Branch: master

0c8a5b32 2014-10-13 12:46:49 Timothy Pearson
Bring undo, redo, find, and revert icons into XDG compliance
M amarok/src/editfilterdialog.cpp
M amarok/src/filebrowser.cpp
M amarok/src/iconloader.cpp
diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp
index 6e79a53..aab9188 100644
--- a/amarok/src/editfilterdialog.cpp
+++ b/amarok/src/editfilterdialog.cpp
@@ -49,7 +49,7 @@
 
     // define "User2" button
     KGuiItem user2Button( i18n("this \"undo\" will undo the last appended filter... be careful how you will translate it "
-       "to avoid two buttons (\"Cancel\" and \"Undo\") with same label in the same dialog", "&Undo"), "undo" );
+       "to avoid two buttons (\"Cancel\" and \"Undo\") with same label in the same dialog", "&Undo"), "edit-undo" );
     setButtonWhatsThis( User2, i18n( "<p>Clicking here will remove the last appended filter. "
                 "You cannot undo more than one action.</p>" ) );
     setButtonTip(User2, i18n( "Remove last appended filter" ) );
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index 4db6021..bc7c219 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -622,7 +622,7 @@
         connect( m_listView, TQT_SIGNAL(executed( TQListViewItem* )), TQT_SLOT(activate( TQListViewItem* )) );
     }
 
-    KPushButton *button = new KPushButton( KGuiItem( i18n("&Show Search Panel"), "find" ), this );
+    KPushButton *button = new KPushButton( KGuiItem( i18n("&Show Search Panel"), "edit-find" ), this );
     button->setToggleButton( true );
     connect( button, TQT_SIGNAL(toggled( bool )), TQT_SLOT(toggle( bool )) );
 
diff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp
index 9e93609..a7812d2 100644
--- a/amarok/src/iconloader.cpp
+++ b/amarok/src/iconloader.cpp
@@ -75,7 +75,7 @@
         iconMap["random_album"]         = "cd";
         iconMap["random_no"]            = "forward";
         iconMap["random_track"]         = "random";
-        iconMap["redo"]                 = "redo";
+        iconMap["redo"]                 = "edit-redo";
         iconMap["refresh"]              = "reload";
         iconMap["remove"]               = "editdelete";
         iconMap["remove_from_playlist"] = "remove";
@@ -87,7 +87,7 @@
         iconMap["rewind"]               = "2leftarrow";
         iconMap["save"]                 = "filesave";
         iconMap["scripts"]              = "pencil";
-        iconMap["search"]               = "find";
+        iconMap["search"]               = "edit-find";
         iconMap["settings_engine"]      = "amarok";
         iconMap["settings_general"]     = "misc";
         iconMap["settings_indicator"]   = "tv";
@@ -97,9 +97,9 @@
         iconMap["podcast"]              = "podcast";
         iconMap["podcast2"]             = "podcast_new";
         iconMap["track"]                = "sound";
-        iconMap["undo"]                 = "undo";
+        iconMap["undo"]                 = "edit-undo";
         iconMap["visualizations"]       = "visualizations";
-        iconMap["zoom"]                 = "find";
+        iconMap["zoom"]                 = "edit-find";
     }
 
     static TQMap<TQString, TQString> amarokMap;