Merge lp:~saviq/unity8/revert-r376 into lp:unity8

[Michał Sawicz]

Revert r376 that caused constant CPU usage due to the ActivityIndicator.

[Loïc Minier (lool)]

Tested binaries that Saviq provided for indicator-network and for unity8 with the unity-notifications before revert, and I didn't get the high CPU usage anymore.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Components/PageHeader.qml'
--- Components/PageHeader.qml	2013-10-02 16:11:27 +0000
+++ Components/PageHeader.qml	2013-10-05 08:36:17 +0000
@@ -18,7 +18,6 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Unity 0.1
 
 Item {
     /*!
@@ -31,7 +30,6 @@
     property bool searchEntryEnabled: false
     property alias searchQuery: searchField.text
     property ListModel searchHistory: SearchHistoryModel {}
-    property Scope scope
 
     height: units.gu(8.5)
     implicitHeight: units.gu(8.5)
@@ -150,7 +148,7 @@
                     hasClearButton: false
 
                     primaryItem: AbstractButton {
-                        enabled: searchField.text != "" && !searchIndicator.running
+                        enabled: searchField.text != ""
                         onClicked: {
                             if (searchField.text != "") {
                                 searchHistory.addQuery(searchField.text)
@@ -160,22 +158,8 @@
                         height: parent.height
                         width: height
 
-                        ActivityIndicator {
-                            id: searchIndicator
-                            objectName: "searchIndicator"
-
-                            anchors {
-                                verticalCenter: parent.verticalCenter
-                                left: parent.left
-                                leftMargin: units.gu(0.5)
-                            }
-
-                            running: opacity > 0
-                        }
-
                         Image {
                             id: primaryImage
-                            objectName: "primaryImage"
                             anchors {
                                 verticalCenter: parent.verticalCenter
                                 left: parent.left
@@ -183,7 +167,6 @@
                             }
                             width: units.gu(3)
                             height: units.gu(3)
-                            visible: opacity > 0
                         }
 
                         Item {
@@ -202,32 +185,6 @@
                     onActiveFocusChanged: {
                         if (!activeFocus) searchContainer.closePopover()
                     }
-
-                    states: [
-                        State {
-                            name: "searching"
-                            when: scope.searchInProgress && searchField.text !== ""
-                            PropertyChanges { target: searchIndicator; running: true; opacity: 1 }
-                            PropertyChanges { target: primaryImage; opacity: 0 }
-                        },
-                        State {
-                            name: "idle"
-                            when: !scope.searchInProgress || searchField.text === ""
-                            PropertyChanges { target: searchIndicator; opacity: 0 }
-                            PropertyChanges { target: primaryImage; opacity: 1 }
-                        }
-                    ]
-
-                    transitions: [
-                        Transition {
-                            to: "searching"
-                            reversible: true
-                            SequentialAnimation {
-                                NumberAnimation { target: primaryImage; property: "opacity"; duration: UbuntuAnimation.FastDuration; easing.type: Easing.Linear }
-                                NumberAnimation { target: searchIndicator; property: "opacity"; duration: UbuntuAnimation.FastDuration; easing.type: Easing.Linear }
-                            }
-                        }
-                    ]
                 }
 
                 states: [

=== modified file 'Dash/GenericScopeView.qml'
--- Dash/GenericScopeView.qml	2013-10-04 15:44:55 +0000
+++ Dash/GenericScopeView.qml	2013-10-05 08:36:17 +0000
@@ -190,7 +190,6 @@
             width: categoryView.width
             text: scopeView.scope.name
             searchEntryEnabled: true
-            scope: scopeView.scope
         }
     }
 

=== modified file 'plugins/Unity/scope.cpp'
--- plugins/Unity/scope.cpp	2013-09-30 11:33:51 +0000
+++ plugins/Unity/scope.cpp	2013-10-05 08:36:17 +0000
@@ -33,14 +33,12 @@
 #include <QQmlEngine>
 
 #include <UnityCore/Variant.h>
-#include <UnityCore/GLibWrapper.h>
 
 #include <libintl.h>
 #include <glib.h>
 
 Scope::Scope(QObject *parent) : QObject(parent)
     , m_formFactor("phone")
-    , m_searchInProgress(false)
 {
     m_categories.reset(new Categories(this));
 }
@@ -70,11 +68,6 @@
     return QString::fromStdString(m_unityScope->search_hint());
 }
 
-bool Scope::searchInProgress() const
-{
-    return m_searchInProgress;
-}
-
 bool Scope::visible() const
 {
     return m_unityScope->visible();
@@ -122,15 +115,10 @@
        string ("") and m_searchQuery is the null string,
        search_query != m_searchQuery is still true.
     */
-    using namespace std::placeholders;
-
     if (m_searchQuery.isNull() || search_query != m_searchQuery) {
         m_searchQuery = search_query;
-        m_cancellable.Renew();
-        m_searchInProgress = true;
-        m_unityScope->Search(search_query.toStdString(), std::bind(&Scope::onSearchFinished, this, _1, _2, _3), m_cancellable);
+        m_unityScope->Search(search_query.toStdString(), sigc::mem_fun(this, &Scope::searchFinished));
         Q_EMIT searchQueryChanged();
-        Q_EMIT searchInProgressChanged();
     }
 }
 
@@ -306,6 +294,8 @@
     m_unityScope->visible.changed.connect(sigc::mem_fun(this, &Scope::visibleChanged));
     m_unityScope->shortcut.changed.connect(sigc::mem_fun(this, &Scope::shortcutChanged));
     m_unityScope->connected.changed.connect(sigc::mem_fun(this, &Scope::connectedChanged));
+    /* Signals forwarding */
+    connect(this, SIGNAL(searchFinished(const std::string &, unity::glib::HintsMap const &, unity::glib::Error const &)), SLOT(onSearchFinished(const std::string &, unity::glib::HintsMap const &)));
 
     /* FIXME: signal should be forwarded instead of calling the handler directly */
     m_unityScope->activated.connect(sigc::mem_fun(this, &Scope::onActivated));
@@ -326,33 +316,18 @@
 
 void Scope::synchronizeStates()
 {
-    using namespace std::placeholders;
-
     if (connected()) {
         /* Forward local states to m_unityScope */
         if (!m_searchQuery.isNull()) {
-            m_cancellable.Renew();
-            m_searchInProgress = true;
-            m_unityScope->Search(m_searchQuery.toStdString(), std::bind(&Scope::onSearchFinished, this, _1, _2, _3), m_cancellable);
-            Q_EMIT searchInProgressChanged();
+            m_unityScope->Search(m_searchQuery.toStdString());
         }
     }
 }
 
-void Scope::onSearchFinished(std::string const& /* query */, unity::glib::HintsMap const& hints, unity::glib::Error const& err)
+void Scope::onSearchFinished(const std::string& /* query */, unity::glib::HintsMap const &hints)
 {
     QString hint;
 
-    GError* error = const_cast<unity::glib::Error&>(err);
-
-    if (!err || !g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-        m_searchInProgress = false;
-        Q_EMIT searchInProgressChanged();
-    } else {
-        // no need to check the results hint, we're still searching
-        return;
-    }
-
     if (!m_unityScope->results()->count()) {
         unity::glib::HintsMap::const_iterator it = hints.find("no-results-hint");
         if (it != hints.end()) {

=== modified file 'plugins/Unity/scope.h'
--- plugins/Unity/scope.h	2013-09-30 11:33:51 +0000
+++ plugins/Unity/scope.h	2013-10-05 08:36:17 +0000
@@ -28,7 +28,6 @@
 // libunity-core
 #include <UnityCore/Scope.h>
 #include <UnityCore/Results.h>
-#include <UnityCore/GLibWrapper.h>
 
 #include "categories.h"
 #include "filters.h"
@@ -44,7 +43,6 @@
     Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
     Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
     Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
-    Q_PROPERTY(bool searchInProgress READ searchInProgress NOTIFY searchInProgressChanged)
     Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
     Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
     Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
@@ -67,7 +65,6 @@
     bool visible() const;
     QString shortcut() const;
     bool connected() const;
-    bool searchInProgress() const;
     Categories* categories() const;
     Filters* filters() const;
     QString searchQuery() const;
@@ -98,11 +95,11 @@
     void iconHintChanged(const std::string&);
     void descriptionChanged(const std::string&);
     void searchHintChanged(const std::string&);
-    void searchInProgressChanged();
     void visibleChanged(bool);
     void shortcutChanged(const std::string&);
     void connectedChanged(bool);
     void categoriesChanged();
+    void searchFinished(const std::string&, unity::glib::HintsMap const&, unity::glib::Error const&);
     void searchQueryChanged();
     void noResultsHintChanged();
     void formFactorChanged();
@@ -118,7 +115,7 @@
 
 private Q_SLOTS:
     void synchronizeStates();
-    void onSearchFinished(std::string const &, unity::glib::HintsMap const &, unity::glib::Error const&);
+    void onSearchFinished(const std::string &, unity::glib::HintsMap const &);
 
 private:
     unity::dash::LocalResult createLocalResult(const QVariant &uri, const QVariant &icon_hint,
@@ -136,8 +133,6 @@
     QString m_searchQuery;
     QString m_noResultsHint;
     QString m_formFactor;
-    bool m_searchInProgress;
-    unity::glib::Cancellable m_cancellable;
     unity::glib::Cancellable m_previewCancellable;
 };
 

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2013-09-30 15:10:55 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2013-10-05 08:36:17 +0000
@@ -30,7 +30,6 @@
 Scope::Scope(QObject* parent)
     : QObject(parent)
     , m_visible(false)
-    , m_searching(false)
     , m_categories(new Categories(this))
     , m_results(new DeeListModel(this))
 {
@@ -45,7 +44,6 @@
     , m_id(id)
     , m_name(name)
     , m_visible(visible)
-    , m_searching(false)
     , m_categories(new Categories(this))
     , m_results(new DeeListModel(this))
 {
@@ -87,10 +85,6 @@
     return true;
 }
 
-bool Scope::searchInProgress() const {
-    return m_searching;
-}
-
 Categories* Scope::categories() const {
     return m_categories;
 }
@@ -128,13 +122,6 @@
     }
 }
 
-void Scope::setSearchInProgress(const bool inProg) {
-    if (inProg != m_searching) {
-        m_searching = inProg;
-        Q_EMIT searchInProgressChanged();
-    }
-}
-
 void Scope::setNoResultsHint(const QString& str) {
     if (str != m_noResultsHint) {
         m_noResultsHint = str;

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2013-09-30 15:10:55 +0000
+++ tests/mocks/Unity/fake_scope.h	2013-10-05 08:36:17 +0000
@@ -37,7 +37,6 @@
     Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
     Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
 
-    Q_PROPERTY(bool searchInProgress READ searchInProgress WRITE setSearchInProgress NOTIFY searchInProgressChanged)
     Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
     Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
     Q_PROPERTY(QString formFactor READ formFactor WRITE setFormFactor NOTIFY formFactorChanged)
@@ -55,7 +54,6 @@
     bool visible() const;
     QString shortcut() const;
     bool connected() const;
-    bool searchInProgress() const;
     Categories* categories() const;
     QString searchQuery() const;
     QString noResultsHint() const;
@@ -66,7 +64,6 @@
     void setSearchQuery(const QString& search_query);
     void setNoResultsHint(const QString& hint);
     void setFormFactor(const QString& form_factor);
-    void setSearchInProgress(const bool inProg);
 
     Q_INVOKABLE void activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,
                               const QVariant &result_type, const QVariant &mimetype, const QVariant &title,
@@ -81,11 +78,11 @@
     void iconHintChanged(const QString&);
     void descriptionChanged(const QString&);
     void searchHintChanged(const QString&);
-    void searchInProgressChanged();
     void visibleChanged(bool);
     void shortcutChanged(const QString&);
     void connectedChanged(bool);
     void categoriesChanged();
+    void searchFinished(const QString&);
     void searchQueryChanged();
     void noResultsHintChanged();
     void formFactorChanged();
@@ -106,7 +103,6 @@
     QString m_noResultsHint;
     QString m_formFactor;
     bool m_visible;
-    bool m_searching;
 
     Categories* m_categories;
     DeeListModel* m_results;

=== modified file 'tests/qmltests/Components/tst_PageHeader.qml'
--- tests/qmltests/Components/tst_PageHeader.qml	2013-10-01 13:42:52 +0000
+++ tests/qmltests/Components/tst_PageHeader.qml	2013-10-05 08:36:17 +0000
@@ -19,17 +19,12 @@
 import ".."
 import "../../../Components"
 import Ubuntu.Components 0.1
-import Unity 0.1
 import Unity.Test 0.1 as UT
 
 Item {
     width: units.gu(110)
     height: units.gu(30)
 
-    Scope {
-        id: scopeMock
-    }
-
     UT.UnityTestCase {
         name: "PageHeaderTest"
         when: windowShown
@@ -137,27 +132,6 @@
             compare(pageHeader.searchHistory.count, 3)
             compare(pageHeader.searchHistory.get(0).query, "humppa4")
         }
-
-        function test_search_indicator() {
-            var searchIndicator = findChild(pageHeader, "searchIndicator")
-            var primaryImage = findChild(pageHeader, "primaryImage")
-
-            pageHeader.triggerSearch()
-
-            scopeMock.searchInProgress = false
-            compare(searchIndicator.running, false, "Search indicator is running.")
-            tryCompare(primaryImage, "visible", true)
-
-            scopeMock.searchInProgress = true
-            compare(searchIndicator.running, true, "Search indicator isn't running.")
-            tryCompare(primaryImage, "visible", false)
-
-            pageHeader.resetSearch()
-        }
-
-        function cleanup() {
-            scopeMock.searchInProgress = false
-        }
     }
 
     Column {
@@ -171,8 +145,6 @@
                 right: parent.right
             }
 
-            scope: scopeMock
-
             searchEntryEnabled: true
             text: "%^$%^%^&%^&%^$%GHR%"
         }