diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-09-15 11:41:38 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-09-17 21:03:29 -0400 |
| commit | b2727ecfda729164a3d18c73787ccc67bd94c1aa (patch) | |
| tree | 0d1b9582dea646daa77e20a3137a890f4bcecab9 /gtk-gui.c | |
| parent | d3bf8af7fe2d862b2b4188332776f86cde00cbe6 (diff) | |
| download | subsurface-b2727ecfda729164a3d18c73787ccc67bd94c1aa.tar.gz | |
Move Import menu entry back to File menu
This should make things more consistent, especially now that "Open"
actually does just that and no longer behaves almost like "Import".
The downside is that the import from a dive computer is now in the File
menu as well and no longer in the Log menu, where Linus originally had
moved it to in commit 3cace090989b.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'gtk-gui.c')
| -rw-r--r-- | gtk-gui.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -862,7 +862,7 @@ 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", NULL, "Import", NULL, NULL, G_CALLBACK(import_dialog) }, + { "Import", NULL, "Import", SHIFTCHAR CTRLCHAR "O", NULL, G_CALLBACK(import_dialog) }, { "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) }, @@ -887,6 +887,7 @@ static const gchar* ui_string = " \ <menubar name=\"MainMenu\"> \ <menu name=\"FileMenu\" action=\"FileMenuAction\"> \ <menuitem name=\"Open\" action=\"OpenFile\" /> \ + <menuitem name=\"Import\" action=\"Import\" /> \ <menuitem name=\"Save\" action=\"SaveFile\" /> \ <menuitem name=\"Save As\" action=\"SaveAsFile\" /> \ <menuitem name=\"Close\" action=\"CloseFile\" /> \ @@ -897,7 +898,6 @@ static const gchar* ui_string = " \ <menuitem name=\"Quit\" action=\"Quit\" /> \ </menu> \ <menu name=\"LogMenu\" action=\"LogMenuAction\"> \ - <menuitem name=\"Import\" action=\"Import\" /> \ <menuitem name=\"Add Dive\" action=\"AddDive\" /> \ <separator name=\"Separator\"/> \ <menuitem name=\"Renumber\" action=\"Renumber\" /> \ |