Branch: master

a89ae653 2014-10-12 17:48:30 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
M knetworkmanager-0.8/src/knetworkmanager-tray.cpp
M knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
index 3c62a1c..1df9763 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
@@ -67,7 +67,7 @@
 			setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_00", TDEIcon::Small));
 
 		if (net.isEncrypted())
-			setPixmap(2, TDEGlobal::iconLoader()->loadIcon("lock", TDEIcon::Small));
+			setPixmap(2, TDEGlobal::iconLoader()->loadIcon("system-lock-screen", TDEIcon::Small));
 	}
 
 	WirelessNetwork _net;
diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
index b88e5d9..15aa999 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
@@ -373,7 +373,7 @@
 	}
 	else
 	{
-		Subhead* subhead = new Subhead (menu, "subhead", i18n("NetworkManager is not running"), SmallIcon("stop", TQIconSet::Automatic));
+		Subhead* subhead = new Subhead (menu, "subhead", i18n("NetworkManager is not running"), SmallIcon("process-stop", TQIconSet::Automatic));
 		menu->insertItem (subhead, -1, -1);
 	}
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
index 36dd802..6b82e52 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
@@ -129,7 +129,7 @@
 	p->drawText   (x, y, w, h, AlignLeft | AlignVCenter | DontClip | ShowPrefix, getDisplayText());
 
 	if (_net.isEncrypted()) {
-		TQPixmap pmLock = SmallIcon ("lock", TQIconSet::Automatic);
+		TQPixmap pmLock = SmallIcon ("system-lock-screen", TQIconSet::Automatic);
 		p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space - pmLock.size ().width () - 6, y + _border, pmLock);
 		spacer = pmLock.size ().width () + 4;
 	}
c7aa3185 2014-10-12 17:53:56 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/knetworkmanager8
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c