diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-13 15:43:58 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-13 15:43:58 -0500 |
| commit | 58964048b37c52bbb841d7ec9386a75d9bf8fbc7 (patch) | |
| tree | 40f0b6657d5612ef284e5992a253d823a2a432c4 | |
| parent | d59f74e30fb3df4bfd516cf813a05702acc0c801 (diff) | |
| download | tdepim-58964048b37c52bbb841d7ec9386a75d9bf8fbc7.tar.gz tdepim-58964048b37c52bbb841d7ec9386a75d9bf8fbc7.zip | |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
63 files changed, 137 insertions, 137 deletions
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 050be54f2..32139358e 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -286,8 +286,8 @@ void ActionManagerImpl::initView(View* view) // Feed/Feed Group popup menu new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage"); new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add"); - new TDEAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); - new TDEAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove"); + new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); + new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove"); new TDEAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify"); TDEActionMenu* vm = new TDEActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" ); @@ -325,7 +325,7 @@ void ActionManagerImpl::initView(View* view) new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article"); - new TDEAction(i18n("&Delete"), "editdelete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); + new TDEAction(i18n("&Delete"), "edit-delete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); if (Settings::showTaggingGUI()) { diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 1bffa97ce..86ee531a3 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -267,7 +267,7 @@ void CertManager::createActions() { actionCollection(), "view_stop_operations" ); action->setEnabled( false ); - (void) new TDEAction( i18n("New Key Pair..."), "filenew", 0, + (void) new TDEAction( i18n("New Key Pair..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newCertificate()), actionCollection(), "file_new_certificate" ); @@ -298,7 +298,7 @@ void CertManager::createActions() { connectEnableOperationSignal( this, mExtendCertificateAction ); #endif - mDeleteCertificateAction = new TDEAction( i18n("Delete"), "editdelete", Key_Delete, + mDeleteCertificateAction = new TDEAction( i18n("Delete"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()), actionCollection(), "edit_delete_certificate" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction ); @@ -1082,7 +1082,7 @@ void CertManager::slotDeleteCertificate() { if ( KMessageBox::warningContinueCancelList( this, msg, keyDisplayNames, i18n( "Delete Certificates" ), - KGuiItem( i18n( "Delete" ), "editdelete" ), + KGuiItem( i18n( "Delete" ), "edit-delete" ), "ConfirmDeleteCert", KMessageBox::Dangerous ) != KMessageBox::Continue ) return; diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 935084bd6..fa14bfbe3 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -62,11 +62,11 @@ using namespace GpgME; namespace { static KGuiItem KGuiItem_save() { - return KGuiItem( i18n("&Save to Disk..."), "filesaveas" ); + return KGuiItem( i18n("&Save to Disk..."), "document-save-as" ); } static KGuiItem KGuiItem_copy() { - return KGuiItem( i18n("&Copy to Clipboard"), "editcopy", i18n("Copy Audit Log to Clipboard") ); + return KGuiItem( i18n("&Copy to Clipboard"), "edit-copy", i18n("Copy Audit Log to Clipboard") ); } static KGuiItem KGuiItem_showAuditLog() { diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index a9bdf999b..d517f0b62 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -305,7 +305,7 @@ void EmailEditDialog::remove() TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).arg( address ); TQString caption = i18n( "Confirm Remove" ); - if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue) { + if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "edit-delete") ) == KMessageBox::Continue) { EmailItem *item = static_cast<EmailItem*>( mEmailListBox->item( mEmailListBox->currentItem() ) ); bool preferred = item->preferred(); diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index dce024a87..28a6f8ff7 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -344,7 +344,7 @@ void DistributionListWidget::removeList() { int result = KMessageBox::warningContinueCancel( this, i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ), - TQString(), KGuiItem( i18n("Delete"), "editdelete") ); + TQString(), KGuiItem( i18n("Delete"), "edit-delete") ); if ( result != KMessageBox::Continue ) return; diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 66d75b985..1d80c915a 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -299,7 +299,7 @@ void ResourceSelection::remove() int result = KMessageBox::warningContinueCancel( this, i18n( "<qt>Do you really want to remove the address book <b>%1</b>?</qt>" ) .arg( item->resource()->resourceName() ), "", - KGuiItem( i18n( "&Remove" ), "editdelete" ) ); + KGuiItem( i18n( "&Remove" ), "edit-delete" ) ); if ( result == KMessageBox::Cancel ) return; diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c17a70c68..186f0fa5e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1366,7 +1366,7 @@ void KABCore::initActions() // mActionUndo->setWhatsThis( i18n( "Undoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) ); // mActionRedo->setWhatsThis( i18n( "Redoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) ); - mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "editdelete", + mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "edit-delete", Key_Delete, this, TQT_SLOT( deleteContacts() ), actionCollection(), "edit_delete" ); mActionDelete->setWhatsThis( i18n( "Delete all selected contacts." ) ); diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 8af9f2618..c0417b7ec 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -154,7 +154,7 @@ void KeyWidget::removeKey() TQString type = mKeyCombo->currentText(); TQString text = i18n( "<qt>Do you really want to remove the key <b>%1</b>?</qt>" ); - if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel ) + if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "edit-delete") ) == KMessageBox::Cancel ) return; mKeyList.remove( mKeyList.at( pos ) ); diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 8b2113678..93fe626b0 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -310,7 +310,7 @@ void ViewManager::deleteView() .arg( mActiveView->caption() ); TQString caption = i18n( "Confirm Delete" ); - if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue ) { + if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "edit-delete") ) == KMessageBox::Continue ) { mViewNameList.remove( mActiveView->caption() ); // remove the view from the config file diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index ced834833..f6e1f0b08 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -435,7 +435,7 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) // File browse button mFileBrowseButton = new TQPushButton(mFileBox); - mFileBrowseButton->setPixmap(SmallIcon("fileopen")); + mFileBrowseButton->setPixmap(SmallIcon("document-open")); mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint()); TQToolTip::add(mFileBrowseButton, i18n("Choose a file")); TQWhatsThis::add(mFileBrowseButton, i18n("Select a text or image file to display.")); @@ -526,7 +526,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) // Log file browse button. // The file browser dialogue is activated by the PickLogFileRadio class. TQPushButton* browseButton = new TQPushButton(box); - browseButton->setPixmap(SmallIcon("fileopen")); + browseButton->setPixmap(SmallIcon("document-open")); browseButton->setFixedSize(browseButton->sizeHint()); TQToolTip::add(browseButton, i18n("Choose a file")); TQWhatsThis::add(browseButton, i18n("Select a log file.")); diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index f7dbc256f..cd1f95d57 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -111,7 +111,7 @@ MainWindow* displayMainWindowSelected(const TQString& eventID) */ TDEAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection* actions, const char* name) { - return new TDEAction(label, "filenew", TDEStdAccel::openNew(), receiver, slot, actions, name); + return new TDEAction(label, "document-new", TDEStdAccel::openNew(), receiver, slot, actions, name); } /****************************************************************************** diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 7487a8a2d..d07912165 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -330,9 +330,9 @@ void MainWindow::initActions() mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actions, "new"); mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); - mActionCopy = new TDEAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy"); + mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy"); mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotModify()), actions, "modify"); - mActionDelete = new TDEAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete"); + mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete"); mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReactivate()), actions, "undelete"); mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotEnable()), actions, "disable"); mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actions, "view"); @@ -673,7 +673,7 @@ void MainWindow::slotDelete() if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the selected alarm?", "Do you really want to delete the %n selected alarms?", n), i18n("Delete Alarm", "Delete Alarms", n), - KGuiItem(i18n("&Delete"), "editdelete"), + KGuiItem(i18n("&Delete"), "edit-delete"), Preferences::CONFIRM_ALARM_DELETION) != KMessageBox::Continue) return; diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index 22346afa0..f439d609d 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -960,7 +960,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mSoundFile = new TQLineEdit(box); mSoundFileLabel->setBuddy(mSoundFile); mSoundFileBrowse = new TQPushButton(box); - mSoundFileBrowse->setPixmap(SmallIcon("fileopen")); + mSoundFileBrowse->setPixmap(SmallIcon("document-open")); mSoundFileBrowse->setFixedSize(mSoundFileBrowse->sizeHint()); connect(mSoundFileBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowseSoundFile())); TQToolTip::add(mSoundFileBrowse, i18n("Choose a sound file")); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index a63c4df86..6cd2301aa 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -97,7 +97,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad // File browse button mFileBrowseButton = new PushButton(box); - mFileBrowseButton->setPixmap(SmallIcon("fileopen")); + mFileBrowseButton->setPixmap(SmallIcon("document-open")); mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint()); connect(mFileBrowseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); TQToolTip::add(mFileBrowseButton, i18n("Choose a file")); diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index 8ee2ca387..3754487a2 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -187,7 +187,7 @@ void TemplateDlg::slotDelete() int n = items.count(); if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the selected alarm template?", "Do you really want to delete the %n selected alarm templates?", n), - i18n("Delete Alarm Template", "Delete Alarm Templates", n), KGuiItem(i18n("&Delete"), "editdelete")) + i18n("Delete Alarm Template", "Delete Alarm Templates", n), KGuiItem(i18n("&Delete"), "edit-delete")) != KMessageBox::Continue) return; diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 508375084..c929ba6ea 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -151,7 +151,7 @@ void karmPart::makeMenus() actionStopAll->setEnabled(false); actionNew = new TDEAction( i18n("&New..."), - TQString::fromLatin1("filenew"), CTRL+Key_N, + TQString::fromLatin1("document-new"), CTRL+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newTask() ), actionCollection(), "new_task"); @@ -161,7 +161,7 @@ void karmPart::makeMenus() TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new TDEAction( i18n("&Delete"), - TQString::fromLatin1("editdelete"), Key_Delete, + TQString::fromLatin1("edit-delete"), Key_Delete, TQT_TQOBJECT(_taskView), TQT_SLOT( deleteTask() ), actionCollection(), "delete_task"); diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index cbd122c67..aa321de31 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -289,7 +289,7 @@ void MainWindow::makeMenus() actionStopAll->setEnabled(false); actionNew = new TDEAction( i18n("&New..."), - TQString::fromLatin1("filenew"), CTRL+Key_N, + TQString::fromLatin1("document-new"), CTRL+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newTask() ), actionCollection(), "new_task"); @@ -299,7 +299,7 @@ void MainWindow::makeMenus() TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new TDEAction( i18n("&Delete"), - TQString::fromLatin1("editdelete"), Key_Delete, + TQString::fromLatin1("edit-delete"), Key_Delete, TQT_TQOBJECT(_taskView), TQT_SLOT( deleteTask() ), actionCollection(), "delete_task"); diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index 7a665608a..611c0a228 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -104,9 +104,9 @@ void MainWidget::initActions() { mActionSynchronize = new TDEAction( i18n("Synchronize"), "hotsync", 0, TQT_TQOBJECT(this), TQT_SLOT( sync() ), mGUIClient->actionCollection(), "sync" ); - mActionAddGroup = new TDEAction( i18n("Add Group..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ), + mActionAddGroup = new TDEAction( i18n("Add Group..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ), mGUIClient->actionCollection(), "add_group" ); - mActionDeleteGroup = new TDEAction( i18n("Delete Group..."), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( deleteGroup() ), + mActionDeleteGroup = new TDEAction( i18n("Delete Group..."), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT( deleteGroup() ), mGUIClient->actionCollection(), "delete_group" ); mActionEditGroup = new TDEAction( i18n("Edit Group..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( editGroup() ), mGUIClient->actionCollection(), "edit_group" ); diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index ab1da8e47..4c451ffb2 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 e740e7491..0f92eab5e 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -453,7 +453,7 @@ void IdentityPage::slotRemoveIdentity() TQString msg = i18n("<qt>Do you really want to remove the identity named " "<b>%1</b>?</qt>").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 45c056eea..22d093aa6 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 def8002a0..9d18138a9 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 7863b01bd..c7ccdc330 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 29d62bda6..d9065f6dc 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 8aefbc585..b4c9842bd 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 bf6846613..e73b69a7d 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 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() ); diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 05307c960..200e77368 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 3c342172e..a5b20198d 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 32483b194..9694823f7 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 c08d21e22..e16b48846 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<SnippetGroup*>(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 df941516c..1e23a0071 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 ); diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 2fda2db1b..379a17cd4 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -104,7 +104,7 @@ void KMobile::setupActions() KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); - new TDEAction(i18n("&Add Device..."), "folder_new", 0, + new TDEAction(i18n("&Add Device..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "device_add"); new TDEAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ), "Delete", TQT_TQOBJECT(this), TQT_SLOT(removeDevice()), actionCollection(), "device_remove"); 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); diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 59380b56f..16f626436 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -104,14 +104,14 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // create the menu items for the note - not the editor... // rename, mail, print, save as, insert date, alarm, close, delete, new note - new TDEAction( i18n("New"), "filenew", 0, + new TDEAction( i18n("New"), "document-new", 0, TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); new TDEAction( i18n("Rename..."), "text", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" ); m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) ); - new TDEAction( i18n("Hide"), "fileclose" , Key_Escape, + new TDEAction( i18n("Hide"), "window-close" , Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "hide_note" ); new TDEAction( i18n("Delete"), "knotes_delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKill()), actionCollection(), "delete_note" ); @@ -125,7 +125,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" ); new TDEAction( i18n("Mail..."), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" ); - new TDEAction( i18n("Save As..."), "filesaveas", 0, + new TDEAction( i18n("Save As..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" ); KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection(), "print_note" ); new TDEAction( i18n("Preferences..."), "configure", 0, @@ -394,7 +394,7 @@ void KNote::slotKill( bool force ) if ( !force && KMessageBox::warningContinueCancel( this, i18n("<qt>Do you really want to delete note <b>%1</b>?</qt>").arg( m_label->text() ), - i18n("Confirm Delete"), KGuiItem( i18n("&Delete"), "editdelete" ), + i18n("Confirm Delete"), KGuiItem( i18n("&Delete"), "edit-delete" ), "ConfirmDeleteNote" ) != KMessageBox::Continue ) diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index fff0bebf1..87b5070a9 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -529,15 +529,15 @@ TQPopupMenu *KNoteEdit::createPopupMenu( const TQPoint &pos ) TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos ); if ( isReadOnly() ) - menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) ); + menu->changeItem( menu->idAt(0), SmallIconSet("edit-copy"), menu->text( menu->idAt(0) ) ); else { int id = menu->idAt(0); 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) ); - menu->changeItem( id - IdClear, SmallIconSet("editclear"), menu->text( id - IdClear) ); + menu->changeItem( id - IdCut, SmallIconSet("edit-cut"), menu->text( id - IdCut) ); + menu->changeItem( id - IdCopy, SmallIconSet("edit-copy"), menu->text( id - IdCopy) ); + menu->changeItem( id - IdPaste, SmallIconSet("edit-paste"), menu->text( id - IdPaste) ); + menu->changeItem( id - IdClear, SmallIconSet("edit-clear"), menu->text( id - IdClear) ); menu->insertSeparator(); id = menu->insertItem( SmallIconSet( "spellcheck" ), i18n( "Check Spelling..." ), diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 14fd625b9..5cc2635c2 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -111,13 +111,13 @@ KNotesApp::KNotesApp() KNote::setStyle( KNotesGlobalConfig::style() ); // create the GUI... - new TDEAction( i18n("New Note"), "filenew", 0, + new TDEAction( i18n("New Note"), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" ); - new TDEAction( i18n("New Note From Clipboard"), "editpaste", 0, + new TDEAction( i18n("New Note From Clipboard"), "edit-paste", 0, TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); new TDEAction( i18n("Show All Notes"), "knotes", 0, TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); - new TDEAction( i18n("Hide All Notes"), "fileclose", 0, + new TDEAction( i18n("Hide All Notes"), "window-close", 0, TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); new KHelpMenu( this, kapp->aboutData(), false, actionCollection() ); diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 7c3b456f5..02a4028e2 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -54,7 +54,7 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) actionCollection(), "file_new" ); new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ), actionCollection(), "edit_rename" ); - new TDEAction( i18n( "Delete" ), "editdelete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ), + new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ), actionCollection(), "edit_delete" ); new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ), actionCollection(), "print_note" ); diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 96957fb31..93b2c2dd2 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -270,7 +270,7 @@ void SummaryWidget::popupMenu( const TQString &uid ) TDEPopupMenu popup( this ); TQToolTip::remove( this ); popup.insertItem( i18n( "&Edit Appointment..." ), 0 ); - popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", TDEIcon::Small), + popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "edit-delete", TDEIcon::Small), i18n( "&Delete Appointment" ), 1 ); switch ( popup.exec( TQCursor::pos() ) ) { diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index c6c594611..255ee2ef1 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -227,7 +227,7 @@ void TodoSummaryWidget::popupMenu( const TQString &uid ) TDEPopupMenu popup( this ); TQToolTip::remove( this ); popup.insertItem( i18n( "&Edit To-do..." ), 0 ); - popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", TDEIcon::Small), + popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "edit-delete", TDEIcon::Small), i18n( "&Delete To-do" ), 1 ); KCal::Todo *todo = mCalendar->todo( uid ); if ( !todo->isCompleted() ) { diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 161614bfe..68aa0f9a2 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -309,7 +309,7 @@ void ActionManager::initActions() mUndoAction = KStdAction::undo( TQT_TQOBJECT(h), TQT_SLOT( undo() ), mACollection ); mRedoAction = KStdAction::redo( TQT_TQOBJECT(h), TQT_SLOT( redo() ), mACollection ); } - mDeleteAction = new TDEAction( i18n("&Delete"), "editdelete", 0, + mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( appointment_delete() ), mACollection, "edit_delete" ); if ( mIsPart ) { diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index d4d2e8b07..907603a99 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -902,7 +902,7 @@ int CalendarView::msgItemDelete( Incidence *incidence ) { return KMessageBox::warningContinueCancel(this, i18n("The item \"%1\" will be permanently deleted.").arg( incidence->summary() ), - i18n("KOrganizer Confirmation"), KGuiItem(i18n("&Delete"),"editdelete")); + i18n("KOrganizer Confirmation"), KGuiItem(i18n("&Delete"),"edit-delete")); } diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index cd44d9c8f..74f5a48cb 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -198,7 +198,7 @@ void FilterEdit::bDeletePressed() { if ( mFilters->count() <= 1 ) return; // We need at least a default filter object. int result = KMessageBox::warningContinueCancel( this, - i18n("This item will be permanently deleted."), i18n("Delete Confirmation"), KGuiItem(i18n("Delete"),"editdelete") ); + i18n("This item will be permanently deleted."), i18n("Delete Confirmation"), KGuiItem(i18n("Delete"),"edit-delete") ); if ( result != KMessageBox::Continue ) return; diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index f92ae338b..566719f30 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -211,7 +211,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : "entry" ) ); mDeleteButton = new TQToolButton( this, "deleteButton" ); - TQPixmap pix = KOGlobals::self()->smallIcon( "editdelete" ); + TQPixmap pix = KOGlobals::self()->smallIcon( "edit-delete" ); mDeleteButton->setPixmap( pix ); mDeleteButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") ); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 1c9bc93cb..5d95b81e7 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -519,7 +519,7 @@ void KODayMatrix::dropEvent( TQDropEvent *e ) if ( existingEvent || existingTodo ) { menu->insertItem( i18n("Move"), DRAG_MOVE, 0 ); if (existingEvent) - menu->insertItem( KOGlobals::self()->smallIcon("editcopy"), i18n("Copy"), DRAG_COPY, 1 ); + menu->insertItem( KOGlobals::self()->smallIcon("edit-copy"), i18n("Copy"), DRAG_COPY, 1 ); } else { menu->insertItem( i18n("Add"), DRAG_MOVE, 0 ); } diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 224c7bffb..4560d34f8 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -590,10 +590,10 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) } } if ( weCanCopy ) { - menu.insertItem( SmallIcon( "editcopy" ), i18n( "&Copy Here" ), DRAG_COPY, items++ ); + menu.insertItem( SmallIcon( "edit-copy" ), i18n( "&Copy Here" ), DRAG_COPY, items++ ); } } else { - menu.insertItem( SmallIcon( "editcopy" ), i18n( "&Copy Here" ), DRAG_COPY, items++ ); + menu.insertItem( SmallIcon( "edit-copy" ), i18n( "&Copy Here" ), DRAG_COPY, items++ ); } menu.insertSeparator(); diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index c31c54322..ef2dc5df9 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -390,7 +390,7 @@ int KOEventEditor::msgItemDelete() { return KMessageBox::warningContinueCancel(this, i18n("This item will be permanently deleted."), - i18n("KOrganizer Confirmation"),KGuiItem(i18n("Delete"),"editdelete")); + i18n("KOrganizer Confirmation"),KGuiItem(i18n("Delete"),"edit-delete")); } void KOEventEditor::loadTemplate( /*const*/ CalendarLocal& cal ) diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index ae4e4c20d..0eb2cb29a 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -60,16 +60,16 @@ KOEventPopupMenu::KOEventPopupMenu() //------------------------------------------------------------------------ mEditOnlyItems.append( insertSeparator() ); mEditOnlyItems.append( - insertItem( KOGlobals::self()->smallIcon("editcut"), i18n("&Cut"), + insertItem( KOGlobals::self()->smallIcon("edit-cut"), i18n("&Cut"), this, TQT_SLOT( popupCut() ) ) ); mEditOnlyItems.append( - insertItem( KOGlobals::self()->smallIcon("editcopy"), i18n("&Copy"), + insertItem( KOGlobals::self()->smallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT( popupCopy() ) ) ); // paste is always possible - insertItem( KOGlobals::self()->smallIcon("editpaste"), i18n("&Paste"), + insertItem( KOGlobals::self()->smallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT( popupPaste() ) ); mEditOnlyItems.append( - insertItem( KOGlobals::self()->smallIcon("editdelete"), i18n("&Delete"), + insertItem( KOGlobals::self()->smallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT( popupDelete() ) ) ); //------------------------------------------------------------------------ mEditOnlyItems.append( insertSeparator() ); diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp index b21146d09..fe16b470f 100644 --- a/korganizer/kojournaleditor.cpp +++ b/korganizer/kojournaleditor.cpp @@ -199,7 +199,7 @@ int KOJournalEditor::msgItemDelete() { return KMessageBox::warningContinueCancel( this, i18n("This journal entry will be permanently deleted."), - i18n("KOrganizer Confirmation"), KGuiItem( i18n("Delete"), "editdelete" )); + i18n("KOrganizer Confirmation"), KGuiItem( i18n("Delete"), "edit-delete" )); } void KOJournalEditor::modified() diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index c1e30eedd..60d22b441 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -458,7 +458,7 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name) #ifndef KORG_NOPRINTER mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer1"), i18n("&Print..."), this, TQT_SLOT( printTodo() ) ); #endif - mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("editdelete"), i18n("&Delete"), this, + mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("edit-delete"), i18n("&Delete"), this, TQT_SLOT (deleteTodo()), 0, ePopupDelete ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("New &To-do..."), this, diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index 1adefd207..e0bc1ab7e 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -165,7 +165,7 @@ void Exchange::remove() return; } - if ( KMessageBox::warningContinueCancel( 0L, i18n("Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete all instances!"), i18n("Exchange Plugin"), KGuiItem(i18n("&Delete"),"editdelete") ) + if ( KMessageBox::warningContinueCancel( 0L, i18n("Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete all instances!"), i18n("Exchange Plugin"), KGuiItem(i18n("&Delete"),"edit-delete") ) == KMessageBox::Continue ) { kdDebug(5850) << "Trying to delete appointment " << event->summary() << endl; int result = mClient->removeSynchronous( event ); diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index a689d47ba..35e6607da 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -97,7 +97,7 @@ void KTNEFMain::setupActions() new TDEAction( i18n( "Message Properties" ), "help", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" ); new TDEAction(i18n("Properties"), TQString("contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(propertiesFile()), actionCollection(), "properties_file"); new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" ); - new TDEAction( i18n( "Save Message Text As..." ), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" ); + new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" ); actionCollection()->action("view_file")->setEnabled(false); actionCollection()->action("view_file_as")->setEnabled(false); actionCollection()->action("extract_file")->setEnabled(false); diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index 24a3b7d34..3f06cd520 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -256,10 +256,10 @@ Core::createActions() this, TQT_SLOT(slotSendLater()), actionCollection(), "send_alternative" ); - (void) new TDEAction( i18n( "Save in &Drafts Folder" ), "filesave", 0, + (void) new TDEAction( i18n( "Save in &Drafts Folder" ), "document-save", 0, this, TQT_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts" ); - (void) new TDEAction( i18n( "&Insert File..." ), "fileopen", 0, + (void) new TDEAction( i18n( "&Insert File..." ), "document-open", 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "insert_file" ); (void) new TDEAction( i18n( "&Address Book" ), "contents",0, diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 628dcb717..7942e4ef9 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -626,7 +626,7 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, btnL = new TQHBoxLayout( topL, KDialog::spacingHint() ); editRule=0L; newRule = new TQPushButton(this); - newRule->setPixmap( BarIcon( "filenew", TDEIcon::SizeSmall ) ); + newRule->setPixmap( BarIcon( "document-new", TDEIcon::SizeSmall ) ); TQToolTip::add(newRule,i18n("New rule")), btnL->addWidget(newRule); connect(newRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewRule())); @@ -639,12 +639,12 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, connect(editRule,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEditRule())); } delRule = new TQPushButton(this); - delRule->setIconSet( BarIconSet( "editdelete", TDEIcon::SizeSmall ) ); + delRule->setIconSet( BarIconSet( "edit-delete", TDEIcon::SizeSmall ) ); TQToolTip::add(delRule,i18n("Remove rule")); btnL->addWidget(delRule); connect(delRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelRule())); copyRule = new TQPushButton(this); - copyRule->setIconSet(BarIconSet("editcopy", TDEIcon::SizeSmall)); + copyRule->setIconSet(BarIconSet("edit-copy", TDEIcon::SizeSmall)); TQToolTip::add(copyRule,i18n("Copy rule")); btnL->addWidget(copyRule); connect(copyRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyRule())); diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index 101579305..061ea781f 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -260,7 +260,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c pbClose->setAutoRaise(true); pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); pbClose->setFixedSize( 16, 16 ); - pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "fileclose", TDEIcon::Small, 14 ) ); + pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "window-close", TDEIcon::Small, 14 ) ); TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) ); connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); TQWidget* spacer = new TQWidget( rightBox ); // don't let the close button take up all the height |