| 2166880f | 2014-10-13 12:51:18 | Timothy Pearson |
Bring undo, redo, find, and revert icons into XDG compliance |
||
|
M cervisia/logdlg.cpp M kbabel/commonui/finddialog.cpp M kbugbuster/gui/kbbmainwindow.cpp M tdecachegrind/tdecachegrind/callgraphview.cpp M tdecachegrind/tdecachegrind/callitem.cpp M tdecachegrind/tdecachegrind/instritem.cpp M tdecachegrind/tdecachegrind/sourceitem.cpp M tdecachegrind/tdecachegrind/toplevel.cpp M umbrello/umbrello/listpopupmenu.cpp |
||
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index e924672..e446b58 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -62,7 +62,7 @@
Ok | Apply | Close | Help | User1 | User2 | User3, Close, true,
KGuiItem(i18n("&Annotate")),
KGuiItem(i18n("&Diff"), "vcs_diff"),
- KGuiItem(i18n("&Find..."), "find"))
+ KGuiItem(i18n("&Find..."), "edit-find"))
, cvsService(0)
, partConfig(cfg)
{
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index b58cf7b..34b6368 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -99,7 +99,7 @@
}
else {
setCaption(i18n("Find"));
- setButtonOK(KGuiItem(i18n("&Find"),"find"));
+ setButtonOK(KGuiItem(i18n("&Find"),"edit-find"));
_replaceLabel=0;
_replaceCombo=0;
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index 8005d12..5f7fb3a 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -174,7 +174,7 @@
TQT_SLOT( searchBugNumber() ), actionCollection(), "search_bugnumber" );
// For now "Description" searches by title. Maybe later we can have a
// full-text search interfacing bugs.trinitydesktop.org and rename the current one to "By Title".
- new TDEAction( i18n("Search by &Description...") ,"find", CTRL+TQt::Key_D, TQT_TQOBJECT(this),
+ new TDEAction( i18n("Search by &Description...") ,"edit-find", CTRL+TQt::Key_D, TQT_TQOBJECT(this),
TQT_SLOT( searchDescription() ), actionCollection(), "search_description" );
// new TDEAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, TQT_TQOBJECT(m_mainWidget),
diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index 9f1df42..9a117e5 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -1148,7 +1148,7 @@
setPixmap(0, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true));
if (e->call() && (e->call()->isRecursion() || e->call()->inCycle())) {
- TQString icon = "undo";
+ TQString icon = "edit-undo";
TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader();
TQPixmap p= loader->loadIcon(icon, TDEIcon::Small, 0,
TDEIcon::DefaultState, 0, true);
diff --git a/tdecachegrind/tdecachegrind/callitem.cpp b/tdecachegrind/tdecachegrind/callitem.cpp
index 77bbc88..d40f1fe 100644
--- a/tdecachegrind/tdecachegrind/callitem.cpp
+++ b/tdecachegrind/tdecachegrind/callitem.cpp
@@ -145,7 +145,7 @@
TQPixmap p;
if (sameCycle && !selectedIsCycle && !shownIsCycle) {
- TQString icon = "undo";
+ TQString icon = "edit-undo";
TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader();
p= loader->loadIcon(icon, TDEIcon::Small, 0,
TDEIcon::DefaultState, 0, true);
diff --git a/tdecachegrind/tdecachegrind/instritem.cpp b/tdecachegrind/tdecachegrind/instritem.cpp
index 2b7258d..b07c665 100644
--- a/tdecachegrind/tdecachegrind/instritem.cpp
+++ b/tdecachegrind/tdecachegrind/instritem.cpp
@@ -177,7 +177,7 @@
TQString str;
TQPixmap p;
- TQString icon = "undo";
+ TQString icon = "edit-undo";
TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader();
p= loader->loadIcon(icon, TDEIcon::Small, 0,
TDEIcon::DefaultState, 0, true);
diff --git a/tdecachegrind/tdecachegrind/sourceitem.cpp b/tdecachegrind/tdecachegrind/sourceitem.cpp
index d6e1c1a..85713c1 100644
--- a/tdecachegrind/tdecachegrind/sourceitem.cpp
+++ b/tdecachegrind/tdecachegrind/sourceitem.cpp
@@ -161,7 +161,7 @@
TQString str;
TQPixmap p;
- TQString icon = "undo";
+ TQString icon = "edit-undo";
TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader();
p= loader->loadIcon(icon, TDEIcon::Small, 0,
TDEIcon::DefaultState, 0, true);
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index 3658aee..bcee063 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -528,7 +528,7 @@
action->setWhatsThis( hint );
- _taDump = new TDEToggleAction( i18n( "&Force Dump" ), "redo",
+ _taDump = new TDEToggleAction( i18n( "&Force Dump" ), "edit-redo",
#if TDE_VERSION > 0x030190
// for KDE 3.2: TDEStdAccel::key is deprecated
TDEStdAccel::shortcut(TDEStdAccel::Redo),
@@ -650,7 +650,7 @@
"<p>(*) Only if function grouping is switched on (e.g. ELF object grouping).");
_taExpanded->setWhatsThis( hint );
- _taCycles = new TDEToggleAction( i18n( "Do Cycle Detection" ), "undo",
+ _taCycles = new TDEToggleAction( i18n( "Do Cycle Detection" ), "edit-undo",
TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( toggleCycles() ), actionCollection(),
"view_cycles" );
diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 6279964..136627b 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -1329,8 +1329,8 @@
}
void ListPopupMenu::setupDiagramMenu(UMLView* view) {
- insertItem(SmallIcon("undo"), i18n("Undo"), mt_Undo);
- insertItem(SmallIcon("redo"), i18n("Redo"), mt_Redo);
+ insertItem(SmallIcon("edit-undo"), i18n("Undo"), mt_Undo);
+ insertItem(SmallIcon("edit-redo"), i18n("Redo"), mt_Redo);
insertSeparator();
insertStdItem(mt_Cut);
insertStdItem(mt_Copy);
|
||