Removing header for radio

[watersofshiloah] / src / windows / radio.py

diff --git a/src/windows/radio.py b/src/windows/radio.py
index faa3789..5d5793a 100644 (file)
--- a/src/windows/radio.py
+++ b/src/windows/radio.py
@@ -29,13 +29,6 @@ class RadioWindow(windows._base.BasicWindow):
 
                self._loadingBanner = banners.GenericBanner()
 
-               headerPath = self._store.STORE_LOOKUP["radio_header"]
-               self._header = self._store.get_image_from_store(headerPath)
-               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,
                        gobject.TYPE_STRING,
@@ -74,11 +67,10 @@ class RadioWindow(windows._base.BasicWindow):
                self._presenter = presenter.StreamMiniPresenter(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.connect_auto(self._presenterNavigation, "action", self._on_nav_action)
+               self.connect_auto(self._presenterNavigation, "navigating", self._on_navigating)
 
                self._radioLayout = gtk.VBox(False)
-               self._radioLayout.pack_start(self._headerNavigation.toplevel, False, False)
                self._radioLayout.pack_start(self._treeScroller, True, True)
                self._radioLayout.pack_start(self._presenterNavigation.toplevel, False, True)
 
@@ -86,8 +78,12 @@ class RadioWindow(windows._base.BasicWindow):
                self._layout.pack_start(self._radioLayout, True, True)
 
                self._dateShown = datetime.datetime.now(tz=time_utils.Mountain)
+               self._currentTime = self._dateShown
                self._update_title()
 
+               self._continualUpdate = go_utils.Timeout(self._on_continual_update, once = False)
+               self._continualUpdate.start(seconds=60)
+
        def show(self):
                windows._base.BasicWindow.show(self)
 
@@ -99,6 +95,15 @@ class RadioWindow(windows._base.BasicWindow):
        def jump_to(self, node):
                _moduleLogger.info("Only 1 channel, nothing to jump to")
 
+       def _update_time(self, newTime):
+               oldTime = self._dateShown
+               self._dateShown = newTime
+               if newTime.date() == oldTime.date():
+                       self._select_row()
+               else:
+                       self._update_title()
+                       self._refresh()
+
        def _update_title(self):
                self._window.set_title("%s - %s" % (self._node.title, self._dateShown.strftime("%m/%d")))
 
@@ -150,8 +155,22 @@ class RadioWindow(windows._base.BasicWindow):
                        return i
 
        @misc_utils.log_exception(_moduleLogger)
+       def _on_continual_update(self, *args):
+               if self._isDestroyed:
+                       return False
+               newTime = datetime.datetime.now(tz=time_utils.Mountain)
+               oldTime = self._currentTime
+               shownTime = self._dateShown
+
+               self._currentTime = newTime
+               if shownTime.date() == oldTime.date():
+                       _moduleLogger.info("Today selected, updating selection")
+                       self._update_time(newTime)
+               return True
+
+       @misc_utils.log_exception(_moduleLogger)
        def _on_player_state_change(self, player, newState):
-               if self._headerNavigation.is_active() or self._presenterNavigation.is_active():
+               if self._presenterNavigation.is_active():
                        return
 
                self._set_context(newState)
@@ -210,13 +229,9 @@ class RadioWindow(windows._base.BasicWindow):
                elif navState == "up":
                        pass
                elif navState == "left":
-                       self._dateShown += datetime.timedelta(days=1)
-                       self._update_title()
-                       self._refresh()
+                       self._update_time(self._dateShown + datetime.timedelta(days=1))
                elif navState == "right":
-                       self._dateShown -= datetime.timedelta(days=1)
-                       self._update_title()
-                       self._refresh()
+                       self._update_time(self._dateShown - datetime.timedelta(days=1))
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_channels(self, channels):
@@ -245,7 +260,7 @@ class RadioWindow(windows._base.BasicWindow):
                        row = program["time"], program["title"]
                        self._programmingModel.append(row)
 
-               currentDate = datetime.datetime.now()
+               currentDate = self._currentTime
                if currentDate.date() != self._dateShown.date():
                        self._treeView.get_selection().set_mode(gtk.SELECTION_NONE)
                else: