Merge lp:~midori/midori/win32theme into lp:midori

[Cris Dywan]

Implement GTK+ theme switching via Preferences (Win32)

[Paweł Forysiuk (tuxator)]

Works nice. Thanks

review: Approve

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2013-07-26 16:08:27 +0000
+++ midori/midori-preferences.c	2013-08-04 15:35:32 +0000
@@ -241,6 +241,17 @@
 }
 #endif
 
+#ifdef G_OS_WIN32
+static void
+midori_preferences_theme_changed_cb (GtkWidget* button,
+                                     gpointer   user_data)
+{
+    MidoriSettings* settings = user_data;
+    midori_settings_set_theme_name (settings,
+        gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (button)));
+}
+#endif
+
 /**
  * midori_preferences_set_settings:
  * @settings: the settings
@@ -426,6 +437,39 @@
     /* Page "Interface" */
     PAGE_NEW (GTK_STOCK_CONVERT, _("Browsing"));
         FRAME_NEW (NULL);
+    #ifdef G_OS_WIN32
+    INDENTED_ADD (gtk_label_new (_("Theme:")));
+    button = gtk_combo_box_text_new ();
+    SPANNED_ADD (button);
+    guint i = 0;
+    /* On Windows the default theme may be a built-in specific to the
+       running system. So we always add the default and skip it later.
+     */
+    const gchar* default_theme = midori_settings_get_default_theme_name (MIDORI_SETTINGS (settings));
+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (button), default_theme);
+    gtk_combo_box_set_active (GTK_COMBO_BOX (button), i++);
+
+    const gchar* current_theme = midori_settings_get_theme_name (MIDORI_SETTINGS (settings));
+    gchar* theme_path = midori_paths_get_data_filename ("themes", FALSE);
+    GDir* dir;
+    if ((dir = g_dir_open (theme_path, 0, NULL)))
+    {
+        const gchar* name;
+        while ((name = g_dir_read_name (dir)))
+        {
+            if (!g_strcmp0 (name, default_theme))
+                continue;
+            gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (button), name);
+            if (!g_strcmp0 (name, current_theme))
+                gtk_combo_box_set_active (GTK_COMBO_BOX (button), i);
+            i++;
+        }
+        g_dir_close (dir);
+        g_signal_connect (button, "changed",
+                          G_CALLBACK (midori_preferences_theme_changed_cb), settings);
+    }
+    g_free (theme_path);
+    #endif
         INDENTED_ADD (gtk_label_new (_("Toolbar Style:")));
         button = katze_property_proxy (settings, "toolbar-style", NULL);
         SPANNED_ADD (button);

=== modified file 'midori/midori-settings.vala'
--- midori/midori-settings.vala	2013-07-07 12:25:55 +0000
+++ midori/midori-settings.vala	2013-08-04 15:35:32 +0000
@@ -65,6 +65,26 @@
         /* Since: 0.4.8 */
         public uint inactivity_reset { get; set; default = 0; }
 
+        string? default_theme_name_ = null;
+        /* Since: 0.5.5 */
+        public string? default_theme_name { get {
+            if (default_theme_name_ == null)
+                default_theme_name_ = Gtk.Settings.get_default ().gtk_theme_name;
+            return default_theme_name_;
+        } }
+        string? theme_name_ = null;
+        /* Since: 0.5.5 */
+        public string? theme_name { get {
+            return theme_name_;
+        } set {
+            if (theme_name != value) {
+                if (default_theme_name_ == null)
+                    default_theme_name_ = Gtk.Settings.get_default ().gtk_theme_name;
+                theme_name_ = value;
+                Gtk.Settings.get_default ().gtk_theme_name = theme_name_;
+            }
+        } }
+
         GLib.Regex? block_uris_regex = null;
         /* Since: 0.4.8 */
         public string? block_uris { get {

=== modified file 'win32/makedist/makedist.midori'
--- win32/makedist/makedist.midori	2013-06-01 22:51:02 +0000
+++ win32/makedist/makedist.midori	2013-08-04 15:35:32 +0000
@@ -207,6 +207,7 @@
 if [ "$GTK3_BUILD" == "1" ]; then
     grab_files share webkitgtk-3.0
     grab_files share schemas
+    grab_files share/themes/Greybird/ gtk-3.0
     MO_VER=30
 else
     grab_files share MS-Windows