d2ac3c61 | 2014-10-12 17:51:34 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
A pics/crystalsvg/cr16-action-process-stop.png A pics/crystalsvg/cr16-action-system-lock-screen.png A pics/crystalsvg/cr16-action-system-log-out.png A pics/crystalsvg/cr16-action-system-run.png A pics/crystalsvg/cr22-action-process-stop.png A pics/crystalsvg/cr22-action-system-lock-screen.png A pics/crystalsvg/cr22-action-system-log-out.png A pics/crystalsvg/cr22-action-system-run.png A pics/crystalsvg/cr32-action-process-stop.png A pics/crystalsvg/cr32-action-system-lock-screen.png A pics/crystalsvg/cr32-action-system-log-out.png A pics/crystalsvg/cr32-action-system-run.png A pics/crystalsvg/cr48-action-process-stop.png A pics/crystalsvg/cr48-action-system-lock-screen.png A pics/crystalsvg/cr48-action-system-log-out.png M tdehtml/ecma/kjs_debugwin.cpp M tdeparts/tests/example.cpp M tdeparts/tests/ghostview.cpp M tdeparts/tests/normalktm.cpp M tdeprint/cups/kmpropquota.cpp M tdeprint/kprintpreview.cpp M tdeprint/management/kmjobviewer.cpp M tdeprint/management/kmwsmb.cpp M tdeprint/management/networkscanner.cpp M tderandr/randr.cpp M tdeui/kstdguiitem.cpp M tdeui/tests/twindowtest.cpp R pics/crystalsvg/cr16-action-exit.png R pics/crystalsvg/cr16-action-lock.png R pics/crystalsvg/cr16-action-run.png R pics/crystalsvg/cr16-action-stop.png R pics/crystalsvg/cr22-action-exit.png R pics/crystalsvg/cr22-action-lock.png R pics/crystalsvg/cr22-action-run.png R pics/crystalsvg/cr22-action-stop.png R pics/crystalsvg/cr32-action-exit.png R pics/crystalsvg/cr32-action-lock.png R pics/crystalsvg/cr32-action-run.png R pics/crystalsvg/cr32-action-stop.png R pics/crystalsvg/cr48-action-exit.png R pics/crystalsvg/cr48-action-lock.png R pics/crystalsvg/cr48-action-stop.png |
||
diff --git a/pics/crystalsvg/cr16-action-exit.png b/pics/crystalsvg/cr16-action-exit.png deleted file mode 100644 index a77152b..0000000 --- a/pics/crystalsvg/cr16-action-exit.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr16-action-lock.png b/pics/crystalsvg/cr16-action-lock.png deleted file mode 100644 index 945a6eb..0000000 --- a/pics/crystalsvg/cr16-action-lock.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr16-action-process-stop.png b/pics/crystalsvg/cr16-action-process-stop.png new file mode 100644 index 0000000..4d84554 --- /dev/null +++ b/pics/crystalsvg/cr16-action-process-stop.png Binary files differ diff --git a/pics/crystalsvg/cr16-action-run.png b/pics/crystalsvg/cr16-action-run.png deleted file mode 100644 index 215fc6a..0000000 --- a/pics/crystalsvg/cr16-action-run.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr16-action-stop.png b/pics/crystalsvg/cr16-action-stop.png deleted file mode 100644 index 4d84554..0000000 --- a/pics/crystalsvg/cr16-action-stop.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr16-action-system-lock-screen.png b/pics/crystalsvg/cr16-action-system-lock-screen.png new file mode 100644 index 0000000..945a6eb --- /dev/null +++ b/pics/crystalsvg/cr16-action-system-lock-screen.png Binary files differ diff --git a/pics/crystalsvg/cr16-action-system-log-out.png b/pics/crystalsvg/cr16-action-system-log-out.png new file mode 100644 index 0000000..a77152b --- /dev/null +++ b/pics/crystalsvg/cr16-action-system-log-out.png Binary files differ diff --git a/pics/crystalsvg/cr16-action-system-run.png b/pics/crystalsvg/cr16-action-system-run.png new file mode 100644 index 0000000..215fc6a --- /dev/null +++ b/pics/crystalsvg/cr16-action-system-run.png Binary files differ diff --git a/pics/crystalsvg/cr22-action-exit.png b/pics/crystalsvg/cr22-action-exit.png deleted file mode 100644 index b266020..0000000 --- a/pics/crystalsvg/cr22-action-exit.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr22-action-lock.png b/pics/crystalsvg/cr22-action-lock.png deleted file mode 100644 index 7136b01..0000000 --- a/pics/crystalsvg/cr22-action-lock.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr22-action-process-stop.png b/pics/crystalsvg/cr22-action-process-stop.png new file mode 100644 index 0000000..73b27d9 --- /dev/null +++ b/pics/crystalsvg/cr22-action-process-stop.png Binary files differ diff --git a/pics/crystalsvg/cr22-action-run.png b/pics/crystalsvg/cr22-action-run.png deleted file mode 100644 index b5c8949..0000000 --- a/pics/crystalsvg/cr22-action-run.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr22-action-stop.png b/pics/crystalsvg/cr22-action-stop.png deleted file mode 100644 index 73b27d9..0000000 --- a/pics/crystalsvg/cr22-action-stop.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr22-action-system-lock-screen.png b/pics/crystalsvg/cr22-action-system-lock-screen.png new file mode 100644 index 0000000..7136b01 --- /dev/null +++ b/pics/crystalsvg/cr22-action-system-lock-screen.png Binary files differ diff --git a/pics/crystalsvg/cr22-action-system-log-out.png b/pics/crystalsvg/cr22-action-system-log-out.png new file mode 100644 index 0000000..b266020 --- /dev/null +++ b/pics/crystalsvg/cr22-action-system-log-out.png Binary files differ diff --git a/pics/crystalsvg/cr22-action-system-run.png b/pics/crystalsvg/cr22-action-system-run.png new file mode 100644 index 0000000..b5c8949 --- /dev/null +++ b/pics/crystalsvg/cr22-action-system-run.png Binary files differ diff --git a/pics/crystalsvg/cr32-action-exit.png b/pics/crystalsvg/cr32-action-exit.png deleted file mode 100644 index 7445887..0000000 --- a/pics/crystalsvg/cr32-action-exit.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr32-action-lock.png b/pics/crystalsvg/cr32-action-lock.png deleted file mode 100644 index d6c284a..0000000 --- a/pics/crystalsvg/cr32-action-lock.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr32-action-process-stop.png b/pics/crystalsvg/cr32-action-process-stop.png new file mode 100644 index 0000000..1e5a4e7 --- /dev/null +++ b/pics/crystalsvg/cr32-action-process-stop.png Binary files differ diff --git a/pics/crystalsvg/cr32-action-run.png b/pics/crystalsvg/cr32-action-run.png deleted file mode 100644 index 6d21477..0000000 --- a/pics/crystalsvg/cr32-action-run.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr32-action-stop.png b/pics/crystalsvg/cr32-action-stop.png deleted file mode 100644 index 1e5a4e7..0000000 --- a/pics/crystalsvg/cr32-action-stop.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr32-action-system-lock-screen.png b/pics/crystalsvg/cr32-action-system-lock-screen.png new file mode 100644 index 0000000..d6c284a --- /dev/null +++ b/pics/crystalsvg/cr32-action-system-lock-screen.png Binary files differ diff --git a/pics/crystalsvg/cr32-action-system-log-out.png b/pics/crystalsvg/cr32-action-system-log-out.png new file mode 100644 index 0000000..7445887 --- /dev/null +++ b/pics/crystalsvg/cr32-action-system-log-out.png Binary files differ diff --git a/pics/crystalsvg/cr32-action-system-run.png b/pics/crystalsvg/cr32-action-system-run.png new file mode 100644 index 0000000..6d21477 --- /dev/null +++ b/pics/crystalsvg/cr32-action-system-run.png Binary files differ diff --git a/pics/crystalsvg/cr48-action-exit.png b/pics/crystalsvg/cr48-action-exit.png deleted file mode 100644 index f1ca32a..0000000 --- a/pics/crystalsvg/cr48-action-exit.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr48-action-lock.png b/pics/crystalsvg/cr48-action-lock.png deleted file mode 100644 index 82afff9..0000000 --- a/pics/crystalsvg/cr48-action-lock.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr48-action-process-stop.png b/pics/crystalsvg/cr48-action-process-stop.png new file mode 100644 index 0000000..6576cd3 --- /dev/null +++ b/pics/crystalsvg/cr48-action-process-stop.png Binary files differ diff --git a/pics/crystalsvg/cr48-action-stop.png b/pics/crystalsvg/cr48-action-stop.png deleted file mode 100644 index 6576cd3..0000000 --- a/pics/crystalsvg/cr48-action-stop.png +++ /dev/null Binary files differ diff --git a/pics/crystalsvg/cr48-action-system-lock-screen.png b/pics/crystalsvg/cr48-action-system-lock-screen.png new file mode 100644 index 0000000..82afff9 --- /dev/null +++ b/pics/crystalsvg/cr48-action-system-lock-screen.png Binary files differ diff --git a/pics/crystalsvg/cr48-action-system-log-out.png b/pics/crystalsvg/cr48-action-system-log-out.png new file mode 100644 index 0000000..f1ca32a --- /dev/null +++ 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 b7bd23d..df2e24d 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -81,7 +81,7 @@ { 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 @@ 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 @@ 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 c8fb77b..fedf93e 100644 --- a/tdeparts/tests/example.cpp +++ b/tdeparts/tests/example.cpp @@ -41,7 +41,7 @@ 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 d83ec8f..c324708 100644 --- a/tdeparts/tests/ghostview.cpp +++ b/tdeparts/tests/ghostview.cpp @@ -23,7 +23,7 @@ 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 92e4625..3fe7f1a 100644 --- a/tdeparts/tests/normalktm.cpp +++ b/tdeparts/tests/normalktm.cpp @@ -44,7 +44,7 @@ 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 limit reached (max: 250 lines) ** |
||
659c2cd8 | 2014-10-12 17:56:55 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs |
||
M cmake M tdeinit/CMakeLists.txt |
||
** Diff limit reached (max: 250 lines) ** |