[shotwell/wip/dedeprecate: 43/64] WIP

From: Jens Georg <jensgeorg src gnome org>
To: commits-list gnome org
Cc:
Subject: [shotwell/wip/dedeprecate: 43/64] WIP
Date: Thu, 10 Nov 2016 22:48:12 +0000 (UTC)
commit 5e757a1db7df0fe7eb39089d60068f0ac8b6b84f
Author: Jens Georg <mail jensge org>
Date:   Wed Nov 2 20:56:47 2016 +0100

    WIP

 src/Page.vala                  |    8 +-
 src/SearchFilter.vala          |   49 ++++---
 src/camera/ImportPage.vala     |    2 +-
 src/library/LibraryWindow.vala |  309 +++++++++++++---------------------------
 ui/collection.ui               |   22 ++--
 ui/direct.ui                   |   46 +++---
 ui/direct_context.ui           |    6 +-
 ui/event.ui                    |    6 +-
 ui/events_directory.ui         |   38 +++---
 ui/import.ui                   |   34 +++---
 ui/import_queue.ui             |   16 +-
 ui/media.ui                    |   98 +++++++-------
 ui/offline.ui                  |   32 ++--
 ui/photo.ui                    |  114 ++++++++--------
 ui/photo_context.ui            |   44 +++---
 ui/savedsearch.ui              |    6 +-
 ui/search_bar.ui               |   16 +-
 ui/tags.ui                     |    6 +-
 ui/trash.ui                    |   36 +++---
 19 files changed, 391 insertions(+), 497 deletions(-)
---
diff --git a/src/Page.vala b/src/Page.vala
index f7c7a75..2d62998 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -89,8 +89,6 @@ public abstract class Page : Gtk.ScrolledWindow {
     private Gtk.ActionGroup? action_group = null;
     private Gtk.ActionGroup[]? common_action_groups = null;
     
-    private uint[] merge_ids = new uint[0];
-    
     protected Page(string page_name) {
         this.page_name = page_name;
         
@@ -580,11 +578,7 @@ public abstract class Page : Gtk.ScrolledWindow {
         File ui_file = Resources.get_ui(ui_filename);
         
         try {
-            critical ("=> adding ui file %s", ui_filename);
-            merge_ids += builder.add_from_file(ui_file.get_path());
-            foreach (var obj in builder.get_objects ()) {
-                critical ("Found object %s", obj.get_type ().name ());
-            }
+            builder.add_from_file(ui_file.get_path());
         } catch (Error err) {
             AppWindow.error_message("Error loading UI file %s: %s".printf(
                 ui_file.get_path(), err.message));
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index ff7c5f7..d947bfa 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -368,8 +368,6 @@ public class SearchFilterActions {
         }
     }
     
-    private GLib.SimpleActionGroup action_group = new GLib.SimpleActionGroup ();
-
     private SearchFilterCriteria criteria = SearchFilterCriteria.ALL;
     private TextAction? _text = null;
     private bool has_flagged = true;
@@ -412,16 +410,22 @@ public class SearchFilterActions {
         text.text_changed.connect(on_text_changed);
     }
     
-    public GLib.ActionGroup get_action_group() {
-        return action_group;
-    }
-    
     public SearchFilterCriteria get_criteria() {
         return criteria;
     }
+
+    public unowned GLib.ActionEntry[] get_actions () {
+        return SearchFilterActions.entries;
+    }
     
     public unowned GLib.SimpleAction? get_action(string name) {
-        return action_group.lookup_action(name) as GLib.SimpleAction;
+        var lw = AppWindow.get_instance () as LibraryWindow;
+        if (lw != null) {
+            return lw.lookup_action (name) as GLib.SimpleAction;
+        }
+
+        return null;
+        //    return action_group.lookup_action(name) as GLib.SimpleAction;
     }
     
     public void set_action_sensitive (string name, bool sensitive) {
@@ -512,7 +516,7 @@ public class SearchFilterActions {
     
     private void update_sensitivities() {
         bool allow_ratings = (SearchFilterCriteria.RATING & criteria) != 0;
-        set_action_sensitive("filterbar.display.rating", allow_ratings & can_filter_by_stars);
+        set_action_sensitive("display.rating", allow_ratings & can_filter_by_stars);
 
         // Ticket #3343 - Don't disable the text field, even
         // when no searchable items are available.
@@ -546,7 +550,6 @@ public class SearchFilterActions {
     
     private void register() {
         _text = new TextAction();
-        this.action_group.add_action_entries (entries, this);
     }
 
     private void on_rating_changed (GLib.SimpleAction action,
@@ -1047,7 +1050,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
     public SearchFilterToolbar(SearchFilterActions actions) {
         this.actions = actions;
         toolbar = new Gtk.Toolbar();
-        toolbar.insert_action_group ("filterbar", actions.get_action_group ());
+//        toolbar.insert_action_group ("filterbar", actions.get_action_group ());
         actions.media_context_changed.connect(on_media_context_changed);
         search_box = new SearchBox(actions.text);
         
@@ -1075,14 +1078,13 @@ public class SearchFilterToolbar : Gtk.Revealer {
         label_type = new LabelToolItem(_("Type"), 10, 5);
         toolbar.insert(label_type, -1);
         
-        toolbtn_photos = new ToggleActionToolButton("filterbar.display.photos");
+        toolbtn_photos = new ToggleActionToolButton("win.display.photos");
         toolbtn_photos.set_tooltip_text (_("Photos"));
         
-        toolbtn_videos = new
-            ToggleActionToolButton("filterbar.display.videos");
+        toolbtn_videos = new ToggleActionToolButton("win.display.videos");
         toolbtn_videos.set_tooltip_text(_("Videos"));
         
-        toolbtn_raw = new ToggleActionToolButton("filterbar.display.raw");
+        toolbtn_raw = new ToggleActionToolButton("win.display.raw");
         toolbtn_raw.set_tooltip_text(_("RAW Photos"));
         
         toolbar.insert(toolbtn_photos, -1);
@@ -1095,7 +1097,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
         
         // Flagged button
         
-        toolbtn_flag = new ToggleActionToolButton("filterbar.display.flagged");
+        toolbtn_flag = new ToggleActionToolButton("win.display.flagged");
         toolbtn_flag.set_label(_("Flagged"));
         toolbtn_flag.set_tooltip_text(_("Flagged"));
         
@@ -1202,12 +1204,13 @@ public class SearchFilterToolbar : Gtk.Revealer {
         // Try to obtain the action for toggling the searchbar.  If
         // it's null, then we're probably in direct edit mode, and 
         // shouldn't do anything anyway.
-        Gtk.ToggleAction searchbar_toggle = aw.get_common_action("CommonDisplaySearchbar") as 
Gtk.ToggleAction;
+        var action = aw.lookup_action ("CommonDisplaySearchbar") as
+            GLib.SimpleAction;
         
         // Could we find the appropriate action?
-        if(searchbar_toggle != null) {
+        if(action != null) {
             // Yes, hide the search bar.
-            searchbar_toggle.set_active(false);
+            action.set_state(false);
         }
     }
     
@@ -1237,9 +1240,13 @@ public class SearchFilterToolbar : Gtk.Revealer {
         if (aw == null)
             return;
 
-        Gtk.ToggleAction searchbar_toggle = aw.get_common_action("CommonDisplaySearchbar") as 
Gtk.ToggleAction;
-        if(searchbar_toggle != null)
-            searchbar_toggle.set_active(true);
+        var action = aw.lookup_action ("CommonDisplaySearchbar") as
+            GLib.SimpleAction;
+
+        // Could we find the appropriate action?
+        if(action != null) {
+            action.set_state(true);
+        }
 
         update();
     }
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index db48634..dade13a 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -801,7 +801,7 @@ public class ImportPage : CheckerboardPage {
             
             // Find button
             Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton();
-            find_button.set_related_action(get_action("CommonDisplaySearchbar"));
+            find_button.set_action_name ("win.CommonDisplaySearchbar");
             
             toolbar.insert(find_button, -1);
             
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 0dcca0a..2d5ccf8 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -98,7 +98,7 @@ public class LibraryWindow : AppWindow {
     private Gtk.Paned client_paned = new Gtk.Paned(Gtk.Orientation.HORIZONTAL);
     private Gtk.Frame bottom_frame = new Gtk.Frame(null);
     
-    private Gtk.ActionGroup common_action_group = new Gtk.ActionGroup("LibraryWindowGlobalActionGroup");
+    //private Gtk.ActionGroup common_action_group = new Gtk.ActionGroup("LibraryWindowGlobalActionGroup");
     
     private OneShotScheduler properties_scheduler = null;
     private bool notify_library_is_home_dir = true;
@@ -278,7 +278,8 @@ public class LibraryWindow : AppWindow {
         monitor.auto_import_progress.disconnect(on_library_monitor_auto_import_progress);
     }
 
-    private const GLib.ActionEntry[] common_actions {
+    private const GLib.ActionEntry[] common_actions = {
+        // Normal actions
         { "CommonFileImport", on_file_import },
         { "ExternalLibraryImport", on_external_library_import },
         { "CommonPreferences", on_preferences },
@@ -286,136 +287,31 @@ public class LibraryWindow : AppWindow {
         { "CommonJumpToEvent", on_jump_to_event },
         { "CommonFind", on_find },
         { "CommonNewSearch", on_new_search },
+
+        // Toogle actions
+        { "CommonDisplayBasicProperties", on_action_toggle, null, "false", on_display_basic_properties },
+        { "CommonDisplayExtendedProperties", on_action_toggle, null, "false", on_display_extended_properties 
},
+
+#if 0
+        { "CommonDisplaySearchbar", on_display_searchbar, null, is_search_toolbar_visible.to_string () },
+        { "CommonDisplaySidebar", on_display_sidebar, null, is_sidebar_visible ().to_string () },
+        { "CommonDisplayToolbar", on_display_toolbar, null, is_toolbar_visible ().to_string () }
+#endif
+        { "CommonDisplaySearchbar", on_action_toggle, null, "false", on_display_searchbar },
+        { "CommonDisplaySidebar", on_action_toggle, null, "true", on_display_sidebar },
+        { "CommonDisplayToolbar", on_action_toggle, null, "true", on_display_toolbar }
     };
-    
-    private Gtk.ActionEntry[] create_common_actions() {
-        Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
-        
-        Gtk.ActionEntry import = { "CommonFileImport", Resources.IMPORT,
-            TRANSLATABLE, "<Ctrl>I", TRANSLATABLE, on_file_import };
-        import.label = _("_Import From Folder…");
-        import.tooltip = _("Import photos from disk to library");
-        actions += import;
-        
-        Gtk.ActionEntry import_from_external = {
-            "ExternalLibraryImport", Resources.IMPORT, TRANSLATABLE,
-            null, TRANSLATABLE, on_external_library_import
-        };
-        import_from_external.label = _("Import From _Application…");
-        actions += import_from_external;
-
-        Gtk.ActionEntry sort = { "CommonSortEvents", null, TRANSLATABLE, null, null, null };
-        sort.label = _("Sort _Events");
-        actions += sort;
-
-        Gtk.ActionEntry preferences = { "CommonPreferences", Resources.PREFERENCES_LABEL, TRANSLATABLE,
-            null, TRANSLATABLE, on_preferences };
-        preferences.label = Resources.PREFERENCES_MENU;
-        actions += preferences;
-        
-        Gtk.ActionEntry empty = { "CommonEmptyTrash", null, TRANSLATABLE, null, null,
-            on_empty_trash };
-        empty.label = _("Empty T_rash");
-        empty.tooltip = _("Delete all photos in the trash");
-        actions += empty;
-        
-        Gtk.ActionEntry jump_to_event = { "CommonJumpToEvent", null, TRANSLATABLE, null,
-            TRANSLATABLE, on_jump_to_event };
-        jump_to_event.label = _("View Eve_nt for Photo");
-        actions += jump_to_event;
-        
-        Gtk.ActionEntry find = { "CommonFind", null, TRANSLATABLE, null, null, on_find };
-        find.label = _("_Find");
-        find.tooltip = _("Find photos and videos by search criteria");
-        actions += find;
-        
-        // add the common action for the FilterPhotos submenu (the submenu contains items from
-        // SearchFilterActions)
-        Gtk.ActionEntry filter_photos = { "CommonFilterPhotos", null, TRANSLATABLE, null, null, null };
-        filter_photos.label = Resources.FILTER_PHOTOS_MENU;
-        actions += filter_photos;
-        
-        Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, "<Ctrl>S", null, 
-            on_new_search };
-        new_search.label =  _("Ne_w Saved Search…");
-        actions += new_search;
-
-        // top-level menus
-        
-        Gtk.ActionEntry file = { "FileMenu", null, TRANSLATABLE, null, null, null };
-        file.label = _("_File");
-        actions += file;
-
-        Gtk.ActionEntry edit = { "EditMenu", null, TRANSLATABLE, null, null, null };
-        edit.label = _("_Edit");
-        actions += edit;
-
-        Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, null };
-        view.label = _("_View");
-        actions += view;
-
-        Gtk.ActionEntry photo = { "PhotoMenu", null, TRANSLATABLE, null, null, null };
-        photo.label = _("_Photo");
-        actions += photo;
-
-        Gtk.ActionEntry photos = { "PhotosMenu", null, TRANSLATABLE, null, null, null };
-        photos.label = _("_Photos");
-        actions += photos;
-
-        Gtk.ActionEntry event = { "EventsMenu", null, TRANSLATABLE, null, null, null };
-        event.label = _("Even_ts");
-        actions += event;
-
-        Gtk.ActionEntry tags = { "TagsMenu", null, TRANSLATABLE, null, null, null };
-        tags.label = _("Ta_gs");
-        actions += tags;
-
-        Gtk.ActionEntry help = { "HelpMenu", null, TRANSLATABLE, null, null, null };
-        help.label = _("_Help");
-        actions += help;
-
-        return actions;
-    }
-    
-    private Gtk.ToggleActionEntry[] create_common_toggle_actions() {
-        Gtk.ToggleActionEntry[] actions = new Gtk.ToggleActionEntry[0];
-        
-        Gtk.ToggleActionEntry basic_props = { "CommonDisplayBasicProperties", null,
-            TRANSLATABLE, "<Ctrl><Shift>I", TRANSLATABLE, on_display_basic_properties, false };
-        basic_props.label = _("_Basic Information");
-        basic_props.tooltip = _("Display basic information for the selection");
-        actions += basic_props;
-
-        Gtk.ToggleActionEntry extended_props = { "CommonDisplayExtendedProperties", null,
-            TRANSLATABLE, "<Ctrl><Shift>X", TRANSLATABLE, on_display_extended_properties, false };
-        extended_props.label = _("E_xtended Information");
-        extended_props.tooltip = _("Display extended information for the selection");
-        actions += extended_props;
-        
-        Gtk.ToggleActionEntry searchbar = { "CommonDisplaySearchbar", "edit-find", TRANSLATABLE,
-            "F8", TRANSLATABLE, on_display_searchbar, is_search_toolbar_visible };
-        searchbar.label = _("_Search Bar");
-        searchbar.tooltip = _("Display the search bar");
-        actions += searchbar;
-        
-        Gtk.ToggleActionEntry sidebar = { "CommonDisplaySidebar", null, TRANSLATABLE,
-            "F9", TRANSLATABLE, on_display_sidebar, is_sidebar_visible() };
-        sidebar.label = _("S_idebar");
-        sidebar.tooltip = _("Display the sidebar");
-        actions += sidebar;
 
-        Gtk.ToggleActionEntry toolbar = { "CommonDisplayToolbar", null, TRANSLATABLE,
-            "<Ctrl>F9", TRANSLATABLE, on_display_toolbar, is_toolbar_visible() };
-        toolbar.label = _("T_oolbar");
-        toolbar.tooltip = _("Display the tool bar");
-        actions += toolbar;
-
-        return actions;
+    protected override void add_actions () {
+        base.add_actions ();
+        this.add_action_entries (common_actions, this);
+        this.add_action_entries (search_actions.get_actions (), search_actions);
     }
-    
+
+#if 0
     private void add_common_radio_actions(Gtk.ActionGroup group) {
         Gtk.RadioActionEntry[] actions = new Gtk.RadioActionEntry[0];
-        
+
         Gtk.RadioActionEntry ascending = { "CommonSortEventsAscending",
             Resources.SORT_ASCENDING_LABEL, TRANSLATABLE, null, TRANSLATABLE,
             SORT_EVENTS_ORDER_ASCENDING };
@@ -429,81 +325,63 @@ public class LibraryWindow : AppWindow {
         descending.label = _("D_escending");
         descending.tooltip = _("Sort photos in a descending order");
         actions += descending;
-        
+
         group.add_radio_actions(actions, SORT_EVENTS_ORDER_ASCENDING, on_events_sort_changed);
     }
-    
-    protected Gtk.ActionGroup[] create_common_action_groups() {
-        Gtk.ActionGroup[] groups = new Gtk.ActionGroup[0];
-        //base.create_common_action_groups();
-        
-        common_action_group.add_actions(create_common_actions(), this);
-        common_action_group.add_toggle_actions(create_common_toggle_actions(), this);
-        add_common_radio_actions(common_action_group);
-        
-        Gtk.Action? action = common_action_group.get_action("CommonDisplaySearchbar");
-        if (action != null) {
-            action.short_label = Resources.FIND_LABEL;
-            action.is_important = true;
-        }
-        
-        groups += common_action_group;
-        //groups += search_actions.get_action_group();
-        
-        return groups;
-    }
-    
+#endif
+
     protected override void switched_pages(Page? old_page, Page? new_page) {
         base.switched_pages(old_page, new_page);
-        
+
         // monitor when the ViewFilter is changed in any page
         if (old_page != null) {
             old_page.get_view().view_filter_installed.disconnect(on_view_filter_installed);
             old_page.get_view().view_filter_removed.disconnect(on_view_filter_removed);
         }
-        
+
         if (new_page != null) {
             new_page.get_view().view_filter_installed.connect(on_view_filter_installed);
             new_page.get_view().view_filter_removed.connect(on_view_filter_removed);
         }
-        
+
         search_actions.monitor_page_contents(old_page, new_page);
     }
-    
+
     private void on_view_filter_installed(ViewFilter filter) {
         filter.refresh.connect(on_view_filter_refreshed);
     }
-    
+
     private void on_view_filter_removed(ViewFilter filter) {
         filter.refresh.disconnect(on_view_filter_refreshed);
     }
-    
+
     private void on_view_filter_refreshed() {
         // if view filter is reset to show all items, do nothing (leave searchbar in current
         // state)
         if (!get_current_page().get_view().are_items_filtered_out())
             return;
-        
+
         // always show the searchbar when items are filtered
-        Gtk.ToggleAction? display_searchbar = get_common_action("CommonDisplaySearchbar")
-            as Gtk.ToggleAction;
-        if (display_searchbar != null)
-            display_searchbar.active = true;
+        var action = this.lookup_action ("CommonDisplaySearchbar") as
+            GLib.SimpleAction;
+
+        if (action != null)
+            action.set_state (true);
     }
-    
+
     // show_all() may make visible certain items we wish to keep programmatically hidden
     public override void show_all() {
         base.show_all();
         if (false != true)
             return;
-        
+
         Gtk.ToggleAction? basic_properties_action = get_current_page().get_common_action(
             "CommonDisplayBasicProperties") as Gtk.ToggleAction;
         assert(basic_properties_action != null);
-        
+
         if (!basic_properties_action.get_active())
             bottom_frame.hide();
-        
+
         Gtk.ToggleAction? searchbar_action = get_current_page().get_common_action(
             "CommonDisplaySearchbar") as Gtk.ToggleAction;
         assert(searchbar_action != null);
@@ -514,27 +392,27 @@ public class LibraryWindow : AppWindow {
             init_view_filter(current_page);
 
         toggle_search_bar(should_show_search_bar(), current_page);
-        
+
         // Sidebar
         set_sidebar_visible(is_sidebar_visible());
     }
-    
+
     public static LibraryWindow get_app() {
         assert(instance is LibraryWindow);
-        
+
         return (LibraryWindow) instance;
     }
-    
+
     // This may be called before Debug.init(), so no error logging may be made
     public static bool is_mount_uri_supported(string uri) {
         foreach (string scheme in SUPPORTED_MOUNT_SCHEMES) {
             if (uri.has_prefix(scheme))
                 return true;
         }
-        
+
         return false;
     }
-    
+
     public override string get_app_role() {
         return Resources.APP_LIBRARY_ROLE;
     }
@@ -546,7 +424,7 @@ public class LibraryWindow : AppWindow {
         else
             debug("No tag entry found for rename");
     }
-    
+
     public void rename_event_in_sidebar(Event event) {
         Events.EventEntry? entry = events_branch.get_entry_for_event(event);
         if (entry != null)
@@ -554,7 +432,7 @@ public class LibraryWindow : AppWindow {
         else
             debug("No event entry found for rename");
     }
-    
+
     public void rename_search_in_sidebar(SavedSearch search) {
         Searches.SidebarEntry? entry = saved_search_branch.get_entry_for_saved_search(search);
         if (entry != null)
@@ -562,28 +440,28 @@ public class LibraryWindow : AppWindow {
         else
             debug("No search entry found for rename");
     }
-    
+
     protected override void on_quit() {
         Config.Facade.get_instance().set_library_window_state(maximized, dimensions);
 
         Config.Facade.get_instance().set_sidebar_position(client_paned.position);
-        
+
         base.on_quit();
     }
-    
+
     private Photo? get_start_fullscreen_photo(CollectionPage page) {
         ViewCollection view = page.get_view();
-        
+
         // if a selection is present, use the first selected LibraryPhoto, otherwise do
         // nothing; if no selection present, use the first LibraryPhoto
         Gee.List<DataSource>? sources = (view.get_selected_count() > 0)
             ? view.get_selected_sources_of_type(typeof(LibraryPhoto))
             : view.get_sources_of_type(typeof(LibraryPhoto));
-        
+
         return (sources != null && sources.size != 0)
             ? (Photo) sources[0] : null;
     }
-    
+
     private bool get_fullscreen_photo(Page page, out CollectionPage collection, out Photo start,
         out ViewCollection? view_collection = null) {
         collection = null;
@@ -596,7 +474,7 @@ public class LibraryWindow : AppWindow {
             Photo? photo = get_start_fullscreen_photo(collection);
             if (photo == null)
                 return false;
-            
+
             start = photo;
             view_collection = null;
             
@@ -611,11 +489,11 @@ public class LibraryWindow : AppWindow {
             Event? event = (Event?) ((DataView) view.get_at(0)).get_source();
             if (event == null)
                 return false;
-            
+
             Events.EventEntry? entry = events_branch.get_entry_for_event(event);
             if (entry == null)
                 return false;
-            
+
             collection = (EventPage) entry.get_page();
             Photo? photo = get_start_fullscreen_photo(collection);
             if (photo == null)
@@ -626,7 +504,7 @@ public class LibraryWindow : AppWindow {
             
             return true;
         }
-        
+
         if (page is LibraryPhotoPage) {
             LibraryPhotoPage photo_page = (LibraryPhotoPage) page;
             
@@ -636,11 +514,11 @@ public class LibraryWindow : AppWindow {
             
             if (!photo_page.has_photo())
                 return false;
-            
+
             collection = controller;
             start = photo_page.get_photo();
             view_collection = photo_page.get_view();
-            
+
             return true;
         }
         
@@ -662,7 +540,7 @@ public class LibraryWindow : AppWindow {
 
         go_fullscreen(fs_photo);
     }
-    
+
     private void on_file_import() {
         Gtk.FileChooserDialog import_dialog = new Gtk.FileChooserDialog(_("Import From Folder"), null,
             Gtk.FileChooserAction.SELECT_FOLDER, Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL, 
@@ -680,7 +558,7 @@ public class LibraryWindow : AppWindow {
                     ? Gtk.ResponseType.REJECT : copy_files_dialog();
             
             if (copy_files_response != Gtk.ResponseType.CANCEL) {
-                dispatch_import_jobs(import_dialog.get_uris(), "folders", 
+                dispatch_import_jobs(import_dialog.get_uris(), "folders",
                     copy_files_response == Gtk.ResponseType.ACCEPT);
             }
         }
@@ -699,7 +577,7 @@ public class LibraryWindow : AppWindow {
         base.update_common_action_availability(old_page, new_page);
         
         bool is_checkerboard = new_page is CheckerboardPage;
-        
+
         set_common_action_sensitive("CommonDisplaySearchbar", is_checkerboard);
         set_common_action_sensitive("CommonFind", is_checkerboard);
     }
@@ -727,7 +605,7 @@ public class LibraryWindow : AppWindow {
     private bool can_empty_trash() {
         return (LibraryPhoto.global.get_trashcan_count() > 0) || (Video.global.get_trashcan_count() > 0);
     }
-    
+
     private void on_empty_trash() {
         Gee.ArrayList<MediaSource> to_remove = new Gee.ArrayList<MediaSource>();
         to_remove.add_all(LibraryPhoto.global.get_trashcan_contents());
@@ -772,10 +650,10 @@ public class LibraryWindow : AppWindow {
     }
     
     private void on_find() {
-        Gtk.ToggleAction action = (Gtk.ToggleAction) get_current_page().get_common_action(
-            "CommonDisplaySearchbar");
-        action.active = true;
-        
+        var action = this.lookup_action ("CommonDisplaySearchbar") as
+            GLib.SimpleAction;
+        action.set_state (true);
+
         // give it focus (which should move cursor to the text entry control)
         search_toolbar.take_focus();
     }
@@ -795,19 +673,21 @@ public class LibraryWindow : AppWindow {
         return (action != null) ? action.current_value : SORT_EVENTS_ORDER_DESCENDING;
     }
 
+    /*
     private void on_events_sort_changed(Gtk.Action action, Gtk.Action c) {
         Gtk.RadioAction current = (Gtk.RadioAction) c;
         
         Config.Facade.get_instance().set_events_sort_ascending(
             current.current_value == SORT_EVENTS_ORDER_ASCENDING);
     }
+    */
     
     private void on_preferences() {
         PreferencesDialog.show();
     }
     
-    private void on_display_basic_properties(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    private void on_display_basic_properties(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
 
         if (display) {
             basic_properties.update_properties(get_current_page());
@@ -820,10 +700,16 @@ public class LibraryWindow : AppWindow {
 
         // sync the setting so it will persist
         Config.Facade.get_instance().set_display_basic_properties(display);
+        action.set_state (value);
     }
 
-    private void on_display_extended_properties(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    private void on_action_toggle (GLib.Action action, Variant? value) {
+        Variant new_state = ! (bool) action.get_state ();
+        action.change_state (new_state);
+    }
+
+    private void on_display_extended_properties(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
 
         if (display) {
             extended_properties.update_properties(get_current_page());
@@ -831,12 +717,17 @@ public class LibraryWindow : AppWindow {
         } else {
             extended_properties.hide();
         }
+
+        action.set_state (value);
     }
     
-    private void on_display_searchbar(Gtk.Action action) {
-        bool is_shown = ((Gtk.ToggleAction) action).get_active();
+    private void on_display_searchbar(GLib.SimpleAction action, Variant? value) {
+        bool is_shown = value.get_boolean ();
+
         Config.Facade.get_instance().set_display_search_bar(is_shown);
         show_search_bar(is_shown);
+
+        action.set_state (value);
     }
     
     public void show_search_bar(bool display) {
@@ -849,9 +740,10 @@ public class LibraryWindow : AppWindow {
             search_actions.reset();
     }
     
-    private void on_display_sidebar(Gtk.Action action) {
-        set_sidebar_visible(((Gtk.ToggleAction) action).get_active());
-        
+    private void on_display_sidebar(GLib.SimpleAction action, Variant? variant) {
+        set_sidebar_visible(variant.get_boolean ());
+
+        action.set_state (variant);
     }
 
     private void set_sidebar_visible(bool visible) {
@@ -863,8 +755,10 @@ public class LibraryWindow : AppWindow {
         return Config.Facade.get_instance().get_display_sidebar();
     }
     
-    private void on_display_toolbar (Gtk.Action action) {
-        set_toolbar_visible ((action as Gtk.ToggleAction).get_active ());
+    private void on_display_toolbar (GLib.SimpleAction action, Variant? variant) {
+        set_toolbar_visible (variant.get_boolean ());
+
+        action.set_state (variant);
     }
 
     private void set_toolbar_visible (bool visible) {
@@ -888,10 +782,9 @@ public class LibraryWindow : AppWindow {
     }
 
     private void sync_extended_properties(bool show) {
-        Gtk.ToggleAction? extended_display_action = get_common_action("CommonDisplayExtendedProperties")
-            as Gtk.ToggleAction;
-        assert(extended_display_action != null);
-        extended_display_action.set_active(show);
+        var action = this.lookup_action ("CommonDisplayExtendedProperties")
+            as GLib.SimpleAction;
+        action.set_state (show);
 
         // sync the setting so it will persist
         Config.Facade.get_instance().set_display_extended_properties(show);
@@ -976,7 +869,7 @@ public class LibraryWindow : AppWindow {
             
             return true;
         }
-        
+
         // since we cannot set a default action, we must set it when we spy a drag motion
         Gdk.DragAction drag_action = get_drag_action();
         
diff --git a/ui/collection.ui b/ui/collection.ui
index 9a4b681..2f629d6 100644
--- a/ui/collection.ui
+++ b/ui/collection.ui
@@ -6,41 +6,41 @@
       <section>
         <item>
           <attribute name="label" translatable="no">★★★★★</attribute>
-          <attribute name="action">RateFive</attribute>
+          <attribute name="action">win.RateFive</attribute>
         </item>
         <item>
           <attribute name="label" translatable="no">★★★★</attribute>
-          <attribute name="action">RateFour</attribute>
+          <attribute name="action">win.RateFour</attribute>
         </item>
         <item>
           <attribute name="label" translatable="no">★★★</attribute>
-          <attribute name="action">RateThree</attribute>
+          <attribute name="action">win.RateThree</attribute>
         </item>
         <item>
           <attribute name="label" translatable="no">★★</attribute>
-          <attribute name="action">RateTwo</attribute>
+          <attribute name="action">win.RateTwo</attribute>
         </item>
         <item>
           <attribute name="label" translatable="no">★</attribute>
-          <attribute name="action">RateOne</attribute>
+          <attribute name="action">win.RateOne</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Unrated</attribute>
-          <attribute name="action">RateUnrated</attribute>
+          <attribute name="action">win.RateUnrated</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Rejected</attribute>
-          <attribute name="action">RateRejected</attribute>
+          <attribute name="action">win.RateRejected</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Increase</attribute>
-          <attribute name="action">IncreaseRating</attribute>
+          <attribute name="action">win.IncreaseRating</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Decrease</attribute>
-          <attribute name="action">DecreaseRating</attribute>
+          <attribute name="action">win.DecreaseRating</attribute>
         </item>
       </section>
     </submenu>
@@ -49,11 +49,11 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">Shotwell</attribute>
-          <attribute name="action">RawDeveloperShotwell</attribute>
+          <attribute name="action">win.RawDeveloperShotwell</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Camera</attribute>
-          <attribute name="action">RawDeveloperCamera</attribute>
+          <attribute name="action">win.RawDeveloperCamera</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/direct.ui b/ui/direct.ui
index b7a1c07..75acb0f 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -7,12 +7,12 @@
         <item>
           <attribute name="label" translatable="yes">_Save</attribute>
           <attribute name="accel">&lt;Primary&gt;s</attribute>
-          <attribute name="action">Save</attribute>
+          <attribute name="action">win.Save</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Save _As…</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
-          <attribute name="action">SaveAs</attribute>
+          <attribute name="action">win.SaveAs</attribute>
         </item>
       </section>
       <section>
@@ -21,7 +21,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">Send _To…</attribute>
-          <attribute name="action">SendTo</attribute>
+          <attribute name="action">win.SendTo</attribute>
         </item>
       <attribute name="id">SetBackgroundPlaceholder</attribute>
       </section>
@@ -29,7 +29,7 @@
         <item>
           <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
-          <attribute name="action">CommonJumpToFile</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
         </item>
       </section>
       <section>
@@ -68,29 +68,29 @@
         <item>
           <attribute name="label" translatable="yes">Zoom _In</attribute>
           <attribute name="accel">&lt;Primary&gt;plus</attribute>
-          <attribute name="action">IncreaseSize</attribute>
+          <attribute name="action">win.IncreaseSize</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Zoom _Out</attribute>
           <attribute name="accel">&lt;Primary&gt;minus</attribute>
-          <attribute name="action">DecreaseSize</attribute>
+          <attribute name="action">win.DecreaseSize</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Fit to _Page</attribute>
           <attribute name="accel">&lt;Primary&gt;0</attribute>
-          <attribute name="action">ZoomFit</attribute>
+          <attribute name="action">win.ZoomFit</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Zoom _100%</attribute>
           <attribute name="accel">&lt;Primary&gt;1</attribute>
-          <attribute name="action">Zoom100</attribute>
+          <attribute name="action">win.Zoom100</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Zoom _200%</attribute>
           <attribute name="accel">&lt;Primary&gt;2</attribute>
-          <attribute name="action">Zoom200</attribute>
+          <attribute name="action">win.Zoom200</attribute>
         </item>
       </section>
     </submenu>
@@ -99,31 +99,31 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Previous Photo</attribute>
-          <attribute name="action">PrevPhoto</attribute>
+          <attribute name="action">win.PrevPhoto</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Next Photo</attribute>
-          <attribute name="action">NextPhoto</attribute>
+          <attribute name="action">win.NextPhoto</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Rotate _Right</attribute>
           <attribute name="accel">&lt;Primary&gt;r</attribute>
-          <attribute name="action">RotateClockwise</attribute>
+          <attribute name="action">win.RotateClockwise</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Rotate _Left</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;r</attribute>
-          <attribute name="action">RotateCounterclockwise</attribute>
+          <attribute name="action">win.RotateCounterclockwise</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Flip Hori_zontally</attribute>
-          <attribute name="action">FlipHorizontally</attribute>
+          <attribute name="action">win.FlipHorizontally</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Flip Verti_cally</attribute>
-          <attribute name="action">FlipVertically</attribute>
+          <attribute name="action">win.FlipVertically</attribute>
         </item>
       </section>
       <section>
@@ -133,39 +133,39 @@
             <item>
               <attribute name="label" translatable="yes">_Enhance</attribute>
               <attribute name="accel">&lt;Primary&gt;e</attribute>
-              <attribute name="action">Enhance</attribute>
+              <attribute name="action">win.Enhance</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Crop</attribute>
               <attribute name="accel">&lt;Primary&gt;o</attribute>
-              <attribute name="action">Crop</attribute>
+              <attribute name="action">win.Crop</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Straighten</attribute>
               <attribute name="accel">&lt;Primary&gt;a</attribute>
-              <attribute name="action">Straighten</attribute>
+              <attribute name="action">win.Straighten</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Red-eye</attribute>
               <attribute name="accel">&lt;Primary&gt;y</attribute>
-              <attribute name="action">RedEye</attribute>
+              <attribute name="action">win.RedEye</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Adjust</attribute>
               <attribute name="accel">&lt;Primary&gt;d</attribute>
-              <attribute name="action">Adjust</attribute>
+              <attribute name="action">win.Adjust</attribute>
             </item>
           </section>
         </submenu>
         <item>
           <attribute name="label" translatable="yes">Re_vert to Original</attribute>
-          <attribute name="action">Revert</attribute>
+          <attribute name="action">win.Revert</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Adjust Date and Time…</attribute>
-          <attribute name="action">AdjustDateTime</attribute>
+          <attribute name="action">win.AdjustDateTime</attribute>
         </item>
       </section>
     </submenu>
@@ -189,7 +189,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">CommonAbout</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/direct_context.ui b/ui/direct_context.ui
index d746c1a..0b045a8 100644
--- a/ui/direct_context.ui
+++ b/ui/direct_context.ui
@@ -7,18 +7,18 @@
         <item>
           <attribute name="label" translatable="yes">_Enhance</attribute>
           <attribute name="accel">&lt;Primary&gt;e</attribute>
-          <attribute name="action">Enhance</attribute>
+          <attribute name="action">win.Enhance</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Re_vert to Original</attribute>
-          <attribute name="action">Revert</attribute>
+          <attribute name="action">win.Revert</attribute>
         </item>
       </section>
       <section>
       <attribute name="id">ContextJumpPlaceholder</attribute>
         <item>
           <attribute name="label" translatable="yes">Send _To…</attribute>
-          <attribute name="action">SendTo</attribute>
+          <attribute name="action">win.SendTo</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/event.ui b/ui/event.ui
index 66cb167..84ca32d 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -8,7 +8,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">Make _Key Photo for Event</attribute>
-          <attribute name="action">MakePrimary</attribute>
+          <attribute name="action">win.MakePrimary</attribute>
         </item>
       </section>
     </submenu>
@@ -18,11 +18,11 @@
         <item>
           <attribute name="label" translatable="yes">Re_name Event…</attribute>
           <attribute name="accel">F2</attribute>
-          <attribute name="action">Rename</attribute>
+          <attribute name="action">win.Rename</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Edit _Comment…</attribute>
-          <attribute name="action">EditComment</attribute>
+          <attribute name="action">win.EditComment</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index ff05238..54754ce 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -7,17 +7,17 @@
         <item>
           <attribute name="label" translatable="yes">_Import from Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
-          <attribute name="action">CommonFileImport</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Import From _Application…</attribute>
-          <attribute name="action">ExternalLibraryImport</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Empty T_rash</attribute>
-          <attribute name="action">CommonEmptyTrash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
@@ -45,25 +45,25 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Find</attribute>
-          <attribute name="action">CommonFind</attribute>
+          <attribute name="action">win.CommonFind</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
           <attribute name="accel">&lt;Primary&gt;s</attribute>
-          <attribute name="action">CommonNewSearch</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Select _All</attribute>
           <attribute name="accel">&lt;Primary&gt;a</attribute>
-          <attribute name="action">CommonSelectAll</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Preferences</attribute>
-          <attribute name="action">CommonPreferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
@@ -73,34 +73,34 @@
         <item>
           <attribute name="label" translatable="yes">_Basic Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
-          <attribute name="action">CommonDisplayBasicProperties</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">E_xtended Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
-          <attribute name="action">CommonDisplayExtendedProperties</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Search Bar</attribute>
           <attribute name="accel">F8</attribute>
-          <attribute name="action">CommonDisplaySearchbar</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">S_idebar</attribute>
           <attribute name="accel">F9</attribute>
-          <attribute name="action">CommonDisplaySidebar</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">T_oolbar</attribute>
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
-          <attribute name="action">CommonDisplayToolbar</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Comments</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
-          <attribute name="action">ViewComment</attribute>
+          <attribute name="action">win.ViewComment</attribute>
         </item>
       </section>
       <section>
@@ -109,11 +109,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">_Ascending</attribute>
-              <attribute name="action">CommonSortEventsAscending</attribute>
+              <attribute name="action">win.CommonSortEventsAscending</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">D_escending</attribute>
-              <attribute name="action">CommonSortEventsDescending</attribute>
+              <attribute name="action">win.CommonSortEventsDescending</attribute>
             </item>
           </section>
         </submenu>
@@ -131,16 +131,16 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Merge Events</attribute>
-          <attribute name="action">Merge</attribute>
+          <attribute name="action">win.Merge</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Re_name Event…</attribute>
           <attribute name="accel">F2</attribute>
-          <attribute name="action">Rename</attribute>
+          <attribute name="action">win.Rename</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Edit _Comment…</attribute>
-          <attribute name="action">EditComment</attribute>
+          <attribute name="action">win.EditComment</attribute>
         </item>
       </section>
     </submenu>
@@ -164,7 +164,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">CommonAbout</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/import.ui b/ui/import.ui
index 9a67910..bbf15af 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -7,25 +7,25 @@
         <item>
           <attribute name="label" translatable="yes">_Import from Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
-          <attribute name="action">CommonFileImport</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Import _Selected</attribute>
-          <attribute name="action">ImportSelected</attribute>
+          <attribute name="action">win.ImportSelected</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Import _All</attribute>
-          <attribute name="action">ImportAll</attribute>
+          <attribute name="action">win.ImportAll</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Import From _Application…</attribute>
-          <attribute name="action">ExternalLibraryImport</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Empty T_rash</attribute>
-          <attribute name="action">CommonEmptyTrash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
@@ -53,20 +53,20 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Find</attribute>
-          <attribute name="action">CommonFind</attribute>
+          <attribute name="action">win.CommonFind</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Select _All</attribute>
           <attribute name="accel">&lt;Primary&gt;a</attribute>
-          <attribute name="action">CommonSelectAll</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Preferences</attribute>
-          <attribute name="action">CommonPreferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
@@ -76,34 +76,34 @@
         <item>
           <attribute name="label" translatable="yes">_Basic Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
-          <attribute name="action">CommonDisplayBasicProperties</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">E_xtended Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
-          <attribute name="action">CommonDisplayExtendedProperties</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Search Bar</attribute>
           <attribute name="accel">F8</attribute>
-          <attribute name="action">CommonDisplaySearchbar</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">S_idebar</attribute>
           <attribute name="accel">F9</attribute>
-          <attribute name="action">CommonDisplaySidebar</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">T_oolbar</attribute>
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
-          <attribute name="action">CommonDisplayToolbar</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Titles</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
-          <attribute name="action">ViewTitle</attribute>
+          <attribute name="action">win.ViewTitle</attribute>
         </item>
       </section>
       <section>
@@ -167,11 +167,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">_Ascending</attribute>
-              <attribute name="action">CommonSortEventsAscending</attribute>
+              <attribute name="action">win.CommonSortEventsAscending</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Descending</attribute>
-              <attribute name="action">CommonSortEventsDescending</attribute>
+              <attribute name="action">win.CommonSortEventsDescending</attribute>
             </item>
           </section>
         </submenu>
@@ -197,7 +197,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">CommonAbout</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index ce096da..a72b98b 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -6,24 +6,24 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Stop Import</attribute>
-          <attribute name="action">Stop</attribute>
+          <attribute name="action">win.Stop</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Import from Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
-          <attribute name="action">CommonFileImport</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Import From _Application…</attribute>
-          <attribute name="action">ExternalLibraryImport</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Empty T_rash</attribute>
-          <attribute name="action">CommonEmptyTrash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
@@ -40,7 +40,7 @@
         <item>
           <attribute name="label" translatable="yes">_Basic Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
-          <attribute name="action">CommonDisplayBasicProperties</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
         </item>
       </section>
       <section>
@@ -49,11 +49,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">_Ascending</attribute>
-              <attribute name="action">CommonSortEventsAscending</attribute>
+              <attribute name="action">win.CommonSortEventsAscending</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">D_escending</attribute>
-              <attribute name="action">CommonSortEventsDescending</attribute>
+              <attribute name="action">win.CommonSortEventsDescending</attribute>
             </item>
           </section>
         </submenu>
@@ -79,7 +79,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">CommonAbout</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/media.ui b/ui/media.ui
index 1348936..6c7c602 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -7,16 +7,16 @@
         <item>
           <attribute name="label" translatable="yes">_Import from Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
-          <attribute name="action">CommonFileImport</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Import From _Application…</attribute>
-          <attribute name="action">ExternalLibraryImport</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Save _As…</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
-          <attribute name="action">Export</attribute>
+          <attribute name="action">win.Export</attribute>
         </item>
       </section>
       <section>
@@ -26,13 +26,13 @@
         <item>
           <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
-          <attribute name="action">CommonJumpToFile</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Empty T_rash</attribute>
-          <attribute name="action">CommonEmptyTrash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
@@ -60,12 +60,12 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Find</attribute>
-          <attribute name="action">CommonFind</attribute>
+          <attribute name="action">win.CommonFind</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
           <attribute name="accel">&lt;Primary&gt;s</attribute>
-          <attribute name="action">CommonNewSearch</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
         </item>
       </section>
       <section>
@@ -73,25 +73,25 @@
         <item>
           <attribute name="label" translatable="yes">R_emove from Library</attribute>
           <attribute name="accel">&lt;Shift&gt;Delete</attribute>
-          <attribute name="action">RemoveFromLibrary</attribute>
+          <attribute name="action">win.RemoveFromLibrary</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Move to Trash</attribute>
           <attribute name="accel">Delete</attribute>
-          <attribute name="action">MoveToTrash</attribute>
+          <attribute name="action">win.MoveToTrash</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Select _All</attribute>
           <attribute name="accel">&lt;Primary&gt;a</attribute>
-          <attribute name="action">CommonSelectAll</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Preferences</attribute>
-          <attribute name="action">CommonPreferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
@@ -101,49 +101,49 @@
         <item>
           <attribute name="label" translatable="yes">_Basic Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
-          <attribute name="action">CommonDisplayBasicProperties</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">E_xtended Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
-          <attribute name="action">CommonDisplayExtendedProperties</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Search Bar</attribute>
           <attribute name="accel">F8</attribute>
-          <attribute name="action">CommonDisplaySearchbar</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">S_idebar</attribute>
           <attribute name="accel">F9</attribute>
-          <attribute name="action">CommonDisplaySidebar</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">T_oolbar</attribute>
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
-          <attribute name="action">CommonDisplayToolbar</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Titles</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
-          <attribute name="action">ViewTitle</attribute>
+          <attribute name="action">win.ViewTitle</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Comments</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
-          <attribute name="action">ViewComment</attribute>
+          <attribute name="action">win.ViewComment</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Ta_gs</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;g</attribute>
-          <attribute name="action">ViewTags</attribute>
+          <attribute name="action">win.ViewTags</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Ratings</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;n</attribute>
-          <attribute name="action">ViewRatings</attribute>
+          <attribute name="action">win.ViewRatings</attribute>
         </item>
       </section>
       <section>
@@ -207,29 +207,29 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">By _Title</attribute>
-              <attribute name="action">SortByTitle</attribute>
+              <attribute name="action">win.SortByTitle</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">By _Filename</attribute>
-              <attribute name="action">SortByFilename</attribute>
+              <attribute name="action">win.SortByFilename</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">By Exposure _Date</attribute>
-              <attribute name="action">SortByExposureDate</attribute>
+              <attribute name="action">win.SortByExposureDate</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">By _Rating</attribute>
-              <attribute name="action">SortByRating</attribute>
+              <attribute name="action">win.SortByRating</attribute>
             </item>
           </section>
           <section>
             <item>
               <attribute name="label" translatable="yes">_Ascending</attribute>
-              <attribute name="action">SortAscending</attribute>
+              <attribute name="action">win.SortAscending</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">D_escending</attribute>
-              <attribute name="action">SortDescending</attribute>
+              <attribute name="action">win.SortDescending</attribute>
             </item>
           </section>
         </submenu>
@@ -238,11 +238,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">_Ascending</attribute>
-              <attribute name="action">CommonSortEventsAscending</attribute>
+              <attribute name="action">win.CommonSortEventsAscending</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Descending</attribute>
-              <attribute name="action">CommonSortEventsDescending</attribute>
+              <attribute name="action">win.CommonSortEventsDescending</attribute>
             </item>
           </section>
         </submenu>
@@ -251,12 +251,12 @@
         <item>
           <attribute name="label" translatable="yes">Zoom _In</attribute>
           <attribute name="accel">&lt;Primary&gt;plus</attribute>
-          <attribute name="action">IncreaseSize</attribute>
+          <attribute name="action">win.IncreaseSize</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Zoom _Out</attribute>
           <attribute name="accel">&lt;Primary&gt;minus</attribute>
-          <attribute name="action">DecreaseSize</attribute>
+          <attribute name="action">win.DecreaseSize</attribute>
         </item>
       </section>
       <section>
@@ -272,7 +272,7 @@
         <item>
           <attribute name="label" translatable="yes">_Flag</attribute>
           <attribute name="accel">&lt;Primary&gt;g</attribute>
-          <attribute name="action">Flag</attribute>
+          <attribute name="action">win.Flag</attribute>
         </item>
         <submenu>
           <attribute name="label" translatable="yes">_Set Rating</attribute>
@@ -280,49 +280,49 @@
             <item>
               <attribute name="label" translatable="no">★★★★★</attribute>
               <attribute name="accel">5</attribute>
-              <attribute name="action">RateFive</attribute>
+              <attribute name="action">win.RateFive</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★★</attribute>
               <attribute name="accel">4</attribute>
-              <attribute name="action">RateFour</attribute>
+              <attribute name="action">win.RateFour</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★</attribute>
               <attribute name="accel">3</attribute>
-              <attribute name="action">RateThree</attribute>
+              <attribute name="action">win.RateThree</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★</attribute>
               <attribute name="accel">2</attribute>
-              <attribute name="action">RateTwo</attribute>
+              <attribute name="action">win.RateTwo</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★</attribute>
               <attribute name="accel">1</attribute>
-              <attribute name="action">RateOne</attribute>
+              <attribute name="action">win.RateOne</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Unrated</attribute>
               <attribute name="accel">0</attribute>
-              <attribute name="action">RateUnrated</attribute>
+              <attribute name="action">win.RateUnrated</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Rejected</attribute>
               <attribute name="accel">9</attribute>
-              <attribute name="action">RateRejected</attribute>
+              <attribute name="action">win.RateRejected</attribute>
             </item>
           </section>
           <section>
             <item>
               <attribute name="label" translatable="yes">_Increase</attribute>
               <attribute name="accel">greater</attribute>
-              <attribute name="action">IncreaseRating</attribute>
+              <attribute name="action">win.IncreaseRating</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Decrease</attribute>
               <attribute name="accel">less</attribute>
-              <attribute name="action">DecreaseRating</attribute>
+              <attribute name="action">win.DecreaseRating</attribute>
             </item>
           </section>
         </submenu>
@@ -330,11 +330,11 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">Edit _Title…</attribute>
-          <attribute name="action">EditTitle</attribute>
+          <attribute name="action">win.EditTitle</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Edit _Comment…</attribute>
-          <attribute name="action">EditComment</attribute>
+          <attribute name="action">win.EditComment</attribute>
         </item>
       <attribute name="id">PhotosExtrasDateTimePlaceholder</attribute>
       </section>
@@ -344,11 +344,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">Shotwell</attribute>
-              <attribute name="action">RawDeveloperShotwell</attribute>
+              <attribute name="action">win.RawDeveloperShotwell</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">Camera</attribute>
-              <attribute name="action">RawDeveloperCamera</attribute>
+              <attribute name="action">win.RawDeveloperCamera</attribute>
             </item>
           </section>
         </submenu>
@@ -363,12 +363,12 @@
         <item>
           <attribute name="label" translatable="yes">_New Event</attribute>
           <attribute name="accel">&lt;Primary&gt;n</attribute>
-          <attribute name="action">NewEvent</attribute>
+          <attribute name="action">win.NewEvent</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
-          <attribute name="action">CommonJumpToEvent</attribute>
+          <attribute name="action">win.CommonJumpToEvent</attribute>
         </item>
       </section>
     </submenu>
@@ -378,12 +378,12 @@
         <item>
           <attribute name="label" translatable="yes">Add _Tags…</attribute>
           <attribute name="accel">&lt;Primary&gt;t</attribute>
-          <attribute name="action">AddTags</attribute>
+          <attribute name="action">win.AddTags</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
           <attribute name="accel">&lt;Primary&gt;m</attribute>
-          <attribute name="action">ModifyTags</attribute>
+          <attribute name="action">win.ModifyTags</attribute>
         </item>
       </section>
     </submenu>
@@ -407,7 +407,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">CommonAbout</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/offline.ui b/ui/offline.ui
index 1ea5a4b..d1d2ddb 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -7,17 +7,17 @@
         <item>
           <attribute name="label" translatable="yes">_Import from Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
-          <attribute name="action">CommonFileImport</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Import From _Application…</attribute>
-          <attribute name="action">ExternalLibraryImport</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Empty T_rash</attribute>
-          <attribute name="action">CommonEmptyTrash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
@@ -45,32 +45,32 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Find</attribute>
-          <attribute name="action">CommonFind</attribute>
+          <attribute name="action">win.CommonFind</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
           <attribute name="accel">&lt;Primary&gt;s</attribute>
-          <attribute name="action">CommonNewSearch</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">R_emove from Library</attribute>
           <attribute name="accel">&lt;Shift&gt;Delete</attribute>
-          <attribute name="action">RemoveFromLibrary</attribute>
+          <attribute name="action">win.RemoveFromLibrary</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Select _All</attribute>
           <attribute name="accel">&lt;Primary&gt;a</attribute>
-          <attribute name="action">CommonSelectAll</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Preferences</attribute>
-          <attribute name="action">CommonPreferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
@@ -80,27 +80,27 @@
         <item>
           <attribute name="label" translatable="yes">_Basic Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
-          <attribute name="action">CommonDisplayBasicProperties</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">E_xtended Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
-          <attribute name="action">CommonDisplayExtendedProperties</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Search Bar</attribute>
           <attribute name="accel">F8</attribute>
-          <attribute name="action">CommonDisplaySearchbar</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">S_idebar</attribute>
           <attribute name="accel">F9</attribute>
-          <attribute name="action">CommonDisplaySidebar</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">T_oolbar</attribute>
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
-          <attribute name="action">CommonDisplayToolbar</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
       </section>
       <section>
@@ -164,11 +164,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">_Ascending</attribute>
-              <attribute name="action">CommonSortEventsAscending</attribute>
+              <attribute name="action">win.CommonSortEventsAscending</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">D_escending</attribute>
-              <attribute name="action">CommonSortEventsDescending</attribute>
+              <attribute name="action">win.CommonSortEventsDescending</attribute>
             </item>
           </section>
         </submenu>
@@ -194,7 +194,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">CommonAbout</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/photo.ui b/ui/photo.ui
index 4e9ec9e..3a64227 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -7,16 +7,16 @@
         <item>
           <attribute name="label" translatable="yes">_Import from Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
-          <attribute name="action">CommonFileImport</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Import From _Application…</attribute>
-          <attribute name="action">ExternalLibraryImport</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Save _As…</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
-          <attribute name="action">Export</attribute>
+          <attribute name="action">win.Export</attribute>
         </item>
       </section>
       <section>
@@ -26,7 +26,7 @@
       <attribute name="id">PublishPlaceholder</attribute>
         <item>
           <attribute name="label" translatable="yes">Send _To…</attribute>
-          <attribute name="action">SendTo</attribute>
+          <attribute name="action">win.SendTo</attribute>
         </item>
       <attribute name="id">SetBackgroundPlaceholder</attribute>
       </section>
@@ -34,13 +34,13 @@
         <item>
           <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
-          <attribute name="action">CommonJumpToFile</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Empty T_rash</attribute>
-          <attribute name="action">CommonEmptyTrash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
@@ -69,25 +69,25 @@
         <item>
           <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
           <attribute name="accel">&lt;Primary&gt;s</attribute>
-          <attribute name="action">CommonNewSearch</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">R_emove from Library</attribute>
           <attribute name="accel">&lt;Shift&gt;Delete</attribute>
-          <attribute name="action">RemoveFromLibrary</attribute>
+          <attribute name="action">win.RemoveFromLibrary</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Move to Trash</attribute>
           <attribute name="accel">Delete</attribute>
-          <attribute name="action">MoveToTrash</attribute>
+          <attribute name="action">win.MoveToTrash</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Preferences</attribute>
-          <attribute name="action">CommonPreferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
@@ -97,29 +97,29 @@
         <item>
           <attribute name="label" translatable="yes">_Basic Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
-          <attribute name="action">CommonDisplayBasicProperties</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">E_xtended Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
-          <attribute name="action">CommonDisplayExtendedProperties</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">S_idebar</attribute>
           <attribute name="accel">F9</attribute>
-          <attribute name="action">CommonDisplaySidebar</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">T_oolbar</attribute>
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
-          <attribute name="action">CommonDisplayToolbar</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Ratings</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;n</attribute>
-          <attribute name="action">ViewRatings</attribute>
+          <attribute name="action">win.ViewRatings</attribute>
         </item>
       </section>
       <section>
@@ -128,11 +128,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">_Ascending</attribute>
-              <attribute name="action">CommonSortEventsAscending</attribute>
+              <attribute name="action">win.CommonSortEventsAscending</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Descending</attribute>
-              <attribute name="action">CommonSortEventsDescending</attribute>
+              <attribute name="action">win.CommonSortEventsDescending</attribute>
             </item>
           </section>
         </submenu>
@@ -141,29 +141,29 @@
         <item>
           <attribute name="label" translatable="yes">Zoom _In</attribute>
           <attribute name="accel">&lt;Primary&gt;plus</attribute>
-          <attribute name="action">IncreaseSize</attribute>
+          <attribute name="action">win.IncreaseSize</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Zoom _Out</attribute>
           <attribute name="accel">&lt;Primary&gt;minus</attribute>
-          <attribute name="action">DecreaseSize</attribute>
+          <attribute name="action">win.DecreaseSize</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Fit to _Page</attribute>
           <attribute name="accel">&lt;Primary&gt;0</attribute>
-          <attribute name="action">ZoomFit</attribute>
+          <attribute name="action">win.ZoomFit</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Zoom _100%</attribute>
           <attribute name="accel">&lt;Primary&gt;1</attribute>
-          <attribute name="action">Zoom100</attribute>
+          <attribute name="action">win.Zoom100</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Zoom _200%</attribute>
           <attribute name="accel">&lt;Primary&gt;2</attribute>
-          <attribute name="action">Zoom200</attribute>
+          <attribute name="action">win.Zoom200</attribute>
         </item>
       </section>
       <section>
@@ -177,7 +177,7 @@
         <item>
           <attribute name="label" translatable="yes">S_lideshow</attribute>
           <attribute name="accel">F5</attribute>
-          <attribute name="action">Slideshow</attribute>
+          <attribute name="action">win.Slideshow</attribute>
         </item>
       </section>
     </submenu>
@@ -186,31 +186,31 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Previous Photo</attribute>
-          <attribute name="action">PrevPhoto</attribute>
+          <attribute name="action">win.PrevPhoto</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Next Photo</attribute>
-          <attribute name="action">NextPhoto</attribute>
+          <attribute name="action">win.NextPhoto</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Rotate _Right</attribute>
           <attribute name="accel">&lt;Primary&gt;r</attribute>
-          <attribute name="action">RotateClockwise</attribute>
+          <attribute name="action">win.RotateClockwise</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Rotate _Left</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;r</attribute>
-          <attribute name="action">RotateCounterclockwise</attribute>
+          <attribute name="action">win.RotateCounterclockwise</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Flip Hori_zontally</attribute>
-          <attribute name="action">FlipHorizontally</attribute>
+          <attribute name="action">win.FlipHorizontally</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Flip Verti_cally</attribute>
-          <attribute name="action">FlipVertically</attribute>
+          <attribute name="action">win.FlipVertically</attribute>
         </item>
       </section>
       <section>
@@ -220,52 +220,52 @@
             <item>
               <attribute name="label" translatable="yes">_Enhance</attribute>
               <attribute name="accel">&lt;Primary&gt;e</attribute>
-              <attribute name="action">Enhance</attribute>
+              <attribute name="action">win.Enhance</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Crop</attribute>
               <attribute name="accel">&lt;Primary&gt;o</attribute>
-              <attribute name="action">Crop</attribute>
+              <attribute name="action">win.Crop</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Straighten</attribute>
               <attribute name="accel">&lt;Primary&gt;a</attribute>
-              <attribute name="action">Straighten</attribute>
+              <attribute name="action">win.Straighten</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Red-eye</attribute>
               <attribute name="accel">&lt;Primary&gt;y</attribute>
-              <attribute name="action">RedEye</attribute>
+              <attribute name="action">win.RedEye</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Adjust</attribute>
               <attribute name="accel">&lt;Primary&gt;d</attribute>
-              <attribute name="action">Adjust</attribute>
+              <attribute name="action">win.Adjust</attribute>
             </item>
           </section>
         </submenu>
         <item>
           <attribute name="label" translatable="yes">Re_vert to Original</attribute>
-          <attribute name="action">Revert</attribute>
+          <attribute name="action">win.Revert</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Copy Color Adjustments</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
-          <attribute name="action">CopyColorAdjustments</attribute>
+          <attribute name="action">win.CopyColorAdjustments</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Paste Color Adjustments</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;v</attribute>
-          <attribute name="action">PasteColorAdjustments</attribute>
+          <attribute name="action">win.PasteColorAdjustments</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Flag</attribute>
           <attribute name="accel">&lt;Primary&gt;g</attribute>
-          <attribute name="action">Flag</attribute>
+          <attribute name="action">win.Flag</attribute>
         </item>
         <submenu>
           <attribute name="label" translatable="yes">_Set Rating</attribute>
@@ -273,49 +273,49 @@
             <item>
               <attribute name="label" translatable="no">★★★★★</attribute>
               <attribute name="accel">5</attribute>
-              <attribute name="action">RateFive</attribute>
+              <attribute name="action">win.RateFive</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★★</attribute>
               <attribute name="accel">4</attribute>
-              <attribute name="action">RateFour</attribute>
+              <attribute name="action">win.RateFour</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★</attribute>
               <attribute name="accel">3</attribute>
-              <attribute name="action">RateThree</attribute>
+              <attribute name="action">win.RateThree</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★</attribute>
               <attribute name="accel">2</attribute>
-              <attribute name="action">RateTwo</attribute>
+              <attribute name="action">win.RateTwo</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★</attribute>
               <attribute name="accel">1</attribute>
-              <attribute name="action">RateOne</attribute>
+              <attribute name="action">win.RateOne</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Unrated</attribute>
               <attribute name="accel">0</attribute>
-              <attribute name="action">RateUnrated</attribute>
+              <attribute name="action">win.RateUnrated</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Rejected</attribute>
               <attribute name="accel">9</attribute>
-              <attribute name="action">RateRejected</attribute>
+              <attribute name="action">win.RateRejected</attribute>
             </item>
           </section>
           <section>
             <item>
               <attribute name="label" translatable="yes">_Increase</attribute>
               <attribute name="accel">greater</attribute>
-              <attribute name="action">IncreaseRating</attribute>
+              <attribute name="action">win.IncreaseRating</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Decrease</attribute>
               <attribute name="accel">less</attribute>
-              <attribute name="action">DecreaseRating</attribute>
+              <attribute name="action">win.DecreaseRating</attribute>
             </item>
           </section>
         </submenu>
@@ -323,15 +323,15 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">Edit _Title…</attribute>
-          <attribute name="action">EditTitle</attribute>
+          <attribute name="action">win.EditTitle</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Edit _Comment…</attribute>
-          <attribute name="action">EditComment</attribute>
+          <attribute name="action">win.EditComment</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Adjust Date and Time…</attribute>
-          <attribute name="action">AdjustDateTime</attribute>
+          <attribute name="action">win.AdjustDateTime</attribute>
         </item>
       </section>
       <section>
@@ -340,11 +340,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">Shotwell</attribute>
-              <attribute name="action">RawDeveloperShotwell</attribute>
+              <attribute name="action">win.RawDeveloperShotwell</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">Camera</attribute>
-              <attribute name="action">RawDeveloperCamera</attribute>
+              <attribute name="action">win.RawDeveloperCamera</attribute>
             </item>
           </section>
         </submenu>
@@ -353,11 +353,11 @@
         <item>
           <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
           <attribute name="accel">&lt;Primary&gt;Return</attribute>
-          <attribute name="action">ExternalEdit</attribute>
+          <attribute name="action">win.ExternalEdit</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Open With RA_W Editor</attribute>
-          <attribute name="action">ExternalEditRAW</attribute>
+          <attribute name="action">win.ExternalEditRAW</attribute>
         </item>
       </section>
     </submenu>
@@ -367,12 +367,12 @@
         <item>
           <attribute name="label" translatable="yes">Add _Tags…</attribute>
           <attribute name="accel">&lt;Primary&gt;t</attribute>
-          <attribute name="action">AddTags</attribute>
+          <attribute name="action">win.AddTags</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
           <attribute name="accel">&lt;Primary&gt;m</attribute>
-          <attribute name="action">ModifyTags</attribute>
+          <attribute name="action">win.ModifyTags</attribute>
         </item>
       </section>
     </submenu>
@@ -396,7 +396,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">CommonAbout</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/photo_context.ui b/ui/photo_context.ui
index 4e2fe8e..a010df9 100644
--- a/ui/photo_context.ui
+++ b/ui/photo_context.ui
@@ -7,23 +7,23 @@
         <item>
           <attribute name="label" translatable="yes">_Enhance</attribute>
           <attribute name="accel">&lt;Primary&gt;e</attribute>
-          <attribute name="action">Enhance</attribute>
+          <attribute name="action">win.Enhance</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Re_vert to Original</attribute>
-          <attribute name="action">Revert</attribute>
+          <attribute name="action">win.Revert</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Add Tags…</attribute>
           <attribute name="accel">&lt;Primary&gt;a</attribute>
-          <attribute name="action">AddTagsContextMenu</attribute>
+          <attribute name="action">win.AddTagsContextMenu</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
           <attribute name="accel">&lt;Primary&gt;m</attribute>
-          <attribute name="action">ModifyTags</attribute>
+          <attribute name="action">win.ModifyTags</attribute>
         </item>
       <attribute name="id">ContextTagsPlaceholder</attribute>
       </section>
@@ -31,7 +31,7 @@
         <item>
           <attribute name="label" translatable="yes">_Flag</attribute>
           <attribute name="accel">&lt;Primary&gt;g</attribute>
-          <attribute name="action">Flag</attribute>
+          <attribute name="action">win.Flag</attribute>
         </item>
         <submenu>
           <attribute name="label" translatable="yes">_Set Rating</attribute>
@@ -39,49 +39,49 @@
             <item>
               <attribute name="label" translatable="no">★★★★★</attribute>
               <attribute name="accel">5</attribute>
-              <attribute name="action">RateFive</attribute>
+              <attribute name="action">win.RateFive</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★★</attribute>
               <attribute name="accel">4</attribute>
-              <attribute name="action">RateFour</attribute>
+              <attribute name="action">win.RateFour</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★</attribute>
               <attribute name="accel">3</attribute>
-              <attribute name="action">RateThree</attribute>
+              <attribute name="action">win.RateThree</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★</attribute>
               <attribute name="accel">2</attribute>
-              <attribute name="action">RateTwo</attribute>
+              <attribute name="action">win.RateTwo</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★</attribute>
               <attribute name="accel">1</attribute>
-              <attribute name="action">RateOne</attribute>
+              <attribute name="action">win.RateOne</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Unrated</attribute>
               <attribute name="accel">0</attribute>
-              <attribute name="action">RateUnrated</attribute>
+              <attribute name="action">win.RateUnrated</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Rejected</attribute>
               <attribute name="accel">9</attribute>
-              <attribute name="action">RateRejected</attribute>
+              <attribute name="action">win.RateRejected</attribute>
             </item>
           </section>
           <section>
             <item>
               <attribute name="label" translatable="yes">_Increase</attribute>
               <attribute name="accel">greater</attribute>
-              <attribute name="action">IncreaseRating</attribute>
+              <attribute name="action">win.IncreaseRating</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Decrease</attribute>
               <attribute name="accel">less</attribute>
-              <attribute name="action">DecreaseRating</attribute>
+              <attribute name="action">win.DecreaseRating</attribute>
             </item>
           </section>
         </submenu>
@@ -91,11 +91,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">Shotwell</attribute>
-              <attribute name="action">RawDeveloperShotwell</attribute>
+              <attribute name="action">win.RawDeveloperShotwell</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">Camera</attribute>
-              <attribute name="action">RawDeveloperCamera</attribute>
+              <attribute name="action">win.RawDeveloperCamera</attribute>
             </item>
           </section>
         </submenu>
@@ -103,34 +103,34 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">Edit _Title…</attribute>
-          <attribute name="action">EditTitle</attribute>
+          <attribute name="action">win.EditTitle</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Edit _Comment…</attribute>
-          <attribute name="action">EditComment</attribute>
+          <attribute name="action">win.EditComment</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
           <attribute name="accel">&lt;Primary&gt;Return</attribute>
-          <attribute name="action">ExternalEdit</attribute>
+          <attribute name="action">win.ExternalEdit</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Open With RA_W Editor</attribute>
-          <attribute name="action">ExternalEditRAW</attribute>
+          <attribute name="action">win.ExternalEditRAW</attribute>
         </item>
       </section>
       <section>
       <attribute name="id">ContextJumpPlaceholder</attribute>
         <item>
           <attribute name="label" translatable="yes">Send T_o…</attribute>
-          <attribute name="action">SendToContextMenu</attribute>
+          <attribute name="action">win.SendToContextMenu</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Move to Trash</attribute>
           <attribute name="accel">Delete</attribute>
-          <attribute name="action">MoveToTrash</attribute>
+          <attribute name="action">win.MoveToTrash</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/savedsearch.ui b/ui/savedsearch.ui
index e1236c1..fe0010e 100644
--- a/ui/savedsearch.ui
+++ b/ui/savedsearch.ui
@@ -6,15 +6,15 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">Re_name…</attribute>
-          <attribute name="action">RenameSearch</attribute>
+          <attribute name="action">win.RenameSearch</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Edit…</attribute>
-          <attribute name="action">EditSearch</attribute>
+          <attribute name="action">win.EditSearch</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Delete</attribute>
-          <attribute name="action">DeleteSearch</attribute>
+          <attribute name="action">win.DeleteSearch</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/search_bar.ui b/ui/search_bar.ui
index 5f899c8..9d56962 100644
--- a/ui/search_bar.ui
+++ b/ui/search_bar.ui
@@ -4,49 +4,49 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">Rejected _Only</attribute>
-        <attribute name="action">filterbar.display.rating</attribute>
+        <attribute name="action">win.display.rating</attribute>
         <attribute name="target">8</attribute>
         <attribute name="accel">&lt;Primary&gt;8</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">All + _Rejected</attribute>
-        <attribute name="action">filterbar.display.rating</attribute>
+        <attribute name="action">win.display.rating</attribute>
         <attribute name="target">1</attribute>
         <attribute name="accel">&lt;Primary&gt;9</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">_All Photos</attribute>
-        <attribute name="action">filterbar.display.rating</attribute>
+        <attribute name="action">win.display.rating</attribute>
         <attribute name="target">2</attribute>
         <attribute name="accel">&lt;Primary&gt;0</attribute>
       </item>
       <item>
         <attribute name="label" translatable="no">★</attribute>
-        <attribute name="action">filterbar.display.rating</attribute>
+        <attribute name="action">win.display.rating</attribute>
         <attribute name="target">3</attribute>
         <attribute name="accel">&lt;Primary&gt;1</attribute>
       </item>
       <item>
         <attribute name="label" translatable="no">★★</attribute>
-        <attribute name="action">filterbar.display.rating</attribute>
+        <attribute name="action">win.display.rating</attribute>
         <attribute name="target">4</attribute>
         <attribute name="accel">&lt;Primary&gt;2</attribute>
       </item>
       <item>
         <attribute name="label" translatable="no">★★★</attribute>
-        <attribute name="action">filterbar.display.rating</attribute>
+        <attribute name="action">win.display.rating</attribute>
         <attribute name="target">5</attribute>
         <attribute name="accel">&lt;Primary&gt;3</attribute>
       </item>
       <item>
         <attribute name="label" translatable="no">★★★★</attribute>
-        <attribute name="action">filterbar.display.rating</attribute>
+        <attribute name="action">win.display.rating</attribute>
         <attribute name="target">6</attribute>
         <attribute name="accel">&lt;Primary&gt;4</attribute>
       </item>
       <item>
         <attribute name="label" translatable="no">★★★★★</attribute>
-        <attribute name="action">filterbar.display.rating</attribute>
+        <attribute name="action">win.display.rating</attribute>
         <attribute name="target">7</attribute>
         <attribute name="accel">&lt;Primary&gt;5</attribute>
       </item>
diff --git a/ui/tags.ui b/ui/tags.ui
index 574102f..8ffcd33 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -6,17 +6,17 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">RemoveTagFromPhotos</attribute>
-          <attribute name="action">RemoveTagFromPhotos</attribute>
+          <attribute name="action">win.RemoveTagFromPhotos</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">RenameTag</attribute>
-          <attribute name="action">RenameTag</attribute>
+          <attribute name="action">win.RenameTag</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">DeleteTag</attribute>
-          <attribute name="action">DeleteTag</attribute>
+          <attribute name="action">win.DeleteTag</attribute>
         </item>
       </section>
     </submenu>
diff --git a/ui/trash.ui b/ui/trash.ui
index 0ed7880..c2396a7 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -7,22 +7,22 @@
         <item>
           <attribute name="label" translatable="yes">_Import from Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
-          <attribute name="action">CommonFileImport</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Import From _Application…</attribute>
-          <attribute name="action">ExternalLibraryImport</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
-          <attribute name="action">CommonJumpToFile</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Empty T_rash</attribute>
-          <attribute name="action">CommonEmptyTrash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
@@ -50,36 +50,36 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Find</attribute>
-          <attribute name="action">CommonFind</attribute>
+          <attribute name="action">win.CommonFind</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
           <attribute name="accel">&lt;Primary&gt;s</attribute>
-          <attribute name="action">CommonNewSearch</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Delete</attribute>
           <attribute name="accel">Delete</attribute>
-          <attribute name="action">Delete</attribute>
+          <attribute name="action">win.Delete</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Restore</attribute>
-          <attribute name="action">Restore</attribute>
+          <attribute name="action">win.Restore</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">Select _All</attribute>
           <attribute name="accel">&lt;Primary&gt;a</attribute>
-          <attribute name="action">CommonSelectAll</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Preferences</attribute>
-          <attribute name="action">CommonPreferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
@@ -89,27 +89,27 @@
         <item>
           <attribute name="label" translatable="yes">_Basic Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
-          <attribute name="action">CommonDisplayBasicProperties</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">E_xtended Information</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
-          <attribute name="action">CommonDisplayExtendedProperties</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Search Bar</attribute>
           <attribute name="accel">F8</attribute>
-          <attribute name="action">CommonDisplaySearchbar</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">S_idebar</attribute>
           <attribute name="accel">F9</attribute>
-          <attribute name="action">CommonDisplaySidebar</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">T_oolbar</attribute>
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
-          <attribute name="action">CommonDisplayToolbar</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
       </section>
       <section>
@@ -173,11 +173,11 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">_Ascending</attribute>
-              <attribute name="action">CommonSortEventsAscending</attribute>
+              <attribute name="action">win.CommonSortEventsAscending</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">D_escending</attribute>
-              <attribute name="action">CommonSortEventsDescending</attribute>
+              <attribute name="action">win.CommonSortEventsDescending</attribute>
             </item>
           </section>
         </submenu>
@@ -203,7 +203,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">CommonAbout</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
         </item>
       </section>
     </submenu>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]