Merge lp:~xanderfomin/midori/fix-bug1258849 into lp:midori

[Alexander Fomin]

Changing default zoom representation from float value to percent.

[Cris Dywan (kalikiana)]

There's a flaw here: any existing values already stored in user config files will be wrong after this change and anyone programatically dealing with it will be up for a surprise. So I'd rather this were a strictly UI related solution. This already hard-codes "zoom" as a special-case so it may as well deal with 1.0 being 100%?

review: Needs Fixing

Unmerged revisions

6706. By Alexander Fomin on 2014-05-22

Changing default zoom representation from float to percent.

=== modified file 'katze/katze-utils.c'
--- katze/katze-utils.c	2014-02-23 14:51:05 +0000
+++ katze/katze-utils.c	2014-05-23 00:02:13 +0000
@@ -497,6 +497,22 @@
             G_CALLBACK (proxy_widget_string_destroy_cb), object);
         g_free (notify_property);
     }
+    else if (type == G_TYPE_PARAM_DOUBLE && _hint == I_("zoom"))
+    {
+        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);
+        /* Three digits are enough */
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 3);
+        gtk_spin_button_set_digits (GTK_SPIN_BUTTON (widget), 0);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON (widget), 10.0, -10.0);
+        g_signal_connect (widget, "value-changed",
+                          G_CALLBACK (proxy_spin_button_changed_cb), object);
+    }
     else if (type == G_TYPE_PARAM_DOUBLE)
     {
         gdouble value;

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2014-02-22 14:06:19 +0000
+++ midori/midori-preferences.c	2014-05-23 00:02:13 +0000
@@ -411,12 +411,18 @@
     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"));
+
+    FRAME_NEW (NULL);
+    label = gtk_label_new (_("Default zoom level"));
+    gtk_widget_set_tooltip_text (label, _("Initial factor to enlarge newly opened tabs by"));
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     INDENTED_ADD (label);
-    button = katze_property_proxy (settings, "zoom-level", NULL);
+    button = katze_property_proxy (settings, "zoom-level", "zoom");
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON (button), MIDORI_DEFAULT_ZOOM_MIN, MIDORI_DEFAULT_ZOOM_MAX);
     gtk_widget_set_tooltip_text (button, _("Initial factor to enlarge newly opened tabs by"));
     SPANNED_ADD (button);
+    label = gtk_label_new (_("%"));
+    SPANNED_ADD (label);
 
     FRAME_NEW (NULL);
     button = gtk_label_new (_("Preferred languages"));
@@ -425,7 +431,7 @@
     entry = katze_property_proxy (settings, "preferred-languages", "languages");
     gtk_widget_set_tooltip_text (entry, _("A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""));
     SPANNED_ADD (entry);
-    label = gtk_label_new (_("Save downloaded files to:"));
+    label = gtk_label_new (_("Save downloaded files to"));
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     INDENTED_ADD (label);
     button = katze_property_proxy (settings, "download-folder", "folder");

=== modified file 'midori/midori-settings.vala'
--- midori/midori-settings.vala	2013-11-24 21:50:38 +0000
+++ midori/midori-settings.vala	2014-05-23 00:02:13 +0000
@@ -140,7 +140,7 @@
         // [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 double zoom_level { get; set; default = 100.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	2014-04-28 22:01:42 +0000
+++ midori/midori-view.c	2014-05-23 00:02:13 +0000
@@ -351,7 +351,7 @@
                                      "The current zoom level",
                                      G_MINFLOAT,
                                      G_MAXFLOAT,
-                                     1.0f,
+                                     100.0f,
                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
     /**
@@ -1687,7 +1687,7 @@
         }
         if (MIDORI_MOD_SCROLL (event->state))
         {
-            midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0);
+            midori_view_set_zoom_level (MIDORI_VIEW (view), 100.0);
             return FALSE; /* Allow Ctrl + Middle click */
         }
         return FALSE;
@@ -1967,10 +1967,10 @@
     {
         if (event->direction == GDK_SCROLL_DOWN)
             midori_view_set_zoom_level (view,
-                midori_view_get_zoom_level (view) - 0.10f);
+                midori_view_get_zoom_level (view) - 10.0f);
         else if(event->direction == GDK_SCROLL_UP)
             midori_view_set_zoom_level (view,
-                midori_view_get_zoom_level (view) + 0.10f);
+                midori_view_get_zoom_level (view) + 10.0f);
         return TRUE;
     }
     else
@@ -4257,11 +4257,11 @@
 gfloat
 midori_view_get_zoom_level (MidoriView* view)
 {
-    g_return_val_if_fail (MIDORI_IS_VIEW (view), 1.0f);
+    g_return_val_if_fail (MIDORI_IS_VIEW (view), 100.0f);
 
     if (view->web_view != NULL)
-        return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view->web_view));
-    return 1.0f;
+        return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view->web_view)) * 100.0f;
+    return 100.0f;
 }
 
 /**
@@ -4278,7 +4278,7 @@
     g_return_if_fail (MIDORI_IS_VIEW (view));
 
     webkit_web_view_set_zoom_level (
-        WEBKIT_WEB_VIEW (view->web_view), zoom_level);
+        WEBKIT_WEB_VIEW (view->web_view), zoom_level / 100.0f);
     g_object_notify (G_OBJECT (view), "zoom-level");
 }
 

=== modified file 'midori/midori-view.h'
--- midori/midori-view.h	2014-04-05 19:15:34 +0000
+++ midori/midori-view.h	2014-05-23 00:02:13 +0000
@@ -17,6 +17,12 @@
 
 #include <katze/katze.h>
 
+enum
+{
+    MIDORI_DEFAULT_ZOOM_MIN = 30, /* Minimum default zoom value */
+    MIDORI_DEFAULT_ZOOM_MAX = 300 /* Maximum default zoom value */
+};
+
 G_BEGIN_DECLS
 
 typedef enum