Merge lp:~midori/midori/domainKeys into lp:midori

[axlrose112]

Implement ctrl+enter extension

[Paweł Forysiuk (tuxator)]

Imho ctrl+enter should only do www. + word + .com

If you wanna support different suffix i would suggest using different key combo maybe
alt + enter.

I would just read that custom suffix from user config, defaulting to .org, with a little note to user that he may change it to domain suffix of his country.
For both default setting and gui you can look at external download extension.

Renaming variables was nice, would just revert the domain thingy from it cause it would change the default behaviour from what i gather.

review: Needs Fixing

[axlrose112 (axlrose112)]

ahh ok, i will improve it then, thank you

[lp:~midori/midori/domainKeys]

6566. By axlrose112 on 2014-03-02

Add www. and .com/.country_domain and proceed with Ctrl+Enter/Ctrl+Shift

[Cris Dywan (kalikiana)]

Nice!

review: Approve

=== added file 'extensions/domain-keys.vala'
--- extensions/domain-keys.vala	1970-01-01 00:00:00 +0000
+++ extensions/domain-keys.vala	2014-03-02 18:28:29 +0000
@@ -0,0 +1,76 @@
+/*
+ Copyright (C) 2014 James Axl <[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.
+*/
+
+namespace DomainHotkeys {
+    class Manager : Midori.Extension {
+        internal Manager () {
+            GLib.Object (name: _("Domain Hotkeys"),
+                         description: _("Add www. and .com/.country_domain and proceed with Ctrl+Enter/Ctrl+Shift"),
+                         version: "0.1" + Midori.VERSION_SUFFIX,
+                         authors: "James Axl <[e-mail]>");
+            activate.connect (this.activated);
+            deactivate.connect (this.deactivated);
+        }
+
+        bool key_press_event (Midori.LocationAction action, Gdk.EventKey event_key) {
+            if (event_key.keyval == Gdk.Key.Return) {
+                if ((bool)(event_key.state & Gdk.ModifierType.CONTROL_MASK)) {
+                    submit_uri(action);
+                    return true;
+                } else if((bool)(event_key.state & Gdk.ModifierType.SHIFT_MASK)) {
+                    submit_uri(action, true);
+                    return true;
+                }
+            }
+            return false;
+        }
+        
+        void submit_uri(Midori.LocationAction action, bool locale = false) {
+			var url = action.get_text ();
+			if (locale){
+				var domain = C_("Domain", ".com");
+				url = "www." + url + domain;
+			} else {
+				url = "www." + url + ".com";
+			}
+			action.submit_uri(url, false);
+		}
+
+        void browser_added (Midori.Browser browser) {
+            var action_group = browser.get_action_group ();
+            var action = action_group.get_action ("Location") as Midori.LocationAction;
+            action.key_press_event.connect (key_press_event);
+        }
+
+        void activated (Midori.App app) {
+            foreach (var browser in app.get_browsers ())
+                browser_added (browser);
+            app.add_browser.connect (browser_added);
+        }
+
+        void browser_removed (Midori.Browser browser) {
+            var action_group = browser.get_action_group ();
+            var action = action_group.get_action ("Location") as Midori.LocationAction;
+            action.key_press_event.disconnect (key_press_event);
+        }
+
+        void deactivated () {
+            var app = get_app ();
+            app.add_browser.disconnect (browser_added);
+            foreach (var browser in app.get_browsers ())
+                browser_removed (browser);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new DomainHotkeys.Manager ();
+}
 
=== modified file 'midori/marshal.list'
--- midori/marshal.list	2013-12-26 17:29:08 +0000
+++ midori/marshal.list	2014-03-02 18:28:29 +0000
@@ -1,3 +1,4 @@
+BOOLEAN:POINTER
 BOOLEAN:OBJECT
 BOOLEAN:OBJECT,OBJECT
 BOOLEAN:OBJECT,OBJECT,POINTER
 
=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2014-02-11 23:01:05 +0000
+++ midori/midori-locationaction.c	2014-03-02 18:28:29 +0000
@@ -69,6 +69,7 @@
     SECONDARY_ICON_RELEASED,
     RESET_URI,
     SUBMIT_URI,
+    KEY_PRESS_EVENT,
     LAST_SIGNAL
 };
 
@@ -176,6 +177,23 @@
                                         G_TYPE_STRING,
                                         G_TYPE_BOOLEAN);
 
+    /**
+     * MidoriLocationAction:key-press-event:
+     *
+     * A key (combination) was pressed in an entry of the action.
+     *
+     * Since 0.5.8
+     */
+    signals[KEY_PRESS_EVENT] = g_signal_new ("key-press-event",
+                                             G_TYPE_FROM_CLASS (class),
+                                             (GSignalFlags) (G_SIGNAL_RUN_LAST),
+                                             0,
+                                             0,
+                                             NULL,
+                                             midori_cclosure_marshal_BOOLEAN__POINTER,
+                                             G_TYPE_BOOLEAN, 1,
+                                             GDK_TYPE_EVENT);
+
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->finalize = midori_location_action_finalize;
     gobject_class->set_property = midori_location_action_set_property;
@@ -1025,6 +1043,11 @@
                                            GdkEventKey* event,
                                            GtkAction*   action)
 {
+    gboolean handled = FALSE;
+    g_signal_emit (action, signals[KEY_PRESS_EVENT], 0, event, &handled);
+    if (handled)
+        return TRUE;
+
     GtkWidget* widget = GTK_WIDGET (entry);
     MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
     const gchar* text;
@@ -1068,8 +1091,10 @@
         }
 
         if (is_enter && (text = gtk_entry_get_text (entry)) && *text)
+        {
             g_signal_emit (action, signals[SUBMIT_URI], 0, text,
                            MIDORI_MOD_NEW_TAB (event->state));
+        }
         break;
     case GDK_KEY_Escape:
     {
 
=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2014-02-22 14:06:19 +0000
+++ midori/midori.vapi	2014-03-02 18:28:29 +0000
@@ -218,6 +218,15 @@
     public class LocationAction : Gtk.Action {
         public static string render_uri ([CCode (array_length = false)] string[] keys, string uri_escaped);
         public static string render_title ([CCode (array_length = false)] string[] keys, string title);
+
+        public double progress { get; set; }
+        public string secondary_icon { get; set; }
+
+        public unowned string get_text ();
+        public void set_text (string text);
+
+        public signal void submit_uri (string uri, bool new_tab);
+        public signal bool key_press_event (Gdk.EventKey event);
     }
 
     [CCode (cheader_filename = "midori/midori.h")]
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-02-21 20:28:57 +0000
+++ po/POTFILES.in	2014-03-02 18:28:29 +0000
@@ -102,3 +102,4 @@
 extensions/adblock/config.vala
 extensions/adblock/updater.vala
 extensions/adblock/element.vala
+extensions/domain-keys.vala