Merge lp:~azzar1/unity/format-option into lp:unity

[Andrea Azzarone]

Add a "Format..." option to volume icons.

Add a "Format..." option to volume icons. Initial branch: lp:~mcintire-evan/unity/add-format-option

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4071
http://jenkins.qa.ubuntu.com/job/unity-ci/1399/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/49

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

review: Approve (continuous-integration)

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

Some improvements to do in order to use the event timestamp and launch context, plus a way to detect gnome-disks properly.

I guess we can also now add "gnome-disks" package to debian/control's Recommends.

[lp:~azzar1/unity/format-option]

4068. By Matthias Klose on 2016-02-08

debian: Multiarchify the library packages.

Manual sync with debian packaging

4069. By Marco Trevisan (Treviño) on 2016-02-09

Launcher: add FileManager, Trash and Volume icons integration

Now the launcher will link each nautilus window to the related volume or trash
icon, while the Nautilus launcher icon will only be active if the file manager is
browsing other locations.
It's now possible to manage sub-windows from the parent icon like it happens for
every other application (so even spreading them or select from QL)

The windows management logic has been moved to WindowedLauncherIcon which is a
base class of ApplicationLauncherIcon, and StorageLauncherIcon.
VolumeLauncherIcon and TrashLauncherIcon are now based on StorageLauncherIcon
which connects to the FileManager to get the windows for a given location.

FileManagerLauncherIcon is now special and is both an ApplicationLauncherIcon
and a StorageLauncherIcon, and uses the parent application only for some tasks.

Lots of random code cleanup included too. Fixes: #1063823, #1063838, #1161323, #1524721
Approved by: PS Jenkins bot, Andrea Azzarone

4070. By Marco Trevisan (Treviño) on 2016-02-09

SwitcherModel: avoid to access to invalid selection or to divide by zero Fixes: #1537524
Approved by: PS Jenkins bot, Andrea Azzarone

4071. By Didier Roche on 2016-02-09

debian: Recommends session-shortcuts, prodiving easy way to shutdown, reboot and logout from dash
Approved by: Marco Trevisan (Treviño)

4072. By Marco Trevisan (Treviño) on 2016-02-09

CMake: use GNUInstallDirs with native multi-arch support

We can now use CMAKE_INSTALL_*DIR instead of defining them manually.
Also disable networkarea region plugin build by default. Fixes: #1485668, #1508635
Approved by: Andrea Azzarone

4073. By handsome_feng on 2016-02-09

Extend the lockscreen theme for kylin.
Approved by: PS Jenkins bot, Marco Trevisan (Treviño)

4074. By CI Train Bot Account on 2016-02-09

Releasing 7.4.0+16.04.20160209.3-0ubuntu1

[lp:~azzar1/unity/format-option]

4075. By Andrea Azzarone on 2016-02-24

Merge with trunk.

4076. By Andrea Azzarone on 2016-02-24

Use proper unicode char for triple dots.

4077. By Andrea Azzarone on 2016-02-24

Avoid the useless std::string.

4078. By Andrea Azzarone on 2016-02-25

Properly launch gnome-disk.

[Andrea Azzarone (azzar1)]

Done.

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

Looks good now, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4078
http://jenkins.qa.ubuntu.com/job/unity-ci/1416/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/66

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-02-23 22:39:12 +0000
+++ debian/control	2016-02-25 13:43:24 +0000
@@ -84,6 +84,7 @@
 Recommends: unity-control-center,
             ${unity-default-masterscopes}
             nautilus,
+            gnome-disk-utility,
             indicator-appmenu (>= 15.02.0),
             indicator-application,
             indicator-sound,

=== modified file 'launcher/Volume.h'
--- launcher/Volume.h	2013-10-07 16:49:04 +0000
+++ launcher/Volume.h	2016-02-25 13:43:24 +0000
@@ -39,11 +39,13 @@
   virtual ~Volume() = default;
 
   virtual bool CanBeEjected() const = 0;
+  virtual bool CanBeFormatted() const = 0;
   virtual bool CanBeRemoved() const = 0;
   virtual bool CanBeStopped() const = 0;
   virtual std::string GetName() const = 0;
   virtual std::string GetIconName() const = 0;
   virtual std::string GetIdentifier() const = 0;
+  virtual std::string GetUnixDevicePath() const = 0;
   virtual std::string GetUri() const = 0;
   virtual bool HasSiblings() const = 0;
   virtual bool IsMounted() const = 0;

=== modified file 'launcher/VolumeImp.cpp'
--- launcher/VolumeImp.cpp	2013-10-07 16:49:04 +0000
+++ launcher/VolumeImp.cpp	2016-02-25 13:43:24 +0000
@@ -53,6 +53,11 @@
     return g_volume_can_eject(volume_) != FALSE;
   }
 
+  bool CanBeFormatted() const
+  {
+    return !GetUnixDevicePath().empty();
+  }
+
   bool CanBeRemoved() const
   {
     glib::Object<GDrive> drive(g_volume_get_drive(volume_));
@@ -84,6 +89,12 @@
     return uuid.Str() + "-" + label.Str();
   }
 
+  std::string GetUnixDevicePath() const
+  {
+    glib::String ret(g_volume_get_identifier(volume_, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
+    return ret.Str();
+  }
+
   bool HasSiblings() const
   {
     glib::Object<GDrive> drive(g_volume_get_drive(volume_));
@@ -200,6 +211,11 @@
   return pimpl->CanBeEjected();
 }
 
+bool VolumeImp::CanBeFormatted() const
+{
+  return pimpl->CanBeFormatted();
+}
+
 bool VolumeImp::CanBeRemoved() const
 {
   return pimpl->CanBeRemoved();
@@ -225,6 +241,11 @@
   return pimpl->GetIdentifier();
 }
 
+std::string VolumeImp::GetUnixDevicePath() const
+{
+  return pimpl->GetUnixDevicePath();
+}
+
 std::string VolumeImp::GetUri() const
 {
   return pimpl->GetUri();

=== modified file 'launcher/VolumeImp.h'
--- launcher/VolumeImp.h	2013-10-07 16:49:04 +0000
+++ launcher/VolumeImp.h	2016-02-25 13:43:24 +0000
@@ -41,11 +41,13 @@
   virtual ~VolumeImp();
 
   virtual bool CanBeEjected() const;
+  virtual bool CanBeFormatted() const;
   virtual bool CanBeRemoved() const;
   virtual bool CanBeStopped() const;
   virtual std::string GetName() const;
   virtual std::string GetIconName() const;
   virtual std::string GetIdentifier() const;
+  virtual std::string GetUnixDevicePath() const;
   virtual std::string GetUri() const;
   virtual bool HasSiblings() const;
   virtual bool IsMounted() const;

=== modified file 'launcher/VolumeLauncherIcon.cpp'
--- launcher/VolumeLauncherIcon.cpp	2015-12-09 12:02:05 +0000
+++ launcher/VolumeLauncherIcon.cpp	2016-02-25 13:43:24 +0000
@@ -20,6 +20,7 @@
 
 
 #include "config.h"
+#include <gio/gdesktopappinfo.h>
 #include <glib/gi18n-lib.h>
 #include <UnityCore/ConnectionManager.h>
 #include <UnityCore/GLibSignal.h>
@@ -161,6 +162,7 @@
     MenuItemsVector result;
 
     AppendOpenItem(result);
+    AppendFormatItem(result);
     AppendSeparatorItem(result);
     AppendNameItem(result);
     AppendSeparatorItem(result);
@@ -295,6 +297,51 @@
     menu.push_back(menu_item);
   }
 
+  void AppendFormatItem(MenuItemsVector& menu)
+  {
+    glib::Object<GDesktopAppInfo> gd(g_desktop_app_info_new("gnome-disks.desktop"));
+
+    if (!volume_->CanBeFormatted() || !gd)
+      return;
+
+    glib::Object<DbusmenuMenuitem> menu_item(dbusmenu_menuitem_new());
+
+    dbusmenu_menuitem_property_set(menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Format…"));
+    dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+    dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
+
+    parent_->glib_signals_.Add(new ItemSignal(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, [this] (DbusmenuMenuitem*, unsigned timestamp) {
+      OpenFormatPrompt(timestamp);
+    }));
+
+    menu.push_back(menu_item);
+  }
+
+  void OpenFormatPrompt(Time timestamp)
+  {
+    glib::Object<GDesktopAppInfo> gd_desktop_app_info(g_desktop_app_info_new("gnome-disks.desktop"));
+
+    if (!gd_desktop_app_info)
+      return;
+
+    auto gd_app_info = glib::object_cast<GAppInfo>(gd_desktop_app_info);
+
+    std::string command_line = glib::gchar_to_string(g_app_info_get_executable(gd_app_info)) +
+                               " --block-device " +
+                               volume_->GetUnixDevicePath() + 
+                               " --format-device";
+
+    GdkDisplay* display = gdk_display_get_default();
+    glib::Object<GdkAppLaunchContext> app_launch_context(gdk_display_get_app_launch_context(display));
+    gdk_app_launch_context_set_timestamp(app_launch_context, timestamp);
+
+    glib::Object<GAppInfo> app_info(g_app_info_create_from_commandline(command_line.c_str(),
+                                                                       nullptr,
+                                                                       G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION,
+                                                                       nullptr));
+    g_app_info_launch_uris(app_info, nullptr, glib::object_cast<GAppLaunchContext>(app_launch_context), nullptr);
+  }
+
   void AppendUnmountItem(MenuItemsVector& menu)
   {
     if (!volume_->IsMounted() || volume_->CanBeEjected() || volume_->CanBeStopped())

=== modified file 'tests/test_mock_devices.h'
--- tests/test_mock_devices.h	2013-10-07 16:49:04 +0000
+++ tests/test_mock_devices.h	2016-02-25 13:43:24 +0000
@@ -78,11 +78,13 @@
   typedef std::shared_ptr<MockVolume> Ptr;
   typedef testing::NiceMock<MockVolume> Nice;
 
+  MOCK_CONST_METHOD0(CanBeFormatted, bool(void));
   MOCK_CONST_METHOD0(CanBeRemoved, bool(void));
   MOCK_CONST_METHOD0(CanBeStopped, bool(void));
   MOCK_CONST_METHOD0(GetName, std::string(void));
   MOCK_CONST_METHOD0(GetIconName, std::string(void));
   MOCK_CONST_METHOD0(GetIdentifier, std::string(void));
+  MOCK_CONST_METHOD0(GetUnixDevicePath, std::string(void));
   MOCK_CONST_METHOD0(GetUri, std::string(void));
   MOCK_CONST_METHOD0(HasSiblings, bool(void));
   MOCK_CONST_METHOD0(CanBeEjected, bool(void));

=== modified file 'tests/test_volume_launcher_icon.cpp'
--- tests/test_volume_launcher_icon.cpp	2015-12-08 14:34:55 +0000
+++ tests/test_volume_launcher_icon.cpp	2016-02-25 13:43:24 +0000
@@ -56,11 +56,13 @@
 
   void SetupVolumeDefaultBehavior()
   {
+    ON_CALL(*volume_, CanBeFormatted()).WillByDefault(Return(false));
     ON_CALL(*volume_, CanBeRemoved()).WillByDefault(Return(false));
     ON_CALL(*volume_, CanBeStopped()).WillByDefault(Return(false));
     ON_CALL(*volume_, GetName()).WillByDefault(Return("Test Name"));
     ON_CALL(*volume_, GetIconName()).WillByDefault(Return("Test Icon Name"));
     ON_CALL(*volume_, GetIdentifier()).WillByDefault(Return("Test Identifier"));
+    ON_CALL(*volume_, GetUnixDevicePath()).WillByDefault(Return("/dev/sda1"));
     ON_CALL(*volume_, GetUri()).WillByDefault(Return("file:///media/user/device_uri"));
     ON_CALL(*volume_, HasSiblings()).WillByDefault(Return(false));
     ON_CALL(*volume_, CanBeEjected()).WillByDefault(Return(false));