From 0c8a5b327871d2df899ca19d42e4dd0e4385935f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 12:46:49 -0500 Subject: [PATCH] Bring undo, redo, find, and revert icons into XDG compliance --- amarok/src/editfilterdialog.cpp | 2 +- amarok/src/filebrowser.cpp | 2 +- amarok/src/iconloader.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp index 6e79a53d..aab91888 100644 --- a/amarok/src/editfilterdialog.cpp +++ b/amarok/src/editfilterdialog.cpp @@ -49,7 +49,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c // 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( "

Clicking here will remove the last appended filter. " "You cannot undo more than one action.

" ) ); setButtonTip(User2, i18n( "Remove last appended filter" ) ); diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp index 4db60218..bc7c2191 100644 --- a/amarok/src/filebrowser.cpp +++ b/amarok/src/filebrowser.cpp @@ -622,7 +622,7 @@ SearchPane::SearchPane( FileBrowser *parent ) 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 9e936092..a7812d2b 100644 --- a/amarok/src/iconloader.cpp +++ b/amarok/src/iconloader.cpp @@ -75,7 +75,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h 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 @@ Amarok::icon( const TQString& name ) //declared in amarok.h 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 @@ Amarok::icon( const TQString& name ) //declared in amarok.h 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 amarokMap;