Branch: master

d59f74e3 2014-10-13 12:51:12 Timothy Pearson
Bring undo, redo, find, and revert icons into XDG compliance
M certmanager/certmanager.cpp
M certmanager/lib/ui/cryptoconfigdialog.cpp
M kaddressbook/kabcore.cpp
M kmail/kmmainwidget.cpp
M kmail/searchwindow.cpp
M knotes/knoteedit.cpp
M korganizer/searchdialog.cpp
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index c818824..1bffa97 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -363,7 +363,7 @@
   mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ),
                                   "location_combo_action", mNextFindRemote? 1 : 0 );
 
-  mFindAction = new TDEAction( i18n("Find"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
+  mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
 			     actionCollection(), "find" );
 
   KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() );
diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp
index 52402d6..4ec32cb 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.cpp
+++ b/certmanager/lib/ui/cryptoconfigdialog.cpp
@@ -40,7 +40,7 @@
                  WStyle_Customize | WStyle_DialogBorder | WStyle_Maximize | WStyle_Title | WStyle_SysMenu,
                  parent, name, true /*modal*/,
                  i18n( "Configure" ), Default|Cancel|Apply|Ok|User1,
-                 Ok, true /*separator*/, KGuiItem( i18n( "&Reset" ), "undo" ) )
+                 Ok, true /*separator*/, KGuiItem( i18n( "&Reset" ), "edit-undo" ) )
 {
   mMainWidget = new CryptoConfigModule( config, this );
   setMainWidget( mMainWidget );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index dbd9064..c17a70c 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1406,7 +1406,7 @@
   action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) );
 
   // misc
-  action = new TDEAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "find", 0,
+  action = new TDEAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "edit-find", 0,
                         this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" );
   action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) );
 
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 6302478..9e67766 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -2770,7 +2770,7 @@
   (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" );
 
-  mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "find", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this),
+  mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this),
 		      TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" );
 
   (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), TQT_TQOBJECT(this),
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 52f4647..668876a 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -110,7 +110,7 @@
                          KMFolder *curFolder, bool modal):
   KDialogBase(0, name, modal, i18n("Find Messages"),
               User1 | User2 | Close, User1, false,
-              KGuiItem( i18n("&Search"), "find" ),
+              KGuiItem( i18n("&Search"), "edit-find" ),
               KStdGuiItem::stop()),
   mStopped(false),
   mCloseRequested(false),
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 2ba215b..fff0beb 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -532,8 +532,8 @@
       menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) );
     else {
       int id = menu->idAt(0);
-      menu->changeItem( id - IdUndo, SmallIconSet("undo"), menu->text( id - IdUndo) );
-      menu->changeItem( id - IdRedo, SmallIconSet("redo"), menu->text( id - IdRedo) );
+      menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) );
+      menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) );
       menu->changeItem( id - IdCut, SmallIconSet("editcut"), menu->text( id - IdCut) );
       menu->changeItem( id - IdCopy, SmallIconSet("editcopy"), menu->text( id - IdCopy) );
       menu->changeItem( id - IdPaste, SmallIconSet("editpaste"), menu->text( id - IdPaste) );
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index dd0f455..c9e5f88 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -47,7 +47,7 @@
 
 SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   : KDialogBase(Plain,i18n("Find Events"),User1|Close,User1,parent,0,false,false,
-                KGuiItem( i18n("&Find"), "find") )
+                KGuiItem( i18n("&Find"), "edit-find") )
 {
   mCalendar = calendar;