diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 5e2cef175..7488fec05 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -525,7 +525,7 @@ TQPixmap KateDocument::configPagePixmap (uint number, int size) const return BarIcon("rightjust", size); case 5: - return BarIcon("filesave", size); + return BarIcon("document-save", size); case 6: return BarIcon("source", size); diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 821cb0faf..603d7dc3c 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -221,7 +221,7 @@ void KateView::setupActions() m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); - m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); + m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); if (!m_doc->readOnly()) @@ -889,7 +889,7 @@ bool KateView::checkOverwrite( KURL u ) ( this, i18n( "A file named \"%1\" already exists. Are you sure you want to overwrite it?" ).arg( info.fileName() ), i18n( "Overwrite File?" ), - KGuiItem( i18n( "&Overwrite" ), "filesave", i18n( "Overwrite the file" ) ) + KGuiItem( i18n( "&Overwrite" ), "document-save", i18n( "Overwrite the file" ) ) ); } diff --git a/pics/crystalsvg/cr128-action-fileopen.png b/pics/crystalsvg/cr128-action-document-open.png similarity index 100% rename from pics/crystalsvg/cr128-action-fileopen.png rename to pics/crystalsvg/cr128-action-document-open.png diff --git a/pics/crystalsvg/cr16-action-filenew.png b/pics/crystalsvg/cr16-action-document-new.png similarity index 100% rename from pics/crystalsvg/cr16-action-filenew.png rename to pics/crystalsvg/cr16-action-document-new.png diff --git a/pics/crystalsvg/cr16-action-fileopen.png b/pics/crystalsvg/cr16-action-document-open.png similarity index 100% rename from pics/crystalsvg/cr16-action-fileopen.png rename to pics/crystalsvg/cr16-action-document-open.png diff --git a/pics/crystalsvg/cr16-action-filequickprint.png b/pics/crystalsvg/cr16-action-document-print-preview.png similarity index 100% rename from pics/crystalsvg/cr16-action-filequickprint.png rename to pics/crystalsvg/cr16-action-document-print-preview.png diff --git a/pics/crystalsvg/cr16-action-fileprint.png b/pics/crystalsvg/cr16-action-document-print.png similarity index 100% rename from pics/crystalsvg/cr16-action-fileprint.png rename to pics/crystalsvg/cr16-action-document-print.png diff --git a/pics/crystalsvg/cr16-action-filesaveas.png b/pics/crystalsvg/cr16-action-document-save.png similarity index 100% rename from pics/crystalsvg/cr16-action-filesaveas.png rename to pics/crystalsvg/cr16-action-document-save.png diff --git a/pics/crystalsvg/cr16-action-editclear.png b/pics/crystalsvg/cr16-action-edit-clear.png similarity index 100% rename from pics/crystalsvg/cr16-action-editclear.png rename to pics/crystalsvg/cr16-action-edit-clear.png diff --git a/pics/crystalsvg/cr16-action-editcopy.png b/pics/crystalsvg/cr16-action-edit-copy.png similarity index 100% rename from pics/crystalsvg/cr16-action-editcopy.png rename to pics/crystalsvg/cr16-action-edit-copy.png diff --git a/pics/crystalsvg/cr16-action-editcut.png b/pics/crystalsvg/cr16-action-edit-cut.png similarity index 100% rename from pics/crystalsvg/cr16-action-editcut.png rename to pics/crystalsvg/cr16-action-edit-cut.png diff --git a/pics/crystalsvg/cr16-action-editdelete.png b/pics/crystalsvg/cr16-action-edit-delete.png similarity index 100% rename from pics/crystalsvg/cr16-action-editdelete.png rename to pics/crystalsvg/cr16-action-edit-delete.png diff --git a/pics/crystalsvg/cr16-action-editpaste.png b/pics/crystalsvg/cr16-action-edit-paste.png similarity index 100% rename from pics/crystalsvg/cr16-action-editpaste.png rename to pics/crystalsvg/cr16-action-edit-paste.png diff --git a/pics/crystalsvg/cr16-action-folder_new.png b/pics/crystalsvg/cr16-action-folder-new.png similarity index 100% rename from pics/crystalsvg/cr16-action-folder_new.png rename to pics/crystalsvg/cr16-action-folder-new.png diff --git a/pics/crystalsvg/cr16-action-gohome.png b/pics/crystalsvg/cr16-action-go-home.png similarity index 100% rename from pics/crystalsvg/cr16-action-gohome.png rename to pics/crystalsvg/cr16-action-go-home.png diff --git a/pics/crystalsvg/cr16-action-fileclose.png b/pics/crystalsvg/cr16-action-window-close.png similarity index 100% rename from pics/crystalsvg/cr16-action-fileclose.png rename to pics/crystalsvg/cr16-action-window-close.png diff --git a/pics/crystalsvg/cr22-action-filenew.png b/pics/crystalsvg/cr22-action-document-new.png similarity index 100% rename from pics/crystalsvg/cr22-action-filenew.png rename to pics/crystalsvg/cr22-action-document-new.png diff --git a/pics/crystalsvg/cr22-action-fileopen.png b/pics/crystalsvg/cr22-action-document-open.png similarity index 100% rename from pics/crystalsvg/cr22-action-fileopen.png rename to pics/crystalsvg/cr22-action-document-open.png diff --git a/pics/crystalsvg/cr22-action-filequickprint.png b/pics/crystalsvg/cr22-action-document-print-preview.png similarity index 100% rename from pics/crystalsvg/cr22-action-filequickprint.png rename to pics/crystalsvg/cr22-action-document-print-preview.png diff --git a/pics/crystalsvg/cr22-action-fileprint.png b/pics/crystalsvg/cr22-action-document-print.png similarity index 100% rename from pics/crystalsvg/cr22-action-fileprint.png rename to pics/crystalsvg/cr22-action-document-print.png diff --git a/pics/crystalsvg/cr22-action-filesaveas.png b/pics/crystalsvg/cr22-action-document-save.png similarity index 100% rename from pics/crystalsvg/cr22-action-filesaveas.png rename to pics/crystalsvg/cr22-action-document-save.png diff --git a/pics/crystalsvg/cr22-action-editclear.png b/pics/crystalsvg/cr22-action-edit-clear.png similarity index 100% rename from pics/crystalsvg/cr22-action-editclear.png rename to pics/crystalsvg/cr22-action-edit-clear.png diff --git a/pics/crystalsvg/cr22-action-editcopy.png b/pics/crystalsvg/cr22-action-edit-copy.png similarity index 100% rename from pics/crystalsvg/cr22-action-editcopy.png rename to pics/crystalsvg/cr22-action-edit-copy.png diff --git a/pics/crystalsvg/cr22-action-editcut.png b/pics/crystalsvg/cr22-action-edit-cut.png similarity index 100% rename from pics/crystalsvg/cr22-action-editcut.png rename to pics/crystalsvg/cr22-action-edit-cut.png diff --git a/pics/crystalsvg/cr22-action-editdelete.png b/pics/crystalsvg/cr22-action-edit-delete.png similarity index 100% rename from pics/crystalsvg/cr22-action-editdelete.png rename to pics/crystalsvg/cr22-action-edit-delete.png diff --git a/pics/crystalsvg/cr22-action-editpaste.png b/pics/crystalsvg/cr22-action-edit-paste.png similarity index 100% rename from pics/crystalsvg/cr22-action-editpaste.png rename to pics/crystalsvg/cr22-action-edit-paste.png diff --git a/pics/crystalsvg/cr22-action-folder_new.png b/pics/crystalsvg/cr22-action-folder-new.png similarity index 100% rename from pics/crystalsvg/cr22-action-folder_new.png rename to pics/crystalsvg/cr22-action-folder-new.png diff --git a/pics/crystalsvg/cr22-action-gohome.png b/pics/crystalsvg/cr22-action-go-home.png similarity index 100% rename from pics/crystalsvg/cr22-action-gohome.png rename to pics/crystalsvg/cr22-action-go-home.png diff --git a/pics/crystalsvg/cr22-action-fileclose.png b/pics/crystalsvg/cr22-action-window-close.png similarity index 100% rename from pics/crystalsvg/cr22-action-fileclose.png rename to pics/crystalsvg/cr22-action-window-close.png diff --git a/pics/crystalsvg/cr32-action-filenew.png b/pics/crystalsvg/cr32-action-document-new.png similarity index 100% rename from pics/crystalsvg/cr32-action-filenew.png rename to pics/crystalsvg/cr32-action-document-new.png diff --git a/pics/crystalsvg/cr32-action-fileopen.png b/pics/crystalsvg/cr32-action-document-open.png similarity index 100% rename from pics/crystalsvg/cr32-action-fileopen.png rename to pics/crystalsvg/cr32-action-document-open.png diff --git a/pics/crystalsvg/cr32-action-filequickprint.png b/pics/crystalsvg/cr32-action-document-print-preview.png similarity index 100% rename from pics/crystalsvg/cr32-action-filequickprint.png rename to pics/crystalsvg/cr32-action-document-print-preview.png diff --git a/pics/crystalsvg/cr32-action-fileprint.png b/pics/crystalsvg/cr32-action-document-print.png similarity index 100% rename from pics/crystalsvg/cr32-action-fileprint.png rename to pics/crystalsvg/cr32-action-document-print.png diff --git a/pics/crystalsvg/cr32-action-filesaveas.png b/pics/crystalsvg/cr32-action-document-save.png similarity index 100% rename from pics/crystalsvg/cr32-action-filesaveas.png rename to pics/crystalsvg/cr32-action-document-save.png diff --git a/pics/crystalsvg/cr32-action-editclear.png b/pics/crystalsvg/cr32-action-edit-clear.png similarity index 100% rename from pics/crystalsvg/cr32-action-editclear.png rename to pics/crystalsvg/cr32-action-edit-clear.png diff --git a/pics/crystalsvg/cr32-action-editcopy.png b/pics/crystalsvg/cr32-action-edit-copy.png similarity index 100% rename from pics/crystalsvg/cr32-action-editcopy.png rename to pics/crystalsvg/cr32-action-edit-copy.png diff --git a/pics/crystalsvg/cr32-action-editcut.png b/pics/crystalsvg/cr32-action-edit-cut.png similarity index 100% rename from pics/crystalsvg/cr32-action-editcut.png rename to pics/crystalsvg/cr32-action-edit-cut.png diff --git a/pics/crystalsvg/cr32-action-editdelete.png b/pics/crystalsvg/cr32-action-edit-delete.png similarity index 100% rename from pics/crystalsvg/cr32-action-editdelete.png rename to pics/crystalsvg/cr32-action-edit-delete.png diff --git a/pics/crystalsvg/cr32-action-editpaste.png b/pics/crystalsvg/cr32-action-edit-paste.png similarity index 100% rename from pics/crystalsvg/cr32-action-editpaste.png rename to pics/crystalsvg/cr32-action-edit-paste.png diff --git a/pics/crystalsvg/cr32-action-folder_new.png b/pics/crystalsvg/cr32-action-folder-new.png similarity index 100% rename from pics/crystalsvg/cr32-action-folder_new.png rename to pics/crystalsvg/cr32-action-folder-new.png diff --git a/pics/crystalsvg/cr32-action-gohome.png b/pics/crystalsvg/cr32-action-go-home.png similarity index 100% rename from pics/crystalsvg/cr32-action-gohome.png rename to pics/crystalsvg/cr32-action-go-home.png diff --git a/pics/crystalsvg/cr32-action-fileclose.png b/pics/crystalsvg/cr32-action-window-close.png similarity index 100% rename from pics/crystalsvg/cr32-action-fileclose.png rename to pics/crystalsvg/cr32-action-window-close.png diff --git a/pics/crystalsvg/cr48-action-filenew.png b/pics/crystalsvg/cr48-action-document-new.png similarity index 100% rename from pics/crystalsvg/cr48-action-filenew.png rename to pics/crystalsvg/cr48-action-document-new.png diff --git a/pics/crystalsvg/cr48-action-filequickprint.png b/pics/crystalsvg/cr48-action-document-print-preview.png similarity index 100% rename from pics/crystalsvg/cr48-action-filequickprint.png rename to pics/crystalsvg/cr48-action-document-print-preview.png diff --git a/pics/crystalsvg/cr48-action-fileprint.png b/pics/crystalsvg/cr48-action-document-print.png similarity index 100% rename from pics/crystalsvg/cr48-action-fileprint.png rename to pics/crystalsvg/cr48-action-document-print.png diff --git a/pics/crystalsvg/cr48-action-gohome.png b/pics/crystalsvg/cr48-action-go-home.png similarity index 100% rename from pics/crystalsvg/cr48-action-gohome.png rename to pics/crystalsvg/cr48-action-go-home.png diff --git a/pics/crystalsvg/cr48-action-fileclose.png b/pics/crystalsvg/cr48-action-window-close.png similarity index 100% rename from pics/crystalsvg/cr48-action-fileclose.png rename to pics/crystalsvg/cr48-action-window-close.png diff --git a/pics/crystalsvg/cr64-action-fileopen.png b/pics/crystalsvg/cr64-action-document-open.png similarity index 100% rename from pics/crystalsvg/cr64-action-fileopen.png rename to pics/crystalsvg/cr64-action-document-open.png diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h index a5dc3fcec..1b4fbe097 100644 --- a/tdecore/tdeapplication.h +++ b/tdecore/tdeapplication.h @@ -648,7 +648,7 @@ public slots: * If the widget with focus provides a clear() slot, call that slot. Thus for a * simple application clear() can be implemented as: * \code - * new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" ); + * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" ); * \endcode * * Note that for some widgets, this may not provide the intended bahavior. For diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index 7c70a3c99..b138e91e6 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -1088,7 +1088,7 @@ KJSErrorDlg *TDEHTMLPart::jsErrorExtension() { d->m_jsedlg->setURL(m_url.prettyURL()); if (TDEGlobalSettings::showIconsOnPushButtons()) { d->m_jsedlg->_clear->setIconSet(SmallIconSet("locationbar_erase")); - d->m_jsedlg->_close->setIconSet(SmallIconSet("fileclose")); + d->m_jsedlg->_close->setIconSet(SmallIconSet("window-close")); } } return d->m_jsedlg; diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp index bce2c4db0..bb8a948a7 100644 --- a/tdehtml/testtdehtml.cpp +++ b/tdehtml/testtdehtml.cpp @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" ); TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" ); kprint->setEnabled(true); - TDEToggleAction *ta = new TDEToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" ); + TDEToggleAction *ta = new TDEToggleAction( "Navigable", "edit-clear", 0, doc->actionCollection(), "navigable" ); ta->setChecked(doc->isCaretMode()); TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) )); ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" ); diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc index e1b00bc40..cbeadc413 100644 --- a/tdeio/bookmarks/kbookmarkmenu.cc +++ b/tdeio/bookmarks/kbookmarkmenu.cc @@ -276,7 +276,7 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address, id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("editdelete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); @@ -287,7 +287,7 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address, id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("editdelete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); @@ -541,7 +541,7 @@ void KBookmarkMenu::addNewFolder() title.remove( p, 1 ); TDEAction * paNewFolder = new TDEAction( title, - "folder_new", //"folder", + "folder-new", //"folder", 0, this, TQT_SLOT( slotNewFolder() ), @@ -828,7 +828,7 @@ KBookmarkEditDialog::KBookmarkEditDialog(const TQString& title, const TQString& { setButtonOK( (editType == InsertionMode) ? KGuiItem( i18n( "&Add" ), "bookmark_add") : i18n( "&Update" ) ); if (editType == InsertionMode) { - setButtonGuiItem( User1, KGuiItem( i18n( "&New Folder..." ), "folder_new") ); + setButtonGuiItem( User1, KGuiItem( i18n( "&New Folder..." ), "folder-new") ); } bool folder = url.isNull(); diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp index 62cbd1d43..5d73df4e6 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.cpp +++ b/tdeio/misc/tdewalletd/tdewalletd.cpp @@ -440,7 +440,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo kpd->setPrompt(i18n("The application '%1' has requested to open the wallet '%2'. Please enter the password for this wallet below.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet))); } brandNew = false; - kpd->setButtonOK(KGuiItem(i18n("&Open"),"fileopen")); + kpd->setButtonOK(KGuiItem(i18n("&Open"),"document-open")); } else { emptyPass = true; } @@ -454,7 +454,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo kpd->setPrompt(i18n("The application '%1' has requested to open the TDE wallet. This is used to store sensitive data in a secure fashion. Please enter a password to use with this wallet or click cancel to deny the application's request.").arg(TQStyleSheet::escape(appid))); } brandNew = true; - kpd->setButtonOK(KGuiItem(i18n("&Open"),"fileopen")); + kpd->setButtonOK(KGuiItem(i18n("&Open"),"document-open")); } else { kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0); if (appid.length() == 0) { @@ -463,7 +463,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo kpd->setPrompt(i18n("The application '%1' has requested to create a new wallet named '%2'. Please choose a password for this wallet, or cancel to deny the application's request.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet))); } brandNew = true; - kpd->setButtonOK(KGuiItem(i18n("C&reate"),"filenew")); + kpd->setButtonOK(KGuiItem(i18n("C&reate"),"document-new")); } if (kpd) { diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index c23628eae..c929028db 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -97,7 +97,7 @@ class UIServerSystemTray:public KSystemTray TDEPopupMenu* pop= contextMenu(); pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure())); pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); - setPixmap(loadIcon("filesave")); + setPixmap(loadIcon("document-save")); //actionCollection()->action("file_quit")->setEnabled(true); KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection()); } @@ -595,7 +595,7 @@ UIServer::UIServer() readSettings(); // setup toolbar - toolBar()->insertButton("editdelete", TOOL_CANCEL, + toolBar()->insertButton("edit-delete", TOOL_CANCEL, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); toolBar()->insertButton("configure", TOOL_CONFIGURE, diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp index 5027f631c..8087f206d 100644 --- a/tdeio/tdefile/kdirselectdialog.cpp +++ b/tdeio/tdefile/kdirselectdialog.cpp @@ -89,7 +89,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, bool modal) : KDialogBase( parent, name, modal, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, - KGuiItem( i18n("New Folder..."), "folder_new" ) ), + KGuiItem( i18n("New Folder..."), "folder-new" ) ), m_localOnly( localOnly ) { d = new KDirSelectDialogPrivate; @@ -122,7 +122,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, TQT_SLOT( slotComboTextChanged( const TQString& ) )); m_contextMenu = new TQPopupMenu( this ); - TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); + TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); newFolder->plug(m_contextMenu); m_contextMenu->insertSeparator(); m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this), diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp index e4f86fbed..64f5f4fb2 100644 --- a/tdeio/tdefile/kurlbar.cpp +++ b/tdeio/tdefile/kurlbar.cpp @@ -752,11 +752,11 @@ void KURLBar::slotContextMenuRequested( TQListBoxItem *_item, const TQPoint& pos popup->insertSeparator(); } - popup->insertItem(SmallIconSet("filenew"), i18n("&Add Entry..."), AddItem); + popup->insertItem(SmallIconSet("document-new"), i18n("&Add Entry..."), AddItem); if (item != 0L && item->isPersistent()) { - popup->insertItem( SmallIconSet("editdelete"), i18n("&Remove Entry"), + popup->insertItem( SmallIconSet("edit-delete"), i18n("&Remove Entry"), RemoveItem ); } diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp index 7ecfd543d..64e25b93c 100644 --- a/tdeio/tdefile/kurlrequester.cpp +++ b/tdeio/tdefile/kurlrequester.cpp @@ -206,7 +206,7 @@ void KURLRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KURLDragPushButton( this, "tdefile button"); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("document-open")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index dc44aa8ba..c7dc845cc 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -1271,9 +1271,9 @@ void KDirOperator::setupActions() TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - new TDEAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), + new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); - mkdirAction->setIcon( TQString::fromLatin1("folder_new") ); + mkdirAction->setIcon( TQString::fromLatin1("folder-new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload )); diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index 03bc17757..a004ae177 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -1838,7 +1838,7 @@ void KFileDialog::setOperationMode( OperationMode mode ) d->keepLocation = (mode == Saving); filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving ); if ( mode == Opening ) - d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "fileopen") ); + d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "document-open") ); else if ( mode == Saving ) { d->okButton->setGuiItem( KStdGuiItem::save() ); setNonExtSelection(); diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp index 5db9c5a0c..7198a3fd5 100644 --- a/tdeio/tdeio/defaultprogress.cpp +++ b/tdeio/tdeio/defaultprogress.cpp @@ -89,8 +89,8 @@ void DefaultProgress::init() #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS // Set a useful icon for this window! KWin::setIcons( winId(), - TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 32 ), - TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp index 0a317e5fe..954fdf20b 100644 --- a/tdemdi/tdemdichildfrm.cpp +++ b/tdemdi/tdemdichildfrm.cpp @@ -143,7 +143,7 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) ); TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) ); - m_pIconButtonPixmap = new TQPixmap( SmallIcon( "filenew" ) ); + m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) ); if ( m_pIconButtonPixmap->isNull() ) * m_pIconButtonPixmap = TQPixmap( filenew ); diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp index 0d3ace26c..c459e818e 100644 --- a/tdeparts/browserrun.cpp +++ b/tdeparts/browserrun.cpp @@ -350,7 +350,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ int choice = KMessageBox::questionYesNoCancel( 0L, question, url.host(), - KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "fileopen"), + KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "document-open"), TQString::fromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!! return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel ); // SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp index c324708ff..39af41a73 100644 --- a/tdeparts/tests/ghostview.cpp +++ b/tdeparts/tests/ghostview.cpp @@ -20,7 +20,7 @@ Shell::Shell() { setXMLFile( "ghostviewtest_shell.rc" ); - TDEAction * paOpen = new TDEAction( "&Open file" , "fileopen", 0, this, + TDEAction * paOpen = new TDEAction( "&Open file" , "document-open", 0, this, TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" ); diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp index 49fdecc7c..4fe84d769 100644 --- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -33,7 +33,7 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name) { setPageLabel(i18n("Jobs")); setHeader(i18n("Print Jobs Settings")); - setPixmap("fileprint"); + setPixmap("document-print"); keepjobhistory_ = new TQCheckBox(i18n("Preserve job history"), this); keepjobfiles_ = new TQCheckBox(i18n("Preserve job files"), this); diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp index 936dee212..2e0d523f0 100644 --- a/tdeprint/cups/cupsdconf2/editlist.cpp +++ b/tdeprint/cups/cupsdconf2/editlist.cpp @@ -30,9 +30,9 @@ EditList::EditList(TQWidget *parent, const char *name) : TQWidget(parent, name) { list_ = new TDEListBox(this); - addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "filenew"), this); + addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "document-new"), this); editbtn_ = new KPushButton(KGuiItem(i18n("Edit..."), "edit"), this); - delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "editdelete"), this); + delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "edit-delete"), this); defbtn_ = new KPushButton(KGuiItem(i18n("Default List"), "history"), this); TQGridLayout *m1 = new TQGridLayout(this, 4, 2, 0, 0); diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp index 25c984ec4..c3a6d50d2 100644 --- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -30,7 +30,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name) { edit_ = new TQLineEdit(this); button_ = new KPushButton(this); - button_->setPixmap(SmallIcon("fileopen")); + button_->setPixmap(SmallIcon("document-open")); connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked())); TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3); diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index 0992e2935..e6cade32e 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -37,10 +37,10 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*))); m_add = new TQPushButton(this); - m_add->setPixmap(SmallIcon("folder_new")); + m_add->setPixmap(SmallIcon("folder-new")); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); m_remove = new TQPushButton(this); - m_remove->setPixmap(SmallIcon("editdelete")); + m_remove->setPixmap(SmallIcon("edit-delete")); connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); m_remove->setEnabled(false); diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp index ed56804bc..63f0207dd 100644 --- a/tdeprint/cups/ippreportdlg.cpp +++ b/tdeprint/cups/ippreportdlg.cpp @@ -31,14 +31,14 @@ #include IppReportDlg::IppReportDlg(TQWidget *parent, const char *name) -: KDialogBase(parent, name, true, i18n("IPP Report"), Close|User1, Close, false, KGuiItem(i18n("&Print"), "fileprint")) +: KDialogBase(parent, name, true, i18n("IPP Report"), Close|User1, Close, false, KGuiItem(i18n("&Print"), "document-print")) { m_edit = new KTextEdit(this); m_edit->setReadOnly(true); setMainWidget(m_edit); resize(540, 500); setFocusProxy(m_edit); - setButtonGuiItem(User1, KGuiItem(i18n("&Print"),"fileprint")); + setButtonGuiItem(User1, KGuiItem(i18n("&Print"),"document-print")); } void IppReportDlg::slotUser1() diff --git a/tdeprint/cups/kmpropbanners.cpp b/tdeprint/cups/kmpropbanners.cpp index 602af7f6d..5abc4177d 100644 --- a/tdeprint/cups/kmpropbanners.cpp +++ b/tdeprint/cups/kmpropbanners.cpp @@ -48,7 +48,7 @@ KMPropBanners::KMPropBanners(TQWidget *parent, const char *name) m_title = i18n("Banners"); m_header = i18n("Banner Settings"); - m_pixmap = "editcopy"; + m_pixmap = "edit-copy"; } KMPropBanners::~KMPropBanners() diff --git a/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp index 1ce2f5625..2a73a07e5 100644 --- a/tdeprint/driveritem.cpp +++ b/tdeprint/driveritem.cpp @@ -28,7 +28,7 @@ DriverItem::DriverItem(TQListView *parent, DrBase *item) : TQListViewItem(parent), m_item(item), m_conflict(false) { setOpen(depth() < 3); - setPixmap(0,SmallIcon("fileprint")); + setPixmap(0,SmallIcon("document-print")); updateText(); } diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index f63dfd11b..9df774510 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -304,7 +304,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) d->m_wizard->setMinimumSize(TQSize(d->m_printers->minimumHeight(),d->m_printers->minimumHeight())); TQToolTip::add(d->m_wizard, i18n("Add printer...")); TQWhatsThis::add(d->m_wizard, whatsThisAddPrinterWizard); - d->m_ok = new KPushButton(KGuiItem(i18n("&Print"), "fileprint"), this); + d->m_ok = new KPushButton(KGuiItem(i18n("&Print"), "document-print"), this); TQWhatsThis::add( d->m_ok, whatsThisPrintButton); d->m_ok->setDefault(true); d->m_ok->setEnabled( false ); diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index 0a385efbf..d4de7925d 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -138,7 +138,7 @@ static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOn else { msg.append(" ").append(i18n("Do you want to continue printing anyway?")); - return (KMessageBox::warningContinueCancel(parent, msg, TQString::null, KGuiItem(i18n("Print"),"fileprint")) == KMessageBox::Continue); + return (KMessageBox::warningContinueCancel(parent, msg, TQString::null, KGuiItem(i18n("Print"),"document-print")) == KMessageBox::Continue); } } @@ -157,7 +157,7 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print"); else { - new TDEAction(i18n("Print"), "fileprint", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); + new TDEAction(i18n("Print"), "document-print", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); new TDEAction(i18n("Cancel"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print"); } @@ -319,7 +319,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId } else if (!previewOnly) { - return (KMessageBox::questionYesNo(parentW, i18n("Do you want to continue printing?"), TQString::null, KGuiItem(i18n("Print"),"fileprint"), KStdGuiItem::cancel(), "continuePrinting") == KMessageBox::Yes); + return (KMessageBox::questionYesNo(parentW, i18n("Do you want to continue printing?"), TQString::null, KGuiItem(i18n("Print"),"document-print"), KStdGuiItem::cancel(), "continuePrinting") == KMessageBox::Yes); } else return false; diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp index 9a8f9caa2..bf61919c3 100644 --- a/tdeprint/lpr/editentrydialog.cpp +++ b/tdeprint/lpr/editentrydialog.cpp @@ -75,7 +75,7 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c TQListViewItem *root = new TQListViewItem(m_view, entry->name), *item = 0; root->setSelectable(false); root->setOpen(true); - root->setPixmap(0, SmallIcon("fileprint")); + root->setPixmap(0, SmallIcon("document-print")); for (TQMap::ConstIterator it=m_fields.begin(); it!=m_fields.end(); ++it) item = new TQListViewItem(root, item, (*it).toString(), it.key()); } diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index e93c30276..4d9854774 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -57,7 +57,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) m_up = new KPushButton(KGuiItem(i18n("&Up"), "go-up"), box2); m_down = new KPushButton(KGuiItem(i18n("&Down"), "go-down"), box2); m_add = new KPushButton(KGuiItem(i18n("&Add"), "add"), box2); - m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "editdelete"), box2); + m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "edit-delete"), box2); TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); lab0->setBuddy(m_addpath); diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp index 635667cec..edf8902bf 100644 --- a/tdeprint/management/kmconfiggeneral.cpp +++ b/tdeprint/management/kmconfiggeneral.cpp @@ -43,7 +43,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) { setPageName(i18n("General")); setPageHeader(i18n("General Settings")); - setPagePixmap("fileprint"); + setPagePixmap("document-print"); TQGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this); m_timer = new KIntNumInput(m_timerbox,"Timer"); diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index 50297bdca..7223dbcd3 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -52,7 +52,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) m_raw = new TQCheckBox(i18n("&Raw printer (no driver needed)"),this); m_postscript->setCursor(KCursor::handCursor()); m_raw->setCursor(KCursor::handCursor()); - m_other = new KPushButton(KGuiItem(i18n("&Other..."), "fileopen"), this); + m_other = new KPushButton(KGuiItem(i18n("&Other..."), "document-open"), this); TQLabel *l1 = new TQLabel(i18n("&Manufacturer:"), this); TQLabel *l2 = new TQLabel(i18n("Mo&del:"), this); l1->setBuddy(m_manu); diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp index 0cadf3dba..09fe56867 100644 --- a/tdeprint/management/kminstancepage.cpp +++ b/tdeprint/management/kminstancepage.cpp @@ -84,14 +84,14 @@ void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, cons void KMInstancePage::initActions() { - addButton(i18n("New..."), "filenew", TQT_SLOT(slotNew())); - addButton(i18n("Copy..."), "editcopy", TQT_SLOT(slotCopy())); + addButton(i18n("New..."), "document-new", TQT_SLOT(slotNew())); + addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy())); addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove())); m_buttons.append(0); addButton(i18n("Set as Default"), "exec", TQT_SLOT(slotDefault())); addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings())); m_buttons.append(0); - addButton(i18n("Test..."), "fileprint", TQT_SLOT(slotTest())); + addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest())); } void KMInstancePage::setPrinter(KMPrinter *p) @@ -110,7 +110,7 @@ void KMInstancePage::setPrinter(KMPrinter *p) for (;it.current();++it) { TQStringList pair = TQStringList::split('/',it.current()->name(),false); - m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "fileprint")),(pair.count() > 1 ? pair[1] : i18n("(Default)"))); + m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "document-print")),(pair.count() > 1 ? pair[1] : i18n("(Default)"))); } m_view->sort(); } diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index b94a2a7ad..4153013d3 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -145,7 +145,7 @@ void KMJobViewer::updateCaption() if (!m_standalone) return; - TQString pixname("fileprint"); + TQString pixname("document-print"); if (!m_prname.isEmpty()) { setCaption(i18n("Print Jobs for %1").arg(m_prname)); @@ -263,7 +263,7 @@ void KMJobViewer::initActions() TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); - TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move"); + TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move"); mact->setDelayed(false); connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); @@ -353,7 +353,7 @@ void KMJobViewer::buildPrinterMenu(TQPopupMenu *menu, bool use_all, bool use_spe int i(0); if (use_all) { - menu->insertItem(SmallIcon("fileprint"), i18n("All Printers"), i++); + menu->insertItem(SmallIcon("document-print"), i18n("All Printers"), i++); menu->insertSeparator(); } for (; it.current(); ++it, i++) diff --git a/tdeprint/management/kmpages.cpp b/tdeprint/management/kmpages.cpp index d0c413966..f14a61667 100644 --- a/tdeprint/management/kmpages.cpp +++ b/tdeprint/management/kmpages.cpp @@ -66,7 +66,7 @@ void KMPages::initialize() // Instance page KMInstancePage *instpage = new KMInstancePage(this, "Instance"); - addTab(instpage, SmallIcon("fileprint"), i18n("Instances")); + addTab(instpage, SmallIcon("document-print"), i18n("Instances")); m_pages.append(instpage); // initialize pages diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp index 7c4c0173d..db6dc1486 100644 --- a/tdeprint/management/kmspecialprinterdlg.cpp +++ b/tdeprint/management/kmspecialprinterdlg.cpp @@ -89,7 +89,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) m_extensionlabel->setBuddy(m_extension); m_icon = new TDEIconButton(dummy); - m_icon->setIcon("fileprint"); + m_icon->setIcon("document-print"); m_icon->setFixedSize(TQSize(48,48)); connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) ); diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp index f6865a659..47ba4a2a7 100644 --- a/tdeprint/management/kxmlcommanddlg.cpp +++ b/tdeprint/management/kxmlcommanddlg.cpp @@ -95,7 +95,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam m_addopt = new TQToolButton(this); m_addopt->setIconSet(SmallIconSet("document")); m_delopt = new TQToolButton(this); - m_delopt->setIconSet(SmallIconSet("editdelete")); + m_delopt->setIconSet(SmallIconSet("edit-delete")); m_up = new TQToolButton(this); m_up->setIconSet(SmallIconSet("go-up")); m_down = new TQToolButton(this); @@ -144,9 +144,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam m_values->setSorting(-1); m_values->setMaximumHeight(110); m_addval = new TQToolButton(w2); - m_addval->setIconSet(SmallIconSet("editcopy")); + m_addval->setIconSet(SmallIconSet("edit-copy")); m_delval = new TQToolButton(w2); - m_delval->setIconSet(SmallIconSet("editdelete")); + m_delval->setIconSet(SmallIconSet("edit-delete")); TQToolTip::add(m_addval, i18n("Add value")); TQToolTip::add(m_delval, i18n("Delete value")); @@ -370,7 +370,7 @@ void KXmlCommandAdvancedDlg::parseXmlCommand(KXmlCommand *xmlcmd) TQListViewItem *root = new TQListViewItem(m_view, xmlcmd->name(), xmlcmd->name()); DrMain *driver = xmlcmd->driver(); - root->setPixmap(0, SmallIcon("fileprint")); + root->setPixmap(0, SmallIcon("document-print")); root->setOpen(true); if (driver) { @@ -845,9 +845,9 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) m_requirements->addColumn(""); m_requirements->header()->hide(); m_addreq = new TQToolButton(m_gb2); - m_addreq->setIconSet(SmallIconSet("filenew")); + m_addreq->setIconSet(SmallIconSet("document-new")); m_removereq = new TQToolButton(m_gb2); - m_removereq->setIconSet(SmallIconSet("editdelete")); + m_removereq->setIconSet(SmallIconSet("edit-delete")); TQPushButton *m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain); m_mimetype = new TQComboBox(dummy); m_availablemime = new TDEListBox(m_gb1); diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp index 08722cf6e..95f2b94a7 100644 --- a/tdeprint/management/kxmlcommandselector.cpp +++ b/tdeprint/management/kxmlcommandselector.cpp @@ -47,7 +47,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int))); TQPushButton *m_add = new KPushButton(this); TQPushButton *m_edit = new KPushButton(this); - m_add->setPixmap(SmallIcon("filenew")); + m_add->setPixmap(SmallIcon("document-new")); m_edit->setPixmap(SmallIcon("configure")); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand())); connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); @@ -69,7 +69,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const if (canBeNull) { m_line = new TQLineEdit(this); - m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "fileopen"), this); + m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "document-open"), this); m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this); connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool))); diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp index 607fab296..311950e02 100644 --- a/tdeprint/tdefilelist.cpp +++ b/tdeprint/tdefilelist.cpp @@ -110,7 +110,7 @@ KFileList::KFileList(TQWidget *parent, const char *name) connect(m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); m_add = new TQToolButton(this); - m_add->setIconSet(SmallIconSet("fileopen")); + m_add->setIconSet(SmallIconSet("document-open")); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFile())); TQToolTip::add(m_add, i18n("Add file")); TQWhatsThis::add(m_add, whatsThisAddFileButton); diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 9b7b6c955..754f67c3c 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -69,9 +69,9 @@ StatusWindow::StatusWindow(int pid) m_label->setAlignment(AlignCenter); m_button = new KPushButton(KStdGuiItem::close(), this); m_icon = new TQLabel(this); - m_icon->setPixmap(DesktopIcon("fileprint")); + m_icon->setPixmap(DesktopIcon("document-print")); m_icon->setAlignment(AlignCenter); - KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("fileprint")); + KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("document-print")); TQGridLayout *l0 = new TQGridLayout(this, 2, 3, 10, 10); l0->setRowStretch(0, 1); l0->setColStretch(1, 1); diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index d6d3d0f46..3b2b770ee 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -729,7 +729,7 @@ void KHistoryComboEditor::virtual_hook( int id, void* data ) KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget *parent ) : KDialogBase( parent, "khistorycomboeditor", true, i18n( "History Editor" ), KDialogBase::Close | KDialogBase::User1, KDialogBase::User1, true, - KGuiItem( i18n( "&Delete Entry" ), "editdelete") ), d(0) + KGuiItem( i18n( "&Delete Entry" ), "edit-delete") ), d(0) { TQVBox* box = new TQVBox( this ); box->setSpacing( KDialog::spacingHint() ); diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp index 4a3a22eeb..0c147e4b8 100644 --- a/tdeui/keditcl2.cpp +++ b/tdeui/keditcl2.cpp @@ -1112,15 +1112,15 @@ TQPopupMenu *KEdit::createPopupMenu( const TQPoint& pos ) TQPopupMenu *menu = TQMultiLineEdit::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) ); } return menu; diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index bfb575c79..1afca42ce 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -767,10 +767,10 @@ void KEditToolbarWidget::setupLayout() this, TQT_SLOT(slotToolbarSelected(const TQString&))); // TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this); -// new_toolbar->setPixmap(BarIcon("filenew", TDEIcon::SizeSmall)); +// new_toolbar->setPixmap(BarIcon("document-new", TDEIcon::SizeSmall)); // new_toolbar->setEnabled(false); // disabled until implemented // TQPushButton *del_toolbar = new TQPushButton(i18n("&Delete"), this); -// del_toolbar->setPixmap(BarIcon("editdelete", TDEIcon::SizeSmall)); +// del_toolbar->setPixmap(BarIcon("edit-delete", TDEIcon::SizeSmall)); // del_toolbar->setEnabled(false); // disabled until implemented // our list of inactive actions diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index f41ebd22c..92afc91fd 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -868,10 +868,10 @@ TQPopupMenu *KLineEdit::createPopupMenu() int id = popup->idAt(0); popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) ); popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) ); - popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) ); - popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) ); - popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) ); - popup->changeItem( id - IdClear, SmallIconSet("editclear"), popup->text( id - IdClear) ); + popup->changeItem( id - IdCut, SmallIconSet("edit-cut"), popup->text( id - IdCut) ); + popup->changeItem( id - IdCopy, SmallIconSet("edit-copy"), popup->text( id - IdCopy) ); + popup->changeItem( id - IdPaste, SmallIconSet("edit-paste"), popup->text( id - IdPaste) ); + popup->changeItem( id - IdClear, SmallIconSet("edit-clear"), popup->text( id - IdClear) ); // If a completion object is present and the input // widget is not read-only, show the Text Completion diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h index 31b80618c..db1199757 100644 --- a/tdeui/kstdaction.h +++ b/tdeui/kstdaction.h @@ -50,7 +50,7 @@ class TDEToggleFullScreenAction; * for regular actions. For example, if you previously had: * * \code - * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("filenew")), + * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("document-new")), * TDEStdAccel::shortcut(TDEStdAccel::New), this, * TQT_SLOT(fileNew()), actionCollection()); * \endcode diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h index 407d76fa1..f481f2e8b 100644 --- a/tdeui/kstdaction_p.h +++ b/tdeui/kstdaction_p.h @@ -37,25 +37,25 @@ struct KStdActionInfo static const KStdActionInfo g_rgActionInfo[] = { - { New, TDEStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "filenew" }, - { Open, TDEStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "fileopen" }, - { OpenRecent, TDEStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "fileopen" }, - { Save, TDEStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "filesave" }, - { SaveAs, TDEStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" }, + { New, TDEStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "document-new" }, + { Open, TDEStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "document-open" }, + { OpenRecent, TDEStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "document-open" }, + { Save, TDEStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "document-save" }, + { SaveAs, TDEStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "document-save-as" }, { Revert, TDEStdAccel::AccelNone, "file_revert", I18N_NOOP("Re&vert"), 0, "revert" }, - { Close, TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "fileclose" }, - { Print, TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "fileprint" }, - { PrintPreview, TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "filequickprint" }, + { Close, TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "window-close" }, + { Print, TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "document-print" }, + { PrintPreview, TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "document-print-preview" }, { Mail, TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail_send" }, { Quit, TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" }, { Undo, TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "edit-undo" }, { Redo, TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "edit-redo" }, - { Cut, TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "editcut" }, - { Copy, TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "editcopy" }, - { Paste, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" }, - { PasteText, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" }, - { Clear, TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "editclear" }, + { Cut, TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "edit-cut" }, + { Copy, TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "edit-copy" }, + { Paste, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "edit-paste" }, + { PasteText, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "edit-paste" }, + { Clear, TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "edit-clear" }, { SelectAll, TDEStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 }, { Deselect, TDEStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 }, { Find, TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "edit-find" }, @@ -78,7 +78,7 @@ static const KStdActionInfo g_rgActionInfo[] = // The following three have special i18n() needs for sLabel { Back, TDEStdAccel::Back, "go_back", 0, 0, "back" }, { Forward, TDEStdAccel::Forward, "go_forward", 0, 0, "forward" }, - { Home, TDEStdAccel::Home, "go_home", 0, 0, "gohome" }, + { Home, TDEStdAccel::Home, "go_home", 0, 0, "go-home" }, { Prior, TDEStdAccel::Prior, "go_previous", I18N_NOOP("&Previous Page"), 0, "back" }, { Next, TDEStdAccel::Next, "go_next", I18N_NOOP("&Next Page"), 0, "forward" }, { Goto, TDEStdAccel::AccelNone, "go_goto", I18N_NOOP("&Go To..."), 0, 0 }, diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp index db8c26b91..a763c4b6c 100644 --- a/tdeui/kstdguiitem.cpp +++ b/tdeui/kstdguiitem.cpp @@ -124,7 +124,7 @@ KGuiItem KStdGuiItem::discard() KGuiItem KStdGuiItem::save() { - return KGuiItem( i18n( "&Save" ), "filesave", i18n( "Save data" ) ); + return KGuiItem( i18n( "&Save" ), "document-save", i18n( "Save data" ) ); } KGuiItem KStdGuiItem::dontSave() @@ -135,7 +135,7 @@ KGuiItem KStdGuiItem::dontSave() KGuiItem KStdGuiItem::saveAs() { - return KGuiItem( i18n( "Save &As..." ), "filesaveas", + return KGuiItem( i18n( "Save &As..." ), "document-save-as", i18n( "Save file with another name" ) ); } @@ -171,7 +171,7 @@ KGuiItem KStdGuiItem::help() KGuiItem KStdGuiItem::close() { - return KGuiItem( i18n( "&Close" ), "fileclose", + return KGuiItem( i18n( "&Close" ), "window-close", i18n( "Close the current window or document" ) ); } @@ -204,7 +204,7 @@ TQPair KStdGuiItem::backAndForward() KGuiItem KStdGuiItem::print() { - return KGuiItem( i18n( "&Print..." ), "fileprint", + return KGuiItem( i18n( "&Print..." ), "document-print", i18n( "Opens the print dialog to print " "the current document" ) ); } @@ -217,13 +217,13 @@ KGuiItem KStdGuiItem::cont() KGuiItem KStdGuiItem::del() { - return KGuiItem( i18n( "&Delete" ), "editdelete", + return KGuiItem( i18n( "&Delete" ), "edit-delete", i18n( "Delete item(s)" ) ); } KGuiItem KStdGuiItem::open() { - return KGuiItem( i18n( "&Open..." ), "fileopen", + return KGuiItem( i18n( "&Open..." ), "document-open", i18n( "Open file" ) ); } diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index 911162f14..a49719519 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } mHoverCloseButton = new TQPushButton( this ); - mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, TDEIcon::SizeSmall) ); + mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("window-close", TDEIcon::Toolbar, TDEIcon::SizeSmall) ); mHoverCloseButton->setGeometry( rect ); TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); mHoverCloseButton->setFlat(true); diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index d8405bf7a..a0331ccf7 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -125,15 +125,15 @@ TQPopupMenu *KTextBrowser::createPopupMenu( const TQPoint & pos ) TQPopupMenu *popup = TQTextBrowser::createPopupMenu( pos ); if ( isReadOnly() ) - popup->changeItem( popup->idAt(0), SmallIconSet("editcopy"), popup->text( popup->idAt(0) ) ); + popup->changeItem( popup->idAt(0), SmallIconSet("edit-copy"), popup->text( popup->idAt(0) ) ); else { int id = popup->idAt(0); popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) ); popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) ); - popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) ); - popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) ); - popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) ); - popup->changeItem( id - IdClear, SmallIconSet("editclear"), popup->text( id - IdClear) ); + popup->changeItem( id - IdCut, SmallIconSet("edit-cut"), popup->text( id - IdCut) ); + popup->changeItem( id - IdCopy, SmallIconSet("edit-copy"), popup->text( id - IdCopy) ); + popup->changeItem( id - IdPaste, SmallIconSet("edit-paste"), popup->text( id - IdPaste) ); + popup->changeItem( id - IdClear, SmallIconSet("edit-clear"), popup->text( id - IdClear) ); } return popup; diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index 03cd006a4..74b9f30cd 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -217,15 +217,15 @@ TQPopupMenu *KTextEdit::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/tdeui/tdeaction.h b/tdeui/tdeaction.h index 5919c9641..cc803022f 100644 --- a/tdeui/tdeaction.h +++ b/tdeui/tdeaction.h @@ -133,7 +133,7 @@ class TDEMainWindow; * * Here is an example of enabling a "New [document]" action * \code - * TDEAction *newAct = new TDEAction(i18n("&New"), "filenew", + * TDEAction *newAct = new TDEAction(i18n("&New"), "document-new", * TDEStdAccel::shortcut(TDEStdAccel::New), * this, TQT_SLOT(fileNew()), * actionCollection(), "new"); diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp index 2d60692dd..f826f13b0 100644 --- a/tdeui/tests/twindowtest.cpp +++ b/tdeui/tests/twindowtest.cpp @@ -112,17 +112,17 @@ setAutoSaveSettings(); // First four buttons - pix = BarIcon("filenew"); + pix = BarIcon("document-new"); itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()), true, "Create.. (toggles upper button)", 50); - pix = BarIcon("fileopen"); + pix = BarIcon("document-open"); tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), false, "Open"); pix = BarIcon("filefloppy"); tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()), true, "Save (beep or delayed popup)"); tb->setDelayedPopup(2, itemsMenu); - pix = BarIcon("fileprint"); + pix = BarIcon("document-print"); tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()), true, "Print (enables/disables open)"); @@ -156,12 +156,12 @@ setAutoSaveSettings(); tb1 = new TDEToolBar(this, TQMainWindow::DockTop); // this one is normal and has separators - pix = BarIcon("filenew"); + pix = BarIcon("document-new"); tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)"); tb1->setToggle(0); tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool))); - pix = BarIcon("fileopen"); + pix = BarIcon("document-open"); tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), true, "Open (starts progres in sb)"); @@ -172,16 +172,16 @@ setAutoSaveSettings(); true, "Save file2 (autorepeat)"); tb1->setAutoRepeat(2); - pix = BarIcon("fileprint"); + pix = BarIcon("document-print"); tb1->insertButton(pix, 3, itemsMenu, true, "Print (pops menu)"); tb1->insertSeparator (); /**** RADIO BUTTONS */ - pix = BarIcon("filenew"); + pix = BarIcon("document-new"); tb1->insertButton(pix, 4, true, "Radiobutton1"); tb1->setToggle(4); - pix = BarIcon("fileopen"); + pix = BarIcon("document-open"); tb1->insertButton(pix, 5, true, "Radiobutton2"); tb1->setToggle(5); @@ -189,7 +189,7 @@ setAutoSaveSettings(); tb1->insertButton(pix, 6, true, "Radiobutton3"); tb1->setToggle(6); - pix = BarIcon("fileprint"); + pix = BarIcon("document-print"); tb1->insertButton(pix, 7, true, "Radiobutton4"); tb1->setToggle(7);