return TRUE;
}
-static void
-cb_menu_quit(gpointer data, guint cb_action, GtkWidget *item)
+static void cb_menu_quit(GtkMenuItem *mi, gpointer data)
{
ui_psensor_quit();
}
-static void
-cb_menu_preferences(gpointer data, guint cb_action, GtkWidget *item)
+static void cb_menu_preferences(GtkMenuItem *mi, gpointer data)
{
ui_pref_dialog_run((struct ui_psensor *)data);
}
gtk_main_quit();
}
-static GtkItemFactoryEntry menu_items[] = {
- {"/Psensor", NULL, NULL, 0, "<Branch>"},
- {"/Psensor/Preferences",
- NULL, cb_menu_preferences, 0, "<Item>"},
- {"/Psensor/sep1",
- NULL, NULL, 0, "<Separator>"},
- {"/Psensor/Quit",
- "", cb_menu_quit, 0, "<StockItem>", GTK_STOCK_QUIT},
+static const char *menu_desc =
+"<ui>"
+" <menubar name='MainMenu'>"
+" <menu name='Psensor' action='PsensorMenuAction'>"
+" <menuitem name='Preferences' action='PreferencesAction' />"
+" <separator />"
+" <menuitem name='Quit' action='QuitAction' />"
+" </menu>"
+" </menubar>"
+"</ui>";
+
+static GtkActionEntry entries[] = {
+ { "PsensorMenuAction", NULL, "_Psensor" }, /* name, stock id, label */
+
+ { "PreferencesAction", GTK_STOCK_PREFERENCES, /* name, stock id */
+ "_Preferences", NULL, /* label, accelerator */
+ "Preferences", /* tooltip */
+ G_CALLBACK(cb_menu_preferences) },
+
+ { "QuitAction",
+ GTK_STOCK_QUIT, "_Quit", NULL, "Quit", G_CALLBACK(cb_menu_quit) }
};
-
-static gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
+static guint n_entries = G_N_ELEMENTS(entries);
static GtkWidget *get_menu(struct ui_psensor *ui)
{
- GtkItemFactory *item_factory;
+ GtkActionGroup *action_group;
+ GtkUIManager *menu_manager;
+ GError *error;
+
+ action_group = gtk_action_group_new("PsensorActions");
+ gtk_action_group_set_translation_domain(action_group, PACKAGE);
+ menu_manager = gtk_ui_manager_new();
+
+ gtk_action_group_add_actions(action_group, entries, n_entries, ui);
+ gtk_ui_manager_insert_action_group(menu_manager, action_group, 0);
+
+ error = NULL;
+ gtk_ui_manager_add_ui_from_string(menu_manager, menu_desc, -1, &error);
- item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", NULL);
+ if (error)
+ g_error(_("building menus failed: %s"), error->message);
- gtk_item_factory_create_items(item_factory,
- nmenu_items, menu_items, ui);
- return gtk_item_factory_get_widget(item_factory, "<main>");
+ return gtk_ui_manager_get_widget(menu_manager, "/MainMenu");
}
void ui_window_create(struct ui_psensor *ui)