[gtk+] inspector: Merge Visual and Themes tabs
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] inspector: Merge Visual and Themes tabs
- Date: Thu, 15 May 2014 04:15:36 +0000 (UTC)
commit b36c8250a9e109637270a79127c56d617a9dda25
Author: Matthias Clasen <mclasen redhat com>
Date: Wed May 14 22:53:32 2014 -0400
inspector: Merge Visual and Themes tabs
gtk/inspector/Makefile.am | 3 -
gtk/inspector/init.c | 2 -
gtk/inspector/inspector.gresource.xml | 1 -
gtk/inspector/themes.c | 205 ----------------------
gtk/inspector/themes.h | 58 -------
gtk/inspector/themes.ui | 68 --------
gtk/inspector/visual.c | 183 ++++++++++++++++++--
gtk/inspector/visual.h | 4 +-
gtk/inspector/visual.ui | 305 +++++++++++++++++++++++++--------
gtk/inspector/window.c | 1 -
gtk/inspector/window.ui | 11 --
po/POTFILES.in | 1 -
12 files changed, 403 insertions(+), 439 deletions(-)
---
diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am
index d1d5706..ee32cf3 100644
--- a/gtk/inspector/Makefile.am
+++ b/gtk/inspector/Makefile.am
@@ -42,8 +42,6 @@ libgtkinspector_la_SOURCES = \
resources.c \
signals-list.h \
signals-list.c \
- themes.h \
- themes.c \
visual.h \
visual.c \
widget-tree.h \
@@ -84,7 +82,6 @@ templates = \
object-hierarchy.ui \
prop-list.ui \
signals-list.ui \
- themes.ui \
visual.ui \
widget-tree.ui \
window.ui
diff --git a/gtk/inspector/init.c b/gtk/inspector/init.c
index 027f374..4621c71 100644
--- a/gtk/inspector/init.c
+++ b/gtk/inspector/init.c
@@ -34,7 +34,6 @@
#include "python-shell.h"
#include "resources.h"
#include "signals-list.h"
-#include "themes.h"
#include "visual.h"
#include "widget-tree.h"
#include "window.h"
@@ -58,7 +57,6 @@ gtk_inspector_init (void)
g_type_ensure (GTK_TYPE_INSPECTOR_PROP_LIST);
g_type_ensure (GTK_TYPE_INSPECTOR_PYTHON_SHELL);
g_type_ensure (GTK_TYPE_INSPECTOR_SIGNALS_LIST);
- g_type_ensure (GTK_TYPE_INSPECTOR_THEMES);
g_type_ensure (GTK_TYPE_INSPECTOR_VISUAL);
g_type_ensure (GTK_TYPE_INSPECTOR_WIDGET_TREE);
g_type_ensure (GTK_TYPE_INSPECTOR_WINDOW);
diff --git a/gtk/inspector/inspector.gresource.xml b/gtk/inspector/inspector.gresource.xml
index 74081fb..9282da6 100644
--- a/gtk/inspector/inspector.gresource.xml
+++ b/gtk/inspector/inspector.gresource.xml
@@ -9,7 +9,6 @@
<file>object-hierarchy.ui</file>
<file>prop-list.ui</file>
<file>signals-list.ui</file>
- <file>themes.ui</file>
<file>visual.ui</file>
<file>widget-tree.ui</file>
<file>window.ui</file>
diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c
index 7b2fed7..361e734 100644
--- a/gtk/inspector/visual.c
+++ b/gtk/inspector/visual.c
@@ -19,22 +19,21 @@
struct _GtkInspectorVisualPrivate
{
- GtkWidget *updates_switch;
GtkWidget *direction_combo;
+ GtkWidget *updates_switch;
GtkWidget *baselines_switch;
GtkWidget *pixelcache_switch;
-};
-G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorVisual, gtk_inspector_visual, GTK_TYPE_LIST_BOX)
+ GtkWidget *theme_combo;
+ GtkWidget *dark_switch;
+ GtkWidget *icon_combo;
+};
-static void
-updates_activate (GtkSwitch *sw)
-{
- gdk_window_set_debug_updates (gtk_switch_get_active (sw));
-}
+G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorVisual, gtk_inspector_visual, GTK_TYPE_BOX)
static void
-fix_direction_recurse (GtkWidget *widget, gpointer data)
+fix_direction_recurse (GtkWidget *widget,
+ gpointer data)
{
GtkTextDirection dir = GPOINTER_TO_INT (data);
@@ -84,6 +83,12 @@ init_direction (GtkInspectorVisual *vis)
gtk_combo_box_set_active_id (GTK_COMBO_BOX (vis->priv->direction_combo), direction);
}
+void
+updates_activate (GtkSwitch *sw)
+{
+ gdk_window_set_debug_updates (gtk_switch_get_active (sw));
+}
+
static void
baselines_activate (GtkSwitch *sw)
{
@@ -115,12 +120,157 @@ pixelcache_activate (GtkSwitch *sw)
}
static void
-gtk_inspector_visual_init (GtkInspectorVisual *pt)
+fill_gtk (const gchar *path,
+ GHashTable *t)
+{
+ const gchar *dir_entry;
+ GDir *dir = g_dir_open (path, 0, NULL);
+
+ if (!dir)
+ return;
+
+ while ((dir_entry = g_dir_read_name (dir)))
+ {
+ gchar *filename = g_build_filename (path, dir_entry, "gtk-3.0", "gtk.css", NULL);
+
+ if (g_file_test (filename, G_FILE_TEST_IS_REGULAR) &&
+ !g_hash_table_contains (t, dir_entry))
+ g_hash_table_add (t, g_strdup (dir_entry));
+
+ g_free (filename);
+ }
+}
+
+static void
+init_theme (GtkInspectorVisual *vis)
+{
+ GHashTable *t;
+ GHashTableIter iter;
+ gchar *theme, *current_theme, *path;
+ gint i, pos;
+ GSettings *settings;
+
+ t = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ g_hash_table_add (t, g_strdup ("Raleigh"));
+
+ fill_gtk (GTK_DATADIR "/themes", t);
+ path = g_build_filename (g_get_user_data_dir (), "themes", NULL);
+ fill_gtk (path, t);
+ g_free (path);
+
+ settings = g_settings_new ("org.gnome.desktop.interface");
+ current_theme = g_settings_get_string (settings, "gtk-theme");
+ g_object_unref (settings);
+
+ g_hash_table_iter_init (&iter, t);
+ pos = i = 0;
+ while (g_hash_table_iter_next (&iter, (gpointer *)&theme, NULL))
+ {
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (vis->priv->theme_combo), theme);
+ if (g_strcmp0 (theme, current_theme) == 0)
+ pos = i;
+ i++;
+ }
+ g_hash_table_destroy (t);
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (vis->priv->theme_combo), pos);
+}
+
+static void
+theme_changed (GtkComboBox *c,
+ GtkInspectorVisual *vis)
{
- pt->priv = gtk_inspector_visual_get_instance_private (pt);
- gtk_widget_init_template (GTK_WIDGET (pt));
+ gchar *theme;
- init_direction (pt);
+ theme = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (c));
+ g_object_set (gtk_settings_get_default (), "gtk-theme-name", theme, NULL);
+ g_free (theme);
+}
+
+static void
+init_dark (GtkInspectorVisual *vis)
+{
+ g_object_bind_property (vis->priv->dark_switch, "active",
+ gtk_settings_get_default (), "gtk-application-prefer-dark-theme",
+ G_BINDING_BIDIRECTIONAL);
+}
+
+static void
+fill_icons (const gchar *path,
+ GHashTable *t)
+{
+ const gchar *dir_entry;
+ GDir *dir;
+
+ dir = g_dir_open (path, 0, NULL);
+ if (!dir)
+ return;
+
+ while ((dir_entry = g_dir_read_name (dir)))
+ {
+ gchar *filename = g_build_filename (path, dir_entry, "index.theme", NULL);
+
+ if (g_file_test (filename, G_FILE_TEST_IS_REGULAR) &&
+ g_strcmp0 (dir_entry, "hicolor") != 0 &&
+ !g_hash_table_contains (t, dir_entry))
+ g_hash_table_add (t, g_strdup (dir_entry));
+
+ g_free (filename);
+ }
+}
+
+static void
+init_icons (GtkInspectorVisual *vis)
+{
+ GHashTable *t;
+ GHashTableIter iter;
+ gchar *theme, *current_theme, *path;
+ gint i, pos;
+ GSettings *settings;
+
+ t = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+ fill_icons (GTK_DATADIR "/icons", t);
+ path = g_build_filename (g_get_user_data_dir (), "icons", NULL);
+ fill_icons (path, t);
+ g_free (path);
+
+ settings = g_settings_new ("org.gnome.desktop.interface");
+ current_theme = g_settings_get_string (settings, "icon-theme");
+ g_object_unref (settings);
+
+ g_hash_table_iter_init (&iter, t);
+ pos = i = 0;
+ while (g_hash_table_iter_next (&iter, (gpointer *)&theme, NULL))
+ {
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (vis->priv->icon_combo), theme);
+ if (g_strcmp0 (theme, current_theme) == 0)
+ pos = i;
+ i++;
+ }
+ g_hash_table_destroy (t);
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (vis->priv->icon_combo), pos);
+}
+
+static void
+icons_changed (GtkComboBox *c,
+ GtkInspectorVisual *vis)
+{
+ gchar *theme = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (c));
+ g_object_set (gtk_settings_get_default (), "gtk-icon-theme-name", theme, NULL);
+ g_free (theme);
+}
+
+static void
+gtk_inspector_visual_init (GtkInspectorVisual *vis)
+{
+ vis->priv = gtk_inspector_visual_get_instance_private (vis);
+ gtk_widget_init_template (GTK_WIDGET (vis));
+ init_direction (vis);
+ init_theme (vis);
+ init_dark (vis);
+ init_icons (vis);
}
static void
@@ -133,10 +283,17 @@ gtk_inspector_visual_class_init (GtkInspectorVisualClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, direction_combo);
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, baselines_switch);
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, pixelcache_switch);
+ gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, dark_switch);
+ gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, theme_combo);
+ gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, icon_combo);
+
gtk_widget_class_bind_template_callback (widget_class, updates_activate);
gtk_widget_class_bind_template_callback (widget_class, direction_changed);
gtk_widget_class_bind_template_callback (widget_class, baselines_activate);
gtk_widget_class_bind_template_callback (widget_class, pixelcache_activate);
+ gtk_widget_class_bind_template_callback (widget_class, theme_changed);
+ gtk_widget_class_bind_template_callback (widget_class, icons_changed);
+
}
GtkWidget *
diff --git a/gtk/inspector/visual.h b/gtk/inspector/visual.h
index 2227d3f..00f9c7e 100644
--- a/gtk/inspector/visual.h
+++ b/gtk/inspector/visual.h
@@ -32,13 +32,13 @@ typedef struct _GtkInspectorVisualPrivate GtkInspectorVisualPrivate;
typedef struct _GtkInspectorVisual
{
- GtkListBox parent;
+ GtkBox parent;
GtkInspectorVisualPrivate *priv;
} GtkInspectorVisual;
typedef struct _GtkInspectorVisualClass
{
- GtkListBoxClass parent;
+ GtkBoxClass parent;
} GtkInspectorVisualClass;
G_BEGIN_DECLS
diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui
index da2162a..4d2e69f 100644
--- a/gtk/inspector/visual.ui
+++ b/gtk/inspector/visual.ui
@@ -1,94 +1,251 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30">
- <template class="GtkInspectorVisual" parent="GtkListBox">
- <property name="selection-mode">none</property>
+ <template class="GtkInspectorVisual" parent="GtkBox">
+ <property name="orientation">vertical</property>
+ <property name="margin">60</property>
+ <property name="spacing">10</property>
<child>
- <object class="GtkBox">
+ <object class="GtkFrame" id="visual_frame">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="margin">10</property>
+ <property name="halign">center</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkListBox">
<property name="visible">True</property>
- <property name="label" translatable="yes">Text Direction</property>
- <property name="hexpand">True</property>
- <property name="xalign">0.0</property>
- </object>
- </child>
- <child>
- <object class="GtkComboBoxText" id="direction_combo">
- <property name="visible">True</property>
- <signal name="changed" handler="direction_changed"/>
- <items>
- <item translatable="yes" id="ltr">Left-to-Right</item>
- <item translatable="yes" id="rtl">Right-to-Left</item>
- </items>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="margin">10</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Show Graphic Updates</property>
- <property name="hexpand">True</property>
- <property name="xalign">0.0</property>
- </object>
- </child>
- <child>
- <object class="GtkSwitch" id="updates_switch">
- <property name="visible">True</property>
- <signal name="notify::active" handler="updates_activate"/>
+ <property name="selection-mode">none</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">10</property>
+ <property name="spacing">40</property>
+ <child>
+ <object class="GtkLabel" id="direction_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Text Direction</property>
+ <property name="halign">start</property>
+ <property name="valign">baseline</property>
+ <property name="xalign">0.0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="direction_combo">
+ <property name="visible">True</property>
+ <property name="halign">end</property>
+ <property name="valign">baseline</property>
+ <signal name="changed" handler="direction_changed"/>
+ <items>
+ <item translatable="yes" id="ltr">Left-to-Right</item>
+ <item translatable="yes" id="rtl">Right-to-Left</item>
+ </items>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">10</property>
+ <property name="spacing">40</property>
+ <child>
+ <object class="GtkLabel" id="updates_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show Graphic Updates</property>
+ <property name="halign">start</property>
+ <property name="valign">baseline</property>
+ <property name="xalign">0.0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="updates_switch">
+ <property name="visible">True</property>
+ <property name="halign">end</property>
+ <property name="valign">baseline</property>
+ <signal name="notify::active" handler="updates_activate"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">10</property>
+ <property name="spacing">40</property>
+ <child>
+ <object class="GtkLabel" id="baselines_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show Baselines</property>
+ <property name="halign">start</property>
+ <property name="valign">baseline</property>
+ <property name="xalign">0.0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="baselines_switch">
+ <property name="visible">True</property>
+ <property name="halign">end</property>
+ <property name="valign">baseline</property>
+ <signal name="notify::active" handler="baselines_activate"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">10</property>
+ <property name="spacing">40</property>
+ <child>
+ <object class="GtkLabel" id="pixelcache_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show Pixel Cache</property>
+ <property name="halign">start</property>
+ <property name="valign">baseline</property>
+ <property name="xalign">0.0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="pixelcache_switch">
+ <property name="visible">True</property>
+ <property name="halign">end</property>
+ <property name="valign">baseline</property>
+ <signal name="notify::active" handler="pixelcache_activate"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkFrame" id="theme_frame">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="margin">10</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Show Baselines</property>
- <property name="hexpand">True</property>
- <property name="xalign">0.0</property>
- </object>
- </child>
- <child>
- <object class="GtkSwitch" id="baselines_switch">
- <property name="visible">True</property>
- <signal name="notify::active" handler="baselines_activate"/>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="margin">10</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Show Pixel Cache</property>
- <property name="hexpand">True</property>
- <property name="xalign">0.0</property>
- </object>
- </child>
+ <property name="halign">center</property>
<child>
- <object class="GtkSwitch" id="pixelcache_switch">
+ <object class="GtkListBox">
<property name="visible">True</property>
- <signal name="notify::active" handler="pixelcache_activate"/>
+ <property name="selection-mode">none</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">10</property>
+ <property name="spacing">40</property>
+ <child>
+ <object class="GtkLabel" id="theme_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">GTK+ Theme</property>
+ <property name="halign">start</property>
+ <property name="valign">baseline</property>
+ <property name="xalign">0.0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="theme_combo">
+ <property name="visible">True</property>
+ <property name="halign">end</property>
+ <property name="valign">baseline</property>
+ <signal name="changed" handler="theme_changed"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">10</property>
+ <property name="spacing">40</property>
+ <child>
+ <object class="GtkLabel" id="dark_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Dark variant</property>
+ <property name="halign">start</property>
+ <property name="valign">baseline</property>
+ <property name="xalign">0.0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="dark_switch">
+ <property name="visible">True</property>
+ <property name="halign">end</property>
+ <property name="valign">baseline</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">10</property>
+ <property name="spacing">40</property>
+ <child>
+ <object class="GtkLabel" id="icon_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Icon Theme</property>
+ <property name="halign">start</property>
+ <property name="valign">baseline</property>
+ <property name="xalign">0.0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="icon_combo">
+ <property name="visible">True</property>
+ <property name="halign">end</property>
+ <property name="valign">baseline</property>
+ <signal name="changed" handler="icons_changed"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
</template>
+ <object class="GtkSizeGroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="direction_label"/>
+ <widget name="updates_label"/>
+ <widget name="baselines_label"/>
+ <widget name="pixelcache_label"/>
+ <widget name="theme_label"/>
+ <widget name="dark_label"/>
+ <widget name="icon_label"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="visual_frame"/>
+ <widget name="theme_frame"/>
+ </widgets>
+ </object>
+-->
</interface>
diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c
index 0bcf066..87605f2 100644
--- a/gtk/inspector/window.c
+++ b/gtk/inspector/window.c
@@ -36,7 +36,6 @@
#include "python-shell.h"
#include "button-path.h"
#include "data-list.h"
-#include "themes.h"
#include "signals-list.h"
#include "actions.h"
diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index 238bd36..2234a06 100644
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -220,17 +220,6 @@
</object>
</child>
<child>
- <object class="GtkInspectorThemes">
- <property name="visible">True</property>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Themes</property>
- </object>
- </child>
- <child>
<object class="GtkInspectorCssEditor">
<property name="visible">True</property>
<property name="global">True</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 574db4b..c93ff68 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -280,7 +280,6 @@ gtk/inspector/object-hierarchy.ui.h
gtk/inspector/prop-list.ui.h
gtk/inspector/signals-list.c
gtk/inspector/signals-list.ui.h
-gtk/inspector/themes.ui.h
gtk/inspector/visual.ui.h
gtk/inspector/widget-tree.ui.h
gtk/inspector/window.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
