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

[Cris Dywan]

Implement a default zoom level preference

[André Stösel (ivaldi)]

What about [ctrl+0] (normal size)?
I'm not quite sure what to expect...

 - normal = 100%
 or
 - normal = default zoom

[André Stösel (ivaldi)]

We talked about this in IRC and came to the conclusion that [CTRL+0] should reset the zoom to 100%.

review: Approve

=== modified file 'katze/katze-utils.c'
--- katze/katze-utils.c	2013-04-16 23:16:24 +0000
+++ katze/katze-utils.c	2013-07-07 12:29:26 +0000
@@ -705,6 +705,22 @@
             G_CALLBACK (proxy_widget_string_destroy_cb), object);
         g_free (notify_property);
     }
+    else if (type == G_TYPE_PARAM_DOUBLE)
+    {
+        gdouble value;
+        g_object_get (object, property, &value, NULL);
+
+        widget = gtk_spin_button_new_with_range (
+            G_PARAM_SPEC_DOUBLE (pspec)->minimum,
+            G_PARAM_SPEC_DOUBLE (pspec)->maximum, 1);
+        /* Keep it narrow, 5 + 2 digits are usually fine */
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 5 + 2);
+        gtk_spin_button_set_digits (GTK_SPIN_BUTTON (widget), 2);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON (widget), 0.1, -0.1);
+        g_signal_connect (widget, "value-changed",
+                          G_CALLBACK (proxy_spin_button_changed_cb), object);
+    }
     else if (type == G_TYPE_PARAM_FLOAT)
     {
         gfloat value;

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2013-06-26 21:54:50 +0000
+++ midori/midori-preferences.c	2013-07-07 12:29:26 +0000
@@ -403,6 +403,12 @@
     gtk_button_set_label (GTK_BUTTON (button), _("Allow scripts to open popups"));
     gtk_widget_set_tooltip_text (button, _("Whether scripts are allowed to open popup windows automatically"));
     SPANNED_ADD (button);
+    label = gtk_label_new (_("Default Zoom Level"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    INDENTED_ADD (label);
+    button = katze_property_proxy (settings, "zoom-level", NULL);
+    gtk_widget_set_tooltip_text (button, _("Initial factor to enlarge newly opened tabs by"));
+    SPANNED_ADD (button);
 
     FRAME_NEW (NULL);
     button = gtk_label_new (_("Preferred languages"));

=== modified file 'midori/midori-settings.vala'
--- midori/midori-settings.vala	2013-04-11 20:33:43 +0000
+++ midori/midori-settings.vala	2013-07-07 12:29:26 +0000
@@ -119,6 +119,8 @@
         /* Since: 0.1.4 */
         // [Deprecated (since = "0.4.7")]
         public bool find_while_typing { get; set; default = false; }
+        /* Since: 0.5.4 */
+        public double zoom_level { get; set; default = 1.0; }
 
         public bool open_popups_in_tabs { get; set; default = true; }
         /* Since: 0.2.0 */

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-07-01 20:20:33 +0000
+++ midori/midori-view.c	2013-07-07 12:29:26 +0000
@@ -3280,6 +3280,7 @@
                            MidoriWebSettings* settings)
 {
     gboolean zoom_text_and_images;
+    gdouble zoom_level;
 
     if (view->settings)
         g_signal_handlers_disconnect_by_func (view->settings,
@@ -3294,6 +3295,7 @@
                       G_CALLBACK (midori_view_settings_notify_cb), view);
 
     g_object_get (view->settings,
+        "zoom-level", &zoom_level,
         "zoom-text-and-images", &zoom_text_and_images,
         "close-buttons-on-tabs", &view->close_buttons_on_tabs,
         "open-new-pages-in", &view->open_new_pages_in,
@@ -3305,6 +3307,7 @@
     webkit_web_view_set_full_content_zoom (WEBKIT_WEB_VIEW (view->web_view),
         zoom_text_and_images);
     #endif
+    midori_view_set_zoom_level (view, zoom_level);
 }
 
 /**

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2013-06-19 20:20:05 +0000
+++ midori/midori-websettings.c	2013-07-07 12:29:26 +0000
@@ -1395,7 +1395,7 @@
             integer = g_key_file_get_integer (key_file, "settings", property, NULL);
             g_object_set (settings, property, integer, NULL);
         }
-        else if (type == G_TYPE_PARAM_FLOAT)
+        else if (type == G_TYPE_PARAM_FLOAT || type == G_TYPE_PARAM_DOUBLE)
         {
             number = g_key_file_get_double (key_file, "settings", property, NULL);
             g_object_set (settings, property, number, NULL);
@@ -1504,6 +1504,13 @@
             if (integer != G_PARAM_SPEC_UINT (pspec)->default_value)
                 g_key_file_set_integer (key_file, "settings", property, integer);
         }
+        else if (type == G_TYPE_PARAM_DOUBLE)
+        {
+            gdouble number;
+            g_object_get (settings, property, &number, NULL);
+            if (number != G_PARAM_SPEC_DOUBLE (pspec)->default_value)
+                g_key_file_set_double (key_file, "settings", property, number);
+        }
         else if (type == G_TYPE_PARAM_FLOAT)
         {
             gfloat number;