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

9 files changed, 22 insertions, 22 deletions

diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 1af971b3b..bdde0f432 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -200,9 +200,9 @@ void ArticleWidget::initActions()
   mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this),
     TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" );
 
-  new TDEAction( i18n("&Open URL"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()),
+  new TDEAction( i18n("&Open URL"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()),
                mActionCollection, "open_url" );
-  new TDEAction( i18n("&Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()),
+  new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()),
                mActionCollection, "copy_url" );
   new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()),
                mActionCollection, "add_bookmark" );
@@ -210,9 +210,9 @@ void ArticleWidget::initActions()
                mActionCollection, "add_addr_book" );
   new TDEAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()),
                mActionCollection, "openin_addr_book" );
-  new TDEAction( i18n("&Open Attachment"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()),
+  new TDEAction( i18n("&Open Attachment"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()),
                mActionCollection, "open_attachment" );
-  new TDEAction( i18n("&Save Attachment As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()),
+  new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()),
                mActionCollection, "save_attachment" );
 }
 
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 6016519f4..77b97288e 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -155,7 +155,7 @@ bool KNAccountManager::removeAccount(KNNntpAccount *a)
   if(knGlobals.folderManager()->unsentForAccount(a->id()) > 0) {
     KMessageBox::sorry(knGlobals.topWidget, i18n("This account cannot be deleted since there are some unsent messages for it."));
   }
-  else if(KMessageBox::warningContinueCancel(knGlobals.topWidget, i18n("Do you really want to delete this account?"),"",KGuiItem(i18n("&Delete"),"editdelete"))==KMessageBox::Continue) {
+  else if(KMessageBox::warningContinueCancel(knGlobals.topWidget, i18n("Do you really want to delete this account?"),"",KGuiItem(i18n("&Delete"),"edit-delete"))==KMessageBox::Continue) {
     lst = gManager->groupsOfAccount( a );
     for ( TQValueList<KNGroup*>::Iterator it = lst.begin(); it != lst.end(); ++it ) {
       if ( (*it)->isLocked() ) {
diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp
index e70f6243e..86c58cc61 100644
--- a/knode/knarticlemanager.cpp
+++ b/knode/knarticlemanager.cpp
@@ -580,7 +580,7 @@ bool KNArticleManager::deleteArticles(KNLocalArticle::List &l, bool ask)
     }
     if( KMessageBox::Cancel == KMessageBox::warningContinueCancelList(
       knGlobals.topWidget, i18n("Do you really want to delete these articles?"), lst,
-        i18n("Delete Articles"), KGuiItem(i18n("&Delete"),"editdelete")) )
+        i18n("Delete Articles"), KGuiItem(i18n("&Delete"),"edit-delete")) )
       return false;
   }
 
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index ac8d9fcd8..cc8398d0c 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -211,10 +211,10 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
   new TDEAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this),
     TQT_SLOT(slotSendLater()), actionCollection(), "send_later");
 
-  new TDEAction(i18n("Save as &Draft"),"filesave", 0 , TQT_TQOBJECT(this),
+  new TDEAction(i18n("Save as &Draft"),"document-save", 0 , TQT_TQOBJECT(this),
     TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft");
 
-  new TDEAction(i18n("D&elete"),"editdelete", 0 , TQT_TQOBJECT(this),
+  new TDEAction(i18n("D&elete"),"edit-delete", 0 , TQT_TQOBJECT(this),
     TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete");
 
   KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection());
@@ -265,7 +265,7 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
 
   //options menu
 
-  a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "filenew", 0 , TQT_TQOBJECT(this),
+  a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , TQT_TQOBJECT(this),
                    TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news");
 
   a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this),
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index 8a218eb29..7c0ef4359 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -268,8 +268,8 @@ KNConfig::Appearance::Appearance()
   i_cons[ignore]          = UserIcon("ignore");
   i_cons[mail]            = SmallIcon("mail_generic");
   i_cons[posting]         = UserIcon("article");
-  i_cons[canceledPosting] = SmallIcon("editdelete");
-  i_cons[savedRemote]     = SmallIcon("editcopy");
+  i_cons[canceledPosting] = SmallIcon("edit-delete");
+  i_cons[savedRemote]     = SmallIcon("edit-copy");
   i_cons[group]           = UserIcon("group");
   i_cons[sendErr]         = UserIcon("snderr");
 }
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index 3d4948a40..68b474a14 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -1424,7 +1424,7 @@ void KNConfig::DisplayedHeadersWidget::slotDelBtnClicked()
   if(l_box->currentItem()==-1)
     return;
 
-  if(KMessageBox::warningContinueCancel(this, i18n("Really delete this header?"),"",KGuiItem(i18n("&Delete"),"editdelete"))==KMessageBox::Continue) {
+  if(KMessageBox::warningContinueCancel(this, i18n("Really delete this header?"),"",KGuiItem(i18n("&Delete"),"edit-delete"))==KMessageBox::Continue) {
     KNDisplayedHeader *h = (static_cast<HdrItem*>(l_box->item(l_box->currentItem())))->hdr;
     d_ata->remove(h);
     l_box->removeItem(l_box->currentItem());
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index 2264dd293..eee045c28 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -262,7 +262,7 @@ void KNFilterManager::copyFilter(KNArticleFilter *f)
 void KNFilterManager::deleteFilter(KNArticleFilter *f)
 {
   if ( KMessageBox::warningContinueCancel( fset ? fset : knGlobals.topWidget,
-       i18n("Do you really want to delete this filter?"), TQString(), KGuiItem( i18n("&Delete"), "editdelete" ) )
+       i18n("Do you really want to delete this filter?"), TQString(), KGuiItem( i18n("&Delete"), "edit-delete" ) )
        == KMessageBox::Continue ) {
     if ( mFilterList.remove( f ) ) { // does not delete surplus config files
       if ( fset ) {                 // we reuse ids to reduce the number of dead files
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 46a92c7bc..1870b9f5e 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -607,7 +607,7 @@ void KNMainWidget::initActions()
                               TQT_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders");
   a_ctAccGetNewHdrsAll      = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, TQT_TQOBJECT(this),
                                           TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders");
-  a_ctAccDelete             = new TDEAction(i18n("&Delete Account"), "editdelete", 0, TQT_TQOBJECT(this),
+  a_ctAccDelete             = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, TQT_TQOBJECT(this),
                               TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete");
   a_ctAccPostNewArticle     = new TDEAction(i18n("&Post to Newsgroup..."), "mail_new", CTRL+Key_N, TQT_TQOBJECT(this),
                               TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew");
@@ -640,11 +640,11 @@ void KNMainWidget::initActions()
                        "knode_configure_knode" );
 
   //collection-view - folder
-  a_ctFolNew                = new TDEAction(i18n("&New Folder"), "folder_new", 0, TQT_TQOBJECT(this),
-                              TQT_SLOT(slotFolNew()), actionCollection(), "folder_new");
-  a_ctFolNewChild           = new TDEAction(i18n("New &Subfolder"), "folder_new", 0, TQT_TQOBJECT(this),
+  a_ctFolNew                = new TDEAction(i18n("&New Folder"), "folder-new", 0, TQT_TQOBJECT(this),
+                              TQT_SLOT(slotFolNew()), actionCollection(), "folder-new");
+  a_ctFolNewChild           = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, TQT_TQOBJECT(this),
                               TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild");
-  a_ctFolDelete             = new TDEAction(i18n("&Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this),
+  a_ctFolDelete             = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this),
                               TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete");
   a_ctFolRename             = new TDEAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this),
                               TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename");
@@ -723,7 +723,7 @@ void KNMainWidget::initActions()
   //header-view local articles
   a_ctArtSendOutbox         = new TDEAction(i18n("Sen&d Pending Messages"), "mail_send", 0, TQT_TQOBJECT(this),
                               TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending");
-  a_ctArtDelete             = new TDEAction(i18n("&Delete Article"), "editdelete", Key_Delete, TQT_TQOBJECT(this),
+  a_ctArtDelete             = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, TQT_TQOBJECT(this),
                               TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete");
   a_ctArtSendNow            = new TDEAction(i18n("Send &Now"),"mail_send", 0 , TQT_TQOBJECT(this),
                               TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow");
@@ -1588,7 +1588,7 @@ void KNMainWidget::slotFolDelete()
     KMessageBox::sorry(knGlobals.topWidget, i18n("You cannot delete a standard folder."));
 
   else if( KMessageBox::Continue==KMessageBox::warningContinueCancel(knGlobals.topWidget,
-      i18n("Do you really want to delete this folder and all its children?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) {
+      i18n("Do you really want to delete this folder and all its children?"),"",KGuiItem(i18n("&Delete"),"edit-delete")) ) {
 
     if(!f_olManager->deleteFolder(f_olManager->currentFolder()))
       KMessageBox::sorry(knGlobals.topWidget,
@@ -1639,7 +1639,7 @@ void KNMainWidget::slotFolEmpty()
       return;
     }
     if( KMessageBox::Continue == KMessageBox::warningContinueCancel(
-        this, i18n("Do you really want to delete all articles in %1?").arg(f_olManager->currentFolder()->name()),"",KGuiItem(i18n("&Delete"),"editdelete")) )
+        this, i18n("Do you really want to delete all articles in %1?").arg(f_olManager->currentFolder()->name()),"",KGuiItem(i18n("&Delete"),"edit-delete")) )
       f_olManager->emptyFolder(f_olManager->currentFolder());
   }
 }
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index 737bece29..b38e06507 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -38,7 +38,7 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent)
 
   startBtn=new TQPushButton(SmallIcon("mail_find"),i18n("Sea&rch"), bg);
   startBtn->setDefault(true);
-  newBtn=new TQPushButton(SmallIcon("editclear"),i18n("C&lear"), bg);
+  newBtn=new TQPushButton(SmallIcon("edit-clear"),i18n("C&lear"), bg);
   closeBtn=new KPushButton(KStdGuiItem::close(), bg);
 
   completeThreads=new TQCheckBox(i18n("Sho&w complete threads"),this);