Merge lp:~alphapapa/pithos/888778 into lp:~kevin-mehall/pithos/trunk

[Adam Porter]

Fixed lp:888778.

[lp:~alphapapa/pithos/888778]

183. By Adam Porter on 2011-12-19

Fixed so the bring_to_top() toggle will iconify if the notification icon is off, but hide if it's on.

184. By Adam Porter on 2011-12-19

Changed bring_to_top() to toggle_window() and added ToggleWindow DBUS method. Left Present method for backwards-compatibility with existing users. :)

185. By Adam Porter on 2011-12-20

Updated notification_icon plugin to use new main toggle_window() function.
Added separators in indicator icon menus; looks much better.
Fixed incorrect labels in indicator icon menus (on KDE, at least, they were using Gtk stock labels, e.g. "Jump to" instead of "Tired").
Turned off icons in indicator menu due to #627218. At least it's consistent this way. Also, the trend is moving away from icons in menus toward a cleaner look--Unity doesn't even allow them.

186. By Adam Porter on 2011-12-20

Removed dead line of code.

187. By Adam Porter on 2011-12-20

One more.

188. By Adam Porter on 2011-12-21

The libindicator icon doesn't work that well, at least on KDE. 1) It doesn't support the left-click event on KDE, 2) it doesn't show the right icons on KDE. And these bugs depend on libappindicator being updated--we're at their mercy. So I made a "status_icon" plugin that's just a copy of the notification_icon plugin without the libindicator code, so it only uses a Gtk status icon. And that shows the right icons on KDE and supports the left-click event, so a simple left click shows and hides the window. The preferences allow either or both to be enabled, so users can try both. I suppose a group enabled by a checkbox containing radio buttons might be more correct, but this is simple and works.

189. By Adam Porter on 2011-12-25

Fixed mediakeys.py to work with toggle_window().

190. By Adam Porter on 2011-12-25

Added exception handling.

191. By Adam Porter on 2011-12-25

Added comment, because keybinder.bind() doesn't raise an exception if it fails.

192. By Adam Porter on 2011-12-25

Added errors for failed keybindings.

Unmerged revisions

192. By Adam Porter on 2011-12-25

Added errors for failed keybindings.

191. By Adam Porter on 2011-12-25

Added comment, because keybinder.bind() doesn't raise an exception if it fails.

190. By Adam Porter on 2011-12-25

Added exception handling.

189. By Adam Porter on 2011-12-25

Fixed mediakeys.py to work with toggle_window().

188. By Adam Porter on 2011-12-21

The libindicator icon doesn't work that well, at least on KDE. 1) It doesn't support the left-click event on KDE, 2) it doesn't show the right icons on KDE. And these bugs depend on libappindicator being updated--we're at their mercy. So I made a "status_icon" plugin that's just a copy of the notification_icon plugin without the libindicator code, so it only uses a Gtk status icon. And that shows the right icons on KDE and supports the left-click event, so a simple left click shows and hides the window. The preferences allow either or both to be enabled, so users can try both. I suppose a group enabled by a checkbox containing radio buttons might be more correct, but this is simple and works.

187. By Adam Porter on 2011-12-20

One more.

186. By Adam Porter on 2011-12-20

Removed dead line of code.

185. By Adam Porter on 2011-12-20

Updated notification_icon plugin to use new main toggle_window() function.
Added separators in indicator icon menus; looks much better.
Fixed incorrect labels in indicator icon menus (on KDE, at least, they were using Gtk stock labels, e.g. "Jump to" instead of "Tired").
Turned off icons in indicator menu due to #627218. At least it's consistent this way. Also, the trend is moving away from icons in menus toward a cleaner look--Unity doesn't even allow them.

184. By Adam Porter on 2011-12-19

Changed bring_to_top() to toggle_window() and added ToggleWindow DBUS method. Left Present method for backwards-compatibility with existing users. :)

183. By Adam Porter on 2011-12-19

Fixed so the bring_to_top() toggle will iconify if the notification icon is off, but hide if it's on.

=== modified file 'bin/pithos'
--- bin/pithos	2011-12-15 00:15:02 +0000
+++ bin/pithos	2011-12-19 11:29:23 +0000
@@ -745,9 +745,12 @@
             self.stations_dlg = StationsDialog.NewStationsDialog(self)
             self.stations_dlg.show_all()
             
-    def bring_to_top(self, *ignore):
-        self.show()
-        self.present()
+    def toggle_window(self, *ignore):
+        if self.is_active(): 
+            # If the notification icon is on, close the window; otherwise, iconify it
+            if self.preferences.get(self.plugins['notification_icon'].preference, False): self.hide()
+            else: self.iconify()
+        else: self.present()
         
         
     def quit(self, widget=None, data=None):

=== modified file 'pithos/dbus_service.py'
--- pithos/dbus_service.py	2010-08-25 23:50:34 +0000
+++ pithos/dbus_service.py	2011-12-19 11:29:23 +0000
@@ -63,7 +63,11 @@
         
     @dbus.service.method(DBUS_BUS)
     def Present(self):
-        self.window.bring_to_top()
+        self.window.toggle_window()
+        
+    @dbus.service.method(DBUS_BUS)
+    def ToggleWindow(self):
+        self.window.toggle_window()
         
     @dbus.service.method(DBUS_BUS, out_signature='a{sv}')
     def GetCurrentSong(self):