mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the newer GtkUIManager for menu creation.

Browse source 
Signed-off-by: Nathan Samson <nathansamson@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Nathan Samson 2011-09-04 02:14:39 +02:00 committed by Linus Torvalds
parent b176daf6d6
commit 4d62478e14
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
main.c
View file

@ -128,25 +128,38 @@ static void file_save(GtkWidget *w, gpointer data)
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
} }
static GtkItemFactoryEntry menu_items[] = { static GtkActionEntry menu_items[] = {
{ "/_File", NULL, NULL, 0, "<Branch>" }, { "FileMenuAction", GTK_STOCK_FILE, NULL, NULL, NULL, NULL},
{ "/File/_Open", "<control>O", file_open, 0, "<StockItem>", GTK_STOCK_OPEN }, { "OpenFile", GTK_STOCK_OPEN, NULL, "<control>O", NULL, G_CALLBACK(file_open) },
{ "/File/_Save", "<control>S", file_save, 0, "<StockItem>", GTK_STOCK_SAVE }, { "SaveFile", GTK_STOCK_SAVE, NULL, "<control>S", NULL, G_CALLBACK(file_save) },
}; };
static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
/* This is just directly from the gtk menubar tutorial. */ static const gchar* ui_string = " \
<ui> \
<menubar name=\"MainMenu\"> \
<menu name=\"FileMenu\" action=\"FileMenuAction\"> \
<menuitem name=\"Open\" action=\"OpenFile\" /> \
<menuitem name=\"Save\" action=\"SaveFile\" /> \
</menu> \
</menubar> \
</ui> \
";
static GtkWidget *get_menubar_menu(GtkWidget *window) static GtkWidget *get_menubar_menu(GtkWidget *window)
{ {
GtkItemFactory *item_factory; GtkActionGroup *action_group = gtk_action_group_new("Menu");
GtkAccelGroup *accel_group; gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0);
accel_group = gtk_accel_group_new(); GtkUIManager *ui_manager = gtk_ui_manager_new();
item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group); gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
GError* error = 0;
gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ui_manager), ui_string, -1, &error);
gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL); gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ui_manager));
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); GtkWidget* menu = gtk_ui_manager_get_widget(ui_manager, "/MainMenu");
return gtk_item_factory_get_widget(item_factory, "<main>");
return menu;
} }
int main(int argc, char **argv) int main(int argc, char **argv)