Merge lp:~stolowski/unity-2d/shell-accessible-names into lp:unity-2d

[Paweł Stołowski]

[a11y] Report correct names of root shell elements to accessibility stack, instead of just "Shell".

UNBLOCK

[Albert Astals Cid (aacid)]

Looks good, works as well :-)

review: Approve

=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2012-01-23 10:31:52 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2012-04-06 15:28:20 +0000
@@ -109,11 +109,14 @@
     return false;
 }
 
-QAccessibleInterface *panelFactory(const QString &classname, QObject *object)
+QAccessibleInterface *accessibilityFactory(const QString &classname, QObject *object)
 {
     QAccessibleInterface *interface = 0;
 
-    if (classname == "Unity2dPanel" && object && object->isWidgetType()) {
+    if (classname == "ShellDeclarativeView" && object && object->isWidgetType()) {
+        interface = new QAccessibleWidget(static_cast<QWidget *>(object), QAccessible::Pane);
+    }
+    else if (classname == "Unity2dPanel" && object && object->isWidgetType()) {
         interface = new QAccessibleWidget(static_cast<QWidget *>(object), QAccessible::ToolBar);
     }
 
@@ -179,7 +182,7 @@
         qputenv("GSETTINGS_SCHEMA_DIR", unity2dDirectory().toLocal8Bit() + "/data");
     }
 
-    QAccessible::installFactory(panelFactory);
+    QAccessible::installFactory(accessibilityFactory);
 }
 
 Unity2dApplication::~Unity2dApplication()
 
=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-04-04 08:26:18 +0000
+++ shell/Shell.qml	2012-04-06 15:28:20 +0000
@@ -28,6 +28,20 @@
     property variant dashLoader
     property variant hudLoader
 
+    Binding {
+        target: declarativeView
+        property: "accessibleName"
+        value: {
+            if (shellManager.hudActive) {
+                return "Hud";
+            }
+            if (shellManager.dashActive) {
+                return "Dash";
+            }
+            return "Launcher";
+        }
+    }
+
     /* Space reserved by strutManager is taken off screen.availableGeometry but
        we want the shell to take all the available space, including the one we
        reserved ourselves via strutManager. */
 
=== modified file 'shell/app/shellmanager.cpp'
--- shell/app/shellmanager.cpp	2012-04-02 14:42:15 +0000
+++ shell/app/shellmanager.cpp	2012-04-06 15:28:20 +0000
@@ -117,7 +117,6 @@
 {
     const QStringList arguments = qApp->arguments();
     ShellDeclarativeView * view = new ShellDeclarativeView(q, m_sourceFileUrl, screen);
-    view->setAccessibleName("Shell");
     if (arguments.contains("-opengl")) {
         view->setUseOpenGL(true);
     }