summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2011-10-28 15:34:50 -0400
committerRobert Ancell <robert.ancell@canonical.com>2011-10-28 15:34:50 -0400
commit09ade4470d078d2b9f15d6578a580311e4553e82 (patch)
tree231039e71c4c4b3fb74c327889abc4e3f33bdbe9
parentc88b48ef2cdd03ec5d27e0440f157550bca8f1f7 (diff)
downloaddconf-09ade4470d078d2b9f15d6578a580311e4553e82.tar.gz
editor: Use GtkPaned to separate directories and keys
-rw-r--r--editor/dconf-editor.ui16
-rw-r--r--editor/dconf-editor.vala6
2 files changed, 10 insertions, 12 deletions
diff --git a/editor/dconf-editor.ui b/editor/dconf-editor.ui
index c231036..30f3343 100644
--- a/editor/dconf-editor.ui
+++ b/editor/dconf-editor.ui
@@ -15,10 +15,10 @@
<signal name="window-state-event" handler="main_window_window_state_event_cb" swapped="no"/>
<signal name="configure-event" handler="main_window_configure_event_cb" swapped="no"/>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkHPaned" id="hpaned1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property name="position">100</property>
<child>
<object class="GtkScrolledWindow" id="directory_scrolledwindow">
<property name="visible">True</property>
@@ -30,9 +30,8 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
<child>
@@ -251,9 +250,8 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
</object>
diff --git a/editor/dconf-editor.vala b/editor/dconf-editor.vala
index 40e9e54..9daf3c0 100644
--- a/editor/dconf-editor.vala
+++ b/editor/dconf-editor.vala
@@ -7,7 +7,7 @@ class ConfigurationEditor
private Gtk.Window window;
private Gtk.TreeView dir_tree_view;
private Gtk.TreeView key_tree_view;
- private Gtk.Table key_info_table;
+ private Gtk.Grid key_info_grid;
private Gtk.Label schema_label;
private Gtk.Label summary_label;
private Gtk.Label description_label;
@@ -53,7 +53,7 @@ class ConfigurationEditor
scroll = (Gtk.ScrolledWindow)ui.get_object("key_scrolledwindow");
scroll.add(key_tree_view);
- key_info_table = (Gtk.Table)ui.get_object("key_info_table");
+ key_info_grid = (Gtk.Grid)ui.get_object("key_info_grid");
schema_label = (Gtk.Label)ui.get_object("schema_label");
summary_label = (Gtk.Label)ui.get_object("summary_label");
description_label = (Gtk.Label)ui.get_object("description_label");
@@ -140,7 +140,7 @@ class ConfigurationEditor
if(selected_key != null)
selected_key.value_changed.connect(key_changed_cb);
- key_info_table.sensitive = selected_key != null;
+ key_info_grid.sensitive = selected_key != null;
set_default_action.sensitive = selected_key != null && !selected_key.is_default;
string schema_name = "", summary = "", description = "", type = "", default_value = "";