Branch: master

9768f943 2014-10-12 17:49:28 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
M tdenetworkmanager/src/tdenetman-tray.cpp
M tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
index e8fc06a..af8214b 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
@@ -70,7 +70,7 @@
 		}
 
 		if (net.isEncrypted()) {
-			setPixmap(2, TDEGlobal::iconLoader()->loadIcon("lock", TDEIcon::Small));
+			setPixmap(2, TDEGlobal::iconLoader()->loadIcon("system-lock-screen", TDEIcon::Small));
 		}
 
 		setText(3, TQString("%1").arg(net.getAPCount()));
diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
index de0e5de..14ea239 100644
--- a/tdenetworkmanager/src/tdenetman-tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
@@ -346,7 +346,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/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
index 561c6f6..09ccb36 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
@@ -127,7 +127,7 @@
 	p->drawText   (x, y, w, h, AlignLeft | AlignVCenter | DontClip | ShowPrefix, getDisplayText());
 
 	if (_net.isEncrypted()) {
-		TQPixmap pmLock = SmallIcon ("lock", h - (_border*2));
+		TQPixmap pmLock = SmallIcon ("system-lock-screen", h - (_border*2));
 		if (pmLock.size().height() != (h - (_border*2))) {
 			TQImage pmLockImg = pmLock.convertToImage();
 			pmLockImg = pmLockImg.smoothScale(65535, (h - (_border*2)), TQImage::ScaleMin);
1833d340 2014-10-12 17:55:13 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdenetworkmanager
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c