Merge lp:~midori/midori/contextActionEscaped into lp:midori

[Cris Dywan]

Implement and use ContextAction.escaped

[gue5t gue5t (gue5t)]

This *removes* underscores, but it should duplicate underscores instead. With this patch, instead of the desired "foo_bar.com" appearing when right-clicking the empty space next to notebook tabs, "foobar.com" is shown (the old behavior is "foo<u>b</u>ar.com", if you mentally interpret the markup).

This patch is a lot simpler than what I had, which is a plus!

review: Needs Fixing

[Cris Dywan (kalikiana)]

Damn me, I've mixed it up before, I'll think of a simple unit test so we know it actually does what it's meant to.

[gue5t gue5t (gue5t)]

Looks good now!

review: Approve

=== modified file 'midori/midori-contextaction.vala'
--- midori/midori-contextaction.vala	2013-08-02 23:45:16 +0000
+++ midori/midori-contextaction.vala	2014-03-06 23:52:22 +0000
@@ -22,6 +22,19 @@
             children = new List<ContextAction> ();
         }
 
+        /*
+           The action label will be escaped for mnemonics so for example
+           "a_fairy_tale" will not get accel keys on "f" or "t".
+
+           Since: 0.5.8
+         */
+        public ContextAction.escaped (string name, string label, string? tooltip, string? stock_id) {
+            string? escaped_label = label.replace ("_", "__");
+            GLib.Object (name: name, label: escaped_label, tooltip: tooltip, stock_id: stock_id);
+            action_groups = new List<Gtk.ActionGroup> ();
+            children = new List<ContextAction> ();
+        }
+
         public delegate void ActionActivateCallback (Gtk.Action action);
         public void add_simple (string name, string? label, string? tooltip, string? stock_id, ActionActivateCallback callback) {
             var action = new ContextAction (name, label, tooltip, stock_id);

=== modified file 'midori/midori-notebook.vala'
--- midori/midori-notebook.vala	2014-03-03 22:49:56 +0000
+++ midori/midori-notebook.vala	2014-03-06 23:52:22 +0000
@@ -260,6 +260,25 @@
             notebook.create_window.disconnect (window_created);
         }
 
+        /* Since: 0.5.8 */
+        public ContextAction get_context_action () {
+            var menu = new Midori.ContextAction ("NotebookContextMenu", null, null, null);
+            uint counter = 0;
+            foreach (var child in notebook.get_children ()) {
+                var tab = child as Midori.Tab;
+                var tally = notebook.get_tab_label (tab) as Tally;
+                var action = new Midori.ContextAction.escaped ("Tab%u".printf (counter), tally.label.label, null, null);
+                action.gicon = tally.icon.gicon;
+                action.activate.connect (()=>{
+                    notebook.set_current_page (notebook.page_num (tab));
+                });
+                menu.add (action);
+                counter++;
+            }
+            context_menu (menu);
+            return menu;
+        }
+
         bool button_pressed (Gdk.EventButton event) {
             /* Propagate events in logical label area */
             foreach (var child in notebook.get_children ()) {
@@ -280,20 +299,7 @@
                 return true;
             }
             else if (event.button == 3) {
-                var menu = new Midori.ContextAction ("NotebookContextMenu", null, null, null);
-                uint counter = 0;
-                foreach (var child in notebook.get_children ()) {
-                    var tab = child as Midori.Tab;
-                    var tally = notebook.get_tab_label (tab) as Tally;
-                    var action = new Gtk.Action ("Tab%u".printf (counter), tally.label.label, null, null);
-                    action.gicon = tally.icon.gicon;
-                    action.activate.connect (()=>{
-                        notebook.set_current_page (notebook.page_num (tab));
-                    });
-                    menu.add (action);
-                    counter++;
-                }
-                context_menu (menu);
+                var menu = get_context_action ();
                 var popup = menu.create_menu (null, false);
                 popup.show ();
                 popup.attach_to_widget (this, null);

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2014-03-03 22:49:56 +0000
+++ midori/midori-view.c	2014-03-06 23:52:22 +0000
@@ -2370,7 +2370,7 @@
               && strstr (view->selected_text, "://") == NULL))
             {
                 gchar* text = g_strdup_printf (_("Send a message to %s"), view->selected_text);
-                GtkAction* action = gtk_action_new ("SendMessage", text, NULL, GTK_STOCK_JUMP_TO);
+                GtkAction* action = (GtkAction*)midori_context_action_new_escaped ("SendMessage", text, NULL, GTK_STOCK_JUMP_TO);
                 g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->selected_text), (GDestroyNotify)g_free);
                 g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_email_activate_cb), view);
                 midori_context_action_add (menu, action);
@@ -2397,7 +2397,7 @@
             {
                 GdkPixbuf* pixbuf;
                 gchar* search_option = g_strdup_printf ("SearchWith%u", i);
-                GtkAction* action = gtk_action_new (search_option, katze_item_get_name (item), NULL, STOCK_EDIT_FIND);
+                GtkAction* action = (GtkAction*)midori_context_action_new_escaped (search_option, katze_item_get_name (item), NULL, STOCK_EDIT_FIND);
                 g_free (search_option);
                 midori_context_action_add (searches, action);
                 if ((pixbuf = katze_item_get_pixbuf (item, view->web_view)))

=== added file 'tests/notebook.vala'
--- tests/notebook.vala	1970-01-01 00:00:00 +0000
+++ tests/notebook.vala	2014-03-06 23:52:22 +0000
@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 2014 Christian Dywan <[e-mail]>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+void notebook_menu () {
+    var notebook = new Midori.Notebook ();
+    /* FIXME: we should just use a Tab but currently it has no title property */
+    var tab = new Midori.View.with_title ("a_fairy_tale", new Midori.WebSettings ());
+    /*var tab = new Midori.View.with_title (null, new Midori.WebSettings ());
+    view.set_html ("<title>a_fairy_tale</title><body>The earth is <em>flat</em> for a fact.</body>");
+    var loop = MainContext.default ();
+    do { loop.iteration (true); } while (view.load_status != Midori.LoadStatus.FINISHED);*/
+    notebook.insert (tab, 0);
+    var menu = notebook.get_context_action ();
+    var tab_menu = menu.get_by_name ("Tab0");
+    assert (tab_menu != null);
+    /* The underscores should be escaped */
+    Katze.assert_str_equal ("Tab0", tab_menu.label, "‪a__fairy__tale");
+}
+
+void main (string[] args) {
+    Test.init (ref args);
+    Midori.App.setup (ref args, null);
+    Test.add_func ("/notebook/menu", notebook_menu);
+    Test.run ();
+}