[gnome-maps/wip/placeEntry: 2/2] MainWindow: use PlaceEntry

[Mattias Bengtsson <mattiasb src gnome org>]

commit 48f3b9eac005b500b10c4737a9728ab1404c9ab7
Author: Mattias Bengtsson <mattias jc bengtsson gmail com>
Date:   Thu Jun 12 05:16:50 2014 +0200

    MainWindow: use PlaceEntry
    
    Move over to using PlaceEntry in the HeaderBar.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=731545

 src/main-window.ui |   29 ------------------
 src/mainWindow.js  |   81 ++++++++++++++++-----------------------------------
 src/placeEntry.js  |    6 ++-
 3 files changed, 30 insertions(+), 86 deletions(-)
---
diff --git a/src/main-window.ui b/src/main-window.ui
index bfc4063..aad0507 100644
--- a/src/main-window.ui
+++ b/src/main-window.ui
@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkEntryCompletion" id="search-completion">
-    <property name="minimum_key_length">2</property>
-    <child>
-      <object class="GtkCellRendererPixbuf" id="iconCellRenderer">
-        <property name="xpad">2</property>
-      </object>
-      <attributes>
-        <attribute name="pixbuf">0</attribute>
-      </attributes>
-    </child>
-    <child>
-      <object class="GtkCellRendererText" id="textCellRenderer">
-        <property name="ypad">4</property>
-      </object>
-      <attributes>
-        <attribute name="text">2</attribute>
-      </attributes>
-    </child>
-  </object>
   <object class="GtkApplicationWindow" id="app-window">
     <property name="width-request">600</property>
     <property name="height-request">500</property>
@@ -33,16 +14,6 @@
         <style>
           <class name="titlebar"/>
         </style>
-        <child type="title">
-          <object class="GtkSearchEntry" id="search-entry">
-            <property name="visible">True</property>
-            <property name="has-focus">True</property>
-            <property name="width-request">500</property>
-            <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
-            <property name="completion">search-completion</property>
-          </object>
-        </child>
         <child>
           <object class="GtkButton" id="goto-user-location-button">
             <property name="visible">True</property>
diff --git a/src/mainWindow.js b/src/mainWindow.js
index e3b9350..ea07ada 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -33,8 +33,8 @@ const Mainloop = imports.mainloop;
 const Application = imports.application;
 const MapView = imports.mapView;
 const LayersPopover = imports.layersPopover;
-const SearchPopup = imports.searchPopup;
 const ContextMenu = imports.contextMenu;
+const PlaceEntry = imports.placeEntry;
 const PlaceStore = imports.placeStore;
 const Utils = imports.utils;
 const Config = imports.config;
@@ -52,14 +52,10 @@ const MainWindow = new Lang.Class({
     _init: function(app, overlay) {
         this._configureId = 0;
         let ui = Utils.getUIObject('main-window', [ 'app-window',
-                                                    'search-entry',
-                                                    'search-completion',
+                                                    'header-bar',
                                                     'layers-button']);
-        this._searchEntry = ui.searchEntry;
-        this._searchCompletion = ui.searchCompletion;
         this.window = ui.appWindow;
         this.window.application = app;
-        this._placeStore = Application.placeStore;
         this._overlay = overlay;
 
         ui.appWindow.add(this._overlay);
@@ -73,7 +69,10 @@ const MainWindow = new Lang.Class({
 
         ui.layersButton.popover = new LayersPopover.LayersPopover();
 
-        this._initSearchWidgets();
+        let placeEntry = this._createPlaceEntry();
+        ui.headerBar.set_custom_title(placeEntry);
+        placeEntry.has_focus = true;
+
         this._initActions();
         this._initSignals();
         this._restoreWindowGeometry();
@@ -82,28 +81,26 @@ const MainWindow = new Lang.Class({
         this._overlay.show_all();
     },
 
-    _initSearchWidgets: function() {
-        this._searchPopup = new SearchPopup.SearchPopup(this._searchEntry, 10);
-
-        this._searchPopup.connect('selected',
-                                  this._onSearchPopupSelected.bind(this));
-        this._searchPopup.connect('selected',
-                                  this._overlay.grab_focus.bind(this._overlay));
-        this.mapView.view.connect('button-press-event',
-                                  this._searchPopup.hide.bind(this._searchPopup));
-        this.mapView.view.connect('button-press-event',
-                                  this._overlay.grab_focus.bind(this._overlay));
-        this._searchEntry.connect('changed',
-                                  this._searchPopup.hide.bind(this._searchPopup));
-
-        this._searchCompletion.set_model(this._placeStore);
-        this._searchCompletion.connect('match-selected', (function(c, m, iter) {
-            let place = m.get_value(iter, PlaceStore.Columns.PLACE);
-            this.mapView.showNGotoLocation(place);
-            this._placeStore.addRecent(place);
+    _createPlaceEntry: function() {
+        let placeEntry = new PlaceEntry.PlaceEntry({ mapView:       this.mapView,
+                                                     visible:       true,
+                                                     margin_start:  6,
+                                                     margin_end:    6,
+                                                     width_request: 500
+                                                   });
+        placeEntry.connect('notify::place', (function() {
+            if (placeEntry.place) {
+                this.mapView.showNGotoLocation(placeEntry.place);
+                Application.placeStore.addRecent(placeEntry.place);
+            }
         }).bind(this));
 
-        this._searchCompletion.set_match_func(PlaceStore.completionMatchFunc);
+        let popover = placeEntry.popover;
+        popover.connect('selected',
+                        this._overlay.grab_focus.bind(this._overlay));
+        this.mapView.view.connect('button-press-event',
+                                  popover.hide.bind(popover));
+        return placeEntry;
     },
 
     _initActions: function() {
@@ -148,8 +145,8 @@ const MainWindow = new Lang.Class({
         this.window.connect('key-press-event',
                             this._onKeyPressEvent.bind(this));
 
-        this._searchEntry.connect('activate',
-                                  this._onSearchActivate.bind(this));
+        this.mapView.view.connect('button-press-event',
+                                  this._overlay.grab_focus.bind(this._overlay));
         this._viewMovedId = 0;
     },
 
@@ -226,32 +223,6 @@ const MainWindow = new Lang.Class({
         return false;
     },
 
-    _onSearchPopupSelected: function(widget, place) {
-        this.mapView.showNGotoLocation(place);
-
-        this._placeStore.addRecent(place);
-        this._searchPopup.hide();
-    },
-
-    _onSearchActivate: function() {
-        let searchString = this._searchEntry.get_text();
-
-        if (searchString.length > 0) {
-            this._searchPopup.showSpinner();
-            this.mapView.geocodeSearch(searchString,
-                                       this._showSearchResults.bind(this));
-        }
-    },
-
-    _showSearchResults: function(places) {
-        if (places === null) {
-            this._searchPopup.hide();
-            return;
-        }
-        this._searchPopup.updateResult(places, this._searchEntry.get_text());
-        this._searchPopup.showResult();
-    },
-
     _quit: function() {
         // remove configure event handler if still there
         if (this._configureId !== 0) {
diff --git a/src/placeEntry.js b/src/placeEntry.js
index f1ebd2c..a2b1af9 100644
--- a/src/placeEntry.js
+++ b/src/placeEntry.js
@@ -55,13 +55,15 @@ const PlaceEntry = new Lang.Class({
         return this._popover;
     },
 
-    _init: function(mapView, props) {
+    _init: function(props) {
         let numVisible = props.num_visible || 10;
         delete props.num_visible;
+        this._mapView = props.mapView;
+        delete props.mapView;
+
         props.completion = this._createCompletion();
         this.parent(props);
 
-        this._mapView = mapView;
         this._popover = this._createPopover(numVisible);
 
         this.connect('activate', this._onActivate.bind(this));