X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=45185c016090e3e1569ae09ce02467d7364a5693;hb=788ebc0500b12fb502b82473c1459ccca06345a5;hp=a20954dd6e7fdaabd0bc7f150a5ab3609a347e61;hpb=53ecd2025d00e844fbfb84b5765d975e1e8942be;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index a20954d..45185c0 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -245,7 +245,7 @@ GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char
 	return col;
 }
 
-static void create_radio(GtkWidget *vbox, const char *name, ...)
+static void create_radio(GtkWidget *vbox, const char *w_name, ...)
 {
 	va_list args;
 	GtkRadioButton *group = NULL;
@@ -254,10 +254,10 @@ static void create_radio(GtkWidget *vbox, const char *name, ...)
 	box = gtk_hbox_new(TRUE, 10);
 	gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 0);
 
-	label = gtk_label_new(name);
+	label = gtk_label_new(w_name);
 	gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0);
 
-	va_start(args, name);
+	va_start(args, w_name);
 	for (;;) {
 		int enabled;
 		const char *name;
@@ -573,19 +573,19 @@ static GtkActionEntry menu_items[] = {
 	{ "ViewMenuAction",  GTK_STOCK_FILE, "View", NULL, NULL, NULL},
 	{ "FilterMenuAction",  GTK_STOCK_FILE, "Filter", NULL, NULL, NULL},
 	{ "HelpMenuAction", GTK_STOCK_HELP, "Help", NULL, NULL, NULL},
-	{ "OpenFile",       GTK_STOCK_OPEN, NULL,   "<control>O", NULL, G_CALLBACK(file_open) },
-	{ "SaveFile",       GTK_STOCK_SAVE, NULL,   "<control>S", NULL, G_CALLBACK(file_save) },
-	{ "Print",          GTK_STOCK_PRINT, NULL,  "<control>P", NULL, G_CALLBACK(do_print) },
+	{ "OpenFile",       GTK_STOCK_OPEN, NULL,   CTRLCHAR "O", NULL, G_CALLBACK(file_open) },
+	{ "SaveFile",       GTK_STOCK_SAVE, NULL,   CTRLCHAR "S", NULL, G_CALLBACK(file_save) },
+	{ "Print",          GTK_STOCK_PRINT, NULL,  CTRLCHAR "P", NULL, G_CALLBACK(do_print) },
 	{ "Import",         NULL, "Import", NULL, NULL, G_CALLBACK(import_dialog) },
-	{ "Preferences",    NULL, "Preferences", NULL, NULL, G_CALLBACK(preferences_dialog) },
+	{ "Preferences",    NULL, "Preferences", PREFERENCE_ACCEL, NULL, G_CALLBACK(preferences_dialog) },
 	{ "Renumber",       NULL, "Renumber", NULL, NULL, G_CALLBACK(renumber_dialog) },
 	{ "SelectEvents",   NULL, "SelectEvents", NULL, NULL, G_CALLBACK(selectevents_dialog) },
-	{ "Quit",           GTK_STOCK_QUIT, NULL,   "<control>Q", NULL, G_CALLBACK(quit) },
+	{ "Quit",           GTK_STOCK_QUIT, NULL,   CTRLCHAR "Q", NULL, G_CALLBACK(quit) },
 	{ "About",          GTK_STOCK_ABOUT, NULL,  NULL, NULL, G_CALLBACK(about_dialog) },
-	{ "ViewList",       NULL, "List",  "<control>1", NULL, G_CALLBACK(view_list) },
-	{ "ViewProfile",    NULL, "Profile", "<control>2", NULL, G_CALLBACK(view_profile) },
-	{ "ViewInfo",       NULL, "Info", "<control>3", NULL, G_CALLBACK(view_info) },
-	{ "ViewThree",       NULL, "Three", "<control>4", NULL, G_CALLBACK(view_three) },
+	{ "ViewList",       NULL, "List",  CTRLCHAR "1", NULL, G_CALLBACK(view_list) },
+	{ "ViewProfile",    NULL, "Profile", CTRLCHAR "2", NULL, G_CALLBACK(view_profile) },
+	{ "ViewInfo",       NULL, "Info", CTRLCHAR "3", NULL, G_CALLBACK(view_info) },
+	{ "ViewThree",       NULL, "Three", CTRLCHAR "4", NULL, G_CALLBACK(view_three) },
 };
 static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
 
@@ -622,12 +622,11 @@ static const gchar* ui_string = " \
 	</ui> \
 ";
 
-static GtkWidget *get_menubar_menu(GtkWidget *window)
+static GtkWidget *get_menubar_menu(GtkWidget *window, GtkUIManager *ui_manager)
 {
 	GtkActionGroup *action_group = gtk_action_group_new("Menu");
 	gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0);
 
-	GtkUIManager *ui_manager = gtk_ui_manager_new();
 	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);
@@ -647,15 +646,14 @@ void init_ui(int *argcp, char ***argvp)
 {
 	GtkWidget *win;
 	GtkWidget *notebook;
-	GtkWidget *dive_info;
+	GtkWidget *nb_page;
 	GtkWidget *dive_list;
-	GtkWidget *equipment;
-	GtkWidget *stats;
 	GtkWidget *menubar;
 	GtkWidget *vbox;
 	GdkScreen *screen;
 	GtkIconTheme *icon_theme=NULL;
 	GtkSettings *settings;
+	GtkUIManager *ui_manager;
 
 	gtk_init(argcp, argvp);
 	settings = gtk_settings_get_default();
@@ -708,9 +706,10 @@ void init_ui(int *argcp, char ***argvp)
 	gtk_container_add(GTK_CONTAINER(win), vbox);
 	main_vbox = vbox;
 
-	menubar = get_menubar_menu(win);
+	ui_manager = gtk_ui_manager_new();
+	menubar = get_menubar_menu(win, ui_manager);
 
-	subsurface_ui_setup(settings, menubar, vbox);
+	subsurface_ui_setup(settings, menubar, vbox, ui_manager);
 
 	vpane = gtk_vpaned_new();
 	gtk_box_pack_start(GTK_BOX(vbox), vpane, TRUE, TRUE, 3);
@@ -734,16 +733,20 @@ void init_ui(int *argcp, char ***argvp)
 	gtk_paned_add2(GTK_PANED(hpane), dive_profile);
 
 	/* Frame for extended dive info */
-	dive_info = extended_dive_info_widget();
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_info, gtk_label_new("Dive Notes"));
+	nb_page = extended_dive_info_widget();
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Dive Notes"));
 
 	/* Frame for dive equipment */
-	equipment = equipment_widget();
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), equipment, gtk_label_new("Equipment"));
+	nb_page = equipment_widget();
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Equipment"));
 
-	/* Frame for dive statistics */
-	stats = stats_widget();
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), stats, gtk_label_new("Info & Stats"));
+	/* Frame for single dive statistics */
+	nb_page = single_stats_widget();
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Dive Info"));
+
+	/* Frame for total dive statistics */
+	nb_page = total_stats_widget();
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Overall Stats"));
 
 	gtk_widget_set_app_paintable(win, TRUE);
 	gtk_widget_show_all(win);