Merge lp:~gerboland/unity-2d/hud-a11y-fix into lp:unity-2d

[Gerry Boland]

[hud] [a11y] completionText not supplied by HUD for A11Y, so need to convert resultText html to plain text and use that as A11Y string

[hud] [a11y] completionText not supplied by HUD for A11Y, so need to convert resultText html to plain text and use that as A11Y string

Manual test added as infrastructure for Automated testing of A11Y has yet to be assembled.

[Tiago Salem Herrmann (tiagosh)]

works great.
Thanks.

review: Approve

=== modified file 'libunity-2d-private/src/hud.cpp'
--- libunity-2d-private/src/hud.cpp	2012-02-20 09:12:49 +0000
+++ libunity-2d-private/src/hud.cpp	2012-03-20 11:18:20 +0000
@@ -28,6 +28,7 @@
 
 // Qt
 #include <QDateTime>
+#include <QTextDocument>
 
 static const char* HUD_DBUS_SERVICE = "com.canonical.hud";
 static const char* HUD_DBUS_PATH = "/com/canonical/hud";
@@ -39,6 +40,7 @@
     QHash<int, QByteArray> names;
     names[ResultIdRole] = "resultId";
     names[FormattedTextRole] = "formattedText";
+    names[PlainTextRole] = "plainText";
     names[IconNameRole] = "iconName";
     names[ItemIconRole] = "itemIcon";
     names[CompletionTextRole] = "completionText";
@@ -71,6 +73,7 @@
     if (!index.isValid() || m_searchQuery.isEmpty()) {
         return QVariant();
     }
+    QTextDocument formattedText;
 
     std::shared_ptr<unity::hud::Query> result;
 
@@ -86,6 +89,10 @@
         return index.row();
     case Hud::FormattedTextRole:
         return QString::fromStdString(result->formatted_text);
+    /* Work around the fact that HUD does not return plain text results for a11y */
+    case Hud::PlainTextRole:
+        formattedText.setHtml(QString::fromStdString(result->formatted_text));
+        return formattedText.toPlainText();
     case Hud::IconNameRole:
         return QString::fromStdString(result->icon_name);
     case Hud::ItemIconRole:
 
=== modified file 'libunity-2d-private/src/hud.h'
--- libunity-2d-private/src/hud.h	2012-02-15 18:48:53 +0000
+++ libunity-2d-private/src/hud.h	2012-03-20 11:18:20 +0000
@@ -41,6 +41,7 @@
     enum Roles {
         ResultIdRole = Qt::UserRole+1,
         FormattedTextRole,
+        PlainTextRole,
         IconNameRole,
         ItemIconRole,
         CompletionTextRole,
 
=== modified file 'shell/hud/ResultItem.qml'
--- shell/hud/ResultItem.qml	2012-02-16 11:41:43 +0000
+++ shell/hud/ResultItem.qml	2012-03-20 11:18:20 +0000
@@ -23,7 +23,7 @@
     id: delegate
     property string icon: ""
 
-    Accessible.name: completionText
+    Accessible.name: plainText
     Accessible.role: Accessible.Button
 
     Rectangle {
 
=== modified file 'tests/manual-tests/hud.txt'
--- tests/manual-tests/hud.txt	2012-02-17 15:18:47 +0000
+++ tests/manual-tests/hud.txt	2012-03-20 11:18:20 +0000
@@ -7,3 +7,11 @@
 --> check tile is updated to reflect the app/indicator listed
 --> click on one and ensure the action is performed
 --> Check HUD closes
+
+----
+ * Enable Accessibility and Orca speech output
+ * Tap Alt key
+ * Enter a few characters
+ * Use arrow keys to navigate up/down through the options returned
+
+--> Check Orca speaks the contents of the results