Adding some app menu buttons

git-svn-id: file:///svnroot/quicknote/trunk@87 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2

diff --git a/src/hildonize.py b/src/hildonize.py
index 0fe0eb0..09ee705 100755 (executable)
--- a/src/hildonize.py
+++ b/src/hildonize.py
@@ -2,6 +2,7 @@
 
 """
 Open Issues
+       @bug not all of a message is shown
        @bug Buttons are too small
 """
 
@@ -91,16 +92,14 @@ except AttributeError:
                hildonize_window = _null_hildonize_window
 
 
-def _fremantle_hildonize_menu(window, gtkMenu, buttons):
+def _fremantle_hildonize_menu(window, gtkMenu):
        appMenu = hildon.AppMenu()
-       for button in buttons:
-               appMenu.append(button)
        window.set_app_menu(appMenu)
        gtkMenu.get_parent().remove(gtkMenu)
        return appMenu
 
 
-def _hildon_hildonize_menu(window, gtkMenu, ignoredButtons):
+def _hildon_hildonize_menu(window, gtkMenu):
        hildonMenu = gtk.Menu()
        for child in gtkMenu.get_children():
                child.reparent(hildonMenu)
@@ -109,7 +108,7 @@ def _hildon_hildonize_menu(window, gtkMenu, ignoredButtons):
        return hildonMenu
 
 
-def _null_hildonize_menu(window, gtkMenu, ignoredButtons):
+def _null_hildonize_menu(window, gtkMenu):
        return gtkMenu
 
 
@@ -722,12 +721,21 @@ if __name__ == "__main__":
        win = gtk.Window()
        win.add(label)
        win = hildonize_window(app, win)
-       if False:
+       if False and IS_FREMANTLE_SUPPORTED:
+               appMenu = hildon.AppMenu()
+               for i in xrange(5):
+                       b = gtk.Button(str(i))
+                       appMenu.append(b)
+               win.set_app_menu(appMenu)
+               win.show_all()
+               appMenu.show_all()
+               gtk.main()
+       elif False:
                print touch_selector(win, "Test", ["A", "B", "C", "D"], 2)
-       if True:
+       elif False:
                print touch_selector_entry(win, "Test", ["A", "B", "C", "D"], "C")
                print touch_selector_entry(win, "Test", ["A", "B", "C", "D"], "Blah")
-       if False:
+       elif False:
                import pprint
                name, value = "", ""
                goodLocals = [
@@ -735,11 +743,11 @@ if __name__ == "__main__":
                        if not name.startswith("_")
                ]
                pprint.pprint(goodLocals)
-       if False:
+       elif False:
                import time
                show_information_banner(win, "Hello World")
                time.sleep(5)
-       if False:
+       elif False:
                import time
                banner = show_busy_banner_start(win, "Hello World")
                time.sleep(5)

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index bd466bb..c13af75 100644 (file)
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -133,15 +133,23 @@ class QuicknoteProgram(hildonize.get_app_class()):
                        help_menu.show()
                        help_menu.set_submenu(helpmenu)
 
-                       menu_bar = gtk.MenuBar()
-                       menu_bar.show()
-                       menu_bar.append (file_menu)
-                       menu_bar.append (category_menu)
-                       menu_bar.append (view_menu)
-                       menu_bar.append (help_menu)
+                       menuBar = gtk.MenuBar()
+                       menuBar.show()
+                       menuBar.append (file_menu)
+                       menuBar.append (category_menu)
+                       menuBar.append (view_menu)
+                       menuBar.append (help_menu)
+
+                       vbox.pack_start(menuBar, False, False, 0)
+               else:
+                       menuBar = gtk.MenuBar()
+                       menuBar.show()
+
+                       moveToCategoryButton = gtk.Button(_("Move To Category"))
+                       moveToCategoryButton.connect("clicked", self._on_move_category, None)
 
-                       menu_bar.show()
-                       vbox.pack_start(menu_bar, False, False, 0)
+                       deleteCategoryButton = gtk.Button(_("Delete Category"))
+                       deleteCategoryButton.connect("clicked", self._on_delete_category, None)
 
                #Create GUI elements
                self._topBox = kopfzeile.Kopfzeile(self._db)
@@ -165,12 +173,13 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
                self._window = hildonize.hildonize_window(self, self._window)
                hildonize.set_application_title(self._window, "%s" % constants.__pretty_app_name__)
-               if hildonize.GTK_MENU_USED:
-                       menu_bar = hildonize.hildonize_menu(
-                               self._window,
-                               menu_bar,
-                               []
-                       )
+               menuBar = hildonize.hildonize_menu(
+                       self._window,
+                       menuBar,
+               )
+               if hildonize.IS_FREMANTLE_SUPPORTED:
+                       menuBar.append(moveToCategoryButton)
+                       menuBar.append(deleteCategoryButton)
 
                if not hildonize.IS_HILDON_SUPPORTED:
                        _moduleLogger.info("No hildonization support")
@@ -343,7 +352,7 @@ class QuicknoteProgram(hildonize.get_app_class()):
                sqldiag.destroy()
 
        @gtk_toolbox.log_exception(_moduleLogger)
-       def _on_move_category(self, widget = None, data = None):
+       def _on_move_category(self, *args):
                comboCategory = gtk.combo_box_new_text()
                comboCategory.append_text('undefined')
                sql = "SELECT id, liste FROM categories WHERE id = 0 ORDER BY liste"
@@ -383,7 +392,7 @@ class QuicknoteProgram(hildonize.get_app_class()):
                        mbox.destroy()
 
        @gtk_toolbox.log_exception(_moduleLogger)
-       def _on_delete_category(self, widget = None, data = None):
+       def _on_delete_category(self, *args):
                if self._topBox.get_category() == "%" or self._topBox.get_category() == "undefined":
                        mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("This category can not be deleted"))
                        response = mbox.run()