Merge lp:~azzar1/unity/fix-814610 into lp:unity

[Andrea Azzarone]

Adds a "Format..." quicklist item to device icons (optical devices and mp4 should not have this quicklist item).

Following nautilus example, it uses gnome disk utility format tool. Here's how it appears: http://people.ubuntu.com/~andyrock/Format.png

Didier told me that this require an FFe.

[Didier Roche-Tolomelli (didrocks)]

See the comment on the attached bug report. Maybe pending it for P?

[Neil J. Patel (njpatel)]

I'm approving this but let's wait until we branch for P to merge as it adds new strings.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-09-22 15:30:45 +0000
+++ CMakeLists.txt	2011-09-24 14:45:28 +0000
@@ -121,7 +121,7 @@
 #
 # Compiz Plugins
 #
-set (UNITY_PLUGIN_DEPS "compiz;nux-1.0 >= 1.2.2;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4;atk;unity-misc >= 0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0 >= 3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0")
+set (UNITY_PLUGIN_DEPS "compiz;nux-1.0 >= 1.2.2;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4;atk;unity-misc >= 0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0 >= 3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0;gdu")
 
 
 find_package (Compiz REQUIRED)

=== modified file 'plugins/unityshell/src/DeviceLauncherIcon.cpp'
--- plugins/unityshell/src/DeviceLauncherIcon.cpp	2011-09-08 04:49:34 +0000
+++ plugins/unityshell/src/DeviceLauncherIcon.cpp	2011-09-24 14:45:28 +0000
@@ -35,12 +35,17 @@
 namespace
 {
 nux::logging::Logger logger("unity.launcher");
+
+GduDevice* get_device_for_device_file (const gchar *device_file);
+
 }
 
 DeviceLauncherIcon::DeviceLauncherIcon(Launcher* launcher, GVolume* volume)
   : SimpleLauncherIcon(launcher)
   , volume_(volume)
-{
+  , device_file_(g_volume_get_identifier(volume_, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE))
+  , gdu_device_(get_device_for_device_file(device_file_.Value()))
+{  
   DevicesSettings::GetDefault().changed.connect(sigc::mem_fun(this, &DeviceLauncherIcon::OnSettingsChanged));
 
   // Checks if in favourites!
@@ -118,6 +123,21 @@
                    G_CALLBACK(&DeviceLauncherIcon::OnOpen), this);
                    
   result.push_back(menu_item);
+  
+  // "Format" item
+  if (gdu_device_ && !gdu_device_is_optical_disc(gdu_device_))
+  {
+    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);
+
+    g_signal_connect(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+                     G_CALLBACK(&DeviceLauncherIcon::OnFormat), this);
+                     
+    result.push_back(menu_item);
+  }
 
   // "Eject" item
   if (drive && g_drive_can_eject(drive))
@@ -329,6 +349,32 @@
   self->ActivateLauncherIcon(ActionArg(ActionArg::OTHER, 0));
 }
 
+void DeviceLauncherIcon::OnFormat(DbusmenuMenuitem* item,
+                                  int time,
+                                  DeviceLauncherIcon* self)
+{
+  glib::Error error;
+  
+  gchar const* args[] = { "/usr/lib/gnome-disk-utility/gdu-format-tool",
+                          "--device-file",
+                          self->device_file_.Value(),
+                          NULL};
+                          
+  g_spawn_async(NULL, // working dir
+                const_cast<gchar **>(args),
+                NULL, // envp
+                (GSpawnFlags) 0, // flags
+                NULL, // child_setup
+                NULL, // user_data
+                NULL, // GPid *child_pid
+                &error);
+                
+  if (error)
+  {
+    LOG_WARNING(logger) << "Error launching " << args[0] << ": " << error;
+  }
+}
+
 void DeviceLauncherIcon::OnEject(DbusmenuMenuitem* item,
                                  int time,
                                  DeviceLauncherIcon* self)
@@ -433,4 +479,19 @@
   UpdateVisibility();
 }
 
+namespace {
+
+GduDevice* get_device_for_device_file(const gchar *device_file)
+{
+  if (device_file == NULL || strlen(device_file) <= 1)
+    return NULL;
+    
+  glib::Object<GduPool> pool(gdu_pool_new());
+  GduDevice *device = gdu_pool_get_by_device_file(pool, device_file);
+
+  return device;
+}
+
+} // anonymouse namespace
+
 } // namespace unity

=== modified file 'plugins/unityshell/src/DeviceLauncherIcon.h'
--- plugins/unityshell/src/DeviceLauncherIcon.h	2011-08-25 10:33:02 +0000
+++ plugins/unityshell/src/DeviceLauncherIcon.h	2011-09-24 14:45:28 +0000
@@ -21,8 +21,10 @@
 #define _DEVICE_LAUNCHER_ICON_H__H
 
 #include <gio/gio.h>
+#define GDU_API_IS_SUBJECT_TO_CHANGE
+G_BEGIN_DECLS
+#include <gdu/gdu.h>
 #include <UnityCore/GLibWrapper.h>
-
 #include "SimpleLauncherIcon.h"
 
 namespace unity {
@@ -51,6 +53,7 @@
   void StopDrive();
   static void OnTogglePin(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
   static void OnOpen(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
+  static void OnFormat(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
   static void OnEject(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
   static void OnUnmount(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
   static void OnChanged(GVolume* volume, DeviceLauncherIcon* self);
@@ -62,6 +65,8 @@
 
 private:
   GVolume* volume_;
+  glib::String device_file_;
+  glib::Object<GduDevice> gdu_device_;
   bool keep_in_launcher_;
 };