Merge lp:~feng-kylin/unity8/AddIndicationForRunningApp into lp:unity8

[handsome_feng]

Added indication for running apps.

Add indication for the running apps.

* Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

 * If you changed the UI, has there been a design review?

no

[Michael Zanetti (mzanetti)]

The code looks mostly ok (I've left 3 inline comments) and it works fine in make tryLauncher. However, testing it on the phone it doesn't work. No running icon painted :/

review: Needs Fixing

[handsome_feng (feng-kylin)]

> The code looks mostly ok (I've left 3 inline comments) and it works fine in
> make tryLauncher. However, testing it on the phone it doesn't work. No running
> icon painted :/

hmm... unfortunately，there are some problems on my nexus4 now.
But i will test this as soon as possible when my phone is repaired.

[handsome_feng (feng-kylin)]

Seems like a bug in unity8. I use the trunk code to test,run unity8 trough qtcreate repeatedly， it also got a "QML Image: Cannot open: file:///home/phablet/shell/qml/Launcher/graphics/focused_app_arrow.png" error, and the indication for focused app disappeared. hm... Keep investigating this.

[Michael Zanetti (mzanetti)]

actually I'm wondering if we really need to add the running_app_icon. isn't it just the same as the "focused_app_arrow" one? I guess we could rotate in code, at least until design gives a new one.

[handsome_feng (feng-kylin)]

> actually I'm wondering if we really need to add the running_app_icon. isn't it
> just the same as the "focused_app_arrow" one? I guess we could rotate in code,
> at least until design gives a new one.

hm, I agree with you, so rotating it in code first.

[Michael Zanetti (mzanetti)]

Ok, I've tested this and it seems to work fine now.

Please rebase on https://code.launchpad.net/~lukas-kde/unity8/closeAppsFromQuicklist/+merge/265669 which is already in a silo and about to land.

We'll get this in with the next silo then.

Thanks a lot for your contributions!

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
CI can't even compile at this stage, i've run relevant tests locally and seems fine.

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2015-07-29 05:57:57 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2015-07-29 05:57:57 +0000
@@ -517,7 +517,6 @@
             Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRecent});
         }
         item->setRunning(true);
-        // TODO Shall we paint some running/recent app highlight? If yes, do it here.
     } else {
         LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
         item->setRecent(true);

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2015-07-29 05:57:57 +0000
+++ qml/Launcher/LauncherDelegate.qml	2015-07-29 05:57:57 +0000
@@ -24,6 +24,7 @@
     property int count: 0
     property bool countVisible: false
     property int progress: -1
+    property bool itemRunning: false
     property bool itemFocused: false
     property real maxAngle: 0
     property bool inverted: false
@@ -217,6 +218,17 @@
         }
 
         Image {
+            objectName: "runningHighlight"
+            anchors {
+                left: parent.left
+                verticalCenter: parent.verticalCenter
+            }
+            visible: root.itemRunning
+            rotation: 180
+            source: "graphics/focused_app_arrow.png"
+        }
+
+        Image {
             objectName: "focusedHighlight"
             anchors {
                 right: parent.right

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-07-29 05:57:57 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-07-29 05:57:57 +0000
@@ -196,6 +196,7 @@
                         count: model.count
                         countVisible: model.countVisible
                         progress: model.progress
+                        itemRunning: model.running
                         itemFocused: model.focused
                         inverted: root.inverted
                         alerting: model.alerting

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-07-29 05:57:57 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-07-29 05:57:57 +0000
@@ -299,6 +299,22 @@
         QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);
     }
 
+    void testApplicationRunning() {
+        launcherModel->pin("abs-icon");
+        launcherModel->pin("no-icon");
+
+        QCOMPARE(launcherModel->get(0)->running(), true);
+        QCOMPARE(launcherModel->get(1)->running(), true);
+
+        appManager->stopApplication("abs-icon");
+        QCOMPARE(launcherModel->get(0)->running(), false);
+        QCOMPARE(launcherModel->get(1)->running(), true);
+
+        appManager->stopApplication("no-icon");
+        QCOMPARE(launcherModel->get(0)->running(), false);
+        QCOMPARE(launcherModel->get(1)->running(), false);
+    }
+
     void testApplicationFocused() {
         // all apps unfocused at beginning...
         QCOMPARE(launcherModel->get(0)->focused(), false);

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-07-29 05:57:57 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-07-29 05:57:57 +0000
@@ -382,6 +382,15 @@
             }
         }
 
+        function test_runningHighlight() {
+            dragLauncherIntoView();
+            var launcherListView = findChild(launcher, "launcherListView");
+            for (var i = 0; i < launcherListView.count; ++i) {
+                var delegate = findChild(launcherListView, "launcherDelegate" + i)
+                compare(findChild(delegate, "runningHighlight").visible, LauncherModel.get(i).running)
+            }
+        }
+
         function test_focusedHighlight() {
             dragLauncherIntoView();
             var launcherListView = findChild(launcher, "launcherListView");