From b1e464affa3d62cd135faf66b8ba3a8edeead743 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 20 May 2010 21:27:14 -0500 Subject: [PATCH] Removing dead code --- hand_tests/fake_player.py | 104 -------------------------- hand_tests/test_controls.py | 35 --------- hand_tests/test_nav_control.py | 35 --------- src/playcontrol.py | 161 ---------------------------------------- src/presenter.py | 1 - 5 files changed, 336 deletions(-) delete mode 100644 hand_tests/fake_player.py delete mode 100755 hand_tests/test_controls.py delete mode 100755 hand_tests/test_nav_control.py diff --git a/hand_tests/fake_player.py b/hand_tests/fake_player.py deleted file mode 100644 index c9b7ef0..0000000 --- a/hand_tests/fake_player.py +++ /dev/null @@ -1,104 +0,0 @@ -import logging - -import gobject -import gtk - - -_moduleLogger = logging.getLogger(__name__) - - -class FakePlayer(gobject.GObject): - - __gsignals__ = { - 'state_change' : ( - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT, ), - ), - 'navigate_change' : ( - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT, ), - ), - 'title_change' : ( - gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT, ), - ), - } - - def __init__(self): - gobject.GObject.__init__(self) - - self._title = gtk.Entry() - self._title.connect("activate", self._title_change) - - self._playButton = gtk.RadioButton(label="Play") - self._playButton.connect("clicked", self._state_change, "play") - self._pauseButton = gtk.RadioButton(group=self._playButton, label="Pause") - self._pauseButton.connect("clicked", self._state_change, "pause") - self._stopButton = gtk.RadioButton(group=self._playButton, label="stop") - self._stopButton.connect("clicked", self._state_change, "stop") - - self._canNavigate = gtk.CheckButton("Can Navigate?") - self._canNavigate.connect("clicked", self._navigate_change) - - self._layout = gtk.VBox() - self._layout.pack_start(self._title) - self._layout.pack_start(self._playButton) - self._layout.pack_start(self._pauseButton) - self._layout.pack_start(self._stopButton) - self._layout.pack_start(self._canNavigate) - - self._state = "stop" - - @property - def toplevel(self): - return self._layout - - @property - def node(self): - return None - - @property - def title(self): - return self._title.get_text() - - @property - def can_navigate(self): - return self._canNavigate.get_active() - - @property - def state(self): - return self._state - - def _state_change(self, widget, state): - _moduleLogger.info("User changed state") - self.emit("state_change", state) - self._state = state - - def _navigate_change(self, widget): - _moduleLogger.info("User changed nav") - self.emit("navigate_change", self._canNavigate.get_active()) - - def _title_change(self, widget): - _moduleLogger.info("User changed title") - self.emit("title_change", self._title.get_text()) - - def play(self): - _moduleLogger.info("play") - - def pause(self): - _moduleLogger.info("pause") - - def stop(self): - _moduleLogger.info("stop") - - def back(self): - _moduleLogger.info("back") - - def next(self): - _moduleLogger.info("next") - - -gobject.type_register(FakePlayer) diff --git a/hand_tests/test_controls.py b/hand_tests/test_controls.py deleted file mode 100755 index be2c3e8..0000000 --- a/hand_tests/test_controls.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python - -import sys -import logging - -import gtk - -sys.path.append('../src') - -import imagestore -import playcontrol -import fake_player - - -if __name__ == "__main__": - logging.basicConfig(level=logging.DEBUG) - - store = imagestore.ImageStore("../data", ".") - - player = fake_player.FakePlayer() - sp = playcontrol.PlayControl(player, store) - - layout = gtk.VBox() - layout.pack_start(player.toplevel) - layout.pack_start(sp.toplevel) - - window = gtk.Window() - window.set_title("Test") - window.add(layout) - window.connect("destroy", lambda w: gtk.main_quit()) - window.show_all() - - sp.refresh() - - gtk.main() diff --git a/hand_tests/test_nav_control.py b/hand_tests/test_nav_control.py deleted file mode 100755 index e1649fa..0000000 --- a/hand_tests/test_nav_control.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python - -import sys -import logging - -import gtk - -sys.path.append('../src') - -import imagestore -import playcontrol -import fake_player - - -if __name__ == "__main__": - logging.basicConfig(level=logging.DEBUG) - - store = imagestore.ImageStore("../data", ".") - - player = fake_player.FakePlayer() - sp = playcontrol.NavControl(player, store) - - layout = gtk.VBox() - layout.pack_start(player.toplevel) - layout.pack_start(sp.toplevel) - - window = gtk.Window() - window.set_title("Test") - window.add(layout) - window.connect("destroy", lambda w: gtk.main_quit()) - window.show_all() - - sp.refresh() - - gtk.main() diff --git a/src/playcontrol.py b/src/playcontrol.py index 935ad47..4ff4bf1 100644 --- a/src/playcontrol.py +++ b/src/playcontrol.py @@ -154,164 +154,3 @@ class NavControl(gobject.GObject, go_utils.AutoSignal): gobject.type_register(NavControl) - - -class PlayControl(object): - - def __init__(self, player, store): - self._isPortrait = True - - self._store = store - - self._player = player - 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["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["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["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["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["next"]) - self._next = gtk.Button() - self._next.set_image(img) - self._next.connect("clicked", self._on_next_clicked) - - self._controls = gtk.HBox() - self._controls.pack_start(self._back) - self._controls.pack_start(self._stop) - self._controls.pack_start(self._pause) - self._controls.pack_start(self._play) - self._controls.pack_start(self._next) - - self._layout = gtk.VBox() - self._layout.pack_start(self._controls) - - def refresh(self): - if not self._player.title: - self.toplevel.hide() - self._set_navigate(self._player.can_navigate) - self._set_state(self._player.state) - - @property - def toplevel(self): - return self._layout - - def set_orientation(self, orientation): - if orientation == gtk.ORIENTATION_VERTICAL: - if self._isPortrait: - return - self._isPortrait = True - - self._controls.remove(self._back) - self._controls.remove(self._stop) - self._controls.remove(self._pause) - self._controls.remove(self._play) - self._controls.remove(self._next) - self._layout.remove(self._controls) - - self._controls = gtk.HBox() - self._controls.pack_start(self._back) - self._controls.pack_start(self._stop) - self._controls.pack_start(self._pause) - self._controls.pack_start(self._play) - self._controls.pack_start(self._next) - self._layout.pack_start(self._controls) - elif orientation == gtk.ORIENTATION_HORIZONTAL: - if not self._isPortrait: - return - self._isPortrait = False - - self._controls.remove(self._back) - self._controls.remove(self._stop) - self._controls.remove(self._pause) - self._controls.remove(self._play) - self._controls.remove(self._next) - self._layout.remove(self._controls) - - self._controls = gtk.VBox() - self._controls.pack_start(self._back) - self._controls.pack_start(self._stop) - self._controls.pack_start(self._pause) - self._controls.pack_start(self._play) - self._controls.pack_start(self._next) - self._layout.pack_start(self._controls) - else: - raise NotImplementedError(orientation) - - def _set_navigate(self, canNavigate): - if canNavigate: - self._back.show() - self._next.show() - else: - self._back.hide() - self._next.hide() - - def _set_state(self, newState): - if newState == "play": - self._pause.show() - self._play.hide() - self.toplevel.show() - elif newState == "pause": - self._pause.hide() - self._play.show() - self.toplevel.show() - elif newState == "stop": - self._pause.hide() - self._play.show() - self.toplevel.hide() - - @misc_utils.log_exception(_moduleLogger) - def _on_player_state_change(self, player, newState): - self._set_state(newState) - - @misc_utils.log_exception(_moduleLogger) - def _on_player_nav_change(self, player, node): - self._set_navigate(player.can_navigate) - - @misc_utils.log_exception(_moduleLogger) - def _on_back_clicked(self, *args): - self._player.back() - - parent = gtk_toolbox.find_parent_window(self._layout) - hildonize.show_information_banner(parent, self._player.title) - - @misc_utils.log_exception(_moduleLogger) - def _on_stop_clicked(self, *args): - self._pause.hide() - self._play.show() - self._player.stop() - - @misc_utils.log_exception(_moduleLogger) - def _on_pause_clicked(self, *args): - self._pause.show() - self._play.hide() - self._player.pause() - - @misc_utils.log_exception(_moduleLogger) - def _on_play_clicked(self, *args): - self._pause.hide() - self._play.show() - self._player.play() - - @misc_utils.log_exception(_moduleLogger) - def _on_next_clicked(self, *args): - self._player.next() - - parent = gtk_toolbox.find_parent_window(self._layout) - hildonize.show_information_banner(parent, self._player.title) diff --git a/src/presenter.py b/src/presenter.py index bef0a79..45df079 100644 --- a/src/presenter.py +++ b/src/presenter.py @@ -2,7 +2,6 @@ import logging import gobject import pango -import cairo import gtk import util.misc as misc_utils -- 1.7.9.5