Merge lp:~fboucault/unity-2d/activate_first_result into lp:unity-2d/3.0

[Florian Boucault]

[dash] Pressing enter/return key activates the first result available.

New APIs to manually access the result sets were added:
- QVariantMap QSortFilterProxyModelQML::get(int row)
- int QSortFilterProxyModelQML::count()

[Florian Boucault (fboucault)]

Note that the latest version of libqtdee is needed for this MR to work. It should be available in the PPA now.

=== modified file 'libunity-2d-private/Unity2d/qsortfilterproxymodelqml.cpp'
--- libunity-2d-private/Unity2d/qsortfilterproxymodelqml.cpp	2011-03-10 01:13:42 +0000
+++ libunity-2d-private/Unity2d/qsortfilterproxymodelqml.cpp	2011-03-23 14:06:54 +0000
@@ -56,3 +56,27 @@
     connect(itemModel, SIGNAL(modelAboutToBeReset()), SLOT(updateRoleNames()));
     connect(itemModel, SIGNAL(modelReset()), SLOT(updateRoleNames()));
 }
+
+QVariantMap
+QSortFilterProxyModelQML::get(int row)
+{
+    if (sourceModel() == NULL) {
+        return QVariantMap();
+    }
+
+    QVariantMap result;
+    QHashIterator<int, QByteArray> i(roleNames());
+    while (i.hasNext()) {
+        i.next();
+        QModelIndex modelIndex = index(row, 0);
+        QVariant data = modelIndex.data(i.key());
+        result[i.value()] = data;
+     }
+     return result;
+}
+
+int
+QSortFilterProxyModelQML::count()
+{
+    return rowCount();
+}

=== modified file 'libunity-2d-private/Unity2d/qsortfilterproxymodelqml.h'
--- libunity-2d-private/Unity2d/qsortfilterproxymodelqml.h	2011-02-08 11:48:16 +0000
+++ libunity-2d-private/Unity2d/qsortfilterproxymodelqml.h	2011-03-23 14:06:54 +0000
@@ -28,6 +28,9 @@
 public:
     explicit QSortFilterProxyModelQML(QObject *parent = 0);
 
+    Q_INVOKABLE QVariantMap get(int row);
+    Q_INVOKABLE int count();
+
     /* getters */
     QObject* sourceModelQObject() const;
 

=== modified file 'places/Home.qml'
--- places/Home.qml	2011-03-22 06:15:19 +0000
+++ places/Home.qml	2011-03-23 14:06:54 +0000
@@ -32,6 +32,24 @@
         }
     }
 
+    function activateFirstResult() {
+        /* Going through the list of place entries and selecting the first one
+           that has results for the global search, that is items in its
+           globalResultsModel */
+        var placeEntry, i
+        for (i=0; i<dash.places.rowCount(); i=i+1) {
+            placeEntry = dash.places.get(i)
+            if (placeEntry.globalResultsModel != null && placeEntry.globalResultsModel.count() != 0) {
+                var firstResult = placeEntry.globalResultsModel.get(0)
+                /* Places give back the uri of the item in 'column_0' per specification */
+                var uri = firstResult.column_0
+                dashView.active = false
+                placeEntry.place.activate(decodeURIComponent(uri))
+                return;
+            }
+        }
+    }
+
     /* Set to true if shortcut buttons are visible */
     property bool shortcutsActive: false
 

=== modified file 'places/PlaceEntryView.qml'
--- places/PlaceEntryView.qml	2011-03-22 06:15:19 +0000
+++ places/PlaceEntryView.qml	2011-03-23 14:06:54 +0000
@@ -25,6 +25,40 @@
     /* An instance of PlaceEntryModel */
     property variant model
 
+    function activateFirstResult() {
+        /* Going through the list of groups and selecting the first one
+           that has results for the search. A QSortFilterProxyModelQML
+           ('firstGroupModel') is used to filter the search results per group.
+        */
+        var placeEntry, i
+        for (i=0; i<placeEntryView.model.entryGroupsModel.count(); i=i+1) {
+            firstGroupModel.groupId = i
+            if (firstGroupModel.count() != 0) {
+                var firstResult = firstGroupModel.get(0)
+                /* Places give back the uri of the item in 'column_0' per specification */
+                var uri = firstResult.column_0
+                dashView.active = false
+                model.place.activate(decodeURIComponent(uri))
+                return;
+            }
+        }
+    }
+
+    QSortFilterProxyModelQML {
+        id: firstGroupModel
+
+        property int groupId
+        model: placeEntryView.model.entryResultsModel
+
+        /* placeEntryView.model.entryResultsModel contains data for all
+           the groups of a given Place.
+           Each row has a column (the second one) containing the id of
+           the group it belongs to (groupId).
+        */
+        filterRole: 2 /* second column (see above comment) */
+        filterRegExp: RegExp("^%1$".arg(groupId)) /* exact match */
+    }
+
     ListViewWithScrollbar {
         id: results
 

=== modified file 'places/SearchEntry.qml'
--- places/SearchEntry.qml	2011-03-22 15:31:25 +0000
+++ places/SearchEntry.qml	2011-03-23 14:06:54 +0000
@@ -109,8 +109,8 @@
             }
 
             Keys.onPressed: {
-                if (event.key == Qt.Key_Return) {
-                    searchQuery = text
+                if (event.key == Qt.Key_Return || event.key == Qt.Key_Enter) {
+                    dash.currentPage.activateFirstResult()
                     event.accepted = true;
                 }
             }