From: Ed Page Date: Mon, 17 May 2010 12:44:39 +0000 (-0500) Subject: Misc work from Maemo 5 usage X-Git-Url: http://vcs.maemo.org/git/?p=watersofshiloah;a=commitdiff_plain;h=be76b644bf353e9cdd223cb17e4c19f296190366 Misc work from Maemo 5 usage --- diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py index 1b725db..e9dc1c8 100755 --- a/src/mormonchannel_gtk.py +++ b/src/mormonchannel_gtk.py @@ -2,7 +2,10 @@ # -*- coding: utf-8 -*- """ +@todo Timezone issue with Mormon CHannel +@todo Fix scrollto for Fremantle @todo backgrounds need some resizing +@todo Icons on source selector need work @bug For some reason, the back/close button doesn't work when I nest multiple levels @todo Need to confirm id's are persistent (not just for todos but broken behavior on transition) @todo Track recent diff --git a/src/windows/_base.py b/src/windows/_base.py index d158167..25007da 100644 --- a/src/windows/_base.py +++ b/src/windows/_base.py @@ -250,7 +250,9 @@ class ListWindow(BasicWindow): @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) + self._window_from_node(node) @misc_utils.log_exception(_moduleLogger) def _on_player_title_change(self, player, node): diff --git a/src/windows/conferences.py b/src/windows/conferences.py index 1febd97..9370d4a 100644 --- a/src/windows/conferences.py +++ b/src/windows/conferences.py @@ -27,6 +27,7 @@ class ConferencesWindow(windows._base.ListWindow): yield gobject.TYPE_PYOBJECT, None textrenderer = gtk.CellRendererText() + textrenderer.set_property("scale", 0.75) column = gtk.TreeViewColumn("Date") column.set_property("sizing", gtk.TREE_VIEW_COLUMN_FIXED) column.set_property("fixed-width", 96) @@ -79,12 +80,6 @@ class ConferencesWindow(windows._base.ListWindow): sessionsWindow.show() return sessionsWindow - @misc_utils.log_exception(_moduleLogger) - def _on_row_activated(self, view, path, column): - itr = self._model.get_iter(path) - node = self._model.get_value(itr, 0) - self._window_from_node(node) - gobject.type_register(ConferencesWindow) @@ -144,12 +139,6 @@ class ConferenceSessionsWindow(windows._base.ListWindow): sessionsWindow.show() return sessionsWindow - @misc_utils.log_exception(_moduleLogger) - def _on_row_activated(self, view, path, column): - itr = self._model.get_iter(path) - node = self._model.get_value(itr, 0) - self._window_from_node(node) - gobject.type_register(ConferenceSessionsWindow) @@ -165,11 +154,10 @@ class ConferenceTalksWindow(windows._base.ListWindow): yield gobject.TYPE_PYOBJECT, None textrenderer = gtk.CellRendererText() - hildonize.set_cell_thumb_selectable(textrenderer) column = gtk.TreeViewColumn("Talk") column.set_property("sizing", gtk.TREE_VIEW_COLUMN_FIXED) column.pack_start(textrenderer, expand=True) - column.add_attribute(textrenderer, "text", 1) + column.add_attribute(textrenderer, "markup", 1) yield gobject.TYPE_STRING, column def _refresh(self): @@ -188,7 +176,7 @@ class ConferenceTalksWindow(windows._base.ListWindow): self._hide_loading() for programNode in programs: program = programNode.get_properties() - row = programNode, "%s\n%s" % (program["title"], program["speaker"]) + row = programNode, "%s\n%s" % (programNode.title, programNode.subtitle) self._model.append(row) self._select_row() @@ -209,12 +197,6 @@ class ConferenceTalksWindow(windows._base.ListWindow): sessionsWindow.show() return sessionsWindow - @misc_utils.log_exception(_moduleLogger) - def _on_row_activated(self, view, path, column): - itr = self._model.get_iter(path) - node = self._model.get_value(itr, 0) - self._window_from_node(node) - gobject.type_register(ConferenceTalksWindow) diff --git a/src/windows/magazines.py b/src/windows/magazines.py index 32c72d5..68117a1 100644 --- a/src/windows/magazines.py +++ b/src/windows/magazines.py @@ -104,12 +104,6 @@ class MagazinesWindow(windows._base.ListWindow): issuesWindow.show() return issuesWindow - @misc_utils.log_exception(_moduleLogger) - def _on_row_activated(self, view, path, column): - itr = self._model.get_iter(path) - node = self._model.get_value(itr, 0) - self._window_from_node(node) - gobject.type_register(MagazinesWindow) @@ -199,12 +193,6 @@ class MagazineIssuesWindow(windows._base.ListWindow): issuesWindow.show() return issuesWindow - @misc_utils.log_exception(_moduleLogger) - def _on_row_activated(self, view, path, column): - itr = self._model.get_iter(path) - node = self._model.get_value(itr, 0) - self._window_from_node(node) - gobject.type_register(MagazineIssuesWindow) @@ -220,11 +208,10 @@ class MagazineArticlesWindow(windows._base.ListWindow): yield gobject.TYPE_PYOBJECT, None textrenderer = gtk.CellRendererText() - hildonize.set_cell_thumb_selectable(textrenderer) column = gtk.TreeViewColumn("Article") column.set_property("sizing", gtk.TREE_VIEW_COLUMN_FIXED) column.pack_start(textrenderer, expand=True) - column.add_attribute(textrenderer, "text", 1) + column.add_attribute(textrenderer, "markup", 1) yield gobject.TYPE_STRING, column def _refresh(self): @@ -243,7 +230,7 @@ class MagazineArticlesWindow(windows._base.ListWindow): self._hide_loading() for programNode in programs: program = programNode.get_properties() - row = programNode, "%s\n%s" % (program["title"], program["author"]) + row = programNode, "%s\n%s" % (programNode.title, programNode.subtitle) self._model.append(row) self._select_row() @@ -264,12 +251,6 @@ class MagazineArticlesWindow(windows._base.ListWindow): issuesWindow.show() return issuesWindow - @misc_utils.log_exception(_moduleLogger) - def _on_row_activated(self, view, path, column): - itr = self._model.get_iter(path) - node = self._model.get_value(itr, 0) - self._window_from_node(node) - gobject.type_register(MagazineArticlesWindow) diff --git a/src/windows/radio.py b/src/windows/radio.py index 1af768d..436f532 100644 --- a/src/windows/radio.py +++ b/src/windows/radio.py @@ -41,13 +41,13 @@ class RadioWindow(windows._base.BasicWindow): textrenderer = gtk.CellRendererText() timeColumn = gtk.TreeViewColumn("Time") + textrenderer.set_property("scale", 0.75) timeColumn.set_property("sizing", gtk.TREE_VIEW_COLUMN_FIXED) timeColumn.set_property("fixed-width", 80) timeColumn.pack_start(textrenderer, expand=True) timeColumn.add_attribute(textrenderer, "text", 0) textrenderer = gtk.CellRendererText() - hildonize.set_cell_thumb_selectable(textrenderer) titleColumn = gtk.TreeViewColumn("Program") titleColumn.set_property("sizing", gtk.TREE_VIEW_COLUMN_FIXED) titleColumn.pack_start(textrenderer, expand=True) diff --git a/src/windows/scriptures.py b/src/windows/scriptures.py index 58fe5ee..013f3f6 100644 --- a/src/windows/scriptures.py +++ b/src/windows/scriptures.py @@ -71,12 +71,6 @@ class ScripturesWindow(windows._base.ListWindow): booksWindow.show() return booksWindow - @misc_utils.log_exception(_moduleLogger) - def _on_row_activated(self, view, path, column): - itr = self._model.get_iter(path) - node = self._model.get_value(itr, 0) - self._window_from_node(node) - gobject.type_register(ScripturesWindow) @@ -136,12 +130,6 @@ class ScriptureBooksWindow(windows._base.ListWindow): booksWindow.show() return booksWindow - @misc_utils.log_exception(_moduleLogger) - def _on_row_activated(self, view, path, column): - itr = self._model.get_iter(path) - node = self._model.get_value(itr, 0) - self._window_from_node(node) - gobject.type_register(ScriptureBooksWindow) @@ -201,12 +189,6 @@ class ScriptureChaptersWindow(windows._base.ListWindow): booksWindow.show() return booksWindow - @misc_utils.log_exception(_moduleLogger) - def _on_row_activated(self, view, path, column): - itr = self._model.get_iter(path) - node = self._model.get_value(itr, 0) - self._window_from_node(node) - gobject.type_register(ScriptureChaptersWindow) diff --git a/src/windows/source.py b/src/windows/source.py index 15b01e2..42c72fc 100644 --- a/src/windows/source.py +++ b/src/windows/source.py @@ -26,30 +26,22 @@ class SourceSelector(windows._base.BasicWindow): self._radioButton = self._create_button("radio", "Radio") self._radioButton.connect("clicked", self._on_source_selected, stream_index.SOURCE_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, stream_index.SOURCE_CONFERENCES) - self._conferenceWrapper = gtk.VBox() - self._conferenceWrapper.pack_start(self._conferenceButton, False, True) self._magazineButton = self._create_button("magazines", "Magazines") self._magazineButton.connect("clicked", self._on_source_selected, stream_index.SOURCE_MAGAZINES) - self._magazineWrapper = gtk.VBox() - self._magazineWrapper.pack_start(self._magazineButton, False, True) self._scriptureButton = self._create_button("scriptures", "Scriptures") self._scriptureButton.connect("clicked", self._on_source_selected, stream_index.SOURCE_SCRIPTURES) - self._scriptureWrapper = gtk.VBox() - self._scriptureWrapper.pack_start(self._scriptureButton, False, True) self._buttonLayout = gtk.VButtonBox() self._buttonLayout.set_layout(gtk.BUTTONBOX_SPREAD) - self._buttonLayout.pack_start(self._radioWrapper, True, True) - self._buttonLayout.pack_start(self._conferenceWrapper, True, True) - self._buttonLayout.pack_start(self._magazineWrapper, True, True) - self._buttonLayout.pack_start(self._scriptureWrapper, True, True) + self._buttonLayout.pack_start(self._radioButton, True, True) + self._buttonLayout.pack_start(self._conferenceButton, True, True) + self._buttonLayout.pack_start(self._magazineButton, True, True) + self._buttonLayout.pack_start(self._scriptureButton, True, True) self._separator = gtk.HSeparator() self._playcontrol = playcontrol.NavControl(player, store)