Re-add the back button on the detail view.

1 files changed, 9 insertions, 11 deletions

diff --git a/journalactivity.py b/journalactivity.py
index 9035ab8..cc5cf2f 100755
--- a/journalactivity.py
+++ b/journalactivity.py
@@ -37,7 +37,6 @@ class JournalActivity(activity.Activity):
         self.set_title('Journal')
 
         self._toolbox = JournalToolbox()
-        self._toolbox.connect('current-toolbar-changed', self._notify_current_toolbar_cb)
         self._toolbox.search_toolbar.connect('query-changed', self._query_changed_cb)
         self._toolbox.entry_toolbar.connect('entry-erased', self._entry_erased_cb)
         self.set_toolbox(self._toolbox)
@@ -62,11 +61,6 @@ class JournalActivity(activity.Activity):
 
         self.iconify()
 
-    def _notify_current_toolbar_cb(self, toolbox, toolbar_index):
-        if toolbar_index == 0 and self.canvas != self._main_view:
-            self.set_canvas(self._main_view)
-            self._main_view.show()
-
     def _notify_selected_entry_cb(self, list_view, pspec):
         if list_view.props.selected_entry:
             self._toolbox.set_current_toolbar(1)
@@ -78,12 +72,13 @@ class JournalActivity(activity.Activity):
 
     def _entry_activated_cb(self, list_view, entry):
         detail_view = DetailView(entry.jobject)
+        detail_view.connect('go-back-clicked', self._go_back_clicked_cb)
         self.set_canvas(detail_view)
         detail_view.show()
     
     def _go_back_clicked_cb(self, detail_view):
-        self.set_canvas(self._main_view)
-        self._main_view.show()
+        self._show_main_view()
+        self._toolbox.set_current_toolbar(0)
 
     def _notify_active_cb(self, widget, pspec):
         if self.props.active:
@@ -92,15 +87,18 @@ class JournalActivity(activity.Activity):
 
     def _query_changed_cb(self, toolbar, query):
         self._list_view.update_with_query(query)
+        self._show_main_view()
+
+    def _show_main_view(self):
         self.set_canvas(self._main_view)
         self._main_view.show()
 
     def _entry_erased_cb(self, toolbar):
         self._list_view.refresh()
-        self.set_canvas(self._main_view)
-        self._main_view.show()
+        self._show_main_view()
+        self._toolbox.set_current_toolbar(0)
 
     def _volume_changed_cb(self, volume_toolbar, volume_id):
         logging.debug('Selected volume: %r.' % volume_id)
         self._toolbox.search_toolbar.set_volume_id(volume_id)
-
+        self._toolbox.set_current_toolbar(0)