[gnome-documents] searchbar: port dropdown to GMenuModel

[Cosimo Cecchi <cosimoc src gnome org>]

commit 3e4b0866ad8ddf66aa931e9a094c80e588570f70
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Jul 30 15:10:59 2014 +0200

    searchbar: port dropdown to GMenuModel
    
    Now that we have GActions for search options, tie it all together and
    use them to build the popover contents. We have to steal the child of a
    GtkPopover to get the UI, since GTK doesn't expose a public API for that
    yet.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=725622

 src/manager.js   |  122 ++++++++++--------------------------------------------
 src/searchbar.js |   52 ++++++++++-------------
 2 files changed, 45 insertions(+), 129 deletions(-)
---
diff --git a/src/manager.js b/src/manager.js
index 2c7e569..03bbe84 100644
--- a/src/manager.js
+++ b/src/manager.js
@@ -21,6 +21,8 @@
 
 const GdPrivate = imports.gi.GdPrivate;
 const Gdk = imports.gi.Gdk;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Pango = imports.gi.Pango;
@@ -185,125 +187,45 @@ const BaseManager = new Lang.Class({
 });
 Signals.addSignalMethods(BaseManager.prototype);
 
-// GTK+ implementations
-
-const BaseModelColumns = {
-    ID: 0,
-    NAME: 1,
-    HEADING_TEXT: 2
-};
-
 const BaseModel = new Lang.Class({
     Name: 'BaseModel',
 
     _init: function(manager) {
-        this.model = Gtk.ListStore.new(
-            [ GObject.TYPE_STRING, // ID
-              GObject.TYPE_STRING, // NAME
-              GObject.TYPE_STRING ]); // HEADING_TEXT
+        this.model = new Gio.Menu();
         this._manager = manager;
         this._manager.connect('item-added', Lang.bind(this, this._refreshModel));
         this._manager.connect('item-removed', Lang.bind(this, this._refreshModel));
 
+        let application = Gio.Application.get_default();
+        let actionId = this._manager.getActionId();
+        application.connect('action-state-changed::' + actionId, Lang.bind(this, function(actionGroup, 
actionName, value) {
+            let itemId = value.get_string()[0];
+            this._manager.setActiveItemById(itemId);
+        }));
+        this._manager.connect('active-changed', Lang.bind(this, function(manager, activeItem) {
+            application.change_action_state(actionId, GLib.Variant.new('s', activeItem.id));
+        }));
+
         this._refreshModel();
     },
 
     _refreshModel: function() {
-        this.model.clear();
+        this.model.remove_all();
 
-        let iter;
+        let menuItem;
         let title = this._manager.getTitle();
+        let actionId = this._manager.getActionId();
 
-        if (title) {
-            iter = this.model.append();
-            this.model.set(iter,
-                [ 0, 1, 2 ],
-                [ 'heading', '', title ]);
-        }
+        let section = new Gio.Menu();
+        this.model.append_section(title, section);
 
         let items = this._manager.getItems();
         for (let idx in items) {
             let item = items[idx];
-            iter = this.model.append();
-            this.model.set(iter,
-                [ 0, 1, 2 ],
-                [ item.id, item.name, '' ]);
+            menuItem = new Gio.MenuItem();
+            menuItem.set_action_and_target_value(actionId, GLib.Variant.new('s', item.id));
+            menuItem.set_label(item.name);
+            section.append_item(menuItem);
         }
     }
 });
-
-const BaseView = new Lang.Class({
-    Name: 'BaseView',
-
-    _init: function(manager) {
-        this._model = new BaseModel(manager);
-        this._manager = manager;
-
-        this.widget = new Gtk.TreeView({ activate_on_single_click: true,
-                                         headers_visible: false,
-                                         enable_search: false });
-        this._treeView = this.widget;
-        this._treeView.set_model(this._model.model);
-
-        let selection = this._treeView.get_selection();
-        selection.set_mode(Gtk.SelectionMode.NONE);
-
-        this._treeView.connect('row-activated', Lang.bind(this,
-            function(view, path) {
-                let iter = this._model.model.get_iter(path)[1];
-                let id = this._model.model.get_value(iter, BaseModelColumns.ID);
-
-                this.emit('item-activated');
-                this._manager.setActiveItemById(id);
-            }));
-
-        let col = new Gtk.TreeViewColumn();
-        this._treeView.append_column(col);
-
-        // headings
-        this._rendererHeading = new Gtk.CellRendererText({ weight: Pango.Weight.BOLD,
-                                                           weight_set: true });
-        col.pack_start(this._rendererHeading, false);
-        col.add_attribute(this._rendererHeading,
-                          'text', BaseModelColumns.HEADING_TEXT);
-        col.set_cell_data_func(this._rendererHeading,
-            Lang.bind(this, this._visibilityForHeading, true));
-
-        // radio selection
-        this._rendererRadio = new Gtk.CellRendererToggle({ radio: true,
-                                                           mode: Gtk.CellRendererMode.INERT });
-        col.pack_start(this._rendererRadio, false);
-        col.set_cell_data_func(this._rendererRadio,
-            Lang.bind(this, this._visibilityForHeading, false,
-                      Lang.bind(this,
-                          function(col, cell, model, iter) {
-                              let id = model.get_value(iter, BaseModelColumns.ID);
-                              if (id == this._manager.getActiveItem().id)
-                                  cell.active = true;
-                              else
-                                  cell.active = false;
-                          })));
-
-        // item name
-        this._rendererText = new Gtk.CellRendererText();
-        col.pack_start(this._rendererText, true);
-        col.add_attribute(this._rendererText,
-                          'text', BaseModelColumns.NAME);
-        col.set_cell_data_func(this._rendererText,
-            Lang.bind(this, this._visibilityForHeading, false));
-
-        this.widget.show_all();
-    },
-
-    _visibilityForHeading: function(col, cell, model, iter, visible, additionalFunc) {
-        let heading = model.get_value(iter, BaseModelColumns.HEADING_TEXT);
-        if ((visible && heading != null && heading.length) || (!visible && heading != null && 
!heading.length))
-            cell.visible = true;
-        else
-            cell.visible = false;
-
-        if (additionalFunc)
-            additionalFunc(col, cell, model, iter);
-    }
-});
-Signals.addSignalMethods(BaseView.prototype);
diff --git a/src/searchbar.js b/src/searchbar.js
index d6024c9..b470f8e 100644
--- a/src/searchbar.js
+++ b/src/searchbar.js
@@ -224,32 +224,26 @@ const Dropdown = new Lang.Class({
     Extends: Gtk.Popover,
 
     _init: function(relativeTo) {
-        this.parent({ relative_to: relativeTo,
-                      height_request: 240 });
-        this._sourceView = new Manager.BaseView(Application.sourceManager);
-        this._typeView = new Manager.BaseView(Application.searchTypeManager);
-        this._matchView = new Manager.BaseView(Application.searchMatchManager);
-        // TODO: this is out for now, but should we move it somewhere
-        // else?
-        // this._categoryView = new Manager.BaseView(Application.searchCategoryManager);
-
-        this._grid = new Gtk.Grid({ orientation: Gtk.Orientation.HORIZONTAL,
-                                    row_homogeneous: true,
-                                    margin: 10 });
-        this.add(this._grid);
-
-        this._grid.add(this._sourceView.widget);
-        this._grid.add(this._typeView.widget);
-        this._grid.add(this._matchView.widget);
-        //this._grid.add(this._categoryView.widget);
-
-        this.get_style_context().add_class('documents-dropdown');
-        this.hide();
-        this._grid.show_all();
-    },
-
-    _onItemActivated: function() {
-        this.emit('item-activated');
+        this.parent({ relative_to: relativeTo, position: Gtk.PositionType.BOTTOM });
+
+        let grid = new Gtk.Grid({ orientation: Gtk.Orientation.HORIZONTAL,
+                                  row_homogeneous: true });
+        this.add(grid);
+
+        [Application.sourceManager,
+         Application.searchTypeManager,
+         Application.searchMatchManager].forEach(Lang.bind(this, function(manager) {
+             let model = new Manager.BaseModel(manager);
+
+             // HACK: see https://bugzilla.gnome.org/show_bug.cgi?id=733977
+             let popover = new Gtk.Popover();
+             popover.bind_model(model.model, 'app');
+             let w = popover.get_child();
+             w.reparent(grid);
+             w.valign = Gtk.Align.START;
+             w.vexpand = true;
+             popover.destroy();
+         }));
     }
 });
 
@@ -285,8 +279,6 @@ const OverviewSearchbar = new Lang.Class({
             Lang.bind(this, this._onTagClicked));
         this._searchEntry.connect('tag-button-clicked',
             Lang.bind(this, this._onTagButtonClicked));
-        
-        this._dropdown = new Dropdown(this._searchEntry);
 
         this._sourceTag = new Gd.TaggedEntryTag();
         this._typeTag = new Gd.TaggedEntryTag();
@@ -311,8 +303,10 @@ const OverviewSearchbar = new Lang.Class({
             function() {
                 let active = this._dropdownButton.get_active();
                 if(active)
-                    this._dropdown.show();
+                    this._dropdown.show_all();
             }));
+
+        this._dropdown = new Dropdown(this._dropdownButton);
         this._dropdown.connect('closed', Lang.bind(this,
             function() {
                 this._dropdownButton.set_active(false);