Merge lp:~mcintire-evan/unity/add-format-option into lp:unity

[Didier Roche]

I've uploaded a branch, but it's not ready for review, I just need a bit of help. http://bazaar.launchpad.net/~mcintire-evan/unity/add-format-option/revision/4068 is what I have so far (I do need to rebase the code, but I'll do that after I get this bit working) I have some comments in there with what the problems are (at least what I think), and I've done some research and toying with solutions, but I don't know what the preferable way to go about it is; one of my ideas was to add a GetDeviceIdentifier() function to Volume and use that, but I'm not sure. I'd greatly appreciate some insight/help with this, thanks!

[Andrea Azzarone (azzar1)]

I'll rebase this branch to make it depend on lp:~3v1n0/unity/launcher-filemanager-integration.

review: Approve

[Andrea Azzarone (azzar1)]

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4068
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mcintire-evan/unity/add-format-option/+merge/282282/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1394/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/44/console

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

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

New working branch:
https://code.launchpad.net/~azzar1/unity/format-option/+merge/283741

review: Disapprove

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

Yeah, I agree something had to be improved.

I had my review ready, but for some reason I didn't submit it. So, here's for the record.

[Evan McIntire (mcintire-evan)]

Thanks Marco, but it seems Andrea made a branch going off of this that works as I had intended when I started this, thanks though!

Unmerged revisions

4068. By Evan McIntire on 2016-01-07

Begin adding format option to quicklists

=== modified file 'launcher/VolumeLauncherIcon.cpp'
--- launcher/VolumeLauncherIcon.cpp	2015-01-22 15:05:34 +0000
+++ launcher/VolumeLauncherIcon.cpp	2016-01-12 10:32:24 +0000
@@ -168,6 +168,7 @@
     MenuItemsVector result;
 
     AppendOpenItem(result);
+    AppendFormatItem(result);
     AppendSeparatorItem(result);
     AppendNameItem(result);
     AppendSeparatorItem(result);
@@ -241,6 +242,42 @@
 
     menu.push_back(menu_item);
   }
+  
+  void AppendFormatItem(MenuItemsVector& menu)
+  {
+    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);
+
+    gsignals_.Add(new ItemSignal(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, [this] (DbusmenuMenuitem*, unsigned timestamp) {
+      OpenFormatPrompt();
+    }));
+
+    menu.push_back(menu_item);
+  }
+  
+  void OpenFormatPrompt()
+  {
+    //TODO: Clean vars up at the end of the function
+    GAppInfo *appInfo;
+    gchar *cmdline;
+    
+    //This line is how it is done in nautilus, but we don't have access to the GVolume directly in this code
+    //device_identifier = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+    
+    //Fails with error "Invalid byte sequence in conversion input", and I don't even think it's the correct identifier
+    auto const& identifier = volume_->GetIdentifier();
+    
+    cmdline = g_strconcat ("gnome-disks ",
+                           "--block-device ", identifier, " ",
+                           "--format-device ",
+                           NULL);
+ 
+    appInfo = g_app_info_create_from_commandline (cmdline, NULL, G_APP_INFO_CREATE_NONE, NULL);
+    g_app_info_launch (appInfo, NULL, NULL, NULL);
+  }
 
   void AppendEjectItem(MenuItemsVector& menu)
   {