diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2013-02-20 14:48:02 +0200 |
|---|---|---|
| committer | Mark Ryan <mark.d.ryan@intel.com> | 2013-03-06 15:47:44 +0100 |
| commit | 48328b60c1d355aaf50194feabbabc9264103454 (patch) | |
| tree | 43ce6e9bfd73818e0673d84e5ec2fcd54a109a7e | |
| parent | b01a5f8c2aac5815c14cfe8315888e7ba78c1fb6 (diff) | |
| download | dleyna-control-48328b60c1d355aaf50194feabbabc9264103454.tar.gz | |
[player] Use buttons with stock media images
Also use a play/pause button instead of separate ones
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
| -rw-r--r-- | src/msd/msd_player.py | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/src/msd/msd_player.py b/src/msd/msd_player.py index a5ecefd..ac14bcc 100644 --- a/src/msd/msd_player.py +++ b/src/msd/msd_player.py @@ -114,18 +114,23 @@ class GStreamerWindow(PlayWindowBase): button_bar = gtk.HBox(True, 0) - self.__stop_button = gtk.Button("Stop") + self.__stop_button = gtk.Button() self.__stop_button.connect("clicked", self.__stop) - self.__pause_button = gtk.Button("Pause") - self.__pause_button.connect("clicked", self.__pause) - self.__start_button = gtk.Button("Play") - self.__start_button.connect("clicked", self.__start) - self.__start_button.set_sensitive(False) + stop_image = gtk.Image() + stop_image.set_from_stock(gtk.STOCK_MEDIA_STOP, + gtk.ICON_SIZE_BUTTON) + self.__stop_button.add(stop_image) + + self.__play_pause_button = gtk.Button() + self.__play_pause_button.connect("clicked", self.__play_pause) + self.__play_pause_image = gtk.Image() + self.__play_pause_image.set_from_stock(gtk.STOCK_MEDIA_PAUSE, + gtk.ICON_SIZE_BUTTON) + self.__play_pause_button.add(self.__play_pause_image) self.__scale = gtk.HScale() - button_bar.pack_start(self.__start_button, True, True, 0) - button_bar.pack_start(self.__pause_button, True, True, 0) + button_bar.pack_start(self.__play_pause_button, True, True, 0) button_bar.pack_start(self.__stop_button, True, True, 0) self.private_area.pack_start(self.__scale, False, False, 0) @@ -139,8 +144,8 @@ class GStreamerWindow(PlayWindowBase): self.player.set_state(gst.STATE_PLAYING) def __stop_or_pause(self): - self.__pause_button.set_sensitive(False) - self.__start_button.set_sensitive(True) + self.__play_pause_image.set_from_stock(gtk.STOCK_MEDIA_PLAY, + gtk.ICON_SIZE_BUTTON) self.__scale.set_sensitive(True) if self.__update_pos_id != 0: glib.source_remove(self.__update_pos_id) @@ -153,16 +158,18 @@ class GStreamerWindow(PlayWindowBase): if self.__adjustment: self.__adjustment.set_value(0) - def __start(self, button): - self.player.set_state(gst.STATE_PLAYING) - self.__scale.set_sensitive(False) - self.__start_button.set_sensitive(False) - self.__pause_button.set_sensitive(True) - self.__stop_button.set_sensitive(True) + def __play_pause(self, button): + print (self.player.get_state()[1]) + if (self.player.get_state()[1] == gst.STATE_PLAYING): + self.player.set_state(gst.STATE_PAUSED) + self.__stop_or_pause() + else: + self.player.set_state(gst.STATE_PLAYING) + self.__play_pause_image.set_from_stock(gtk.STOCK_MEDIA_PAUSE, + gtk.ICON_SIZE_BUTTON) - def __pause(self, button): - self.player.set_state(gst.STATE_PAUSED) - self.__stop_or_pause() + self.__scale.set_sensitive(False) + self.__stop_button.set_sensitive(True) def __update_pos(self, user_data): try: |