[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/context/applets/wikipedia
From:       Simon Esneault <simon.esneault () gmail ! com>
Date:       2009-06-23 13:11:44
Message-ID: 1245762704.497156.11829.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 985709 by sesneault:

Change the IconWidget Settings to standard one



 M  +8 -7      WikipediaApplet.cpp  
 M  +1 -1      WikipediaApplet.h  


--- trunk/extragear/multimedia/amarok/src/context/applets/wikipedia/WikipediaApplet.cpp \
#985708:985709 @@ -56,7 +56,7 @@
     , m_artistIcon( 0 )
     , m_albumIcon( 0 )
     , m_trackIcon( 0 )
-    , m_langIcon( 0 )
+    , m_settingsIcon( 0 )
     , m_reloadIcon( 0 )
     , m_css( 0 )
     , m_current( "" )
@@ -135,12 +135,12 @@
     m_trackIcon = addAction( trackAction );
     connect( m_trackIcon, SIGNAL( activated() ), this, SLOT( gotoTrack() ) );
 
-    QAction* langAction = new QAction( i18n( "Lang" ), this );
-    langAction->setIcon( KIcon( "amarok_change_language" ) );
+    QAction* langAction = new QAction( i18n( "Settings" ), this );
+    langAction->setIcon( KIcon( "preferences-system" ) );
     langAction->setVisible( true );
     langAction->setEnabled( true );
-    m_langIcon = addAction( langAction );
-    connect( m_langIcon, SIGNAL( activated() ), this, SLOT( switchLang() ) );
+    m_settingsIcon = addAction( langAction );
+    connect( m_settingsIcon, SIGNAL( activated() ), this, SLOT( switchLang() ) );
     
     QAction* reloadAction = new QAction( i18n( "Reload" ), this );
     reloadAction->setIcon( KIcon( "view-refresh" ) );
@@ -216,7 +216,7 @@
     m_albumIcon->setPos( size().width() - 4 * iconWidth - 4 * standardPadding(), \
                standardPadding() );
     m_trackIcon->setPos( size().width() - 3 * iconWidth - 4 * standardPadding(), \
standardPadding() );  
-    m_langIcon->setPos( size().width() - 2 * iconWidth - 2 * standardPadding(), \
standardPadding() );     +    m_settingsIcon->setPos( size().width() - 2 * iconWidth \
                - 2 * standardPadding(), standardPadding() );
     m_reloadIcon->setPos( size().width() - iconWidth - standardPadding(), \
standardPadding() );  }
 
@@ -265,6 +265,7 @@
 
             if ( m_backwardIcon->action() && !m_backwardIcon->action()->isEnabled() \
)  m_backwardIcon->action()->setEnabled( true );
+
         }
         m_current = data[ "page" ].toString();
         m_webView->setHtml( m_current, KUrl( QString() ) );
@@ -461,7 +462,7 @@
     else if ( m_wikiPreferredLang == "de" )
         ui_Settings.comboBox->setCurrentIndex( 3 );
     
-    parent->addPage( settings, i18n( "Wikipedia Settings" ), \
"amarok_change_language"); +    parent->addPage( settings, i18n( "Wikipedia Settings" \
                ), "preferences-system");
     connect( ui_Settings.comboBox, SIGNAL( currentIndexChanged( QString ) ), this, \
SLOT( switchToLang( QString ) ) );  }
 
--- trunk/extragear/multimedia/amarok/src/context/applets/wikipedia/WikipediaApplet.h \
#985708:985709 @@ -83,7 +83,7 @@
     Plasma::IconWidget *m_artistIcon;
     Plasma::IconWidget *m_albumIcon;
     Plasma::IconWidget *m_trackIcon;
-    Plasma::IconWidget *m_langIcon;
+    Plasma::IconWidget *m_settingsIcon;
     Plasma::IconWidget *m_reloadIcon;
 
     Ui::wikipediaSettings ui_Settings;


[prev in list] [next in list] [prev in thread] [next in thread]