Merge lp:~gerboland/unity-2d/hud-misc-fixes into lp:unity-2d

[Gerry Boland]

[hud] Improve monitoring of HUD service connection: reset data properly and disconnect only when connected

[hud] Improve monitoring of HUD service connection: reset data properly and disconnect only when connected

[Paweł Stołowski (stolowski)]

Can you initialize m_hudQueryOpen in ctor just to be on the safe side, in case anyone adds any logic based on it in the future?
Also, I'd use at least UQ_WARNING to signal connection error, rather than UQ_DEBUG.

review: Needs Fixing

[lp:~gerboland/unity-2d/hud-misc-fixes]

1011. By Gerry Boland on 2012-03-26

Initialise m_hudQueryOpen to be safe

1012. By Gerry Boland on 2012-03-26

HUD-service missing error should be warning

[Paweł Stołowski (stolowski)]

Looks good!

review: Approve

=== modified file 'libunity-2d-private/src/hud.cpp'
--- libunity-2d-private/src/hud.cpp	2012-03-06 14:40:24 +0000
+++ libunity-2d-private/src/hud.cpp	2012-03-26 14:12:19 +0000
@@ -35,7 +35,8 @@
 
 Hud::Hud(QObject *parent) :
     QAbstractListModel(parent),
-    m_connected(false)
+    m_connected(false),
+    m_hudQueryOpen(false)
 {
     QHash<int, QByteArray> names;
     names[ResultIdRole] = "resultId";
@@ -115,11 +116,16 @@
 
 void Hud::setSearchQuery(const QString& searchQuery)
 {
-    if (searchQuery != m_searchQuery) {
-        m_searchQuery = searchQuery;
-        m_unityHud->RequestQuery(m_searchQuery.toStdString());
-        beginResetModel();
-        Q_EMIT searchQueryChanged();
+    if (!connected()) {
+        UQ_WARNING << "No connection to HUD service available. Unable to search.";
+    } else {
+        if (searchQuery != m_searchQuery) {
+            m_searchQuery = searchQuery;
+            m_unityHud->RequestQuery(m_searchQuery.toStdString());
+            m_hudQueryOpen = true;
+            beginResetModel();
+            Q_EMIT searchQueryChanged();
+        }
     }
 }
 
@@ -146,8 +152,14 @@
 
 void Hud::endSearch()
 {
-    m_unityHud->CloseQuery();
+    if (m_hudQueryOpen && connected()) {
+        m_unityHud->CloseQuery();
+        m_hudQueryOpen = false;
+    }
     m_searchQuery.clear();
+    beginResetModel();
+    m_unityHudResults.clear();
+    endResetModel();
 }
 
 void Hud::onResultsUpdated(const unity::hud::Hud::Queries results)

=== modified file 'libunity-2d-private/src/hud.h'
--- libunity-2d-private/src/hud.h	2012-03-06 14:40:24 +0000
+++ libunity-2d-private/src/hud.h	2012-03-26 14:12:19 +0000
@@ -78,7 +78,8 @@
     void onResultsUpdated(const unity::hud::Hud::Queries);
 
 private:
-    bool m_connected;
+    bool m_connected; //Unity-Core's GlibDbusWrapper is connected to the service and is listening to the service signals
+    bool m_hudQueryOpen; //status of the HUD query connection with HUD service
     QString m_searchQuery;
     unity::hud::Hud* m_unityHud;
     unity::hud::Hud::Queries m_unityHudResults; //doubly-ended queue of 'Query's.

=== modified file 'shell/hud/Hud.qml'
--- shell/hud/Hud.qml	2012-03-14 14:29:05 +0000
+++ shell/hud/Hud.qml	2012-03-26 14:12:19 +0000
@@ -58,7 +58,7 @@
             shellManager.hudShell.forceActivateWindow()
             resultList.focus = true
         } else {
-            hudModel.endSearch
+            hudModel.endSearch()
             resultList.currentIndex = -1
         }
     }
@@ -194,8 +194,9 @@
 
                 opacity: 1
 
-                active: hud.active
-                placeHolderText: u2d.tr("Type your Command")
+                active: hudModel.connected && hud.active
+                placeHolderText: (hudModel.connected) ? u2d.tr("Type your Command")
+                                                      : u2d.tr("Error: HUD service not connected")
 
                 onSearchQueryChanged: {
                     hudModel.searchQuery = searchQuery