| 57db10cf | 2014-10-12 17:50:11 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
|
M examples/systray.py M templates/annotated/systray.py M templates/annotated/systray1.py M templates/basic/systray.py M templates/basic/systray1.py |
||
diff --git a/examples/systray.py b/examples/systray.py
index 0eeb6b7..0da1961 100644
--- a/examples/systray.py
+++ b/examples/systray.py
@@ -45,7 +45,7 @@
icons = TDEIconLoader ()
systray = KSystemTray (mainWindow)
-systray.setPixmap (icons.loadIcon("stop", TDEIcon.Desktop))
+systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop))
systray.show ()
#mainWindow.show()
diff --git a/templates/annotated/systray.py b/templates/annotated/systray.py
index 1c3745c..1bb8849 100644
--- a/templates/annotated/systray.py
+++ b/templates/annotated/systray.py
@@ -70,7 +70,7 @@
# when clicked, so parent needs to be the main window
systray = KSystemTray (mainWindow)
-systray.setPixmap (icons.loadIcon("stop", TDEIcon.Desktop))
+systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop))
systray.connect (systray, SIGNAL ("quitSelected ()"), slotQuitSelected)
systray.show ()
diff --git a/templates/annotated/systray1.py b/templates/annotated/systray1.py
index d7d00ab..e25ffb6 100644
--- a/templates/annotated/systray1.py
+++ b/templates/annotated/systray1.py
@@ -57,7 +57,7 @@
# KSystemTray hides or shows its parent when the system tray icon is clicked
self.systray = KSystemTray (self)
- self.systray.setPixmap (icons.loadIcon("stop", TDEIcon.Desktop))
+ self.systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop))
self.systray.connect (self.systray, SIGNAL ("quitSelected ()"), self.slotQuitSelected)
self.systray.show ()
diff --git a/templates/basic/systray.py b/templates/basic/systray.py
index b4bb489..84f2e1a 100644
--- a/templates/basic/systray.py
+++ b/templates/basic/systray.py
@@ -51,7 +51,7 @@
systray = KSystemTray (mainWindow)
-systray.setPixmap (icons.loadIcon("stop", TDEIcon.Desktop))
+systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop))
systray.connect (systray, SIGNAL ("quitSelected ()"), slotQuitSelected)
systray.show ()
diff --git a/templates/basic/systray1.py b/templates/basic/systray1.py
index ac5e508..b6b9b05 100644
--- a/templates/basic/systray1.py
+++ b/templates/basic/systray1.py
@@ -42,7 +42,7 @@
icons = TDEIconLoader ()
self.systray = KSystemTray (self)
- self.systray.setPixmap (icons.loadIcon("stop", TDEIcon.Desktop))
+ self.systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop))
self.systray.connect (self.systray, SIGNAL ("quitSelected ()"), self.slotQuitSelected)
self.systray.show ()
|
||
| e53c7326 | 2014-10-12 17:56:14 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/python-trinity |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 0d5ca8b..08c6f54 160000 --- a/cmake +++ b/cmake -Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 +Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c |
||