Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

1 files changed, 16 insertions, 16 deletions

diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 9e677662b..32e5a40d9 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -1245,7 +1245,7 @@ void KMMainWidget::slotRemoveFolder()
   }
 
   if (KMessageBox::warningContinueCancel(this, str, title,
-                                         KGuiItem( i18n("&Delete"), "editdelete"))
+                                         KGuiItem( i18n("&Delete"), "edit-delete"))
       == KMessageBox::Continue)
   {
     KMail::FolderUtil::deleteFolder( mFolder, this );
@@ -2642,7 +2642,7 @@ void KMMainWidget::setupActions()
   mMsgActions->setMessageView( mMsgView );
 
   //----- File Menu
-  mSaveAsAction = new TDEAction( i18n("Save &As..."), "filesave",
+  mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save",
     TDEStdAccel::shortcut(TDEStdAccel::Save),
     TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" );
 
@@ -2719,7 +2719,7 @@ void KMMainWidget::setupActions()
   // disable action if no kwatchgnupg binary is around
   if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false);
 
-  act = new TDEAction( i18n("&Import Messages..."), "fileopen", 0, TQT_TQOBJECT(this),
+  act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotImport()), actionCollection(), "import" );
   if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false);
 
@@ -2754,7 +2754,7 @@ void KMMainWidget::setupActions()
    * sure it is plugged into the TDEAccel now, since that won't happen on
    * XMLGui construction or manual ->plug(). This is only a problem when run
    * as a part, though. */
-  mDeleteAction = new TDEAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
+  mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
                               TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" );
   mDeleteAction->plugAccel( actionCollection()->tdeaccel() );
 
@@ -2763,7 +2763,7 @@ void KMMainWidget::setupActions()
                              CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashThread()),
                              actionCollection(), "move_thread_to_trash" );
 
-  mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "editdelete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this),
+  mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this),
                               TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" );
 
 
@@ -2777,7 +2777,7 @@ void KMMainWidget::setupActions()
 		      TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
 
   //----- Folder Menu
-  mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder_new", 0, TQT_TQOBJECT(mFolderTree),
+  mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, TQT_TQOBJECT(mFolderTree),
 		      TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" );
 
   mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this),
@@ -2810,10 +2810,10 @@ void KMMainWidget::setupActions()
   mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" );
 
-  mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "editdelete", 0, TQT_TQOBJECT(this),
+  mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
 
-  mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "filesave", 0, TQT_TQOBJECT(this),
+  mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT( slotArchiveFolder() ), actionCollection(),
                                       "archive_folder" );
 
@@ -2829,25 +2829,25 @@ void KMMainWidget::setupActions()
   mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" );
 
-  new TDEAction( i18n("Copy Folder"), "editcopy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()),
+  new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()),
                TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" );
-  new TDEAction( i18n("Cut Folder"), "editcut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()),
+  new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()),
                TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" );
-  new TDEAction( i18n("Paste Folder"), "editpaste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()),
+  new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()),
                TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" );
 
-  new TDEAction( i18n("Copy Messages"), "editcopy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()),
+  new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()),
                TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" );
-  new TDEAction( i18n("Cut Messages"), "editcut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()),
+  new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()),
                TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" );
-  new TDEAction( i18n("Paste Messages"), "editpaste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()),
+  new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()),
                TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" );
 
   //----- Message Menu
   (void) new TDEAction( i18n("&New Message..."), "mail_new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this),
 		      TQT_SLOT(slotCompose()), actionCollection(), "new_message" );
   mTemplateMenu =
-    new TDEActionMenu( i18n("New Message From &Template"), "filenew",
+    new TDEActionMenu( i18n("New Message From &Template"), "document-new",
                      actionCollection(), "new_from_template" );
   mTemplateMenu->setDelayed( true );
   connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this),
@@ -2924,7 +2924,7 @@ void KMMainWidget::setupActions()
 
   mPrintAction = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), actionCollection());
 
-  mUseAction = new TDEAction( i18n("New Message From &Template"), "filenew",
+  mUseAction = new TDEAction( i18n("New Message From &Template"), "document-new",
                             Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ),
                             actionCollection(), "use_template" );
   mUseAction->plugAccel( actionCollection()->tdeaccel() );