From 70f7e8358fa98dbe4568a608c2ee1d760ac1b76d Mon Sep 17 00:00:00 2001
From: Denis Washington <denisw@src.gnome.org>
Date: Fri, 25 May 2007 14:44:03 +0000
Subject: [PATCH] Revert the organization of the theme details dialog to the
 old (2.18)

* appearance.glade:
* appearance-style.c:
Revert the organization of the theme details dialog to the old (2.18)
style again, but now with thumbnails for gtk+, metacity and icon themes.

svn path=/trunk/; revision=7654
---
 capplets/appearance/ChangeLog          |   7 +
 capplets/appearance/appearance-style.c | 134 ++++--
 capplets/appearance/appearance.glade   | 589 ++++++++++++++++---------
 3 files changed, 464 insertions(+), 266 deletions(-)

diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index db8609d89..a7b210d7c 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-25  Denis Washington  <denisw@svn.gnome.org>
+
+	* appearance.glade:
+	* appearance-style.c:
+	Revert the organization of the theme details dialog to the old (2.18)
+	style again, but now with thumbnails for gtk+, metacity and icon themes.
+
 2007-05-16  Jens Granseuer  <jensgr@gmx.net>
 
 	* appearance-style.c: (prepare_combo), (find_string_in_model),
diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c
index d1863682b..958a6a5c0 100644
--- a/capplets/appearance/appearance-style.c
+++ b/capplets/appearance/appearance-style.c
@@ -20,9 +20,11 @@
 #include "appearance.h"
 
 #include <string.h>
+#include <pango/pango.h>
 
 #include "gnome-theme-info.h"
 #include "gconf-property-editor.h"
+#include "theme-thumbnail.h"
 
 enum ThemeType {
   GTK_THEMES,
@@ -41,7 +43,7 @@ static const gchar *gconf_keys[] = {
 };
 
 
-static void prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type);
+static void prepare_list (AppearanceData *data, GtkWidget *list, enum ThemeType type);
 static void update_color_buttons_from_string (gchar *color_scheme, AppearanceData *data);
 
 static void color_scheme_changed (GObject    *settings, GParamSpec *pspec, AppearanceData  *data);
@@ -66,9 +68,9 @@ style_init (AppearanceData *data)
   g_signal_connect_swapped (glade_xml_get_widget (data->xml, "theme_close_button"), "clicked", (GCallback) gtk_widget_hide, w);
   gtk_widget_hide_on_delete (w);
 
-  prepare_combo (data, glade_xml_get_widget (data->xml, "gtk_themes_combobox"), GTK_THEMES);
-  prepare_combo (data, glade_xml_get_widget (data->xml, "window_themes_combobox"), METACITY_THEMES);
-  prepare_combo (data, glade_xml_get_widget (data->xml, "icon_themes_combobox"), ICON_THEMES);
+  prepare_list (data, glade_xml_get_widget (data->xml, "gtk_themes_list"), GTK_THEMES);
+  prepare_list (data, glade_xml_get_widget (data->xml, "window_themes_list"), METACITY_THEMES);
+  prepare_list (data, glade_xml_get_widget (data->xml, "icon_themes_list"), ICON_THEMES);
 
   settings = gtk_settings_get_default ();
   g_object_get (G_OBJECT (settings), "gtk-color-scheme", &colour_scheme, NULL);
@@ -86,29 +88,30 @@ style_init (AppearanceData *data)
 }
 
 static void
-prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type)
+prepare_list (AppearanceData *data, GtkWidget *list, enum ThemeType type)
 {
   GtkListStore *store;
-  GList *l, *list = NULL;
+  GList *l, *themes = NULL;
   GtkCellRenderer *renderer;
+  GtkTreeViewColumn *column;
   GtkTreeModel *sort_model;
 
   switch (type)
   {
     case GTK_THEMES:
-      list = gnome_theme_info_find_by_type (GNOME_THEME_GTK_2);
+      themes = gnome_theme_info_find_by_type (GNOME_THEME_GTK_2);
       break;
 
     case METACITY_THEMES:
-      list = gnome_theme_info_find_by_type (GNOME_THEME_METACITY);
+      themes = gnome_theme_info_find_by_type (GNOME_THEME_METACITY);
       break;
 
     case ICON_THEMES:
-      list = gnome_theme_icon_info_find_all ();
+      themes = gnome_theme_icon_info_find_all ();
       break;
 
     case CURSOR_THEMES:
-      list = NULL; /* don't know what to do yet */
+      themes = NULL; /* don't know what to do yet */
 
     default:
       /* we don't deal with any other type of themes here */
@@ -117,11 +120,12 @@ prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type)
   if (!list)
     return;
 
-  store = gtk_list_store_new (1, G_TYPE_STRING);
+  store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
 
-  for (l = list; l; l = g_list_next (l))
+  for (l = themes; l; l = g_list_next (l))
   {
     gchar *name = NULL;
+    GdkPixbuf *thumbnail;
     GtkTreeIter i;
 
     if (type < ICON_THEMES)
@@ -132,20 +136,56 @@ prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type)
     if (!name)
       continue; /* just in case... */
 
-    gtk_list_store_insert_with_values (store, &i, 0, 0, name, -1);
+    switch (type)
+    {
+      case GTK_THEMES:
+        thumbnail = generate_gtk_theme_thumbnail ((GnomeThemeInfo*) l->data);
+        break;
+
+      case ICON_THEMES:
+        thumbnail = generate_icon_theme_thumbnail ((GnomeThemeIconInfo*) l->data);
+        break;
+      
+      case METACITY_THEMES:
+        thumbnail = generate_metacity_theme_thumbnail ((GnomeThemeInfo*) l->data);
+        break;
+        
+      default:
+        thumbnail = NULL;
+    } 
+
+    gtk_list_store_insert_with_values (store, &i, 0, 0, thumbnail, 1, name, -1);
 
   }
 
   sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (store));
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), 0, GTK_SORT_ASCENDING);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), 1, GTK_SORT_ASCENDING);
 
-  gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (sort_model));
+  gtk_tree_view_set_model (GTK_TREE_VIEW (list), GTK_TREE_MODEL (sort_model));
+
+  renderer = gtk_cell_renderer_pixbuf_new ();
+  g_object_set (G_OBJECT (renderer),
+    "xpad", 3,
+    "ypad", 3,
+    NULL);
+
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_pack_start (column, renderer, FALSE);  
+  gtk_tree_view_column_add_attribute (column, renderer, "pixbuf", 0);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
 
   renderer = gtk_cell_renderer_text_new ();
-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
-  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0);
+  g_object_set (G_OBJECT (renderer),
+    "weight", PANGO_WEIGHT_BOLD,
+    "weight-set", TRUE,
+    NULL);
 
-  gconf_peditor_new_combo_box (NULL, gconf_keys[type], combo,
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_pack_start (column, renderer, FALSE);  
+  gtk_tree_view_column_add_attribute (column, renderer, "text", 1);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+
+  gconf_peditor_new_tree_view (NULL, gconf_keys[type], list,
     "conv-to-widget-cb", conv_to_widget_cb,
     "conv-from-widget-cb", conv_from_widget_cb,
     NULL);
@@ -153,57 +193,54 @@ prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type)
 
 /* Callbacks */
 
-static int
+static gchar *
 find_string_in_model (GtkTreeModel *model, const gchar *value, gint column)
 {
-  gint index = -1;
   GtkTreeIter iter;
-  gboolean found, valid;
-  gchar *test = NULL;
+  gboolean valid;
+  gchar *path = NULL, *test = NULL;
 
   if (!value)
-    return -1;
+    return NULL;
 
   valid = gtk_tree_model_get_iter_first (model, &iter);
-  found = FALSE;
+
   while (valid)
   {
-    index++;
     g_free (test);
     gtk_tree_model_get (model, &iter, column, &test, -1);
     if (test && !strcmp (test, value))
     {
-      found = TRUE;
+      path = gtk_tree_model_get_string_from_iter (model, &iter);
       break;
     }
     valid = gtk_tree_model_iter_next (model, &iter);
   }
   g_free (test);
 
-  return found ? index : -1;
+  return path;
 }
 
 static GConfValue *
 conv_to_widget_cb (GConfPropertyEditor *peditor, GConfValue *value)
 {
   GtkTreeModel *store;
-  GtkComboBox *combo;
+  GtkTreeView *list;
   const gchar *curr_value;
   GConfValue *new_value;
-  gint index;
+  gchar *path;
 
   /* find value in model */
   curr_value = gconf_value_get_string (value);
-  combo = GTK_COMBO_BOX (gconf_property_editor_get_ui_control (peditor));
-  store = gtk_combo_box_get_model (combo);
-
-  index = find_string_in_model (store, curr_value, 0);
+  list = GTK_TREE_VIEW (gconf_property_editor_get_ui_control (peditor));
+  store = gtk_tree_view_get_model (list);
 
+  path = find_string_in_model (store, curr_value, 1);
 
   /* Add a temporary item if we can't find a match
    * TODO: delete this item if it is no longer selected?
    */
-  if (index == -1)
+  if (!path)
   {
     GtkListStore *list_store;
 
@@ -212,15 +249,15 @@ conv_to_widget_cb (GConfPropertyEditor *peditor, GConfValue *value)
     else
       list_store = GTK_LIST_STORE (store);
 
-    gtk_list_store_insert_with_values (list_store, NULL, 0, 0, curr_value, -1);
+    gtk_list_store_insert_with_values (list_store, NULL, 0, 1, curr_value, -1);
     /* if the model is sorted then it might not still be in the position we just
      * placed it, so we have to search the model again... */
-    index = find_string_in_model (store, curr_value, 0);
+    path = find_string_in_model (store, curr_value, 1);
   }
 
-
-  new_value = gconf_value_new (GCONF_VALUE_INT);
-  gconf_value_set_int (new_value, index);
+  new_value = gconf_value_new (GCONF_VALUE_STRING);
+  gconf_value_set_string (new_value, path);
+  g_free (path);
 
   return new_value;
 }
@@ -229,19 +266,22 @@ static GConfValue *
 conv_from_widget_cb (GConfPropertyEditor *peditor, GConfValue *value)
 {
   GConfValue *new_value;
-  gchar *combo_value = NULL;
+  gchar *list_value = NULL;
   GtkTreeIter iter;
+  GtkTreeSelection *selection;
   GtkTreeModel *model;
-  GtkComboBox *combo;
+  GtkTreeView *list;
 
-  combo = GTK_COMBO_BOX (gconf_property_editor_get_ui_control (peditor));
-  model = gtk_combo_box_get_model (combo);
-  gtk_combo_box_get_active_iter (combo, &iter);
-  gtk_tree_model_get (model, &iter, 0, &combo_value, -1);
+  list = GTK_TREE_VIEW (gconf_property_editor_get_ui_control (peditor));
+  model = gtk_tree_view_get_model (list);
+
+  selection = gtk_tree_view_get_selection (list);
+  gtk_tree_selection_get_selected (selection, NULL, &iter);
+  gtk_tree_model_get (model, &iter, 1, &list_value, -1);
 
   new_value = gconf_value_new (GCONF_VALUE_STRING);
-  gconf_value_set_string (new_value, combo_value);
-  g_free (combo_value);
+  gconf_value_set_string (new_value, list_value);
+  g_free (list_value);
 
   return new_value;
 }
diff --git a/capplets/appearance/appearance.glade b/capplets/appearance/appearance.glade
index c8fb26668..f2fb47869 100644
--- a/capplets/appearance/appearance.glade
+++ b/capplets/appearance/appearance.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.2.0 on Wed May 16 18:26:51 2007 by denis@dwashington-->
+<!--Generated with glade3 3.2.0 on Thu May 24 17:43:03 2007 by denis@dwashington-->
 <glade-interface>
   <widget class="GtkDialog" id="render_details">
     <property name="border_width">5</property>
@@ -1806,172 +1806,60 @@ Text only</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox2">
+          <widget class="GtkNotebook" id="notebook2">
             <property name="visible">True</property>
+            <property name="can_focus">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="border_width">12</property>
+            <property name="border_width">5</property>
             <child>
-              <widget class="GtkLabel" id="label2">
+              <widget class="GtkVBox" id="vbox27">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Theme Details&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkTable" id="table1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="border_width">6</property>
-                <property name="n_rows">4</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">24</property>
-                <property name="row_spacing">6</property>
+                <property name="border_width">12</property>
+                <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkComboBox" id="icon_themes_combobox">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="y_options">GTK_EXPAND</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkComboBox" id="window_themes_combobox">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkComboBox" id="gtk_themes_combobox">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label3">
+                  <widget class="GtkScrolledWindow" id="scrolledwindow3">
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Icons:</property>
-                  </widget>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                    <property name="y_options">GTK_EXPAND</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Window borders:</property>
-                  </widget>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                    <property name="y_options">GTK_EXPAND</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Controls:</property>
-                  </widget>
-                  <packing>
-                    <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label6">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Cursor:</property>
-                  </widget>
-                  <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkComboBox" id="cursor_themes_combobox">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="colors_vbox">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkLabel" id="label7">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Colors&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkHBox" id="hbox6">
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="no_show_all">True</property>
-                    <property name="spacing">12</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
                     <child>
-                      <widget class="GtkImage" id="image1">
+                      <widget class="GtkTreeView" id="gtk_themes_list">
+                        <property name="height_request">300</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="stock">gtk-dialog-info</property>
+                        <property name="headers_visible">False</property>
+                        <property name="headers_clickable">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHButtonBox" id="hbuttonbox3">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="spacing">6</property>
+                    <property name="layout_style">GTK_BUTTONBOX_END</property>
+                    <child>
+                      <widget class="GtkButton" id="gtk_themes_install">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Install...</property>
                       </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                      </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label12">
+                      <widget class="GtkButton" id="gtk_themes_delete">
                         <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">The currently selected controls theme doesn't support color schemes</property>
-                        <property name="wrap">True</property>
+                        <property name="label" translatable="yes">gtk-delete</property>
+                        <property name="use_stock">True</property>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -1980,41 +1868,104 @@ Text only</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="padding">12</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
+              </widget>
+              <packing>
+                <property name="tab_expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label41">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Controls</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="border_width">12</property>
                 <child>
-                  <widget class="GtkTable" id="color_scheme_table">
+                  <widget class="GtkTable" id="color_scheme_table1">
                     <property name="visible">True</property>
-                    <property name="border_width">12</property>
-                    <property name="n_rows">2</property>
-                    <property name="n_columns">4</property>
+                    <property name="n_rows">4</property>
+                    <property name="n_columns">2</property>
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">12</property>
                     <child>
-                      <widget class="GtkLabel" id="label13">
+                      <widget class="GtkColorButton" id="colorbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="color">#000000000000</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="x_options"></property>
+                        <property name="y_options">GTK_EXPAND</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkColorButton" id="selected_bg_colorbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options"></property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Input boxes:</property>
+                        <property name="label" translatable="yes">_Selected items:</property>
                         <property name="use_underline">True</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label14">
+                      <widget class="GtkLabel" id="label5">
                         <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Windows:</property>
-                        <property name="use_underline">True</property>
+                        <property name="label" translatable="yes">Tooltips:</property>
                       </widget>
                       <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkColorButton" id="bg_colorbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="x_options"></property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -2033,87 +1984,287 @@ Text only</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="bg_colorbutton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="x_options"></property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label15">
+                      <widget class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Selected items:</property>
+                        <property name="label" translatable="yes">_Windows:</property>
                         <property name="use_underline">True</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="selected_bg_colorbutton">
+                      <widget class="GtkLabel" id="label2">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">3</property>
-                        <property name="right_attach">4</property>
-                        <property name="x_options"></property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label17">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Tooltips:</property>
+                        <property name="label" translatable="yes">_Input boxes:</property>
+                        <property name="use_underline">True</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkColorButton" id="colorbutton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="color">#000000000000</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">3</property>
-                        <property name="right_attach">4</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options"></property>
-                        <property name="y_options">GTK_EXPAND</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
                   </packing>
                 </child>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">12</property>
+                <property name="position">1</property>
+                <property name="tab_expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label18">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Colors</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">1</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox29">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="border_width">12</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <child>
+                      <widget class="GtkTreeView" id="window_themes_list">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="headers_visible">False</property>
+                        <property name="headers_clickable">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHButtonBox" id="hbuttonbox6">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="spacing">6</property>
+                    <property name="layout_style">GTK_BUTTONBOX_END</property>
+                    <child>
+                      <widget class="GtkButton" id="window_themes_install">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Install...</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="window_themes_delete">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">gtk-delete</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
                 <property name="position">2</property>
+                <property name="tab_expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label42">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Window Border</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">2</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox30">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="border_width">12</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <child>
+                      <widget class="GtkTreeView" id="icon_themes_list">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="headers_visible">False</property>
+                        <property name="headers_clickable">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHButtonBox" id="hbuttonbox7">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="spacing">6</property>
+                    <property name="layout_style">GTK_BUTTONBOX_END</property>
+                    <child>
+                      <widget class="GtkButton" id="icon_themes_install">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Install...</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="icon_themes_delete">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">gtk-delete</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label43">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Icons</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">3</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox32">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="border_width">12</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow8">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <child>
+                      <widget class="GtkTreeView" id="pointer_themes_list">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="headers_visible">False</property>
+                        <property name="headers_clickable">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHButtonBox" id="hbuttonbox9">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="spacing">6</property>
+                    <property name="layout_style">GTK_BUTTONBOX_END</property>
+                    <child>
+                      <widget class="GtkButton" id="pointer_themes_install">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Install...</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="pointer_themes_delete">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">gtk-delete</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">4</property>
+                <property name="tab_expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label44">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Pointer</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">4</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
           </widget>
@@ -2125,9 +2276,9 @@ Text only</property>
           <widget class="GtkHButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
             <child>
-              <widget class="GtkButton" id="button6">
+              <widget class="GtkButton" id="theme_help_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>