@@ -18,6 +18,7 @@ import QtQuick 2.0
1818import Ubuntu.Components 0.1
1919import Ubuntu.Components.Popups 0.1
2020import Ubuntu.Components.ListItems 0.1 as ListItem
21+import Unity 0.1
2122
2223Item {
2324 /*!
@@ -30,6 +31,8 @@ Item {
3031 property bool searchEntryEnabled: false
3132 property alias searchQuery: searchField.text
3233 property ListModel searchHistory: SearchHistoryModel {}
34+ property Scope scope
35+ property bool searchInProgress: false
3336
3437 height: units.gu(8.5)
3538 implicitHeight: units.gu(8.5)
@@ -46,6 +49,11 @@ Item {
4649 searchField.focus = false;
4750 }
4851
52+ Connections {
53+ target: scope
54+ onSearchInProgressChanged: searchInProgress = scope.searchInProgress
55+ }
56+
4957 Connections {
5058 target: greeter
5159 onShownChanged: if (shown) resetSearch()
@@ -148,7 +156,7 @@ Item {
148156 hasClearButton: false
149157
150158 primaryItem: AbstractButton {
151− enabled: searchField.text != ""
159+ enabled: searchField.text != "" && !searchIndicator.running
152160 onClicked: {
153161 if (searchField.text != "") {
154162 searchHistory.addQuery(searchField.text)
@@ -158,6 +166,22 @@ Item {
158166 height: parent.height
159167 width: height
160168
169+ ActivityIndicator {
170+ id: searchIndicator
171+ objectName: "searchIndicator"
172+
173+ anchors {
174+ verticalCenter: parent.verticalCenter
175+ left: parent.left
176+ leftMargin: units.gu(0.5)
177+ }
178+
179+ running: searchInProgress && searchField.text !== ""
180+ opacity: running ? 1 : 0
181+
182+ Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing.type: Easing.Linear } }
183+ }
184+
161185 Image {
162186 id: primaryImage
163187 anchors {
@@ -167,6 +191,10 @@ Item {
167191 }
168192 width: units.gu(3)
169193 height: units.gu(3)
194+ visible: opacity > 0
195+ opacity: searchIndicator.running ? 0 : 1
196+
197+ Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing.type: Easing.Linear } }
170198 }
171199
172200 Item {