From 8c226149dddfaa79c9420eddb80c583212f82dcb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 12 Oct 2014 17:51:45 -0500 Subject: [PATCH] Bring stop, lock, exit, and run icons into XDG compliance --- filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp | 4 ++-- filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp | 2 +- kdict/toplevel.cpp | 2 +- kpf/src/ActiveMonitorWindow.cpp | 2 +- kppp/logview/main.cpp | 2 +- kppp/miniterm.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 2b490c9e..2ba64931 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -161,7 +161,7 @@ TQPixmap ShareListViewItem::createPropertyPixmap() if (_share->getBoolValue("browseable")) { - p.drawPixmap(x,0,SmallIcon("run")); + p.drawPixmap(x,0,SmallIcon("system-run")); x = x+w+margin; } @@ -305,7 +305,7 @@ void KcmSambaConf::initAdvancedTab() icon = SmallIcon("folder"); else if (label == i18n("Locking")) - icon = SmallIcon("lock"); + icon = SmallIcon("system-lock-screen"); else if (label == i18n("Printing")) icon = SmallIcon("fileprint"); diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 56536018..161d704f 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -298,7 +298,7 @@ void ShareDlgImpl::initAdvancedTab() icon = SmallIcon("fileprint"); else if (label.lower() == "locking") - icon = SmallIcon("lock"); + icon = SmallIcon("system-lock-screen"); else if (label.lower() == "logon") icon = SmallIcon("tdmconfig"); diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 72b22980..3ab47b05 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -315,7 +315,7 @@ void TopLevel::setupActions() actPrint->setEnabled(false); actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , TQT_TQOBJECT(this), TQT_SLOT(doDefine()), actionCollection(), "start_query"); - actStopQuery = new TDEAction(i18n("St&op Query"),"stop", 0 , TQT_TQOBJECT(this), + actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , TQT_TQOBJECT(this), TQT_SLOT(stopClients()), actionCollection(), "stop_query"); actStopQuery->setEnabled(false); KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection()); diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp index 7695de80..b23af9bc 100644 --- a/kpf/src/ActiveMonitorWindow.cpp +++ b/kpf/src/ActiveMonitorWindow.cpp @@ -49,7 +49,7 @@ namespace KPF new TDEAction ( i18n("&Cancel Selected Transfers"), - "stop", + "process-stop", 0, TQT_TQOBJECT(monitor_), TQT_SLOT(slotKillSelected()), diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp index b282f64b..8633d46f 100644 --- a/kppp/logview/main.cpp +++ b/kppp/logview/main.cpp @@ -69,7 +69,7 @@ TopWidget::TopWidget() : TDEMainWindow(0, "") { // create menu mb = new KMenuBar(this); TQPopupMenu *fm = new TQPopupMenu; - fm->insertItem(SmallIcon("exit"),KStdGuiItem::quit().text(), F_EXIT); + fm->insertItem(SmallIcon("system-log-out"),KStdGuiItem::quit().text(), F_EXIT); mb->insertItem(i18n("&File"), fm); mb->setAccel(CTRL + Key_Q, F_EXIT); diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index 94d484cf..2f27f98f 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -102,7 +102,7 @@ MiniTerm::~MiniTerm() { void MiniTerm::setupToolbar() { toolbar = new TDEToolBar( this ); - toolbar->insertButton("exit", 0, + toolbar->insertButton("system-log-out", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(cancelbutton()), TRUE, i18n("Close MiniTerm"));