Merge lp:~azzar1/unity/scale-eject-notification into lp:unity

[Andrea Azzarone]

Use the standard notification-device-eject in the "device eject" notification. This allows us to scale it properly on high-dpi setups.

[Sebastien Bacher (seb128)]

not a code review but you have a typo in the commit message "notificaiton"

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

Yeah, better one.

review: Approve

=== modified file 'launcher/DeviceNotificationDisplay.h'
--- launcher/DeviceNotificationDisplay.h	2012-08-22 09:03:25 +0000
+++ launcher/DeviceNotificationDisplay.h	2016-07-21 12:39:12 +0000
@@ -36,7 +36,7 @@
 
   virtual ~DeviceNotificationDisplay() {}
 
-  virtual void Display(std::string const& icon_name, std::string const& volume_name) = 0;
+  virtual void Display(std::string const& volume_name) = 0;
 };
 
 }

=== modified file 'launcher/DeviceNotificationDisplayImp.cpp'
--- launcher/DeviceNotificationDisplayImp.cpp	2015-04-22 23:54:26 +0000
+++ launcher/DeviceNotificationDisplayImp.cpp	2016-07-21 12:39:12 +0000
@@ -20,49 +20,27 @@
 #include "config.h"
 #include <glib/gi18n-lib.h>
 #include <libnotify/notify.h>
-#include <sigc++/sigc++.h>
 #include <UnityCore/GLibWrapper.h>
 
 #include "DeviceNotificationDisplayImp.h"
-#include "unity-shared/IconLoader.h"
 
 namespace unity
 {
 namespace launcher
 {
 
-namespace
-{
-const unsigned icon_size = 48;
-}
-
 //
 // Start private implementation
 //
 class DeviceNotificationDisplayImp::Impl
 {
 public:
-  void Show(std::string const& icon_name, std::string const& volume_name)
-  {
-    IconLoader::GetDefault().LoadFromGIconString(icon_name, -1, icon_size,
-                                                 sigc::bind(sigc::mem_fun(this, &Impl::ShowNotificationWhenIconIsReady), volume_name));
-  }
-
-  void ShowNotificationWhenIconIsReady(std::string const& icon_name,
-                                       int max_width,
-                                       int max_height,
-                                       glib::Object<GdkPixbuf> const& pixbuf,
-                                       std::string const& volume_name)
+  void Show(std::string const& volume_name)
   {
     glib::Object<NotifyNotification> notification(notify_notification_new(volume_name.c_str(),
                                                                          _("The drive has been successfully ejected"),
-                                                                          nullptr));
-
+                                                                          "notification-device-eject"));
     notify_notification_set_hint(notification, "x-canonical-private-synchronous", g_variant_new_boolean(TRUE));
-
-    if (pixbuf)
-      notify_notification_set_image_from_pixbuf(notification, pixbuf);
-
     notify_notification_show(notification, nullptr);
   }
 };
@@ -78,9 +56,9 @@
 DeviceNotificationDisplayImp::~DeviceNotificationDisplayImp()
 {}
 
-void DeviceNotificationDisplayImp::Display(std::string const& icon_name, std::string const& volume_name)
+void DeviceNotificationDisplayImp::Display(std::string const& volume_name)
 {
-  pimpl->Show(icon_name, volume_name);
+  pimpl->Show(volume_name);
 }
 
 }

=== modified file 'launcher/DeviceNotificationDisplayImp.h'
--- launcher/DeviceNotificationDisplayImp.h	2012-08-22 09:03:25 +0000
+++ launcher/DeviceNotificationDisplayImp.h	2016-07-21 12:39:12 +0000
@@ -33,7 +33,7 @@
   DeviceNotificationDisplayImp();
   virtual ~DeviceNotificationDisplayImp();
 
-  virtual void Display(std::string const& icon_name, std::string const& volume_name);
+  virtual void Display(std::string const& volume_name);
 
 private:
   class Impl;

=== modified file 'launcher/VolumeLauncherIcon.cpp'
--- launcher/VolumeLauncherIcon.cpp	2016-02-25 13:42:10 +0000
+++ launcher/VolumeLauncherIcon.cpp	2016-07-21 12:39:12 +0000
@@ -108,7 +108,7 @@
 
     auto conn = std::make_shared<sigc::connection>();
     *conn = volume_->ejected.connect([this, conn] {
-      notification_->Display(volume_->GetIconName(), volume_->GetName());
+      notification_->Display(volume_->GetName());
       conn->disconnect();
     });
     connections_.Add(*conn);

=== modified file 'tests/test_mock_devices.h'
--- tests/test_mock_devices.h	2016-01-24 14:35:49 +0000
+++ tests/test_mock_devices.h	2016-07-21 12:39:12 +0000
@@ -101,7 +101,7 @@
   typedef std::shared_ptr<MockDeviceNotificationDisplay> Ptr;
   typedef testing::NiceMock<MockDeviceNotificationDisplay> Nice;
 
-  MOCK_METHOD2(Display, void(std::string const& icon_name, std::string const& volume_name));
+  MOCK_METHOD1(Display, void(std::string const& volume_name));
 };
 
 } // anonymous namespace

=== modified file 'tests/test_volume_launcher_icon.cpp'
--- tests/test_volume_launcher_icon.cpp	2016-01-24 14:35:49 +0000
+++ tests/test_volume_launcher_icon.cpp	2016-07-21 12:39:12 +0000
@@ -481,7 +481,7 @@
   auto menuitem = GetMenuItemAtIndex(5);
 
   EXPECT_CALL(*volume_, Eject());
-  EXPECT_CALL(*notifications_, Display(volume_->GetIconName(), volume_->GetName()));
+  EXPECT_CALL(*notifications_, Display(volume_->GetName()));
 
   ASSERT_STREQ(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Eject");
   EXPECT_TRUE(dbusmenu_menuitem_property_get_bool(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE));
@@ -573,7 +573,7 @@
     .WillRepeatedly(Return(true));
 
   EXPECT_CALL(*volume_, Eject());
-  EXPECT_CALL(*notifications_, Display(volume_->GetIconName(), volume_->GetName()));
+  EXPECT_CALL(*notifications_, Display(volume_->GetName()));
   icon_->EjectAndShowNotification();
 }