Merge lp:~vikoadi/pantheon-photos/export-contextmenu into lp:~pantheon-photos/pantheon-photos/trunk

[Viko Adi Rahmawan]

* move export menuitem from menubar to contextmenu in PhotoPage and CollectionPage
* Drop Nautilus Send to entirely

* move export menuitem from menubar to contextmenu in PhotoPage and CollectionPage
* Drop Nautilus Send to entirely

[Danielle Foré (danrabbit)]

Can you also remove "Send To.." in this branch since it does pretty much the same thing (except it's broken) :p

[lp:~vikoadi/pantheon-photos/export-contextmenu]

2591. By Viko Adi Rahmawan on 2014-08-24

drop nautilus send to

[Viko Adi Rahmawan (vikoadi)]

Drop Nautilus send to

[Danielle Foré (danrabbit)]

review: Approve

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-08-23 07:54:47 +0000
+++ src/CollectionPage.vala	2014-08-24 00:42:32 +0000
@@ -74,7 +74,6 @@
     private static InjectionGroup create_file_menu_injectables () {
         InjectionGroup group = new InjectionGroup ("/MenuBar/FileMenu/FileExtrasPlaceholder");
 
-        group.add_menu_item ("SendTo");
         group.add_menu_item ("SetBackground");
 
         return group;

=== modified file 'src/DesktopIntegration.vala'
--- src/DesktopIntegration.vala	2014-08-12 01:16:54 +0000
+++ src/DesktopIntegration.vala	2014-08-24 00:42:32 +0000
@@ -6,12 +6,9 @@
 
 namespace DesktopIntegration {
 
-private const string SENDTO_EXEC = "nautilus-sendto";
 private const string DESKTOP_SLIDESHOW_XML_FILENAME = "wallpaper.xml";
 
 private int init_count = 0;
-private bool send_to_installed = false;
-private ExporterUI send_to_exporter = null;
 private ExporterUI desktop_slideshow_exporter = null;
 private double desktop_slideshow_transition = 0.0;
 private double desktop_slideshow_duration = 0.0;
@@ -19,8 +16,6 @@
 public void init () {
     if (init_count++ != 0)
         return;
-
-    send_to_installed = Environment.find_program_in_path (SENDTO_EXEC) != null;
 }
 
 public void terminate () {
@@ -86,72 +81,6 @@
     return str != null ? str : app_info.get_executable ();
 }
 
-public bool is_send_to_installed () {
-    return send_to_installed;
-}
-
-public void files_send_to (File[] files) {
-    if (files.length == 0)
-        return;
-
-    string[] argv = new string[files.length + 1];
-    argv[0] = SENDTO_EXEC;
-
-    for (int ctr = 0; ctr < files.length; ctr++)
-        argv[ctr + 1] = files[ctr].get_path ();
-
-    try {
-        AppWindow.get_instance ().set_busy_cursor ();
-
-        Pid child_pid;
-        Process.spawn_async (
-            "/",
-            argv,
-            null, // environment
-            SpawnFlags.SEARCH_PATH,
-            null, // child setup
-            out child_pid);
-
-        AppWindow.get_instance ().set_normal_cursor ();
-    } catch (Error err) {
-        AppWindow.get_instance ().set_normal_cursor ();
-        AppWindow.error_message (_ ("Unable to launch Nautilus Send-To: %s").printf (err.message));
-    }
-}
-
-public void send_to (Gee.Collection<MediaSource> media) {
-    if (media.size == 0 || send_to_exporter != null)
-        return;
-
-    ExportDialog dialog = new ExportDialog (_ ("Send To"));
-
-    // determine the mix of media in the export collection -- if it contains only
-    // videos then we can use the Video.export_many( ) fast path and not have to
-    // worry about ExportFormatParameters or the Export... dialog
-    if (MediaSourceCollection.has_video (media) && !MediaSourceCollection.has_photo (media)) {
-        send_to_exporter = Video.export_many ((Gee.Collection<Video>) media,
-                                              on_send_to_export_completed, true);
-        return;
-    }
-
-    int scale;
-    ScaleConstraint constraint;
-    ExportFormatParameters export_params = ExportFormatParameters.current ();
-    if (!dialog.execute (out scale, out constraint, ref export_params))
-        return;
-
-    send_to_exporter = new ExporterUI (new Exporter.for_temp_file (media,
-                                       Scaling.for_constraint (constraint, scale, false), export_params));
-    send_to_exporter.export (on_send_to_export_completed);
-}
-
-private void on_send_to_export_completed (Exporter exporter, bool is_cancelled) {
-    if (!is_cancelled)
-        files_send_to (exporter.get_exported_files ());
-
-    send_to_exporter = null;
-}
-
 public void set_background (Photo photo) {
     // attempt to set the wallpaper to the photo's native format, but if not writeable, go to the
     // system default

=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala	2014-08-08 21:13:09 +0000
+++ src/MediaPage.vala	2014-08-24 00:42:32 +0000
@@ -275,20 +275,6 @@
         export.label = Resources.EXPORT_MENU;
         actions += export;
 
-        Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null,
-                                    TRANSLATABLE, on_send_to
-                                  };
-        send_to.label = Resources.SEND_TO_MENU;
-        actions += send_to;
-
-        // This is identical to the above action, except that it has different
-        // mnemonics and is _only_ for use in the context menu.
-        Gtk.ActionEntry send_to_context_menu = { "SendToContextMenu", "document-send", TRANSLATABLE, null,
-                                                 TRANSLATABLE, on_send_to
-                                               };
-        send_to_context_menu.label = Resources.SEND_TO_CONTEXT_MENU;
-        actions += send_to_context_menu;
-
         Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE,
                                                 "<Shift>Delete", TRANSLATABLE, on_remove_from_library
                                               };
@@ -548,11 +534,6 @@
         set_action_sensitive ("RemoveFromLibrary", selected_count > 0);
         set_action_sensitive ("MoveToTrash", selected_count > 0);
 
-        if (DesktopIntegration.is_send_to_installed ())
-            set_action_sensitive ("SendTo", selected_count > 0);
-        else
-            set_action_visible ("SendTo", false);
-
         set_action_sensitive ("Rate", selected_count > 0);
         update_rating_sensitivities ();
 
@@ -716,10 +697,6 @@
         }
     }
 
-    private void on_send_to () {
-        DesktopIntegration.send_to ((Gee.Collection<MediaSource>) get_view ().get_selected_sources ());
-    }
-
     protected void on_play_video () {
         if (get_view ().get_selected_count () != 1)
             return;
@@ -1336,4 +1313,4 @@
 
         return get_checkerboard_layout ().get_scale ();
     }
-}
+}
\ No newline at end of file

=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2014-08-23 07:54:47 +0000
+++ src/PhotoPage.vala	2014-08-24 00:42:32 +0000
@@ -2553,12 +2553,6 @@
                                            };
         adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
         actions += adjust_date_time;
-        
-        Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null,
-                                    TRANSLATABLE, on_send_to
-                                  };
-        send_to.label = Resources.SEND_TO_MENU;
-        actions += send_to;
 
         Gtk.ActionEntry set_background = { "SetBackground", null, TRANSLATABLE, "<Ctrl>B",
                                            TRANSLATABLE, on_set_background
@@ -2699,14 +2693,6 @@
         open_with_raw.label = Resources.OPEN_WITH_RAW_MENU;
         actions += open_with_raw;
 
-        // These are identical to add_tags and send_to, except that they have
-        // different mnemonics and are _only_ for use in the context menu.
-        Gtk.ActionEntry send_to_context_menu = { "SendToContextMenu", "document-send", TRANSLATABLE, null,
-                                                 TRANSLATABLE, on_send_to
-                                               };
-        send_to_context_menu.label = Resources.SEND_TO_CONTEXT_MENU;
-        actions += send_to_context_menu;
-
         Gtk.ActionEntry add_tags_context_menu = { "AddTagsContextMenu", null, TRANSLATABLE, "<Ctrl>A", TRANSLATABLE,
                                                   on_add_tags
                                                 };
@@ -2961,7 +2947,6 @@
     protected override void update_ui (bool missing) {
         bool sensitivity = !missing;
 
-        set_action_sensitive ("SendTo", sensitivity);
         set_action_sensitive ("Publish", sensitivity);
         set_action_sensitive ("Print", sensitivity);
         set_action_sensitive ("CommonJumpToFile", sensitivity);
@@ -3296,11 +3281,6 @@
         }
     }
 
-    private void on_send_to () {
-        if (has_photo ())
-            DesktopIntegration.send_to ((Gee.Collection<Photo>) get_view ().get_selected_sources ());
-    }
-
     private void on_export () {
         if (!has_photo ())
             return;

=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala	2014-08-17 07:06:58 +0000
+++ src/direct/DirectPhotoPage.vala	2014-08-24 00:42:32 +0000
@@ -59,12 +59,6 @@
         save_as.tooltip = _ ("Save photo with a different name");
         actions += save_as;
 
-        Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null,
-                                    TRANSLATABLE, on_send_to
-                                  };
-        send_to.label = Resources.SEND_TO_MENU;
-        actions += send_to;
-
         Gtk.ActionEntry print = { "Print", Gtk.Stock.PRINT, TRANSLATABLE, "<Ctrl>P",
                                   TRANSLATABLE, on_print
                                 };
@@ -355,7 +349,6 @@
 
         set_action_sensitive ("Save", sensitivity);
         set_action_sensitive ("SaveAs", sensitivity);
-        set_action_sensitive ("SendTo", sensitivity);
         set_action_sensitive ("Publish", sensitivity);
         set_action_sensitive ("Print", sensitivity);
         set_action_sensitive ("CommonJumpToFile", sensitivity);
@@ -547,11 +540,6 @@
         save_as_dialog.destroy ();
     }
 
-    private void on_send_to () {
-        if (has_photo ())
-            DesktopIntegration.send_to ((Gee.Collection<Photo>) get_view ().get_selected_sources ());
-    }
-
     protected override bool on_app_key_pressed (Gdk.EventKey event) {
         bool handled = true;
 

=== modified file 'src/util/system.vala'
--- src/util/system.vala	2014-08-08 21:13:09 +0000
+++ src/util/system.vala	2014-08-24 00:42:32 +0000
@@ -37,4 +37,4 @@
 
 int posix_wexitstatus (int status) {
     return (((status) & 0xff00) >> 8);
-}
+}
\ No newline at end of file

=== modified file 'ui/collection.ui'
--- ui/collection.ui	2014-08-23 07:54:47 +0000
+++ ui/collection.ui	2014-08-24 00:42:32 +0000
@@ -42,7 +42,7 @@
         <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
         <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
         <menuitem name="ContextPrint" action="Print"/>
-        <menuitem name="ContextSendTo" action="SendToContextMenu" />
+        <menuitem name="ContextExport" action="Export" />
         <separator />
         <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
     </popup>

=== modified file 'ui/direct.ui'
--- ui/direct.ui	2014-08-23 07:54:47 +0000
+++ ui/direct.ui	2014-08-24 00:42:32 +0000
@@ -5,7 +5,6 @@
             <menuitem name="Save" action="Save" />
             <menuitem name="SaveAs" action="SaveAs" />
             <separator />
-            <menuitem name="SendTo" action="SendTo" />
             <placeholder name="SetBackgroundPlaceholder" />
             <separator />
             <menuitem name="JumpToFile" action="CommonJumpToFile" />

=== modified file 'ui/direct_context.ui'
--- ui/direct_context.ui	2014-08-08 15:28:05 +0000
+++ ui/direct_context.ui	2014-08-24 00:42:32 +0000
@@ -7,6 +7,5 @@
         <separator />
         <placeholder name="ContextJumpPlaceholder" />
         <placeholder name="PrintPlaceholder"/>
-        <menuitem name="ContextSendTo" action="SendTo" />
     </popup>
 </ui>
\ No newline at end of file

=== modified file 'ui/media.ui'
--- ui/media.ui	2014-08-10 13:08:34 +0000
+++ ui/media.ui	2014-08-24 00:42:32 +0000
@@ -4,7 +4,6 @@
         <menu name="FileMenu" action="FileMenu">
             <menuitem name="Import" action="CommonFileImport" />
             <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <menuitem name="Export" action="Export" />
             <separator />
             <placeholder name="FileExtrasPlaceholder" />
         </menu>

=== modified file 'ui/photo.ui'
--- ui/photo.ui	2014-08-23 07:54:47 +0000
+++ ui/photo.ui	2014-08-24 00:42:32 +0000
@@ -4,9 +4,7 @@
         <menu name="FileMenu" action="FileMenu">
             <menuitem name="Import" action="CommonFileImport" />
             <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <menuitem name="Export" action="Export" />
             <separator />
-            <menuitem name="SendTo" action="SendTo" />
             <placeholder name="SetBackgroundPlaceholder" />
         </menu>
         

=== modified file 'ui/photo_context.ui'
--- ui/photo_context.ui	2014-08-17 07:06:58 +0000
+++ ui/photo_context.ui	2014-08-24 00:42:32 +0000
@@ -37,9 +37,9 @@
         <separator />
         <placeholder name="ContextJumpPlaceholder" />
         <placeholder name="PrintPlaceholder" />
-        <menuitem name="ContextSendTo" action="SendToContextMenu" />
+        <menuitem name="ContextExport" action="Export" />
         <separator />
         <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
     </popup>
 
-</ui>
+</ui>
\ No newline at end of file