[PATCH] Reorganise view menus and file import.

[amit.k.chaudhuri at gmail.com]

From: Amit Chaudhuri <amit.k.chaudhuri at gmail.com>

Move the view submenu to a top level location.

Alter the wording of File|Import to drop XML qualifier; we import more
formats than this.

Signed-off-by: Amit Chaudhuri <amit.k.chaudhuri at gmail.com>
---
 Documentation/user-manual.txt |   33 +++++++++++++++++++--------------
 gtk-gui.c                     |   22 +++++++++++-----------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 8284d63..20ebff2 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -62,7 +62,7 @@ at all. This is because the program doesn't have any information available.
 If you have used the program before and saved the data, the program will
 automatically load the already available divelog files.
 
-There is a menu, containing 'File', 'Log', 'Filter', 'Planner' and 'Help'.
+There is a menu, containing 'File', 'Log', 'View', 'Filter', 'Planner' and 'Help'.
 
 The screen is divided in 3 area's (shown below with test dives loaded):
 
@@ -717,10 +717,10 @@ JDiveLog stores its information into files with the extension of .jlb.
 These .jlb contain all the information that has been stored, except your
 images in XML format.
 
-By using the menu 'File - Import XML File(s)' you get a popup asking
+By using the menu 'File - Import File(s)' you get a popup asking
 for the file name.  To import your JDiveLog file(s) do the following:
 
- - Open 'File - Import XML Files(s)' on the menu
+ - Open 'File - Import File(s)' on the menu
  - Browse your directories to the location where your *.jlb file is
  - Select your existing *.jlb file and click 'open'
  - Click the OK button in the popup
@@ -810,7 +810,7 @@ Reading Suunto DM4 backup in Subsurface
 Importing the logs from DM4 does not require any special steps. You just
 do the following:
 
- - Open the following menu 'File - Import XML Files(s)'
+ - Open the following menu 'File - Import File(s)'
  - Browse your directories to the location where your DM4 backup is
    stored
  - Select the backup file you want to import and click 'Open'
@@ -827,7 +827,7 @@ Importing Dives from MacDive
 Importing logs from MacDive is as easy as it gets. Do the following
 steps in Subsurface:
 
- - Open the following menu 'File - Import XML Files(s)'
+ - Open the following menu 'File - Import File(s)'
  - Browse your directories to the location where your MacDive logs are
    stored
  - Select the log file(s) you want to import and click 'open'
@@ -865,7 +865,7 @@ Import divelogs.de to Subsurface
 The import works similarly as importing any other divelogs. Just do the
 following steps on Subsurface:
 
- - Open the following menu 'File - Import XML Files(s)'
+ - Open the following menu 'File - Import File(s)'
  - Browse your directories to the location where yourUserName.DLD is
  - Select the log file and click OK
 
@@ -1085,7 +1085,7 @@ The file menu is used for the following menu options:
  - Save::		Save your current divelogs or changes you made to your divelogs
  - Save As::		Save your current divelogs or changes you made to your divelogs under a different name
  - Close::		Close your current divelog, saving as necessary
- - Import XML File(s)::	Import your dives from files exported by other divelogs
+ - Import File(s)::	Import your dives from files exported by other divelogs
  - Print::		Print your current divelog profiles and information about the dive
  - Preferences::	Set your preferences as described in <<S_SettingUpPreferences,chapter Setting up Preferences>>
  - Quit::		Quit the program
@@ -1109,13 +1109,18 @@ Within the Log menu, you will find the following sub-items:
 			show a minimum of 30m / 90ft. This can be changed to be only 10m / 30ft.
  - Yearly Statistics::	Contrary to the Statistics in the main display, these are purely calendar based
  - Dives Locations::    Show an interactive map with locations of the logged dives with GPS coordinates
- - View::		This is a submenu containing:
-	* List::		Show only the list of dives you have made
-	* Profile::	Show only the dive profile of the selected dive
-	* Info::		Show only the 3 tab information screen
-	* Three::		Show the 'default' 3 screen setup
-	* Prev DC		Switch to the previous dive computer
-	* Next DC		Switch to the next dive computer
+
+The View Menu
+~~~~~~~~~~~~~
+
+The view menu allows you to choose between the following representations:
+
+ - List::		Show only the list of dives you have made
+ - Profile::		Show only the dive profile of the selected dive
+ - Info::		Show only the 3 tab information screen
+ - Three::		Show the 'default' 3 screen setup
+ - Prev DC		Switch to the previous dive computer
+ - Next DC		Switch to the next dive computer
 
 The Filter Menu
 ~~~~~~~~~~~~~~~
diff --git a/gtk-gui.c b/gtk-gui.c
index 31d68c3..e63b3e6 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -1493,7 +1493,7 @@ static GtkActionEntry menu_items[] = {
 	{ "SaveAsFile",     GTK_STOCK_SAVE_AS, N_("Save As..."),   SHIFTCHAR CTRLCHAR "S", NULL, G_CALLBACK(file_save_as) },
 	{ "CloseFile",      GTK_STOCK_CLOSE, N_("Close"), NULL, NULL, G_CALLBACK(file_close) },
 	{ "Print",          GTK_STOCK_PRINT, N_("Print..."),  CTRLCHAR "P", NULL, G_CALLBACK(do_print) },
-	{ "ImportFile",     NULL, N_("Import XML File(s)..."), CTRLCHAR "I", NULL, G_CALLBACK(import_files) },
+	{ "ImportFile",     NULL, N_("Import File(s)..."), CTRLCHAR "I", NULL, G_CALLBACK(import_files) },
 	{ "DownloadLog",    NULL, N_("Download From Dive Computer..."), CTRLCHAR "D", NULL, G_CALLBACK(download_dialog) },
 	{ "DownloadWeb",    GTK_STOCK_CONNECT, N_("Download From Web Service..."), NULL, NULL, G_CALLBACK(webservice_download_dialog) },
 	{ "AddDive",        GTK_STOCK_ADD, N_("Add Dive..."), NULL, NULL, G_CALLBACK(add_dive_cb) },
@@ -1552,18 +1552,18 @@ static const gchar* ui_string = " \
 				<menuitem name=\"Renumber\" action=\"Renumber\" /> \
 				<menuitem name=\"Autogroup\" action=\"Autogroup\" /> \
 				<menuitem name=\"Toggle Zoom\" action=\"ToggleZoom\" /> \
-				<menuitem name=\"YearlyStats\" action=\"YearlyStats\" /> "
+				<menuitem name=\"YearlyStats\" action=\"YearlyStats\" />"
 #if HAVE_OSM_GPS_MAP
-				"<menuitem name=\"DivesLocations\" action=\"DivesLocations\" /> "
+				"<menuitem name=\"Dive Locations\" action=\"DivesLocations\" /> "
 #endif
-				"<menu name=\"View\" action=\"ViewMenuAction\"> \
-					<menuitem name=\"List\" action=\"ViewList\" /> \
-					<menuitem name=\"Profile\" action=\"ViewProfile\" /> \
-					<menuitem name=\"Info\" action=\"ViewInfo\" /> \
-					<menuitem name=\"Paned\" action=\"ViewThree\" /> \
-					<menuitem name=\"PrevDC\" action=\"PrevDC\" /> \
-					<menuitem name=\"NextDC\" action=\"NextDC\" /> \
-				</menu> \
+			"</menu> \
+			<menu name=\"ViewMenu\" action=\"ViewMenuAction\"> \
+				<menuitem name=\"List\" action=\"ViewList\" /> \
+				<menuitem name=\"Profile\" action=\"ViewProfile\" /> \
+				<menuitem name=\"Info\" action=\"ViewInfo\" /> \
+				<menuitem name=\"Paned\" action=\"ViewThree\" /> \
+				<menuitem name=\"PrevDC\" action=\"PrevDC\" /> \
+				<menuitem name=\"NextDC\" action=\"NextDC\" /> \
 			</menu> \
 			<menu name=\"FilterMenu\" action=\"FilterMenuAction\"> \
 				<menuitem name=\"SelectEvents\" action=\"SelectEvents\" /> \
-- 
1.7.10.4