Moved history to the (app)menu

[quicknote] / src / quicknote_gtk.py

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index bd466bb..f3daff4 100644 (file)
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -103,11 +103,11 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
                        menu_items = gtk.MenuItem(_("Delete"))
                        categorymenu.append(menu_items)
-                       menu_items.connect("activate", self._on_delete_category, None)
+                       menu_items.connect("activate", self._on_delete_category)
 
                        menu_items = gtk.MenuItem(_("Move To Category"))
                        categorymenu.append(menu_items)
-                       menu_items.connect("activate", self._on_move_category, None)
+                       menu_items.connect("activate", self._on_move_category)
 
                        category_menu = gtk.MenuItem(_("Category"))
                        category_menu.show()
@@ -117,9 +117,13 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
                        menu_items = gtk.MenuItem(_("Word Wrap"))
                        viewmenu.append(menu_items)
-                       menu_items.connect("activate", self._on_toggle_word_wrap, None)
+                       menu_items.connect("activate", self._on_toggle_word_wrap)
 
-                       view_menu = gtk.MenuItem(_("View"))
+                       menu_items = gtk.MenuItem(_("History"))
+                       viewmenu.append(menu_items)
+                       menu_items.connect("activate", self._on_show_history)
+
+                       view_menu = gtk.MenuItem(_("Note"))
                        view_menu.show()
                        view_menu.set_submenu(viewmenu)
 
@@ -133,15 +137,18 @@ 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)
 
-                       menu_bar.show()
-                       vbox.pack_start(menu_bar, False, False, 0)
+                       vbox.pack_start(menuBar, False, False, 0)
+               else:
+                       menuBar = gtk.MenuBar()
+                       menuBar.show()
+                       vbox.pack_start(menuBar, False, False, 0)
 
                #Create GUI elements
                self._topBox = kopfzeile.Kopfzeile(self._db)
@@ -165,12 +172,24 @@ 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:
+                       moveToCategoryButton = gtk.Button(_("Move To Category"))
+                       moveToCategoryButton.connect("clicked", self._on_move_category)
+                       menuBar.append(moveToCategoryButton)
+
+                       deleteCategoryButton = gtk.Button(_("Delete Category"))
+                       deleteCategoryButton.connect("clicked", self._on_delete_category)
+                       menuBar.append(deleteCategoryButton)
+
+                       historyButton= gtk.Button(_("Note History"))
+                       historyButton.connect("clicked", self._on_show_history)
+                       menuBar.append(historyButton)
+
+                       menuBar.show_all()
 
                if not hildonize.IS_HILDON_SUPPORTED:
                        _moduleLogger.info("No hildonization support")
@@ -267,10 +286,8 @@ class QuicknoteProgram(hildonize.get_app_class()):
                self._isZoomEnabled = zoomEnabled
                if zoomEnabled:
                        self._topBox.hide()
-                       self._notizen.show_history_area(False)
                else:
                        self._topBox.show()
-                       self._notizen.show_history_area(True)
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_device_state_change(self, shutdown, save_unsaved_data, memory_low, system_inactivity, message, userData):
@@ -305,23 +322,36 @@ class QuicknoteProgram(hildonize.get_app_class()):
                                self._window.unfullscreen ()
                        else:
                                self._window.fullscreen ()
+                       return True
                elif (
                        event.keyval == gtk.keysyms.F7 or
                        event.keyval == gtk.keysyms.i and isCtrl
                ):
                        # Zoom In
                        self.enable_zoom(True)
+                       return True
                elif (
                        event.keyval == gtk.keysyms.F8 or
                        event.keyval == gtk.keysyms.o and isCtrl
                ):
                        # Zoom Out
                        self.enable_zoom(False)
-               elif event.keyval == ord("l") and event.get_state() & gtk.gdk.CONTROL_MASK:
+                       return True
+               elif (
+                       event.keyval in (gtk.keysyms.w, gtk.keysyms.q) and
+                       event.get_state() & gtk.gdk.CONTROL_MASK
+               ):
+                       self._window.destroy()
+               elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK:
                        with open(constants._user_logpath_, "r") as f:
                                logLines = f.xreadlines()
                                log = "".join(logLines)
                                self._clipboard.set_text(str(log))
+                       return True
+
+       @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_show_history(self, *args):
+               self._notizen.show_history()
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_view_sql_history(self, widget = None, data = None, data2 = None):
@@ -343,7 +373,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 +413,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()