From 5ffb06d3c3a91ac65e59fc39a2bfc1e3b9abb391 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 3 Sep 2019 23:32:31 +0100 Subject: add toolbar customize to main and burger menu --- frontends/gtk/scaffolding.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'frontends/gtk/scaffolding.c') diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c index e0ca65aca..50e061eb1 100644 --- a/frontends/gtk/scaffolding.c +++ b/frontends/gtk/scaffolding.c @@ -757,19 +757,16 @@ static void nsgtk_menu_connect_signals(struct nsgtk_scaffolding *g) "toggled", G_CALLBACK(nsgtk_on_menubar_activate_menu), g); - g_signal_connect(g->burger_menu->view_submenu->toolbars_submenu->menubar_menuitem, - "toggled", - G_CALLBACK(nsgtk_on_menubar_activate_menu), - g); g_signal_connect(g->menu_bar->view_submenu->toolbars_submenu->toolbar_menuitem, "toggled", G_CALLBACK(nsgtk_on_toolbar_activate_menu), g); - g_signal_connect(g->burger_menu->view_submenu->toolbars_submenu->toolbar_menuitem, - "toggled", - G_CALLBACK(nsgtk_on_toolbar_activate_menu), + g_signal_connect(g->menu_bar->view_submenu->toolbars_submenu->customize_menuitem, + "activate", + G_CALLBACK(nsgtk_on_customize_activate_menu), g); + } @@ -791,6 +788,18 @@ create_scaffolding_burger_menu(struct nsgtk_scaffolding *gs, if (nmenu == NULL) { return NULL; } + g_signal_connect(nmenu->view_submenu->toolbars_submenu->menubar_menuitem, + "toggled", + G_CALLBACK(nsgtk_on_menubar_activate_menu), + gs); + g_signal_connect(nmenu->view_submenu->toolbars_submenu->toolbar_menuitem, + "toggled", + G_CALLBACK(nsgtk_on_toolbar_activate_menu), + gs); + g_signal_connect(nmenu->view_submenu->toolbars_submenu->customize_menuitem, + "activate", + G_CALLBACK(nsgtk_on_customize_activate_menu), + gs); return nmenu; } -- cgit v1.2.3