Branch: master

7c7b3179 2014-10-11 21:45:20 Timothy Pearson
Bring previous and next icons into XDG compliance
M kmail/kmmainwidget.cpp
M knode/knmainwidget.cpp
M libtdepim/addresseeselector.cpp
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 72978bc..6302478 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -3069,7 +3069,7 @@
                          actionCollection(), "go_next_message" );
 
   new TDEAction( KGuiItem( i18n("Next &Unread Message"),
-                         TQApplication::reverseLayout() ? "previous" : "next",
+                         TQApplication::reverseLayout() ? "go-previous" : "go-next",
                          i18n("Go to the next unread message") ),
                          Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadMessage()),
                          actionCollection(), "go_next_unread_message" );
@@ -3087,7 +3087,7 @@
                          actionCollection(), "go_prev_message" );
 
   new TDEAction( KGuiItem( i18n("Previous Unread &Message"),
-                         TQApplication::reverseLayout() ? "next" : "previous",
+                         TQApplication::reverseLayout() ? "go-next" : "go-previous",
                          i18n("Go to the previous unread message") ),
                          Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadMessage()),
                          actionCollection(), "go_prev_unread_message" );
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index cd7ceb3..459b01c 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -549,10 +549,10 @@
   mArticleViewer->setCharsetKeyboardAction()->plugAccel(a_ccel);
 
   //navigation
-  a_ctNavNextArt            = new TDEAction( KGuiItem(i18n("&Next Article"), "next",
+  a_ctNavNextArt            = new TDEAction( KGuiItem(i18n("&Next Article"), "go-next",
                               i18n("Go to next article")), "N;Right", TQT_TQOBJECT(h_drView),
                               TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" );
-  a_ctNavPrevArt            = new TDEAction( KGuiItem(i18n("&Previous Article"), "previous",
+  a_ctNavPrevArt            = new TDEAction( KGuiItem(i18n("&Previous Article"), "go-previous",
                               i18n("Go to previous article")), "P;Left" , TQT_TQOBJECT(h_drView),
                               TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" );
   a_ctNavNextUnreadArt      = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , TQT_TQOBJECT(this),
diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index 2234b9a..77f2be0 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -288,8 +288,8 @@
 
   int row = 1;
 
-  TQIconSet moveSet = TDEGlobal::iconLoader()->loadIconSet( "next", TDEIcon::Small );
-  TQIconSet removeSet = TDEGlobal::iconLoader()->loadIconSet( "previous", TDEIcon::Small );
+  TQIconSet moveSet = TDEGlobal::iconLoader()->loadIconSet( "go-next", TDEIcon::Small );
+  TQIconSet removeSet = TDEGlobal::iconLoader()->loadIconSet( "go-previous", TDEIcon::Small );
 
   uint count = mSelection->fieldCount();
   for ( uint i = 0; i < count; ++i, ++row ) {