Fixing the menu

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

diff --git a/src/constants.py b/src/constants.py
index dfdc97b..a5fa0a1 100644 (file)
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "Quicknote"
 __app_name__ = "quicknote"
 __version__ = "0.7.9"
 __pretty_app_name__ = "Quicknote"
 __app_name__ = "quicknote"
 __version__ = "0.7.9"

-__build__ = 0
+__build__ = 1

 _data_path_ = os.path.join(os.path.expanduser("~"), ".quicknote")
 __app_magic__ = 0xdeadbeef
 _user_logpath_ = "%s/quicknote.log" % _data_path_
 _data_path_ = os.path.join(os.path.expanduser("~"), ".quicknote")
 __app_magic__ = 0xdeadbeef
 _user_logpath_ = "%s/quicknote.log" % _data_path_

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index 32f2a02..561f309 100644 (file)
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -144,12 +144,7 @@ class QuicknoteProgram(hildonize.get_app_class()):
                else:
                        menuBar = gtk.MenuBar()
                        menuBar.show()
                else:
                        menuBar = gtk.MenuBar()
                        menuBar.show()

-
-                       moveToCategoryButton = gtk.Button(_("Move To Category"))
-                       moveToCategoryButton.connect("clicked", self._on_move_category, None)
-
-                       deleteCategoryButton = gtk.Button(_("Delete Category"))
-                       deleteCategoryButton.connect("clicked", self._on_delete_category, None)
+                       vbox.pack_start(menuBar, False, False, 0)

 
                #Create GUI elements
                self._topBox = kopfzeile.Kopfzeile(self._db)
 
                #Create GUI elements
                self._topBox = kopfzeile.Kopfzeile(self._db)

@@ -178,9 +173,16 @@ class QuicknoteProgram(hildonize.get_app_class()):
                        menuBar,
                )
                if hildonize.IS_FREMANTLE_SUPPORTED:
                        menuBar,
                )
                if hildonize.IS_FREMANTLE_SUPPORTED:

+                       moveToCategoryButton = gtk.Button(_("Move To Category"))
+                       moveToCategoryButton.connect("clicked", self._on_move_category, None)

                        menuBar.append(moveToCategoryButton)
                        menuBar.append(moveToCategoryButton)

+
+                       deleteCategoryButton = gtk.Button(_("Delete Category"))
+                       deleteCategoryButton.connect("clicked", self._on_delete_category, None)

                        menuBar.append(deleteCategoryButton)
 
                        menuBar.append(deleteCategoryButton)
 

+                       menuBar.show_all()
+

                if not hildonize.IS_HILDON_SUPPORTED:
                        _moduleLogger.info("No hildonization support")
 
                if not hildonize.IS_HILDON_SUPPORTED:
                        _moduleLogger.info("No hildonization support")