Journal: use MultiModeWindowjournal-multimodewindow

2 files changed, 31 insertions, 17 deletions

diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index bb1c7f6..1ed9ba0 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -110,7 +110,7 @@ class JournalActivityDBusService(dbus.service.Object):
 class JournalActivity(JournalWindow):
     def __init__(self):
         logging.debug('STARTUP: Loading the journal')
-        JournalWindow.__init__(self)
+        JournalWindow.__init__(self, ['list', 'detail'])
 
         self.set_title(_('Journal'))
 
@@ -148,11 +148,12 @@ class JournalActivity(JournalWindow):
     def __volume_error_cb(self, gobject, message, severity):
         alert = ErrorAlert(title=severity, msg=message)
         alert.connect('response', self.__alert_response_cb)
-        self.add_alert(alert)
+        self.add_alert('list', alert)
         alert.show()
+        self.switch_to_mode('list')
 
     def __alert_response_cb(self, alert, response_id):
-        self.remove_alert(alert)
+        self.remove_alert('list', alert)
 
     def __realize_cb(self, window):
         wm.set_bundle_id(window.window, _BUNDLE_ID)
@@ -185,6 +186,11 @@ class JournalActivity(JournalWindow):
         search_toolbar.connect('query-changed', self._query_changed_cb)
         search_toolbar.set_mount_point('/')
 
+        self.set_toolbar_box('list', self._main_toolbox)
+        self._main_toolbox.show()
+        self.set_canvas('list', self._main_view)
+        self._main_view.show()
+
     def _setup_secondary_view(self):
         self._secondary_view = gtk.VBox()
 
@@ -197,6 +203,11 @@ class JournalActivity(JournalWindow):
         self._secondary_view.pack_end(self._detail_view)
         self._detail_view.show()
 
+        self.set_toolbar_box('detail', self._detail_toolbox)
+        self._detail_toolbox.show()
+        self.set_canvas('detail', self._secondary_view)
+        self._secondary_view.show()
+
     def _key_press_event_cb(self, widget, event):
         keyname = gtk.gdk.keyval_name(event.keyval)
         if keyname == 'Escape':
@@ -216,13 +227,15 @@ class JournalActivity(JournalWindow):
         self.show_main_view()
 
     def show_main_view(self):
-        if self.toolbar_box != self._main_toolbox:
-            self.set_toolbar_box(self._main_toolbox)
-            self._main_toolbox.show()
+#        if self.get_toolbar_box('list') is None:
+#            self.set_toolbar_box('list', self._main_toolbox)
+#            self._main_toolbox.show()
 
-        if self.canvas != self._main_view:
-            self.set_canvas(self._main_view)
-            self._main_view.show()
+#        if self.get_canvas('list') is None:
+#            self.set_canvas('list', self._main_view)
+#            self._main_view.show()
+
+        self.switch_to_mode('list')
 
     def _show_secondary_view(self, object_id):
         metadata = model.get(object_id)
@@ -231,16 +244,17 @@ class JournalActivity(JournalWindow):
         except Exception:
             logging.exception('Exception while displaying entry:')
 
-        self.set_toolbar_box(self._detail_toolbox)
-        self._detail_toolbox.show()
+#        self.set_toolbar_box('detail', self._detail_toolbox)
+#        self._detail_toolbox.show()
 
         try:
             self._detail_view.props.metadata = metadata
         except Exception:
             logging.exception('Exception while displaying entry:')
 
-        self.set_canvas(self._secondary_view)
-        self._secondary_view.show()
+#        self.set_canvas('detail', self._secondary_view)
+#        self._secondary_view.show()
+        self.switch_to_mode('detail')
 
     def show_object(self, object_id):
         metadata = model.get(object_id)
diff --git a/src/jarabe/journal/journalwindow.py b/src/jarabe/journal/journalwindow.py
index 31bc790..ae3ddf3 100644
--- a/src/jarabe/journal/journalwindow.py
+++ b/src/jarabe/journal/journalwindow.py
@@ -15,17 +15,17 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from sugar.graphics.window import Window
+from sugar.graphics.window import MultiModeWindow
 
 _journal_window = None
 
 
-class JournalWindow(Window):
+class JournalWindow(MultiModeWindow):
 
-    def __init__(self):
+    def __init__(self, modes):
 
         global _journal_window
-        Window.__init__(self)
+        MultiModeWindow.__init__(self, modes)
         _journal_window = self