Notices

Originally Posted by qwerty12

Code:

Index: src/uim.vala
===================================================================
--- src/uim.vala	(revision 43)
+++ src/uim.vala	(working copy)
@@ -26,10 +26,10 @@
 		{ "page-details", null, "Details", null, "Details", null },
 		
 		{ "edit", null, "_Edit" },
-		{ "edit-cut", Gtk.STOCK_CUT, "Cut", "<ctrl>X", "Cut", null },
-		{ "edit-copy", Gtk.STOCK_COPY, "Copy", "<ctrl>C", "Copy", null },
-		{ "edit-paste", Gtk.STOCK_PASTE, "Paste", "<ctrl>V", "Paste", null },
-		{ "edit-select-all", Gtk.STOCK_SELECT_ALL, "Select All", "<ctrl>A", "Select All", null },
+		{ "edit-cut", Gtk.STOCK_CUT, "Cut", null, "Cut", null },
+		{ "edit-copy", Gtk.STOCK_COPY, "Copy", null, "Copy", null },
+		{ "edit-paste", Gtk.STOCK_PASTE, "Paste", null, "Paste", null },
+		{ "edit-select-all", Gtk.STOCK_SELECT_ALL, "Select All", null, "Select All", null },
 		
 		{ "view", null, "_View" },
 		{ "view-encoding", null, "Encoding...", null, "Encoding...", null },
@@ -53,12 +53,12 @@
 		{ "close-all-windows", null, "Close All Windows", "<ctrl>Q", "Close All Windows", null },
 		{ "close-remember", null, "Close and Save All", null, "Close and Save All", null },
 		
-		{ "tool-zoomin", null, "Zoom in", "F7", "Zoom in", null },
-		{ "tool-zoomout", null, "Zoom out", "F8", "Zoom out", null },
+		{ "tool-zoomin", null, "Zoom in", null, "Zoom in", null },
+		{ "tool-zoomout", null, "Zoom out", null, "Zoom out", null },
 		{ "tool-find", null, "Find in page", null, "Find in page", null },
 		{ "tool-dashboard", null, "Open Dashboard", null, "Open Dashboard", null },
 
-		{ "toolbar-back", null, "Back in history", "Escape", "Back in history", null },
+		{ "toolbar-back", null, "Back in history", null, "Back in history", null },
 		{ "toolbar-forward", null, "Forward in history", null, "Forward in history", null },
 		{ "toolbar-reload", null, "Reload page", "<ctrl>R", "Reload page", null },
 		
@@ -69,7 +69,7 @@
 	};
 
 	public const ToggleActionEntry[] toggles = {
-		{ "view-fullscreen", null, "Full Screen", "F6", "Full Screen", null, false },
+		{ "view-fullscreen", null, "Full Screen", null, "Full Screen", null, false },
 		{ "tool-showimages", null, "Show Images", "<ctrl>I", "auto_load_images", null, true },
 		{ "tool-plugins", null, "Enable Plugins", "<ctrl>P", "enable_plugins", null, true },
 		{ "tool-javascript", null, "Enable Javascript", null, "enable_scripts", null, true },

This is what I suggest. I've removed the accels that you handle via key-press-event so it stops the double events from happening (going back twice, zooming in double etc) and I've removed the Copy/Paste/Cut/Select All accels as hildon-input-method does an excellent job of handling that and I can copy and paste in the address bar. I have yet to see any functionality removed/downsides.

Jeez... this code formatting sucks

http://qwerty12.qole.org/keyaccels.diff