Simplify util_clip_triangle()
[geeqie.git] / src / layout-util.cc
index 5afa757..5dd2e1e 100644 (file)
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "layout-util.h"
 
+#include <dirent.h>
+#include <unistd.h>
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#include <gio/gio.h>
+#include <glib-object.h>
+
+#include <config.h>
+
 #include "advanced-exif.h"
+#include "archives.h"
+#include "bar-keywords.h"
 #include "bar-sort.h"
 #include "bar.h"
-#include "bar-keywords.h"
 #include "cache-maint.h"
-#include "collect.h"
-#include "collect-dlg.h"
 #include "collect-io.h"
+#include "collect.h"
 #include "color-man.h"
+#include "compat.h"
+#include "debug.h"
 #include "desktop-file.h"
 #include "dupe.h"
 #include "editors.h"
+#include "filedata.h"
 #include "fullscreen.h"
 #include "histogram.h"
 #include "history-list.h"
-#include "image.h"
 #include "image-overlay.h"
+#include "image.h"
 #include "img-view.h"
+#include "intl.h"
+#include "keymap-template.h"
 #include "layout-image.h"
+#include "layout.h"
 #include "logwindow.h"
+#include "main-defines.h"
+#include "main.h"
 #include "metadata.h"
 #include "misc.h"
+#include "options.h"
 #include "pan-view.h"
 #include "pixbuf-util.h"
 #include "preferences.h"
 #include "print.h"
 #include "rcfile.h"
-#include "search.h"
 #include "search-and-run.h"
+#include "search.h"
 #include "slideshow.h"
 #include "ui-fileops.h"
 #include "ui-menu.h"
 #include "ui-misc.h"
+#include "ui-utildlg.h"
 #include "utilops.h"
 #include "view-dir.h"
 #include "view-file.h"
 #include "window.h"
 
-#include <sys/wait.h>
-#include "keymap-template.h"
-
-#define MENU_EDIT_ACTION_OFFSET 16
-#define FILE_COLUMN_POINTER 0
-
 static gboolean layout_bar_enabled(LayoutWindow *lw);
 static gboolean layout_bar_sort_enabled(LayoutWindow *lw);
 static void layout_bars_hide_toggle(LayoutWindow *lw);
@@ -109,7 +124,7 @@ gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
                {
                if (event->keyval == GDK_KEY_Escape && lw->dir_fd)
                        {
-                       gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path);
+                       gq_gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path);
                        }
 
                /* the gtkaccelgroup of the window is stealing presses before they get to the entry (and more),
@@ -241,9 +256,7 @@ static void layout_menu_clear_marks_cb(GtkAction *, gpointer)
 
        gd = generic_dialog_new(_("Clear Marks"),
                                "marks_clear", nullptr, FALSE, clear_marks_cancel_cb, nullptr);
-       generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION, "Clear all marks?",
-                               "This will clear all marks for all images,\nincluding those linked to keywords",
-                               TRUE);
+       generic_dialog_add_message(gd, GQ_ICON_DIALOG_QUESTION, _("Clear all marks?"), _("This will clear all marks for all images,\nincluding those linked to keywords"), TRUE);
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", layout_menu_clear_marks_ok_cb, TRUE);
        generic_dialog_add_button(gd, GQ_ICON_HELP, _("Help"),
                                clear_marks_help_cb, FALSE);
@@ -587,7 +600,7 @@ static void layout_menu_write_rotate(GtkToggleAction *, gpointer data, gboolean
                        {
                        tpath = static_cast<GtkTreePath *>(work->data);
                        gtk_tree_model_get_iter(store, &iter, tpath);
-                       gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1);
+                       gtk_tree_model_get(store, &iter, VIEW_FILE_COLUMN_POINTER, &fd_n, -1);
                        work = work->next;
                        }
 
@@ -619,10 +632,8 @@ static void layout_menu_write_rotate(GtkToggleAction *, gpointer data, gboolean
 
                        message = g_string_append(message, fd_n->name);
 
-                       gd = generic_dialog_new(_("Image orientation"),
-                       "Image orientation", nullptr, TRUE, nullptr, nullptr);
-                       generic_dialog_add_message(gd, GQ_ICON_DIALOG_ERROR,
-                       "Image orientation", message->str, TRUE);
+                       gd = generic_dialog_new(_("Image orientation"), "image_orientation", nullptr, TRUE, nullptr, nullptr);
+                       generic_dialog_add_message(gd, GQ_ICON_DIALOG_ERROR, _("Image orientation"), message->str, TRUE);
                        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", nullptr, TRUE);
 
                        gtk_widget_show(gd->dialog);
@@ -904,6 +915,95 @@ static void layout_menu_view_in_new_window_cb(GtkAction *, gpointer data)
        view_window_new(layout_image_get_fd(lw));
 }
 
+struct OpenWithData
+{
+       GAppInfo *application;
+       GList *g_file_list;
+       GtkWidget *app_chooser_dialog;
+};
+
+void open_with_response_cb(GtkDialog *, gint response_id, gpointer data)
+{
+       GError *error = nullptr;
+       auto open_with_data = static_cast<OpenWithData *>(data);
+
+       if (response_id == GTK_RESPONSE_OK)
+               {
+               g_app_info_launch(open_with_data->application, open_with_data->g_file_list, nullptr, &error);
+
+               if (error)
+                       {
+                       log_printf("Error launching app: %s\n", error->message);
+                       g_error_free(error);
+                       }
+               }
+
+       g_object_unref(open_with_data->application);
+       g_object_unref(g_list_first(open_with_data->g_file_list)->data);
+       g_list_free(open_with_data->g_file_list);
+       gtk_widget_destroy(GTK_WIDGET(open_with_data->app_chooser_dialog));
+       g_free(open_with_data);
+}
+
+static void open_with_application_selected_cb(GtkAppChooserWidget *, GAppInfo *application, gpointer data)
+{
+       auto open_with_data = static_cast<OpenWithData *>(data);
+
+       g_object_unref(open_with_data->application);
+
+       open_with_data->application = g_app_info_dup(application);
+}
+
+static void open_with_application_activated_cb(GtkAppChooserWidget *, GAppInfo *application, gpointer data)
+{
+       GError *error = nullptr;
+       auto open_with_data = static_cast<OpenWithData *>(data);
+
+       g_app_info_launch(application, open_with_data->g_file_list, nullptr, &error);
+
+       if (error)
+               {
+               log_printf("Error launching app.: %s\n", error->message);
+               g_error_free(error);
+               }
+
+       g_object_unref(open_with_data->application);
+       g_object_unref(g_list_first(open_with_data->g_file_list)->data);
+       g_list_free(open_with_data->g_file_list);
+       gtk_widget_destroy(GTK_WIDGET(open_with_data->app_chooser_dialog));
+       g_free(open_with_data);
+}
+
+static void layout_menu_open_with_cb(GtkAction *, gpointer data)
+{
+       auto lw = static_cast<LayoutWindow *>(data);
+       FileData *fd;
+       GtkWidget *widget;
+       OpenWithData *open_with_data;
+
+       if (layout_selection_list(lw))
+               {
+               open_with_data = g_new(OpenWithData, 1);
+
+               fd = static_cast<FileData *>(g_list_first(layout_selection_list(lw))->data);
+
+               open_with_data->g_file_list = g_list_append(nullptr, g_file_new_for_path(fd->path));
+
+               open_with_data->app_chooser_dialog = gtk_app_chooser_dialog_new(nullptr, GTK_DIALOG_DESTROY_WITH_PARENT, G_FILE(g_list_first(open_with_data->g_file_list)->data));
+
+               widget = gtk_app_chooser_dialog_get_widget(GTK_APP_CHOOSER_DIALOG(open_with_data->app_chooser_dialog));
+
+               open_with_data->application = gtk_app_chooser_get_app_info(GTK_APP_CHOOSER(open_with_data->app_chooser_dialog));
+
+               g_signal_connect(G_OBJECT(widget), "application-selected", G_CALLBACK(open_with_application_selected_cb), open_with_data);
+               g_signal_connect(G_OBJECT(widget), "application-activated", G_CALLBACK(open_with_application_activated_cb), open_with_data);
+               g_signal_connect(G_OBJECT(open_with_data->app_chooser_dialog), "response", G_CALLBACK(open_with_response_cb), open_with_data);
+               g_signal_connect(G_OBJECT(open_with_data->app_chooser_dialog), "close", G_CALLBACK(open_with_response_cb), open_with_data);
+
+               gtk_widget_show(open_with_data->app_chooser_dialog);
+               }
+}
+
 static void layout_menu_open_archive_cb(GtkAction *, gpointer data)
 {
        auto lw = static_cast<LayoutWindow *>(data);
@@ -1268,10 +1368,14 @@ static void layout_menu_foreach_func(
                                        GdkModifierType accel_mods,
                                        gboolean)
 {
-       gchar *path, *name;
-       gchar *key_name, *menu_name;
-       gchar **subset_lt_arr, **subset_gt_arr;
-       gchar *subset_lt, *converted_name;
+       gchar *path;
+       gchar *name;
+       gchar *key_name;
+       gchar *menu_name;
+       gchar **subset_lt_arr;
+       gchar **subset_gt_arr;
+       gchar *subset_lt;
+       gchar *converted_name;
        auto array = static_cast<GPtrArray *>(data);
 
        path = g_strescape(accel_path, nullptr);
@@ -1309,7 +1413,8 @@ static void layout_menu_kbd_map_cb(GtkAction *, gpointer)
        char * tmp_file;
        GError *error = nullptr;
        GIOChannel *channel;
-       char **pre_key, **post_key;
+       char **pre_key;
+       char **post_key;
        const char *key_name;
        char *converted_line;
        int keymap_index;
@@ -1821,7 +1926,7 @@ static void layout_menu_keyword_autocomplete_cb(GtkAction *, gpointer data)
  * color profile button (and menu)
  *-----------------------------------------------------------------------------
  */
-#ifdef HAVE_LCMS
+#if HAVE_LCMS
 static void layout_color_menu_enable_cb(GtkToggleAction *action, gpointer data)
 {
        auto lw = static_cast<LayoutWindow *>(data);
@@ -1832,13 +1937,7 @@ static void layout_color_menu_enable_cb(GtkToggleAction *action, gpointer data)
        layout_util_sync_color(lw);
        layout_image_refresh(lw);
 }
-#else
-static void layout_color_menu_enable_cb()
-{
-}
-#endif
 
-#ifdef HAVE_LCMS
 static void layout_color_menu_use_image_cb(GtkToggleAction *action, gpointer data)
 {
        auto lw = static_cast<LayoutWindow *>(data);
@@ -1851,13 +1950,7 @@ static void layout_color_menu_use_image_cb(GtkToggleAction *action, gpointer dat
        layout_util_sync_color(lw);
        layout_image_refresh(lw);
 }
-#else
-static void layout_color_menu_use_image_cb()
-{
-}
-#endif
 
-#ifdef HAVE_LCMS
 static void layout_color_menu_input_cb(GtkRadioAction *action, GtkRadioAction *, gpointer data)
 {
        auto lw = static_cast<LayoutWindow *>(data);
@@ -1875,6 +1968,14 @@ static void layout_color_menu_input_cb(GtkRadioAction *action, GtkRadioAction *,
        layout_image_refresh(lw);
 }
 #else
+static void layout_color_menu_enable_cb()
+{
+}
+
+static void layout_color_menu_use_image_cb()
+{
+}
+
 static void layout_color_menu_input_cb()
 {
 }
@@ -1947,7 +2048,7 @@ static void layout_menu_collection_recent_update(LayoutWindow *lw)
                menu_item_add(menu, _("Empty"), nullptr, nullptr);
                }
 
-       recent = gtk_ui_manager_get_widget(lw->ui_manager, "/MainMenu/FileMenu/OpenRecent");
+       recent = gtk_ui_manager_get_widget(lw->ui_manager, options->hamburger_menu ? "/MainMenu/OpenMenu/FileMenu/OpenRecent" : "/MainMenu/FileMenu/OpenRecent");
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(recent), menu);
        gtk_widget_set_sensitive(recent, (n != 0));
 }
@@ -2003,7 +2104,7 @@ static void layout_menu_collection_open_update(LayoutWindow *lw)
                menu_item_add(menu, _("Empty"), nullptr, nullptr);
                }
 
-       recent = gtk_ui_manager_get_widget(lw->ui_manager, "/MainMenu/FileMenu/OpenCollection");
+       recent = gtk_ui_manager_get_widget(lw->ui_manager, options->hamburger_menu ? "/MainMenu/OpenMenu/FileMenu/OpenCollection" : "/MainMenu/FileMenu/OpenCollection");
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(recent), menu);
        gtk_widget_set_sensitive(recent, (n != 0));
 }
@@ -2152,7 +2253,8 @@ static void layout_menu_new_window_update(LayoutWindow *lw)
        GtkWidget *menu;
        GtkWidget *sub_menu;
        GtkWidget *item;
-       GList *children, *iter;
+       GList *children;
+       GList *iter;
        gint n;
        GList *list = nullptr;
        gint i = 0;
@@ -2162,7 +2264,7 @@ static void layout_menu_new_window_update(LayoutWindow *lw)
 
        list = layout_window_menu_list(list);
 
-       menu = gtk_ui_manager_get_widget(lw->ui_manager, "/MainMenu/WindowsMenu/NewWindow");
+       menu = gtk_ui_manager_get_widget(lw->ui_manager, options->hamburger_menu ? "/MainMenu/OpenMenu/WindowsMenu/NewWindow" : "/MainMenu/WindowsMenu/NewWindow");
        sub_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu));
 
        children = gtk_container_get_children(GTK_CONTAINER(sub_menu));
@@ -2170,7 +2272,7 @@ static void layout_menu_new_window_update(LayoutWindow *lw)
                {
                if (i >= 4) // separator, default, from current, separator
                        {
-                       gtk_widget_destroy(GTK_WIDGET(iter->data));
+                       gq_gtk_widget_destroy(GTK_WIDGET(iter->data));
                        }
                }
        g_list_free(children);
@@ -2208,7 +2310,7 @@ static void window_rename_ok(GenericDialog *, gpointer data)
        gchar *xml_name;
        gchar *new_id;
 
-       new_id = g_strdup(gtk_entry_get_text(GTK_ENTRY(rw->window_name_entry)));
+       new_id = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(rw->window_name_entry)));
 
        list = layout_window_menu_list(list);
        while (list)
@@ -2304,10 +2406,12 @@ static void layout_menu_windows_menu_cb(GtkWidget *, gpointer data)
        GtkWidget *menu;
        GtkWidget *sub_menu;
        gchar *menu_label;
-       GList *children, *iter;
+       GList *children;
+       GList *iter;
        gint i;
 
-       menu = gtk_ui_manager_get_widget(lw->ui_manager, "/MainMenu/WindowsMenu/");
+       menu = gtk_ui_manager_get_widget(lw->ui_manager, options->hamburger_menu ? "/MainMenu/OpenMenu/WindowsMenu/" : "/MainMenu/WindowsMenu/");
+
        sub_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu));
 
        /* disable Delete for temporary windows */
@@ -2334,11 +2438,12 @@ static void layout_menu_view_menu_cb(GtkWidget *, gpointer data)
        GtkWidget *menu;
        GtkWidget *sub_menu;
        gchar *menu_label;
-       GList *children, *iter;
+       GList *children;
+       GList *iter;
        gint i;
        FileData *fd;
 
-       menu = gtk_ui_manager_get_widget(lw->ui_manager, "/MainMenu/ViewMenu/");
+       menu = gtk_ui_manager_get_widget(lw->ui_manager, options->hamburger_menu ? "/MainMenu/OpenMenu/ViewMenu/" : "/MainMenu/ViewMenu/");
        sub_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu));
 
        fd = layout_image_get_fd(lw);
@@ -2480,8 +2585,8 @@ static void layout_menu_window_rename_cb(GtkWidget *, gpointer data)
        rw->window_name_entry = gtk_entry_new();
        gtk_widget_set_can_focus(rw->window_name_entry, TRUE);
        gtk_editable_set_editable(GTK_EDITABLE(rw->window_name_entry), TRUE);
-       gtk_entry_set_text(GTK_ENTRY(rw->window_name_entry), lw->options.id);
-       gtk_box_pack_start(GTK_BOX(hbox), rw->window_name_entry, TRUE, TRUE, 0);
+       gq_gtk_entry_set_text(GTK_ENTRY(rw->window_name_entry), lw->options.id);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), rw->window_name_entry, TRUE, TRUE, 0);
        gtk_widget_grab_focus(GTK_WIDGET(rw->window_name_entry));
        gtk_widget_show(rw->window_name_entry);
        g_signal_connect(rw->window_name_entry, "activate", G_CALLBACK(window_rename_entry_activate_cb), rw);
@@ -2527,519 +2632,232 @@ static void layout_menu_window_delete_cb(GtkWidget *, gpointer data)
  *  name, stock_id, label, accelerator, tooltip, callback
  */
 static GtkActionEntry menu_entries[] = {
-  { "FileMenu",                nullptr,                        N_("_File"),                            nullptr,                        nullptr,                                        nullptr },
-  { "GoMenu",          nullptr,                        N_("_Go"),                              nullptr,                        nullptr,                                        nullptr },
-  { "EditMenu",                nullptr,                        N_("_Edit"),                            nullptr,                        nullptr,                                        nullptr },
-  { "SelectMenu",      nullptr,                        N_("_Select"),                          nullptr,                        nullptr,                                        nullptr },
-  { "OrientationMenu", nullptr,                        N_("_Orientation"),                     nullptr,                        nullptr,                                        nullptr },
-  { "RatingMenu",      nullptr,                        N_("_Rating"),                                  nullptr,                        nullptr,                                        nullptr },
-  { "PreferencesMenu", nullptr,                        N_("P_references"),                     nullptr,                        nullptr,                                        nullptr },
-  { "ViewMenu",                nullptr,                        N_("_View"),                            nullptr,                        nullptr,                                        CB(layout_menu_view_menu_cb)  },
-  { "FileDirMenu",     nullptr,                        N_("_Files and Folders"),               nullptr,                        nullptr,                                        nullptr },
-  { "ZoomMenu",                nullptr,                        N_("_Zoom"),                            nullptr,                        nullptr,                                        nullptr },
-  { "ColorMenu",       nullptr,                        N_("_Color Management"),                nullptr,                        nullptr,                                        nullptr },
-  { "ConnectZoomMenu", nullptr,                        N_("_Connected Zoom"),                  nullptr,                        nullptr,                                        nullptr },
-  { "SplitMenu",       nullptr,                        N_("Spli_t"),                           nullptr,                        nullptr,                                        nullptr },
-  { "StereoMenu",      nullptr,                        N_("Stere_o"),                          nullptr,                        nullptr,                                        nullptr },
-  { "OverlayMenu",     nullptr,                        N_("Image _Overlay"),                   nullptr,                        nullptr,                                        nullptr },
-  { "PluginsMenu",     nullptr,                        N_("_Plugins"),                         nullptr,                        nullptr,                                        nullptr },
-  { "WindowsMenu",             nullptr,                N_("_Windows"),                         nullptr,                        nullptr,                                        CB(layout_menu_windows_menu_cb)  },
-  { "HelpMenu",                nullptr,                        N_("_Help"),                            nullptr,                        nullptr,                                        nullptr },
-
-  { "Copy",            GQ_ICON_COPY,           N_("_Copy..."),                         "<control>C",           N_("Copy..."),                          CB(layout_menu_copy_cb) },
-  { "Move",    PIXBUF_INLINE_ICON_MOVE,                        N_("_Move..."),                         "<control>M",           N_("Move..."),                          CB(layout_menu_move_cb) },
-  { "Rename",  PIXBUF_INLINE_ICON_RENAME,      N_("_Rename..."),                       "<control>R",           N_("Rename..."),                        CB(layout_menu_rename_cb) },
-  { "Delete",  PIXBUF_INLINE_ICON_TRASH,       N_("Move to Trash..."),         "<control>D",   N_("Move to Trash..."),         CB(layout_menu_move_to_trash_cb) },
-  { "DeleteAlt1",      PIXBUF_INLINE_ICON_TRASH,N_("Move to Trash..."),        "Delete",               N_("Move to Trash..."),         CB(layout_menu_move_to_trash_key_cb) },
-  { "DeleteAlt2",      PIXBUF_INLINE_ICON_TRASH,N_("Move to Trash..."),        "KP_Delete",    N_("Move to Trash..."),         CB(layout_menu_move_to_trash_key_cb) },
-  { "PermanentDelete", GQ_ICON_DELETE, N_("Delete..."),                        "<shift>Delete",N_("Delete..."),                        CB(layout_menu_delete_cb) }, 
-  { "SelectAll",       PIXBUF_INLINE_ICON_SELECT_ALL,                  N_("Select _all"),                      "<control>A",           N_("Select all"),                       CB(layout_menu_select_all_cb) },
-  { "SelectNone",      PIXBUF_INLINE_ICON_SELECT_NONE,                 N_("Select _none"),                     "<control><shift>A",    N_("Select none"),                      CB(layout_menu_unselect_all_cb) },
-  { "SelectInvert",    PIXBUF_INLINE_ICON_SELECT_INVERT,                       N_("_Invert Selection"),                "<control><shift>I",    N_("Invert Selection"),                 CB(layout_menu_invert_selection_cb) },
-  { "CloseWindow",     GQ_ICON_CLOSE,  N_("C_lose window"),                    "<control>W",           N_("Close window"),                     CB(layout_menu_close_cb) },
-  { "Quit",            GQ_ICON_QUIT,   N_("_Quit"),                            "<control>Q",           N_("Quit"),                             CB(layout_menu_exit_cb) },
-  { "FirstImage",      GQ_ICON_GO_TOP, N_("_First Image"),                     "Home",                 N_("First Image"),                      CB(layout_menu_image_first_cb) },
-  { "PrevImage",       GQ_ICON_GO_UP,  N_("_Previous Image"),                  "BackSpace",            N_("Previous Image"),                   CB(layout_menu_image_prev_cb) },
-  { "PrevImageAlt1",   GQ_ICON_GO_UP,  N_("_Previous Image"),                  "Page_Up",              N_("Previous Image"),                   CB(layout_menu_image_prev_cb) },
-  { "PrevImageAlt2",   GQ_ICON_GO_UP,  N_("_Previous Image"),                  "KP_Page_Up",           N_("Previous Image"),                   CB(layout_menu_image_prev_cb) },
-  { "NextImage",       GQ_ICON_GO_DOWN,        N_("_Next Image"),                      "space",                N_("Next Image"),                       CB(layout_menu_image_next_cb) },
-  { "NextImageAlt1",   GQ_ICON_GO_DOWN,        N_("_Next Image"),                      "Page_Down",            N_("Next Image"),                       CB(layout_menu_image_next_cb) },
-
-  { "ImageForward",    GQ_ICON_GO_LAST,        N_("Image Forward"),    nullptr,        N_("Forward in image history"), CB(layout_menu_image_forward_cb) },
-  { "ImageBack",       GQ_ICON_GO_FIRST,       N_("Image Back"),               nullptr,        N_("Back in image history"),            CB(layout_menu_image_back_cb) },
-
-  { "FirstPage",GQ_ICON_PREV_PAGE,     N_("_First Page"),              nullptr,        N_( "First Page of multi-page image"),  CB(layout_menu_page_first_cb) },
-  { "LastPage",        GQ_ICON_NEXT_PAGE,              N_("_Last Page"),               nullptr,        N_("Last Page of multi-page image"),    CB(layout_menu_page_last_cb) },
-  { "NextPage",        GQ_ICON_FORWARD_PAGE,   N_("_Next Page"),               nullptr,        N_("Next Page of multi-page image"),    CB(layout_menu_page_next_cb) },
-  { "PrevPage",        GQ_ICON_BACK_PAGE,              N_("_Previous Page"),   nullptr,        N_("Previous Page of multi-page image"),        CB(layout_menu_page_previous_cb) },
-
-
-  { "NextImageAlt2",   GQ_ICON_GO_DOWN,        N_("_Next Image"),                      "KP_Page_Down",         N_("Next Image"),               CB(layout_menu_image_next_cb) },
-  { "LastImage",       GQ_ICON_GO_BOTTOM,      N_("_Last Image"),                      "End",                  N_("Last Image"),                       CB(layout_menu_image_last_cb) },
-  { "Back",            GQ_ICON_GO_PREV,        N_("_Back"),                    nullptr,        N_("Back in folder history"),           CB(layout_menu_back_cb) },
-  { "Forward", GQ_ICON_GO_NEXT,        N_("_Forward"),         nullptr,        N_("Forward in folder history"),        CB(layout_menu_forward_cb) },
-  { "Home",            GQ_ICON_HOME,           N_("_Home"),                    nullptr,        N_("Home"),                             CB(layout_menu_home_cb) },
-  { "Up",              GQ_ICON_GO_UP,  N_("_Up"),                              nullptr,        N_("Up one folder"),                            CB(layout_menu_up_cb) },
-  { "NewWindow",       nullptr,                N_("New window"),                       nullptr,                N_("New window"),       CB(layout_menu_window_cb) },
-  { "NewWindowDefault",        nullptr,        N_("default"),                  "<control>N",           N_("New window (default)"),     CB(layout_menu_window_default_cb)  },
-  { "NewWindowFromCurrent",    nullptr,        N_("from current"),                     nullptr,                N_("from current"),     CB(layout_menu_window_from_current_cb)  },
-  { "RenameWindow",    GQ_ICON_EDIT,           N_("Rename window"),    nullptr,        N_("Rename window"),    CB(layout_menu_window_rename_cb) },
-  { "DeleteWindow",    GQ_ICON_DELETE,         N_("Delete window"),    nullptr,        N_("Delete window"),    CB(layout_menu_window_delete_cb) },
-  { "NewCollection",   GQ_ICON_COLLECTION,     N_("_New collection"),                  "C",                    N_("New collection"),                   CB(layout_menu_new_cb) },
-  { "OpenCollection",  GQ_ICON_OPEN,           N_("_Open collection..."),              "O",                    N_("Open collection..."),               nullptr },
-  { "OpenRecent",      nullptr,                        N_("Open recen_t"),                     nullptr,                        N_("Open recent collection"),                   nullptr },
-  { "Search",          GQ_ICON_FIND,           N_("_Search..."),                       "F3",                   N_("Search..."),                        CB(layout_menu_search_cb) },
-  { "FindDupes",       GQ_ICON_FIND,           N_("_Find duplicates..."),              "D",                    N_("Find duplicates..."),               CB(layout_menu_dupes_cb) },
-  { "PanView", PIXBUF_INLINE_ICON_PANORAMA,    N_("Pa_n view"),                        "<control>J",           N_("Pan view"),                         CB(layout_menu_pan_cb) },
-  { "Print",           GQ_ICON_PRINT,  N_("_Print..."),                        "<shift>P",             N_("Print..."),                         CB(layout_menu_print_cb) },
-  { "NewFolder",       GQ_ICON_DIRECTORY,      N_("N_ew folder..."),                   "<control>F",           N_("New folder..."),                    CB(layout_menu_dir_cb) },
-  { "EnableGrouping",  nullptr,                        N_("Enable file _grouping"),            nullptr,                        N_("Enable file grouping"),             CB(layout_menu_enable_grouping_cb) },
-  { "DisableGrouping", nullptr,                        N_("Disable file groupi_ng"),           nullptr,                        N_("Disable file grouping"),            CB(layout_menu_disable_grouping_cb) },
-  { "CopyPath",                nullptr,                        N_("_Copy path to clipboard"),          nullptr,                        N_("Copy path to clipboard"),           CB(layout_menu_copy_path_cb) },
-  { "CopyPathUnquoted",                nullptr,                        N_("_Copy path unquoted to clipboard"),         nullptr,                        N_("Copy path unquoted to clipboard"),          CB(layout_menu_copy_path_unquoted_cb) },
-  { "Rating0",         nullptr,                        N_("_Rating 0"),        "<alt>KP_0",    N_("Rating 0"),                 CB(layout_menu_rating_0_cb) },
-  { "Rating1",         nullptr,                        N_("_Rating 1"),        "<alt>KP_1",    N_("Rating 1"),                 CB(layout_menu_rating_1_cb) },
-  { "Rating2",         nullptr,                        N_("_Rating 2"),        "<alt>KP_2",    N_("Rating 2"),                 CB(layout_menu_rating_2_cb) },
-  { "Rating3",         nullptr,                        N_("_Rating 3"),        "<alt>KP_3",    N_("Rating 3"),                 CB(layout_menu_rating_3_cb) },
-  { "Rating4",         nullptr,                        N_("_Rating 4"),        "<alt>KP_4",    N_("Rating 4"),                 CB(layout_menu_rating_4_cb) },
-  { "Rating5",         nullptr,                        N_("_Rating 5"),        "<alt>KP_5",    N_("Rating 5"),                 CB(layout_menu_rating_5_cb) },
-  { "RatingM1",                nullptr,                        N_("_Rating -1"),       "<alt>KP_Subtract",     N_("Rating -1"),        CB(layout_menu_rating_m1_cb) },
-  { "RotateCW",                GQ_ICON_ROTATE_RIGHT,                   N_("_Rotate clockwise 90°"),           "bracketright",         N_("Image Rotate clockwise 90°"),                      CB(layout_menu_alter_90_cb) },
-  { "RotateCCW",       GQ_ICON_ROTATE_LEFT,    N_("Rotate _counterclockwise 90°"),            "bracketleft",          N_("Rotate counterclockwise 90°"),             CB(layout_menu_alter_90cc_cb) },
-  { "Rotate180",       PIXBUF_INLINE_ICON_180, N_("Rotate 1_80°"),    "<shift>R",             N_("Image Rotate 180°"),                       CB(layout_menu_alter_180_cb) },
-  { "Mirror",          GQ_ICON_FLIP_HORIZONTAL,        N_("_Mirror"),  "<shift>M",             N_("Image Mirror"),                             CB(layout_menu_alter_mirror_cb) },
-  { "Flip",            GQ_ICON_FLIP_VERTICAL,          N_("_Flip"),    "<shift>F",             N_("Image Flip"),                               CB(layout_menu_alter_flip_cb) },
-  { "AlterNone",       PIXBUF_INLINE_ICON_ORIGINAL,    N_("_Original state"),  "<shift>O",             N_("Image rotate Original state"),                      CB(layout_menu_alter_none_cb) },
-  { "Preferences",     GQ_ICON_PREFERENCES,    N_("P_references..."),                  "<control>O",           N_("Preferences..."),                   CB(layout_menu_config_cb) },
-  { "Plugins",         GQ_ICON_PREFERENCES,    N_("Configure _Plugins..."),            nullptr,                        N_("Configure Plugins..."),             CB(layout_menu_editors_cb) },
-  { "LayoutConfig",    GQ_ICON_PREFERENCES,    N_("_Configure this window..."),        nullptr,                        N_("Configure this window..."),         CB(layout_menu_layout_config_cb) },
-  { "Maintenance",     PIXBUF_INLINE_ICON_MAINTENANCE, N_("_Cache maintenance..."),    nullptr,                        N_("Cache maintenance..."),             CB(layout_menu_remove_thumb_cb) },
-  { "Wallpaper",       nullptr,                        N_("Set as _wallpaper"),                nullptr,                        N_("Set as wallpaper"),                 CB(layout_menu_wallpaper_cb) },
-  { "SaveMetadata",    GQ_ICON_SAVE,           N_("_Save metadata"),                   "<control>S",           N_("Save metadata"),                    CB(layout_menu_metadata_write_cb) },
-  { "KeywordAutocomplete",     nullptr,        N_("Keyword autocomplete"),             "<alt>K",               N_("Keyword Autocomplete"),                     CB(layout_menu_keyword_autocomplete_cb) },
-  { "ZoomInAlt1",      GQ_ICON_ZOOM_IN,        N_("Zoom _in"),                         "KP_Add",               N_("Zoom in"),                          CB(layout_menu_zoom_in_cb) },
-  { "ZoomIn",          GQ_ICON_ZOOM_IN,        N_("Zoom _in"),                         "equal",                N_("Zoom in"),                          CB(layout_menu_zoom_in_cb) },
-  { "ZoomOut",         GQ_ICON_ZOOM_OUT,       N_("Zoom _out"),                        "minus",                N_("Zoom out"),                         CB(layout_menu_zoom_out_cb) },
-  { "ZoomOutAlt1",     GQ_ICON_ZOOM_OUT,       N_("Zoom _out"),                        "KP_Subtract",          N_("Zoom out"),                         CB(layout_menu_zoom_out_cb) },
-  { "Zoom100",         GQ_ICON_ZOOM_100,       N_("Zoom _1:1"),                        "Z",                    N_("Zoom 1:1"),                         CB(layout_menu_zoom_1_1_cb) },
-  { "Zoom100Alt1",     GQ_ICON_ZOOM_100,       N_("Zoom _1:1"),                        "KP_Divide",            N_("Zoom 1:1"),                         CB(layout_menu_zoom_1_1_cb) },
-  { "ZoomFitAlt1",     GQ_ICON_ZOOM_FIT,       N_("_Zoom to fit"),                     "KP_Multiply",          N_("Zoom to fit"),                      CB(layout_menu_zoom_fit_cb) },
-  { "ZoomFit",         GQ_ICON_ZOOM_FIT,       N_("_Zoom to fit"),                     "X",                    N_("Zoom to fit"),                      CB(layout_menu_zoom_fit_cb) },
-  { "ZoomFillHor",     PIXBUF_INLINE_ICON_ZOOMFILLHOR, N_("Fit _Horizontally"),                "H",                    N_("Fit Horizontally"),                 CB(layout_menu_zoom_fit_hor_cb) },
-  { "ZoomFillVert",    PIXBUF_INLINE_ICON_ZOOMFILLVERT,        N_("Fit _Vertically"),                  "W",                    N_("Fit Vertically"),                   CB(layout_menu_zoom_fit_vert_cb) },
-  { "Zoom200",         GQ_ICON_GENERIC,                        N_("Zoom _2:1"),                        nullptr,                        N_("Zoom 2:1"),                         CB(layout_menu_zoom_2_1_cb) },
-  { "Zoom300",         GQ_ICON_GENERIC,                        N_("Zoom _3:1"),                        nullptr,                        N_("Zoom 3:1"),                         CB(layout_menu_zoom_3_1_cb) },
-  { "Zoom400",         GQ_ICON_GENERIC,                        N_("Zoom _4:1"),                        nullptr,                        N_("Zoom 4:1"),                         CB(layout_menu_zoom_4_1_cb) },
-  { "Zoom50",          GQ_ICON_GENERIC,                        N_("Zoom 1:2"),                         nullptr,                        N_("Zoom 1:2"),                         CB(layout_menu_zoom_1_2_cb) },
-  { "Zoom33",          GQ_ICON_GENERIC,                        N_("Zoom 1:3"),                         nullptr,                        N_("Zoom 1:3"),                         CB(layout_menu_zoom_1_3_cb) },
-  { "Zoom25",          GQ_ICON_GENERIC,                        N_("Zoom 1:4"),                         nullptr,                        N_("Zoom 1:4"),                         CB(layout_menu_zoom_1_4_cb) },
-  { "ConnectZoomIn",   GQ_ICON_ZOOM_IN,        N_("Zoom _in"),                         "plus",                 N_("Connected Zoom in"),                CB(layout_menu_connect_zoom_in_cb) },
-  { "ConnectZoomInAlt1",GQ_ICON_ZOOM_IN,       N_("Zoom _in"),                         "<shift>KP_Add",        N_("Connected Zoom in"),                CB(layout_menu_connect_zoom_in_cb) },
-  { "ConnectZoomOut",  GQ_ICON_ZOOM_OUT,       N_("Zoom _out"),                        "underscore",           N_("Connected Zoom out"),               CB(layout_menu_connect_zoom_out_cb) },
-  { "ConnectZoomOutAlt1",GQ_ICON_ZOOM_OUT,     N_("Zoom _out"),                        "<shift>KP_Subtract",   N_("Connected Zoom out"),               CB(layout_menu_connect_zoom_out_cb) },
-  { "ConnectZoom100",  GQ_ICON_ZOOM_100,       N_("Zoom _1:1"),                        "<shift>Z",             N_("Connected Zoom 1:1"),               CB(layout_menu_connect_zoom_1_1_cb) },
-  { "ConnectZoom100Alt1",GQ_ICON_ZOOM_100,     N_("Zoom _1:1"),                        "<shift>KP_Divide",     N_("Connected Zoom 1:1"),               CB(layout_menu_connect_zoom_1_1_cb) },
-  { "ConnectZoomFit",  GQ_ICON_ZOOM_FIT,       N_("_Zoom to fit"),                     "<shift>X",             N_("Connected Zoom to fit"),            CB(layout_menu_connect_zoom_fit_cb) },
-  { "ConnectZoomFitAlt1",GQ_ICON_ZOOM_FIT,     N_("_Zoom to fit"),                     "<shift>KP_Multiply",   N_("Connected Zoom to fit"),            CB(layout_menu_connect_zoom_fit_cb) },
-  { "ConnectZoomFillHor",nullptr,                      N_("Fit _Horizontally"),                "<shift>H",             N_("Connected Fit Horizontally"),       CB(layout_menu_connect_zoom_fit_hor_cb) },
-  { "ConnectZoomFillVert",nullptr,                     N_("Fit _Vertically"),                  "<shift>W",             N_("Connected Fit Vertically"),         CB(layout_menu_connect_zoom_fit_vert_cb) },
-  { "ConnectZoom200",  nullptr,                        N_("Zoom _2:1"),                        nullptr,                        N_("Connected Zoom 2:1"),               CB(layout_menu_connect_zoom_2_1_cb) },
-  { "ConnectZoom300",  nullptr,                        N_("Zoom _3:1"),                        nullptr,                        N_("Connected Zoom 3:1"),               CB(layout_menu_connect_zoom_3_1_cb) },
-  { "ConnectZoom400",  nullptr,                        N_("Zoom _4:1"),                        nullptr,                        N_("Connected Zoom 4:1"),               CB(layout_menu_connect_zoom_4_1_cb) },
-  { "ConnectZoom50",   nullptr,                        N_("Zoom 1:2"),                         nullptr,                        N_("Connected Zoom 1:2"),               CB(layout_menu_connect_zoom_1_2_cb) },
-  { "ConnectZoom33",   nullptr,                        N_("Zoom 1:3"),                         nullptr,                        N_("Connected Zoom 1:3"),               CB(layout_menu_connect_zoom_1_3_cb) },
-  { "ConnectZoom25",   nullptr,                        N_("Zoom 1:4"),                         nullptr,                        N_("Connected Zoom 1:4"),               CB(layout_menu_connect_zoom_1_4_cb) },
-  { "ViewInNewWindow", nullptr,                        N_("_View in new window"),              "<control>V",           N_("View in new window"),               CB(layout_menu_view_in_new_window_cb) },
-  { "OpenArchive",     GQ_ICON_OPEN,                   N_("Open archive"),             nullptr,                N_("Open archive"),             CB(layout_menu_open_archive_cb) },
-  { "FullScreen",      GQ_ICON_FULLSCREEN,     N_("F_ull screen"),                     "F",                    N_("Full screen"),                      CB(layout_menu_fullscreen_cb) },
-  { "FullScreenAlt1",  GQ_ICON_FULLSCREEN,     N_("F_ull screen"),                     "V",                    N_("Full screen"),                      CB(layout_menu_fullscreen_cb) },
-  { "FullScreenAlt2",  GQ_ICON_FULLSCREEN,     N_("F_ull screen"),                     "F11",                  N_("Full screen"),                      CB(layout_menu_fullscreen_cb) },
-  { "Escape",          GQ_ICON_LEAVE_FULLSCREEN,N_("_Leave full screen"),              "Escape",               N_("Leave full screen"),                CB(layout_menu_escape_cb) },
-  { "EscapeAlt1",      GQ_ICON_LEAVE_FULLSCREEN,N_("_Leave full screen"),              "Q",                    N_("Leave full screen"),                CB(layout_menu_escape_cb) },
-  { "ImageOverlayCycle",nullptr,                       N_("_Cycle through overlay modes"),     "I",                    N_("Cycle through Overlay modes"),      CB(layout_menu_overlay_toggle_cb) },
-  { "HistogramChanCycle",nullptr,                      N_("Cycle through histogram ch_annels"),"K",                    N_("Cycle through histogram channels"), CB(layout_menu_histogram_toggle_channel_cb) },
-  { "HistogramModeCycle",nullptr,                      N_("Cycle through histogram mo_des"),   "J",                    N_("Cycle through histogram modes"),    CB(layout_menu_histogram_toggle_mode_cb) },
-  { "HideTools",       PIXBUF_INLINE_ICON_HIDETOOLS,   N_("_Hide file list"),                  "<control>H",           N_("Hide file list"),                   CB(layout_menu_hide_cb) },
-  { "SlideShowPause",  GQ_ICON_PAUSE,  N_("_Pause slideshow"),                 "P",                    N_("Pause slideshow"),                  CB(layout_menu_slideshow_pause_cb) },
-  { "SlideShowFaster", GQ_ICON_GENERIC,        N_("Faster"),           "<control>equal",                       N_("Slideshow Faster"),                         CB(layout_menu_slideshow_faster_cb) },
-  { "SlideShowSlower", GQ_ICON_GENERIC,        N_("Slower"),           "<control>minus",                       N_("Slideshow Slower"),                         CB(layout_menu_slideshow_slower_cb) },
-  { "Refresh",         GQ_ICON_REFRESH,        N_("_Refresh"),                         "R",                    N_("Refresh"),                          CB(layout_menu_refresh_cb) },
-  { "HelpContents",    GQ_ICON_HELP,           N_("_Help manual"),                     "F1",                   N_("Help manual"),                              CB(layout_menu_help_cb) },
-  { "HelpSearch",      nullptr,                N_("On-line help search"),                      nullptr,                        N_("On-line help search"),                              CB(layout_menu_help_search_cb) },
-  { "HelpShortcuts",   nullptr,                        N_("_Keyboard shortcuts"),              nullptr,                        N_("Keyboard shortcuts"),               CB(layout_menu_help_keys_cb) },
-  { "HelpKbd",         nullptr,                        N_("_Keyboard map"),                    nullptr,                        N_("Keyboard map"),                     CB(layout_menu_kbd_map_cb) },
-  { "HelpNotes",       nullptr,                        N_("_Readme"),                  nullptr,                        N_("Readme"),                   CB(layout_menu_notes_cb) },
-  { "HelpChangeLog",   nullptr,                        N_("_ChangeLog"),                       nullptr,                        N_("ChangeLog notes"),                  CB(layout_menu_changelog_cb) },
-  { "SearchAndRunCommand",     GQ_ICON_FIND,           N_("Search and Run command"),   "slash",        N_("Search commands by keyword and run them"),  CB(layout_menu_search_and_run_cb) },
-  { "About",           GQ_ICON_ABOUT,  N_("_About"),                           nullptr,                        N_("About"),                            CB(layout_menu_about_cb) },
-  { "LogWindow",       nullptr,                        N_("_Log Window"),                      nullptr,                        N_("Log Window"),                       CB(layout_menu_log_window_cb) },
-  { "ExifWin",         PIXBUF_INLINE_ICON_EXIF,        N_("_Exif window"),                     "<control>E",           N_("Exif window"),                      CB(layout_menu_bar_exif_cb) },
-  { "StereoCycle",     nullptr,                        N_("_Cycle through stereo modes"),      nullptr,                        N_("Cycle through stereo modes"),       CB(layout_menu_stereo_mode_next_cb) },
-  { "SplitNextPane",   nullptr,                        N_("_Next Pane"),       "<alt>Right",                   N_("Next Split Pane"),  CB(layout_menu_split_pane_next_cb) },
-  { "SplitPreviousPane",       nullptr,                        N_("_Previous Pane"),   "<alt>Left",                    N_("Previous Split Pane"),      CB(layout_menu_split_pane_prev_cb) },
-  { "SplitUpPane",     nullptr,                        N_("_Up Pane"), "<alt>Up",                      N_("Up Split Pane"),    CB(layout_menu_split_pane_updown_cb) },
-  { "SplitDownPane",   nullptr,                        N_("_Down Pane"),       "<alt>Down",                    N_("Down Split Pane"),  CB(layout_menu_split_pane_updown_cb) },
-  { "WriteRotation",   nullptr,                        N_("_Write orientation to file"),               nullptr,                N_("Write orientation to file"),                        CB(layout_menu_write_rotate_cb) },
-  { "WriteRotationKeepDate",   nullptr,                        N_("_Write orientation to file (preserve timestamp)"),                  nullptr,                N_("Write orientation to file (preserve timestamp)"),                   CB(layout_menu_write_rotate_keep_date_cb) },
-  { "ClearMarks",      nullptr,                N_("Clear Marks..."),                   nullptr,                N_("Clear Marks"),                      CB(layout_menu_clear_marks_cb) },
+  { "About",                 GQ_ICON_ABOUT,                     N_("_About"),                                           nullptr,               N_("About"),                                           CB(layout_menu_about_cb) },
+  { "AlterNone",             PIXBUF_INLINE_ICON_ORIGINAL,       N_("_Original state"),                                  "<shift>O",            N_("Image rotate Original state"),                     CB(layout_menu_alter_none_cb) },
+  { "Back",                  GQ_ICON_GO_PREV,                   N_("_Back"),                                            nullptr,               N_("Back in folder history"),                          CB(layout_menu_back_cb) },
+  { "ClearMarks",            nullptr,                           N_("Clear Marks..."),                                   nullptr,               N_("Clear Marks"),                                     CB(layout_menu_clear_marks_cb) },
+  { "CloseWindow",           GQ_ICON_CLOSE,                     N_("C_lose window"),                                    "<control>W",          N_("Close window"),                                    CB(layout_menu_close_cb) },
+  { "ColorMenu",             nullptr,                           N_("_Color Management"),                                nullptr,               nullptr,                                               nullptr },
+  { "ConnectZoom100Alt1",    GQ_ICON_ZOOM_100,                  N_("Zoom _1:1"),                                        "<shift>KP_Divide",    N_("Connected Zoom 1:1"),                              CB(layout_menu_connect_zoom_1_1_cb) },                 
+  { "ConnectZoom100",        GQ_ICON_ZOOM_100,                  N_("Zoom _1:1"),                                        "<shift>Z",            N_("Connected Zoom 1:1"),                              CB(layout_menu_connect_zoom_1_1_cb) },
+  { "ConnectZoom200",        nullptr,                           N_("Zoom _2:1"),                                        nullptr,               N_("Connected Zoom 2:1"),                              CB(layout_menu_connect_zoom_2_1_cb) },
+  { "ConnectZoom25",         nullptr,                           N_("Zoom 1:4"),                                         nullptr,               N_("Connected Zoom 1:4"),                              CB(layout_menu_connect_zoom_1_4_cb) },
+  { "ConnectZoom300",        nullptr,                           N_("Zoom _3:1"),                                        nullptr,               N_("Connected Zoom 3:1"),                              CB(layout_menu_connect_zoom_3_1_cb) },
+  { "ConnectZoom33",         nullptr,                           N_("Zoom 1:3"),                                         nullptr,               N_("Connected Zoom 1:3"),                              CB(layout_menu_connect_zoom_1_3_cb) },
+  { "ConnectZoom400",        nullptr,                           N_("Zoom _4:1"),                                        nullptr,               N_("Connected Zoom 4:1"),                              CB(layout_menu_connect_zoom_4_1_cb) },
+  { "ConnectZoom50",         nullptr,                           N_("Zoom 1:2"),                                         nullptr,               N_("Connected Zoom 1:2"),                              CB(layout_menu_connect_zoom_1_2_cb) },
+  { "ConnectZoomFillHor",    nullptr,                           N_("Fit _Horizontally"),                                "<shift>H",            N_("Connected Fit Horizontally"),                      CB(layout_menu_connect_zoom_fit_hor_cb) },             
+  { "ConnectZoomFillVert",   nullptr,                           N_("Fit _Vertically"),                                  "<shift>W",            N_("Connected Fit Vertically"),                        CB(layout_menu_connect_zoom_fit_vert_cb) },            
+  { "ConnectZoomFitAlt1",    GQ_ICON_ZOOM_FIT,                  N_("_Zoom to fit"),                                     "<shift>KP_Multiply",  N_("Connected Zoom to fit"),                           CB(layout_menu_connect_zoom_fit_cb) },                 
+  { "ConnectZoomFit",        GQ_ICON_ZOOM_FIT,                  N_("_Zoom to fit"),                                     "<shift>X",            N_("Connected Zoom to fit"),                           CB(layout_menu_connect_zoom_fit_cb) },
+  { "ConnectZoomInAlt1",     GQ_ICON_ZOOM_IN,                   N_("Zoom _in"),                                         "<shift>KP_Add",       N_("Connected Zoom in"),                               CB(layout_menu_connect_zoom_in_cb) },                  
+  { "ConnectZoomIn",         GQ_ICON_ZOOM_IN,                   N_("Zoom _in"),                                         "plus",                N_("Connected Zoom in"),                               CB(layout_menu_connect_zoom_in_cb) },
+  { "ConnectZoomMenu",       nullptr,                           N_("_Connected Zoom"),                                  nullptr,               nullptr,                                               nullptr },
+  { "ConnectZoomOutAlt1",    GQ_ICON_ZOOM_OUT,                  N_("Zoom _out"),                                        "<shift>KP_Subtract",  N_("Connected Zoom out"),                              CB(layout_menu_connect_zoom_out_cb) },                 
+  { "ConnectZoomOut",        GQ_ICON_ZOOM_OUT,                  N_("Zoom _out"),                                        "underscore",          N_("Connected Zoom out"),                              CB(layout_menu_connect_zoom_out_cb) },
+  { "Copy",                  GQ_ICON_COPY,                      N_("_Copy..."),                                         "<control>C",          N_("Copy..."),                                         CB(layout_menu_copy_cb) },
+  { "CopyPath",              nullptr,                           N_("_Copy path to clipboard"),                          nullptr,               N_("Copy path to clipboard"),                          CB(layout_menu_copy_path_cb) },
+  { "CopyPathUnquoted",      nullptr,                           N_("_Copy path unquoted to clipboard"),                 nullptr,               N_("Copy path unquoted to clipboard"),                 CB(layout_menu_copy_path_unquoted_cb) },
+  { "DeleteAlt1",            GQ_ICON_USER_TRASH,                N_("Move to Trash..."),                                 "Delete",              N_("Move to Trash..."),                                CB(layout_menu_move_to_trash_key_cb) },                
+  { "DeleteAlt2",            GQ_ICON_USER_TRASH,                N_("Move to Trash..."),                                 "KP_Delete",           N_("Move to Trash..."),                                CB(layout_menu_move_to_trash_key_cb) },                
+  { "Delete",                GQ_ICON_USER_TRASH,                N_("Move to Trash..."),                                 "<control>D",          N_("Move to Trash..."),                                CB(layout_menu_move_to_trash_cb) },
+  { "DeleteWindow",          GQ_ICON_DELETE,                    N_("Delete window"),                                    nullptr,               N_("Delete window"),                                   CB(layout_menu_window_delete_cb) },
+  { "DisableGrouping",       nullptr,                           N_("Disable file groupi_ng"),                           nullptr,               N_("Disable file grouping"),                           CB(layout_menu_disable_grouping_cb) },
+  { "EditMenu",              nullptr,                           N_("_Edit"),                                            nullptr,               nullptr,                                               nullptr },
+  { "EnableGrouping",        nullptr,                           N_("Enable file _grouping"),                            nullptr,               N_("Enable file grouping"),                            CB(layout_menu_enable_grouping_cb) },
+  { "EscapeAlt1",            GQ_ICON_LEAVE_FULLSCREEN,          N_("_Leave full screen"),                               "Q",                   N_("Leave full screen"),                               CB(layout_menu_escape_cb) },                           
+  { "Escape",                GQ_ICON_LEAVE_FULLSCREEN,          N_("_Leave full screen"),                              "Escape",               N_("Leave full screen"),                               CB(layout_menu_escape_cb) },                           
+  { "ExifWin",               PIXBUF_INLINE_ICON_EXIF,           N_("_Exif window"),                                     "<control>E",          N_("Exif window"),                                     CB(layout_menu_bar_exif_cb) },
+  { "FileDirMenu",           nullptr,                           N_("_Files and Folders"),                               nullptr,               nullptr,                                               nullptr },
+  { "FileMenu",              nullptr,                           N_("_File"),                                            nullptr,               nullptr,                                               nullptr },
+  { "FindDupes",             GQ_ICON_FIND,                      N_("_Find duplicates..."),                              "D",                   N_("Find duplicates..."),                              CB(layout_menu_dupes_cb) },
+  { "FirstImage",            GQ_ICON_GO_TOP,                    N_("_First Image"),                                     "Home",                N_("First Image"),                                     CB(layout_menu_image_first_cb) },
+  { "FirstPage",             GQ_ICON_PREV_PAGE,                 N_("_First Page"),                                      nullptr,               N_( "First Page of multi-page image"),                 CB(layout_menu_page_first_cb) },                       
+  { "Flip",                  GQ_ICON_FLIP_VERTICAL,             N_("_Flip"),                                            "<shift>F",            N_("Image Flip"),                                      CB(layout_menu_alter_flip_cb) },
+  { "Forward",               GQ_ICON_GO_NEXT,                   N_("_Forward"),                                         nullptr,               N_("Forward in folder history"),                       CB(layout_menu_forward_cb) },
+  { "FullScreenAlt1",        GQ_ICON_FULLSCREEN,                N_("F_ull screen"),                                     "V",                   N_("Full screen"),                                     CB(layout_menu_fullscreen_cb) },
+  { "FullScreenAlt2",        GQ_ICON_FULLSCREEN,                N_("F_ull screen"),                                     "F11",                 N_("Full screen"),                                     CB(layout_menu_fullscreen_cb) },
+  { "FullScreen",            GQ_ICON_FULLSCREEN,                N_("F_ull screen"),                                     "F",                   N_("Full screen"),                                     CB(layout_menu_fullscreen_cb) },
+  { "GoMenu",                nullptr,                           N_("_Go"),                                              nullptr,               nullptr,                                               nullptr },
+  { "HelpChangeLog",         nullptr,                           N_("_ChangeLog"),                                       nullptr,               N_("ChangeLog notes"),                                 CB(layout_menu_changelog_cb) },
+  { "HelpContents",          GQ_ICON_HELP,                      N_("_Help manual"),                                     "F1",                  N_("Help manual"),                                     CB(layout_menu_help_cb) },
+  { "HelpKbd",               nullptr,                           N_("_Keyboard map"),                                    nullptr,               N_("Keyboard map"),                                    CB(layout_menu_kbd_map_cb) },
+  { "HelpMenu",              nullptr,                           N_("_Help"),                                            nullptr,               nullptr,                                               nullptr },
+  { "HelpNotes",             nullptr,                           N_("_Readme"),                                          nullptr,               N_("Readme"),                                          CB(layout_menu_notes_cb) },
+  { "HelpSearch",            nullptr,                           N_("On-line help search"),                              nullptr,               N_("On-line help search"),                             CB(layout_menu_help_search_cb) },
+  { "HelpShortcuts",         nullptr,                           N_("_Keyboard shortcuts"),                              nullptr,               N_("Keyboard shortcuts"),                              CB(layout_menu_help_keys_cb) },
+  { "HideTools",             PIXBUF_INLINE_ICON_HIDETOOLS,      N_("_Hide file list"),                                  "<control>H",          N_("Hide file list"),                                  CB(layout_menu_hide_cb) },
+  { "HistogramChanCycle",    nullptr,                           N_("Cycle through histogram ch_annels"),                "K",                   N_("Cycle through histogram channels"),                CB(layout_menu_histogram_toggle_channel_cb) },                                                         
+  { "HistogramModeCycle",    nullptr,                           N_("Cycle through histogram mo_des"),                   "J",                   N_("Cycle through histogram modes"),                   CB(layout_menu_histogram_toggle_mode_cb) },            
+  { "Home",                  GQ_ICON_HOME,                      N_("_Home"),                                            nullptr,               N_("Home"),                                            CB(layout_menu_home_cb) },
+  { "ImageBack",             GQ_ICON_GO_FIRST,                  N_("Image Back"),                                       nullptr,               N_("Back in image history"),                           CB(layout_menu_image_back_cb) },
+  { "ImageForward",          GQ_ICON_GO_LAST,                   N_("Image Forward"),                                    nullptr,               N_("Forward in image history"),                        CB(layout_menu_image_forward_cb) },
+  { "ImageOverlayCycle",     nullptr,                           N_("_Cycle through overlay modes"),                     "I",                   N_("Cycle through Overlay modes"),                     CB(layout_menu_overlay_toggle_cb) },                   
+  { "KeywordAutocomplete",   nullptr,                           N_("Keyword autocomplete"),                             "<alt>K",              N_("Keyword Autocomplete"),                            CB(layout_menu_keyword_autocomplete_cb) },
+  { "LastImage",             GQ_ICON_GO_BOTTOM,                 N_("_Last Image"),                                      "End",                 N_("Last Image"),                                      CB(layout_menu_image_last_cb) },
+  { "LastPage",              GQ_ICON_NEXT_PAGE,                 N_("_Last Page"),                                       nullptr,               N_("Last Page of multi-page image"),                   CB(layout_menu_page_last_cb) },
+  { "LayoutConfig",          GQ_ICON_PREFERENCES,               N_("_Configure this window..."),                        nullptr,               N_("Configure this window..."),                        CB(layout_menu_layout_config_cb) },
+  { "LogWindow",             nullptr,                           N_("_Log Window"),                                      nullptr,               N_("Log Window"),                                      CB(layout_menu_log_window_cb) },
+  { "Maintenance",           PIXBUF_INLINE_ICON_MAINTENANCE,    N_("_Cache maintenance..."),                            nullptr,               N_("Cache maintenance..."),                            CB(layout_menu_remove_thumb_cb) },
+  { "Mirror",                GQ_ICON_FLIP_HORIZONTAL,           N_("_Mirror"),                                          "<shift>M",            N_("Image Mirror"),                                    CB(layout_menu_alter_mirror_cb) },
+  { "Move",                  PIXBUF_INLINE_ICON_MOVE,           N_("_Move..."),                                         "<control>M",          N_("Move..."),                                         CB(layout_menu_move_cb) },
+  { "NewCollection",         GQ_ICON_COLLECTION,                N_("_New collection"),                                  "C",                   N_("New collection"),                                  CB(layout_menu_new_cb) },
+  { "NewFolder",             GQ_ICON_DIRECTORY,                 N_("N_ew folder..."),                                   "<control>F",          N_("New folder..."),                                   CB(layout_menu_dir_cb) },
+  { "NewWindowDefault",      nullptr,                           N_("default"),                                          "<control>N",          N_("New window (default)"),                            CB(layout_menu_window_default_cb)  },
+  { "NewWindowFromCurrent",  nullptr,                           N_("from current"),                                     nullptr,               N_("from current"),                                    CB(layout_menu_window_from_current_cb)  },
+  { "NewWindow",             nullptr,                           N_("New window"),                                       nullptr,               N_("New window"),                                      CB(layout_menu_window_cb) },
+  { "NextImageAlt1",         GQ_ICON_GO_DOWN,                   N_("_Next Image"),                                      "Page_Down",           N_("Next Image"),                                      CB(layout_menu_image_next_cb) },
+  { "NextImageAlt2",         GQ_ICON_GO_DOWN,                   N_("_Next Image"),                                      "KP_Page_Down",        N_("Next Image"),                                      CB(layout_menu_image_next_cb) },
+  { "NextImage",             GQ_ICON_GO_DOWN,                   N_("_Next Image"),                                      "space",               N_("Next Image"),                                      CB(layout_menu_image_next_cb) },
+  { "NextPage",              GQ_ICON_FORWARD_PAGE,              N_("_Next Page"),                                       nullptr,               N_("Next Page of multi-page image"),                   CB(layout_menu_page_next_cb) },
+  { "OpenArchive",           GQ_ICON_OPEN,                      N_("Open archive"),                                     nullptr,               N_("Open archive"),                                    CB(layout_menu_open_archive_cb) },
+  { "OpenCollection",        GQ_ICON_OPEN,                      N_("_Open collection..."),                              "O",                   N_("Open collection..."),                              nullptr },
+  { "OpenMenu",              nullptr,                           N_("☰"),                                                nullptr,               nullptr,                                               nullptr },
+  { "OpenRecent",            nullptr,                           N_("Open recen_t"),                                     nullptr,               N_("Open recent collection"),                          nullptr },
+  { "OpenWith",              GQ_ICON_OPEN_WITH,                 N_("Open With..."),                                     nullptr,               N_("Open With..."),                                    CB(layout_menu_open_with_cb) },
+  { "OrientationMenu",       nullptr,                           N_("_Orientation"),                                     nullptr,               nullptr,                                               nullptr },
+  { "OverlayMenu",           nullptr,                           N_("Image _Overlay"),                                   nullptr,               nullptr,                                               nullptr },
+  { "PanView",               PIXBUF_INLINE_ICON_PANORAMA,       N_("Pa_n view"),                                        "<control>J",          N_("Pan view"),                                        CB(layout_menu_pan_cb) },
+  { "PermanentDelete",       GQ_ICON_DELETE,                    N_("Delete..."),                                        "<shift>Delete",       N_("Delete..."),                                       CB(layout_menu_delete_cb) },                           
+  { "Plugins",               GQ_ICON_PREFERENCES,               N_("Configure _Plugins..."),                            nullptr,               N_("Configure Plugins..."),                            CB(layout_menu_editors_cb) },
+  { "PluginsMenu",           nullptr,                           N_("_Plugins"),                                         nullptr,               nullptr,                                               nullptr },
+  { "Preferences",           GQ_ICON_PREFERENCES,               N_("P_references..."),                                  "<control>O",          N_("Preferences..."),                                  CB(layout_menu_config_cb) },
+  { "PreferencesMenu",       nullptr,                           N_("P_references"),                                     nullptr,               nullptr,                                               nullptr },
+  { "PrevImageAlt1",         GQ_ICON_GO_UP,                     N_("_Previous Image"),                                  "Page_Up",             N_("Previous Image"),                                  CB(layout_menu_image_prev_cb) },
+  { "PrevImageAlt2",         GQ_ICON_GO_UP,                     N_("_Previous Image"),                                  "KP_Page_Up",          N_("Previous Image"),                                  CB(layout_menu_image_prev_cb) },
+  { "PrevImage",             GQ_ICON_GO_UP,                     N_("_Previous Image"),                                  "BackSpace",           N_("Previous Image"),                                  CB(layout_menu_image_prev_cb) },
+  { "PrevPage",              GQ_ICON_BACK_PAGE,                 N_("_Previous Page"),                                   nullptr,               N_("Previous Page of multi-page image"),               CB(layout_menu_page_previous_cb) },
+  { "Print",                 GQ_ICON_PRINT,                     N_("_Print..."),                                        "<shift>P",            N_("Print..."),                                        CB(layout_menu_print_cb) },
+  { "Quit",                  GQ_ICON_QUIT,                      N_("_Quit"),                                            "<control>Q",          N_("Quit"),                                            CB(layout_menu_exit_cb) },
+  { "Rating0",               nullptr,                           N_("_Rating 0"),                                        "<alt>KP_0",           N_("Rating 0"),                                        CB(layout_menu_rating_0_cb) },
+  { "Rating1",               nullptr,                           N_("_Rating 1"),                                        "<alt>KP_1",           N_("Rating 1"),                                        CB(layout_menu_rating_1_cb) },
+  { "Rating2",               nullptr,                           N_("_Rating 2"),                                        "<alt>KP_2",           N_("Rating 2"),                                        CB(layout_menu_rating_2_cb) },
+  { "Rating3",               nullptr,                           N_("_Rating 3"),                                        "<alt>KP_3",           N_("Rating 3"),                                        CB(layout_menu_rating_3_cb) },
+  { "Rating4",               nullptr,                           N_("_Rating 4"),                                        "<alt>KP_4",           N_("Rating 4"),                                        CB(layout_menu_rating_4_cb) },
+  { "Rating5",               nullptr,                           N_("_Rating 5"),                                        "<alt>KP_5",           N_("Rating 5"),                                        CB(layout_menu_rating_5_cb) },
+  { "RatingM1",              nullptr,                           N_("_Rating -1"),                                       "<alt>KP_Subtract",    N_("Rating -1"),                                       CB(layout_menu_rating_m1_cb) },
+  { "RatingMenu",            nullptr,                           N_("_Rating"),                                          nullptr,               nullptr,                                               nullptr },
+  { "Refresh",               GQ_ICON_REFRESH,                   N_("_Refresh"),                                         "R",                   N_("Refresh"),                                         CB(layout_menu_refresh_cb) },
+  { "Rename",                PIXBUF_INLINE_ICON_RENAME,         N_("_Rename..."),                                       "<control>R",          N_("Rename..."),                                       CB(layout_menu_rename_cb) },
+  { "RenameWindow",          GQ_ICON_EDIT,                      N_("Rename window"),                                    nullptr,               N_("Rename window"),                                   CB(layout_menu_window_rename_cb) },
+  { "Rotate180",             PIXBUF_INLINE_ICON_180,            N_("Rotate 1_80°"),                                     "<shift>R",            N_("Image Rotate 180°"),                               CB(layout_menu_alter_180_cb) },
+  { "RotateCCW",             GQ_ICON_ROTATE_LEFT,               N_("Rotate _counterclockwise 90°"),                     "bracketleft",         N_("Rotate counterclockwise 90°"),                     CB(layout_menu_alter_90cc_cb) },
+  { "RotateCW",              GQ_ICON_ROTATE_RIGHT,              N_("_Rotate clockwise 90°"),                            "bracketright",        N_("Image Rotate clockwise 90°"),                      CB(layout_menu_alter_90_cb) },
+  { "SaveMetadata",          GQ_ICON_SAVE,                      N_("_Save metadata"),                                   "<control>S",          N_("Save metadata"),                                   CB(layout_menu_metadata_write_cb) },
+  { "SearchAndRunCommand",   GQ_ICON_FIND,                      N_("Search and Run command"),                           "slash",               N_("Search commands by keyword and run them"),         CB(layout_menu_search_and_run_cb) },
+  { "Search",                GQ_ICON_FIND,                      N_("_Search..."),                                       "F3",                  N_("Search..."),                                       CB(layout_menu_search_cb) },
+  { "SelectAll",             PIXBUF_INLINE_ICON_SELECT_ALL,     N_("Select _all"),                                      "<control>A",          N_("Select all"),                                      CB(layout_menu_select_all_cb) },
+  { "SelectInvert",          PIXBUF_INLINE_ICON_SELECT_INVERT,  N_("_Invert Selection"),                                "<control><shift>I",   N_("Invert Selection"),                                CB(layout_menu_invert_selection_cb) },
+  { "SelectMenu",            nullptr,                           N_("_Select"),                                          nullptr,               nullptr,                                               nullptr },
+  { "SelectNone",            PIXBUF_INLINE_ICON_SELECT_NONE,    N_("Select _none"),                                     "<control><shift>A",   N_("Select none"),                                     CB(layout_menu_unselect_all_cb) },
+  { "SlideShowFaster",       GQ_ICON_GENERIC,                   N_("Faster"),                                           "<control>equal",      N_("Slideshow Faster"),                                CB(layout_menu_slideshow_faster_cb) },
+  { "SlideShowPause",        GQ_ICON_PAUSE,                     N_("_Pause slideshow"),                                 "P",                   N_("Pause slideshow"),                                 CB(layout_menu_slideshow_pause_cb) },
+  { "SlideShowSlower",       GQ_ICON_GENERIC,                   N_("Slower"),                                           "<control>minus",      N_("Slideshow Slower"),                                CB(layout_menu_slideshow_slower_cb) },
+  { "SplitDownPane",         nullptr,                           N_("_Down Pane"),                                       "<alt>Down",           N_("Down Split Pane"),                                 CB(layout_menu_split_pane_updown_cb) },
+  { "SplitMenu",             nullptr,                           N_("Spli_t"),                                           nullptr,               nullptr,                                               nullptr },
+  { "SplitNextPane",         nullptr,                           N_("_Next Pane"),                                       "<alt>Right",          N_("Next Split Pane"),                                 CB(layout_menu_split_pane_next_cb) },
+  { "SplitPreviousPane",     nullptr,                           N_("_Previous Pane"),                                   "<alt>Left",           N_("Previous Split Pane"),                             CB(layout_menu_split_pane_prev_cb) },
+  { "SplitUpPane",           nullptr,                           N_("_Up Pane"),                                         "<alt>Up",             N_("Up Split Pane"),                                   CB(layout_menu_split_pane_updown_cb) },
+  { "StereoCycle",           nullptr,                           N_("_Cycle through stereo modes"),                      nullptr,               N_("Cycle through stereo modes"),                      CB(layout_menu_stereo_mode_next_cb) },
+  { "StereoMenu",            nullptr,                           N_("Stere_o"),                                          nullptr,               nullptr,                                               nullptr },
+  { "Up",                    GQ_ICON_GO_UP,                     N_("_Up"),                                              nullptr,               N_("Up one folder"),                                   CB(layout_menu_up_cb) },
+  { "ViewInNewWindow",       nullptr,                           N_("_View in new window"),                              "<control>V",          N_("View in new window"),                              CB(layout_menu_view_in_new_window_cb) },
+  { "ViewMenu",              nullptr,                           N_("_View"),                                            nullptr,               nullptr,                                               CB(layout_menu_view_menu_cb)  },
+  { "Wallpaper",             nullptr,                           N_("Set as _wallpaper"),                                nullptr,               N_("Set as wallpaper"),                                CB(layout_menu_wallpaper_cb) },
+  { "WindowsMenu",           nullptr,                           N_("_Windows"),                                         nullptr,               nullptr,                                               CB(layout_menu_windows_menu_cb)  },
+  { "WriteRotationKeepDate", nullptr,                           N_("_Write orientation to file (preserve timestamp)"),  nullptr,               N_("Write orientation to file (preserve timestamp)"),  CB(layout_menu_write_rotate_keep_date_cb) },
+  { "WriteRotation",         nullptr,                           N_("_Write orientation to file"),                       nullptr,               N_("Write orientation to file"),                       CB(layout_menu_write_rotate_cb) },
+  { "Zoom100Alt1",           GQ_ICON_ZOOM_100,                  N_("Zoom _1:1"),                                        "KP_Divide",           N_("Zoom 1:1"),                                        CB(layout_menu_zoom_1_1_cb) },
+  { "Zoom100",               GQ_ICON_ZOOM_100,                  N_("Zoom _1:1"),                                        "Z",                   N_("Zoom 1:1"),                                        CB(layout_menu_zoom_1_1_cb) },
+  { "Zoom200",               GQ_ICON_GENERIC,                   N_("Zoom _2:1"),                                        nullptr,               N_("Zoom 2:1"),                                        CB(layout_menu_zoom_2_1_cb) },
+  { "Zoom25",                GQ_ICON_GENERIC,                   N_("Zoom 1:4"),                                         nullptr,               N_("Zoom 1:4"),                                        CB(layout_menu_zoom_1_4_cb) },
+  { "Zoom300",               GQ_ICON_GENERIC,                   N_("Zoom _3:1"),                                        nullptr,               N_("Zoom 3:1"),                                        CB(layout_menu_zoom_3_1_cb) },
+  { "Zoom33",                GQ_ICON_GENERIC,                   N_("Zoom 1:3"),                                         nullptr,               N_("Zoom 1:3"),                                        CB(layout_menu_zoom_1_3_cb) },
+  { "Zoom400",               GQ_ICON_GENERIC,                   N_("Zoom _4:1"),                                        nullptr,               N_("Zoom 4:1"),                                        CB(layout_menu_zoom_4_1_cb) },
+  { "Zoom50",                GQ_ICON_GENERIC,                   N_("Zoom 1:2"),                                         nullptr,               N_("Zoom 1:2"),                                        CB(layout_menu_zoom_1_2_cb) },
+  { "ZoomFillHor",           PIXBUF_INLINE_ICON_ZOOMFILLHOR,    N_("Fit _Horizontally"),                                "H",                   N_("Fit Horizontally"),                                CB(layout_menu_zoom_fit_hor_cb) },
+  { "ZoomFillVert",          PIXBUF_INLINE_ICON_ZOOMFILLVERT,   N_("Fit _Vertically"),                                  "W",                   N_("Fit Vertically"),                                  CB(layout_menu_zoom_fit_vert_cb) },
+  { "ZoomFitAlt1",           GQ_ICON_ZOOM_FIT,                  N_("_Zoom to fit"),                                     "KP_Multiply",         N_("Zoom to fit"),                                     CB(layout_menu_zoom_fit_cb) },
+  { "ZoomFit",               GQ_ICON_ZOOM_FIT,                  N_("_Zoom to fit"),                                     "X",                   N_("Zoom to fit"),                                     CB(layout_menu_zoom_fit_cb) },
+  { "ZoomInAlt1",            GQ_ICON_ZOOM_IN,                   N_("Zoom _in"),                                         "KP_Add",              N_("Zoom in"),                                         CB(layout_menu_zoom_in_cb) },
+  { "ZoomIn",                GQ_ICON_ZOOM_IN,                   N_("Zoom _in"),                                         "equal",               N_("Zoom in"),                                         CB(layout_menu_zoom_in_cb) },
+  { "ZoomMenu",              nullptr,                           N_("_Zoom"),                                            nullptr,               nullptr,                                               nullptr },
+  { "ZoomOutAlt1",           GQ_ICON_ZOOM_OUT,                  N_("Zoom _out"),                                        "KP_Subtract",         N_("Zoom out"),                                        CB(layout_menu_zoom_out_cb) },
+  { "ZoomOut",               GQ_ICON_ZOOM_OUT,                  N_("Zoom _out"),                                        "minus",               N_("Zoom out"),                                        CB(layout_menu_zoom_out_cb) }
 };
 
 static GtkToggleActionEntry menu_toggle_entries[] = {
-  { "Thumbnails",      PIXBUF_INLINE_ICON_THUMB,N_("Show _Thumbnails"),                "T",                    N_("Show Thumbnails"),                  CB(layout_menu_thumb_cb),        FALSE },
-  { "ShowMarks",        PIXBUF_INLINE_ICON_MARKS,      N_("Show _Marks"),                      "M",                    N_("Show Marks"),                       CB(layout_menu_marks_cb),        FALSE  },
-  { "ShowFileFilter", PIXBUF_INLINE_ICON_FILE_FILTER,  N_("Show File Filter"), nullptr,        N_("Show File Filter"), CB(layout_menu_file_filter_cb),  FALSE  },
-  { "ShowInfoPixel",   GQ_ICON_SELECT_COLOR,   N_("Pi_xel Info"),                      nullptr,                        N_("Show Pixel Info"),                  CB(layout_menu_info_pixel_cb),   FALSE  },
-  { "IgnoreAlpha", GQ_ICON_STRIKETHROUGH,           N_("Hide _alpha"),          "<shift>A",     N_("Hide alpha channel"),       CB(layout_menu_alter_ignore_alpha_cb), FALSE},
-  { "FloatTools",      PIXBUF_INLINE_ICON_FLOAT,N_("_Float file list"),                "L",                    N_("Float file list"),                  CB(layout_menu_float_cb),        FALSE  },
-  { "HideSelectableToolbars",  nullptr,                        N_("Hide Selectable Bars"),                     "<control>grave",                       N_("Hide Selectable Bars"),                     CB(layout_menu_selectable_toolbars_cb),  FALSE  },
-  { "SBar",    GQ_ICON_PROPERTIES,                     N_("_Info sidebar"),                    "<control>K",           N_("Info sidebar"),                     CB(layout_menu_bar_cb),          FALSE  },
-  { "SBarSort",        PIXBUF_INLINE_ICON_SORT,        N_("Sort _manager"),                    "<shift>S",             N_("Sort manager"),                     CB(layout_menu_bar_sort_cb),     FALSE  },
-  { "HideBars",                nullptr,                        N_("Hide Bars and Files"),                      "grave",                N_("Hide Bars and Files"),                      CB(layout_menu_hide_bars_cb),    FALSE  },
-  { "SlideShow",       GQ_ICON_PLAY,   N_("Toggle _slideshow"),                "S",                    N_("Toggle slideshow"),                 CB(layout_menu_slideshow_cb),    FALSE  },
-  { "UseColorProfiles",        GQ_ICON_COLOR_MANAGEMENT,       N_("Use _color profiles"),              nullptr,                        N_("Use color profiles"),               CB(layout_color_menu_enable_cb), FALSE},
-  { "UseImageProfile", nullptr,                        N_("Use profile from _image"),          nullptr,                        N_("Use profile from image"),           CB(layout_color_menu_use_image_cb), FALSE},
-  { "Grayscale",       PIXBUF_INLINE_ICON_GRAYSCALE,   N_("Toggle _grayscale"),        "<shift>G",             N_("Toggle grayscale"),         CB(layout_menu_alter_desaturate_cb), FALSE},
-  { "ImageOverlay",    nullptr,                        N_("Image _Overlay"),                   nullptr,                        N_("Image Overlay"),                    CB(layout_menu_overlay_cb),      FALSE },
-  { "ImageHistogram",  nullptr,                        N_("_Show Histogram"),                  nullptr,                        N_("Show Histogram"),                   CB(layout_menu_histogram_cb),    FALSE },
-  { "RectangularSelection",    PIXBUF_INLINE_ICON_SELECT_RECTANGLE,    N_("Rectangular Selection"),                    "<alt>R",                       N_("Rectangular Selection"),                    CB(layout_menu_rectangular_selection_cb),        FALSE },
-  { "Animate", nullptr,        N_("_Animation"),               "A",                    N_("Toggle animation"),                 CB(layout_menu_animate_cb),      FALSE  },
-  { "ExifRotate",      GQ_ICON_ROTATE_LEFT,    N_("_Exif rotate"),             "<alt>X",               N_("Toggle Exif rotate"),                       CB(layout_menu_exif_rotate_cb), FALSE },
-  { "DrawRectangle",   PIXBUF_INLINE_ICON_DRAW_RECTANGLE,                      N_("Draw Rectangle"),           nullptr,                N_("Draw Rectangle"),                   CB(layout_menu_select_rectangle_cb), FALSE },
-  { "OverUnderExposed",        PIXBUF_INLINE_ICON_EXPOSURE,    N_("Over/Under Exposed"),       "<shift>E",             N_("Highlight over/under exposed"),             CB(layout_menu_select_overunderexposed_cb), FALSE },
-  { "SplitPaneSync",   PIXBUF_INLINE_SPLIT_PANE_SYNC,                  N_("Split Pane Sync"),  nullptr,                N_("Split Pane Sync"),  CB(layout_menu_split_pane_sync_cb), FALSE },
+  { "Animate",                 nullptr,                              N_("_Animation"),               "A",               N_("Toggle animation"),              CB(layout_menu_animate_cb),                  FALSE  },
+  { "DrawRectangle",           PIXBUF_INLINE_ICON_DRAW_RECTANGLE,    N_("Draw Rectangle"),           nullptr,           N_("Draw Rectangle"),                CB(layout_menu_select_rectangle_cb),         FALSE  },
+  { "ExifRotate",              GQ_ICON_ROTATE_LEFT,                  N_("_Exif rotate"),             "<alt>X",          N_("Toggle Exif rotate"),            CB(layout_menu_exif_rotate_cb),              FALSE  },
+  { "FloatTools",              PIXBUF_INLINE_ICON_FLOAT,             N_("_Float file list"),         "L",               N_("Float file list"),               CB(layout_menu_float_cb),                    FALSE  },
+  { "Grayscale",               PIXBUF_INLINE_ICON_GRAYSCALE,         N_("Toggle _grayscale"),        "<shift>G",        N_("Toggle grayscale"),              CB(layout_menu_alter_desaturate_cb),         FALSE  },
+  { "HideBars",                nullptr,                              N_("Hide Bars and Files"),      "grave",           N_("Hide Bars and Files"),           CB(layout_menu_hide_bars_cb),                FALSE  },
+  { "HideSelectableToolbars",  nullptr,                              N_("Hide Selectable Bars"),     "<control>grave",  N_("Hide Selectable Bars"),          CB(layout_menu_selectable_toolbars_cb),      FALSE  },
+  { "IgnoreAlpha",             GQ_ICON_STRIKETHROUGH,                N_("Hide _alpha"),              "<shift>A",        N_("Hide alpha channel"),            CB(layout_menu_alter_ignore_alpha_cb),       FALSE  },
+  { "ImageHistogram",          nullptr,                              N_("_Show Histogram"),          nullptr,           N_("Show Histogram"),                CB(layout_menu_histogram_cb),                FALSE  },
+  { "ImageOverlay",            nullptr,                              N_("Image _Overlay"),           nullptr,           N_("Image Overlay"),                 CB(layout_menu_overlay_cb),                  FALSE  },
+  { "OverUnderExposed",        PIXBUF_INLINE_ICON_EXPOSURE,          N_("Over/Under Exposed"),       "<shift>E",        N_("Highlight over/under exposed"),  CB(layout_menu_select_overunderexposed_cb),  FALSE  },
+  { "RectangularSelection",    PIXBUF_INLINE_ICON_SELECT_RECTANGLE,  N_("Rectangular Selection"),    "<alt>R",          N_("Rectangular Selection"),         CB(layout_menu_rectangular_selection_cb),    FALSE  },
+  { "SBar",                    PIXBUF_INLINE_ICON_PROPERTIES,        N_("_Info sidebar"),            "<control>K",      N_("Info sidebar"),                  CB(layout_menu_bar_cb),                      FALSE  },
+  { "SBarSort",                PIXBUF_INLINE_ICON_SORT,              N_("Sort _manager"),            "<shift>S",        N_("Sort manager"),                  CB(layout_menu_bar_sort_cb),                 FALSE  },
+  { "ShowFileFilter",          GQ_ICON_FILE_FILTER,                  N_("Show File Filter"),         nullptr,           N_("Show File Filter"),              CB(layout_menu_file_filter_cb),              FALSE  },
+  { "ShowInfoPixel",           GQ_ICON_SELECT_COLOR,                 N_("Pi_xel Info"),              nullptr,           N_("Show Pixel Info"),               CB(layout_menu_info_pixel_cb),               FALSE  },
+  { "ShowMarks",               PIXBUF_INLINE_ICON_MARKS,             N_("Show _Marks"),              "M",               N_("Show Marks"),                    CB(layout_menu_marks_cb),                    FALSE  },
+  { "SlideShow",               GQ_ICON_PLAY,                         N_("Toggle _slideshow"),        "S",               N_("Toggle slideshow"),              CB(layout_menu_slideshow_cb),                FALSE  },
+  { "SplitPaneSync",           PIXBUF_INLINE_SPLIT_PANE_SYNC,        N_("Split Pane Sync"),          nullptr,           N_("Split Pane Sync"),               CB(layout_menu_split_pane_sync_cb),          FALSE  },
+  { "Thumbnails",              PIXBUF_INLINE_ICON_THUMB,             N_("Show _Thumbnails"),         "T",               N_("Show Thumbnails"),               CB(layout_menu_thumb_cb),                    FALSE  },
+  { "UseColorProfiles",        GQ_ICON_COLOR_MANAGEMENT,             N_("Use _color profiles"),      nullptr,           N_("Use color profiles"),            CB(layout_color_menu_enable_cb),             FALSE  },
+  { "UseImageProfile",         nullptr,                              N_("Use profile from _image"),  nullptr,           N_("Use profile from image"),        CB(layout_color_menu_use_image_cb),          FALSE  }
 };
 
 static GtkRadioActionEntry menu_radio_entries[] = {
-  { "ViewList",                nullptr,                        N_("Images as _List"),                  "<control>L",           N_("View Images as List"),              FILEVIEW_LIST },
-  { "ViewIcons",       nullptr,                        N_("Images as I_cons"),                 "<control>I",           N_("View Images as Icons"),             FILEVIEW_ICON }
+  { "ViewIcons",  nullptr,  N_("Images as I_cons"),  "<control>I",  N_("View Images as Icons"),  FILEVIEW_ICON },
+  { "ViewList",   nullptr,  N_("Images as _List"),   "<control>L",  N_("View Images as List"),   FILEVIEW_LIST }
 };
 
 static GtkToggleActionEntry menu_view_dir_toggle_entries[] = {
-  { "FolderTree",      nullptr,                        N_("T_oggle Folder View"),                      "<control>T",           N_("Toggle Folders View"),              CB(layout_menu_view_dir_as_cb),FALSE },
+  { "FolderTree",  nullptr,  N_("T_oggle Folder View"),  "<control>T",  N_("Toggle Folders View"),  CB(layout_menu_view_dir_as_cb),FALSE },
 };
 
 static GtkRadioActionEntry menu_split_radio_entries[] = {
-  { "SplitHorizontal", nullptr,                        N_("_Horizontal"),                      "E",                    N_("Split panes horizontal."),                  SPLIT_HOR },
-  { "SplitVertical",   nullptr,                        N_("_Vertical"),                        "U",                    N_("Split panes vertical"),                             SPLIT_VERT },
-  { "SplitTriple",     nullptr,                        N_("_Triple"),                          nullptr,                        N_("Split panes triple"),                               SPLIT_TRIPLE },
-  { "SplitQuad",       nullptr,                        N_("_Quad"),                            nullptr,                        N_("Split panes quad"),                         SPLIT_QUAD },
-  { "SplitSingle",     nullptr,                        N_("_Single"),                          "Y",                    N_("Single pane"),                              SPLIT_NONE }
+  { "SplitHorizontal",  nullptr,  N_("_Horizontal"),  "E",      N_("Split panes horizontal."),  SPLIT_HOR },
+  { "SplitQuad",        nullptr,  N_("_Quad"),        nullptr,  N_("Split panes quad"),         SPLIT_QUAD },
+  { "SplitSingle",      nullptr,  N_("_Single"),      "Y",      N_("Single pane"),              SPLIT_NONE },
+  { "SplitTriple",      nullptr,  N_("_Triple"),      nullptr,  N_("Split panes triple"),       SPLIT_TRIPLE },
+  { "SplitVertical",    nullptr,  N_("_Vertical"),    "U",      N_("Split panes vertical"),     SPLIT_VERT }
 };
 
 static GtkRadioActionEntry menu_color_radio_entries[] = {
-  { "ColorProfile0",   nullptr,                        N_("Input _0: sRGB"),                   nullptr,                        N_("Input 0: sRGB"),                    COLOR_PROFILE_SRGB },
-  { "ColorProfile1",   nullptr,                        N_("Input _1: AdobeRGB compatible"),    nullptr,                        N_("Input 1: AdobeRGB compatible"),     COLOR_PROFILE_ADOBERGB },
-  { "ColorProfile2",   nullptr,                        N_("Input _2"),                         nullptr,                        N_("Input 2"),                          COLOR_PROFILE_FILE },
-  { "ColorProfile3",   nullptr,                        N_("Input _3"),                         nullptr,                        N_("Input 3"),                          COLOR_PROFILE_FILE + 1 },
-  { "ColorProfile4",   nullptr,                        N_("Input _4"),                         nullptr,                        N_("Input 4"),                          COLOR_PROFILE_FILE + 2 },
-  { "ColorProfile5",   nullptr,                        N_("Input _5"),                         nullptr,                        N_("Input 5"),                          COLOR_PROFILE_FILE + 3 }
+  { "ColorProfile0",  nullptr,  N_("Input _0: sRGB"),                 nullptr,  N_("Input 0: sRGB"),                 COLOR_PROFILE_SRGB },
+  { "ColorProfile1",  nullptr,  N_("Input _1: AdobeRGB compatible"),  nullptr,  N_("Input 1: AdobeRGB compatible"),  COLOR_PROFILE_ADOBERGB },
+  { "ColorProfile2",  nullptr,  N_("Input _2"),                       nullptr,  N_("Input 2"),                       COLOR_PROFILE_FILE },
+  { "ColorProfile3",  nullptr,  N_("Input _3"),                       nullptr,  N_("Input 3"),                       COLOR_PROFILE_FILE + 1 },
+  { "ColorProfile4",  nullptr,  N_("Input _4"),                       nullptr,  N_("Input 4"),                       COLOR_PROFILE_FILE + 2 },
+  { "ColorProfile5",  nullptr,  N_("Input _5"),                       nullptr,  N_("Input 5"),                       COLOR_PROFILE_FILE + 3 }
 };
 
 static GtkRadioActionEntry menu_histogram_channel[] = {
-  { "HistogramChanR",  nullptr,                        N_("Histogram on _Red"),                nullptr,                        N_("Histogram on Red"),         HCHAN_R },
-  { "HistogramChanG",  nullptr,                        N_("Histogram on _Green"),              nullptr,                        N_("Histogram on Green"),       HCHAN_G },
-  { "HistogramChanB",  nullptr,                        N_("Histogram on _Blue"),               nullptr,                        N_("Histogram on Blue"),        HCHAN_B },
-  { "HistogramChanRGB",        nullptr,                        N_("_Histogram on RGB"),                        nullptr,                        N_("Histogram on RGB"),         HCHAN_RGB },
-  { "HistogramChanV",  nullptr,                        N_("Histogram on _Value"),              nullptr,                        N_("Histogram on Value"),       HCHAN_MAX }
+  { "HistogramChanB",    nullptr,  N_("Histogram on _Blue"),   nullptr,  N_("Histogram on Blue"),   HCHAN_B },
+  { "HistogramChanG",    nullptr,  N_("Histogram on _Green"),  nullptr,  N_("Histogram on Green"),  HCHAN_G },
+  { "HistogramChanRGB",  nullptr,  N_("_Histogram on RGB"),    nullptr,  N_("Histogram on RGB"),    HCHAN_RGB },
+  { "HistogramChanR",    nullptr,  N_("Histogram on _Red"),    nullptr,  N_("Histogram on Red"),    HCHAN_R },
+  { "HistogramChanV",    nullptr,  N_("Histogram on _Value"),  nullptr,  N_("Histogram on Value"),  HCHAN_MAX }
 };
 
 static GtkRadioActionEntry menu_histogram_mode[] = {
-  { "HistogramModeLin",        nullptr,                        N_("Li_near Histogram"),                nullptr,                        N_("Linear Histogram"),         0 },
-  { "HistogramModeLog",        nullptr,                        N_("_Log Histogram"),                   nullptr,                        N_("Log Histogram"),            1 },
+  { "HistogramModeLin",  nullptr,  N_("Li_near Histogram"),  nullptr,  N_("Linear Histogram"),  0 },
+  { "HistogramModeLog",  nullptr,  N_("_Log Histogram"),     nullptr,  N_("Log Histogram"),     1 },
 };
 
 static GtkRadioActionEntry menu_stereo_mode_entries[] = {
-  { "StereoAuto",      nullptr,                        N_("_Auto"),                            nullptr,                        N_("Stereo Auto"),              STEREO_PIXBUF_DEFAULT },
-  { "StereoSBS",       nullptr,                        N_("_Side by Side"),                    nullptr,                        N_("Stereo Side by Side"),      STEREO_PIXBUF_SBS },
-  { "StereoCross",     nullptr,                        N_("_Cross"),                           nullptr,                        N_("Stereo Cross"),             STEREO_PIXBUF_CROSS },
-  { "StereoOff",       nullptr,                        N_("_Off"),                             nullptr,                        N_("Stereo Off"),               STEREO_PIXBUF_NONE }
+  { "StereoAuto",   nullptr,  N_("_Auto"),          nullptr,  N_("Stereo Auto"),          STEREO_PIXBUF_DEFAULT },
+  { "StereoCross",  nullptr,  N_("_Cross"),         nullptr,  N_("Stereo Cross"),         STEREO_PIXBUF_CROSS },
+  { "StereoOff",    nullptr,  N_("_Off"),           nullptr,  N_("Stereo Off"),           STEREO_PIXBUF_NONE },
+  { "StereoSBS",    nullptr,  N_("_Side by Side"),  nullptr,  N_("Stereo Side by Side"),  STEREO_PIXBUF_SBS }
 };
-
-
 #undef CB
 
-static const gchar *menu_ui_description =
-"<ui>"
-"  <menubar name='MainMenu'>"
-"    <menu action='FileMenu'>"
-"      <menuitem action='NewCollection'/>"
-"      <menuitem action='OpenCollection'/>"
-"      <menuitem action='OpenRecent'/>"
-"      <placeholder name='OpenSection'/>"
-"      <separator/>"
-"      <menuitem action='Search'/>"
-"      <menuitem action='FindDupes'/>"
-"      <placeholder name='SearchSection'/>"
-"      <separator/>"
-"      <menuitem action='Print'/>"
-"      <placeholder name='PrintSection'/>"
-"      <separator/>"
-"      <menuitem action='NewFolder'/>"
-"      <menuitem action='Copy'/>"
-"      <menuitem action='Move'/>"
-"      <menuitem action='Rename'/>"
-"      <separator/>"
-"      <menuitem action='Delete'/>"
-"      <menuitem action='PermanentDelete'/>"
-"      <separator/>"
-"      <placeholder name='FileOpsSection'/>"
-"      <separator/>"
-"      <placeholder name='QuitSection'/>"
-"      <menuitem action='Quit'/>"
-"      <separator/>"
-"    </menu>"
-"    <menu action='GoMenu'>"
-"      <menuitem action='FirstImage'/>"
-"      <menuitem action='PrevImage'/>"
-"      <menuitem action='NextImage'/>"
-"      <menuitem action='LastImage'/>"
-"      <menuitem action='ImageBack'/>"
-"      <menuitem action='ImageForward'/>"
-"      <separator/>"
-"      <menuitem action='Back'/>"
-"      <menuitem action='Forward'/>"
-"      <menuitem action='Up'/>"
-"      <menuitem action='Home'/>"
-"      <separator/>"
-"      <menuitem action='FirstPage'/>"
-"      <menuitem action='LastPage'/>"
-"      <menuitem action='NextPage'/>"
-"      <menuitem action='PrevPage'/>"
-"    </menu>"
-"    <menu action='SelectMenu'>"
-"      <menuitem action='SelectAll'/>"
-"      <menuitem action='SelectNone'/>"
-"      <menuitem action='SelectInvert'/>"
-"      <menuitem action='RectangularSelection'/>"
-"      <menuitem action='ShowFileFilter'/>"
-"      <placeholder name='SelectSection'/>"
-"      <separator/>"
-"      <menuitem action='CopyPath'/>"
-"      <menuitem action='CopyPathUnquoted'/>"
-"      <placeholder name='ClipboardSection'/>"
-"      <separator/>"
-"      <menuitem action='ShowMarks'/>"
-"      <menuitem action='ClearMarks'/>"
-"      <placeholder name='MarksSection'/>"
-"      <separator/>"
-"    </menu>"
-"    <menu action='EditMenu'>"
-"      <placeholder name='EditSection'/>"
-"      <separator/>"
-"      <menu action='OrientationMenu'>"
-"        <menuitem action='RotateCW'/>"
-"        <menuitem action='RotateCCW'/>"
-"        <menuitem action='Rotate180'/>"
-"        <menuitem action='Mirror'/>"
-"        <menuitem action='Flip'/>"
-"        <menuitem action='AlterNone'/>"
-"        <separator/>"
-"        <menuitem action='ExifRotate'/>"
-"        <separator/>"
-"        <menuitem action='WriteRotation'/>"
-"        <menuitem action='WriteRotationKeepDate'/>"
-"        <separator/>"
-"      </menu>"
-"      <menu action='RatingMenu'>"
-"        <menuitem action='Rating0'/>"
-"        <menuitem action='Rating1'/>"
-"        <menuitem action='Rating2'/>"
-"        <menuitem action='Rating3'/>"
-"        <menuitem action='Rating4'/>"
-"        <menuitem action='Rating5'/>"
-"        <menuitem action='RatingM1'/>"
-"        <separator/>"
-"      </menu>"
-"      <menuitem action='SaveMetadata'/>"
-"      <menuitem action='KeywordAutocomplete'/>"
-"      <placeholder name='PropertiesSection'/>"
-"      <separator/>"
-"      <menuitem action='DrawRectangle'/>"
-"      <separator/>"
-"      <menuitem action='Preferences'/>"
-"      <menuitem action='Plugins'/>"
-"      <menuitem action='LayoutConfig'/>"
-"      <menuitem action='Maintenance'/>"
-"      <placeholder name='PreferencesSection'/>"
-"      <separator/>"
-"      <separator/>"
-"    </menu>"
-"    <menu action='PluginsMenu'>"
-"    </menu>"
-"    <menu action='ViewMenu'>"
-"      <menuitem action='ViewInNewWindow'/>"
-"      <menuitem action='PanView'/>"
-"      <menuitem action='ExifWin'/>"
-"      <menuitem action='OpenArchive'/>"
-"      <placeholder name='WindowSection'/>"
-"      <separator/>"
-"      <menu action='FileDirMenu'>"
-"        <menuitem action='FolderTree'/>"
-"        <placeholder name='FolderSection'/>"
-"        <separator/>"
-"        <menuitem action='ViewList'/>"
-"        <menuitem action='ViewIcons'/>"
-"        <menuitem action='Thumbnails'/>"
-"        <placeholder name='ListSection'/>"
-"        <separator/>"
-"        <menuitem action='FloatTools'/>"
-"        <menuitem action='HideTools'/>"
-"      </menu>"
-"      <placeholder name='DirSection'/>"
-"      <separator/>"
-"      <menu action='ZoomMenu'>"
-"        <menu action='ConnectZoomMenu'>"
-"          <menuitem action='ConnectZoomIn'/>"
-"          <menuitem action='ConnectZoomOut'/>"
-"          <menuitem action='ConnectZoomFit'/>"
-"          <menuitem action='ConnectZoomFillHor'/>"
-"          <menuitem action='ConnectZoomFillVert'/>"
-"          <menuitem action='ConnectZoom100'/>"
-"          <menuitem action='ConnectZoom200'/>"
-"          <menuitem action='ConnectZoom300'/>"
-"          <menuitem action='ConnectZoom400'/>"
-"          <menuitem action='ConnectZoom50'/>"
-"          <menuitem action='ConnectZoom33'/>"
-"          <menuitem action='ConnectZoom25'/>"
-"        </menu>"
-"        <menuitem action='ZoomIn'/>"
-"        <menuitem action='ZoomOut'/>"
-"        <menuitem action='ZoomFit'/>"
-"        <menuitem action='ZoomFillHor'/>"
-"        <menuitem action='ZoomFillVert'/>"
-"        <menuitem action='Zoom100'/>"
-"        <menuitem action='Zoom200'/>"
-"        <menuitem action='Zoom300'/>"
-"        <menuitem action='Zoom400'/>"
-"        <menuitem action='Zoom50'/>"
-"        <menuitem action='Zoom33'/>"
-"        <menuitem action='Zoom25'/>"
-"      </menu>"
-"      <menu action='SplitMenu'>"
-"        <menuitem action='SplitHorizontal'/>"
-"        <menuitem action='SplitVertical'/>"
-"        <menuitem action='SplitTriple'/>"
-"        <menuitem action='SplitQuad'/>"
-"        <menuitem action='SplitSingle'/>"
-"        <separator/>"
-"        <menuitem action='SplitNextPane'/>"
-"        <menuitem action='SplitPreviousPane'/>"
-"        <menuitem action='SplitUpPane'/>"
-"        <menuitem action='SplitDownPane'/>"
-"        <separator/>"
-"        <menuitem action='SplitPaneSync'/>"
-"      </menu>"
-"      <menu action='StereoMenu'>"
-"        <menuitem action='StereoAuto'/>"
-"        <menuitem action='StereoSBS'/>"
-"        <menuitem action='StereoCross'/>"
-"        <menuitem action='StereoOff'/>"
-"        <separator/>"
-"        <menuitem action='StereoCycle'/>"
-"      </menu>"
-"      <menu action='ColorMenu'>"
-"        <menuitem action='UseColorProfiles'/>"
-"        <menuitem action='UseImageProfile'/>"
-"        <menuitem action='ColorProfile0'/>"
-"        <menuitem action='ColorProfile1'/>"
-"        <menuitem action='ColorProfile2'/>"
-"        <menuitem action='ColorProfile3'/>"
-"        <menuitem action='ColorProfile4'/>"
-"        <menuitem action='ColorProfile5'/>"
-"        <separator/>"
-"        <menuitem action='Grayscale'/>"
-"      </menu>"
-"      <menu action='OverlayMenu'>"
-"        <menuitem action='ImageOverlay'/>"
-"        <menuitem action='ImageHistogram'/>"
-"        <menuitem action='ImageOverlayCycle'/>"
-"        <separator/>"
-"        <menuitem action='HistogramChanR'/>"
-"        <menuitem action='HistogramChanG'/>"
-"        <menuitem action='HistogramChanB'/>"
-"        <menuitem action='HistogramChanRGB'/>"
-"        <menuitem action='HistogramChanV'/>"
-"        <menuitem action='HistogramChanCycle'/>"
-"        <separator/>"
-"        <menuitem action='HistogramModeLin'/>"
-"        <menuitem action='HistogramModeLog'/>"
-"        <menuitem action='HistogramModeCycle'/>"
-"      </menu>"
-"      <menuitem action='OverUnderExposed'/>"
-"      <menuitem action='FullScreen'/>"
-"      <placeholder name='ViewSection'/>"
-"      <separator/>"
-"      <menuitem action='SBar'/>"
-"      <menuitem action='SBarSort'/>"
-"      <menuitem action='HideBars'/>"
-"      <menuitem action='HideSelectableToolbars'/>"
-"      <menuitem action='ShowInfoPixel'/>"
-"      <menuitem action='IgnoreAlpha'/>"
-"      <placeholder name='ToolsSection'/>"
-"      <separator/>"
-"      <menuitem action='Animate'/>"
-"      <menuitem action='SlideShow'/>"
-"      <menuitem action='SlideShowPause'/>"
-"      <menuitem action='SlideShowFaster'/>"
-"      <menuitem action='SlideShowSlower'/>"
-"      <separator/>"
-"      <menuitem action='Refresh'/>"
-"      <placeholder name='SlideShowSection'/>"
-"      <separator/>"
-"    </menu>"
-"    <menu action='WindowsMenu'>"
-"      <menu action='NewWindow'>"
-"        <menuitem action='NewWindowDefault'/>"
-"        <menuitem action='NewWindowFromCurrent'/>"
-"        <separator/>"
-"       </menu>"
-"      <menuitem action='RenameWindow'/>"
-"      <menuitem action='DeleteWindow'/>"
-"      <menuitem action='CloseWindow'/>"
-"    </menu>"
-"    <menu action='HelpMenu'>"
-"      <separator/>"
-"      <menuitem action='HelpContents'/>"
-"      <menuitem action='SearchAndRunCommand'/>"
-"      <menuitem action='HelpSearch'/>"
-"      <menuitem action='HelpShortcuts'/>"
-"      <menuitem action='HelpKbd'/>"
-"      <menuitem action='HelpNotes'/>"
-"      <menuitem action='HelpChangeLog'/>"
-"      <placeholder name='HelpSection'/>"
-"      <separator/>"
-"      <menuitem action='About'/>"
-"      <separator/>"
-"      <menuitem action='LogWindow'/>"
-"      <separator/>"
-"    </menu>"
-"  </menubar>"
-"  <toolbar name='ToolBar'>"
-"  </toolbar>"
-"  <toolbar name='StatusBar'>"
-"  </toolbar>"
-"<accelerator action='PrevImageAlt1'/>"
-"<accelerator action='PrevImageAlt2'/>"
-"<accelerator action='NextImageAlt1'/>"
-"<accelerator action='NextImageAlt2'/>"
-"<accelerator action='DeleteAlt1'/>"
-"<accelerator action='DeleteAlt2'/>"
-"<accelerator action='FullScreenAlt1'/>"
-"<accelerator action='FullScreenAlt2'/>"
-"<accelerator action='Escape'/>"
-"<accelerator action='EscapeAlt1'/>"
-
-"<accelerator action='ZoomInAlt1'/>"
-"<accelerator action='ZoomOutAlt1'/>"
-"<accelerator action='Zoom100Alt1'/>"
-"<accelerator action='ZoomFitAlt1'/>"
-
-"<accelerator action='ConnectZoomInAlt1'/>"
-"<accelerator action='ConnectZoomOutAlt1'/>"
-"<accelerator action='ConnectZoom100Alt1'/>"
-"<accelerator action='ConnectZoomFitAlt1'/>"
-"</ui>";
-
 static gchar *menu_translate(const gchar *path, gpointer)
 {
        return static_cast<gchar *>(_(path));
@@ -3079,8 +2897,13 @@ static void layout_actions_setup_marks(LayoutWindow *lw)
        GError *error;
        GString *desc = g_string_new(
                                "<ui>"
-                               "  <menubar name='MainMenu'>"
-                               "    <menu action='SelectMenu'>");
+                               "  <menubar name='MainMenu'>");
+
+       if (options->hamburger_menu)
+               {
+               g_string_append(desc, "    <menu action='OpenMenu'>");
+               }
+       g_string_append(desc, "      <menu action='SelectMenu'>");
 
        for (mark = 1; mark <= FILEDATA_MARKS_SIZE; mark++)
                {
@@ -3115,8 +2938,13 @@ static void layout_actions_setup_marks(LayoutWindow *lw)
                }
 
        g_string_append(desc,
-                               "    </menu>"
-                               "  </menubar>");
+                               "      </menu>");
+       if (options->hamburger_menu)
+               {
+               g_string_append(desc, "    </menu>");
+               }
+       g_string_append(desc, "  </menubar>");
+
        for (mark = 1; mark <= FILEDATA_MARKS_SIZE; mark++)
                {
                gint i = (mark < 10 ? mark : 0);
@@ -3165,7 +2993,9 @@ static GList *layout_actions_editor_menu_path(EditorDescription *editor)
 
 static void layout_actions_editor_add(GString *desc, GList *path, GList *old_path)
 {
-       gint to_open, to_close, i;
+       gint to_open;
+       gint to_close;
+       gint i;
        while (path && old_path && strcmp(static_cast<gchar *>(path->data), static_cast<gchar *>(old_path->data)) == 0)
                {
                path = path->next;
@@ -3246,6 +3076,11 @@ static void layout_actions_setup_editors(LayoutWindow *lw)
                                "<ui>"
                                "  <menubar name='MainMenu'>");
 
+       if (options->hamburger_menu)
+               {
+               g_string_append(desc, "    <menu action='OpenMenu'>");
+               }
+
        editors_list = editor_list_get();
 
        old_path = nullptr;
@@ -3278,7 +3113,12 @@ static void layout_actions_setup_editors(LayoutWindow *lw)
        layout_actions_editor_add(desc, nullptr, old_path);
        g_list_free_full(old_path, g_free);
 
-       g_string_append(desc,   "  </menubar>"
+       if (options->hamburger_menu)
+               {
+               g_string_append(desc, "</menu>");
+               }
+
+       g_string_append(desc,"  </menubar>"
                                "</ui>" );
 
        error = nullptr;
@@ -3294,10 +3134,21 @@ static void layout_actions_setup_editors(LayoutWindow *lw)
        g_list_free(editors_list);
 }
 
+void create_toolbars(LayoutWindow *lw)
+{
+       gint i;
+
+       for (i = 0; i < TOOLBAR_COUNT; i++)
+               {
+               layout_actions_toolbar(lw, static_cast<ToolbarType>(i));
+               layout_toolbar_clear(lw, static_cast<ToolbarType>(i));
+               layout_toolbar_add_default(lw, static_cast<ToolbarType>(i));
+               }
+}
+
 void layout_actions_setup(LayoutWindow *lw)
 {
        GError *error;
-       gint i;
 
        DEBUG_1("%s layout_actions_setup: start", get_exec_time());
        if (lw->ui_manager) return;
@@ -3338,20 +3189,14 @@ void layout_actions_setup(LayoutWindow *lw)
 
        DEBUG_1("%s layout_actions_setup: add menu", get_exec_time());
        error = nullptr;
-       if (!gtk_ui_manager_add_ui_from_string(lw->ui_manager, menu_ui_description, -1, &error))
+
+       if (!gtk_ui_manager_add_ui_from_resource(lw->ui_manager, options->hamburger_menu ? GQ_RESOURCE_PATH_UI "/menu-hamburger.ui" : GQ_RESOURCE_PATH_UI "/menu-classic.ui" , &error))
                {
                g_message("building menus failed: %s", error->message);
                g_error_free(error);
                exit(EXIT_FAILURE);
                }
 
-       DEBUG_1("%s layout_actions_setup: add toolbar", get_exec_time());
-       for (i = 0; i < TOOLBAR_COUNT; i++)
-               {
-               layout_toolbar_clear(lw, static_cast<ToolbarType>(i));
-               layout_toolbar_add_default(lw, static_cast<ToolbarType>(i));
-               }
-
        DEBUG_1("%s layout_actions_setup: marks", get_exec_time());
        layout_actions_setup_marks(lw);
 
@@ -3457,20 +3302,10 @@ GtkWidget *layout_actions_menu_bar(LayoutWindow *lw)
 GtkWidget *layout_actions_toolbar(LayoutWindow *lw, ToolbarType type)
 {
        if (lw->toolbar[type]) return lw->toolbar[type];
-       switch (type)
-               {
-               case TOOLBAR_MAIN:
-                       lw->toolbar[type] = gtk_ui_manager_get_widget(lw->ui_manager, "/ToolBar");
-                       gtk_toolbar_set_style(GTK_TOOLBAR(lw->toolbar[type]), GTK_TOOLBAR_ICONS);
-                       break;
-               case TOOLBAR_STATUS:
-                       lw->toolbar[type] = gtk_ui_manager_get_widget(lw->ui_manager, "/StatusBar");
-                       gtk_toolbar_set_style(GTK_TOOLBAR(lw->toolbar[type]), GTK_TOOLBAR_ICONS);
-                       gtk_toolbar_set_show_arrow(GTK_TOOLBAR(lw->toolbar[type]), FALSE);
-                       break;
-               default:
-                       break;
-               }
+
+       lw->toolbar[type] = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+
+       gtk_widget_show(lw->toolbar[type]);
        g_object_ref(lw->toolbar[type]);
        return lw->toolbar[type];
 }
@@ -3482,19 +3317,38 @@ GtkWidget *layout_actions_menu_tool_bar(LayoutWindow *lw)
 
        if (lw->menu_tool_bar) return lw->menu_tool_bar;
 
-       menu_bar = layout_actions_menu_bar(lw);
-       DEBUG_NAME(menu_bar);
        toolbar = layout_actions_toolbar(lw, TOOLBAR_MAIN);
        DEBUG_NAME(toolbar);
        lw->menu_tool_bar = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
-       gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), menu_bar, FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), toolbar, FALSE, FALSE, 0);
+       if (!options->hamburger_menu)
+               {
+               menu_bar = layout_actions_menu_bar(lw);
+               DEBUG_NAME(menu_bar);
+               gq_gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), menu_bar, FALSE, FALSE, 0);
+               }
+
+       gq_gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), toolbar, FALSE, FALSE, 0);
 
        g_object_ref(lw->menu_tool_bar);
        return lw->menu_tool_bar;
 }
 
+void toolbar_clear_cb(GtkWidget *widget, gpointer)
+{
+       GtkAction *action;
+
+       if (GTK_IS_BUTTON(widget))
+               {
+               action = static_cast<GtkAction *>(g_object_get_data(G_OBJECT(widget), "action"));
+               if (g_object_get_data(G_OBJECT(widget), "id") )
+                       {
+                       g_signal_handler_disconnect(action, GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(widget), "id")));
+                       }
+               }
+       gtk_widget_destroy(widget);
+}
+
 void layout_toolbar_clear(LayoutWindow *lw, ToolbarType type)
 {
        if (lw->toolbar_merge_id[type])
@@ -3506,15 +3360,59 @@ void layout_toolbar_clear(LayoutWindow *lw, ToolbarType type)
        lw->toolbar_actions[type] = nullptr;
 
        lw->toolbar_merge_id[type] = gtk_ui_manager_new_merge_id(lw->ui_manager);
+
+       if (lw->toolbar[type])
+               {
+               gtk_container_foreach(GTK_CONTAINER(lw->toolbar[type]), (GtkCallback)G_CALLBACK(toolbar_clear_cb), nullptr);
+               }
+}
+
+void action_radio_changed_cb(GtkAction *action, GtkAction *current, gpointer data)
+{
+       auto button = static_cast<GtkToggleButton *>(data);
+
+       if (action == current )
+               {
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
+               }
+       else
+               {
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
+               }
+}
+
+void action_toggle_activate_cb(GtkAction* self, gpointer data)
+{
+       auto button = static_cast<GtkToggleButton *>(data);
+
+       if (gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(self)) != gtk_toggle_button_get_active(button))
+               {
+               gtk_toggle_button_set_active(button, gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(self)));
+               }
 }
 
-void layout_toolbar_add(LayoutWindow *lw, ToolbarType type, const gchar *action)
+gboolean toolbar_button_press_event_cb(GtkWidget *, GdkEvent *, gpointer data)
+{
+       gtk_action_activate(GTK_ACTION(data));
+
+       return TRUE;
+}
+
+void layout_toolbar_add(LayoutWindow *lw, ToolbarType type, const gchar *action_name)
 {
        const gchar *path = nullptr;
+       const gchar *tooltip_text = nullptr;
+       GtkAction *action;
+       GtkWidget *action_icon = nullptr;
+       GtkWidget *button;
+       gulong id;
 
-       if (!action || !lw->ui_manager) return;
+       if (!action_name || !lw->ui_manager) return;
 
-       if (g_list_find_custom(lw->toolbar_actions[type], action, reinterpret_cast<GCompareFunc>(strcmp))) return;
+       if (!lw->toolbar[type])
+               {
+               return;
+               }
 
        switch (type)
                {
@@ -3528,8 +3426,7 @@ void layout_toolbar_add(LayoutWindow *lw, ToolbarType type, const gchar *action)
                        break;
                }
 
-
-       if (g_str_has_suffix(action, ".desktop"))
+       if (g_str_has_suffix(action_name, ".desktop"))
                {
                /* this may be called before the external editors are read
                   create a dummy action for now */
@@ -3538,22 +3435,79 @@ void layout_toolbar_add(LayoutWindow *lw, ToolbarType type, const gchar *action)
                        lw->action_group_editors = gtk_action_group_new("MenuActionsExternal");
                        gtk_ui_manager_insert_action_group(lw->ui_manager, lw->action_group_editors, 1);
                        }
-               if (!gtk_action_group_get_action(lw->action_group_editors, action))
+               if (!gtk_action_group_get_action(lw->action_group_editors, action_name))
                        {
-                       GtkActionEntry entry = { action,
+                       GtkActionEntry entry = { action_name,
                                                 GQ_ICON_MISSING_IMAGE,
-                                                action,
+                                                action_name,
                                                 nullptr,
                                                 nullptr,
-                                                nullptr };
-                       DEBUG_1("Creating temporary action %s", action);
+                                                nullptr
+                                              };
+                       DEBUG_1("Creating temporary action %s", action_name);
                        gtk_action_group_add_actions(lw->action_group_editors, &entry, 1, lw);
                        }
                }
-       gtk_ui_manager_add_ui(lw->ui_manager, lw->toolbar_merge_id[type], path, action, action, GTK_UI_MANAGER_TOOLITEM, FALSE);
-       lw->toolbar_actions[type] = g_list_append(lw->toolbar_actions[type], g_strdup(action));
-}
 
+       if (g_strcmp0(action_name, "Separator") == 0)
+               {
+               button = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
+               }
+       else
+               {
+               action = gtk_action_group_get_action(lw->action_group, action_name);
+
+               action_icon = gtk_action_create_icon(action, GTK_ICON_SIZE_SMALL_TOOLBAR);
+               tooltip_text = gtk_action_get_tooltip(action);
+
+               gtk_ui_manager_add_ui(lw->ui_manager, lw->toolbar_merge_id[type], path, action_name, action_name, GTK_UI_MANAGER_TOOLITEM, FALSE);
+
+               if (GTK_IS_RADIO_ACTION(action) || GTK_IS_TOGGLE_ACTION(action))
+                       {
+                       button = gtk_toggle_button_new();
+                       }
+               else
+                       {
+                       button = gtk_button_new();
+                       }
+
+               if (GTK_IS_TOGGLE_ACTION(action) || GTK_IS_RADIO_ACTION(action))
+                       {
+                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)));
+                       }
+
+               if (action_icon)
+                       {
+                       gtk_button_set_image(GTK_BUTTON(button), action_icon);
+                       }
+               else
+                       {
+                       gtk_button_set_label(GTK_BUTTON(button), action_name);
+                       }
+
+               gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+               gtk_widget_set_tooltip_text(button, tooltip_text);
+
+               if (GTK_IS_RADIO_ACTION(action))
+                       {
+                       id = g_signal_connect(G_OBJECT(action), "changed", G_CALLBACK(action_radio_changed_cb), button);
+                       g_object_set_data(G_OBJECT(button), "id", GUINT_TO_POINTER(id));
+                       }
+               else if (GTK_IS_TOGGLE_ACTION(action))
+                       {
+                       id = g_signal_connect(G_OBJECT(action), "activate", G_CALLBACK(action_toggle_activate_cb), button);
+                       g_object_set_data(G_OBJECT(button), "id", GUINT_TO_POINTER(id));
+                       }
+
+               g_signal_connect(G_OBJECT(button), "button_press_event", G_CALLBACK(toolbar_button_press_event_cb), action);
+               g_object_set_data(G_OBJECT(button), "action", action);
+               }
+
+       gq_gtk_container_add(GTK_WIDGET(lw->toolbar[type]), GTK_WIDGET(button));
+       gtk_widget_show(GTK_WIDGET(button));
+
+       lw->toolbar_actions[type] = g_list_append(lw->toolbar_actions[type], g_strdup(action_name));
+}
 
 void layout_toolbar_add_default(LayoutWindow *lw, ToolbarType type)
 {
@@ -3747,7 +3701,7 @@ void layout_util_sync_color(LayoutWindow *lw)
        gboolean use_image = FALSE;
        gint i;
        gchar action_name[15];
-#ifdef HAVE_LCMS
+#if HAVE_LCMS
        gchar *image_profile;
        gchar *screen_profile;
 #endif
@@ -3758,7 +3712,7 @@ void layout_util_sync_color(LayoutWindow *lw)
        use_color = layout_image_color_profile_get_use(lw);
 
        action = gtk_action_group_get_action(lw->action_group, "UseColorProfiles");
-#ifdef HAVE_LCMS
+#if HAVE_LCMS
        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), use_color);
        if (layout_image_color_profile_get_status(lw, &image_profile, &screen_profile))
                {
@@ -4136,7 +4090,7 @@ void layout_bar_sort_set(LayoutWindow *lw, GtkWidget *bar)
        g_signal_connect(G_OBJECT(lw->bar_sort), "destroy",
                         G_CALLBACK(layout_bar_sort_destroyed), lw);
 
-       gtk_box_pack_end(GTK_BOX(lw->utility_box), lw->bar_sort, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(lw->utility_box), lw->bar_sort, FALSE, FALSE, 0);
 }
 
 void layout_bar_sort_toggle(LayoutWindow *lw)
@@ -4222,7 +4176,7 @@ GtkWidget *layout_bars_prepare(LayoutWindow *lw, GtkWidget *image)
        lw->utility_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        lw->utility_paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
        DEBUG_NAME(lw->utility_paned);
-       gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0);
 
        gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE);
        gtk_widget_show(lw->utility_paned);