Merge lp:~tiagosh/unity-2d/unity-2d-shell-homelens into lp:unity-2d

[Tiago Salem Herrmann]

This MR replaces the old home lens by the new one provided by unity.
The following libqtdee branch must be installed in order to compile this branch: lp:~tiagosh/dee-qt/dee-qt-local-models .

[Gerry Boland (gerboland)]

Hi Tiago,
great work, thanks for this! But we need tests to be able to accept this.

I think testing the following will be sufficient:
1. open dash, check somehow that this Home lens is showing
2. open dash, type a character, check search results appear in Home lens

Consult the existing tests to get an idea where to start. Getting started guide here:
https://wiki.ubuntu.com/Unity2DTestability
and this old test of mine might help you get started. Not it's for unity-2d, so things have changed a little
https://bazaar.launchpad.net/~gerboland/unity-2d/dash-test/view/head:/tests/places/show_hide_tests.rb

Ping me if you need a hand
-G

review: Needs Fixing

[Michał Sawicz (saviq)]

Hey, this also looks like it could go into lp:unity-2d almost without modification. As it's a goal to have as small a diff between trunk and shell when we get to merging it, could you please have a MR against lp:unity-2d for this?

review: Needs Information

[Michał Sawicz (saviq)]

As discussed, let's wait with this until shell gets merged into trunk.

review: Abstain

[Gerry Boland (gerboland)]

Hey,
this is great work, thank you Tiago. It requires some fixes though:
- first, your patch to dee-qt may need fixing. I'm blaming it for these problems:
    - on first run, all the icons were ? icons with no text.
    - bug I can reproduce:
      1. I hope dash. I search for something, I get correct results
      2. if I empty search box, everything is still good
      3. I switch to applications lens, everything good
      4. I switch back to home lens, I get many ? icons everywhere with no text (just like first run)
  But the bug may be here. I've not tried to dig yet.
  Here's screengrab to show you: https://imgur.com/wTMaN

- possibly as a consequence, I get these unity-2d errors when viewing Home lens
[WARNING] shell/dash/RendererGrid.qml:92: ReferenceError: Can't find variable: column_0
[WARNING] shell/dash/RendererGrid.qml:92: ReferenceError: Can't find variable: display

[WARNING] shell/dash/LensView.qml:87: Unable to assign [undefined] to QString iconHint
[WARNING] shell/dash/LensView.qml:88: Unable to assign [undefined] to QString rendererName
[WARNING] shell/dash/LensView.qml:86: Unable to assign [undefined] to QString name
   <repeated many times>

[WARNING] shell/dash/RendererGrid.qml:92: ReferenceError: Can't find variable: column_0
   <repeated many times>

But your code looks clean, nothing obvious appears wrong to me.

review: Needs Fixing

[Albert Astals Cid (aacid)]

Doesn't merge cleanly with lp:~unity-2d-team/unity-2d/unity-2d-shell Can you remerge it?

review: Needs Fixing

[Albert Astals Cid (aacid)]

review: Approve (fun)

[Albert Astals Cid (aacid)]

With fun i mean "Functional" :/

I still have to look at the code, there is also
unity-2d-shell: [CRITICAL] dee: dee_model_get_first_iter: assertion `DEE_IS_MODEL (self)' failed
unity-2d-shell: [CRITICAL] dee: dee_model_get_last_iter: assertion `DEE_IS_MODEL (self)' failed
unity-2d-shell: [CRITICAL] dee: dee_model_get_first_iter: assertion `DEE_IS_MODEL (self)' failed
unity-2d-shell: [CRITICAL] dee: dee_model_get_last_iter: assertion `DEE_IS_MODEL (self)' failed
unity-2d-shell: [CRITICAL] dee: dee_model_get_first_iter: assertion `DEE_IS_MODEL (self)' failed
unity-2d-shell: [CRITICAL] dee: dee_model_get_last_iter: assertion `DEE_IS_MODEL (self)' failed
unity-2d-shell: [CRITICAL] dee: dee_model_get_first_iter: assertion `DEE_IS_MODEL (self)' failed
unity-2d-shell: [CRITICAL] dee: dee_model_get_last_iter: assertion `DEE_IS_MODEL (self)' failed

That thiago says that can't remove but are somehow scary for my pov

[Albert Astals Cid (aacid)]

And with Thiago i mean Tiago

[Florian Boucault (fboucault)]

Please resubmit the MR against lp:unity-2d

[Albert Astals Cid (aacid)]

Had a more thorough look at those warnings and they really seem to come from unity libraries themselves without much interaction in our side.

So Approve it is

review: Approve

=== modified file 'libunity-2d-private/src/lens.cpp'
--- libunity-2d-private/src/lens.cpp	2011-12-14 22:45:04 +0000
+++ libunity-2d-private/src/lens.cpp	2012-02-10 20:42:23 +0000
@@ -224,9 +224,21 @@
 
     m_filters = new Filters(m_unityLens->filters, this);
 
-    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
-    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
-    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+    if (QString::fromStdString(m_unityLens->results()->swarm_name) == QString(":local")) {
+        m_results->setModel(m_unityLens->results()->model());
+    } else {
+        m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
+    }
+    if (QString::fromStdString(m_unityLens->global_results()->swarm_name) == QString(":local")) {
+        m_globalResults->setModel(m_unityLens->global_results()->model());
+    } else {
+        m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
+    }
+    if (QString::fromStdString(m_unityLens->categories()->swarm_name) == QString(":local")) {
+        m_categories->setModel(m_unityLens->categories()->model());
+    } else {
+        m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+    }
 
     /* Property change signals */
     m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));

=== modified file 'libunity-2d-private/src/lenses.cpp'
--- libunity-2d-private/src/lenses.cpp	2011-09-09 10:15:14 +0000
+++ libunity-2d-private/src/lenses.cpp	2012-02-10 20:42:23 +0000
@@ -27,6 +27,8 @@
 
 // libunity-core
 #include <UnityCore/FilesystemLenses.h>
+#include <UnityCore/HomeLens.h>
+#include <unity2dtr.h>
 
 Lenses::Lenses(QObject *parent) :
     QAbstractListModel(parent)
@@ -36,17 +38,18 @@
     roles[Lenses::RoleVisible] = "visible";
     setRoleNames(roles);
 
+    m_homeLens = new unity::dash::HomeLens(u2dTr("Home").toStdString(), u2dTr("Home screen").toStdString(), u2dTr("Search").toStdString());
     m_unityLenses = new unity::dash::FilesystemLenses("/usr/share/unity/lenses");
-    for (unsigned int i=0; i<m_unityLenses->count(); i++) {
-        unity::dash::Lens::Ptr unityLens = m_unityLenses->GetLensAtIndex(i);
-        addUnityLens(unityLens, i);
-    }
-    m_unityLenses->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
+    m_homeLens->AddLenses(*m_unityLenses);
+    m_homeLens->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
+    unity::dash::HomeLens::Ptr homeLensPtr(m_homeLens);
+    addUnityLens(homeLensPtr, 0);
 }
 
 Lenses::~Lenses()
 {
     delete m_unityLenses;
+    delete m_homeLens;
 }
 
 int Lenses::rowCount(const QModelIndex& parent) const

=== modified file 'libunity-2d-private/src/lenses.h'
--- libunity-2d-private/src/lenses.h	2011-08-11 14:38:51 +0000
+++ libunity-2d-private/src/lenses.h	2012-02-10 20:42:23 +0000
@@ -26,6 +26,7 @@
 
 // libunity-core
 #include <UnityCore/Lens.h>
+#include <UnityCore/HomeLens.h>
 
 namespace unity
 {
@@ -64,6 +65,7 @@
 
 private:
     unity::dash::Lenses* m_unityLenses;
+    unity::dash::HomeLens* m_homeLens;
     QList<Lens*> m_lenses;
 
     void addUnityLens(unity::dash::Lens::Ptr unity_lens, int index);

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-02-09 12:27:35 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-02-10 20:42:23 +0000
@@ -41,6 +41,7 @@
 #include <QtDBus/QDBusInterface>
 #include <QX11Info>
 #include <QGraphicsObject>
+#include <QFileInfo>
 
 // X11
 #include <X11/Xlib.h>
@@ -188,6 +189,12 @@
     return m_active;
 }
 
+bool
+ShellDeclarativeView::haveCustomHomeShortcuts() const
+{
+    return QFileInfo(unity2dDirectory() + "/shell/dash/HomeShortcutsCustomized.qml").exists();
+}
+
 void
 ShellDeclarativeView::setDashMode(ShellDeclarativeView::DashMode mode)
 {

=== modified file 'shell/app/shelldeclarativeview.h'
--- shell/app/shelldeclarativeview.h	2012-02-09 02:22:19 +0000
+++ shell/app/shelldeclarativeview.h	2012-02-10 20:42:23 +0000
@@ -39,6 +39,7 @@
     Q_PROPERTY(QString activeLens READ activeLens WRITE setActiveLens NOTIFY activeLensChanged)
     Q_PROPERTY(bool focus READ hasFocus NOTIFY focusChanged) // overridden to add notify
     Q_PROPERTY(bool superKeyHeld READ superKeyHeld NOTIFY superKeyHeldChanged)
+    Q_PROPERTY(bool haveCustomHomeShortcuts READ haveCustomHomeShortcuts)
 
     /* These two properties and mouse movement tracking on the widget are added here only because
        we need to detect when the mouse is inside the area occupied by the lancher. This should
@@ -59,6 +60,7 @@
 
     /* getters */
     bool dashActive() const;
+    bool haveCustomHomeShortcuts() const;
     DashMode dashMode() const;
     const QString& activeLens() const;
     bool expanded() const;

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-02-09 11:22:43 +0000
+++ shell/dash/Dash.qml	2012-02-10 20:42:23 +0000
@@ -106,6 +106,7 @@
         for (var i=0; i<lenses.rowCount(); i++) {
             lenses.get(i).viewType = Lens.Hidden
         }
+        declarativeView.activeLens = ""
     }
 
     SpreadMonitor {
@@ -133,11 +134,19 @@
             return
         }
 
-        /* To activate lens, we set its viewType to LensView, and then set all
-           other lenses to Hidden */
         for (var i=0; i<lenses.rowCount(); i++) {
             var thislens = lenses.get(i)
-            thislens.viewType = (lens == thislens) ?  Lens.LensView : Lens.Hidden
+            if (lensId == "home.lens") {
+                if (thislens.id == lensId) {
+                    thislens.viewType = Lens.LensView
+                    continue
+                }
+                /* When Home is shown, need to notify all other lenses. Those in the global view
+                    (in home search results page) are set to HomeView, all others to Hidden */
+                thislens.viewType = (thislens.searchInGlobal) ? Lens.HomeView : Lens.Hidden
+            } else {
+                thislens.viewType = (lens == thislens) ?  Lens.LensView : Lens.Hidden
+            }
         }
 
         buildLensPage(lens)
@@ -147,20 +156,19 @@
 
     function activateHome() {
         if (spreadMonitor.shown) return
-
-        /* When Home is shown, need to notify all other lenses. Those in the global view
-           (in home search results page) are set to HomeView, all others to Hidden */
-        for (var i=0; i<lenses.rowCount(); i++) {
-            var thislens = lenses.get(i)
-            thislens.viewType = (thislens.searchInGlobal) ? Lens.HomeView : Lens.Hidden
+        if (declarativeView.haveCustomHomeShortcuts) {
+            for (var i=0; i<lenses.rowCount(); i++) {
+                lenses.get(i).viewType = Lens.Hidden
+            }
+            pageLoader.setSource("Home.qml")
+            /* Take advantage of the fact that the loaded qml is local and setting
+               the source loads it immediately making pageLoader.item valid */
+            activatePage(pageLoader.item)
+            declarativeView.activeLens = ""
+            dash.active = true
+        } else {
+            activateLens("home.lens")
         }
-
-        pageLoader.setSource("Home.qml")
-        /* Take advantage of the fact that the loaded qml is local and setting
-           the source loads it immediately making pageLoader.item valid */
-        activatePage(pageLoader.item)
-        declarativeView.activeLens = ""
-        dash.active = true
     }
 
     function activateLensWithOptionFilter(lensId, filterId, optionId) {
@@ -304,7 +312,7 @@
             KeyNavigation.left: search_entry
 
             /* FilterPane is only to be displayed for lenses, not in the home page or Alt+F2 Run page */
-            visible: declarativeView.activeLens != "" && declarativeView.activeLens != "commands.lens"
+            visible: declarativeView.activeLens != "home.lens" && declarativeView.activeLens != "" && declarativeView.activeLens != "commands.lens"
             lens: visible && currentPage != undefined ? currentPage.model : undefined
 
             anchors.top: search_entry.anchors.top

=== modified file 'shell/dash/LensBar.qml'
--- shell/dash/LensBar.qml	2012-01-10 13:07:48 +0000
+++ shell/dash/LensBar.qml	2012-02-10 20:42:23 +0000
@@ -93,22 +93,6 @@
             return undefined
         }
 
-        /* Need to manually include the Home lens */
-        LensButton {
-            id: homeLens
-
-            Accessible.name: u2d.tr("home")
-
-            focus: true
-            icon: "artwork/lens-nav-home.svg"
-            onClicked: dash.activateHome()
-            active: ( declarativeView.activeLens == "" )
-            iconWidth: lensBar.iconWidth
-            iconSpacing: lensBar.iconSpacing
-            width: iconWidth+iconSpacing
-            height: lensContainer.height
-        }
-
         /* Now fetch all other lenses and display */
         Repeater{
             id: repeater
@@ -118,9 +102,26 @@
                 Accessible.name: u2d.tr(item.name)
 
                 /* Heuristic: if iconHint does not contain a '/' then it is an icon name */
-                icon: item.iconHint.indexOf("/") == -1 ? "image://icons/" + item.iconHint : item.iconHint
-                active: item.viewType == Lens.LensView
-                onClicked: dash.activateLens(item.id)
+                icon: {
+                    if (item.id == "home.lens") {
+                        return "artwork/lens-nav-home.svg"
+                    }
+                    item.iconHint.indexOf("/") == -1 ? "image://icons/" + item.iconHint : item.iconHint
+                }
+                active: {
+                    /* we need this in order to activate the arrow when using a custom shortcuts file */
+                    if (item.id == "home.lens" && declarativeView.activeLens == "") {
+                        return true
+                    }
+                    return item.viewType == Lens.LensView
+                }
+                onClicked: {
+                    if (item.id == "home.lens") {
+                        dash.activateHome()
+                    } else {
+                        dash.activateLens(item.id)
+                    }
+                }
                 iconWidth: lensBar.iconWidth
                 iconSpacing: lensBar.iconSpacing
                 width: iconWidth+iconSpacing

=== modified file 'shell/dash/LensView.qml'
--- shell/dash/LensView.qml	2012-01-10 10:42:46 +0000
+++ shell/dash/LensView.qml	2012-02-10 20:42:23 +0000
@@ -81,7 +81,7 @@
         bodyDelegate: Loader {
             visible: category_model.count > 0
             width: parent.width
-            height: visible ? item.contentHeight : 0
+            height: item ? visible ? item.contentHeight : 0 : 0
 
             property string name: model.column_0
             property string iconHint: model.column_1
@@ -119,18 +119,19 @@
             Binding { target: item; property: "categoryId"; value: categoryId }
             Binding { target: item; property: "category_model"; value: category_model }
             Binding { target: item; property: "lens"; value: lensView.model }
+            Binding { target: item; property: "lensId"; value: lensView.model.id }
 
             onLoaded: item.focus = true
         }
 
         headerDelegate: CategoryHeader {
-            visible: body.item.needHeader && body.visible
+            visible: body.item ? body.item.needHeader && body.visible : false
             height: visible ? 32 : 0
 
-            property bool foldable: body.item.folded != undefined
-            availableCount: foldable ? body.category_model.count - body.item.cellsPerRow : 0
-            folded: foldable ? body.item.folded : false
-            onClicked: if(foldable) body.item.folded = !body.item.folded
+            property bool foldable: body.item ? body.item.folded != undefined : false
+            availableCount: body.item ? foldable ? body.category_model.count - body.item.cellsPerRow : 0 : 0
+            folded: body.item ? foldable ? body.item.folded : false : false
+            onClicked: if(foldable && body.item) body.item.folded = !body.item.folded
             moving: flickerMoving
 
             icon: body.iconHint

=== modified file 'shell/dash/RendererGrid.qml'
--- shell/dash/RendererGrid.qml	2011-11-23 10:27:05 +0000
+++ shell/dash/RendererGrid.qml	2012-02-10 20:42:23 +0000
@@ -77,14 +77,6 @@
 
                 FocusPath.index: index
 
-                property string uri: column_0
-                property string iconHint: column_1
-                property string categoryId: column_2 // FIXME: rename to categoryIndex
-                property string mimetype: column_3
-                property string displayName: column_4 // FIXME: rename to name
-                property string comment: column_5
-                property string dndUri: column_6
-
                 Loader {
                     id: loader
 
@@ -96,13 +88,13 @@
 
                     sourceComponent: cellRenderer
                     onLoaded: {
-                        item.uri = uri
-                        item.iconHint = iconHint
-                        item.mimetype = mimetype
-                        item.displayName = displayName
-                        item.comment = comment
+                        item.uri = column_0
+                        item.iconHint = column_1
+                        item.mimetype = column_3
+                        item.displayName = column_4
+                        item.comment = column_5
                         item.focus = true
-                        item.dndUri = dndUri
+                        item.dndUri = column_6
                     }
                 }
             }