Merge lp:~laszlok/decibel-audio-player/status-icon-fix into lp:decibel-audio-player

[Laszlo Pandy]

Added two features to the status icon:
 - Scrolling up and down changes volume.
 - Middle click toggles pause.

[Anonym25712 (anonym25712)]

review: Approve

Unmerged revisions

65. By Laszlo Pandy on 2010-06-05

Scroll mouse on status icon to change volume.

64. By Laszlo Pandy on 2010-06-04

Add middle click to pause on status icon.

=== modified file 'src/modules/StatusIcon.py'
--- src/modules/StatusIcon.py	2010-05-16 08:43:26 +0000
+++ src/modules/StatusIcon.py	2010-06-05 00:18:23 +0000
@@ -23,6 +23,7 @@
 
 MOD_INFO = ('Status Icon', _('Status Icon'), _('Add an icon to the notification area'), [], False, False)
 
+VOLUME_SCROLL_STEP = 0.05
 
 class StatusIcon(modules.Module):
 
@@ -30,7 +31,8 @@
         """ Constructor """
         modules.Module.__init__(self, (consts.MSG_EVT_MOD_LOADED, consts.MSG_EVT_MOD_UNLOADED,  consts.MSG_EVT_APP_STARTED,
                                        consts.MSG_EVT_NEW_TRACK,  consts.MSG_EVT_PAUSED,        consts.MSG_EVT_UNPAUSED,
-                                       consts.MSG_EVT_STOPPED,    consts.MSG_EVT_NEW_TRACKLIST, consts.MSG_EVT_TRACK_MOVED))
+                                       consts.MSG_EVT_STOPPED,    consts.MSG_EVT_NEW_TRACKLIST, consts.MSG_EVT_TRACK_MOVED,
+                                       consts.MSG_EVT_VOLUME_CHANGED))
 
 
     def install(self):
@@ -45,15 +47,18 @@
         self.trackHasPrev     = False
         self.emptyTracklist   = True
         self.isMainWinVisible = True
+        self.currVolume       = 0
         # The status icon does not support RGBA, so make sure to use the RGB color map when creating it
         colormap = self.mainWindow.get_screen().get_rgb_colormap()
         gtk.widget_push_colormap(self.mainWindow.get_screen().get_rgb_colormap())
         self.statusIcon = gtk.StatusIcon()
         gtk.widget_pop_colormap()
         # GTK+ handlers
-        self.statusIcon.connect('activate',     self.toggleWinVisibility)
-        self.statusIcon.connect('popup-menu',   self.onPopupMenu)
-        self.statusIcon.connect('size-changed', self.renderIcons)
+        self.statusIcon.connect('activate',           self.toggleWinVisibility)
+        self.statusIcon.connect('popup-menu',         self.onPopupMenu)
+        self.statusIcon.connect('size-changed',       self.renderIcons)
+        self.statusIcon.connect('scroll-event',       self.onScroll)
+        self.statusIcon.connect('button-press-event', self.onButtonPress)
         # Install everything
         self.statusIcon.set_tooltip(consts.appName)
         self.onNewTrack(None)
@@ -119,6 +124,9 @@
         self.statusIcon.set_from_pixbuf(self.icoNormal)
         self.statusIcon.set_tooltip(self.tooltip)
 
+    def onVolumeChanged(self, volume):
+        """ The volume has been changed """
+        self.currVolume = volume
 
     def toggleWinVisibility(self, statusIcon):
         """ Show/hide the main window """
@@ -147,6 +155,7 @@
         elif msg == consts.MSG_EVT_APP_STARTED:   self.install()
         elif msg == consts.MSG_EVT_MOD_UNLOADED:  self.uninstall()
         elif msg == consts.MSG_EVT_NEW_TRACKLIST: self.emptyTracklist = (len(params['tracks']) == 0)
+        elif msg == consts.MSG_EVT_VOLUME_CHANGED:self.onVolumeChanged(params['value'])
 
 
     # --== GTK handlers ==--
@@ -181,3 +190,21 @@
         self.menuPlay.set_sensitive((not (self.isPlaying or self.emptyTracklist)) or self.isPaused)
 
         self.popupMenu.popup(None, None, gtk.status_icon_position_menu, button, time, statusIcon)
+
+    def onScroll(self, statusIcon, scrollEvent):
+        """ The mouse is scrolled on the status icon """
+        volume = self.currVolume
+        if scrollEvent.direction == gtk.gdk.SCROLL_UP or scrollEvent.direction == gtk.gdk.SCROLL_RIGHT:
+            volume = min(1.0, volume + VOLUME_SCROLL_STEP)
+        else:
+            volume = max(0.0, volume - VOLUME_SCROLL_STEP)
+        
+        modules.postMsg(consts.MSG_CMD_SET_VOLUME, {'value': volume})
+
+    def onButtonPress(self, statusIcon, buttonEvent):
+        """ A button is pressed on the status icon """
+        if buttonEvent.button == 2:
+            modules.postMsg(consts.MSG_CMD_TOGGLE_PAUSE)
+        
+
+