Ticket #485: add_stop_button_and_commandline_option.patch

src/dbus_manager.py

@@ -118 +118 @@
-        def play_pause(self):
-            Dispatcher.control("play")
-            return "Successful command "
+
+        @dbus.service.method("org.gnome.Listen")
+        def stop(self):
+            Dispatcher.control("stop")
+            return "Successful command "
-    
-        @dbus.service.method("org.gnome.Listen")
-        def volume(self,value):

src/option_parser.py

@@ -47 +47 @@
-                                
-        self.parser.add_option("--play-pause", action="store_true", dest="play", default=False,
-                                help=_("play or pause current playing media"))
+        
+        self.parser.add_option("--stop", action="store_true", dest="stop", default=False,
+                                help=_("stop current playing media"))
-                                
-        self.parser.add_option("-c","--current-playing", action="store_true", dest="print_current", default=False,
-                                help=_("show current playing song"))
@@ -96 +99 @@
-        if self.options.play:
-            ret = listen_dbus_interface.play()
-            
+        if self.options.stop:
+            ret = listen_dbus_interface.stop()
+            
-        if self.options.volume!=None:
-            ret = listen_dbus_interface.volume(self.options.volume)
-            

src/player/__init__.py

@@ -54 +54 @@
-                ()),
-        "played" : (gobject.SIGNAL_RUN_LAST,
-                gobject.TYPE_NONE,
-
+
+
+
+
-    }
-
-    def __init__(self):
@@ -325 +328 @@
-            config.set("player","play","false")
-
-    def stop(self):
-
+#
-        self.debug("stop")
-paus
+stopp
-        self.bin.set_state(gst.STATE_NULL)
-        self.paused = True
-        #self.song = None

src/widget/control.py

@@ -48 +48 @@
-
-        self.pack_start(build_btn(_("Previous"),gtk.STOCK_MEDIA_PREVIOUS,"previous"),False,False)
-        self.pack_start(build_btn(_("Play"),gtk.STOCK_MEDIA_PLAY,"play"),False,False)
+        self.pack_start(build_btn(_("Stop"),gtk.STOCK_MEDIA_STOP,"stop"),False,False)
-        self.pack_start(build_btn(_("Next"),gtk.STOCK_MEDIA_NEXT,"next"),False,False)
-
-        self.vol = VolumeSlider(player)
@@ -63 +64 @@
-
-        player.connect("played",self.swap_btn_play,gtk.STOCK_MEDIA_PAUSE)
-        player.connect("paused",self.swap_btn_play,gtk.STOCK_MEDIA_PLAY)
+        player.connect("stopped",self.swap_btn_play,gtk.STOCK_MEDIA_PLAY)
-
-    def swap_btn_play(self,obj,stock):
-        btn = self.get_children()[1].child.set_from_stock(stock,gtk.ICON_SIZE_LARGE_TOOLBAR)

src/widget/listen.py

@@ -114 +114 @@
-        
-        player.connect("played",self.swap_menu_play,player,_("Pause"),gtk.STOCK_MEDIA_PAUSE,"listen_tray_play.png")
-        player.connect("paused",self.swap_menu_play,player,("Play"),gtk.STOCK_MEDIA_PLAY,"listen_tray_pause.png")
+        player.connect("stopped",self.swap_menu_play,player,("Play"),gtk.STOCK_MEDIA_PLAY,"listen_tray.png")
-        
-        self.tray = TrayIcon(self,player)
-        self.tray.connect("control-action",self.player_ui.control,player)

src/widget/player_ui.py

@@ -152 +152 @@
-                player.pause()
-                if player.song:
-                    player.set_song(player.song)
-
-
+
+
+
+
+
+
-        if action == "shuffle":
-            self.playlist.shuffle()
-            

src/widget/tray.py

@@ -40 +40 @@
-        self.win = window
-        player.connect("played",self.on_play)
-        player.connect("paused",self.on_pause)
+        player.connect("stopped",self.on_pause)
-
-        self.eventbox = gtk.EventBox()
-        try: import egg.trayicon
@@ -61 +62 @@
-            <popup name="TrayIconMenu">
-              <menuitem name="play" action="play"/>
-              <menuitem name="pause" action="pause"/>
+              <menuitem name="stop" action="stop"/>
-              <menuitem name="next" action="next"/>
-              <menuitem name="previous" action="previous"/>
-              <separator/>
@@ -74 +76 @@
-        actiongroup = gtk.ActionGroup('Listen')
-        actiongroup.add_actions([('play', gtk.STOCK_MEDIA_PLAY, _('_Play'), None, _('Play'), lambda w:self.emit("control-action",w.get_name())),
-                                 ('pause', gtk.STOCK_MEDIA_PAUSE, _('_Pause'), None, _('Pause'), lambda w:self.emit("control-action",w.get_name())),
+                                 ('stop', gtk.STOCK_MEDIA_STOP, _('Stop'), None, _('Stop'), lambda w:self.emit("control-action",w.get_name())),
-                                 ('next', gtk.STOCK_MEDIA_NEXT, _('_Next'), None, _('Next'), lambda w:self.emit("control-action",w.get_name())),
-                                 ('previous', gtk.STOCK_MEDIA_PREVIOUS, _('_Previous'), None, _('Previous'),lambda w:self.emit("control-action",w.get_name())),
-                                 ('quit', gtk.STOCK_QUIT, _('_Quit'), None, _('Quit Listen'), lambda w:self.emit("control-action",w.get_name()))])