Refactor to not destroy the detailed view for each switch.

Cleanup code a bit, fix a typo in the detailed view refresh code.

1 files changed, 36 insertions, 37 deletions

diff --git a/journaltoolbox.py b/journaltoolbox.py
index 85b4dd8..dc02fc6 100644
--- a/journaltoolbox.py
+++ b/journaltoolbox.py
@@ -41,7 +41,7 @@ import backup
 
 _AUTOSEARCH_TIMEOUT = 1000
             
-class JournalToolbox(Toolbox):
+class MainToolbox(Toolbox):
     def __init__(self):
         Toolbox.__init__(self)
 
@@ -305,6 +305,29 @@ class ManageToolbar(gtk.Toolbar):
     def __init__(self):
         gtk.Toolbar.__init__(self)
 
+class BackupToolbar(gtk.Toolbar):
+    __gtype_name__ = 'BackupToolbar'
+
+    def __init__(self):
+        gtk.Toolbar.__init__(self)
+
+        self._backup = ToolButton('document-save')
+        self._backup.set_tooltip(_('Backup'))
+        self._backup.connect('clicked', self._backup_clicked_cb)
+        self.insert(self._backup, -1)
+        self._backup.show()
+
+    def _backup_clicked_cb(self, button):
+        backup.backup_gui()
+
+class DetailToolbox(Toolbox):
+    def __init__(self):
+        Toolbox.__init__(self)
+
+        self.entry_toolbar = EntryToolbar()
+        self.add_toolbar('', self.entry_toolbar)
+        self.entry_toolbar.show()
+
 class EntryToolbar(gtk.Toolbar):
     __gtype_name__ = 'EntryToolbar'
 
@@ -317,17 +340,9 @@ class EntryToolbar(gtk.Toolbar):
                             ([]))
     }
 
-    def __init__(self, jobject):
+    def __init__(self):
         gtk.Toolbar.__init__(self)
 
-        self._jobject = jobject
-
-        separator = gtk.SeparatorToolItem()
-        separator.set_size_request(style.GRID_CELL_SIZE, -1)
-        separator.props.draw = False
-        self.add(separator)
-        separator.show()
-
         go_back_button = ToolButton('go-previous-mini')
         go_back_button.set_tooltip(_('Go back'))
         go_back_button.connect('clicked', self._go_back_button_clicked_cb)
@@ -372,17 +387,14 @@ class EntryToolbar(gtk.Toolbar):
         self.add(self._resume)
         self._resume.show()
 
-        separator = gtk.SeparatorToolItem()
-        separator.set_size_request(style.GRID_CELL_SIZE, -1)
-        separator.props.draw = False
-        self.add(separator)
-        separator.show()
-
+    def set_jobject(self, jobject):
+        self._jobject = jobject
         self._refresh_copy_palette()
         self._refresh_resume_palette()
 
     def _resume_clicked_cb(self, button):
-        self._jobject.resume()
+        if self._jobject:
+            self._jobject.resume()
 
     def _copy_clicked_cb(self, button):
         clipboard = gtk.Clipboard()
@@ -397,18 +409,21 @@ class EntryToolbar(gtk.Toolbar):
         pass
 
     def _erase_button_clicked_cb(self, button):
-        datastore.delete(self._jobject.object_id)
-        self.emit('entry-erased')
+        if self._jobject:
+            datastore.delete(self._jobject.object_id)
+            self.emit('entry-erased')
 
     def _go_back_button_clicked_cb(self, back_bar):
         self.emit('go-back-clicked')
         return False
 
     def _resume_menu_item_activate_cb(self, menu_item, service_name):
-        self._jobject.resume(service_name)
+        if self._jobject:
+            self._jobject.resume(service_name)
 
     def _copy_menu_item_activate_cb(self, menu_item, volume):
-        datastore.copy(self._jobject, volume.id)
+        if self._jobject:
+            datastore.copy(self._jobject, volume.id)
 
     def _refresh_copy_palette(self):
         palette = self._copy.get_palette()
@@ -443,19 +458,3 @@ class EntryToolbar(gtk.Toolbar):
                                   activity.service_name)
                 palette.menu.append(menu_item)
                 menu_item.show()
-
-class BackupToolbar(gtk.Toolbar):
-    __gtype_name__ = 'BackupToolbar'
-
-    def __init__(self):
-        gtk.Toolbar.__init__(self)
-
-        self._backup = ToolButton('document-save')
-        self._backup.set_tooltip(_('Backup'))
-        self._backup.connect('clicked', self._backup_clicked_cb)
-        self.insert(self._backup, -1)
-        self._backup.show()
-
-    def _backup_clicked_cb(self, button):
-        backup.backup_gui()
-