diff -ruN traybuttons/data/traybuttonsprefs_pane.ui traybuttons-mod/data/traybuttonsprefs_pane.ui --- traybuttons/data/traybuttonsprefs_pane.ui 2010-02-09 09:35:49.000000000 -0500 +++ traybuttons-mod/data/traybuttonsprefs_pane.ui 2010-02-12 20:25:56.000000000 -0500 @@ -6,8 +6,9 @@ True - 3 + 5 vertical + 5 Show play/pause icon @@ -85,7 +86,7 @@ - Reverse te order of the icons (for Gnome users) + Reversed icon order ( required for Gnome ) True True False diff -ruN traybuttons/TrayButtons.py traybuttons-mod/TrayButtons.py --- traybuttons/TrayButtons.py 2010-02-12 07:50:27.000000000 -0500 +++ traybuttons-mod/TrayButtons.py 2010-02-12 20:37:01.000000000 -0500 @@ -22,17 +22,17 @@ """ Represents the plugin """ - - + + def __init__(self, exaile): self.__exaile = exaile - + # Inicializing icons self.__tyNext = gtk.status_icon_new_from_stock("gtk-media-next") self.__tyPause = gtk.status_icon_new_from_stock("gtk-media-pause") - self.__tyPrevious = gtk.status_icon_new_from_stock("gtk-media-previous") self.__tyStop = gtk.status_icon_new_from_stock("gtk-media-stop") - + self.__tyPrevious = gtk.status_icon_new_from_stock("gtk-media-previous") + self.__tyPrevious.connect("activate", self.on_previous, None) self.__tyPrevious.set_tooltip(_("Previous Track")) self.__tyPause.connect("activate", self.on_pause, None) @@ -41,11 +41,10 @@ self.__tyNext.set_tooltip(_("Next Track")) self.__tyStop.connect("activate", self.on_stop, None) self.__tyStop.set_tooltip(_("Stop")) - + # Redrawing icons due to correct order - self.disable() - self.enable() - + self.redraw_icons() + def on_pause( self, par1, par2 ): """ Called when toggle pause icon is clicked @@ -61,19 +60,19 @@ Called when previous icon is clicked """ self.__exaile.queue.prev() - + def on_next( self, par1, par2 ): """ Called when next icon is clicked """ self.__exaile.queue.next() - + def on_stop( self, par1, par2 ): """ Called when stop icon is clicked """ self.__exaile.player.stop() - + def on_option_set(self, event, settings, option): """ Called when change settings in the configuration panel @@ -84,7 +83,7 @@ else: # needed for reordering icons self.redraw_icons() - + def disable(self): """ Disable the plugin @@ -93,87 +92,87 @@ self.__tyPause.set_visible(False) self.__tyPrevious.set_visible(False) self.__tyStop.set_visible(False) - + def enable(self): """ Enable the plugin """ if self.icons_reversed: self.__tyNext.set_visible(self.next_visible) + self.__tyStop.set_visible(self.stop_visible) self.__tyPause.set_visible(self.pause_visible) self.__tyPrevious.set_visible(self.previous_visible) - self.__tyStop.set_visible(self.stop_visible) - else: - self.__tyStop.set_visible(self.stop_visible) + else: self.__tyPrevious.set_visible(self.previous_visible) + self.__tyStop.set_visible(self.stop_visible) self.__tyPause.set_visible(self.pause_visible) self.__tyNext.set_visible(self.next_visible) - + def redraw_icons(self): """ Redrawing icons """ self.disable() self.enable() - + # ### Properties ### # - - @property + + @property def pause_visible(self): return settings.get_option('plugin/traybuttons/pause_visible', True) - + @pause_visible.setter def pause_visible(self, value): settings.set_option('plugin/traybuttons/pause_visible', value) self.redraw_icons() - - @property + + @property def previous_visible(self): return settings.get_option('plugin/traybuttons/previous_visible', True) - + @previous_visible.setter def previous_visible(self, value): settings.set_option('plugin/traybuttons/previous_visible', value) self.redraw_icons() - - @property + + @property def next_visible(self): return settings.get_option('plugin/traybuttons/next_visible', True) - + @next_visible.setter def next_visible(self, value): settings.set_option('plugin/traybuttons/next_visible', value) self.redraw_icons() - - @property + + @property def stop_visible(self): return settings.get_option('plugin/traybuttons/stop_visible', False) - + @stop_visible.setter def stop_visible(self, value): settings.set_option('plugin/traybuttons/stop_visible', value) self.redraw_icons() - - @property + + @property def icons_reversed(self): return settings.get_option('plugin/traybuttons/icons_reversed', True) - + @icons_reversed.setter def icons_reversed(self, value): settings.set_option('plugin/traybuttons/icons_reversed', value) self.redraw_icons() - - @property + + @property def show_track_information(self): return settings.get_option('plugin/traybuttons/show_track_information', False) - + @show_track_information.setter def show_track_information(self, value): settings.set_option('plugin/traybuttons/show_track_information', value) if ( value == False ) : self.__tyPrevious.set_tooltip(_("Previous Track")) self.__tyNext.set_tooltip(_("Next Track")) - + def set_previous_tooltip(self): """ Set the tooltip of the previous icon @@ -193,7 +192,7 @@ self.__tyPrevious.set_tooltip(_("Previous Track")) else : self.__tyPrevious.set_tooltip(_("Previous Track")) - + def set_next_tooltip(self): """ Set the tooltip of the next icon @@ -213,24 +212,27 @@ self.__tyNext.set_tooltip(_("Next Track")) else: self.__tyNext.set_tooltip(_("Next Track")) - + def set_pause_icon(self) : """ Set the play/pause icon """ - if self.__exaile.player.is_paused() or self.__exaile.player.get_state() == 'stopped' : + exaile = self.__exaile + player = exaile.player + if player.is_paused() or player.get_state() == 'stopped' \ + and exaile.gui.main.progress_bar.bar.get_text() != 'Streaming...': self.__tyPause.set_from_stock( "gtk-media-play" ) self.__tyPause.set_tooltip(_("Play")) else: self.__tyPause.set_from_stock( "gtk-media-pause" ) self.__tyPause.set_tooltip(_("Pause")) - + def player_changed( self, eventType, player, data ): """ Called on player events (start, stop, pause) """ self.set_pause_icon() - + def track_changed( self, eventType, player, track ): """ Called when started to play a new track @@ -241,4 +243,4 @@ else: self.__tyPrevious.set_tooltip(_("Previous Track")) self.__tyNext.set_tooltip(_("Next Track")) - +