Branch: master

4b4400a3 2014-10-12 17:48:17 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/kile/kile.cpp
M src/kile/kilestructurewidget.cpp
M src/kile/kileviewmanager.cpp
diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp
index e8fd0e0..8faacd7 100644
--- a/src/kile/kile.cpp
+++ b/src/kile/kile.cpp
@@ -558,7 +558,7 @@
 	(void) new TDEAction(i18n("Next LaTeX Warning"),"warnnext", 0, m_errorHandler, TQT_SLOT(NextWarning()), actionCollection(),"NextWarning" );
 	(void) new TDEAction(i18n("Previous LaTeX BadBox"),"bboxprev", 0, m_errorHandler, TQT_SLOT(PreviousBadBox()), actionCollection(),"PreviousBadBox" );
 	(void) new TDEAction(i18n("Next LaTeX BadBox"),"bboxnext", 0, m_errorHandler, TQT_SLOT(NextBadBox()), actionCollection(),"NextBadBox" );
-	m_paStop = new TDEAction(i18n("&Stop"),"stop",Key_Escape,0,0,actionCollection(),"Stop");
+	m_paStop = new TDEAction(i18n("&Stop"),"process-stop",Key_Escape,0,0,actionCollection(),"Stop");
 	m_paStop->setEnabled(false);
 
 	(void) new TDEAction(i18n("Editor View"),"edit",CTRL+Key_E , TQT_TQOBJECT(this), TQT_SLOT(showEditorWidget()), actionCollection(),"EditorView" );
diff --git a/src/kile/kilestructurewidget.cpp b/src/kile/kilestructurewidget.cpp
index 929c74d..dcf9340 100644
--- a/src/kile/kilestructurewidget.cpp
+++ b/src/kile/kilestructurewidget.cpp
@@ -336,7 +336,7 @@
 		else if ( folder == "refs" )
 		{
 			fldr->setText(0, i18n("Undefined References"));
-			fldr->setPixmap(0, SmallIcon("stop"));
+			fldr->setPixmap(0, SmallIcon("process-stop"));
 		}
 		else if ( folder == "todo" )
 		{
diff --git a/src/kile/kileviewmanager.cpp b/src/kile/kileviewmanager.cpp
index f37e838..bf1d55f 100644
--- a/src/kile/kileviewmanager.cpp
+++ b/src/kile/kileviewmanager.cpp
@@ -312,7 +312,7 @@
 	else if ( reason == 1 || reason == 2 ) //dirty file
 		icon = SmallIcon("revert");
 	else if ( reason == 3 ) //file deleted
-		icon = SmallIcon("stop");
+		icon = SmallIcon("process-stop");
 	else if ( m_ki->extensions()->isScriptFile(doc->url()) )
 		icon = SmallIcon("js");
 	else
8111282e 2014-10-12 17:53:36 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kile
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c