summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-12 17:51:34 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-12 17:51:34 -0500
commitd2ac3c618323d97084b0c1399ca28e6b41184de4 (patch)
tree2291ff8530e3eb87204c379d031207fe79f93639
parentaf586d3223f7971c614ff38d0a6969d3d2dfd715 (diff)
downloadtdelibs-d2ac3c618323d97084b0c1399ca28e6b41184de4.tar.gz
tdelibs-d2ac3c618323d97084b0c1399ca28e6b41184de4.zip
Bring stop, lock, exit, and run icons into XDG compliance
-rw-r--r--pics/crystalsvg/cr16-action-process-stop.png (renamed from pics/crystalsvg/cr16-action-stop.png)bin907 -> 907 bytes
-rw-r--r--pics/crystalsvg/cr16-action-system-lock-screen.png (renamed from pics/crystalsvg/cr16-action-lock.png)bin759 -> 759 bytes
-rw-r--r--pics/crystalsvg/cr16-action-system-log-out.png (renamed from pics/crystalsvg/cr16-action-exit.png)bin830 -> 830 bytes
-rw-r--r--pics/crystalsvg/cr16-action-system-run.png (renamed from pics/crystalsvg/cr16-action-run.png)bin1114 -> 1114 bytes
-rw-r--r--pics/crystalsvg/cr22-action-process-stop.png (renamed from pics/crystalsvg/cr22-action-stop.png)bin1330 -> 1330 bytes
-rw-r--r--pics/crystalsvg/cr22-action-system-lock-screen.png (renamed from pics/crystalsvg/cr22-action-lock.png)bin1134 -> 1134 bytes
-rw-r--r--pics/crystalsvg/cr22-action-system-log-out.png (renamed from pics/crystalsvg/cr22-action-exit.png)bin1221 -> 1221 bytes
-rw-r--r--pics/crystalsvg/cr22-action-system-run.png (renamed from pics/crystalsvg/cr22-action-run.png)bin1354 -> 1354 bytes
-rw-r--r--pics/crystalsvg/cr32-action-process-stop.png (renamed from pics/crystalsvg/cr32-action-stop.png)bin1630 -> 1630 bytes
-rw-r--r--pics/crystalsvg/cr32-action-system-lock-screen.png (renamed from pics/crystalsvg/cr32-action-lock.png)bin1630 -> 1630 bytes
-rw-r--r--pics/crystalsvg/cr32-action-system-log-out.png (renamed from pics/crystalsvg/cr32-action-exit.png)bin1915 -> 1915 bytes
-rw-r--r--pics/crystalsvg/cr32-action-system-run.png (renamed from pics/crystalsvg/cr32-action-run.png)bin2349 -> 2349 bytes
-rw-r--r--pics/crystalsvg/cr48-action-process-stop.png (renamed from pics/crystalsvg/cr48-action-stop.png)bin3507 -> 3507 bytes
-rw-r--r--pics/crystalsvg/cr48-action-system-lock-screen.png (renamed from pics/crystalsvg/cr48-action-lock.png)bin2735 -> 2735 bytes
-rw-r--r--pics/crystalsvg/cr48-action-system-log-out.png (renamed from pics/crystalsvg/cr48-action-exit.png)bin3110 -> 3110 bytes
-rw-r--r--tdehtml/ecma/kjs_debugwin.cpp6
-rw-r--r--tdeparts/tests/example.cpp2
-rw-r--r--tdeparts/tests/ghostview.cpp2
-rw-r--r--tdeparts/tests/normalktm.cpp2
-rw-r--r--tdeprint/cups/kmpropquota.cpp2
-rw-r--r--tdeprint/kprintpreview.cpp2
-rw-r--r--tdeprint/management/kmjobviewer.cpp4
-rw-r--r--tdeprint/management/kmwsmb.cpp2
-rw-r--r--tdeprint/management/networkscanner.cpp2
-rw-r--r--tderandr/randr.cpp2
-rw-r--r--tdeui/kstdguiitem.cpp4
-rw-r--r--tdeui/tests/twindowtest.cpp4
27 files changed, 17 insertions, 17 deletions
diff --git a/pics/crystalsvg/cr16-action-stop.png b/pics/crystalsvg/cr16-action-process-stop.png
index 4d84554de..4d84554de 100644
--- a/pics/crystalsvg/cr16-action-stop.png
+++ b/pics/crystalsvg/cr16-action-process-stop.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-lock.png b/pics/crystalsvg/cr16-action-system-lock-screen.png
index 945a6ebc8..945a6ebc8 100644
--- a/pics/crystalsvg/cr16-action-lock.png
+++ b/pics/crystalsvg/cr16-action-system-lock-screen.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-exit.png b/pics/crystalsvg/cr16-action-system-log-out.png
index a77152b5b..a77152b5b 100644
--- a/pics/crystalsvg/cr16-action-exit.png
+++ b/pics/crystalsvg/cr16-action-system-log-out.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-run.png b/pics/crystalsvg/cr16-action-system-run.png
index 215fc6aa9..215fc6aa9 100644
--- a/pics/crystalsvg/cr16-action-run.png
+++ b/pics/crystalsvg/cr16-action-system-run.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-stop.png b/pics/crystalsvg/cr22-action-process-stop.png
index 73b27d9fd..73b27d9fd 100644
--- a/pics/crystalsvg/cr22-action-stop.png
+++ b/pics/crystalsvg/cr22-action-process-stop.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-lock.png b/pics/crystalsvg/cr22-action-system-lock-screen.png
index 7136b01b9..7136b01b9 100644
--- a/pics/crystalsvg/cr22-action-lock.png
+++ b/pics/crystalsvg/cr22-action-system-lock-screen.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-exit.png b/pics/crystalsvg/cr22-action-system-log-out.png
index b266020f5..b266020f5 100644
--- a/pics/crystalsvg/cr22-action-exit.png
+++ b/pics/crystalsvg/cr22-action-system-log-out.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-run.png b/pics/crystalsvg/cr22-action-system-run.png
index b5c894955..b5c894955 100644
--- a/pics/crystalsvg/cr22-action-run.png
+++ b/pics/crystalsvg/cr22-action-system-run.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-stop.png b/pics/crystalsvg/cr32-action-process-stop.png
index 1e5a4e766..1e5a4e766 100644
--- a/pics/crystalsvg/cr32-action-stop.png
+++ b/pics/crystalsvg/cr32-action-process-stop.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-lock.png b/pics/crystalsvg/cr32-action-system-lock-screen.png
index d6c284ad0..d6c284ad0 100644
--- a/pics/crystalsvg/cr32-action-lock.png
+++ b/pics/crystalsvg/cr32-action-system-lock-screen.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-exit.png b/pics/crystalsvg/cr32-action-system-log-out.png
index 744588794..744588794 100644
--- a/pics/crystalsvg/cr32-action-exit.png
+++ b/pics/crystalsvg/cr32-action-system-log-out.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-run.png b/pics/crystalsvg/cr32-action-system-run.png
index 6d2147703..6d2147703 100644
--- a/pics/crystalsvg/cr32-action-run.png
+++ b/pics/crystalsvg/cr32-action-system-run.png
Binary files differ
diff --git a/pics/crystalsvg/cr48-action-stop.png b/pics/crystalsvg/cr48-action-process-stop.png
index 6576cd38d..6576cd38d 100644
--- a/pics/crystalsvg/cr48-action-stop.png
+++ b/pics/crystalsvg/cr48-action-process-stop.png
Binary files differ
diff --git a/pics/crystalsvg/cr48-action-lock.png b/pics/crystalsvg/cr48-action-system-lock-screen.png
index 82afff974..82afff974 100644
--- a/pics/crystalsvg/cr48-action-lock.png
+++ b/pics/crystalsvg/cr48-action-system-lock-screen.png
Binary files differ
diff --git a/pics/crystalsvg/cr48-action-exit.png b/pics/crystalsvg/cr48-action-system-log-out.png
index f1ca32a50..f1ca32a50 100644
--- a/pics/crystalsvg/cr48-action-exit.png
+++ b/pics/crystalsvg/cr48-action-system-log-out.png
Binary files differ
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index b7bd23de3..df2e24d37 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -81,7 +81,7 @@ SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char
{
verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height());
viewport()->setBackgroundMode(TQt::NoBackground);
- m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("stop",TDEIcon::Small);
+ m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("process-stop",TDEIcon::Small);
}
SourceDisplay::~SourceDisplay()
@@ -361,7 +361,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
m_execsAlloc = 0;
m_steppingDepth = 0;
- m_stopIcon = TDEGlobal::iconLoader()->loadIcon("stop",TDEIcon::Small);
+ m_stopIcon = TDEGlobal::iconLoader()->loadIcon("process-stop",TDEIcon::Small);
m_emptyIcon = TQPixmap(m_stopIcon.width(),m_stopIcon.height());
TQBitmap emptyMask(m_stopIcon.width(),m_stopIcon.height(),true);
m_emptyIcon.setMask(emptyMask);
@@ -454,7 +454,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
scCont.append(KKeySequence(KKey(Qt::Key_F9)));
m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
m_actionCollection,"cont");
- m_stopAction = new TDEAction(i18n("St&op"),"stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
+ m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
m_actionCollection,"stop");
m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
m_actionCollection,"breaknext");
diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp
index c8fb77b29..fedf93ee6 100644
--- a/tdeparts/tests/example.cpp
+++ b/tdeparts/tests/example.cpp
@@ -41,7 +41,7 @@ Shell::Shell()
m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" );
m_paCloseEditor->setEnabled(false);
TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" );
- paQuit->setIconSet(TQIconSet(BarIcon("exit")));
+ paQuit->setIconSet(TQIconSet(BarIcon("system-log-out")));
(void)new TDEAction( "Yet another menu item", 0, coll, "shell_yami" );
(void)new TDEAction( "Yet another submenu item", 0, coll, "shell_yasmi" );
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index d83ec8f41..c324708ff 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -23,7 +23,7 @@ Shell::Shell()
TDEAction * paOpen = new TDEAction( "&Open file" , "fileopen", 0, this,
TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" );
- TDEAction * paQuit = new TDEAction( "&Quit" , "exit", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );
+ TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );
// Try to find a postscript component first
TDETrader::OfferList offers = TDETrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)");
diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp
index 92e46254e..3fe7f1a7a 100644
--- a/tdeparts/tests/normalktm.cpp
+++ b/tdeparts/tests/normalktm.cpp
@@ -44,7 +44,7 @@ Shell::Shell()
m_paCloseEditor->plug( pFile );
TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" );
- paQuit->setIconSet(TQIconSet(BarIcon("exit")));
+ paQuit->setIconSet(TQIconSet(BarIcon("system-log-out")));
paQuit->plug( pFile );
setCentralWidget( m_splitter );
diff --git a/tdeprint/cups/kmpropquota.cpp b/tdeprint/cups/kmpropquota.cpp
index 773e667e9..24c74182b 100644
--- a/tdeprint/cups/kmpropquota.cpp
+++ b/tdeprint/cups/kmpropquota.cpp
@@ -56,7 +56,7 @@ KMPropQuota::KMPropQuota(TQWidget *parent, const char *name)
m_title = i18n("Quotas");
m_header = i18n("Quota Settings");
- m_pixmap = "lock";
+ m_pixmap = "system-lock-screen";
}
KMPropQuota::~KMPropQuota()
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index 623a7f934..0a385efbf 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -158,7 +158,7 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
else
{
new TDEAction(i18n("Print"), "fileprint", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
- new TDEAction(i18n("Cancel"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
+ new TDEAction(i18n("Cancel"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
}
}
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 98e9595f9..29ba01ce0 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -259,8 +259,8 @@ void KMJobViewer::init()
void KMJobViewer::initActions()
{
// job actions
- TDEAction *hact = new TDEAction(i18n("&Hold"),"stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
- TDEAction *ract = new TDEAction(i18n("&Resume"),"run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
+ 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");
TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move");
diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp
index 836a7fb15..44b2f493c 100644
--- a/tdeprint/management/kmwsmb.cpp
+++ b/tdeprint/management/kmwsmb.cpp
@@ -39,7 +39,7 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name)
m_view = new SmbView(this,"SmbView");
m_loginlabel = new TQLabel( this );
TQPushButton *m_scan = new KPushButton(KGuiItem(i18n("Scan"), "viewmag"), this);
- TQPushButton *m_abort = new KPushButton(KGuiItem(i18n("Abort"), "stop"), this);
+ TQPushButton *m_abort = new KPushButton(KGuiItem(i18n("Abort"), "process-stop"), this);
m_abort->setEnabled(false);
TQLabel *m_worklabel = new TQLabel(i18n("Workgroup:"), this);
TQLabel *m_serverlabel = new TQLabel(i18n("Server:"), this);
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index ee4e7dbc7..ec859dc63 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -146,7 +146,7 @@ void NetworkScanner::start()
d->printers.clear();
emit scanStarted();
d->settings->setEnabled( false );
- d->scan->setGuiItem( KGuiItem( i18n( "&Abort" ), "stop" ) );
+ d->scan->setGuiItem( KGuiItem( i18n( "&Abort" ), "process-stop" ) );
d->currentaddress = -1;
d->scanning = true;
next();
diff --git a/tderandr/randr.cpp b/tderandr/randr.cpp
index 59fd0e8ae..81b328918 100644
--- a/tderandr/randr.cpp
+++ b/tderandr/randr.cpp
@@ -413,7 +413,7 @@ KDE_EXPORT TQPixmap RandRScreen::rotationIcon(int rotation) const
case RR_Reflect_X:
case RR_Reflect_Y:
default:
- return SmallIcon("stop");
+ return SmallIcon("process-stop");
}
}
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index 80bf54bce..793d4d946 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -229,7 +229,7 @@ KGuiItem KStdGuiItem::open()
KGuiItem KStdGuiItem::quit()
{
- return KGuiItem( i18n( "&Quit" ), "exit",
+ return KGuiItem( i18n( "&Quit" ), "system-log-out",
i18n( "Quit application" ) );
}
@@ -256,7 +256,7 @@ KGuiItem KStdGuiItem::find()
KGuiItem KStdGuiItem::stop()
{
- return KGuiItem(i18n("Stop"), "stop");
+ return KGuiItem(i18n("Stop"), "process-stop");
}
KGuiItem KStdGuiItem::add()
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 77e01d289..2d60692dd 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -147,7 +147,7 @@ setAutoSaveSettings();
tb->setItemAutoSized (5);
// Now add another button and align it right
- pix = BarIcon("exit");
+ pix = BarIcon("system-log-out");
tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
TQT_SLOT( quit() ), true, "Exit");
tb->alignItemRight (6);
@@ -407,7 +407,7 @@ void testWindow::slotExit ()
else
{
TQPixmap pix;
- pix = BarIcon("exit");
+ pix = BarIcon("system-log-out");
tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
TQT_SLOT( quit() ), true, "Exit");
tb->alignItemRight (6);