From bc5046d9917fe9cf84dd899f90aef5b90b7d4b04 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 15 Jul 2020 16:54:27 +0200 Subject: [PATCH 13/18] Move from GtkMenuBar to GMenu This moves forward with gtk4 support, while also allowing a global menu for environments which use one, such as GNOME. I also added shortcuts so that users can press ^Q, ^R and ^S to quit, refresh and save. --- src/gui/gtk-lshw.c | 2 +- src/gui/gtk-lshw.ui | 138 ++++++++++++-------------------------------- src/gui/stock.c | 6 +- src/gui/stock.h | 4 +- 4 files changed, 47 insertions(+), 103 deletions(-) diff --git a/src/gui/gtk-lshw.c b/src/gui/gtk-lshw.c index 7b91ec5e4f01..d3e531c4ceb3 100644 --- a/src/gui/gtk-lshw.c +++ b/src/gui/gtk-lshw.c @@ -57,7 +57,7 @@ activate (GApplication *app, g_simple_action_set_enabled(save_action, FALSE); lshw_gtk_stock_init(); - lshw_ui_init(); + lshw_ui_init(GTK_APPLICATION(app)); if(!mainwindow) return; diff --git a/src/gui/gtk-lshw.ui b/src/gui/gtk-lshw.ui index 76fcd19379f2..cf9d678f00d9 100644 --- a/src/gui/gtk-lshw.ui +++ b/src/gui/gtk-lshw.ui @@ -103,7 +103,6 @@ - True False lshw 700 @@ -115,105 +114,6 @@ True False GTK_ORIENTATION_VERTICAL - - - True - False - - - True - False - _File - True - - - True - False - - - gtk-save - True - False - True - True - app.save - - - - - True - False - - - - - gtk-quit - True - False - True - True - app.quit - - - - - - - - - True - False - _View - True - - - True - False - - - gtk-refresh - True - False - True - True - app.refresh - - - - - - - - - True - False - _Help - True - - - True - False - - - gtk-about - True - False - True - True - app.about - - - - - - - - - False - True - 0 - - True @@ -423,4 +323,42 @@ + + + _File +
+ + _Save + app.save + <Control>s + +
+
+ + _Quit + app.quit + <Control>q + +
+ + + _View +
+ + _Refresh + app.refresh + <Control>r + +
+ + + _Help +
+ + _About + app.about + +
+ + diff --git a/src/gui/stock.c b/src/gui/stock.c index fa18f9ed7f85..ce0b42abea58 100644 --- a/src/gui/stock.c +++ b/src/gui/stock.c @@ -14,6 +14,7 @@ GtkWidget *list2 = NULL; GtkWidget *list3 = NULL; GtkWidget *description = NULL; GtkWidget *statusbar = NULL; +GMenuModel *menubar = NULL; GHashTable *pixbufs = NULL; static struct StockIcon @@ -118,7 +119,7 @@ lshw_gtk_stock_init(void) (void) &id; /* avoid "id defined but not used" warning */ } -void lshw_ui_init(void) +void lshw_ui_init(GtkApplication *app) { GError *error = NULL; GtkBuilder *builder = NULL; @@ -151,6 +152,9 @@ void lshw_ui_init(void) description = GTK_WIDGET(gtk_builder_get_object( builder, "description")); statusbar = GTK_WIDGET(gtk_builder_get_object( builder, "statusbar")); gtk_builder_connect_signals( builder, mainwindow ); + menubar = G_MENU_MODEL( gtk_builder_get_object( builder, "menubar")); + gtk_window_set_application( GTK_WINDOW( mainwindow ), app ); + gtk_application_set_menubar( app, menubar ); g_object_unref( G_OBJECT( builder ) ); icon = g_hash_table_lookup(pixbufs, LSHW_STOCK_LOGO); diff --git a/src/gui/stock.h b/src/gui/stock.h index 58f788e5b573..1c732dfb541e 100644 --- a/src/gui/stock.h +++ b/src/gui/stock.h @@ -45,6 +45,8 @@ */ #define LSHW_DEFAULT_ICON_SIZE 40 +typedef struct _GtkApplication GtkApplication; + void lshw_gtk_stock_init(void); -void lshw_ui_init(void); +void lshw_ui_init(GtkApplication *); #endif /* _STOCK_H_ */ -- 2.17.1