From ff67ca92edfe5e5c74d58a6fa8021eccd6cb7cf9 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 22 Sep 2012 01:12:37 +0300 Subject: Separate the "Import" menu entry into two menu entries in "File" and "Log" New entries with icons and shortcut keys in the menus. "Import XML File" is now using CTRL + I. Reserve CTRL + E for "Export XML File" if possible. "Download From Dive Computer" is using CTRL + D and a GTK_STOCK_GO_DOWN icon. Added separator below this entry in the "Log" menu. Note: menu entry callbacks are NULL at this stage. Signed-off-by: Lubomir I. Ivanov --- gtk-gui.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gtk-gui.c b/gtk-gui.c index e15f72afb..2ee035099 100644 --- a/gtk-gui.c +++ b/gtk-gui.c @@ -880,7 +880,8 @@ static GtkActionEntry menu_items[] = { { "SaveAsFile", GTK_STOCK_SAVE_AS, NULL, SHIFTCHAR CTRLCHAR "S", NULL, G_CALLBACK(file_save_as) }, { "CloseFile", GTK_STOCK_CLOSE, NULL, NULL, NULL, G_CALLBACK(file_close) }, { "Print", GTK_STOCK_PRINT, NULL, CTRLCHAR "P", NULL, G_CALLBACK(do_print) }, - { "Import", GTK_STOCK_GO_BACK, "Import", SHIFTCHAR CTRLCHAR "O", NULL, G_CALLBACK(import_dialog) }, + { "ImportFile", GTK_STOCK_GO_BACK, "Import XML File", CTRLCHAR "I", NULL, NULL }, + { "DownloadLog", GTK_STOCK_GO_DOWN, "Download From Dive Computer", CTRLCHAR "D", NULL, NULL }, { "AddDive", GTK_STOCK_ADD, "Add Dive", NULL, NULL, G_CALLBACK(add_dive_cb) }, { "Preferences", GTK_STOCK_PREFERENCES, "Preferences", PREFERENCE_ACCEL, NULL, G_CALLBACK(preferences_dialog) }, { "Renumber", NULL, "Renumber", NULL, NULL, G_CALLBACK(renumber_dialog) }, @@ -911,7 +912,7 @@ static const gchar* ui_string = " \ \ \ \ - \ + \ \ \ \ @@ -920,8 +921,10 @@ static const gchar* ui_string = " \ \ \ \ + \ + \ \ - \ + \ \ \ \ -- cgit v1.2.3-70-g09d2