diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2018-07-18 09:30:27 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2018-07-18 09:30:27 (GMT) |
commit | c7b064cf1470974aa304d181e1174f9a329d4d49 (patch) | |
tree | 2ef5c69b026c979a6496f03bc6ea6e9a923faf46 /src/gui/menus/view.c | |
parent | f225f8af4eff40b5096f512b699571554e54f097 (diff) |
Disabled simple accelerators when a text entry gets focus.
Diffstat (limited to 'src/gui/menus/view.c')
-rw-r--r-- | src/gui/menus/view.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/gui/menus/view.c b/src/gui/menus/view.c index f0e7450..d446278 100644 --- a/src/gui/menus/view.c +++ b/src/gui/menus/view.c @@ -31,6 +31,7 @@ #include <i18n.h> +#include "../agroup.h" #include "../editem-int.h" #include "../core/global.h" #include "../core/items.h" @@ -73,9 +74,8 @@ static void mcb_view_show_full_screen(GtkCheckMenuItem *, GMenuBar *); /****************************************************************************** * * -* Paramètres : ref = espace de référencement global. * -* accgroup = groupe d'accélérateurs pour les menus. * -* bar = barre de menu parente. * +* Paramètres : ref = espace de référencement global. * +* bar = barre de menu parente. * * * * Description : Construit le menu "Affichage". * * * @@ -85,7 +85,7 @@ static void mcb_view_show_full_screen(GtkCheckMenuItem *, GMenuBar *); * * ******************************************************************************/ -GtkWidget *build_menu_view(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *bar) +GtkWidget *build_menu_view(GObject *ref, GMenuBar *bar) { GtkWidget *result; /* Support à retourner */ GtkWidget *menubar; /* Support pour éléments */ @@ -114,7 +114,7 @@ GtkWidget *build_menu_view(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *bar) submenuitem = qck_create_radio_menu_item(ref, "mnu_view_switch_textview", NULL, _("Text view"), G_CALLBACK(mcb_view_change_support), NULL); - add_accelerator_to_menu_item(submenuitem, "F3", accgroup); + add_accelerator_to_widget(submenuitem, "F3"); g_object_set_data(G_OBJECT(submenuitem), "kind_of_view", GUINT_TO_POINTER(BVW_BLOCK)); g_object_set_data(G_OBJECT(submenuitem), "kind_of_display", GSIZE_TO_POINTER(GTK_TYPE_BLOCK_DISPLAY)); gtk_container_add(GTK_CONTAINER(menubar), submenuitem); @@ -123,19 +123,19 @@ GtkWidget *build_menu_view(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *bar) submenuitem = qck_create_radio_menu_item(ref, "mnu_view_switch_graphview", rgroup, _("Graph view"), G_CALLBACK(mcb_view_change_support), NULL); - add_accelerator_to_menu_item(submenuitem, "F4", accgroup); + add_accelerator_to_widget(submenuitem, "F4"); g_object_set_data(G_OBJECT(submenuitem), "kind_of_view", GUINT_TO_POINTER(BVW_GRAPH)); g_object_set_data(G_OBJECT(submenuitem), "kind_of_display", GSIZE_TO_POINTER(GTK_TYPE_GRAPH_DISPLAY)); gtk_container_add(GTK_CONTAINER(menubar), submenuitem); submenuitem = qck_create_menu_item(ref, "mcb_view_switch_to_next_support", _("Switch to next"), G_CALLBACK(mcb_view_switch_to_next_support), NULL); - add_accelerator_to_menu_item(submenuitem, "Tab", accgroup); + add_accelerator_to_widget(submenuitem, "Tab"); gtk_container_add(GTK_CONTAINER(menubar), submenuitem); submenuitem = qck_create_menu_item(ref, "mcb_view_switch_to_prev_support", _("Switch to previous"), G_CALLBACK(mcb_view_switch_to_prev_support), NULL); - add_accelerator_to_menu_item(submenuitem, "<Shift>Tab", accgroup); + add_accelerator_to_widget(submenuitem, "<Shift>Tab"); gtk_container_add(GTK_CONTAINER(menubar), submenuitem); /* Séparation */ @@ -169,7 +169,7 @@ GtkWidget *build_menu_view(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *bar) submenuitem = qck_create_check_menu_item(NULL, NULL, _("Full screen"), G_CALLBACK(mcb_view_show_full_screen), bar); - add_accelerator_to_menu_item(submenuitem, "F11", accgroup); + add_accelerator_to_widget(submenuitem, "F11"); gtk_container_add(GTK_CONTAINER(menubar), submenuitem); return result; @@ -404,12 +404,10 @@ static void update_switch_access_in_menu_view(void) static void mcb_view_update_side_panels_list(GtkMenuItem *menuitem, GMenuBar *bar) { GtkWidget *menubar; /* Support pour éléments */ - GtkAccelGroup *accgroup; /* Groupe de raccourcis */ typedef struct _panels_loading_filter { GtkContainer *support; /* Support pour éléments */ - GtkAccelGroup *accel; /* Groupe de raccourcis */ PanelItemPersonality personality; /* Nature des éléments attendus*/ bool first; /* Premier ajout ? */ @@ -463,7 +461,7 @@ static void mcb_view_update_side_panels_list(GtkMenuItem *menuitem, GMenuBar *ba bindings = gtk_panel_item_get_key_bindings(panel); if (bindings != NULL) - add_accelerator_to_menu_item(submenuitem, bindings, filter->accel); + add_accelerator_to_widget(submenuitem, bindings); gtk_container_add(filter->support, submenuitem); @@ -485,10 +483,7 @@ static void mcb_view_update_side_panels_list(GtkMenuItem *menuitem, GMenuBar *ba } - accgroup = GTK_ACCEL_GROUP(g_object_get_data(G_OBJECT(bar), "accgroup")); - pfilter.support = GTK_CONTAINER(menubar); - pfilter.accel = accgroup; pfilter.personality = PIP_SINGLETON; pfilter.first = false; |