From 58964048b37c52bbb841d7ec9386a75d9bf8fbc7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 15:43:58 -0500 Subject: Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance --- kmail/accountdialog.cpp | 2 +- kmail/configuredialog.cpp | 2 +- kmail/favoritefolderview.cpp | 2 +- kmail/foldertreebase.cpp | 2 +- kmail/kmcomposewin.cpp | 16 ++++++++-------- kmail/kmfilterdlg.cpp | 6 +++--- kmail/kmfolderseldlg.cpp | 4 ++-- kmail/kmfoldertree.cpp | 6 +++--- kmail/kmmainwidget.cpp | 32 ++++++++++++++++---------------- kmail/kmmimeparttree.cpp | 8 ++++---- kmail/kmreadermainwin.cpp | 2 +- kmail/kmreaderwin.cpp | 8 ++++---- kmail/snippetwidget.cpp | 4 ++-- kmail/treebase.cpp | 2 +- 14 files changed, 48 insertions(+), 48 deletions(-) (limited to 'kmail') diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index ab1da8e4..4c451ffb 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -2305,7 +2305,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, edit->setText( it.key() ); TQToolButton* button = new TQToolButton( grid ); button->setIconSet( - TDEGlobal::iconLoader()->loadIconSet( "editdelete", TDEIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "edit-delete", TDEIcon::Small, 0 ) ); button->setAutoRaise( true ); button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); button->setFixedSize( 22, 22 ); diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index e740e749..0f92eab5 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -453,7 +453,7 @@ void IdentityPage::slotRemoveIdentity() TQString msg = i18n("Do you really want to remove the identity named " "%1?").arg( item->identity().identityName() ); if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"), - KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue ) + KGuiItem(i18n("&Remove"),"edit-delete") ) == KMessageBox::Continue ) if ( im->removeIdentity( item->identity().identityName() ) ) { delete item; mIdentityList->setSelected( mIdentityList->currentItem(), true ); diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 45c056ee..22d093aa 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -339,7 +339,7 @@ void FavoriteFolderView::contextMenu(TQListViewItem * item, const TQPoint & poin mainWidget()->action("modify")->plug( &contextMenu ); contextMenu.insertSeparator(); - contextMenu.insertItem( SmallIconSet("editdelete"), i18n("Remove From Favorites"), + contextMenu.insertItem( SmallIconSet("edit-delete"), i18n("Remove From Favorites"), this, TQT_SLOT(removeFolder()) ); contextMenu.insertItem( SmallIconSet("edit"), i18n("Rename Favorite"), this, TQT_SLOT(renameFolder()) ); diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index def8002a..9d18138a 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -83,7 +83,7 @@ int FolderTreeBase::dndMode(bool alwaysAsk) if ( GlobalSettings::self()->showPopupAfterDnD() || alwaysAsk ) { TDEPopupMenu menu; menu.insertItem( i18n("&Move Here"), DRAG_MOVE, 0 ); - menu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), DRAG_COPY, 1 ); + menu.insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), DRAG_COPY, 1 ); menu.insertSeparator(); menu.insertItem( SmallIcon("cancel"), i18n("C&ancel"), DRAG_CANCEL, 3 ); action = menu.exec( TQCursor::pos(), 0 ); diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 7863b01b..c7ccdc33 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -1290,17 +1290,17 @@ void KMComposeWin::setupActions(void) - (void) new TDEAction (i18n("Save as &Draft"), "filesave", 0, + (void) new TDEAction (i18n("Save as &Draft"), "document-save", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts"); - (void) new TDEAction (i18n("Save as &Template"), "filesave", 0, + (void) new TDEAction (i18n("Save as &Template"), "document-save", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()), actionCollection(), "save_in_templates"); - (void) new TDEAction (i18n("&Insert File..."), "fileopen", 0, + (void) new TDEAction (i18n("&Insert File..."), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), actionCollection(), "insert_file"); mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"), - "fileopen", 0, + "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertRecentFile(const KURL&)), actionCollection(), "insert_file_recent"); @@ -1468,7 +1468,7 @@ void KMComposeWin::setupActions(void) mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachRemove()), actionCollection(), "remove"); - mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "filesave",0, + mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "document-save",0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()), actionCollection(), "attach_save"); mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this), @@ -2260,7 +2260,7 @@ bool KMComposeWin::queryClose () const int rc = KMessageBox::warningYesNoCancel( this, i18n("Do you want to save the message for later or discard it?"), i18n("Close Composer"), - KGuiItem(savebut, "filesave", TQString(), savetext), + KGuiItem(savebut, "document-save", TQString(), savetext), KStdGuiItem::discard() ); if ( rc == KMessageBox::Cancel ) return false; @@ -2775,7 +2775,7 @@ void KMComposeWin::slotAttachFile() KFileDialog fdlg( recentURL.url(), TQString(), this, 0, true ); fdlg.setOperationMode( KFileDialog::Other ); fdlg.setCaption( i18n( "Attach File" ) ); - fdlg.okButton()->setGuiItem( KGuiItem( i18n( "&Attach" ),"fileopen" ) ); + fdlg.okButton()->setGuiItem( KGuiItem( i18n( "&Attach" ),"document-open" ) ); fdlg.setMode( KFile::Files ); fdlg.exec(); KURL::List files = fdlg.selectedURLs(); @@ -3216,7 +3216,7 @@ void KMComposeWin::slotAttachPopupMenu(TQListViewItem *, const TQPoint &, int) mEditWithId = mAttachMenu->insertItem( i18n("Edit With..."), this, TQT_SLOT(slotAttachEditWith()) ); mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQT_SLOT(slotAttachRemove())); - mSaveAsId = mAttachMenu->insertItem( SmallIconSet("filesaveas"), i18n("Save As..."), this, + mSaveAsId = mAttachMenu->insertItem( SmallIconSet("document-save-as"), i18n("Save As..."), this, TQT_SLOT( slotAttachSave() ) ); mPropertiesId = mAttachMenu->insertItem( i18n("Properties"), this, TQT_SLOT( slotAttachProperties() ) ); diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index 29d62bda..d9065f6d 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -621,13 +621,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons hb = new TQHBox(this); hb->setSpacing(4); mBtnNew = new TQPushButton( TQString(), hb ); - mBtnNew->setPixmap( BarIcon( "filenew", TDEIcon::SizeSmall ) ); + mBtnNew->setPixmap( BarIcon( "document-new", TDEIcon::SizeSmall ) ); mBtnNew->setMinimumSize( mBtnNew->sizeHint() * 1.2 ); mBtnCopy = new TQPushButton( TQString(), hb ); - mBtnCopy->setIconSet( BarIconSet( "editcopy", TDEIcon::SizeSmall ) ); + mBtnCopy->setIconSet( BarIconSet( "edit-copy", TDEIcon::SizeSmall ) ); mBtnCopy->setMinimumSize( mBtnCopy->sizeHint() * 1.2 ); mBtnDelete = new TQPushButton( TQString(), hb ); - mBtnDelete->setIconSet( BarIconSet( "editdelete", TDEIcon::SizeSmall ) ); + mBtnDelete->setIconSet( BarIconSet( "edit-delete", TDEIcon::SizeSmall ) ); mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 ); mBtnRename = new TQPushButton( i18n("Rename..."), hb ); TQToolTip::add( mBtnNew, i18n("New") ); diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index 8aefbc58..b4c9842b 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -22,7 +22,7 @@ KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * parent, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings ) : KDialogBase( parent, "folder dialog", true, caption, Ok|Cancel|User1, Ok, true, - KGuiItem(i18n("&New Subfolder..."), "folder_new", + KGuiItem(i18n("&New Subfolder..."), "folder-new", i18n("Create a new subfolder under the currently selected folder")) ), // mainwin as parent, modal mUseGlobalSettings( useGlobalSettings ) @@ -44,7 +44,7 @@ KMFolderSelDlg::KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings ) : KDialogBase( parent, "folder dialog", true, caption, Ok|Cancel|User1, Ok, true, - KGuiItem(i18n("&New Subfolder..."), "folder_new", + KGuiItem(i18n("&New Subfolder..."), "folder-new", i18n("Create a new subfolder under the currently selected folder")) ), // mainwin as parent, modal mUseGlobalSettings( useGlobalSettings ) diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index bf684661..e73b69a7 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -125,7 +125,7 @@ TQPixmap KMFolderTreeItem::normalIcon(int size) const case SentMail: icon = "folder_sent_mail"; break; case Trash: icon = "trashcan_empty"; break; case Drafts: icon = "edit"; break; - case Templates: icon = "filenew"; break; + case Templates: icon = "document-new"; break; default: { //If not a resource folder don't try to use icalIface folder pixmap @@ -1092,7 +1092,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if (!fti->folder()) createChild = i18n("&New Folder..."); if ( ( fti->folder() || (fti->text(0) != i18n("Searches")) ) && !multiFolder) - folderMenu->insertItem(SmallIconSet("folder_new"), + folderMenu->insertItem(SmallIconSet("folder-new"), createChild, this, TQT_SLOT(addChildFolder())); @@ -1108,7 +1108,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, folderMenu->insertSeparator(); if ( !fti->folder()->noChildren() && !multiFolder ) { - folderMenu->insertItem(SmallIconSet("folder_new"), + folderMenu->insertItem(SmallIconSet("folder-new"), i18n("&New Subfolder..."), this, TQT_SLOT(addChildFolder())); } diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 9e677662..32e5a40d 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() ); diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 05307c96..200e7736 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -132,11 +132,11 @@ void KMMimePartTree::itemRightClicked( TQListViewItem* item, TQPopupMenu* popup = new TQPopupMenu; if ( mCurrentContextMenuItem->node()->nodeId() > 2 && mCurrentContextMenuItem->node()->typeString() != "Multipart" ) { - popup->insertItem( SmallIcon("fileopen"), i18n("to open", "Open"), this, TQT_SLOT(slotOpen()) ); + popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQT_SLOT(slotOpen()) ); popup->insertItem( i18n("Open With..."), this, TQT_SLOT(slotOpenWith()) ); popup->insertItem( i18n("to view something", "View"), this, TQT_SLOT(slotView()) ); } - popup->insertItem( SmallIcon("filesaveas"),i18n( "Save &As..." ), this, TQT_SLOT( slotSaveAs() ) ); + popup->insertItem( SmallIcon("document-save-as"),i18n( "Save &As..." ), this, TQT_SLOT( slotSaveAs() ) ); /* * FIXME mkae optional? popup->insertItem( i18n( "Save as &Encoded..." ), this, @@ -147,9 +147,9 @@ void KMMimePartTree::itemRightClicked( TQListViewItem* item, // edit + delete only for attachments if ( mCurrentContextMenuItem->node()->nodeId() > 2 && mCurrentContextMenuItem->node()->typeString() != "Multipart" ) { - popup->insertItem( SmallIcon("editcopy"), i18n("Copy"), this, TQT_SLOT(slotCopy()) ); + popup->insertItem( SmallIcon("edit-copy"), i18n("Copy"), this, TQT_SLOT(slotCopy()) ); if ( GlobalSettings::self()->allowAttachmentDeletion() ) - popup->insertItem( SmallIcon("editdelete"), i18n( "Delete Attachment" ), + popup->insertItem( SmallIcon("edit-delete"), i18n( "Delete Attachment" ), this, TQT_SLOT( slotDelete() ) ); if ( GlobalSettings::self()->allowAttachmentEditing() ) popup->insertItem( SmallIcon( "edit" ), i18n( "Edit Attachment" ), diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 3c342172..a5b20198 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -343,7 +343,7 @@ void KMReaderMainWin::setupAccel() //mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ), // actionCollection() ); - //mSaveAsAction = new TDEAction( i18n("Save &As..."), "filesave", + //mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save", // TDEStdAccel::shortcut( TDEStdAccel::Save ), // this, TQT_SLOT( slotSaveMsg() ), // actionCollection(), "file_save_as" ); diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 32483b19..9694823f 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -2029,16 +2029,16 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo mAtmCurrent = id; mAtmCurrentName = name; TDEPopupMenu *menu = new TDEPopupMenu(); - menu->insertItem(SmallIcon("fileopen"),i18n("to open", "Open"), 1); + menu->insertItem(SmallIcon("document-open"),i18n("to open", "Open"), 1); menu->insertItem(i18n("Open With..."), 2); menu->insertItem(i18n("to view something", "View"), 3); - menu->insertItem(SmallIcon("filesaveas"),i18n("Save As..."), 4); - menu->insertItem(SmallIcon("editcopy"), i18n("Copy"), 9 ); + menu->insertItem(SmallIcon("document-save-as"),i18n("Save As..."), 4); + menu->insertItem(SmallIcon("edit-copy"), i18n("Copy"), 9 ); const bool canChange = message()->parent() ? !message()->parent()->isReadOnly() : false; if ( GlobalSettings::self()->allowAttachmentEditing() && canChange ) menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 ); if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange ) - menu->insertItem(SmallIcon("editdelete"), i18n("Delete Attachment"), 7 ); + menu->insertItem(SmallIcon("edit-delete"), i18n("Delete Attachment"), 7 ); if ( name.endsWith( ".xia", false ) && Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) menu->insertItem( i18n( "Decrypt With Chiasmus..." ), 6 ); diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index c08d21e2..e16b4884 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -544,10 +544,10 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int if (dynamic_cast(item)) { popup.insertItem( i18n("Edit &group..."), this, TQT_SLOT( slotEditGroup() ) ); } else { - popup.insertItem( SmallIconSet("editpaste"), i18n("&Paste"), this, TQT_SLOT( slotExecuted() ) ); + popup.insertItem( SmallIconSet("edit-paste"), i18n("&Paste"), this, TQT_SLOT( slotExecuted() ) ); popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, TQT_SLOT( slotEdit() ) ); } - popup.insertItem( SmallIconSet("editdelete"), i18n("&Remove"), this, TQT_SLOT( slotRemove() ) ); + popup.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), this, TQT_SLOT( slotRemove() ) ); popup.insertSeparator(); } else { popup.insertTitle(i18n("Text Snippets")); diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index df941516..1e23a007 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -95,7 +95,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint &p TDEPopupMenu *folderMenu = new TDEPopupMenu; folderMenu->insertTitle( folder->label() ); folderMenu->insertSeparator(); - folderMenu->insertItem(SmallIconSet("folder_new"), + folderMenu->insertItem(SmallIconSet("folder-new"), i18n("&New Subfolder..."), this, TQT_SLOT(addChildFolder())); kmkernel->setContextMenuShown( true ); -- cgit v1.2.3