diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2012-09-22 01:12:37 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2012-09-21 20:55:33 -0700 |
| commit | ff67ca92edfe5e5c74d58a6fa8021eccd6cb7cf9 (patch) | |
| tree | 8b4b3e2415906fb56e8572a2f6f26a62ef8af27b | |
| parent | 882cb159a46d5d9dbd0a6b92bc587d39bd8b82bc (diff) | |
| download | subsurface-ff67ca92edfe5e5c74d58a6fa8021eccd6cb7cf9.tar.gz | |
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 <neolit123@gmail.com>
| -rw-r--r-- | gtk-gui.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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 = " \ <menuitem name=\"Save As\" action=\"SaveAsFile\" /> \ <menuitem name=\"Close\" action=\"CloseFile\" /> \ <separator name=\"Separator1\"/> \ - <menuitem name=\"Import\" action=\"Import\" /> \ + <menuitem name=\"Import XML File\" action=\"ImportFile\" /> \ <separator name=\"Separator2\"/> \ <menuitem name=\"Print\" action=\"Print\" /> \ <separator name=\"Separator3\"/> \ @@ -920,8 +921,10 @@ static const gchar* ui_string = " \ <menuitem name=\"Quit\" action=\"Quit\" /> \ </menu> \ <menu name=\"LogMenu\" action=\"LogMenuAction\"> \ + <menuitem name=\"Download From Dive Computer\" action=\"DownloadLog\" /> \ + <separator name=\"Separator1\"/> \ <menuitem name=\"Add Dive\" action=\"AddDive\" /> \ - <separator name=\"Separator\"/> \ + <separator name=\"Separator2\"/> \ <menuitem name=\"Renumber\" action=\"Renumber\" /> \ <menuitem name=\"Autogroup\" action=\"Autogroup\" /> \ <menuitem name=\"Toggle Zoom\" action=\"ToggleZoom\" /> \ |