Browse Source

Bring undo, redo, find, and revert icons into XDG compliance

tags/r14.0.0
Timothy Pearson 4 years ago
parent
commit
235c081002

pics/crystalsvg/cr16-action-revert.png → pics/crystalsvg/cr16-action-document-revert.png View File


pics/crystalsvg/cr16-action-find.png → pics/crystalsvg/cr16-action-edit-find.png View File


pics/crystalsvg/cr16-action-redo.png → pics/crystalsvg/cr16-action-edit-redo.png View File


pics/crystalsvg/cr16-action-undo.png → pics/crystalsvg/cr16-action-edit-undo.png View File


pics/crystalsvg/cr22-action-revert.png → pics/crystalsvg/cr22-action-document-revert.png View File


pics/crystalsvg/cr22-action-find.png → pics/crystalsvg/cr22-action-edit-find.png View File


pics/crystalsvg/cr22-action-redo.png → pics/crystalsvg/cr22-action-edit-redo.png View File


pics/crystalsvg/cr22-action-undo.png → pics/crystalsvg/cr22-action-edit-undo.png View File


pics/crystalsvg/cr32-action-revert.png → pics/crystalsvg/cr32-action-document-revert.png View File


pics/crystalsvg/cr32-action-find.png → pics/crystalsvg/cr32-action-edit-find.png View File


pics/crystalsvg/cr32-action-redo.png → pics/crystalsvg/cr32-action-edit-redo.png View File


pics/crystalsvg/cr32-action-undo.png → pics/crystalsvg/cr32-action-edit-undo.png View File


+ 2
- 2
tdehtml/tdehtml_ext.cpp View File

@@ -465,7 +465,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
465 465
       {
466 466
         TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png");
467 467
         if ( iconPath.isEmpty() )
468
-          icon = SmallIcon("find");
468
+          icon = SmallIcon("edit-find");
469 469
         else
470 470
           icon = TQPixmap( iconPath );
471 471
         name = service->name();
@@ -502,7 +502,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
502 502
           {
503 503
             TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png");
504 504
             if ( iconPath.isEmpty() )
505
-              icon = SmallIcon("find");
505
+              icon = SmallIcon("edit-find");
506 506
             else
507 507
               icon = TQPixmap( iconPath );
508 508
             name = service->name();

+ 1
- 1
tdeparts/browserextension.cpp View File

@@ -483,7 +483,7 @@ void BrowserExtension::pasteRequest()
483 483
     {
484 484
         if ( KMessageBox::questionYesNo( m_part->widget(),
485 485
 		    i18n( "<qt>Do you want to search the Internet for <b>%1</b>?" ).arg( TQStyleSheet::escape(url) ),
486
-		    i18n( "Internet Search" ), KGuiItem( i18n( "&Search" ), "find"),
486
+		    i18n( "Internet Search" ), KGuiItem( i18n( "&Search" ), "edit-find"),
487 487
 		    KStdGuiItem::cancel(), "MiddleClickSearch" ) == KMessageBox::Yes)
488 488
           slotOpenURLRequest( filterData.uri(), KParts::URLArgs() );
489 489
     }

+ 1
- 1
tdeprint/management/kmjobviewer.cpp View File

@@ -262,7 +262,7 @@ void KMJobViewer::initActions()
262 262
 	TDEAction	*hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
263 263
 	TDEAction	*ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
264 264
 	TDEAction	*dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
265
-	TDEAction *sact = new TDEAction(i18n("Res&tart"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
265
+	TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
266 266
 	TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move");
267 267
 	mact->setDelayed(false);
268 268
 	connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));

+ 2
- 2
tdeui/kcommand.cpp View File

@@ -83,7 +83,7 @@ KCommandHistory::KCommandHistory(TDEActionCollection * actionCollection, bool wi
83 83
     d=new KCommandHistoryPrivate();
84 84
     if (withMenus)
85 85
     {
86
-        TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "undo",
86
+        TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo",
87 87
                                           TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQT_SLOT( undo() ),
88 88
                                           actionCollection, KStdAction::stdName( KStdAction::Undo ) );
89 89
         connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) );
@@ -91,7 +91,7 @@ KCommandHistory::KCommandHistory(TDEActionCollection * actionCollection, bool wi
91 91
         m_undo = undo;
92 92
         m_undoPopup = undo->popupMenu();
93 93
 
94
-        TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "redo",
94
+        TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo",
95 95
                                           TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQT_SLOT( redo() ),
96 96
                                           actionCollection, KStdAction::stdName( KStdAction::Redo ) );
97 97
         connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) );

+ 4
- 4
tdeui/keditcl2.cpp View File

@@ -698,7 +698,7 @@ public:
698 698
 
699 699
 KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal )
700 700
   :KDialogBase( parent, name, modal, i18n("Find"),
701
-		modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "find") )
701
+		modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "edit-find") )
702 702
 {
703 703
   setWFlags( WType_TopLevel );
704 704
 
@@ -830,7 +830,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal )
830 830
   :KDialogBase( parent, name, modal, i18n("Replace"),
831 831
 		modal ? User3|User2|User1|Cancel : User3|User2|User1|Close,
832 832
                 User3, false,
833
-		i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "find") )
833
+		i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "edit-find") )
834 834
 {
835 835
   setWFlags( WType_TopLevel );
836 836
 
@@ -1115,8 +1115,8 @@ TQPopupMenu *KEdit::createPopupMenu( const TQPoint& pos )
1115 1115
       menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) );
1116 1116
     else {
1117 1117
       int id = menu->idAt(0);
1118
-      menu->changeItem( id - IdUndo, SmallIconSet("undo"), menu->text( id - IdUndo) );
1119
-      menu->changeItem( id - IdRedo, SmallIconSet("redo"), menu->text( id - IdRedo) );
1118
+      menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) );
1119
+      menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) );
1120 1120
       menu->changeItem( id - IdCut, SmallIconSet("editcut"), menu->text( id - IdCut) );
1121 1121
       menu->changeItem( id - IdCopy, SmallIconSet("editcopy"), menu->text( id - IdCopy) );
1122 1122
       menu->changeItem( id - IdPaste, SmallIconSet("editpaste"), menu->text( id - IdPaste) );

+ 2
- 2
tdeui/klineedit.cpp View File

@@ -866,8 +866,8 @@ TQPopupMenu *KLineEdit::createPopupMenu()
866 866
     TQPopupMenu *popup = TQLineEdit::createPopupMenu();
867 867
 
868 868
       int id = popup->idAt(0);
869
-      popup->changeItem( id - IdUndo, SmallIconSet("undo"), popup->text( id - IdUndo) );
870
-      popup->changeItem( id - IdRedo, SmallIconSet("redo"), popup->text( id - IdRedo) );
869
+      popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) );
870
+      popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) );
871 871
       popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) );
872 872
       popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) );
873 873
       popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) );

+ 3
- 3
tdeui/kstdaction_p.h View File

@@ -49,8 +49,8 @@ static const KStdActionInfo g_rgActionInfo[] =
49 49
 	{ Mail,          TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail_send" },
50 50
 	{ Quit,          TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" },
51 51
 
52
-	{ Undo,          TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "undo" },
53
-	{ Redo,          TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "redo" },
52
+	{ Undo,          TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "edit-undo" },
53
+	{ Redo,          TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "edit-redo" },
54 54
 	{ Cut,           TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "editcut" },
55 55
 	{ Copy,          TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "editcopy" },
56 56
 	{ Paste,         TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" },
@@ -58,7 +58,7 @@ static const KStdActionInfo g_rgActionInfo[] =
58 58
 	{ Clear,         TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "editclear" },
59 59
 	{ SelectAll,     TDEStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 },
60 60
 	{ Deselect,      TDEStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 },
61
-	{ Find,          TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "find" },
61
+	{ Find,          TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "edit-find" },
62 62
 	{ FindNext,      TDEStdAccel::FindNext, "edit_find_next", I18N_NOOP("Find &Next"), 0, "go-next" },
63 63
 	// FIXME: rename edit_find_last to edit_find_prev for KDE 4
64 64
 	{ FindPrev,      TDEStdAccel::FindPrev, "edit_find_last", I18N_NOOP("Find Pre&vious"), 0, "go-previous" },

+ 2
- 2
tdeui/kstdguiitem.cpp View File

@@ -235,7 +235,7 @@ KGuiItem KStdGuiItem::quit()
235 235
 
236 236
 KGuiItem KStdGuiItem::reset()
237 237
 {
238
-  return KGuiItem( i18n( "&Reset" ), "undo",
238
+  return KGuiItem( i18n( "&Reset" ), "edit-undo",
239 239
                   i18n( "Reset configuration" ) );
240 240
 }
241 241
 
@@ -251,7 +251,7 @@ KGuiItem KStdGuiItem::configure()
251 251
 
252 252
 KGuiItem KStdGuiItem::find()
253 253
 {
254
-  return KGuiItem(i18n("&Find"), "find");
254
+  return KGuiItem(i18n("&Find"), "edit-find");
255 255
 }
256 256
 
257 257
 KGuiItem KStdGuiItem::stop()

+ 2
- 2
tdeui/ktextbrowser.cpp View File

@@ -128,8 +128,8 @@ TQPopupMenu *KTextBrowser::createPopupMenu( const TQPoint & pos )
128 128
       popup->changeItem( popup->idAt(0), SmallIconSet("editcopy"), popup->text( popup->idAt(0) ) );
129 129
     else {
130 130
       int id = popup->idAt(0);
131
-      popup->changeItem( id - IdUndo, SmallIconSet("undo"), popup->text( id - IdUndo) );
132
-      popup->changeItem( id - IdRedo, SmallIconSet("redo"), popup->text( id - IdRedo) );
131
+      popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) );
132
+      popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) );
133 133
       popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) );
134 134
       popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) );
135 135
       popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) );

+ 2
- 2
tdeui/ktextedit.cpp View File

@@ -220,8 +220,8 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos )
220 220
       menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) );
221 221
     else {
222 222
       int id = menu->idAt(0);
223
-      menu->changeItem( id - IdUndo, SmallIconSet("undo"), menu->text( id - IdUndo) );
224
-      menu->changeItem( id - IdRedo, SmallIconSet("redo"), menu->text( id - IdRedo) );
223
+      menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) );
224
+      menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) );
225 225
       menu->changeItem( id - IdCut, SmallIconSet("editcut"), menu->text( id - IdCut) );
226 226
       menu->changeItem( id - IdCopy, SmallIconSet("editcopy"), menu->text( id - IdCopy) );
227 227
       menu->changeItem( id - IdPaste, SmallIconSet("editpaste"), menu->text( id - IdPaste) );

+ 1
- 1
tdeutils/kfinddialog.cpp View File

@@ -237,7 +237,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha
237 237
     }
238 238
     else
239 239
     {
240
-      setButtonOK(KGuiItem( i18n("&Find"), "find",
240
+      setButtonOK(KGuiItem( i18n("&Find"), "edit-find",
241 241
                     i18n("Start searching"),
242 242
                     i18n("<qt>If you press the <b>Find</b> button, the text you entered "
243 243
                          "above is searched for within the document.</qt>")));

Loading…
Cancel
Save