[dconf-editor] Don't use a custom widget when that's not necessary.

[Arnaud Bonatti <arnaudb src gnome org>]

commit 60321adca10f30b56b86487effbbde96b6e48cc3
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Mon Apr 20 08:21:51 2015 +0200

    Don't use a custom widget when that's not necessary.

 editor/dconf-editor.ui   |   19 +++++++++++++++++--
 editor/dconf-editor.vala |   31 +++++++++++++++----------------
 editor/dconf-view.vala   |    9 ---------
 3 files changed, 32 insertions(+), 27 deletions(-)
---
diff --git a/editor/dconf-editor.ui b/editor/dconf-editor.ui
index 66be016..e6a72a3 100644
--- a/editor/dconf-editor.ui
+++ b/editor/dconf-editor.ui
@@ -20,13 +20,28 @@
             <property name="can_focus">True</property>
             <property name="position">100</property>
             <child>
-              <object class="GtkScrolledWindow" id="directory_scrolledwindow">
+              <object class="GtkScrolledWindow">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
                 <property name="width_request">222</property>
                 <child>
-                  <placeholder/>
+                  <object class="GtkTreeView" id="dir_tree_view">
+                    <property name="visible">True</property>
+                    <property name="headers-visible">False</property>
+                    <!-- <property name="activate-on-single-click">True</property> TODO -->
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <property name="title">Key</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
                 </child>
               </object>
               <packing>
diff --git a/editor/dconf-editor.vala b/editor/dconf-editor.vala
index 34ab267..c9fa6be 100644
--- a/editor/dconf-editor.vala
+++ b/editor/dconf-editor.vala
@@ -66,8 +66,6 @@ class ConfigurationEditor : Gtk.Application
 
         settings = new Settings ("ca.desrt.dconf-editor.Settings");
 
-        model = new SettingsModel();
-
         Gtk.Builder ui = new Gtk.Builder.from_resource ("/ca/desrt/dconf-editor/ui/dconf-editor.ui");
 
         /* window */
@@ -95,23 +93,24 @@ class ConfigurationEditor : Gtk.Application
         set_default_action = (Gtk.Action) ui.get_object("set_default_action");
         set_default_action.activate.connect(set_default_cb);
 
+        dir_tree_view = (Gtk.TreeView) ui.get_object("dir_tree_view");
+
         /* trees */
-        dir_tree_view = new DConfDirView();
-        dir_tree_view.set_model(model);
-        dir_tree_view.get_selection().changed.connect(dir_selected_cb); // FIXME: Put in view
-        dir_tree_view.show();
-        var scroll = (Gtk.ScrolledWindow) ui.get_object("directory_scrolledwindow");
-        scroll.add(dir_tree_view);
-
-        key_tree_view = new DConfKeyView();
-        key_tree_view.show();
-        key_tree_view.get_selection().changed.connect(key_selected_cb);
-        scroll = (Gtk.ScrolledWindow) ui.get_object("key_scrolledwindow");
-        scroll.add(key_tree_view);
+        key_tree_view = new DConfKeyView ();
+        key_tree_view.show ();
+        key_tree_view.get_selection ().changed.connect (key_selected_cb);
+        var scroll = (Gtk.ScrolledWindow) ui.get_object("key_scrolledwindow");
+        scroll.add (key_tree_view);
+
+        model = new SettingsModel ();
+        dir_tree_view.set_model (model);
+
+        Gtk.TreeSelection selection = dir_tree_view.get_selection ();
+        selection.changed.connect (dir_selected_cb);
 
         Gtk.TreeIter iter;
-        if (model.get_iter_first(out iter))
-            dir_tree_view.get_selection().select_iter(iter);
+        if (model.get_iter_first (out iter))
+            selection.select_iter (iter);
 
         /* search box */
         search_box = (Gtk.Box) ui.get_object("search_box");
diff --git a/editor/dconf-view.vala b/editor/dconf-view.vala
index 626106d..fda3cec 100644
--- a/editor/dconf-view.vala
+++ b/editor/dconf-view.vala
@@ -305,15 +305,6 @@ private class KeyValueRenderer: Gtk.CellRenderer
     }
 }
 
-public class DConfDirView : Gtk.TreeView
-{
-    public DConfDirView()
-    {
-        set_headers_visible(false);
-        insert_column_with_attributes(-1, "Key", new Gtk.CellRendererText(), "text", 1, null);
-    }
-}
-
 public class DConfKeyView : Gtk.TreeView
 {
     public DConfKeyView()