[dconf-editor] Move ModificationsRevealer to main window.



commit adf843fb51e1c133669f919c105451ab01df9171
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Thu Jan 11 02:11:22 2018 +0100

    Move ModificationsRevealer to main window.

 editor/browser-view.ui   |    5 -----
 editor/browser-view.vala |   11 +----------
 editor/dconf-editor.ui   |    5 +++++
 editor/dconf-window.vala |    3 +++
 4 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/editor/browser-view.ui b/editor/browser-view.ui
index 3e3c566..599d0d2 100644
--- a/editor/browser-view.ui
+++ b/editor/browser-view.ui
@@ -40,10 +40,5 @@
         </child>
       </object>
     </child>
-    <child>
-      <object class="ModificationsRevealer" id="revealer">
-        <property name="visible">True</property>
-      </object>
-    </child>
   </template>
 </interface>
diff --git a/editor/browser-view.vala b/editor/browser-view.vala
index 936ba9f..58d27dc 100644
--- a/editor/browser-view.vala
+++ b/editor/browser-view.vala
@@ -49,15 +49,12 @@ class BrowserView : Grid
         }
     }
 
-    [GtkChild] private ModificationsRevealer revealer;
-
     private ModificationsHandler _modifications_handler;
     public ModificationsHandler modifications_handler
     {
         private get { return _modifications_handler; }
         set {
             _modifications_handler = value;
-            revealer.modifications_handler = value;
             browse_view.modifications_handler = value;
             properties_view.modifications_handler = value;
             search_results_view.modifications_handler = value;
@@ -304,12 +301,6 @@ class BrowserView : Grid
 
     public void reset_objects (GLib.ListStore? objects, bool recursively)
     {
-        reset_generic (objects, recursively);
-        revealer.warn_if_no_planned_changes ();
-    }
-
-    private void reset_generic (GLib.ListStore? objects, bool recursively)
-    {
         SettingsModel model = modifications_handler.model;
         if (objects == null)
             return;
@@ -326,7 +317,7 @@ class BrowserView : Grid
                 if (recursively) {
                     GLib.ListStore? children = model.get_children ((Directory) setting_object);
                     if (children != null)
-                        reset_generic ((!) children, true);
+                        reset_objects ((!) children, true);
                 }
                 continue;
             }
diff --git a/editor/dconf-editor.ui b/editor/dconf-editor.ui
index 14086bb..6e0301a 100644
--- a/editor/dconf-editor.ui
+++ b/editor/dconf-editor.ui
@@ -159,6 +159,11 @@
                 <property name="vexpand">True</property>
               </object>
             </child>
+            <child>
+              <object class="ModificationsRevealer" id="revealer">
+                <property name="visible">True</property>
+              </object>
+            </child>
           </object>
         </child>
         <child type="overlay">
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index 130bb47..c923099 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -43,6 +43,7 @@ class DConfWindow : ApplicationWindow
     [GtkChild] private SearchEntry search_entry;
 
     [GtkChild] private BrowserView browser_view;
+    [GtkChild] private ModificationsRevealer revealer;
 
     [GtkChild] private Revealer notification_revealer;
     [GtkChild] private Label notification_label;
@@ -72,6 +73,7 @@ class DConfWindow : ApplicationWindow
         model = new SettingsModel (settings);
         pathbar.model = model;
         modifications_handler = new ModificationsHandler (model);
+        revealer.modifications_handler = modifications_handler;
         browser_view.modifications_handler = modifications_handler;
         modifications_handler_reload_handler = modifications_handler.reload.connect (invalidate_popovers);
 
@@ -329,6 +331,7 @@ class DConfWindow : ApplicationWindow
     {
         enter_delay_mode ();
         browser_view.reset_objects (model.get_children (model.get_directory (path)), recursively);
+        revealer.warn_if_no_planned_changes ();
     }
 
     private void enter_delay_mode (/* SimpleAction action, Variant? path_variant */)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]