gobject.TYPE_NONE,
(),
),
- 'fullscreen' : (
+ 'home' : (
+ gobject.SIGNAL_RUN_LAST,
+ gobject.TYPE_NONE,
+ (),
+ ),
+ 'jump-to' : (
gobject.SIGNAL_RUN_LAST,
gobject.TYPE_NONE,
(gobject.TYPE_PYOBJECT, ),
),
+ 'rotate' : (
+ gobject.SIGNAL_RUN_LAST,
+ gobject.TYPE_NONE,
+ (gobject.TYPE_BOOLEAN, ),
+ ),
+ 'fullscreen' : (
+ gobject.SIGNAL_RUN_LAST,
+ gobject.TYPE_NONE,
+ (gobject.TYPE_BOOLEAN, ),
+ ),
}
- def __init__(self, player, store, index):
+ def __init__(self, player, store):
gobject.GObject.__init__(self)
self._isDestroyed = False
self._player = player
self._store = store
- self._index = index
self._clipboard = gtk.clipboard_get()
self._windowInFullscreen = False
def window(self):
return self._window
+ def show(self):
+ self._window.show_all()
+
def save_settings(self, config, sectionName):
config.add_section(sectionName)
config.set(sectionName, "fullscreen", str(self._windowInFullscreen))
self._clipboard.set_text(str(log))
return True
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_home(self, *args):
+ self.emit("home")
+ self._window.destroy()
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_jump(self, source, node):
+ _moduleLogger.error("Jump is not implemented")
+ self.emit("jump-to", node)
+ self._window.destroy()
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_quit(self, *args):
+ self.emit("quit")
+ self._window.destroy()
+
class SourceSelector(BasicWindow):
def __init__(self, player, store, index):
+ BasicWindow.__init__(self, player, store)
self._languages = []
-
- BasicWindow.__init__(self, player, store, index)
+ self._index = index
self._loadingBanner = banners.GenericBanner()
self._radioButton = self._create_button("radio", "Radio")
- self._radioButton.connect("clicked", self._on_source_selected, RadioWindow)
+ self._radioButton.connect("clicked", self._on_source_selected, RadioWindow, "radio")
self._radioWrapper = gtk.VBox()
self._radioWrapper.pack_start(self._radioButton, False, True)
self._conferenceButton = self._create_button("conferences", "Conferences")
- self._conferenceButton.connect("clicked", self._on_source_selected, ConferencesWindow)
+ self._conferenceButton.connect("clicked", self._on_source_selected, ConferencesWindow, "conferences")
self._conferenceWrapper = gtk.VBox()
self._conferenceWrapper.pack_start(self._conferenceButton, False, True)
self._buttonLayout.pack_start(self._magazineWrapper, True, True)
self._buttonLayout.pack_start(self._scriptureWrapper, True, True)
- self._playcontrol = playcontrol.PlayControl(player, store)
+ self._playcontrol = playcontrol.NavControl(player, store)
self._layout.pack_start(self._loadingBanner.toplevel, False, False)
self._layout.pack_start(self._buttonLayout, True, True)
self._layout.pack_start(self._playcontrol.toplevel, False, True)
self._window.set_title(constants.__pretty_app_name__)
- self._window.show_all()
+
+ def show(self):
+ BasicWindow.show(self)
+
self._errorBanner.toplevel.hide()
self._playcontrol.toplevel.hide()
def _refresh(self):
self._show_loading()
- self._index.download(
- "get_languages",
- self._on_languages,
- self._on_error,
- )
+ self._index.get_languages(self._on_languages, self._on_error)
def _create_button(self, icon, message):
image = self._store.get_image_from_store(self._store.STORE_LOOKUP[icon])
@misc_utils.log_exception(_moduleLogger)
def _on_error(self, exception):
self._hide_loading()
- self._errorBanner.push_message(exception)
+ self._errorBanner.push_message(str(exception))
@misc_utils.log_exception(_moduleLogger)
- def _on_source_selected(self, widget, Source):
- sourceWindow = Source(self._player, self._store, self._index, self._languages[0]["id"])
+ def _on_source_selected(self, widget, Source, nodeName):
+ node = self._index.get_source(nodeName, self._languages[0]["id"])
+ sourceWindow = Source(self._player, self._store, node)
sourceWindow.window.set_modal(True)
sourceWindow.window.set_transient_for(self._window)
sourceWindow.window.set_default_size(*self._window.get_size())
+ sourceWindow.connect("quit", self._on_quit)
+ sourceWindow.show()
gobject.type_register(SourceSelector)
class RadioWindow(BasicWindow):
- def __init__(self, player, store, index, languageId):
- BasicWindow.__init__(self, player, store, index)
+ def __init__(self, player, store, node):
+ BasicWindow.__init__(self, player, store)
+ self._node = node
+ self._childNode = None
+
+ self._player.connect("state-change", self._on_player_state_change)
+ self._player.connect("title-change", self._on_player_title_change)
self._loadingBanner = banners.GenericBanner()
self._headerNavigation = presenter.NavigationBox()
self._headerNavigation.toplevel.add(self._header)
self._headerNavigation.connect("action", self._on_nav_action)
-
+ self._headerNavigation.connect("navigating", self._on_navigating)
self._programmingModel = gtk.ListStore(
gobject.TYPE_STRING,
self._treeScroller.add(self._treeView)
self._treeScroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
- self._presenter = presenter.StreamMiniPresenter(self._player, self._store)
+ self._presenter = presenter.StreamMiniPresenter(self._store)
+ if self._player.state == "play":
+ self._presenter.set_state(self._store.STORE_LOOKUP["play"])
+ else:
+ self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
self._presenterNavigation = presenter.NavigationBox()
self._presenterNavigation.toplevel.add(self._presenter.toplevel)
self._presenterNavigation.connect("action", self._on_nav_action)
+ self._presenterNavigation.connect("navigating", self._on_navigating)
self._radioLayout = gtk.VBox(False)
self._radioLayout.pack_start(self._headerNavigation.toplevel, False, False)
self._layout.pack_start(self._radioLayout, True, True)
self._window.set_title("Radio")
- self._window.show_all()
+ self._dateShown = datetime.datetime.now()
+
+ def show(self):
+ BasicWindow.show(self)
+
self._errorBanner.toplevel.hide()
self._loadingBanner.toplevel.hide()
- self._dateShown = datetime.datetime.now()
self._refresh()
def _show_loading(self):
def _refresh(self):
self._show_loading()
self._programmingModel.clear()
- self._index.download(
- "get_radio_channels",
+ self._node.get_children(
self._on_channels,
self._on_load_error,
)
return i
@misc_utils.log_exception(_moduleLogger)
+ def _on_player_state_change(self, player, newState):
+ if self._headerNavigation.is_active() or self._presenterNavigation.is_active():
+ return
+
+ if newState == "play":
+ self._presenter.set_state(self._store.STORE_LOOKUP["play"])
+ elif newState == "pause":
+ self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
+ else:
+ _moduleLogger.info("Unhandled player state %s" % newState)
+ self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_player_title_change(self, player, newState):
+ _moduleLogger.info("Player title magically changed to %s" % player.title)
+ self._destroy()
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_navigating(self, widget, navState):
+ if navState == "clicking":
+ if self._player.state == "play":
+ imageName = "pause"
+ else:
+ imageName = "play"
+ elif navState == "down":
+ imageName = "home"
+ elif navState == "up":
+ imageName = "play"
+ elif navState == "left":
+ imageName = "play"
+ elif navState == "right":
+ imageName = "play"
+
+ self._presenter.set_state(self._store.STORE_LOOKUP[imageName])
+
+ @misc_utils.log_exception(_moduleLogger)
def _on_nav_action(self, widget, navState):
+ if self._player.state == "play":
+ self._presenter.set_state(self._store.STORE_LOOKUP["play"])
+ else:
+ self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
+
if navState == "clicking":
- pass
+ if self._player.state == "play":
+ self._player.pause()
+ else:
+ self._player.play()
elif navState == "down":
self.window.destroy()
elif navState == "up":
_moduleLogger.info("Download complete but window destroyed")
return
- channels = list(channels)
+ channels = channels
if 1 < len(channels):
_moduleLogger.warning("More channels now available!")
- channel = channels[0]
- self._index.download(
- "get_radio_channel_programming",
+ self._childNode = channels[0]
+ self._childNode.get_programming(
+ self._dateShown,
self._on_channel,
self._on_load_error,
- channel["id"],
- self._dateShown,
)
@misc_utils.log_exception(_moduleLogger)
@misc_utils.log_exception(_moduleLogger)
def _on_load_error(self, exception):
self._hide_loading()
- self._errorBanner.push_message(exception)
+ self._errorBanner.push_message(str(exception))
@misc_utils.log_exception(_moduleLogger)
def _on_row_changed(self, selection):
class ListWindow(BasicWindow):
- def __init__(self, player, store, index):
- BasicWindow.__init__(self, player, store, index)
+ def __init__(self, player, store, node):
+ BasicWindow.__init__(self, player, store)
+ self._node = node
self._loadingBanner = banners.GenericBanner()
self._treeScroller.add(self._treeView)
self._treeScroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
- self._playcontrol = playcontrol.PlayControl(self._player, self._store)
+ self._playcontrol = playcontrol.NavControl(self._player, self._store)
+ self._playcontrol.connect("home", self._on_home)
+ self._playcontrol.connect("jump-to", self._on_jump)
self._contentLayout = gtk.VBox(False)
self._contentLayout.pack_start(self._treeScroller, True, True)
self._layout.pack_start(self._loadingBanner.toplevel, False, False)
self._layout.pack_start(self._contentLayout, True, True)
- self._window.show_all()
+ def show(self):
+ BasicWindow.show(self)
+
self._errorBanner.toplevel.hide()
self._loadingBanner.toplevel.hide()
class ConferencesWindow(ListWindow):
- def __init__(self, player, store, index, languageId):
- self._languageId = languageId
-
- ListWindow.__init__(self, player, store, index)
+ def __init__(self, player, store, node):
+ ListWindow.__init__(self, player, store, node)
self._window.set_title("Conferences")
@classmethod
def _get_columns(cls):
- yield gobject.TYPE_STRING, None
+ yield gobject.TYPE_PYOBJECT, None
textrenderer = gtk.CellRendererText()
column = gtk.TreeViewColumn("Date")
def _refresh(self):
ListWindow._refresh(self)
- self._index.download(
- "get_conferences",
+ self._node.get_children(
self._on_conferences,
self._on_error,
- self._languageId,
)
@misc_utils.log_exception(_moduleLogger)
return
self._hide_loading()
- for program in programs:
- row = program["id"], program["title"], program["full_title"]
+ for programNode in programs:
+ program = programNode.get_properties()
+ row = programNode, program["title"], program["full_title"]
self._model.append(row)
path = (self._get_current_row(), )
@misc_utils.log_exception(_moduleLogger)
def _on_error(self, exception):
self._hide_loading()
- self._errorBanner.push_message(exception)
+ self._errorBanner.push_message(str(exception))
@misc_utils.log_exception(_moduleLogger)
def _on_row_activated(self, view, path, column):
itr = self._model.get_iter(path)
- conferenceId = self._model.get_value(itr, 0)
+ node = self._model.get_value(itr, 0)
- sessionsWindow = ConferenceSessionsWindow(self._player, self._store, self._index, conferenceId)
+ sessionsWindow = ConferenceSessionsWindow(self._player, self._store, node)
sessionsWindow.window.set_modal(True)
sessionsWindow.window.set_transient_for(self._window)
sessionsWindow.window.set_default_size(*self._window.get_size())
+ sessionsWindow.connect("quit", self._on_quit)
+ sessionsWindow.connect("home", self._on_home)
+ sessionsWindow.show()
gobject.type_register(ConferencesWindow)
class ConferenceSessionsWindow(ListWindow):
- def __init__(self, player, store, index, conferenceId):
- self._conferenceId = conferenceId
-
- ListWindow.__init__(self, player, store, index)
+ def __init__(self, player, store, node):
+ ListWindow.__init__(self, player, store, node)
self._window.set_title("Sessions")
@classmethod
def _get_columns(cls):
- yield gobject.TYPE_STRING, None
+ yield gobject.TYPE_PYOBJECT, None
textrenderer = gtk.CellRendererText()
column = gtk.TreeViewColumn("Session")
def _refresh(self):
ListWindow._refresh(self)
- self._index.download(
- "get_conference_sessions",
+ self._node.get_children(
self._on_conference_sessions,
self._on_error,
- self._conferenceId,
)
@misc_utils.log_exception(_moduleLogger)
return
self._hide_loading()
- for program in programs:
- row = program["id"], program["title"]
+ for programNode in programs:
+ program = programNode.get_properties()
+ row = programNode, program["title"]
self._model.append(row)
path = (self._get_current_row(), )
@misc_utils.log_exception(_moduleLogger)
def _on_error(self, exception):
self._hide_loading()
- self._errorBanner.push_message(exception)
+ self._errorBanner.push_message(str(exception))
@misc_utils.log_exception(_moduleLogger)
def _on_row_activated(self, view, path, column):
itr = self._model.get_iter(path)
- sessionId = self._model.get_value(itr, 0)
+ node = self._model.get_value(itr, 0)
- sessionsWindow = ConferenceTalksWindow(self._player, self._store, self._index, sessionId)
+ sessionsWindow = ConferenceTalksWindow(self._player, self._store, node)
sessionsWindow.window.set_modal(True)
sessionsWindow.window.set_transient_for(self._window)
sessionsWindow.window.set_default_size(*self._window.get_size())
+ sessionsWindow.connect("quit", self._on_quit)
+ sessionsWindow.connect("home", self._on_home)
+ sessionsWindow.show()
gobject.type_register(ConferenceSessionsWindow)
class ConferenceTalksWindow(ListWindow):
- def __init__(self, player, store, index, sessionId):
- self._sessionId = sessionId
-
- ListWindow.__init__(self, player, store, index)
+ def __init__(self, player, store, node):
+ ListWindow.__init__(self, player, store, node)
self._window.set_title("Talks")
@classmethod
def _get_columns(cls):
- yield gobject.TYPE_STRING, None
+ yield gobject.TYPE_PYOBJECT, None
textrenderer = gtk.CellRendererText()
column = gtk.TreeViewColumn("Talk")
def _refresh(self):
ListWindow._refresh(self)
- self._index.download(
- "get_conference_talks",
+ self._node.get_children(
self._on_conference_talks,
self._on_error,
- self._sessionId,
)
@misc_utils.log_exception(_moduleLogger)
return
self._hide_loading()
- for program in programs:
- row = program["id"], "%s\n%s" % (program["title"], program["speaker"])
+ for programNode in programs:
+ program = programNode.get_properties()
+ row = programNode, "%s\n%s" % (program["title"], program["speaker"])
self._model.append(row)
path = (self._get_current_row(), )
@misc_utils.log_exception(_moduleLogger)
def _on_error(self, exception):
self._hide_loading()
- self._errorBanner.push_message(exception)
+ self._errorBanner.push_message(str(exception))
@misc_utils.log_exception(_moduleLogger)
def _on_row_activated(self, view, path, column):
- raise NotImplementedError("")
+ itr = self._model.get_iter(path)
+ node = self._model.get_value(itr, 0)
+
+ sessionsWindow = ConferenceTalkWindow(self._player, self._store, node)
+ sessionsWindow.window.set_modal(True)
+ sessionsWindow.window.set_transient_for(self._window)
+ sessionsWindow.window.set_default_size(*self._window.get_size())
+ sessionsWindow.connect("quit", self._on_quit)
+ sessionsWindow.connect("home", self._on_home)
+ sessionsWindow.show()
gobject.type_register(ConferenceTalksWindow)
+
+
+class ConferenceTalkWindow(BasicWindow):
+
+ def __init__(self, player, store, node):
+ BasicWindow.__init__(self, player, store)
+
+ self._player.connect("state-change", self._on_player_state_change)
+ self._player.connect("title-change", self._on_player_title_change)
+
+ self._loadingBanner = banners.GenericBanner()
+
+ self._presenter = presenter.StreamPresenter(self._store)
+ self._presenterNavigation = presenter.NavigationBox()
+ self._presenterNavigation.toplevel.add(self._presenter.toplevel)
+ self._presenterNavigation.connect("action", self._on_nav_action)
+ self._presenterNavigation.connect("navigating", self._on_navigating)
+
+ self._layout.pack_start(self._loadingBanner.toplevel, False, False)
+ self._layout.pack_start(self._presenterNavigation.toplevel, True, True)
+
+ self._window.set_title("Talk")
+
+ def show(self):
+ BasicWindow.show(self)
+ self._window.show_all()
+ self._errorBanner.toplevel.hide()
+ self._loadingBanner.toplevel.hide()
+
+ self._presenter.set_context(
+ self._store.STORE_LOOKUP["conference_background"],
+ self._player.title,
+ self._player.subtitle,
+ )
+ if self._player.state == "play":
+ self._presenter.set_state(self._store.STORE_LOOKUP["play"])
+ else:
+ self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
+
+ def _show_loading(self):
+ animationPath = self._store.STORE_LOOKUP["loading"]
+ animation = self._store.get_pixbuf_animation_from_store(animationPath)
+ self._loadingBanner.show(animation, "Loading...")
+
+ def _hide_loading(self):
+ self._loadingBanner.hide()
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_player_state_change(self, player, newState):
+ if self._presenterNavigation.is_active():
+ return
+
+ if newState == "play":
+ self._presenter.set_state(self._store.STORE_LOOKUP["play"])
+ elif newState == "pause":
+ self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
+ else:
+ _moduleLogger.info("Unhandled player state %s" % newState)
+ self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_player_title_change(self, player, newState):
+ self._presenter.set_context(
+ self._store.STORE_LOOKUP["conference_background"],
+ self._player.title,
+ self._player.subtitle,
+ )
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_navigating(self, widget, navState):
+ if navState == "clicking":
+ if self._player.state == "play":
+ imageName = "pause"
+ else:
+ imageName = "play"
+ elif navState == "down":
+ imageName = "home"
+ elif navState == "up":
+ imageName = "play"
+ elif navState == "left":
+ imageName = "next"
+ elif navState == "right":
+ imageName = "prev"
+
+ self._presenter.set_state(self._store.STORE_LOOKUP[imageName])
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_nav_action(self, widget, navState):
+ if self._player.state == "play":
+ self._presenter.set_state(self._store.STORE_LOOKUP["play"])
+ else:
+ self._presenter.set_state(self._store.STORE_LOOKUP["pause"])
+
+ if navState == "clicking":
+ if self._player.state == "play":
+ self._player.pause()
+ else:
+ self._player.play()
+ elif navState == "down":
+ self.emit("home")
+ self._window.destroy()
+ elif navState == "up":
+ pass
+ elif navState == "left":
+ self._player.next()
+ elif navState == "right":
+ self._player.back()
+
+
+gobject.type_register(ConferenceTalkWindow)
projects / watersofshiloah / blobdiff