[dconf-editor] Renamme views.

[Arnaud Bonatti <arnaudb src gnome org>]

commit 73b9be9c247cb33b010278622920a1fadc9d442d
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sun Feb 18 12:03:29 2018 +0100

    Renamme views.

 editor/browser-stack.ui   |   17 +++---------
 editor/browser-stack.vala |   62 ++++++++++++++++++++++----------------------
 editor/browser-view.vala  |    8 +++---
 editor/dconf-window.vala  |    4 +-
 4 files changed, 41 insertions(+), 50 deletions(-)
---
diff --git a/editor/browser-stack.ui b/editor/browser-stack.ui
index b1d71cb..bdc5ee2 100644
--- a/editor/browser-stack.ui
+++ b/editor/browser-stack.ui
@@ -6,32 +6,23 @@
     <child>
       <object class="GtkStack" id="stack">
         <property name="visible">True</property>
-        <property name="visible-child">browse_view</property> <!-- uses the "id" attribute -->
+        <property name="visible-child">folder_view</property>
         <property name="transition-type">crossfade</property>
         <property name="expand">True</property>
         <child>
-          <object class="RegistryView"  id="browse_view">
+          <object class="RegistryView"   id="folder_view">
             <property name="visible">True</property>
           </object>
-          <packing>
-            <property name="name">browse-view</property>
-          </packing>
         </child>
         <child>
-          <object class="RegistryInfo" id="properties_view">
+          <object class="RegistryInfo"   id="object_view">
             <property name="visible">True</property>
           </object>
-          <packing>
-            <property name="name">properties-view</property>
-          </packing>
         </child>
         <child>
-          <object class="RegistrySearch"  id="search_results_view">
+          <object class="RegistrySearch" id="search_view">
             <property name="visible">True</property>
           </object>
-          <packing>
-            <property name="name">search-results-view</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/editor/browser-stack.vala b/editor/browser-stack.vala
index cc62a30..7151c65 100644
--- a/editor/browser-stack.vala
+++ b/editor/browser-stack.vala
@@ -21,9 +21,9 @@ using Gtk;
 class BrowserStack : Grid
 {
     [GtkChild] private Stack stack;
-    [GtkChild] private RegistryView browse_view;
-    [GtkChild] private RegistryInfo properties_view;
-    [GtkChild] private RegistrySearch search_results_view;
+    [GtkChild] private RegistryView folder_view;
+    [GtkChild] private RegistryInfo object_view;
+    [GtkChild] private RegistrySearch search_view;
 
     public ViewType current_view { get; private set; default = ViewType.FOLDER; }
 
@@ -31,17 +31,17 @@ class BrowserStack : Grid
     {
         set
         {
-            browse_view.small_keys_list_rows = value;
-            search_results_view.small_keys_list_rows = value;
+            folder_view.small_keys_list_rows = value;
+            search_view.small_keys_list_rows = value;
         }
     }
 
     public ModificationsHandler modifications_handler
     {
         set {
-            browse_view.modifications_handler = value;
-            properties_view.modifications_handler = value;
-            search_results_view.modifications_handler = value;
+            folder_view.modifications_handler = value;
+            object_view.modifications_handler = value;
+            search_view.modifications_handler = value;
         }
     }
 
@@ -56,9 +56,9 @@ class BrowserStack : Grid
         return "";
     }
 
-    public void prepare_browse_view (GLib.ListStore key_model, bool is_ancestor)
+    public void prepare_folder_view (GLib.ListStore key_model, bool is_ancestor)
     {
-        browse_view.set_key_model (key_model);
+        folder_view.set_key_model (key_model);
 
         stack.set_transition_type (is_ancestor && current_view != ViewType.SEARCH ? 
StackTransitionType.CROSSFADE : StackTransitionType.NONE);
     }
@@ -67,14 +67,14 @@ class BrowserStack : Grid
         requires (current_view == ViewType.FOLDER)
     {
         if (selected == "")
-            browse_view.select_first_row ();
+            folder_view.select_first_row ();
         else
-            browse_view.select_row_named (selected, last_context);
+            folder_view.select_row_named (selected, last_context);
     }
 
-    public void prepare_properties_view (Key key, bool is_parent)
+    public void prepare_object_view (Key key, bool is_parent)
     {
-        properties_view.populate_properties_list_box (key);
+        object_view.populate_properties_list_box (key);
 
         stack.set_transition_type (is_parent && current_view != ViewType.SEARCH ? 
StackTransitionType.CROSSFADE : StackTransitionType.NONE);
     }
@@ -87,20 +87,20 @@ class BrowserStack : Grid
 
         current_view = type;
         if (type == ViewType.FOLDER)
-            stack.set_visible_child (browse_view);
+            stack.set_visible_child (folder_view);
         else if (type == ViewType.OBJECT)
-            stack.set_visible_child (properties_view);
+            stack.set_visible_child (object_view);
         else // (type == ViewType.SEARCH)
         {
-            search_results_view.start_search (path);
+            search_view.start_search (path);
             stack.set_transition_type (StackTransitionType.NONE);
-            stack.set_visible_child (search_results_view);
+            stack.set_visible_child (search_view);
         }
 
         if (clean_object_view)
-            properties_view.clean ();
+            object_view.clean ();
         if (clean_search_view)
-            search_results_view.clean ();
+            search_view.clean ();
     }
 
     public string? get_copy_text ()
@@ -111,7 +111,7 @@ class BrowserStack : Grid
     public string? get_copy_path_text ()
     {
         if (current_view == ViewType.SEARCH)
-            return search_results_view.get_copy_path_text ();
+            return search_view.get_copy_path_text ();
 
         warning ("BrowserView get_copy_path_text() called but current view is not search results view.");
         return null;
@@ -144,8 +144,8 @@ class BrowserStack : Grid
 
     public void invalidate_popovers ()
     {
-        browse_view.invalidate_popovers ();
-        search_results_view.invalidate_popovers ();
+        folder_view.invalidate_popovers ();
+        search_view.invalidate_popovers ();
     }
 
     /*\
@@ -154,17 +154,17 @@ class BrowserStack : Grid
 
     public void set_search_parameters (string current_path, string [] bookmarks, SortingOptions 
sorting_options)
     {
-        search_results_view.set_search_parameters (current_path, bookmarks, sorting_options);
+        search_view.set_search_parameters (current_path, bookmarks, sorting_options);
     }
 
     public bool check_reload_folder (GLib.ListStore fresh_key_model)
     {
-        return browse_view.check_reload (fresh_key_model);
+        return folder_view.check_reload (fresh_key_model);
     }
 
     public bool check_reload_object (Variant properties)
     {
-        return properties_view.check_reload (properties);
+        return object_view.check_reload (properties);
     }
 
     /*\
@@ -174,24 +174,24 @@ class BrowserStack : Grid
     public bool return_pressed ()
         requires (current_view == ViewType.SEARCH)
     {
-        return search_results_view.return_pressed ();
+        return search_view.return_pressed ();
     }
 
     public bool up_pressed ()
     {
         if (current_view == ViewType.FOLDER)
-            return browse_view.up_or_down_pressed (false);
+            return folder_view.up_or_down_pressed (false);
         if (current_view == ViewType.SEARCH)
-            return search_results_view.up_or_down_pressed (false);
+            return search_view.up_or_down_pressed (false);
         return false;
     }
 
     public bool down_pressed ()
     {
         if (current_view == ViewType.FOLDER)
-            return browse_view.up_or_down_pressed (true);
+            return folder_view.up_or_down_pressed (true);
         if (current_view == ViewType.SEARCH)
-            return search_results_view.up_or_down_pressed (true);
+            return search_view.up_or_down_pressed (true);
         return false;
     }
 }
diff --git a/editor/browser-view.vala b/editor/browser-view.vala
index d7602f6..0705b08 100644
--- a/editor/browser-view.vala
+++ b/editor/browser-view.vala
@@ -151,11 +151,11 @@ class BrowserView : Grid
     * * Views
     \*/
 
-    public void prepare_browse_view (GLib.ListStore key_model, bool is_ancestor)
+    public void prepare_folder_view (GLib.ListStore key_model, bool is_ancestor)
     {
         this.key_model = key_model;
         sorting_options.sort_key_model (key_model);
-        current_child.prepare_browse_view (key_model, is_ancestor);
+        current_child.prepare_folder_view (key_model, is_ancestor);
         hide_reload_warning ();
     }
 
@@ -165,9 +165,9 @@ class BrowserView : Grid
         current_child.select_row (selected, last_context);
     }
 
-    public void prepare_properties_view (Key key, bool is_parent)
+    public void prepare_object_view (Key key, bool is_parent)
     {
-        current_child.prepare_properties_view (key, is_parent);
+        current_child.prepare_object_view (key, is_parent);
         hide_reload_warning ();
         last_context = (key is GSettingsKey) ? ((GSettingsKey) key).schema_id : ".dconf";
     }
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index 83a63b2..3486d8e 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -552,7 +552,7 @@ class DConfWindow : ApplicationWindow
         GLib.ListStore? key_model = model.get_children (fallback_path);
         if (key_model != null)
         {
-            browser_view.prepare_browse_view ((!) key_model, current_path.has_prefix (fallback_path));
+            browser_view.prepare_folder_view ((!) key_model, current_path.has_prefix (fallback_path));
             update_current_path (ViewType.FOLDER, fallback_path);
 
             if (selected_or_empty == "")
@@ -584,7 +584,7 @@ class DConfWindow : ApplicationWindow
         }
         else
         {
-            browser_view.prepare_properties_view ((!) found_object, current_path == 
SettingsModel.get_parent_path (full_name));
+            browser_view.prepare_object_view ((!) found_object, current_path == 
SettingsModel.get_parent_path (full_name));
             update_current_path (ViewType.OBJECT, strdup (full_name));
         }