Adl fix #715: / for action search

https://github.com/BestImageViewer/geeqie/issues/715

Wrong function call used to get key label.

diff --git a/src/layout_util.c b/src/layout_util.c
index f2551a9..6075c78 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -1983,7 +1983,7 @@ static GtkActionEntry menu_entries[] = {
   { "NewWindow",       GTK_STOCK_NEW,          N_("New _window"),                      "<control>N",           N_("New window"),                       CB(layout_menu_new_window_cb) },
   { "NewCollection",   GTK_STOCK_INDEX,        N_("_New collection"),                  "C",                    N_("New collection"),                   CB(layout_menu_new_cb) },
   { "OpenCollection",  GTK_STOCK_OPEN,         N_("_Open collection..."),              "O",                    N_("Open collection..."),               CB(layout_menu_open_cb) },
-  { "OpenRecent",      NULL,                   N_("Open recen_t"),                     NULL,                   N_("Open recent"),                      NULL },
+  { "OpenRecent",      NULL,                   N_("Open recen_t"),                     NULL,                   N_("Open recent collection"),                   NULL },
   { "Search",          GTK_STOCK_FIND,         N_("_Search..."),                       "F3",                   N_("Search..."),                        CB(layout_menu_search_cb) },
   { "FindDupes",       GTK_STOCK_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) },
@@ -2014,7 +2014,7 @@ static GtkActionEntry menu_entries[] = {
   { "Rotate180",       PIXBUF_INLINE_ICON_180, N_("Rotate 1_80°"),    "<shift>R",             N_("Image Rotate 180°"),                       CB(layout_menu_alter_180_cb) },
   { "Mirror",          PIXBUF_INLINE_ICON_MIRROR,      N_("_Mirror"),  "<shift>M",             N_("Image Mirror"),                             CB(layout_menu_alter_mirror_cb) },
   { "Flip",            PIXBUF_INLINE_ICON_FLIP,        N_("_Flip"),    "<shift>F",             N_("Image Flip"),                               CB(layout_menu_alter_flip_cb) },
-  { "AlterNone",       PIXBUF_INLINE_ICON_ORIGINAL,    N_("_Original state"),  "<shift>O",             N_("Original state"),                   CB(layout_menu_alter_none_cb) },
+  { "AlterNone",       PIXBUF_INLINE_ICON_ORIGINAL,    N_("_Original state"),  "<shift>O",             N_("Image rotate Original state"),                      CB(layout_menu_alter_none_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) },

diff --git a/src/search_and_run.c b/src/search_and_run.c
index aa670eb..9351ead 100644 (file)
--- a/src/search_and_run.c
+++ b/src/search_and_run.c
@@ -108,7 +108,7 @@ static void command_store_populate(SarData* sar)
                        if (accel_path && gtk_accel_map_lookup_entry(accel_path, &key))
                                {
                                g_object_get(action, "tooltip", &tooltip, "label", &label, NULL);
-                               accel = gtk_accelerator_name(key.accel_key, key.accel_mods);
+                               accel = gtk_accelerator_get_label(key.accel_key, key.accel_mods);
 
                                /* menu items with no tooltip are placeholders */
                                if (g_strrstr(accel_path, ".desktop") != NULL || tooltip != NULL)
@@ -288,8 +288,10 @@ GtkWidget *search_and_run_new(LayoutWindow *lw)
        DEBUG_NAME(sar->window);
 
        geometry.min_width = 500;
-       geometry.min_height = 0;
-       gtk_window_set_geometry_hints(GTK_WINDOW(sar->window), NULL, &geometry, GDK_HINT_MIN_SIZE);
+       geometry.max_width = 1500;
+       geometry.min_height = 10;
+       geometry.max_height = 10;
+       gtk_window_set_geometry_hints(GTK_WINDOW(sar->window), NULL, &geometry, GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
 
        gtk_window_set_resizable(GTK_WINDOW(sar->window), TRUE);