Branch: master

e12d7923 2014-10-12 17:52:19 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
A kxsldbg/kxsldbgpart/hi16-action-system-log-out.png
A kxsldbg/kxsldbgpart/hi16-action-system-run.png
A kxsldbg/kxsldbgpart/hi22-action-system-log-out.png
A kxsldbg/kxsldbgpart/hi22-action-system-run.png
M kommander/editor/mainwindowactions.cpp
M kxsldbg/kxsldbgpart/kxsldbg_part.cpp
M quanta/src/document.cpp
M quanta/src/quanta_init.cpp
M quanta/treeviews/scripttreeview.cpp
M tdefilereplace/tdefilereplacepart.cpp
R kxsldbg/kxsldbgpart/hi16-action-exit.png
R kxsldbg/kxsldbgpart/hi16-action-run.png
R kxsldbg/kxsldbgpart/hi22-action-exit.png
R kxsldbg/kxsldbgpart/hi22-action-run.png
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 80f490d..eb8fd6b 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -473,7 +473,7 @@
   TQPopupMenu *menu = new TQPopupMenu(this, "Run");
   menuBar()->insertItem(i18n("&Run"), menu);
 
-  TDEAction* a = new TDEAction(i18n("Run Dialog"), "run", CTRL + Key_R,
+  TDEAction* a = new TDEAction(i18n("Run Dialog"), "system-run", CTRL + Key_R,
                            TQT_TQOBJECT(this), TQT_SLOT(runForm()), actionCollection(), "run");
   a->setToolTip(i18n("Executes dialog"));
   a->setWhatsThis(whatsThisFrom("Run|Run dialog"));
diff --git a/kxsldbg/kxsldbgpart/hi16-action-exit.png b/kxsldbg/kxsldbgpart/hi16-action-exit.png
deleted file mode 100644
index 3ce5300..0000000
--- a/kxsldbg/kxsldbgpart/hi16-action-exit.png
+++ /dev/null
Binary files differ
diff --git a/kxsldbg/kxsldbgpart/hi16-action-run.png b/kxsldbg/kxsldbgpart/hi16-action-run.png
deleted file mode 100644
index 215fc6a..0000000
--- a/kxsldbg/kxsldbgpart/hi16-action-run.png
+++ /dev/null
Binary files differ
diff --git a/kxsldbg/kxsldbgpart/hi16-action-system-log-out.png b/kxsldbg/kxsldbgpart/hi16-action-system-log-out.png
new file mode 100644
index 0000000..3ce5300
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/hi16-action-system-log-out.png
Binary files differ
diff --git a/kxsldbg/kxsldbgpart/hi16-action-system-run.png b/kxsldbg/kxsldbgpart/hi16-action-system-run.png
new file mode 100644
index 0000000..215fc6a
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/hi16-action-system-run.png
Binary files differ
diff --git a/kxsldbg/kxsldbgpart/hi22-action-exit.png b/kxsldbg/kxsldbgpart/hi22-action-exit.png
deleted file mode 100644
index 119e5ef..0000000
--- a/kxsldbg/kxsldbgpart/hi22-action-exit.png
+++ /dev/null
Binary files differ
diff --git a/kxsldbg/kxsldbgpart/hi22-action-run.png b/kxsldbg/kxsldbgpart/hi22-action-run.png
deleted file mode 100644
index b5c8949..0000000
--- a/kxsldbg/kxsldbgpart/hi22-action-run.png
+++ /dev/null
Binary files differ
diff --git a/kxsldbg/kxsldbgpart/hi22-action-system-log-out.png b/kxsldbg/kxsldbgpart/hi22-action-system-log-out.png
new file mode 100644
index 0000000..119e5ef
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/hi22-action-system-log-out.png
Binary files differ
diff --git a/kxsldbg/kxsldbgpart/hi22-action-system-run.png b/kxsldbg/kxsldbgpart/hi22-action-system-run.png
new file mode 100644
index 0000000..b5c8949
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/hi22-action-system-run.png
Binary files differ
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index 870ff92..92c2171 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -123,7 +123,7 @@
 
     // Motions commands
     (void) new TDEAction( i18n("Run"),
-                        "run", Key_F5,
+                        "system-run", Key_F5,
                         this, TQT_SLOT(runCmd_activated()),
                         actionCollection(), "runCmd" );
 
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index a2f316e..c5530da 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -177,7 +177,7 @@
   KTextEditor::MarkInterfaceExtension* iface = dynamic_cast<KTextEditor::MarkInterfaceExtension*>(m_doc);
   if (iface)
   {
-    iface->setPixmap(KTextEditor::MarkInterface::markType07, SmallIcon("stop"));
+    iface->setPixmap(KTextEditor::MarkInterface::markType07, SmallIcon("process-stop"));
     iface->setPixmap(KTextEditor::MarkInterface::markType02, SmallIcon("debug_breakpoint"));
     iface->setDescription(KTextEditor::MarkInterface::markType02, i18n("Breakpoint"));
     iface->setPixmap(KTextEditor::MarkInterface::markType05, SmallIcon("debug_currentline"));
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 303bb87..31d4180 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -186,7 +186,7 @@
   addToolTreeView(ProjectTreeView::ref(), i18n("Project"), UserIcon("ptab"), KDockWidget::DockLeft);
   addToolTreeView(TemplatesTreeView::ref(), i18n("Templates"), UserIcon("ttab"), KDockWidget::DockLeft);
   addToolTreeView(StructTreeView::ref(), i18n("Document Structure"), BarIcon("view_sidetree"), KDockWidget::DockLeft);
-  addToolTreeView(m_quanta->scriptTab, i18n("Scripts"), BarIcon("run"), KDockWidget::DockLeft);
+  addToolTreeView(m_quanta->scriptTab, i18n("Scripts"), BarIcon("system-run"), KDockWidget::DockLeft);
   m_quanta->m_messageOutputView = addToolTreeView(m_quanta->m_messageOutput, i18n("Messages"), SmallIcon("openterm"), KDockWidget::DockBottom);
   m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom);
   m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom);
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index be80b95..6a4e02a 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -69,13 +69,13 @@
   url.setPath(qConfig.globalDataDir + resourceDir + "scripts/");
 
   BaseTreeBranch *m_globalDir;
-  m_globalDir = new BaseTreeBranch(this, url, i18n("Global Scripts"), SmallIcon("run"), true);
+  m_globalDir = new BaseTreeBranch(this, url, i18n("Global Scripts"), SmallIcon("system-run"), true);
   addBranch(m_globalDir);
 
   url.setPath(locateLocal("data", resourceDir + "scripts/"));
 
   BaseTreeBranch *m_localDir;
-  m_localDir = new BaseTreeBranch(this, url, i18n("Local Scripts"), SmallIcon("run"), true);
+  m_localDir = new BaseTreeBranch(this, url, i18n("Local Scripts"), SmallIcon("system-run"), true);
   addBranch(m_localDir);
 
   // here you define which files should not be visible for the users
@@ -85,7 +85,7 @@
 
   m_fileMenu = new TDEPopupMenu(this);
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Description"), this, TQT_SLOT(slotProperties()));
-  m_fileMenu->insertItem(SmallIcon("run"), i18n("&Run Script"), this, TQT_SLOT(slotRun()));
+  m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQT_SLOT(slotRun()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(i18n("&Edit Script"), this, TQT_SLOT(slotEditScript()));
   m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQT_SLOT(slotEditInQuanta()));
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index e196a15..d3b4e4c 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -571,7 +571,7 @@
   (void)new TDEAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search");
   (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
   (void)new TDEAction(i18n("&Replace"),  "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace");
-  (void)new TDEAction(i18n("Sto&p"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop");
+  (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop");
   (void)new TDEAction(i18n("Cre&ate Report File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results");
 
   // Strings
b4de4028 2014-10-12 17:57:12 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdewebdev
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c