Branch: master

a40d4130 2014-10-12 17:48:23 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
M kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
M kmyfirewall/ipteditor/kmfruleedit.cpp
M kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
M kmyfirewall/kmfwidgets/kmflistview.cpp
M kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
M kmyfirewall/kmfwidgets/kmfprocout.cpp
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
index e3908b7..8f55091 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
@@ -485,7 +485,7 @@
 	icon_name = "target";
 	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
-	icon_name = "stop";
+	icon_name = "process-stop";
 	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
index 3c6830e..1d5948b 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
@@ -650,7 +650,7 @@
 	icon_name = "target";
 	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
-	icon_name = "stop";
+	icon_name = "process-stop";
 	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp
index 6006128..9ddd1ac 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.cpp
+++ b/kmyfirewall/ipteditor/kmfruleedit.cpp
@@ -1483,7 +1483,7 @@
 	icon_name = "target";
 	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
-	icon_name = "stop";
+	icon_name = "process-stop";
 	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
index 7fc9f1a..295e4f2 100644
--- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
+++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
@@ -91,7 +91,7 @@
 	TDEIconLoader *loader = TDEGlobal::iconLoader();
 	TQString icon_name;
 
-	icon_name = "stop";
+	icon_name = "process-stop";
 	icon_err = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp
index 51e8c12..22a87ae 100644
--- a/kmyfirewall/kmfwidgets/kmflistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistview.cpp
@@ -1107,7 +1107,7 @@
 	icon_name = "target";
 	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
-	icon_name = "stop";
+	icon_name = "process-stop";
 	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
index 15d176a..61097ab 100644
--- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
@@ -550,7 +550,7 @@
 	icon_name = "target";
 	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
-	icon_name = "stop";
+	icon_name = "process-stop";
 	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp
index a7d96f1..9f09bd8 100644
--- a/kmyfirewall/kmfwidgets/kmfprocout.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp
@@ -55,7 +55,7 @@
 	TDEIconLoader * loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
-	icon_name = "stop";
+	icon_name = "process-stop";
 	icon_stop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "quit";
3bf1d20b 2014-10-12 17:53:46 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kmyfirewall
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c