[dconf-editor] Introduce BookmarksView.

[Arnaud B. <arnaudb src gnome org>]

commit 7722b5f3fc43539613bb50ca8304c50c626af803
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Thu Jan 10 21:43:11 2019 +0100

    Introduce BookmarksView.
    
    A DConfView is now a BookmarksView which is a
    BrowserView that is a BaseView. Looks ok now.

 editor/bookmarks-view.vala | 196 +++++++++++++++++++++++++++++++++++++++++++++
 editor/dconf-view.vala     | 136 ++-----------------------------
 editor/meson.build         |   1 +
 3 files changed, 202 insertions(+), 131 deletions(-)
---
diff --git a/editor/bookmarks-view.vala b/editor/bookmarks-view.vala
new file mode 100644
index 0000000..94d092a
--- /dev/null
+++ b/editor/bookmarks-view.vala
@@ -0,0 +1,196 @@
+/*
+  This file is part of Dconf Editor
+
+  Dconf Editor is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Dconf Editor is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Dconf Editor.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+using Gtk;
+
+private class BookmarksView : BrowserView, AdaptativeWidget
+{
+    construct
+    {
+        create_bookmarks_list ();
+    }
+
+    protected override void set_window_size (AdaptativeWidget.WindowSize new_size)
+    {
+        base.set_window_size (new_size);
+
+        bookmarks_list.set_window_size (new_size);
+    }
+
+    internal override bool is_in_in_window_mode ()
+    {
+        return (in_window_bookmarks || base.is_in_in_window_mode ());
+    }
+
+    internal override void show_default_view ()
+    {
+        if (in_window_bookmarks)
+        {
+            if (in_window_bookmarks_edit_mode)
+                leave_bookmarks_edit_mode ();
+            in_window_bookmarks = false;
+            set_visible_child_name ("main-view");
+        }
+        else
+            base.show_default_view ();
+    }
+
+    /*\
+    * * bookmarks view
+    \*/
+
+    [CCode (notify = false)] internal bool in_window_bookmarks           { internal get; private set; 
default = false; }
+    [CCode (notify = false)] internal bool in_window_bookmarks_edit_mode { internal get; private set; 
default = false; }
+
+    private BookmarksList bookmarks_list;
+
+    private void create_bookmarks_list ()
+    {
+        bookmarks_list = new BookmarksList (/* needs shadows            */ false,
+                                            /* big placeholder          */ true,
+                                            /* edit-mode action prefix  */ "bmk",
+                                            /* schema path              */ "/ca/desrt/dconf-editor/");
+        bookmarks_list.selection_changed.connect (on_bookmarks_selection_changed);
+        bookmarks_list.update_bookmarks_icons.connect (on_update_bookmarks_icons);
+        bookmarks_list.show ();
+        add (bookmarks_list);
+    }
+
+    private string [] old_bookmarks = new string [0];
+
+    internal void show_bookmarks_view (string [] bookmarks)
+    {
+        if (is_in_in_window_mode ())
+            show_default_view ();
+
+        bookmarks_list.reset ();
+
+        if (bookmarks != old_bookmarks)
+        {
+            Variant variant = new Variant.strv (bookmarks);
+            bookmarks_list.create_bookmark_rows (variant);
+
+            old_bookmarks = bookmarks;
+        }
+        set_visible_child (bookmarks_list);
+        in_window_bookmarks = true;
+    }
+
+    internal void update_bookmark_icon (string bookmark, BookmarkIcon icon)
+    {
+        bookmarks_list.update_bookmark_icon (bookmark, icon);
+    }
+
+    /*\
+    * * edit mode
+    \*/
+
+    internal void enter_bookmarks_edit_mode ()
+        requires (in_window_bookmarks == true)
+    {
+        bookmarks_list.enter_edit_mode ();
+        in_window_bookmarks_edit_mode = true;
+    }
+
+    internal bool leave_bookmarks_edit_mode ()
+        requires (in_window_bookmarks == true)
+    {
+        in_window_bookmarks_edit_mode = false;
+        return bookmarks_list.leave_edit_mode ();
+    }
+
+    internal OverlayedList.SelectionState get_bookmarks_selection_state ()
+    {
+        return bookmarks_list.get_selection_state ();
+    }
+
+    internal void trash_bookmark ()
+    {
+        bookmarks_list.trash_bookmark ();
+    }
+
+    internal void move_top ()
+    {
+        bookmarks_list.move_top ();
+    }
+
+    internal void move_up ()
+    {
+        bookmarks_list.move_up ();
+    }
+
+    internal void move_down ()
+    {
+        bookmarks_list.move_down ();
+    }
+
+    internal void move_bottom ()
+    {
+        bookmarks_list.move_bottom ();
+    }
+
+    /*\
+    * * callbacks
+    \*/
+
+    private void on_bookmarks_selection_changed ()
+    {
+        if (!in_window_bookmarks)
+            return;
+        bookmarks_selection_changed ();
+    }
+
+    internal signal void bookmarks_selection_changed ();
+
+    internal signal void update_bookmarks_icons (Variant bookmarks_variant);
+    private void on_update_bookmarks_icons (Variant bookmarks_variant)
+    {
+        update_bookmarks_icons (bookmarks_variant);
+    }
+
+    /*\
+    * * keyboard calls
+    \*/
+
+    internal override bool next_match ()
+    {
+        if (in_window_bookmarks)
+            return bookmarks_list.next_match ();
+        return base.next_match ();
+    }
+
+    internal override bool previous_match ()
+    {
+        if (in_window_bookmarks)
+            return bookmarks_list.previous_match ();
+        return base.previous_match ();
+    }
+
+    internal override bool handle_copy_text (out string copy_text)
+    {
+        if (in_window_bookmarks)
+            return bookmarks_list.handle_copy_text (out copy_text);
+        return base.handle_copy_text (out copy_text);
+    }
+
+    internal override bool toggle_row_popover ()     // Menu
+    {
+        if (in_window_bookmarks)
+            return false;
+        return base.toggle_row_popover ();
+     }
+}
diff --git a/editor/dconf-view.vala b/editor/dconf-view.vala
index d85a779..18c2a0d 100644
--- a/editor/dconf-view.vala
+++ b/editor/dconf-view.vala
@@ -17,15 +17,13 @@
 
 using Gtk;
 
-private class DConfView : BrowserView, AdaptativeWidget
+private class DConfView : BookmarksView, AdaptativeWidget
 {
     private BrowserStack dconf_content;
 
     construct
     {
         install_action_entries ();
-
-        create_bookmarks_list ();
     }
 
     internal DConfView (ModificationsHandler modifications_handler)
@@ -39,7 +37,7 @@ private class DConfView : BrowserView, AdaptativeWidget
     protected override void set_window_size (AdaptativeWidget.WindowSize new_size)
     {
         base.set_window_size (new_size);
-        bookmarks_list.set_window_size (new_size);
+
         if (modifications_list_created)
             modifications_list.set_window_size (new_size);
     }
@@ -59,19 +57,12 @@ private class DConfView : BrowserView, AdaptativeWidget
 
     internal override bool is_in_in_window_mode ()
     {
-        return (in_window_bookmarks || in_window_modifications || base.is_in_in_window_mode ());
+        return (in_window_modifications || base.is_in_in_window_mode ());
     }
 
     internal override void show_default_view ()
     {
-        if (in_window_bookmarks)
-        {
-            if (in_window_bookmarks_edit_mode)
-                leave_bookmarks_edit_mode ();
-            in_window_bookmarks = false;
-            set_visible_child_name ("main-view");
-        }
-        else if (in_window_modifications)
+        if (in_window_modifications)
         {
             in_window_modifications = false;
             set_visible_child_name ("main-view");
@@ -218,111 +209,6 @@ private class DConfView : BrowserView, AdaptativeWidget
         return ModificationsRevealer.create_delayed_setting_row (modifications_handler, sso.name, 
sso.full_name, sso.context_id);
     }
 
-    /*\
-    * * bookmarks
-    \*/
-
-    [CCode (notify = false)] internal bool in_window_bookmarks           { internal get; private set; 
default = false; }
-    [CCode (notify = false)] internal bool in_window_bookmarks_edit_mode { internal get; private set; 
default = false; }
-
-    private BookmarksList bookmarks_list;
-
-    private void create_bookmarks_list ()
-    {
-        bookmarks_list = new BookmarksList (/* needs shadows            */ false,
-                                            /* big placeholder          */ true,
-                                            /* edit-mode action prefix  */ "bmk",
-                                            /* schema path              */ "/ca/desrt/dconf-editor/");
-        bookmarks_list.selection_changed.connect (on_bookmarks_selection_changed);
-        bookmarks_list.update_bookmarks_icons.connect (on_update_bookmarks_icons);
-        bookmarks_list.show ();
-        add (bookmarks_list);
-    }
-
-    private string [] old_bookmarks = new string [0];
-
-    internal void show_bookmarks_view (string [] bookmarks)
-    {
-        if (in_window_modifications || in_window_about)
-            show_default_view ();
-
-        bookmarks_list.reset ();
-
-        if (bookmarks != old_bookmarks)
-        {
-            Variant variant = new Variant.strv (bookmarks);
-            bookmarks_list.create_bookmark_rows (variant);
-
-            old_bookmarks = bookmarks;
-        }
-        set_visible_child (bookmarks_list);
-        in_window_bookmarks = true;
-    }
-
-    internal void update_bookmark_icon (string bookmark, BookmarkIcon icon)
-    {
-        bookmarks_list.update_bookmark_icon (bookmark, icon);
-    }
-
-    internal void enter_bookmarks_edit_mode ()
-        requires (in_window_bookmarks == true)
-    {
-        bookmarks_list.enter_edit_mode ();
-        in_window_bookmarks_edit_mode = true;
-    }
-
-    internal bool leave_bookmarks_edit_mode ()
-        requires (in_window_bookmarks == true)
-    {
-        in_window_bookmarks_edit_mode = false;
-        return bookmarks_list.leave_edit_mode ();
-    }
-
-    internal OverlayedList.SelectionState get_bookmarks_selection_state ()
-    {
-        return bookmarks_list.get_selection_state ();
-    }
-
-    internal void trash_bookmark ()
-    {
-        bookmarks_list.trash_bookmark ();
-    }
-
-    internal void move_top ()
-    {
-        bookmarks_list.move_top ();
-    }
-
-    internal void move_up ()
-    {
-        bookmarks_list.move_up ();
-    }
-
-    internal void move_down ()
-    {
-        bookmarks_list.move_down ();
-    }
-
-    internal void move_bottom ()
-    {
-        bookmarks_list.move_bottom ();
-    }
-
-    private void on_bookmarks_selection_changed ()
-    {
-        if (!in_window_bookmarks)
-            return;
-        bookmarks_selection_changed ();
-    }
-
-    internal signal void bookmarks_selection_changed ();
-
-    internal signal void update_bookmarks_icons (Variant bookmarks_variant);
-    private void on_update_bookmarks_icons (Variant bookmarks_variant)
-    {
-        update_bookmarks_icons (bookmarks_variant);
-    }
-
     /*\
     * * views
     \*/
@@ -391,36 +277,24 @@ private class DConfView : BrowserView, AdaptativeWidget
     // keyboard
     internal override bool next_match ()
     {
-        if (in_window_bookmarks)
-            return bookmarks_list.next_match ();
         if (in_window_modifications)
             return modifications_list.next_match ();
         return base.next_match ();
     }
+
     internal override bool previous_match ()
     {
-        if (in_window_bookmarks)
-            return bookmarks_list.previous_match ();
         if (in_window_modifications)
             return modifications_list.previous_match ();
         return base.previous_match ();
     }
 
-    internal override bool toggle_row_popover ()     // Menu
-    {
-        if (in_window_bookmarks)
-            return false;
-        return base.toggle_row_popover ();
-     }
-
     internal void toggle_boolean_key ()      { dconf_content.toggle_boolean_key ();      }
     internal void set_selected_to_default () { dconf_content.set_selected_to_default (); }
 
     // current row property
     internal override bool handle_copy_text (out string copy_text)
     {
-        if (in_window_bookmarks)
-            return bookmarks_list.handle_copy_text (out copy_text);
         if (in_window_modifications)
             return modifications_list.handle_copy_text (out copy_text);
         return base.handle_copy_text (out copy_text);
diff --git a/editor/meson.build b/editor/meson.build
index c64b1e2..56e24e9 100644
--- a/editor/meson.build
+++ b/editor/meson.build
@@ -76,6 +76,7 @@ sources = files(
   'bookmarks-controller.vala',
   'bookmarks-headerbar.vala',
   'bookmarks-list.vala',
+  'bookmarks-view.vala',
   'browser-content.vala',
   'browser-headerbar.vala',
   'browser-infobar.vala',