Merge lp:~townsend/unity/fix-waiting-to-install into lp:unity

[Christopher Townsend]

Modify the Launcher icon of an installing app to display "Installing..." instead of always saying "Waiting to install".

== Issue ==
When installing an app from the Dash (or Software Center), the Launcher icon that is presented for the installing app always says "Waiting to install" despite that the app may be really installing.

== Fix ==
The fix is to change the tooltip from "Waiting to install" to "Installing..." when the Progress property is received.

== Test ==
Added a unit test to test that the tooltip changes when the property change happens.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3380
http://jenkins.qa.ubuntu.com/job/unity-ci/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/151/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Hmm this is nice, but it does go through the info quickly. Possibly just having it say "Installing..." instead of info thats goes by to fast to read. Also my icon didn't appear in the launcher after I removed the icon, then installed it again :(

review: Needs Information

[Christopher Townsend (townsend)]

The bug suggests using the "Installing..." or the actual state for the tool tip. I have added Ayatana Design to the bug to get their feedback, so we'll wait on that.

I also noticed the missing icon when trying to reinstall an app, but that is an unrelated bug. I should probably see if there is already a bug opened for that.

[Brandon Schaefer (brandontschaefer)]

LGTM :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3383
http://jenkins.qa.ubuntu.com/job/unity-ci/252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/140

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/252/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/165/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/899
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/118
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/118/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/166/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/903
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/119/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/119

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Oh, maybe it was better to use the ellipsize char (…), see if you can replace it later.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/168/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/933
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/124
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/124/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/124/console

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Jenkins seems to hate you Chris, possibly sending it some hateful mail will speed things up!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2013-07-01 21:20:51 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2013-07-17 18:51:25 +0000
@@ -254,6 +254,7 @@
     {
       SetQuirk(Quirk::PROGRESS, true);
       finished_ = false;
+      tooltip_text = _("Installing..."); 
     }
 
     SetProgress(progress/100.0f);
 
=== modified file 'launcher/SoftwareCenterLauncherIcon.h'
--- launcher/SoftwareCenterLauncherIcon.h	2012-12-05 10:24:53 +0000
+++ launcher/SoftwareCenterLauncherIcon.h	2013-07-17 18:51:25 +0000
@@ -50,9 +50,9 @@
   std::string GetActualDesktopFileAfterInstall();
   void ActivateLauncherIcon(ActionArg arg);
   void OnFinished(GVariant *params);
+  void OnPropertyChanged(GVariant* params);
 
 private:
-  void OnPropertyChanged(GVariant* params);
   void OnDragAnimationFinished();
 
   glib::DBusProxy aptdaemon_trans_;
 
=== modified file 'tests/test_software_center_launcher_icon.cpp'
--- tests/test_software_center_launcher_icon.cpp	2013-07-09 15:00:39 +0000
+++ tests/test_software_center_launcher_icon.cpp	2013-07-17 18:51:25 +0000
@@ -56,6 +56,7 @@
    using SoftwareCenterLauncherIcon::_desktop_file;
    using SoftwareCenterLauncherIcon::GetRemoteUri;
    using SoftwareCenterLauncherIcon::OnFinished;
+   using SoftwareCenterLauncherIcon::OnPropertyChanged;
 };
 
 struct TestSoftwareCenterLauncherIcon : testing::Test
@@ -134,6 +135,20 @@
   EXPECT_TRUE(icon.IsVisible());
 }
 
+TEST_F(TestSoftwareCenterLauncherIcon, TooltipInstalling)
+{
+  ASSERT_EQ(icon.tooltip_text(), "Waiting to install");
+
+  GVariant *progress = g_variant_new("i", 10);
+  GVariant *params = g_variant_new("(sv)", "Progress", progress);
+
+  icon.OnPropertyChanged(params);
+
+  EXPECT_EQ(icon.tooltip_text(), "Installing...");
+
+  g_variant_unref(params);
+}
+
 }
 
 }