Merge lp:~midori/midori/settingsGetAction into lp:midori

[Cris Dywan]

Implement Midori.Settings.get_action

Unmerged revisions

6985. By Cris Dywan on 2015-07-10

Statusbar Features use midori_context_action_create_widget

6984. By Cris Dywan on 2015-07-07

Implement Midori.Settings.get_action

=== modified file 'extensions/statusbar-features.c'
--- extensions/statusbar-features.c	2015-06-06 12:32:23 +0000
+++ extensions/statusbar-features.c	2015-07-10 18:30:41 +0000
@@ -39,7 +39,9 @@
                                                     GtkWidget*  button)
 {
     GtkToolbarStyle style = katze_object_get_enum (toolbar, "toolbar-style");
-    const gchar* text = g_object_get_data (G_OBJECT (button), "feature-label");
+    GtkAction* action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (button));
+    gchar* text;
+    g_object_get (action, "short-name", &text, NULL);
     switch (style)
     {
         case GTK_TOOLBAR_BOTH:
@@ -58,6 +60,7 @@
         default:
             g_assert_not_reached ();
     }
+    g_free (text);
 }
 
 static void
@@ -114,12 +117,7 @@
 {
     const gchar* kind = NULL;
     GtkWidget* button;
-    GtkWidget* image;
-    if (!strcmp (property, "auto-load-images")
-     || !strcmp (property, "enable-javascript")
-     || !strcmp (property, "enable-plugins"))
-        kind = "toggle";
-    else if (!strcmp (property, "identify-as"))
+    if (!strcmp (property, "identify-as"))
         kind = "custom-user-agent";
     else if (strstr (property, "font") != NULL)
         kind = "font";
@@ -139,7 +137,13 @@
         return button;
     }
 
-    button = katze_property_proxy (settings, property, kind);
+    button = midori_context_action_create_widget (midori_settings_get_action (MIDORI_SETTINGS (settings), property));
+    if (GTK_IS_CHECK_BUTTON (button) && gtk_button_get_image (GTK_BUTTON (button)))
+    {
+        gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
+        gtk_button_set_label (GTK_BUTTON (button), "");
+        gtk_widget_show (gtk_button_get_image (GTK_BUTTON (button)));
+    }
     if (GTK_IS_BIN (button))
     {
         GtkWidget* label = gtk_bin_get_child (GTK_BIN (button));
@@ -147,29 +151,7 @@
             gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
     }
 
-    if (!strcmp (property, "auto-load-images"))
-    {
-        g_object_set_data (G_OBJECT (button), "feature-label", _("Images"));
-        image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU);
-        gtk_button_set_image (GTK_BUTTON (button), image);
-        gtk_widget_set_tooltip_text (button, _("Load images automatically"));
-    }
-    else if (!strcmp (property, "enable-javascript"))
-    {
-        g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts"));
-        image = gtk_image_new_from_stock (STOCK_SCRIPT, GTK_ICON_SIZE_MENU);
-        gtk_button_set_image (GTK_BUTTON (button), image);
-        gtk_widget_set_tooltip_text (button, _("Enable scripts"));
-    }
-    else if (!strcmp (property, "enable-plugins"))
-    {
-        if (!midori_web_settings_has_plugin_support ())
-            gtk_widget_hide (button);
-        g_object_set_data (G_OBJECT (button), "feature-label", _("Netscape plugins"));
-        image = gtk_image_new_from_stock (MIDORI_STOCK_PLUGINS, GTK_ICON_SIZE_MENU);
-        gtk_button_set_image (GTK_BUTTON (button), image);
-        gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins"));
-    }
+    g_assert (g_strcmp0 (kind, "shut up the warning for now"));
     if (GTK_IS_TOOLBAR (toolbar) && GTK_IS_BUTTON (button))
     {
         statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);

=== modified file 'katze/katze-utils.c'
--- katze/katze-utils.c	2014-05-20 02:15:05 +0000
+++ katze/katze-utils.c	2015-07-10 18:30:41 +0000
@@ -316,6 +316,8 @@
  * Since 0.2.1 the proxy may contain a label if the platform
  *     has according widgets.
  *
+ * Deprecated: 0.6.0: Use #MidoriSettings.get_action() instead.
+ *
  * Return value: (transfer full): a new widget
  **/
 GtkWidget*

=== modified file 'midori/midori-contextaction.vala'
--- midori/midori-contextaction.vala	2015-06-06 12:20:44 +0000
+++ midori/midori-contextaction.vala	2015-07-10 18:30:41 +0000
@@ -92,6 +92,25 @@
         }
 #endif
 
+        /* Button defined here to allow "unowned" return for the benefit of C */
+        Gtk.Button button;
+        public GLib.Object? object { get; set; default = null; }
+        public string? property { get; set; default = null; }
+        public virtual unowned Gtk.Widget create_widget () {
+            GLib.ParamSpec? pspec = object.get_class ().find_property (property);
+            if (pspec.value_type == typeof (bool)) {
+                button = new Gtk.CheckButton ();
+                button.bind_property ("active", object, property);
+            } else {
+                button = new Gtk.Button ();
+            }
+            button.label = label;
+            button.tooltip_text = tooltip;
+            if (stock_id != null)
+                button.image = new Gtk.Image.from_stock (stock_id, Gtk.IconSize.BUTTON);
+            return button;
+        }
+
         Gtk.ToolButton toolitem;
         public override unowned Gtk.Widget create_tool_item () {
             toolitem = base.create_tool_item () as Gtk.ToolButton;

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2015-07-06 21:26:46 +0000
+++ midori/midori-preferences.c	2015-07-10 18:30:41 +0000
@@ -349,8 +349,7 @@
     /* Page "Behavior" */
     PAGE_NEW (GTK_STOCK_SELECT_COLOR, _("Behavior"));
     FRAME_NEW (NULL);
-    button = katze_property_proxy (settings, "auto-load-images", NULL);
-    gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically"));
+    button = midori_context_action_create_widget (midori_settings_get_action (MIDORI_SETTINGS (settings), "auto-load-images"));
     INDENTED_ADD (button);
     button = katze_property_proxy (settings, "enable-spell-checking", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking"));
@@ -577,17 +576,11 @@
     gtk_label_set_markup (GTK_LABEL (label), markup);
     g_free (markup);
     katze_preferences_add_widget (preferences, label, "filled");
-    button = katze_property_proxy (settings, "enable-offline-web-application-cache", NULL);
-    gtk_button_set_label (GTK_BUTTON (button), _("Enable offline web application cache"));
+    button = midori_context_action_create_widget (midori_settings_get_action (MIDORI_SETTINGS (settings), "enable-offline-web-application-cache"));
     katze_preferences_add_widget (preferences, button, "indented");
-    button = katze_property_proxy (settings, "enable-html5-local-storage", NULL);
-    gtk_button_set_label (GTK_BUTTON (button), _("Enable HTML5 local storage support"));
+    button = midori_context_action_create_widget (midori_settings_get_action (MIDORI_SETTINGS (settings), "enable-html5-local-storage"));
     katze_preferences_add_widget (preferences, button, "spanned");
-    button = katze_property_proxy (settings, "strip-referer", NULL);
-    /* i18n: Reworded: Shorten details propagated when going to another page */
-    gtk_button_set_label (GTK_BUTTON (button), _("Strip referrer details sent to websites"));
-    /* i18n: Referer here is not a typo but a technical term */
-    gtk_widget_set_tooltip_text (button, _("Whether the \"Referer\" header should be shortened to the hostname"));
+    button = midori_context_action_create_widget (midori_settings_get_action (MIDORI_SETTINGS (settings), "strip-referer"));
     katze_preferences_add_widget (preferences, button, "indented");
     katze_preferences_add_widget (preferences, gtk_label_new (NULL), "indented");
     button = gtk_label_new (_("Delete pages from history after:"));

=== modified file 'midori/midori-settings.vala'
--- midori/midori-settings.vala	2013-11-24 21:50:38 +0000
+++ midori/midori-settings.vala	2015-07-10 18:30:41 +0000
@@ -189,5 +189,59 @@
                 || property == "user-stylesheet-uri"
                 || property.has_suffix ("-width");
         }
+
+        /* Determines if Netscape plugins are supported. This can also
+           indicate that plugins are forcibly disabled for testing.
+           Since: 0.6.0 */
+        public static bool has_plugin_support () {
+            if (strcmp (GLib.Environment.get_variable ("MIDORI_DEBUG"), "unarmed") == 0)
+                return false;
+            if (strcmp (GLib.Environment.get_variable ("MOZ_PLUGIN_PATH"), "/") == 0)
+                return false;
+            return true;
+        }
+
+        /* Since: 0.6.0 */
+        public Midori.ContextAction? get_action (string property) {
+            var action = new Midori.ContextAction (property, null, null, null);
+            GLib.ParamSpec? pspec = get_class ().find_property (property);
+            if (pspec == null) {
+                GLib.warning (_("Property '%s' is invalid for %s"),
+                              property, get_class ().get_type ().name ());
+                return action;
+            }
+
+            action.object = this;
+            action.property = property;
+
+            action.label = pspec.get_nick ();
+            action.tooltip = pspec.get_blurb ();
+
+            if (property == "enable-offline-web-application-cache")
+                action.label = _("Enable offline web application cache");
+            else if (property == "enable-html5-local-storage")
+                action.label = _("Enable HTML5 local storage support");
+            else if (property == "strip-referer") {
+                /* i18n: Reworded: Shorten details propagated when going to another page */
+                action.label = _("Strip referrer details sent to websites");
+                /* i18n: Referer here is not a typo but a technical term */
+                action.tooltip = _("Whether the \"Referer\" header should be shortened to the hostname");
+            } else if (property == "auto-load-images") {
+                action.label = action.tooltip = _("Load images automatically");
+                action.short_label = _("Images");
+                action.stock_id = "image-x-generic";
+            } else if (property == "enable-javascript") {
+                action.label = action.tooltip = _("Enable scripts");
+                action.short_label = _("Scripts");
+                action.stock_id = "text-x-javascript";
+            } else if (property == "enable-plugins") {
+                action.label = action.tooltip = _("Enable Netscape plugins");
+                action.short_label = _("Netscape plugins");
+                action.stock_id = "application-x-shockwave-flash";
+                action.visible = has_plugin_support ();
+            } else if (property == "")
+                action.label = _("");
+            return action;
+        }
     }
 }

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2015-07-06 21:26:46 +0000
+++ midori/midori-websettings.c	2015-07-10 18:30:41 +0000
@@ -609,11 +609,12 @@
  * Returns: %TRUE if Netscape plugins can be used
  *
  * Since: 0.4.4
+ * Deprecated: 0.6.0: Use #MidoriSettings.has_plugin_support instead.
  **/
 gboolean
 midori_web_settings_has_plugin_support (void)
 {
-    return !midori_debug ("unarmed")  && g_strcmp0 (g_getenv ("MOZ_PLUGIN_PATH"), "/");
+    return midori_settings_has_plugin_support ();
 }
 
 /**