added search results label

[meabook] / ui / fremantle_ui / fremantle_ui.py

diff --git a/ui/fremantle_ui/fremantle_ui.py b/ui/fremantle_ui/fremantle_ui.py
index 59e9b66..9f03524 100644 (file)
--- a/ui/fremantle_ui/fremantle_ui.py
+++ b/ui/fremantle_ui/fremantle_ui.py
@@ -69,10 +69,8 @@ class FremantleMeabook(MeabookUI):
         search_button = create_menu_button(_('Search'))
         # 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]:
+        self.level3_filter = gtk.RadioButton(self.level1_filter, _('level3'))
+        for filter_widget in [self.level1_filter, self.level3_filter]:
             filter_widget.set_mode(False)
             filter_widget.connect('toggled', self.apply_filter_cb)
         # create items widgets
@@ -110,7 +108,6 @@ class FremantleMeabook(MeabookUI):
         self.window.add(widgets_box)
         # packing menu widgets
         menu.add_filter(self.level1_filter)
-        menu.add_filter(self.level2_filter)
         menu.add_filter(self.level3_filter)
         menu.append(settings_button)
         menu.append(import_button)
@@ -154,15 +151,18 @@ class FremantleMeabook(MeabookUI):
 
         window = hildon.StackableWindow()
         window.set_title(title)
-        if touch_selector_view:
-            container = hildon.TouchSelector()
-            handler = container.connect('changed', self.select_item_cb)
-            set_selector_content(container, handler, items)
+        if not items:
+            container = gtk.Label(_('No items found'))
         else:
-            widgets_box = gtk.VBox()
-            container = hildon.PannableArea()
-            container.add_with_viewport(widgets_box)
-            set_box_content(widgets_box, self._show_item_dialog, items)
+            if touch_selector_view:
+                container = hildon.TouchSelector()
+                handler = container.connect('changed', self.select_item_cb)
+                set_selector_content(container, handler, items)
+            else:
+                widgets_box = gtk.VBox()
+                container = hildon.PannableArea()
+                container.add_with_viewport(widgets_box)
+                set_box_content(widgets_box, self._show_item_dialog, items)
         window.add(container)
         window.show_all()
 
@@ -304,17 +304,11 @@ class FremantleMeabook(MeabookUI):
 
         if not widget.get_active():
             return
-
         self._update_title(' - '.join([_('Meabook'), widget.get_label()]))
-
         if widget == self.level1_filter:
             self._show_ui()
             set_selector_content(self.selector, self.handler, \
                 self.controller.get_all_folders())
-        elif widget == self.level2_filter:
-            self._show_ui()
-            set_selector_content(self.selector, self.handler, \
-                self.controller.get_all_subfolders())
         else:
             self._show_ui(view='box', show_search=True)
             set_box_content(self.box, self._show_item_dialog, \