From: Ed Page Date: Fri, 21 May 2010 03:10:33 +0000 (-0500) Subject: More connect_auto usage X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=commitdiff_plain;h=81b22636333648166e7f622d07066edae06f06d5 More connect_auto usage --- diff --git a/src/presenter.py b/src/presenter.py index 05660d5..e549c66 100644 --- a/src/presenter.py +++ b/src/presenter.py @@ -278,6 +278,8 @@ class NavControl(gobject.GObject, go_utils.AutoSignal): def __init__(self, player, store): gobject.GObject.__init__(self) + self._layout = gtk.HBox() + go_utils.AutoSignal.__init__(self, self.toplevel) self._store = store @@ -285,18 +287,16 @@ class NavControl(gobject.GObject, go_utils.AutoSignal): self._controlBox = NavigationBox() self._controlBox.toplevel.add(self._controlButton) - self._controlBox.connect("action", self._on_nav_action) - self._controlBox.connect("navigating", self._on_navigating) + self.connect_auto(self._controlBox, "action", self._on_nav_action) + self.connect_auto(self._controlBox, "navigating", self._on_navigating) self._titleButton = gtk.Label() self._displayBox = NavigationBox() self._displayBox.toplevel.add(self._titleButton) - self._displayBox.connect("action", self._on_nav_action) - self._displayBox.connect("navigating", self._on_navigating) + self.connect_auto(self._displayBox, "action", self._on_nav_action) + self.connect_auto(self._displayBox, "navigating", self._on_navigating) - self._layout = gtk.HBox() - go_utils.AutoSignal.__init__(self, self.toplevel) self._layout.pack_start(self._controlBox.toplevel, False, False) self._layout.pack_start(self._displayBox.toplevel, True, True) self._player = player diff --git a/src/windows/_base.py b/src/windows/_base.py index d855fd8..0f73621 100644 --- a/src/windows/_base.py +++ b/src/windows/_base.py @@ -210,8 +210,8 @@ class ListWindow(BasicWindow): self._separator = gtk.HSeparator() self._presenter = presenter.NavControl(self._player, self._store) - self._presenter.connect("home", self._on_home) - self._presenter.connect("jump-to", self._on_jump) + self.connect_auto(self._presenter, "home", self._on_home) + self.connect_auto(self._presenter, "jump-to", self._on_jump) self._contentLayout = gtk.VBox(False) self._contentLayout.pack_start(self._treeScroller, True, True) @@ -356,8 +356,8 @@ class PresenterWindow(BasicWindow): ) 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._seekbar = hildonize.create_seekbar() self._seekbar.connect("change-value", self._on_user_seek) diff --git a/src/windows/conferences.py b/src/windows/conferences.py index c5a8b0d..dedfc7c 100644 --- a/src/windows/conferences.py +++ b/src/windows/conferences.py @@ -75,10 +75,10 @@ class ConferencesWindow(windows._base.ListWindow): sessionsWindow.window.fullscreen() else: sessionsWindow.window.unfullscreen() - sessionsWindow.connect("quit", self._on_quit) - sessionsWindow.connect("home", self._on_home) - sessionsWindow.connect("jump-to", self._on_jump) - sessionsWindow.connect("fullscreen", self._on_child_fullscreen) + sessionsWindow.connect_auto(sessionsWindow, "quit", self._on_quit) + sessionsWindow.connect_auto(sessionsWindow, "home", self._on_home) + sessionsWindow.connect_auto(sessionsWindow, "jump-to", self._on_jump) + sessionsWindow.connect_auto(sessionsWindow, "fullscreen", self._on_child_fullscreen) sessionsWindow.show() return sessionsWindow @@ -139,10 +139,10 @@ class ConferenceSessionsWindow(windows._base.ListWindow): sessionsWindow.window.fullscreen() else: sessionsWindow.window.unfullscreen() - sessionsWindow.connect("quit", self._on_quit) - sessionsWindow.connect("home", self._on_home) - sessionsWindow.connect("jump-to", self._on_jump) - sessionsWindow.connect("fullscreen", self._on_child_fullscreen) + sessionsWindow.connect_auto(sessionsWindow, "quit", self._on_quit) + sessionsWindow.connect_auto(sessionsWindow, "home", self._on_home) + sessionsWindow.connect_auto(sessionsWindow, "jump-to", self._on_jump) + sessionsWindow.connect_auto(sessionsWindow, "fullscreen", self._on_child_fullscreen) sessionsWindow.show() return sessionsWindow @@ -202,10 +202,10 @@ class ConferenceTalksWindow(windows._base.ListWindow): sessionsWindow.window.fullscreen() else: sessionsWindow.window.unfullscreen() - sessionsWindow.connect("quit", self._on_quit) - sessionsWindow.connect("home", self._on_home) - sessionsWindow.connect("jump-to", self._on_jump) - sessionsWindow.connect("fullscreen", self._on_child_fullscreen) + sessionsWindow.connect_auto(sessionsWindow, "quit", self._on_quit) + sessionsWindow.connect_auto(sessionsWindow, "home", self._on_home) + sessionsWindow.connect_auto(sessionsWindow, "jump-to", self._on_jump) + sessionsWindow.connect_auto(sessionsWindow, "fullscreen", self._on_child_fullscreen) sessionsWindow.show() return sessionsWindow diff --git a/src/windows/magazines.py b/src/windows/magazines.py index 095c72f..e46cb5d 100644 --- a/src/windows/magazines.py +++ b/src/windows/magazines.py @@ -99,10 +99,10 @@ class MagazinesWindow(windows._base.ListWindow): issuesWindow.window.fullscreen() else: issuesWindow.window.unfullscreen() - issuesWindow.connect("quit", self._on_quit) - issuesWindow.connect("home", self._on_home) - issuesWindow.connect("jump-to", self._on_jump) - issuesWindow.connect("fullscreen", self._on_child_fullscreen) + issuesWindow.connect_auto(issuesWindow, "quit", self._on_quit) + issuesWindow.connect_auto(issuesWindow, "home", self._on_home) + issuesWindow.connect_auto(issuesWindow, "jump-to", self._on_jump) + issuesWindow.connect_auto(issuesWindow, "fullscreen", self._on_child_fullscreen) issuesWindow.show() return issuesWindow @@ -193,10 +193,10 @@ class MagazineIssuesWindow(windows._base.ListWindow): issuesWindow.window.fullscreen() else: issuesWindow.window.unfullscreen() - issuesWindow.connect("quit", self._on_quit) - issuesWindow.connect("home", self._on_home) - issuesWindow.connect("jump-to", self._on_jump) - issuesWindow.connect("fullscreen", self._on_child_fullscreen) + issuesWindow.connect_auto(issuesWindow, "quit", self._on_quit) + issuesWindow.connect_auto(issuesWindow, "home", self._on_home) + issuesWindow.connect_auto(issuesWindow, "jump-to", self._on_jump) + issuesWindow.connect_auto(issuesWindow, "fullscreen", self._on_child_fullscreen) issuesWindow.show() return issuesWindow @@ -256,10 +256,10 @@ class MagazineArticlesWindow(windows._base.ListWindow): issuesWindow.window.fullscreen() else: issuesWindow.window.unfullscreen() - issuesWindow.connect("quit", self._on_quit) - issuesWindow.connect("home", self._on_home) - issuesWindow.connect("jump-to", self._on_jump) - issuesWindow.connect("fullscreen", self._on_child_fullscreen) + issuesWindow.connect_auto(issuesWindow, "quit", self._on_quit) + issuesWindow.connect_auto(issuesWindow, "home", self._on_home) + issuesWindow.connect_auto(issuesWindow, "jump-to", self._on_jump) + issuesWindow.connect_auto(issuesWindow, "fullscreen", self._on_child_fullscreen) issuesWindow.show() return issuesWindow diff --git a/src/windows/radio.py b/src/windows/radio.py index c3a5d3f..981aeee 100644 --- a/src/windows/radio.py +++ b/src/windows/radio.py @@ -33,8 +33,8 @@ class RadioWindow(windows._base.BasicWindow): 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.connect_auto(self._headerNavigation, "action", self._on_nav_action) + self.connect_auto(self._headerNavigation, "navigating", self._on_navigating) self._programmingModel = gtk.ListStore( gobject.TYPE_STRING, @@ -74,8 +74,8 @@ 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) diff --git a/src/windows/scriptures.py b/src/windows/scriptures.py index ef4a0b5..3626827 100644 --- a/src/windows/scriptures.py +++ b/src/windows/scriptures.py @@ -66,10 +66,10 @@ class ScripturesWindow(windows._base.ListWindow): booksWindow.window.fullscreen() else: booksWindow.window.unfullscreen() - booksWindow.connect("quit", self._on_quit) - booksWindow.connect("home", self._on_home) - booksWindow.connect("jump-to", self._on_jump) - booksWindow.connect("fullscreen", self._on_child_fullscreen) + booksWindow.connect_auto(booksWindow, "quit", self._on_quit) + booksWindow.connect_auto(booksWindow, "home", self._on_home) + booksWindow.connect_auto(booksWindow, "jump-to", self._on_jump) + booksWindow.connect_auto(booksWindow, "fullscreen", self._on_child_fullscreen) booksWindow.show() return booksWindow @@ -130,10 +130,10 @@ class ScriptureBooksWindow(windows._base.ListWindow): booksWindow.window.fullscreen() else: booksWindow.window.unfullscreen() - booksWindow.connect("quit", self._on_quit) - booksWindow.connect("home", self._on_home) - booksWindow.connect("jump-to", self._on_jump) - booksWindow.connect("fullscreen", self._on_child_fullscreen) + booksWindow.connect_auto(booksWindow, "quit", self._on_quit) + booksWindow.connect_auto(booksWindow, "home", self._on_home) + booksWindow.connect_auto(booksWindow, "jump-to", self._on_jump) + booksWindow.connect_auto(booksWindow, "fullscreen", self._on_child_fullscreen) booksWindow.show() return booksWindow @@ -194,10 +194,10 @@ class ScriptureChaptersWindow(windows._base.ListWindow): booksWindow.window.fullscreen() else: booksWindow.window.unfullscreen() - booksWindow.connect("quit", self._on_quit) - booksWindow.connect("home", self._on_home) - booksWindow.connect("jump-to", self._on_jump) - booksWindow.connect("fullscreen", self._on_child_fullscreen) + booksWindow.connect_auto(booksWindow, "quit", self._on_quit) + booksWindow.connect_auto(booksWindow, "home", self._on_home) + booksWindow.connect_auto(booksWindow, "jump-to", self._on_jump) + booksWindow.connect_auto(booksWindow, "fullscreen", self._on_child_fullscreen) booksWindow.show() return booksWindow