Branch: master

267521c8 2014-10-13 00:16:24 Timothy Pearson
Bring up, down, top, and bottom icons into XDG compliance
A kaddressbook/pics/lo16-action-go-down.png
A kaddressbook/pics/lo16-action-go-up.png
M akregator/src/actionmanagerimpl.cpp
M certmanager/lib/ui/directoryserviceswidget.cpp
M kaddressbook/kcmconfigs/ldapoptionswidget.cpp
M kmail/kmfilterdlg.cpp
M kmail/simplestringlisteditor.cpp
M knode/knmainwidget.cpp
M knotes/knote.cpp
M libtdepim/completionordereditor.cpp
M libtdepim/kscoringeditor.cpp
M libtdepim/statusbarprogresswidget.cpp
R kaddressbook/pics/lo16-action-down.png
R kaddressbook/pics/lo16-action-up.png
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 40dcc8f..050be54 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -304,8 +304,8 @@
     vm->insert(ra);
 
     // toolbar / feed menu
-    new TDEAction(i18n("&Fetch Feed"), "down", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
-    new TDEAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
+    new TDEAction(i18n("&Fetch Feed"), "go-down", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
+    new TDEAction(i18n("Fe&tch All Feeds"), "go-bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
 
     TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
     stopAction->setEnabled(false);
diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp
index e8c4ae5..1a97e1e 100644
--- a/certmanager/lib/ui/directoryserviceswidget.cpp
+++ b/certmanager/lib/ui/directoryserviceswidget.cpp
@@ -99,10 +99,10 @@
     x500LV->setSorting( -1 );
 
     // taken from kmail's configuredialog.cpp
-    upButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
+    upButton->setIconSet( BarIconSet( "go-up", TDEIcon::SizeSmall ) );
     upButton->setEnabled( false ); // b/c no item is selected yet
 
-    downButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
+    downButton->setIconSet( BarIconSet( "go-down", TDEIcon::SizeSmall ) );
     downButton->setEnabled( false ); // b/c no item is selected yet
 }
 
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 4624185..4e4b15a 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -275,11 +275,11 @@
   TQVBox* upDownBox = new TQVBox( hBox );
   upDownBox->setSpacing( 6 );
   mUpButton = new TQToolButton( upDownBox, "mUpButton" );
-  mUpButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
+  mUpButton->setIconSet( BarIconSet( "go-up", TDEIcon::SizeSmall ) );
   mUpButton->setEnabled( false ); // b/c no item is selected yet
 
   mDownButton = new TQToolButton( upDownBox, "mDownButton" );
-  mDownButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
+  mDownButton->setIconSet( BarIconSet( "go-down", TDEIcon::SizeSmall ) );
   mDownButton->setEnabled( false ); // b/c no item is selected yet
 
   TQWidget* spacer = new TQWidget( upDownBox );
diff --git a/kaddressbook/pics/lo16-action-down.png b/kaddressbook/pics/lo16-action-down.png
deleted file mode 100644
index 5b96831..0000000
--- a/kaddressbook/pics/lo16-action-down.png
+++ /dev/null
Binary files differ
diff --git a/kaddressbook/pics/lo16-action-go-down.png b/kaddressbook/pics/lo16-action-go-down.png
new file mode 100644
index 0000000..5b96831
--- /dev/null
+++ b/kaddressbook/pics/lo16-action-go-down.png
Binary files differ
diff --git a/kaddressbook/pics/lo16-action-go-up.png b/kaddressbook/pics/lo16-action-go-up.png
new file mode 100644
index 0000000..dfaea12
--- /dev/null
+++ b/kaddressbook/pics/lo16-action-go-up.png
Binary files differ
diff --git a/kaddressbook/pics/lo16-action-up.png b/kaddressbook/pics/lo16-action-up.png
deleted file mode 100644
index dfaea12..0000000
--- a/kaddressbook/pics/lo16-action-up.png
+++ /dev/null
Binary files differ
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index f81a707..29d62bd 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -594,19 +594,19 @@
   hb->setSpacing(4);
   mBtnTop = new KPushButton( TQString(), hb );
   mBtnTop->setAutoRepeat( true );
-  mBtnTop->setIconSet( BarIconSet( "top", TDEIcon::SizeSmall ) );
+  mBtnTop->setIconSet( BarIconSet( "go-top", TDEIcon::SizeSmall ) );
   mBtnTop->setMinimumSize( mBtnTop->sizeHint() * 1.2 );
   mBtnUp = new KPushButton( TQString(), hb );
   mBtnUp->setAutoRepeat( true );
-  mBtnUp->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
+  mBtnUp->setIconSet( BarIconSet( "go-up", TDEIcon::SizeSmall ) );
   mBtnUp->setMinimumSize( mBtnUp->sizeHint() * 1.2 );
   mBtnDown = new KPushButton( TQString(), hb );
   mBtnDown->setAutoRepeat( true );
-  mBtnDown->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
+  mBtnDown->setIconSet( BarIconSet( "go-down", TDEIcon::SizeSmall ) );
   mBtnDown->setMinimumSize( mBtnDown->sizeHint() * 1.2 );
   mBtnBot = new KPushButton( TQString(), hb );
   mBtnBot->setAutoRepeat( true );
-  mBtnBot->setIconSet( BarIconSet( "bottom", TDEIcon::SizeSmall ) );
+  mBtnBot->setIconSet( BarIconSet( "go-bottom", TDEIcon::SizeSmall ) );
   mBtnBot->setMinimumSize( mBtnBot->sizeHint() * 1.2 );
   TQToolTip::add( mBtnTop, i18n("Top") );
   TQToolTip::add( mBtnUp, i18n("Up") );
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index b060242..b96a1ad 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -122,7 +122,7 @@
       kdDebug(5006) << "Are you sure you want to use an Up button "
 	"without a Down button??" << endl;
     mUpButton = new KPushButton( TQString(), this );
-    mUpButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
+    mUpButton->setIconSet( BarIconSet( "go-up", TDEIcon::SizeSmall ) );
     mUpButton->setAutoDefault( false );
     mUpButton->setEnabled( false ); // no selection yet
     vlay->addWidget( mUpButton );
@@ -135,7 +135,7 @@
       kdDebug(5006) << "Are you sure you want to use a Down button "
 	"without an Up button??" << endl;
     mDownButton = new KPushButton( TQString(), this );
-    mDownButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
+    mDownButton->setIconSet( BarIconSet( "go-down", TDEIcon::SizeSmall ) );
     mDownButton->setAutoDefault( false );
     mDownButton->setEnabled( false ); // no selection yet
     vlay->addWidget( mDownButton );
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index b9e3b06..46a92c7 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -559,9 +559,9 @@
                               TQT_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle");
   a_ctNavNextUnreadThread   = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this),
                               TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread");
-  a_ctNavNextGroup          = new TDEAction(i18n("Ne&xt Group"), "down", Key_Plus , TQT_TQOBJECT(c_olView),
+  a_ctNavNextGroup          = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , TQT_TQOBJECT(c_olView),
                               TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup");
-  a_ctNavPrevGroup          = new TDEAction(i18n("Pre&vious Group"), "up", Key_Minus , TQT_TQOBJECT(c_olView),
+  a_ctNavPrevGroup          = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , TQT_TQOBJECT(c_olView),
                               TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup");
   a_ctNavReadThrough        = new TDEAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this),
                               TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough");
@@ -715,9 +715,9 @@
                               TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower");
   a_ctScoreRaise            = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this),
                               TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise");
-  a_ctArtToggleIgnored      = new TDEAction(i18n("&Ignore Thread"), "bottom", Key_I , TQT_TQOBJECT(this),
+  a_ctArtToggleIgnored      = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , TQT_TQOBJECT(this),
                               TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore");
-  a_ctArtToggleWatched      = new TDEAction(i18n("&Watch Thread"), "top", Key_W , TQT_TQOBJECT(this),
+  a_ctArtToggleWatched      = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , TQT_TQOBJECT(this),
                               TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch");
 
   //header-view local articles
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index dd2d7e8..59380b5 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -131,11 +131,11 @@
     new TDEAction( i18n("Preferences..."), "configure", 0,
         TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" );
 
-    m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "up", 0,
+    m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "go-up", 0,
         TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" );
     m_keepAbove->setExclusiveGroup( "keepAB" );
 
-    m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "down", 0,
+    m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "go-down", 0,
         TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" );
     m_keepBelow->setExclusiveGroup( "keepAB" );
 
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 5bca85c..924a669 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -223,12 +223,12 @@
 
   TQVBox* upDownBox = new TQVBox( page );
   mUpButton = new KPushButton( upDownBox, "mUpButton" );
-  mUpButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
+  mUpButton->setIconSet( BarIconSet( "go-up", TDEIcon::SizeSmall ) );
   mUpButton->setEnabled( false ); // b/c no item is selected yet
   mUpButton->setFocusPolicy( TQ_StrongFocus );
 
   mDownButton = new KPushButton( upDownBox, "mDownButton" );
-  mDownButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
+  mDownButton->setIconSet( BarIconSet( "go-down", TDEIcon::SizeSmall ) );
   mDownButton->setEnabled( false ); // b/c no item is selected yet
   mDownButton->setFocusPolicy( TQ_StrongFocus );
 
diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp
index d793c7a..628dcb7 100644
--- a/libtdepim/kscoringeditor.cpp
+++ b/libtdepim/kscoringeditor.cpp
@@ -613,12 +613,12 @@
 
   TQHBoxLayout *btnL = new TQHBoxLayout( topL, KDialog::spacingHint() );
   mRuleUp = new TQPushButton( this );
-  mRuleUp->setPixmap( BarIcon( "up", TDEIcon::SizeSmall ) );
+  mRuleUp->setPixmap( BarIcon( "go-up", TDEIcon::SizeSmall ) );
   TQToolTip::add( mRuleUp, i18n("Move rule up") );
   btnL->addWidget( mRuleUp );
   connect( mRuleUp, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleUp() ) );
   mRuleDown = new TQPushButton( this );
-  mRuleDown->setPixmap( BarIcon( "down", TDEIcon::SizeSmall ) );
+  mRuleDown->setPixmap( BarIcon( "go-down", TDEIcon::SizeSmall ) );
   TQToolTip::add( mRuleDown, i18n("Move rule down") );
   btnL->addWidget( mRuleDown );
   connect( mRuleDown, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleDown() ) );
diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp
index 61dd1bf..34f6870 100644
--- a/libtdepim/statusbarprogresswidget.cpp
+++ b/libtdepim/statusbarprogresswidget.cpp
@@ -69,7 +69,7 @@
   m_pButton = new TQPushButton( this );
   m_pButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
                                          TQSizePolicy::Minimum ) );
-  m_pButton->setPixmap( SmallIcon( "up" ) );
+  m_pButton->setPixmap( SmallIcon( "go-up" ) );
   box->addWidget( m_pButton  );
   stack = new TQWidgetStack( this );
   stack->setMaximumHeight( fontMetrics().height() );
@@ -282,12 +282,12 @@
 {
   // Update the hide/show button when the detailed one is shown/hidden
   if ( b ) {
-    m_pButton->setPixmap( SmallIcon( "down" ) );
+    m_pButton->setPixmap( SmallIcon( "go-down" ) );
     TQToolTip::remove( m_pButton );
     TQToolTip::add( m_pButton, i18n("Hide detailed progress window") );
     setMode();
   } else {
-    m_pButton->setPixmap( SmallIcon( "up" ) );
+    m_pButton->setPixmap( SmallIcon( "go-up" ) );
     TQToolTip::remove( m_pButton );
     TQToolTip::add( m_pButton, i18n("Show detailed progress window") );
   }