Merge lp:~aacid/unity-2d/finetunelauncherlistaccessibledescription into lp:unity-2d

[Albert Astals Cid]

[Launcher] Fine tune accessibleDescription

Doesn't say "not running" nor the window count for non Application items

[Launcher] Fine tune accessibleDescription

Doesn't say "not running" nor the window count for non Application items

[lp:~aacid/unity-2d/finetunelauncherlistaccessibledescription]

1044. By Albert Astals Cid on 2012-04-04

Revert Trash::windowCount as it was showing a pip in some cases and probably that's designed not to be that way

[Paweł Stołowski (stolowski)]

There is an extra "%2" for non-application in line 20 of the diff - you can hear Orca saying "<Removable name> percent 2".

review: Needs Fixing

[lp:~aacid/unity-2d/finetunelauncherlistaccessibledescription]

1045. By Albert Astals Cid on 2012-04-05

remove extra %2

[Paweł Stołowski (stolowski)]

Works fine!

review: Approve

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-03-16 15:47:12 +0000
+++ shell/launcher/LauncherList.qml	2012-04-05 10:49:19 +0000
@@ -85,11 +85,15 @@
         id: launcherItem
 
         function accessibleDescription() {
-            if (running) {
-                var windows = u2d.tr("%1 window opened", "%1 windows opened", item.windowCount).arg(item.windowCount)
-                return "%1 %2".arg(item.name).arg(windows)
+            if (item.toString().indexOf("Application") == 0) {
+                if (running) {
+                    var windows = u2d.tr("%1 window opened", "%1 windows opened", item.windowCount).arg(item.windowCount)
+                    return "%1 %2".arg(item.name).arg(windows)
+                } else {
+                    return "%1 %2".arg(item.name).arg(u2d.tr("not running"))
+                }
             } else {
-                return "%1 %2".arg(item.name).arg(u2d.tr("not running"))
+                return "%1".arg(item.name)
             }
         }