diff --git a/pics/crystalsvg/cr16-action-revert.png b/pics/crystalsvg/cr16-action-document-revert.png similarity index 100% rename from pics/crystalsvg/cr16-action-revert.png rename to pics/crystalsvg/cr16-action-document-revert.png diff --git a/pics/crystalsvg/cr16-action-find.png b/pics/crystalsvg/cr16-action-edit-find.png similarity index 100% rename from pics/crystalsvg/cr16-action-find.png rename to pics/crystalsvg/cr16-action-edit-find.png diff --git a/pics/crystalsvg/cr16-action-redo.png b/pics/crystalsvg/cr16-action-edit-redo.png similarity index 100% rename from pics/crystalsvg/cr16-action-redo.png rename to pics/crystalsvg/cr16-action-edit-redo.png diff --git a/pics/crystalsvg/cr16-action-undo.png b/pics/crystalsvg/cr16-action-edit-undo.png similarity index 100% rename from pics/crystalsvg/cr16-action-undo.png rename to pics/crystalsvg/cr16-action-edit-undo.png diff --git a/pics/crystalsvg/cr22-action-revert.png b/pics/crystalsvg/cr22-action-document-revert.png similarity index 100% rename from pics/crystalsvg/cr22-action-revert.png rename to pics/crystalsvg/cr22-action-document-revert.png diff --git a/pics/crystalsvg/cr22-action-find.png b/pics/crystalsvg/cr22-action-edit-find.png similarity index 100% rename from pics/crystalsvg/cr22-action-find.png rename to pics/crystalsvg/cr22-action-edit-find.png diff --git a/pics/crystalsvg/cr22-action-redo.png b/pics/crystalsvg/cr22-action-edit-redo.png similarity index 100% rename from pics/crystalsvg/cr22-action-redo.png rename to pics/crystalsvg/cr22-action-edit-redo.png diff --git a/pics/crystalsvg/cr22-action-undo.png b/pics/crystalsvg/cr22-action-edit-undo.png similarity index 100% rename from pics/crystalsvg/cr22-action-undo.png rename to pics/crystalsvg/cr22-action-edit-undo.png diff --git a/pics/crystalsvg/cr32-action-revert.png b/pics/crystalsvg/cr32-action-document-revert.png similarity index 100% rename from pics/crystalsvg/cr32-action-revert.png rename to pics/crystalsvg/cr32-action-document-revert.png diff --git a/pics/crystalsvg/cr32-action-find.png b/pics/crystalsvg/cr32-action-edit-find.png similarity index 100% rename from pics/crystalsvg/cr32-action-find.png rename to pics/crystalsvg/cr32-action-edit-find.png diff --git a/pics/crystalsvg/cr32-action-redo.png b/pics/crystalsvg/cr32-action-edit-redo.png similarity index 100% rename from pics/crystalsvg/cr32-action-redo.png rename to pics/crystalsvg/cr32-action-edit-redo.png diff --git a/pics/crystalsvg/cr32-action-undo.png b/pics/crystalsvg/cr32-action-edit-undo.png similarity index 100% rename from pics/crystalsvg/cr32-action-undo.png rename to pics/crystalsvg/cr32-action-edit-undo.png diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index b7dfb8a42..0148d8aa6 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -465,7 +465,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri { TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); if ( iconPath.isEmpty() ) - icon = SmallIcon("find"); + icon = SmallIcon("edit-find"); else icon = TQPixmap( iconPath ); name = service->name(); @@ -502,7 +502,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri { TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); if ( iconPath.isEmpty() ) - icon = SmallIcon("find"); + icon = SmallIcon("edit-find"); else icon = TQPixmap( iconPath ); name = service->name(); diff --git a/tdeparts/browserextension.cpp b/tdeparts/browserextension.cpp index 85bfa4a94..ec31eea3e 100644 --- a/tdeparts/browserextension.cpp +++ b/tdeparts/browserextension.cpp @@ -483,7 +483,7 @@ void BrowserExtension::pasteRequest() { if ( KMessageBox::questionYesNo( m_part->widget(), i18n( "Do you want to search the Internet for %1?" ).arg( TQStyleSheet::escape(url) ), - i18n( "Internet Search" ), KGuiItem( i18n( "&Search" ), "find"), + i18n( "Internet Search" ), KGuiItem( i18n( "&Search" ), "edit-find"), KStdGuiItem::cancel(), "MiddleClickSearch" ) == KMessageBox::Yes) slotOpenURLRequest( filterData.uri(), KParts::URLArgs() ); } diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 29ba01ce0..b94a2a7ad 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -262,7 +262,7 @@ void KMJobViewer::initActions() TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold"); 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"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); + 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"); mact->setDelayed(false); connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); diff --git a/tdeui/kcommand.cpp b/tdeui/kcommand.cpp index 994d1262e..5357e557a 100644 --- a/tdeui/kcommand.cpp +++ b/tdeui/kcommand.cpp @@ -83,7 +83,7 @@ KCommandHistory::KCommandHistory(TDEActionCollection * actionCollection, bool wi d=new KCommandHistoryPrivate(); if (withMenus) { - TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "undo", + TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo", TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQT_SLOT( undo() ), actionCollection, KStdAction::stdName( KStdAction::Undo ) ); connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) ); @@ -91,7 +91,7 @@ KCommandHistory::KCommandHistory(TDEActionCollection * actionCollection, bool wi m_undo = undo; m_undoPopup = undo->popupMenu(); - TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "redo", + TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo", TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQT_SLOT( redo() ), actionCollection, KStdAction::stdName( KStdAction::Redo ) ); connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) ); diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp index 4749a471f..4a3a22eeb 100644 --- a/tdeui/keditcl2.cpp +++ b/tdeui/keditcl2.cpp @@ -698,7 +698,7 @@ public: KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal ) :KDialogBase( parent, name, modal, i18n("Find"), - modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "find") ) + modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "edit-find") ) { setWFlags( WType_TopLevel ); @@ -830,7 +830,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) :KDialogBase( parent, name, modal, i18n("Replace"), modal ? User3|User2|User1|Cancel : User3|User2|User1|Close, User3, false, - i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "find") ) + i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "edit-find") ) { setWFlags( WType_TopLevel ); @@ -1115,8 +1115,8 @@ TQPopupMenu *KEdit::createPopupMenu( const TQPoint& pos ) menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) ); else { int id = menu->idAt(0); - menu->changeItem( id - IdUndo, SmallIconSet("undo"), menu->text( id - IdUndo) ); - menu->changeItem( id - IdRedo, SmallIconSet("redo"), menu->text( id - IdRedo) ); + 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) ); diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index 588746ec1..f41ebd22c 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -866,8 +866,8 @@ TQPopupMenu *KLineEdit::createPopupMenu() TQPopupMenu *popup = TQLineEdit::createPopupMenu(); int id = popup->idAt(0); - popup->changeItem( id - IdUndo, SmallIconSet("undo"), popup->text( id - IdUndo) ); - popup->changeItem( id - IdRedo, SmallIconSet("redo"), popup->text( id - IdRedo) ); + 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) ); diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h index 6a119b2c8..407d76fa1 100644 --- a/tdeui/kstdaction_p.h +++ b/tdeui/kstdaction_p.h @@ -49,8 +49,8 @@ static const KStdActionInfo g_rgActionInfo[] = { 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, "undo" }, - { Redo, TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "redo" }, + { 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" }, @@ -58,7 +58,7 @@ static const KStdActionInfo g_rgActionInfo[] = { Clear, TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "editclear" }, { 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, "find" }, + { Find, TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "edit-find" }, { FindNext, TDEStdAccel::FindNext, "edit_find_next", I18N_NOOP("Find &Next"), 0, "go-next" }, // FIXME: rename edit_find_last to edit_find_prev for KDE 4 { FindPrev, TDEStdAccel::FindPrev, "edit_find_last", I18N_NOOP("Find Pre&vious"), 0, "go-previous" }, diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp index 793d4d946..db8c26b91 100644 --- a/tdeui/kstdguiitem.cpp +++ b/tdeui/kstdguiitem.cpp @@ -235,7 +235,7 @@ KGuiItem KStdGuiItem::quit() KGuiItem KStdGuiItem::reset() { - return KGuiItem( i18n( "&Reset" ), "undo", + return KGuiItem( i18n( "&Reset" ), "edit-undo", i18n( "Reset configuration" ) ); } @@ -251,7 +251,7 @@ KGuiItem KStdGuiItem::configure() KGuiItem KStdGuiItem::find() { - return KGuiItem(i18n("&Find"), "find"); + return KGuiItem(i18n("&Find"), "edit-find"); } KGuiItem KStdGuiItem::stop() diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index a4b716db7..d8405bf7a 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -128,8 +128,8 @@ TQPopupMenu *KTextBrowser::createPopupMenu( const TQPoint & pos ) popup->changeItem( popup->idAt(0), SmallIconSet("editcopy"), popup->text( popup->idAt(0) ) ); else { int id = popup->idAt(0); - popup->changeItem( id - IdUndo, SmallIconSet("undo"), popup->text( id - IdUndo) ); - popup->changeItem( id - IdRedo, SmallIconSet("redo"), popup->text( id - IdRedo) ); + 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) ); diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index 445540099..03cd006a4 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -220,8 +220,8 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos ) menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) ); else { int id = menu->idAt(0); - menu->changeItem( id - IdUndo, SmallIconSet("undo"), menu->text( id - IdUndo) ); - menu->changeItem( id - IdRedo, SmallIconSet("redo"), menu->text( id - IdRedo) ); + 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) ); diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp index 974e259b4..9937cd188 100644 --- a/tdeutils/kfinddialog.cpp +++ b/tdeutils/kfinddialog.cpp @@ -237,7 +237,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha } else { - setButtonOK(KGuiItem( i18n("&Find"), "find", + setButtonOK(KGuiItem( i18n("&Find"), "edit-find", i18n("Start searching"), i18n("If you press the Find button, the text you entered " "above is searched for within the document.")));