more work on redesigning
[meabook] / ui / hildon_ui.py
index cc69d98..0aaabeb 100644 (file)
@@ -25,8 +25,7 @@ def create_button(title, value):
 class HildonMeabook(MeabookUI):
     def __init__(self, controller):
         MeabookUI.__init__(self, controller)
-        self.internal_names = []
-        self.callback_id = None
+        self.handler = None
         self.window = hildon.StackableWindow()
         self.window.set_title(_('Meabook'))
         self.window.connect('destroy', self.exit)
@@ -38,26 +37,22 @@ class HildonMeabook(MeabookUI):
         about_button = hildon.Button(gtk.HILDON_SIZE_AUTO, \
             hildon.BUTTON_ARRANGEMENT_HORIZONTAL, _('About'))
 
-        # create filter widgets
+        # create filter widgets and connect signals
         self.level1_filter = gtk.RadioButton(None, _('level1'))
         self.level2_filter = gtk.RadioButton(self.level1_filter, _('level2'))
         self.level3_filter = gtk.RadioButton(self.level2_filter, _('level3'))
         for filter_widget in [self.level1_filter, self.level2_filter, \
             self.level3_filter]:
             filter_widget.set_mode(False)
+            filter_widget.connect('toggled', self.apply_filter_cb)
 
         # create items list
-        self.selector = hildon.TouchSelector(text=True)
+        self.selector = hildon.TouchSelector()
 
         # connect signals
         settings_button.connect('clicked', self.show_settings_dialog_cb)
         about_button.connect('clicked', self.show_about_dialog_cb)
-        self.level1_filter.connect('toggled', self.apply_filter_cb, \
-            self.controller.get_level1_items)
-        self.level2_filter.connect('toggled', self.apply_filter_cb, \
-            self.controller.get_level2_items)
-        self.level3_filter.connect('toggled', self.apply_filter_cb, \
-            self.controller.get_level3_items)
+        self.handler = self.selector.connect('changed', self.select_item_cb)
 
         # packing widgets
         self.window.add(self.selector)
@@ -70,35 +65,48 @@ class HildonMeabook(MeabookUI):
         self.window.set_app_menu(menu)
         self.window.show_all()
 
-    def _set_selector_content(self, items):
-        self.internal_names = []
-        for item in items:
-            self.selector.append_text(item[0])
-            self.internal_names.append(item[1])
+    def _set_selector_content(self, selector, handler, items):
+        """Updates selector content."""
+
+        # temporary block handler
+        selector.handler_block(handler)
+
+        # setting new content
+        # model: name, internal_name, type
+        model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_INT, \
+            gobject.TYPE_STRING)
+        for name, internal_name, item_type in items:
+            _iter = model.append()
+            model.set(_iter, 0, name)
+            model.set(_iter, 1, internal_name)
+            model.set(_iter, 2, item_type)
+        selector.remove_column(0)
+        selector.append_text_column(model, False)
+        selector.unselect_all(0)
+
+        # reconnect callback
+        selector.handler_unblock(handler)
+
+    def _show_items_dialog(self, title, items):
+        """Creates dialog with items."""
+
+        selector = hildon.TouchSelector()
+        window = hildon.StackableWindow()
+        window.set_title(title)
+        window.add(selector)
+        handler = selector.connect('changed', self.select_item_cb)
+        self._set_selector_content(selector, handler, items)
+        window.show_all()
 
     # Implementation of Base UI interface
     def start(self):
+        self.apply_filter_cb(self.level1_filter)
         gtk.main()
 
     def exit(self, event):
         gtk.main_quit()
         self.controller.stop()
 
-    def get_current_level(self):
-        if self.level1_filter.get_active(): return 1
-        elif self.level2_filter.get_active(): return 2
-        else: return 3
-
-    def show_items(self, items, level):
-        if level == 1:  # level1_button is not in gorup, process separately
-            self.level1_filter.set_active(True)
-            self.apply_filter_cb(self.level1_filter, \
-                self.controller.get_level1_items, items)
-        elif level == 2:
-            self.level2_filter.set_active(True)
-        else:
-            self.level3_filter.set_active(True)
-
     def show_about_dialog(self):
         dialog = hildon.Dialog()
         dialog.set_title(_('About'))
@@ -126,65 +134,47 @@ class HildonMeabook(MeabookUI):
 
         ConfigurationDialog(self.controller)
 
-    def apply_filter_cb(self, widget, func, items=None):
+    def apply_filter_cb(self, widget):
         """Updates toplevel selector with different level items."""
 
         if not widget.get_active():
             return
 
-        # blocks 'change' event for selector
-        try:
-            self.selector.handler_block(self.callback_id)
-        except:
-            pass
-
-        # update list content
-        self.selector.get_model(0).clear()
-        self._set_selector_content(items or func())
-        self.selector.unselect_all(0)
-
         self.window.set_title(' - '.join([_('Meabook'), widget.get_label()]))
 
-    def _create_items_dialog(self, title):
-        """Creates dialog for showing items."""
-
-        selector = hildon.TouchSelector(text=True)
-        window = hildon.StackableWindow()
-        window.set_title(title)
-        window.add(selector)
-        return window, selector
-
-    def show_middlelevel_dialog(self, widget, column):
-        """Shows subitems of selected level1-item."""
-
-        selected_item = widget.get_current_text()
-        window, selector = self._create_items_dialog(selected_item)
-        selector.connect('changed', self.show_lowlevel_dialog)
-        for item in self.database.get_middlelevel_entries(selected_item):
-            selector.append_text(item)
-        window.show_all()
-
-    def show_lowlevel_dialog(self, widget, column):
-        """Shows lowlevel items."""
-
-        selected_item = widget.get_current_text()
-        window, selector = self._create_items_dialog(selected_item)
-        selector.connect('changed', self.show_item_dialog)
-        for item in self.database.get_lowlevel_entries():
-            selector.append_text(item)
-        window.show_all()
+        if widget == self.level1_filter:
+            self._set_selector_content(self.selector, self.handler, \
+                self.controller.get_all_folders())
+        elif widget == self.level2_filter:
+            self._set_selector_content(self.selector, self.handler, \
+                self.controller.get_all_subfolders())
+        else:
+            self._set_selector_content(self.selector, self.handler, \
+                self.controller.get_all_files())
+
+    def select_item_cb(self, widget, column):
+        """
+        Emits when changes selector content.
+        Opens new StackableWindow with new content.
+        """
+
+        selected_item_index = widget.get_active(0)
+        _iter = widget.get_model(0)[selected_item_index]
+        if _iter[2] == 'folder':
+            self._show_items_dialog(_iter[0], self.controller.get_items(\
+                _iter[1]))
+        else:
+            self._show_item_dialog(_iter[0], self.controller.get_item(_iter[1]))
 
-    def show_item_dialog(self, widget, column):
+    def _show_item_dialog(self, title, item):
         """Shows detailed item information."""
 
-        selected_item = widget.get_current_text()
-        entry = self.database.get_entry(selected_item)
         window = hildon.StackableWindow()
-        window.set_title(selected_item)
+        window.set_title(title)
         pannable_area = hildon.PannableArea()
         vbox = gtk.VBox()
 
-        for key, value in entry.items():
+        for key, value in item.items():
             button = create_button(_(key) , value)
             vbox.pack_start(button)
 
@@ -202,7 +192,7 @@ class ConfigurationDialog:
         self.controller = controller
 
         self.window = hildon.StackableWindow()
-        self.window.set_title(_('Configuration'))
+        self.window.set_title(_('Settings'))
         self.window.connect('destroy', self.close_dialog_cb)
 
         # create menu