From 4e999b041080a032be588cd26b7348bcedc7e0f3 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Sat, 15 May 2010 10:32:00 -0500 Subject: [PATCH] Fixing the icon for cancel --- src/mormonchannel_gtk.py | 1 - src/windows.py | 23 ++++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py index 391c979..342a043 100755 --- a/src/mormonchannel_gtk.py +++ b/src/mormonchannel_gtk.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- """ -@bug presenter while playing and active, drag up, it shows play rather than pause, same with play control @todo Restructure so there is a windows/ folder with a file per source @todo Add additional sources @todo Track recent diff --git a/src/windows.py b/src/windows.py index a7ec704..83007a6 100644 --- a/src/windows.py +++ b/src/windows.py @@ -444,12 +444,11 @@ class RadioWindow(BasicWindow): _moduleLogger.info("Unhandled player state %s" % self._player.state) elif navState == "down": imageName = "home" - elif navState == "up": - imageName = "play" - elif navState == "left": - imageName = "play" - elif navState == "right": - imageName = "play" + else: + if self._player.state == self._player.STATE_PLAY: + imageName = "pause" + else: + imageName = "play" self._presenter.set_state(self._store.STORE_LOOKUP[imageName]) @@ -953,7 +952,17 @@ class ConferenceTalkWindow(BasicWindow): elif navState == "down": imageName = "home" elif navState == "up": - imageName = "play" + if self._player.state == self._player.STATE_PLAY: + if self._active: + imageName = "pause" + else: + imageName = "play" + elif self._player.state == self._player.STATE_PAUSE: + imageName = "play" + elif self._player.state == self._player.STATE_STOP: + imageName = "play" + else: + _moduleLogger.info("Unhandled player state %s" % self._player.state) elif navState == "left": imageName = "next" elif navState == "right": -- 1.7.9.5