X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=blobdiff_plain;f=src%2Fplaycontrol.py;h=935ad47f8164e39cf4891d0b9c6ed004c0339277;hp=f9bf3483e9f0a5f7fbb824ccf29b99c51276f77f;hb=7e7a33dc080cd129371a2faa5f1185a79b5556db;hpb=26a388bc2959bc61bfb32299259dbce66760d2f4 diff --git a/src/playcontrol.py b/src/playcontrol.py index f9bf348..935ad47 100644 --- a/src/playcontrol.py +++ b/src/playcontrol.py @@ -5,6 +5,7 @@ import gtk import gtk_toolbox import hildonize +import util.go_utils as go_utils import util.misc as misc_utils import presenter @@ -13,7 +14,7 @@ import presenter _moduleLogger = logging.getLogger(__name__) -class NavControl(gobject.GObject): +class NavControl(gobject.GObject, go_utils.AutoSignal): __gsignals__ = { @@ -34,18 +35,14 @@ class NavControl(gobject.GObject): self._store = store - self._player = player - self._player.connect("state-change", self._on_player_state_change) - self._player.connect("title-change", self._on_player_title_change) - - self._controlButton = store.get_image_from_store(store.STORE_LOOKUP["small_play"]) + self._controlButton = store.get_image_from_store(store.STORE_LOOKUP["play"]) self._controlBox = presenter.NavigationBox() self._controlBox.toplevel.add(self._controlButton) self._controlBox.connect("action", self._on_nav_action) self._controlBox.connect("navigating", self._on_navigating) - self._titleButton = gtk.Label("") + self._titleButton = gtk.Label() self._displayBox = presenter.NavigationBox() self._displayBox.toplevel.add(self._titleButton) @@ -53,12 +50,34 @@ class NavControl(gobject.GObject): self._displayBox.connect("navigating", self._on_navigating) self._layout = gtk.HBox() + go_utils.AutoSignal.__init__(self, self.toplevel) self._layout.pack_start(self._controlBox.toplevel, False, False) - self._layout.pack_start(self._displayBox.toplevel, False, True) + self._layout.pack_start(self._displayBox.toplevel, True, True) + self._player = player + self.connect_auto(self._player, "state-change", self._on_player_state_change) + self.connect_auto(self._player, "title-change", self._on_player_title_change) + self._titleButton.set_label(self._player.title) def refresh(self): - if not self._player.title: + self._titleButton.set_label(self._player.title) + self._set_context(self._player.state) + + def _set_context(self, state): + if state == self._player.STATE_PLAY: + stateImage = self._store.STORE_LOOKUP["pause"] + self._store.set_image_from_store(self._controlButton, stateImage) + self.toplevel.show() + elif state == self._player.STATE_PAUSE: + stateImage = self._store.STORE_LOOKUP["play"] + self._store.set_image_from_store(self._controlButton, stateImage) + self.toplevel.show() + elif state == self._player.STATE_STOP: + self._titleButton.set_label("") self.toplevel.hide() + else: + _moduleLogger.info("Unhandled player state %s" % state) + stateImage = self._store.STORE_LOOKUP["pause"] + self._store.set_image_from_store(self._controlButton, stateImage) @property def toplevel(self): @@ -72,65 +91,51 @@ class NavControl(gobject.GObject): if self._controlBox.is_active() or self._displayBox.is_active(): return - if newState == "play": - stateImage = self._store.STORE_LOOKUP["small_play"] - self._store.set_image_from_store(self._controlButton, stateImage) - self.toplevel.show() - elif newState == "pause": - stateImage = self._store.STORE_LOOKUP["small_pause"] - self._store.set_image_from_store(self._controlButton, stateImage) - self.toplevel.show() - elif newState == "stop": - self._titleButton.set_label("") - self.toplevel.hide() - else: - _moduleLogger.info("Unhandled player state %s" % newState) - stateImage = self._store.STORE_LOOKUP["small_pause"] - self._store.set_image_from_store(self._controlButton, stateImage) + self._set_context(newState) @misc_utils.log_exception(_moduleLogger) - def _on_player_title_change(self, player, newState): + def _on_player_title_change(self, player, node): + _moduleLogger.info("Title change: %s" % self._player.title) self._titleButton.set_label(self._player.title) @misc_utils.log_exception(_moduleLogger) def _on_navigating(self, widget, navState): if navState == "down": - imageName = "small_home" - elif navState == "up": - imageName = "small_play" - elif navState == "clicking" or not self._player.can_navigate: + imageName = "home" + elif navState == "clicking": if widget is self._controlBox: - if self._player.state == "play": - imageName = "small_pause" + if self._player.state == self._player.STATE_PLAY: + imageName = "pause_pressed" else: - imageName = "small_play" - elif widget is self._displayBox: - if self._player.state == "play": - imageName = "small_play" + imageName = "play_pressed" + else: + if self._player.state == self._player.STATE_PLAY: + imageName = "pause" else: - imageName = "small_pause" + imageName = "play" + elif self._player.can_navigate: + if navState == "up": + imageName = "play" + elif navState == "left": + imageName = "next" + elif navState == "right": + imageName = "prev" + else: + if self._player.state == self._player.STATE_PLAY: + imageName = "pause" else: - raise NotImplementedError() - elif navState == "left": - imageName = "small_next" - elif navState == "right": - imageName = "small_prev" + imageName = "play" imagePath = self._store.STORE_LOOKUP[imageName] self._store.set_image_from_store(self._controlButton, imagePath) @misc_utils.log_exception(_moduleLogger) def _on_nav_action(self, widget, navState): - if self._player.state == "play": - imageName = "small_play" - else: - imageName = "small_pause" - imagePath = self._store.STORE_LOOKUP[imageName] - self._store.set_image_from_store(self._controlButton, imagePath) + self._set_context(self._player.state) if navState == "clicking": if widget is self._controlBox: - if self._player.state == "play": + if self._player.state == self._player.STATE_PLAY: self._player.pause() else: self._player.play() @@ -162,27 +167,27 @@ class PlayControl(object): self._player.connect("state-change", self._on_player_state_change) self._player.connect("title-change", self._on_player_nav_change) - img = store.get_image_from_store(store.STORE_LOOKUP["small_prev"]) + img = store.get_image_from_store(store.STORE_LOOKUP["prev"]) self._back = gtk.Button() self._back.set_image(img) self._back.connect("clicked", self._on_back_clicked) - img = store.get_image_from_store(store.STORE_LOOKUP["small_stop"]) + img = store.get_image_from_store(store.STORE_LOOKUP["stop"]) self._stop = gtk.Button() self._stop.set_image(img) self._stop.connect("clicked", self._on_stop_clicked) - img = store.get_image_from_store(store.STORE_LOOKUP["small_pause"]) + img = store.get_image_from_store(store.STORE_LOOKUP["pause"]) self._pause = gtk.Button() self._pause.set_image(img) self._pause.connect("clicked", self._on_pause_clicked) - img = store.get_image_from_store(store.STORE_LOOKUP["small_play"]) + img = store.get_image_from_store(store.STORE_LOOKUP["play"]) self._play = gtk.Button() self._play.set_image(img) self._play.connect("clicked", self._on_play_clicked) - img = store.get_image_from_store(store.STORE_LOOKUP["small_next"]) + img = store.get_image_from_store(store.STORE_LOOKUP["next"]) self._next = gtk.Button() self._next.set_image(img) self._next.connect("clicked", self._on_next_clicked) @@ -276,7 +281,7 @@ class PlayControl(object): self._set_state(newState) @misc_utils.log_exception(_moduleLogger) - def _on_player_nav_change(self, player, newState): + def _on_player_nav_change(self, player, node): self._set_navigate(player.can_navigate) @misc_utils.log_exception(_moduleLogger)