Merge lp:~meese/pantheon-photos/fix-1321029 into lp:~pantheon-photos/pantheon-photos/trunk

[meese]

Replaces external editor in photo context menu with full open with menu, fixes bug 1321029

Replaces external editor in photo context menu with full open with menu, fixes bug 1321029

[lp:~meese/pantheon-photos/fix-1321029]

2549. By meese on 2014-07-18

fix format issue

[Corentin Noël (tintou)]

The implementation is right, I found some issues with the codestyle.
I would prefer the use of Gtk.Image.from_gicon as explained in the inline diff: IMO currently the icons are too gib and are inconsistent with the open with menu from Files, using IconSize.MENU will fix this for sure.

review: Needs Fixing

[lp:~meese/pantheon-photos/fix-1321029]

2550. By meese on 2014-08-04

standardizes the get icon method and smaller size, fixes code style issues

[meese (meese)]

fixed and I changed the code style to match the file but if I updated the entire file to follow http://elementaryos.org/docs/code/code-style would that be okay too?

review: Needs Resubmitting

[lp:~meese/pantheon-photos/fix-1321029]

2551. By meese on 2014-08-10

fix for updated master code style change

2552. By meese on 2014-08-10

manual merge from master

[Corentin Noël (tintou)]

Only a few typo remaining and it's okay!

[lp:~meese/pantheon-photos/fix-1321029]

2553. By meese on 2014-08-10

style fixes

[Corentin Noël (tintou)]

Well, Daniel says that showing the pantheon-photos entry is a bug

review: Needs Fixing

[lp:~meese/pantheon-photos/fix-1321029]

2554. By meese on 2014-08-12

fixes pantheon photos showing in open with menu

[Corentin Noël (tintou)]

It's now working fine !

review: Approve

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-08-08 21:13:09 +0000
+++ src/CollectionPage.vala	2014-08-12 01:17:16 +0000
@@ -38,9 +38,6 @@
         init_toolbar ("/CollectionToolbar");
 
         show_all ();
-
-        // watch for updates to the external app settings
-        Config.Facade.get_instance ().external_app_changed.connect (on_external_app_changed);
     }
 
     public override Gtk.Toolbar get_toolbar () {
@@ -200,17 +197,13 @@
         adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
         actions += adjust_date_time;
 
-        Gtk.ActionEntry external_edit = { "ExternalEdit", Gtk.Stock.EDIT, TRANSLATABLE, "<Ctrl>Return",
-                                          TRANSLATABLE, on_external_edit
-                                        };
-        external_edit.label = Resources.EXTERNAL_EDIT_MENU;
-        actions += external_edit;
+        Gtk.ActionEntry open_with = { "OpenWith", null, TRANSLATABLE, null, null, null };
+        open_with.label = Resources.OPEN_WITH_MENU;
+        actions += open_with;
 
-        Gtk.ActionEntry edit_raw = { "ExternalEditRAW", null, TRANSLATABLE, "<Ctrl><Shift>Return",
-                                     TRANSLATABLE, on_external_edit_raw
-                                   };
-        edit_raw.label = Resources.EXTERNAL_EDIT_RAW_MENU;
-        actions += edit_raw;
+        Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, TRANSLATABLE, null, null, null };
+        open_with_raw.label = Resources.OPEN_WITH_RAW_MENU;
+        actions += open_with_raw;
 
         Gtk.ActionEntry slideshow = { "Slideshow", null, TRANSLATABLE, "F5", TRANSLATABLE,
                                       on_slideshow
@@ -233,6 +226,94 @@
         return groups;
     }
 
+    public override Gtk.Menu? get_item_context_menu () {
+        Gtk.Menu menu = (Gtk.Menu) ui.get_widget ("/CollectionContextMenu");
+        assert (menu != null);
+
+        Gtk.MenuItem open_with_menu_item = (Gtk.MenuItem) ui.get_widget ("/CollectionContextMenu/OpenWith");
+        populate_external_app_menu ((Gtk.Menu)open_with_menu_item.get_submenu (), false);
+        open_with_menu_item.show ();
+
+        if (((Photo) get_view ().get_selected_at (0).get_source ()).get_master_file_format () == PhotoFileFormat.RAW) {
+            Gtk.MenuItem open_with_raw_menu_item = (Gtk.MenuItem) ui.get_widget ("/CollectionContextMenu/OpenWithRaw");
+            populate_external_app_menu ((Gtk.Menu)open_with_raw_menu_item.get_submenu (), true);
+            open_with_raw_menu_item.show ();
+        }
+
+        return menu;
+    }
+
+    private void populate_external_app_menu (Gtk.Menu menu, bool raw) {
+        Gtk.MenuItem parent = menu.get_attach_widget () as Gtk.MenuItem;
+        SortedList<AppInfo> external_apps;
+        string[] mime_types;
+
+        // get list of all applications for the given mime types
+        if (raw)
+            mime_types = PhotoFileFormat.RAW.get_mime_types ();
+        else
+            mime_types = PhotoFileFormat.get_editable_mime_types ();
+        assert (mime_types.length != 0);
+        external_apps = DesktopIntegration.get_apps_for_mime_types (mime_types);
+
+        if (external_apps.size == 0) {
+            parent.sensitive = false;
+            return;
+        }
+
+        foreach (Gtk.Widget item in menu.get_children ())
+            menu.remove (item);
+        parent.sensitive = true;
+
+        foreach (AppInfo app in external_apps) {
+            Gtk.ImageMenuItem item_app = new Gtk.ImageMenuItem.with_label (app.get_name ());
+            Gtk.Image image = new Gtk.Image.from_gicon (app.get_icon (), Gtk.IconSize.MENU);
+            item_app.always_show_image = true;
+            item_app.set_image (image);
+            item_app.activate.connect (() => {
+                if (raw)
+                    on_open_with_raw (app.get_commandline ());
+                else
+                    on_open_with (app.get_commandline ());
+            });
+            menu.add (item_app);
+        }
+        menu.show_all ();
+    }
+
+    private void on_open_with (string app) {
+        if (get_view ().get_selected_count () != 1)
+            return;
+
+        Photo photo = (Photo) get_view ().get_selected_at (0).get_source ();
+        try {
+            AppWindow.get_instance ().set_busy_cursor ();
+            photo.open_with_external_editor (app);
+            AppWindow.get_instance ().set_normal_cursor ();
+        } catch (Error err) {
+            AppWindow.get_instance ().set_normal_cursor ();
+            open_external_editor_error_dialog (err, photo);
+        }
+    }
+
+    private void on_open_with_raw (string app) {
+        if (get_view ().get_selected_count () != 1)
+            return;
+
+        Photo photo = (Photo) get_view ().get_selected_at (0).get_source ();
+        if (photo.get_master_file_format () != PhotoFileFormat.RAW)
+            return;
+
+        try {
+            AppWindow.get_instance ().set_busy_cursor ();
+            photo.open_with_raw_external_editor (app);
+            AppWindow.get_instance ().set_normal_cursor ();
+        } catch (Error err) {
+            AppWindow.get_instance ().set_normal_cursor ();
+            AppWindow.error_message (Resources.launch_editor_failed (err));
+        }
+    }
+
     private bool selection_has_video () {
         return MediaSourceCollection.has_video ((Gee.Collection<MediaSource>) get_view ().get_selected_sources ());
     }
@@ -275,14 +356,12 @@
         // don't allow duplication of the selection if it contains a video -- videos are huge and
         // and they're not editable anyway, so there seems to be no use case for duplicating them
         set_action_sensitive ("Duplicate", has_selected && (!selection_has_videos));
-        set_action_visible ("ExternalEdit", (!primary_is_video));
-        set_action_sensitive ("ExternalEdit",
-                              one_selected && !is_string_empty (Config.Facade.get_instance ().get_external_photo_app ()));
-        set_action_visible ("ExternalEditRAW",
+        set_action_visible ("OpenWith", (!primary_is_video));
+        set_action_sensitive ("OpenWith", one_selected);
+        set_action_visible ("OpenWithRaw",
                             one_selected && (!primary_is_video)
                             && ((Photo) get_view ().get_selected_at (0).get_source ()).get_master_file_format () ==
-                            PhotoFileFormat.RAW
-                            && !is_string_empty (Config.Facade.get_instance ().get_external_raw_app ()));
+                            PhotoFileFormat.RAW);
         set_action_sensitive ("Revert", (!selection_has_videos) && can_revert_selected ());
         set_action_sensitive ("Enhance", (!selection_has_videos) && has_selected);
         set_action_sensitive ("CopyColorAdjustments", (!selection_has_videos) && one_selected &&
@@ -345,12 +424,6 @@
         }
     }
 
-    private void on_external_app_changed () {
-        int selected_count = get_view ().get_selected_count ();
-
-        set_action_sensitive ("ExternalEdit", selected_count == 1 && Config.Facade.get_instance ().get_external_photo_app () != "");
-    }
-
     // see #2020
     // double clcik = switch to photo page
     // Super + double click = open in external editor
@@ -378,7 +451,8 @@
 
         if (activator == CheckerboardPage.Activator.MOUSE) {
             if (modifiers.super_pressed)
-                on_external_edit ();
+                //last used
+                on_open_with (Config.Facade.get_instance ().get_external_photo_app ());
             else
                 LibraryWindow.get_app ().switch_to_photo_page (this, photo);
         } else if (activator == CheckerboardPage.Activator.KEYBOARD) {
@@ -649,39 +723,6 @@
         }
     }
 
-    private void on_external_edit () {
-        if (get_view ().get_selected_count () != 1)
-            return;
-
-        Photo photo = (Photo) get_view ().get_selected_at (0).get_source ();
-        try {
-            AppWindow.get_instance ().set_busy_cursor ();
-            photo.open_with_external_editor ();
-            AppWindow.get_instance ().set_normal_cursor ();
-        } catch (Error err) {
-            AppWindow.get_instance ().set_normal_cursor ();
-            open_external_editor_error_dialog (err, photo);
-        }
-    }
-
-    private void on_external_edit_raw () {
-        if (get_view ().get_selected_count () != 1)
-            return;
-
-        Photo photo = (Photo) get_view ().get_selected_at (0).get_source ();
-        if (photo.get_master_file_format () != PhotoFileFormat.RAW)
-            return;
-
-        try {
-            AppWindow.get_instance ().set_busy_cursor ();
-            photo.open_with_raw_external_editor ();
-            AppWindow.get_instance ().set_normal_cursor ();
-        } catch (Error err) {
-            AppWindow.get_instance ().set_normal_cursor ();
-            AppWindow.error_message (Resources.launch_editor_failed (err));
-        }
-    }
-
     public void on_set_background () {
         Gee.ArrayList<LibraryPhoto> photos = new Gee.ArrayList<LibraryPhoto> ();
         MediaSourceCollection.filter_media ((Gee.Collection<MediaSource>) get_view ().get_selected_sources (),
@@ -747,4 +788,5 @@
     public override SearchViewFilter get_search_view_filter () {
         return search_filter;
     }
-}
\ No newline at end of file
+}
+

=== modified file 'src/DesktopIntegration.vala'
--- src/DesktopIntegration.vala	2014-08-08 21:13:09 +0000
+++ src/DesktopIntegration.vala	2014-08-12 01:17:16 +0000
@@ -72,7 +72,7 @@
             }
 
             // dont add Shotwell to app list
-            if (!already_contains && !external_app.get_name ().contains (_ (Resources.APP_TITLE)))
+            if (!already_contains && !external_app.get_name ().contains (_(Resources.APP_DIRECT_ROLE)))
                 external_apps.add (external_app);
         }
     }

=== modified file 'src/Dialogs.vala'
--- src/Dialogs.vala	2014-08-09 14:07:36 +0000
+++ src/Dialogs.vala	2014-08-12 01:17:16 +0000
@@ -2198,10 +2198,6 @@
     private Gtk.Builder builder;
     private Gtk.Adjustment bg_color_adjustment;
     private Gtk.Scale bg_color_slider;
-    private Gtk.ComboBox photo_editor_combo;
-    private Gtk.ComboBox raw_editor_combo;
-    private SortedList<AppInfo> external_raw_apps;
-    private SortedList<AppInfo> external_photo_apps;
     private Gtk.FileChooserButton library_dir_button;
     private Gtk.ComboBoxText dir_pattern_combo;
     private Gtk.Entry dir_pattern_entry;
@@ -2268,8 +2264,6 @@
 
         close_button = builder.get_object ("close_button") as Gtk.Button;
 
-        photo_editor_combo = builder.get_object ("external_photo_editor_combo") as Gtk.ComboBox;
-        raw_editor_combo = builder.get_object ("external_raw_editor_combo") as Gtk.ComboBox;
 
         Gtk.Label pattern_help = builder.get_object ("pattern_help") as Gtk.Label;
 
@@ -2316,8 +2310,6 @@
 
         populate_preference_options ();
 
-        photo_editor_combo.changed.connect (on_photo_editor_changed);
-        raw_editor_combo.changed.connect (on_raw_editor_changed);
 
         Gtk.CheckButton auto_import_button = builder.get_object ("autoimport") as Gtk.CheckButton;
         auto_import_button.set_active (Config.Facade.get_instance ().get_auto_import_from_library ());
@@ -2333,11 +2325,6 @@
     }
 
     public void populate_preference_options () {
-        populate_app_combo_box (photo_editor_combo, PhotoFileFormat.get_editable_mime_types (),
-                                Config.Facade.get_instance ().get_external_photo_app (), out external_photo_apps);
-
-        populate_app_combo_box (raw_editor_combo, PhotoFileFormat.RAW.get_mime_types (),
-                                Config.Facade.get_instance ().get_external_raw_app (), out external_raw_apps);
 
         setup_dir_pattern (dir_pattern_combo, dir_pattern_entry);
 
@@ -2355,64 +2342,6 @@
         return true;
     }
 
-    private void populate_app_combo_box (Gtk.ComboBox combo_box, string[] mime_types,
-                                         string current_app_executable, out SortedList<AppInfo> external_apps) {
-        // get list of all applications for the given mime types
-        assert (mime_types.length != 0);
-        external_apps = DesktopIntegration.get_apps_for_mime_types (mime_types);
-
-        if (external_apps.size == 0)
-            return;
-
-        // populate application ComboBox with app names and icons
-        Gtk.CellRendererPixbuf pixbuf_renderer = new Gtk.CellRendererPixbuf ();
-        Gtk.CellRendererText text_renderer = new Gtk.CellRendererText ();
-        combo_box.clear ();
-        combo_box.pack_start (pixbuf_renderer, false);
-        combo_box.pack_start (text_renderer, false);
-        combo_box.add_attribute (pixbuf_renderer, "pixbuf", 0);
-        combo_box.add_attribute (text_renderer, "text", 1);
-
-        // TODO: need more space between icons and text
-        Gtk.ListStore combo_store = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
-        Gtk.TreeIter iter;
-
-        int current_app = -1;
-
-        foreach (AppInfo app in external_apps) {
-            combo_store.append (out iter);
-
-            Icon app_icon = app.get_icon ();
-            try {
-                if (app_icon is FileIcon) {
-                    combo_store.set_value (iter, 0, scale_pixbuf (new Gdk.Pixbuf.from_file (
-                                               ((FileIcon) app_icon).get_file ().get_path ()), Resources.DEFAULT_ICON_SCALE,
-                                           Gdk.InterpType.BILINEAR, false));
-                } else if (app_icon is ThemedIcon) {
-                    Gdk.Pixbuf icon_pixbuf =
-                        Gtk.IconTheme.get_default ().load_icon (((ThemedIcon) app_icon).get_names ()[0],
-                                Resources.DEFAULT_ICON_SCALE, Gtk.IconLookupFlags.FORCE_SIZE);
-
-                    combo_store.set_value (iter, 0, icon_pixbuf);
-                }
-            } catch (GLib.Error error) {
-                warning ("Error loading icon pixbuf: " + error.message);
-            }
-
-            combo_store.set_value (iter, 1, app.get_name ());
-
-            if (app.get_commandline () == current_app_executable)
-                current_app = external_apps.index_of (app);
-        }
-
-        // TODO: allow users to choose unlisted applications like Nautilus's "Open with -> Other Application..."
-
-        combo_box.set_model (combo_store);
-
-        if (current_app != -1)
-            combo_box.set_active (current_app);
-    }
-
     private void setup_dir_pattern (Gtk.ComboBox combo_box, Gtk.Entry entry) {
         string? pattern = Config.Facade.get_instance ().get_directory_pattern ();
         bool found = false;
@@ -2574,28 +2503,6 @@
         return color;
     }
 
-    private void on_photo_editor_changed () {
-        int photo_app_choice_index = (photo_editor_combo.get_active () < external_photo_apps.size) ?
-                                     photo_editor_combo.get_active () : external_photo_apps.size;
-
-        AppInfo app = external_photo_apps.get_at (photo_app_choice_index);
-
-        Config.Facade.get_instance ().set_external_photo_app (DesktopIntegration.get_app_open_command (app));
-
-        debug ("setting external photo editor to: %s", DesktopIntegration.get_app_open_command (app));
-    }
-
-    private void on_raw_editor_changed () {
-        int raw_app_choice_index = (raw_editor_combo.get_active () < external_raw_apps.size) ?
-                                   raw_editor_combo.get_active () : external_raw_apps.size;
-
-        AppInfo app = external_raw_apps.get_at (raw_app_choice_index);
-
-        Config.Facade.get_instance ().set_external_raw_app (app.get_commandline ());
-
-        debug ("setting external raw editor to: %s", app.get_commandline ());
-    }
-
     private RawDeveloper raw_developer_from_combo () {
         if (default_raw_developer_combo.get_active () == 0)
             return RawDeveloper.CAMERA;

=== modified file 'src/Page.vala'
--- src/Page.vala	2014-08-08 21:13:09 +0000
+++ src/Page.vala	2014-08-12 01:17:16 +0000
@@ -2621,4 +2621,5 @@
     private void on_export_completed () {
         exporter = null;
     }
-}
\ No newline at end of file
+}
+

=== modified file 'src/Photo.vala'
--- src/Photo.vala	2014-08-08 21:13:09 +0000
+++ src/Photo.vala	2014-08-12 01:17:16 +0000
@@ -3653,9 +3653,7 @@
         return generate_unique_file (backing.get_parent (), editable_basename, out collision);
     }
 
-    private static bool launch_editor (File file, PhotoFileFormat file_format) throws Error {
-        string commandline = file_format == PhotoFileFormat.RAW ? Config.Facade.get_instance ().get_external_raw_app () :
-        Config.Facade.get_instance ().get_external_photo_app ();
+    private static bool launch_editor (File file, PhotoFileFormat file_format, string commandline) throws Error {
 
         if (is_string_empty (commandline))
             return false;
@@ -3690,12 +3688,14 @@
     }
 
     // Opens with Ufraw, etc.
-    public void open_with_raw_external_editor () throws Error {
-        launch_editor (get_master_file (), get_master_file_format ());
+    public void open_with_raw_external_editor (string external_editor) throws Error {
+        //store last used
+        Config.Facade.get_instance ().set_external_raw_app (external_editor);
+        launch_editor (get_master_file (), get_master_file_format (), external_editor);
     }
 
     // Opens with GIMP, etc.
-    public void open_with_external_editor () throws Error {
+    public void open_with_external_editor (string external_editor) throws Error {
         File current_editable_file = null;
         File create_editable_file = null;
         PhotoFileFormat editable_file_format;
@@ -3747,7 +3747,9 @@
         if (editable_monitor == null)
             start_monitoring_editable (current_editable_file);
 
-        launch_editor (current_editable_file, get_file_format ());
+        //store last used
+        Config.Facade.get_instance ().set_external_photo_app (external_editor);
+        launch_editor (current_editable_file, get_file_format (), external_editor);
     }
 
     public void revert_to_master (bool notify = true) {

=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2014-08-09 13:57:30 +0000
+++ src/PhotoPage.vala	2014-08-12 01:17:16 +0000
@@ -2335,9 +2335,6 @@
         LibraryPhoto.global.item_destroyed.connect (on_photo_destroyed);
         LibraryPhoto.global.items_altered.connect (on_metadata_altered);
 
-        // watch for updates to the external app settings
-        Config.Facade.get_instance ().external_app_changed.connect (on_external_app_changed);
-
         // Filter out trashed files.
         get_view ().install_view_filter (filter);
         LibraryPhoto.global.items_unlinking.connect (on_photo_unlinking);
@@ -2347,7 +2344,6 @@
     ~LibraryPhotoPage () {
         LibraryPhoto.global.item_destroyed.disconnect (on_photo_destroyed);
         LibraryPhoto.global.items_altered.disconnect (on_metadata_altered);
-        Config.Facade.get_instance ().external_app_changed.disconnect (on_external_app_changed);
     }
 
     public bool not_trashed_view_filter (DataView view) {
@@ -2523,19 +2519,7 @@
                                            };
         adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
         actions += adjust_date_time;
-
-        Gtk.ActionEntry external_edit = { "ExternalEdit", Gtk.Stock.EDIT, TRANSLATABLE,
-                                          "<Ctrl>Return", TRANSLATABLE, on_external_edit
-                                        };
-        external_edit.label = Resources.EXTERNAL_EDIT_MENU;
-        actions += external_edit;
-
-        Gtk.ActionEntry edit_raw = { "ExternalEditRAW", null, TRANSLATABLE, "<Ctrl><Shift>Return",
-                                     TRANSLATABLE, on_external_edit_raw
-                                   };
-        edit_raw.label = Resources.EXTERNAL_EDIT_RAW_MENU;
-        actions += edit_raw;
-
+        
         Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null,
                                     TRANSLATABLE, on_send_to
                                   };
@@ -2673,6 +2657,14 @@
         raw_developer.label = _ ("_Developer");
         actions += raw_developer;
 
+        Gtk.ActionEntry open_with = { "OpenWith", null, TRANSLATABLE, null, null, null };
+        open_with.label = Resources.OPEN_WITH_MENU;
+        actions += open_with;
+
+        Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, TRANSLATABLE, null, null, null };
+        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,
@@ -2764,8 +2756,8 @@
         bool rotate_possible = has_photo () ? is_rotate_available (get_photo ()) : false;
         bool is_raw = has_photo () && get_photo ().get_master_file_format () == PhotoFileFormat.RAW;
 
-        set_action_sensitive ("ExternalEdit",
-                              has_photo () && Config.Facade.get_instance ().get_external_photo_app () != "");
+        set_action_sensitive ("OpenWith",
+                              has_photo ());
 
         set_action_sensitive ("Revert", has_photo () ?
                               (get_photo ().has_transformations () || get_photo ().has_editable ()) : false);
@@ -2795,8 +2787,8 @@
 
         update_flag_action ();
 
-        set_action_visible ("ExternalEditRAW",
-                            is_raw && Config.Facade.get_instance ().get_external_raw_app () != "");
+        set_action_visible ("OpenWithRaw",
+                            is_raw);
 
         base.update_actions (selected_count, count);
     }
@@ -2961,8 +2953,8 @@
         set_action_sensitive ("Adjust", sensitivity);
         set_action_sensitive ("EditTitle", sensitivity);
         set_action_sensitive ("AdjustDateTime", sensitivity);
-        set_action_sensitive ("ExternalEdit", sensitivity);
-        set_action_sensitive ("ExternalEditRAW", sensitivity);
+        set_action_sensitive ("OpenWith", sensitivity);
+        set_action_sensitive ("OpenWithRaw", sensitivity);
         set_action_sensitive ("Revert", sensitivity);
 
         set_action_sensitive ("Rate", sensitivity);
@@ -3088,6 +3080,16 @@
     private Gtk.Menu get_context_menu () {
         Gtk.Menu menu = (Gtk.Menu) ui.get_widget ("/PhotoContextMenu");
         assert (menu != null);
+
+        Gtk.MenuItem open_with_menu_item = (Gtk.MenuItem) ui.get_widget ("/PhotoContextMenu/OpenWith");
+        populate_external_app_menu ((Gtk.Menu)open_with_menu_item.get_submenu (), false);
+        open_with_menu_item.show ();
+
+        if (has_photo () && get_photo ().get_master_file_format () == PhotoFileFormat.RAW) {
+            Gtk.MenuItem open_with_raw_menu_item = (Gtk.MenuItem) ui.get_widget ("/PhotoContextMenu/OpenWithRaw");
+            populate_external_app_menu ((Gtk.Menu)open_with_raw_menu_item.get_submenu (), true);
+            open_with_raw_menu_item.show ();
+        }
         return menu;
     }
 
@@ -3103,6 +3105,75 @@
         return true;
     }
 
+    private void populate_external_app_menu (Gtk.Menu menu, bool raw) {
+        Gtk.MenuItem parent = menu.get_attach_widget () as Gtk.MenuItem;
+        SortedList<AppInfo> external_apps;
+        string[] mime_types;
+
+        // get list of all applications for the given mime types
+        if (raw)
+            mime_types = PhotoFileFormat.RAW.get_mime_types ();
+        else
+            mime_types = PhotoFileFormat.get_editable_mime_types ();
+        assert (mime_types.length != 0);
+        external_apps = DesktopIntegration.get_apps_for_mime_types (mime_types);
+
+        if (external_apps.size == 0) {
+            parent.sensitive = false;
+            return;
+        }
+
+        foreach (Gtk.Widget item in menu.get_children ())
+            menu.remove (item);
+        parent.sensitive = true;
+
+        foreach (AppInfo app in external_apps) {
+            Gtk.ImageMenuItem item_app = new Gtk.ImageMenuItem.with_label (app.get_name ());
+            Gtk.Image image = new Gtk.Image.from_gicon (app.get_icon (), Gtk.IconSize.MENU);
+            item_app.always_show_image = true;
+            item_app.set_image (image);
+            item_app.activate.connect ( () => {
+                if (raw)
+                    on_open_with_raw (app.get_commandline ());
+                else
+                    on_open_with (app.get_commandline ());
+            });
+            menu.add (item_app);
+        }
+        menu.show_all ();
+    }
+
+    private void on_open_with (string app) {
+        if (!has_photo ())
+            return;
+
+        try {
+            AppWindow.get_instance ().set_busy_cursor ();
+            get_photo ().open_with_external_editor (app);
+            AppWindow.get_instance ().set_normal_cursor ();
+        } catch (Error err) {
+            AppWindow.get_instance ().set_normal_cursor ();
+            open_external_editor_error_dialog (err, get_photo ());
+        }
+    }
+
+    private void on_open_with_raw (string app) {
+        if (!has_photo ())
+            return;
+
+        if (get_photo ().get_master_file_format () != PhotoFileFormat.RAW)
+            return;
+
+        try {
+            AppWindow.get_instance ().set_busy_cursor ();
+            get_photo ().open_with_raw_external_editor (app);
+            AppWindow.get_instance ().set_normal_cursor ();
+        } catch (Error err) {
+            AppWindow.get_instance ().set_normal_cursor ();
+            AppWindow.error_message (Resources.launch_editor_failed (err));
+        }
+    }
+
     private void return_to_collection () {
         // Return to the previous page if it exists.
         if (null != return_page)
@@ -3192,43 +3263,6 @@
         }
     }
 
-    private void on_external_app_changed () {
-        set_action_sensitive ("ExternalEdit", has_photo () &&
-                              Config.Facade.get_instance ().get_external_photo_app () != "");
-    }
-
-    private void on_external_edit () {
-        if (!has_photo ())
-            return;
-
-        try {
-            AppWindow.get_instance ().set_busy_cursor ();
-            get_photo ().open_with_external_editor ();
-            AppWindow.get_instance ().set_normal_cursor ();
-        } catch (Error err) {
-            AppWindow.get_instance ().set_normal_cursor ();
-            open_external_editor_error_dialog (err, get_photo ());
-        }
-
-    }
-
-    private void on_external_edit_raw () {
-        if (!has_photo ())
-            return;
-
-        if (get_photo ().get_master_file_format () != PhotoFileFormat.RAW)
-            return;
-
-        try {
-            AppWindow.get_instance ().set_busy_cursor ();
-            get_photo ().open_with_raw_external_editor ();
-            AppWindow.get_instance ().set_normal_cursor ();
-        } catch (Error err) {
-            AppWindow.get_instance ().set_normal_cursor ();
-            AppWindow.error_message (Resources.launch_editor_failed (err));
-        }
-    }
-
     private void on_send_to () {
         if (has_photo ())
             DesktopIntegration.send_to ((Gee.Collection<Photo>) get_view ().get_selected_sources ());

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2014-08-08 21:13:09 +0000
+++ src/Resources.vala	2014-08-12 01:17:16 +0000
@@ -13,9 +13,9 @@
 extern const string? _GIT_VERSION;
 
 namespace Resources {
-public const string APP_TITLE = _ ("Photos");
-public const string APP_LIBRARY_ROLE = _ ("Photo Manager");
-public const string APP_DIRECT_ROLE = _ ("Photo Viewer");
+public const string APP_TITLE = _("Photos");
+public const string APP_LIBRARY_ROLE = _("Photo Manager");
+public const string APP_DIRECT_ROLE = _("Photo Viewer");
 public const string APP_VERSION = _VERSION;
 
 #if _GITVERSION
@@ -24,7 +24,7 @@
 public const string? GIT_VERSION = null;
 #endif
 
-public const string COPYRIGHT = _ ("Copyright 2009-2013 Yorba Foundation");
+public const string COPYRIGHT = _("Copyright 2009-2013 Yorba Foundation");
 public const string APP_GETTEXT_PACKAGE = GETTEXT_PACKAGE;
 
 public const string YORBA_URL = "http://www.yorba.org";
@@ -136,250 +136,258 @@
 public const string ICON_FLAGGED_PAGE = "flag-page";
 public const string ICON_FLAGGED_TRINKET = "flag-trinket.png";
 
-public const string ROTATE_CW_MENU = _ ("Rotate _Right");
-public const string ROTATE_CW_LABEL = _ ("Rotate");
-public const string ROTATE_CW_FULL_LABEL = _ ("Rotate Right");
-public const string ROTATE_CW_TOOLTIP = _ ("Rotate the photos right (press Ctrl to rotate left)");
-
-public const string ROTATE_CCW_MENU = _ ("Rotate _Left");
-public const string ROTATE_CCW_LABEL = _ ("Rotate");
-public const string ROTATE_CCW_FULL_LABEL = _ ("Rotate Left");
-public const string ROTATE_CCW_TOOLTIP = _ ("Rotate the photos left");
-
-public const string HFLIP_MENU = _ ("Flip Hori_zontally");
-public const string HFLIP_LABEL = _ ("Flip Horizontally");
-
-public const string VFLIP_MENU = _ ("Flip Verti_cally");
-public const string VFLIP_LABEL = _ ("Flip Vertically");
-
-public const string ENHANCE_MENU = _ ("_Enhance");
-public const string ENHANCE_LABEL = _ ("Enhance");
-public const string ENHANCE_TOOLTIP = _ ("Automatically improve the photo's appearance");
-
-public const string COPY_ADJUSTMENTS_MENU = _ ("_Copy Color Adjustments");
-public const string COPY_ADJUSTMENTS_LABEL = _ ("Copy Color Adjustments");
-public const string COPY_ADJUSTMENTS_TOOLTIP = _ ("Copy the color adjustments applied to the photo");
-
-public const string PASTE_ADJUSTMENTS_MENU = _ ("_Paste Color Adjustments");
-public const string PASTE_ADJUSTMENTS_LABEL = _ ("Paste Color Adjustments");
-public const string PASTE_ADJUSTMENTS_TOOLTIP = _ ("Apply copied color adjustments to the selected photos");
-
-public const string CROP_MENU = _ ("_Crop");
-public const string CROP_LABEL = _ ("Crop");
-public const string CROP_TOOLTIP = _ ("Crop the photo's size");
-
-public const string STRAIGHTEN_MENU = _ ("_Straighten");
-public const string STRAIGHTEN_LABEL = _ ("Straighten");
-public const string STRAIGHTEN_TOOLTIP = _ ("Straighten the photo");
-
-public const string RED_EYE_MENU = _ ("_Red-eye");
-public const string RED_EYE_LABEL = _ ("Red-eye");
-public const string RED_EYE_TOOLTIP = _ ("Reduce or eliminate any red-eye effects in the photo");
-
-public const string ADJUST_MENU = _ ("_Adjust");
-public const string ADJUST_LABEL = _ ("Adjust");
-public const string ADJUST_TOOLTIP = _ ("Adjust the photo's color and tone");
-
-public const string REVERT_MENU = _ ("Re_vert to Original");
-public const string REVERT_LABEL = _ ("Revert to Original");
-
-public const string REVERT_EDITABLE_MENU = _ ("Revert External E_dits");
-public const string REVERT_EDITABLE_TOOLTIP = _ ("Revert to the master photo");
-
-public const string SET_BACKGROUND_MENU = _ ("Set as _Desktop Background");
-public const string SET_BACKGROUND_TOOLTIP = _ ("Set selected image to be the new desktop background");
-public const string SET_BACKGROUND_SLIDESHOW_MENU = _ ("Set as _Desktop Slideshow...");
-
-public const string UNDO_MENU = _ ("_Undo");
-public const string UNDO_LABEL = _ ("Undo");
-
-public const string REDO_MENU = _ ("_Redo");
-public const string REDO_LABEL = _ ("Redo");
-
-public const string RENAME_EVENT_MENU = _ ("Re_name Event...");
-public const string RENAME_EVENT_LABEL = _ ("Rename Event");
-
-public const string MAKE_KEY_PHOTO_MENU = _ ("Make _Key Photo for Event");
-public const string MAKE_KEY_PHOTO_LABEL = _ ("Make Key Photo for Event");
-
-public const string NEW_EVENT_MENU = _ ("_New Event");
-public const string NEW_EVENT_LABEL = _ ("New Event");
-
-public const string SET_PHOTO_EVENT_LABEL = _ ("Move Photos");
-public const string SET_PHOTO_EVENT_TOOLTIP = _ ("Move photos to an event");
-
-public const string MERGE_MENU = _ ("_Merge Events");
-public const string MERGE_LABEL = _ ("Merge");
-public const string MERGE_TOOLTIP = _ ("Combine events into a single event");
-
-public const string RATING_MENU = _ ("_Set Rating");
-public const string RATING_LABEL = _ ("Set Rating");
-public const string RATING_TOOLTIP = _ ("Change the rating of your photo");
-
-public const string INCREASE_RATING_MENU = _ ("_Increase");
-public const string INCREASE_RATING_LABEL = _ ("Increase Rating");
-
-public const string DECREASE_RATING_MENU = _ ("_Decrease");
-public const string DECREASE_RATING_LABEL = _ ("Decrease Rating");
-
-public const string RATE_UNRATED_MENU = _ ("_Unrated");
-public const string RATE_UNRATED_COMBO_BOX = _ ("Unrated");
-public const string RATE_UNRATED_LABEL = _ ("Rate Unrated");
-public const string RATE_UNRATED_PROGRESS = _ ("Setting as unrated");
-public const string RATE_UNRATED_TOOLTIP = _ ("Remove any ratings");
-
-public const string RATE_REJECTED_MENU = _ ("_Rejected");
-public const string RATE_REJECTED_COMBO_BOX = _ ("Rejected");
-public const string RATE_REJECTED_LABEL = _ ("Rate Rejected");
-public const string RATE_REJECTED_PROGRESS = _ ("Setting as rejected");
-public const string RATE_REJECTED_TOOLTIP = _ ("Set rating to rejected");
-
-public const string DISPLAY_REJECTED_ONLY_MENU = _ ("Rejected Only");
-public const string DISPLAY_REJECTED_ONLY_LABEL = _ ("Rejected Only");
-public const string DISPLAY_REJECTED_ONLY_TOOLTIP = _ ("Show only rejected photos");
-
-public const string DISPLAY_REJECTED_OR_HIGHER_MENU = _ ("All + Rejected");
-public const string DISPLAY_REJECTED_OR_HIGHER_LABEL = _ ("Show all photos, including rejected");
-public const string DISPLAY_REJECTED_OR_HIGHER_TOOLTIP = _ ("Show all photos, including rejected");
-
-public const string DISPLAY_UNRATED_OR_HIGHER_MENU = _ ("All Photos");
-public const string DISPLAY_UNRATED_OR_HIGHER_LABEL = _ ("Show all photos");
-public const string DISPLAY_UNRATED_OR_HIGHER_TOOLTIP = _ ("Show all photos");
-
-public const string VIEW_RATINGS_MENU = _ ("_Ratings");
-public const string VIEW_RATINGS_TOOLTIP = _ ("Display each photo's rating");
-
-public const string FILTER_PHOTOS_MENU = _ ("_Filter Photos");
-public const string FILTER_PHOTOS_LABEL = _ ("Filter Photos");
-public const string FILTER_PHOTOS_TOOLTIP = _ ("Limit the number of photos displayed based on a filter");
-
-public const string DUPLICATE_PHOTO_MENU = _ ("_Duplicate");
-public const string DUPLICATE_PHOTO_LABEL = _ ("Duplicate");
-public const string DUPLICATE_PHOTO_TOOLTIP = _ ("Make a duplicate of the photo");
-
-public const string EXPORT_MENU = _ ("_Export...");
-
-public const string PRINT_MENU = _ ("_Print...");
-
-public const string PUBLISH_MENU = _ ("Pu_blish...");
-public const string PUBLISH_LABEL = _ ("Publish");
-public const string PUBLISH_TOOLTIP = _ ("Publish to various websites");
-
-public const string EDIT_TITLE_MENU = _ ("Edit _Title...");
-public const string EDIT_TITLE_LABEL = _ ("Edit Title");
-
-public const string EDIT_COMMENT_MENU = _ ("Edit _Comment...");
-public const string EDIT_COMMENT_LABEL = _ ("Edit Comment");
-
-public const string EDIT_EVENT_COMMENT_MENU = _ ("Edit Event _Comment...");
-public const string EDIT_EVENT_COMMENT_LABEL = _ ("Edit Event Comment");
-
-public const string ADJUST_DATE_TIME_MENU = _ ("_Adjust Date and Time...");
-public const string ADJUST_DATE_TIME_LABEL = _ ("Adjust Date and Time");
-
-public const string ADD_TAGS_MENU = _ ("Add _Tags...");
-public const string ADD_TAGS_CONTEXT_MENU = _ ("_Add Tags...");
-public const string ADD_TAGS_TITLE = _ ("Add Tags");
-
-public const string PREFERENCES_MENU = _ ("_Preferences");
-
-public const string EXTERNAL_EDIT_MENU = _ ("Open With E_xternal Editor");
-
-public const string EXTERNAL_EDIT_RAW_MENU = _ ("Open With RA_W Editor");
-
-public const string SEND_TO_MENU = _ ("Send _To...");
-public const string SEND_TO_CONTEXT_MENU = _ ("Send T_o...");
-
-public const string FIND_MENU = _ ("_Find...");
-public const string FIND_LABEL = _ ("Find");
-public const string FIND_TOOLTIP = _ ("Find an image by typing text that appears in its name or tags");
-
-public const string FLAG_MENU = _ ("_Flag");
-
-public const string UNFLAG_MENU = _ ("Un_flag");
+public const string ROTATE_CW_MENU = _("Rotate _Right");
+public const string ROTATE_CW_LABEL = _("Rotate");
+public const string ROTATE_CW_FULL_LABEL = _("Rotate Right");
+public const string ROTATE_CW_TOOLTIP = _("Rotate the photos right (press Ctrl to rotate left)");
+
+public const string ROTATE_CCW_MENU = _("Rotate _Left");
+public const string ROTATE_CCW_LABEL = _("Rotate");
+public const string ROTATE_CCW_FULL_LABEL = _("Rotate Left");
+public const string ROTATE_CCW_TOOLTIP = _("Rotate the photos left");
+
+public const string HFLIP_MENU = _("Flip Hori_zontally");
+public const string HFLIP_LABEL = _("Flip Horizontally");
+
+public const string VFLIP_MENU = _("Flip Verti_cally");
+public const string VFLIP_LABEL = _("Flip Vertically");
+
+public const string ENHANCE_MENU = _("_Enhance");
+public const string ENHANCE_LABEL = _("Enhance");
+public const string ENHANCE_TOOLTIP = _("Automatically improve the photo's appearance");
+
+public const string COPY_ADJUSTMENTS_MENU = _("_Copy Color Adjustments");
+public const string COPY_ADJUSTMENTS_LABEL = _("Copy Color Adjustments");
+public const string COPY_ADJUSTMENTS_TOOLTIP = _("Copy the color adjustments applied to the photo");
+
+public const string PASTE_ADJUSTMENTS_MENU = _("_Paste Color Adjustments");
+public const string PASTE_ADJUSTMENTS_LABEL = _("Paste Color Adjustments");
+public const string PASTE_ADJUSTMENTS_TOOLTIP = _("Apply copied color adjustments to the selected photos");
+
+public const string CROP_MENU = _("_Crop");
+public const string CROP_LABEL = _("Crop");
+public const string CROP_TOOLTIP = _("Crop the photo's size");
+
+public const string STRAIGHTEN_MENU = _("_Straighten");
+public const string STRAIGHTEN_LABEL = _("Straighten");
+public const string STRAIGHTEN_TOOLTIP = _("Straighten the photo");
+
+public const string RED_EYE_MENU = _("_Red-eye");
+public const string RED_EYE_LABEL = _("Red-eye");
+public const string RED_EYE_TOOLTIP = _("Reduce or eliminate any red-eye effects in the photo");
+
+public const string ADJUST_MENU = _("_Adjust");
+public const string ADJUST_LABEL = _("Adjust");
+public const string ADJUST_TOOLTIP = _("Adjust the photo's color and tone");
+
+public const string REVERT_MENU = _("Re_vert to Original");
+public const string REVERT_LABEL = _("Revert to Original");
+
+public const string REVERT_EDITABLE_MENU = _("Revert External E_dits");
+public const string REVERT_EDITABLE_TOOLTIP = _("Revert to the master photo");
+
+public const string SET_BACKGROUND_MENU = _("Set as _Desktop Background");
+public const string SET_BACKGROUND_TOOLTIP = _("Set selected image to be the new desktop background");
+public const string SET_BACKGROUND_SLIDESHOW_MENU = _("Set as _Desktop Slideshow...");
+
+public const string UNDO_MENU = _("_Undo");
+public const string UNDO_LABEL = _("Undo");
+
+public const string REDO_MENU = _("_Redo");
+public const string REDO_LABEL = _("Redo");
+
+public const string RENAME_EVENT_MENU = _("Re_name Event...");
+public const string RENAME_EVENT_LABEL = _("Rename Event");
+
+public const string MAKE_KEY_PHOTO_MENU = _("Make _Key Photo for Event");
+public const string MAKE_KEY_PHOTO_LABEL = _("Make Key Photo for Event");
+
+public const string NEW_EVENT_MENU = _("_New Event");
+public const string NEW_EVENT_LABEL = _("New Event");
+
+public const string SET_PHOTO_EVENT_LABEL = _("Move Photos");
+public const string SET_PHOTO_EVENT_TOOLTIP = _("Move photos to an event");
+
+public const string MERGE_MENU = _("_Merge Events");
+public const string MERGE_LABEL = _("Merge");
+public const string MERGE_TOOLTIP = _("Combine events into a single event");
+
+public const string RATING_MENU = _("_Set Rating");
+public const string RATING_LABEL = _("Set Rating");
+public const string RATING_TOOLTIP = _("Change the rating of your photo");
+
+public const string INCREASE_RATING_MENU = _("_Increase");
+public const string INCREASE_RATING_LABEL = _("Increase Rating");
+
+public const string DECREASE_RATING_MENU = _("_Decrease");
+public const string DECREASE_RATING_LABEL = _("Decrease Rating");
+
+public const string RATE_UNRATED_MENU = _("_Unrated");
+public const string RATE_UNRATED_COMBO_BOX = _("Unrated");
+public const string RATE_UNRATED_LABEL = _("Rate Unrated");
+public const string RATE_UNRATED_PROGRESS = _("Setting as unrated");
+public const string RATE_UNRATED_TOOLTIP = _("Remove any ratings");
+
+public const string RATE_REJECTED_MENU = _("_Rejected");
+public const string RATE_REJECTED_COMBO_BOX = _("Rejected");
+public const string RATE_REJECTED_LABEL = _("Rate Rejected");
+public const string RATE_REJECTED_PROGRESS = _("Setting as rejected");
+public const string RATE_REJECTED_TOOLTIP = _("Set rating to rejected");
+
+public const string DISPLAY_REJECTED_ONLY_MENU = _("Rejected Only");
+public const string DISPLAY_REJECTED_ONLY_LABEL = _("Rejected Only");
+public const string DISPLAY_REJECTED_ONLY_TOOLTIP = _("Show only rejected photos");
+
+public const string DISPLAY_REJECTED_OR_HIGHER_MENU = _("All + Rejected");
+public const string DISPLAY_REJECTED_OR_HIGHER_LABEL = _("Show all photos, including rejected");
+public const string DISPLAY_REJECTED_OR_HIGHER_TOOLTIP = _("Show all photos, including rejected");
+
+public const string DISPLAY_UNRATED_OR_HIGHER_MENU = _("All Photos");
+public const string DISPLAY_UNRATED_OR_HIGHER_LABEL = _("Show all photos");
+public const string DISPLAY_UNRATED_OR_HIGHER_TOOLTIP = _("Show all photos");
+
+public const string VIEW_RATINGS_MENU = _("_Ratings");
+public const string VIEW_RATINGS_TOOLTIP = _("Display each photo's rating");
+
+public const string FILTER_PHOTOS_MENU = _("_Filter Photos");
+public const string FILTER_PHOTOS_LABEL = _("Filter Photos");
+public const string FILTER_PHOTOS_TOOLTIP = _("Limit the number of photos displayed based on a filter");
+
+public const string DUPLICATE_PHOTO_MENU = _("_Duplicate");
+public const string DUPLICATE_PHOTO_LABEL = _("Duplicate");
+public const string DUPLICATE_PHOTO_TOOLTIP = _("Make a duplicate of the photo");
+
+public const string EXPORT_MENU = _("_Export...");
+
+public const string PRINT_MENU = _("_Print...");
+
+public const string PUBLISH_MENU = _("Pu_blish...");
+public const string PUBLISH_LABEL = _("Publish");
+public const string PUBLISH_TOOLTIP = _("Publish to various websites");
+
+public const string EDIT_TITLE_MENU = _("Edit _Title...");
+public const string EDIT_TITLE_LABEL = _("Edit Title");
+
+public const string EDIT_COMMENT_MENU = _("Edit _Comment...");
+public const string EDIT_COMMENT_LABEL = _("Edit Comment");
+
+public const string EDIT_EVENT_COMMENT_MENU = _("Edit Event _Comment...");
+public const string EDIT_EVENT_COMMENT_LABEL = _("Edit Event Comment");
+
+public const string ADJUST_DATE_TIME_MENU = _("_Adjust Date and Time...");
+public const string ADJUST_DATE_TIME_LABEL = _("Adjust Date and Time");
+
+public const string ADD_TAGS_MENU = _("Add _Tags...");
+public const string ADD_TAGS_CONTEXT_MENU = _("_Add Tags...");
+public const string ADD_TAGS_TITLE = _("Add Tags");
+
+public const string PREFERENCES_MENU = _("_Preferences");
+
+public const string EXTERNAL_EDIT_MENU = _("Open With E_xternal Editor");
+
+public const string EXTERNAL_EDIT_RAW_MENU = _("Open With RA_W Editor");
+
+public const string OPEN_WITH_MENU = _("_Open With...");
+public const string OPEN_WITH_LABEL = _("Open With");
+public const string OPEN_WITH_TOOLTIP = _("Open photo with external editor");
+
+public const string OPEN_WITH_RAW_MENU = _("_Open With RAW Editor...");
+public const string OPEN_WITH_RAW_LABEL = _("Open With Raw Editor");
+public const string OPEN_WITH_RAW_TOOLTIP = _("Open photo with external RAW editor");
+
+public const string SEND_TO_MENU = _("Send _To...");
+public const string SEND_TO_CONTEXT_MENU = _("Send T_o...");
+
+public const string FIND_MENU = _("_Find...");
+public const string FIND_LABEL = _("Find");
+public const string FIND_TOOLTIP = _("Find an image by typing text that appears in its name or tags");
+
+public const string FLAG_MENU = _("_Flag");
+
+public const string UNFLAG_MENU = _("Un_flag");
 
 public string launch_editor_failed (Error err) {
-    return _ ("Unable to launch editor: %s").printf (err.message);
+    return _("Unable to launch editor: %s").printf (err.message);
 }
 
 public string add_tags_label (string[] names) {
     if (names.length == 1)
-        return _ ("Add Tag \"%s\"").printf (HierarchicalTagUtilities.get_basename (names[0]));
+        return _("Add Tag \"%s\"").printf (HierarchicalTagUtilities.get_basename (names[0]));
     else if (names.length == 2)
-        return _ ("Add Tags \"%s\" and \"%s\"").printf (
+        return _("Add Tags \"%s\" and \"%s\"").printf (
                    HierarchicalTagUtilities.get_basename (names[0]),
                    HierarchicalTagUtilities.get_basename (names[1]));
     else
-        return _ ("Add Tags");
+        return _("Add Tags");
 }
 
 public string delete_tag_menu (string name) {
-    return _ ("_Delete Tag \"%s\"").printf (name);
+    return _("_Delete Tag \"%s\"").printf (name);
 }
 
 public string delete_tag_label (string name) {
-    return _ ("Delete Tag \"%s\"").printf (name);
+    return _("Delete Tag \"%s\"").printf (name);
 }
 
-public const string DELETE_TAG_TITLE = _ ("Delete Tag");
-public const string DELETE_TAG_SIDEBAR_MENU = _ ("_Delete");
+public const string DELETE_TAG_TITLE = _("Delete Tag");
+public const string DELETE_TAG_SIDEBAR_MENU = _("_Delete");
 
-public const string NEW_CHILD_TAG_SIDEBAR_MENU = _ ("_New");
+public const string NEW_CHILD_TAG_SIDEBAR_MENU = _("_New");
 
 public string rename_tag_menu (string name) {
-    return _ ("Re_name Tag \"%s\"...").printf (name);
+    return _("Re_name Tag \"%s\"...").printf (name);
 }
 
 public string rename_tag_label (string old_name, string new_name) {
-    return _ ("Rename Tag \"%s\" to \"%s\"").printf (old_name, new_name);
+    return _("Rename Tag \"%s\" to \"%s\"").printf (old_name, new_name);
 }
 
-public const string RENAME_TAG_SIDEBAR_MENU = _ ("_Rename...");
+public const string RENAME_TAG_SIDEBAR_MENU = _("_Rename...");
 
-public const string MODIFY_TAGS_MENU = _ ("Modif_y Tags...");
-public const string MODIFY_TAGS_LABEL = _ ("Modify Tags");
+public const string MODIFY_TAGS_MENU = _("Modif_y Tags...");
+public const string MODIFY_TAGS_LABEL = _("Modify Tags");
 
 public string tag_photos_label (string name, int count) {
-    return ((count == 1) ? _ ("Tag Photo as \"%s\"") : _ ("Tag Photos as \"%s\"")).printf (name);
+    return ((count == 1) ? _("Tag Photo as \"%s\"") : _("Tag Photos as \"%s\"")).printf (name);
 }
 
 public string tag_photos_tooltip (string name, int count) {
-    return ((count == 1) ? _ ("Tag the selected photo as \"%s\"") :
-            _ ("Tag the selected photos as \"%s\"")).printf (name);
+    return ((count == 1) ? _("Tag the selected photo as \"%s\"") :
+            _("Tag the selected photos as \"%s\"")).printf (name);
 }
 
 public string untag_photos_menu (string name, int count) {
-    return ((count == 1) ? _ ("Remove Tag \"%s\" From _Photo") :
-            _ ("Remove Tag \"%s\" From _Photos")).printf (name);
+    return ((count == 1) ? _("Remove Tag \"%s\" From _Photo") :
+            _("Remove Tag \"%s\" From _Photos")).printf (name);
 }
 
 public string untag_photos_label (string name, int count) {
-    return ((count == 1) ? _ ("Remove Tag \"%s\" From Photo") :
-            _ ("Remove Tag \"%s\" From Photos")).printf (name);
+    return ((count == 1) ? _("Remove Tag \"%s\" From Photo") :
+            _("Remove Tag \"%s\" From Photos")).printf (name);
 }
 
 public static string rename_tag_exists_message (string name) {
-    return _ ("Unable to rename tag to \"%s\" because the tag already exists.").printf (name);
+    return _("Unable to rename tag to \"%s\" because the tag already exists.").printf (name);
 }
 
 public static string rename_search_exists_message (string name) {
-    return _ ("Unable to rename search to \"%s\" because the search already exists.").printf (name);
+    return _("Unable to rename search to \"%s\" because the search already exists.").printf (name);
 }
 
-public const string DEFAULT_SAVED_SEARCH_NAME = _ ("Smart Album");
-
-public const string DELETE_SAVED_SEARCH_DIALOG_TITLE = _ ("Delete Album");
-
-public const string DELETE_SEARCH_MENU = _ ("_Delete");
-public const string EDIT_SEARCH_MENU = _ ("_Edit...");
-public const string RENAME_SEARCH_MENU = _ ("Re_name...");
+public const string DEFAULT_SAVED_SEARCH_NAME = _("Smart Album");
+
+public const string DELETE_SAVED_SEARCH_DIALOG_TITLE = _("Delete Album");
+
+public const string DELETE_SEARCH_MENU = _("_Delete");
+public const string EDIT_SEARCH_MENU = _("_Edit...");
+public const string RENAME_SEARCH_MENU = _("Re_name...");
 
 public string rename_search_label (string old_name, string new_name) {
-    return _ ("Rename Search \"%s\" to \"%s\"").printf (old_name, new_name);
+    return _("Rename Search \"%s\" to \"%s\"").printf (old_name, new_name);
 }
 
 public string delete_search_label (string name) {
-    return _ ("Delete Search \"%s\"").printf (name);
+    return _("Delete Search \"%s\"").printf (name);
 }
 
 private unowned string rating_menu (Rating rating) {
@@ -568,15 +576,15 @@
 
 private void generate_rating_strings () {
     string menu_base = "%s";
-    string label_base = _ ("Rate %s");
-    string tooltip_base = _ ("Set rating to %s");
-    string progress_base = _ ("Setting rating to %s");
+    string label_base = _("Rate %s");
+    string tooltip_base = _("Set rating to %s");
+    string progress_base = _("Setting rating to %s");
     string display_rating_menu_base = "%s";
-    string display_rating_label_base = _ ("Display %s");
-    string display_rating_tooltip_base = _ ("Only show photos with a rating of %s");
-    string display_rating_or_higher_menu_base = _ ("%s or Better");
-    string display_rating_or_higher_label_base = _ ("Display %s or Better");
-    string display_rating_or_higher_tooltip_base = _ ("Only show photos with a rating of %s or better");
+    string display_rating_label_base = _("Display %s");
+    string display_rating_tooltip_base = _("Only show photos with a rating of %s");
+    string display_rating_or_higher_menu_base = _("%s or Better");
+    string display_rating_or_higher_label_base = _("Display %s or Better");
+    string display_rating_or_higher_tooltip_base = _("Only show photos with a rating of %s or better");
 
     RATE_ONE_MENU = menu_base.printf (get_stars (Rating.ONE));
     RATE_TWO_MENU = menu_base.printf (get_stars (Rating.TWO));
@@ -666,26 +674,26 @@
 private string DISPLAY_FIVE_OR_HIGHER_LABEL;
 private string DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
 
-public const string DELETE_PHOTOS_MENU = _ ("_Delete");
-public const string DELETE_FROM_TRASH_TOOLTIP = _ ("Remove the selected photos from the trash");
-public const string DELETE_FROM_LIBRARY_TOOLTIP = _ ("Remove the selected photos from the library");
-
-public const string RESTORE_PHOTOS_MENU = _ ("_Restore");
-public const string RESTORE_PHOTOS_TOOLTIP = _ ("Move the selected photos back into the library");
-
-public const string JUMP_TO_FILE_MENU = _ ("Show in File Mana_ger");
-public const string JUMP_TO_FILE_TOOLTIP = _ ("Open the selected photo's directory in the file manager");
+public const string DELETE_PHOTOS_MENU = _("_Delete");
+public const string DELETE_FROM_TRASH_TOOLTIP = _("Remove the selected photos from the trash");
+public const string DELETE_FROM_LIBRARY_TOOLTIP = _("Remove the selected photos from the library");
+
+public const string RESTORE_PHOTOS_MENU = _("_Restore");
+public const string RESTORE_PHOTOS_TOOLTIP = _("Move the selected photos back into the library");
+
+public const string JUMP_TO_FILE_MENU = _("Show in File Mana_ger");
+public const string JUMP_TO_FILE_TOOLTIP = _("Open the selected photo's directory in the file manager");
 
 public string jump_to_file_failed (Error err) {
-    return _ ("Unable to open in file manager: %s").printf (err.message);
+    return _("Unable to open in file manager: %s").printf (err.message);
 }
 
-public const string REMOVE_FROM_LIBRARY_MENU = _ ("R_emove From Library");
-
-public const string MOVE_TO_TRASH_MENU = _ ("_Move to Trash");
-
-public const string SELECT_ALL_MENU = _ ("Select _All");
-public const string SELECT_ALL_TOOLTIP = _ ("Select all items");
+public const string REMOVE_FROM_LIBRARY_MENU = _("R_emove From Library");
+
+public const string MOVE_TO_TRASH_MENU = _("_Move to Trash");
+
+public const string SELECT_ALL_MENU = _("Select _All");
+public const string SELECT_ALL_TOOLTIP = _("Select all items");
 
 private Gtk.IconFactory factory = null;
 private Gee.HashMap<string, Gdk.Pixbuf> icon_cache = null;
@@ -768,31 +776,31 @@
     /// Locale-specific time format for 12-hour time, i.e. 8:31 PM
     /// Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
     /// See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-    HH_MM_FORMAT_STRING = _ ("%-I:%M %p");
+    HH_MM_FORMAT_STRING = _("%-I:%M %p");
 
     /// Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
     /// Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
     /// See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-    HH_MM_SS_FORMAT_STRING = _ ("%-I:%M:%S %p");
+    HH_MM_SS_FORMAT_STRING = _("%-I:%M:%S %p");
 
     /// Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
     /// See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-    LONG_DATE_FORMAT_STRING = _ ("%a %b %d, %Y");
+    LONG_DATE_FORMAT_STRING = _("%a %b %d, %Y");
 
     /// Locale-specific starting date format for multi-date strings,
     /// i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
     /// See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-    START_MULTIDAY_DATE_FORMAT_STRING = _ ("%a %b %d");
+    START_MULTIDAY_DATE_FORMAT_STRING = _("%a %b %d");
 
     /// Locale-specific ending date format for multi-date strings,
     /// i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
     /// See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-    END_MULTIDAY_DATE_FORMAT_STRING = _ ("%d, %Y");
+    END_MULTIDAY_DATE_FORMAT_STRING = _("%d, %Y");
 
     /// Locale-specific calendar date format for multi-month strings,
     /// i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
     /// See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-    START_MULTIMONTH_DATE_FORMAT_STRING = _ ("%a %b %d");
+    START_MULTIMONTH_DATE_FORMAT_STRING = _("%a %b %d");
 
     // ...put everything back like we found it.
     if (old_messages != null) {

=== modified file 'ui/collection.ui'
--- ui/collection.ui	2014-07-27 04:42:53 +0000
+++ ui/collection.ui	2014-08-12 01:17:16 +0000
@@ -33,8 +33,10 @@
         <menuitem name="ContextEditTitle" action="EditTitle" />
         <menuitem name="ContextEditComment" action="EditComment" />
         <menuitem name="AdjustDateTime" action="AdjustDateTime" />
-        <menuitem name="ContextExternalEdit" action="ExternalEdit" />
-        <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
+        <menu name="OpenWith" action="OpenWith">
+        </menu>
+        <menu name="OpenWithRaw" action="OpenWithRaw">
+        </menu>
         <separator />
         <menuitem name="NewEvent" action="NewEvent" />
         <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />

=== modified file 'ui/photo_context.ui'
--- ui/photo_context.ui	2014-07-27 04:42:53 +0000
+++ ui/photo_context.ui	2014-08-12 01:17:16 +0000
@@ -30,9 +30,10 @@
         <separator />
         <menuitem name="ContextEditTitle" action="EditTitle" />
         <menuitem name="ContextEditComment" action="EditComment" />
-        <menuitem name="AdjustDateTime" action="AdjustDateTime" />
-        <menuitem name="ContextExternalEdit" action="ExternalEdit" />
-        <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
+        <menu name="OpenWith" action="OpenWith">
+        </menu>
+        <menu name="OpenWithRaw" action="OpenWithRaw">
+        </menu>
         <separator />
         <placeholder name="ContextJumpPlaceholder" />
         <menuitem name="ContextSendTo" action="SendToContextMenu" />
@@ -40,4 +41,4 @@
         <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
     </popup>
 
-</ui>
\ No newline at end of file
+</ui>