Merge lp:~bilalakhtar/unity/waiting-to-install-tooltip-925014 into lp:unity

[Bilal Akhtar]

SoftwareCenterLauncherIcon: avoid the "Waiting to Install" tooltip to stay after installation

Be consistent with auto-hiding launcher.

This branch contains a change that checks if the aptdaemon transaction ID was supplied by SC or not. If not, then it doesn't update the tooltip of the SCLauncherIcon to "Waiting to install"

Unity-side of bug fix for bug #925014 .

Merge request for the same bug fix to the Precise SRU branch is here: https://code.launchpad.net/~bilalakhtar/unity/5.0series-sru-software-center-integration-fixes

[Tim Penhey (thumper)]

Why are you including <string.h> in launcher/SoftwareCenterLauncherIcon.cpp?

In launcher/SoftwareCenterLauncherIcon.h, include <string> (not
<string.h>) and put it before <UnityCore/GLibDBusProxy.h>.

Standard includes first, then other libraries, then locals.

review: Needs Fixing

[Bilal Akhtar (bilalakhtar)]

Thanks Tim for the review, I've fixed it now.

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

This is OT, but about this tooltip, any plan to include there the name of the application? Something like: "Waiting to install: SMPlayer"?

Other than that now is fine ;)
FYI, I've made some cleanup related to this in lp:~3v1n0/unity/launcher-cleanup/+merge/108517

review: Approve

[Bilal Akhtar (bilalakhtar)]

@Marco: That's not part of the design spec (though MPT would like to get it changed I guess), but either way, since this branch is targeted at Unity 5.14 for Precise (SRU), string changes like those probably aren't allowed.

[Bilal Akhtar (bilalakhtar)]

I've moved the fix for this bug for the Precise branch to this merge request:

https://code.launchpad.net/~bilalakhtar/unity/5.0series-sru-software-center-integration-fixes

[Tim Penhey (thumper)]

Looks OK, but I'm wondering about testing this.

review: Approve

[Gary Lasker (gary-lasker)]

Hi Bilal! As per the Precise SRU branch, please be sure to test with the corresponding Software Center branch at lp:~gary-lasker/software-center/unity-launcher-integration-fixes to make sure that everything is working as you expect with this branch. Please let me know if anything happens that you are not expecting, or if you need me to make any further changes in my branch to support the changes you've made here.

Thanks!!
Gary

[Brandon Schaefer (brandontschaefer)]

From: https://code.launchpad.net/~bilalakhtar/unity/5.0series-sru-software-center-integration-fixes

https://code.launchpad.net/~bilalakhtar/unity/5.0series-sru-software-center-integration-fixes/+merge/110214/comments/247620

https://code.launchpad.net/~bilalakhtar/unity/5.0series-sru-software-center-integration-fixes/+merge/110214/comments/247860

This would the correct fix for 6.* as we should not be removing the entire installation animation.

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

After talking with Gary I think the approach will be to test this correct, approve it. (Since this is approved in 5.0...) Then I'll make a new bug to point at having this fixed correctly. (Correctly meaning that unity will be aware of the installing progress before completion, and will have the animation).

The new bug:
https://bugs.launchpad.net/unity/+bug/1028564

Tested this manually and it works as proposed.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2012-05-07 19:52:54 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2012-06-07 01:19:19 +0000
@@ -43,6 +43,7 @@
                    G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START)
 , finished_(true)
 , needs_urgent_(false)
+, aptdaemon_trans_id_(aptdaemon_trans_id)
 {
 
   aptdaemon_trans_.Connect("PropertyChanged", sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnPropertyChanged));
@@ -50,7 +51,8 @@
 
   SetIconType(TYPE_APPLICATION);
   icon_name = icon_path;
-  tooltip_text = _("Waiting to install");
+  if (!aptdaemon_trans_id_.empty()) // Application is being installed, or hasn't been installed yet
+    tooltip_text = _("Waiting to install");
 }
 
 void SoftwareCenterLauncherIcon::Animate(nux::ObjectPtr<Launcher> launcher,

=== modified file 'launcher/SoftwareCenterLauncherIcon.h'
--- launcher/SoftwareCenterLauncherIcon.h	2012-05-07 19:52:54 +0000
+++ launcher/SoftwareCenterLauncherIcon.h	2012-06-07 01:19:19 +0000
@@ -21,6 +21,7 @@
 #ifndef SOFTWARE_CENTER_LAUNCHERICON_H
 #define SOFTWARE_CENTER_LAUNCHERICON_H
 
+#include <string>
 #include <UnityCore/GLibDBusProxy.h>
 #include "BamfLauncherIcon.h"
 
@@ -61,6 +62,8 @@
   nux::ObjectPtr<Launcher> launcher_;
   bool finished_;
   bool needs_urgent_;
+
+  std::string aptdaemon_trans_id_;
 };
 
 }