Merge lp:~brandontschaefer/unity/lp.1237132-fix into lp:unity

[Brandon Schaefer]

When Show Desktop is active, it will set the tooltip icon as "Restore Windows". This is per workspace. So each time show_destop bool is updated in PluginAdapter, the Show Desktop icon will update its tooltip if needed.

When Show Desktop is active, it will set the tooltip icon as "Restore Windows". This is per workspace. So each time show_destop bool is updated in PluginAdapter, the Show Desktop icon will update its tooltip if needed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/unity-ci/1063/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/150

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Very cool. +1

review: Approve

=== modified file 'launcher/DesktopLauncherIcon.cpp'
--- launcher/DesktopLauncherIcon.cpp	2013-10-13 23:09:05 +0000
+++ launcher/DesktopLauncherIcon.cpp	2014-08-13 23:35:36 +0000
@@ -33,7 +33,9 @@
   : SimpleLauncherIcon(IconType::DESKTOP)
   , show_in_switcher_(true)
 {
-  tooltip_text = _("Show Desktop");
+  WindowManager::Default().show_desktop_changed.connect(sigc::mem_fun(this, &DesktopLauncherIcon::UpdateTooltipText));
+
+  UpdateTooltipText();
   icon_name = "desktop";
   SetQuirk(Quirk::VISIBLE, true);
   SetShortcut('d');
@@ -43,6 +45,16 @@
 {
   SimpleLauncherIcon::ActivateLauncherIcon(arg);
   WindowManager::Default().ShowDesktop();
+  UpdateTooltipText();
+}
+
+void DesktopLauncherIcon::UpdateTooltipText()
+{
+  auto const& wm = WindowManager::Default();
+  if (wm.InShowDesktop())
+    tooltip_text = _("Restore Windows");
+  else
+    tooltip_text = _("Show Desktop");
 }
 
 std::string DesktopLauncherIcon::GetName() const
 
=== modified file 'launcher/DesktopLauncherIcon.h'
--- launcher/DesktopLauncherIcon.h	2013-08-05 13:59:08 +0000
+++ launcher/DesktopLauncherIcon.h	2014-08-13 23:35:36 +0000
@@ -41,6 +41,8 @@
   std::string GetRemoteUri() const;
 
 private:
+  void UpdateTooltipText();
+
   bool show_in_switcher_;
 };
 
 
=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2014-07-30 18:16:08 +0000
+++ unity-shared/PluginAdapter.cpp	2014-08-13 23:35:36 +0000
@@ -1005,11 +1005,13 @@
 void PluginAdapter::OnShowDesktop()
 {
   _in_show_desktop = true;
+  show_desktop_changed.emit();
 }
 
 void PluginAdapter::OnLeaveDesktop()
 {
   _in_show_desktop = false;
+  show_desktop_changed.emit();
 }
 
 void PluginAdapter::UpdateShowDesktopState()
 
=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2014-04-02 21:42:12 +0000
+++ unity-shared/WindowManager.h	2014-08-13 23:35:36 +0000
@@ -189,6 +189,8 @@
   sigc::signal<void, Window> window_moved;
   sigc::signal<void, Window> window_focus_changed;
 
+  sigc::signal<void> show_desktop_changed;
+
   sigc::signal<void> initiate_spread;
   sigc::signal<void> terminate_spread;