X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=src%2Fquicknote_gtk.py;h=f3daff45c27f31d9101104aeea9057c6f947e37b;hp=561f3090d9a8d259ac9ffa0f6478d3973fed8199;hb=8c59d81188ba9b3904012949b7e01e480ef077b1;hpb=3fbb1a938725988306558a2deb8854033809c44b

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index 561f309..f3daff4 100644
--- 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)
 
@@ -174,13 +178,17 @@ class QuicknoteProgram(hildonize.get_app_class()):
 		)
 		if hildonize.IS_FREMANTLE_SUPPORTED:
 			moveToCategoryButton = gtk.Button(_("Move To Category"))
-			moveToCategoryButton.connect("clicked", self._on_move_category, None)
+			moveToCategoryButton.connect("clicked", self._on_move_category)
 			menuBar.append(moveToCategoryButton)
 
 			deleteCategoryButton = gtk.Button(_("Delete Category"))
-			deleteCategoryButton.connect("clicked", self._on_delete_category, None)
+			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:
@@ -278,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):
@@ -331,7 +337,12 @@ class QuicknoteProgram(hildonize.get_app_class()):
 			# Zoom Out
 			self.enable_zoom(False)
 			return True
-		elif event.keyval == ord("l") and event.get_state() & gtk.gdk.CONTROL_MASK:
+		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)
@@ -339,6 +350,10 @@ class QuicknoteProgram(hildonize.get_app_class()):
 			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):
 		import sqldialog
 		sqldiag = sqldialog.SqlDialog(self._db)