Merge lp:~kalikiana/midori/dialoglauncher into lp:midori

[Cris Dywan]

Replace 'Run as app' in bookmark dialog with 'Create launcher'

Replace 'Run as app' in bookmark dialog with 'Create launcher'

[Cris Dywan (kalikiana)]

Let's introduce a trigger mechanism instead of hard-coding it. We whitelist extensions that are allowed to be automatically through a button or menu item. In this case the bookmark dialog requests a trigger (the same mechanism will be usable for the toolbar context menu). The extension registers the trigger in extension_init.

[Cris Dywan (kalikiana)]

I gave this more thought. I'm now concerned that a trigger has to both activate an extension and call the action. And the browser needs to get a hold of the label which is tricky since it cannot get a MidoriApp easily.

I'd prefer to consider apps as a stock extension for now. For consistency I'm really eager to solve the UI bit but as it seems the triggers won't be ready for a while.

[André Stösel (ivaldi)]

Looks good!

review: Approve

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:midori failed due to conflicts:

text conflict in extensions/apps.vala

[lp:~kalikiana/midori/dialoglauncher]

6182. By Cris Dywan on 2013-08-06

Merge lp:midori

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-07-16 14:20:37 +0000
+++ extensions/apps.vala	2013-08-06 20:23:26 +0000
@@ -380,24 +380,26 @@
             }
         }
 
-        void tool_menu_populated (Midori.Browser browser, Gtk.Menu menu) {
-            var menuitem = new Gtk.MenuItem.with_mnemonic (_("Create _Launcher"));
-            menuitem.show ();
-            menu.append (menuitem);
-            menuitem.activate.connect (() => {
+        void browser_added (Midori.Browser browser) {
+            var accels = new Gtk.AccelGroup ();
+            browser.add_accel_group (accels);
+            var action_group = browser.get_action_group ();
+
+            var action = new Gtk.Action ("CreateLauncher", _("Create _Launcher"),
+                _("Creates a new app for a specific site"), null);
+            action.activate.connect (() => {
                 var view = browser.tab as Midori.View;
                 string checksum = Checksum.compute_for_string (ChecksumType.MD5, view.get_display_uri (), -1);
                 Launcher.create.begin (APP_PREFIX, app_folder.get_child (checksum),
                     view.get_display_uri (), view.get_display_title (), browser);
             });
-        }
+            action_group.add_action_with_accel (action, "<Ctrl><Shift>A");
+            action.set_accel_group (accels);
+            action.connect_accelerator ();
 
-        void browser_added (Midori.Browser browser) {
             var viewable = new Sidebar (array, app_folder, profile_folder);
             viewable.show ();
             browser.panel.append_page (viewable);
-            browser.populate_tool_menu.connect (tool_menu_populated);
-            // TODO website context menu
             widgets.append (viewable);
         }
 
@@ -424,6 +426,12 @@
             app.add_browser.disconnect (browser_added);
             foreach (var widget in widgets)
                 widget.destroy ();
+            foreach (var browser in app.get_browsers ()) {
+                var action_group = browser.get_action_group ();
+                var action = action_group.get_action ("CreateLauncher");
+                action_group.remove_action (action);
+            }
+
         }
 
         internal Manager () {

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-08-02 12:00:42 +0000
+++ midori/midori-browser.c	2013-08-06 20:23:26 +0000
@@ -1070,8 +1070,19 @@
                                                 KatzeItem* bookmark)
 {
     MidoriBrowser* browser = midori_browser_get_for_widget (button);
-    gtk_widget_set_sensitive (button, FALSE);
     midori_browser_add_speed_dial (browser);
+    GtkWidget* dialog = gtk_widget_get_toplevel (button);
+    gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_DELETE_EVENT);
+}
+
+static void
+midori_browser_edit_bookmark_create_launcher_cb (GtkWidget* button,
+                                                 KatzeItem* bookmark)
+{
+    GtkAction* action = g_object_get_data (G_OBJECT (button), "midori-action");
+    gtk_action_activate (action);
+    GtkWidget* dialog = gtk_widget_get_toplevel (button);
+    gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_DELETE_EVENT);
 }
 
 /* Private function, used by MidoriBookmarks and MidoriHistory */
@@ -1095,7 +1106,6 @@
     GtkWidget* entry_uri;
     GtkWidget* combo_folder;
     GtkWidget* check_toolbar;
-    GtkWidget* check_app;
     gboolean return_status = FALSE;
     sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db");
     if (!db)
@@ -1180,15 +1190,6 @@
         katze_item_get_meta_integer (bookmark, "parentid"));
     gtk_box_pack_start (GTK_BOX (vbox), combo_folder, FALSE, FALSE, 0);
 
-    if (new_bookmark && !is_folder)
-    {
-        label = gtk_button_new_with_mnemonic (_("Add to _Speed Dial"));
-        g_signal_connect (label, "clicked",
-            G_CALLBACK (midori_browser_edit_bookmark_add_speed_dial_cb), bookmark);
-            return_status = TRUE;
-        gtk_dialog_add_action_widget (GTK_DIALOG (dialog), label, GTK_RESPONSE_HELP);
-    }
-
     hbox = gtk_hbox_new (FALSE, 6);
     gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
     check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in Bookmarks _Bar"));
@@ -1196,14 +1197,28 @@
         katze_item_get_meta_boolean (bookmark, "toolbar"));
     gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, FALSE, FALSE, 0);
 
-    check_app = NULL;
-    if (!is_folder)
+    if (new_bookmark && !is_folder)
     {
-        check_app = gtk_check_button_new_with_mnemonic (_("Run as _web application"));
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_app),
-            katze_item_get_meta_boolean (bookmark, "app"));
-        gtk_box_pack_start (GTK_BOX (hbox), check_app, FALSE, FALSE, 0);
+        hbox = gtk_hbox_new (FALSE, 6);
+        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+        label = gtk_button_new_with_mnemonic (_("Add to _Speed Dial"));
+        g_signal_connect (label, "clicked",
+            G_CALLBACK (midori_browser_edit_bookmark_add_speed_dial_cb), bookmark);
+        gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+        /* FIXME: There's no API for extending the bookmark dialog */
+        GtkAction* action = _action_by_name (browser, "CreateLauncher");
+        if (action != NULL)
+        {
+            label = gtk_button_new_with_mnemonic (gtk_action_get_label (action));
+            g_object_set_data (G_OBJECT (label), "midori-action", action);
+            g_signal_connect (label, "clicked",
+                G_CALLBACK (midori_browser_edit_bookmark_create_launcher_cb), bookmark);
+            gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+        }
     }
+
     gtk_widget_show_all (content_area);
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
@@ -1216,12 +1231,8 @@
         katze_item_set_meta_integer (bookmark, "toolbar",
             gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)));
         if (!is_folder)
-        {
             katze_item_set_uri (bookmark,
                 gtk_entry_get_text (GTK_ENTRY (entry_uri)));
-            katze_item_set_meta_integer (bookmark, "app",
-                gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_app)));
-        }
 
         selected = midori_bookmark_folder_button_get_active (combo_folder);
         katze_item_set_meta_integer (bookmark, "parentid", selected);

=== modified file 'midori/midori-extension.c'
--- midori/midori-extension.c	2013-05-19 09:33:02 +0000
+++ midori/midori-extension.c	2013-08-06 20:23:26 +0000
@@ -559,8 +559,8 @@
         while (keys && (filename = keys[i++]))
             midori_extension_activate_gracefully (app, extension_path, filename, activate);
         /* FIXME need proper stock extension mechanism */
-        GObject* extension = midori_extension_activate_gracefully (app, extension_path, "libtransfers." G_MODULE_SUFFIX, activate);
-        g_assert (extension != NULL);
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libtransfers." G_MODULE_SUFFIX, activate));
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libapps." G_MODULE_SUFFIX, activate));
     }
     else
     {
@@ -672,7 +672,8 @@
     if (katze_array_get_item_index (extensions, extension) >= 0)
         return;
     /* FIXME need proper stock extension mechanism */
-    if (!strcmp (filename, "libtransfers." G_MODULE_SUFFIX))
+    if (!strcmp (filename, "libtransfers." G_MODULE_SUFFIX)
+     || !strcmp (filename, "libapps." G_MODULE_SUFFIX))
         return;
 
     katze_array_add_item (extensions, extension);