summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-09-08 12:26:57 +0300
committermonsta <[email protected]>2016-09-08 14:24:23 +0300
commitb4ca9200009784e95a5f2b1c1fd982eb33af1094 (patch)
tree695c5f7216a4cc5405e42fd0f9eb36f27f097888
parentb338357b233c0cc96f55072e28687fc09bd62bfc (diff)
downloadmate-control-center-b4ca9200009784e95a5f2b1c1fd982eb33af1094.tar.bz2
mate-control-center-b4ca9200009784e95a5f2b1c1fd982eb33af1094.tar.xz
GTK+3 appearance: don't show Colors tab in Customize Theme dialog
changing theme colors won't work in GTK+3
-rw-r--r--capplets/appearance/appearance-style.c5
-rw-r--r--capplets/appearance/data/appearance.ui7
2 files changed, 11 insertions, 1 deletions
diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c
index 51161f67..fbc090ed 100644
--- a/capplets/appearance/appearance-style.c
+++ b/capplets/appearance/appearance-style.c
@@ -1074,6 +1074,11 @@ style_init (AppearanceData *data)
icon_theme_changed (data->interface_settings, ICON_THEME_KEY, data);
cursor_theme_changed (data->mouse_settings, CURSOR_THEME_KEY, data);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkNotebook *style_nb = GTK_NOTEBOOK (appearance_capplet_get_widget (data, "notebook2"));
+ gtk_notebook_remove_page (style_nb, 1);
+#endif
+
w = appearance_capplet_get_widget (data, "color_scheme_message_hbox");
gtk_widget_set_no_show_all (w, TRUE);
diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui
index 709b3d65..91619bb1 100644
--- a/capplets/appearance/data/appearance.ui
+++ b/capplets/appearance/data/appearance.ui
@@ -2037,6 +2037,7 @@
<property name="title" translatable="yes">Customize Theme</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
+ <property name="default_height">450</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
@@ -2045,6 +2046,7 @@
<property name="spacing">2</property>
<child>
<object class="GtkNotebook" id="notebook2">
+ <property name="expand">True</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>
@@ -2064,6 +2066,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="height_request">200</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>
@@ -2072,7 +2075,6 @@
<property name="shadow_type">in</property>
<child>
<object 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>
@@ -2440,6 +2442,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow5">
+ <property name="height_request">200</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>
@@ -2512,6 +2515,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow6">
+ <property name="height_request">200</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>
@@ -2620,6 +2624,7 @@
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow8">
+ <property name="height_request">200</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>