Move the "Import" function from the File menu to the Log menu

Sure, you can import a file too, but it really makes more sense to have
the actions related to importing new logs under "Log", I think.  I don't
think of it as a file operation.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/README b/README
index d7ed22a796039fc3ac30268ad7523fa1924e6757..66d953075e013b4de5df063b75bfac97b711d9b3 100644 (file)
--- a/README
+++ b/README
@@ -38,7 +38,7 @@ just do
        make
        ./subsurface
 
-and select "Import" from the File menu, tell it what dive computer you
+and select "Import" from the Log menu, tell it what dive computer you
 have (and where it is connected if you need to), and hit "OK".
 
 NOTE! There are often multiple models of dive computers that import

diff --git a/gtk-gui.c b/gtk-gui.c
index 0bc79954f49124b413cd84dbb08737f659a817df..23848f8923c11c16c3d48dfe51a9f20c615db51c 100644 (file)
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -624,13 +624,13 @@ static const gchar* ui_string = " \
                                <menuitem name=\"Save\" action=\"SaveFile\" /> \
                                <menuitem name=\"Print\" action=\"Print\" /> \
                                <separator name=\"Separator1\"/> \
-                               <menuitem name=\"Import\" action=\"Import\" /> \
-                               <separator name=\"Separator2\"/> \
                                <menuitem name=\"Preferences\" action=\"Preferences\" /> \
-                               <separator name=\"Separator3\"/> \
+                               <separator name=\"Separator2\"/> \
                                <menuitem name=\"Quit\" action=\"Quit\" /> \
                        </menu> \
                        <menu name=\"LogMenu\" action=\"LogMenuAction\"> \
+                               <menuitem name=\"Import\" action=\"Import\" /> \
+                               <separator name=\"Separator\"/> \
                                <menuitem name=\"Renumber\" action=\"Renumber\" /> \
                                <menu name=\"View\" action=\"ViewMenuAction\"> \
                                        <menuitem name=\"List\" action=\"ViewList\" /> \