refs #596, #597: redesign of HYDRO main menu: create new Image and Polyline items.

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 98e3ee3c6c8a59610ecd179d474a8f6d2330b3ad..3ede1f216c9e16197f7606e7538dee7725c9864d 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -237,21 +237,30 @@ void HYDROGUI_Module::createMenus()
 
   int aHydroMenu = 6; // Edit menu id == 5, View menu id == 10
   int aHydroId = createMenu( tr( "MEN_DESK_HYDRO" ), -1, -1, aHydroMenu );
-  createMenu( ImportImageId, aHydroId, -1, -1 );
-  createMenu( ImportPolylineId, aHydroId, -1, -1 );
   createMenu( ImportSinusXId, aHydroId, -1, -1 );
   createMenu( ExportSinusXId, aHydroId, -1, -1 );
   createMenu( ImportLandcoverId, aHydroId, -1, -1 );
   
   createMenu( ImportBathymetryId, aHydroId, -1, -1 );
   createMenu( ImportStricklerTableFromFileId, aHydroId, -1, -1 );
-  createMenu( CreatePolylineId, aHydroId, -1, -1 );
   createMenu( CreatePolyline3DId, aHydroId, -1, -1 );
   createMenu( CreateImmersibleZoneId, aHydroId, -1, -1 );
   createMenu( CreateChannelId, aHydroId, -1, -1 );
   createMenu( CreateDigueId, aHydroId, -1, -1 );  
   createMenu( CreateLandCoverId, aHydroId, -1, -1 );  
 
+  int aNewImageId = createMenu( tr( "MEN_DESK_IMAGE" ), aHydroId, -1 );
+  createMenu( ImportImageId, aNewImageId, -1, -1 );
+  createMenu( FuseImagesId, aNewImageId, -1, -1 );
+  createMenu( CutImagesId, aNewImageId, -1, -1 );
+  createMenu( SplitImageId, aNewImageId, -1, -1 );
+
+  int aNewPolylineId = createMenu( tr( "MEN_DESK_POLYLINE" ), aHydroId, -1 );
+  createMenu( ImportPolylineId, aNewPolylineId, -1, -1 );
+  createMenu( CreatePolylineId, aNewPolylineId, -1, -1 );
+  createMenu( SplitPolylinesId, aNewPolylineId, -1, -1 );
+  createMenu( MergePolylinesId, aNewPolylineId, -1, -1 );
+
   int aNewProfileId = createMenu( tr( "MEN_DESK_PROFILE" ), aHydroId, -1 );
   createMenu( CreateProfileId, aNewProfileId, -1, -1 );
   createMenu( ImportProfilesId, aNewProfileId, -1, -1 );
@@ -271,12 +280,6 @@ void HYDROGUI_Module::createMenus()
   createMenu( separator(), aHydroId );
   createMenu( EditLocalCSId, aHydroId, -1, -1 );
   createMenu( separator(), aHydroId );
-  createMenu( FuseImagesId, aHydroId, -1, -1 );
-  createMenu( CutImagesId, aHydroId, -1, -1 );
-  createMenu( SplitImageId, aHydroId, -1, -1 );
-  createMenu( separator(), aHydroId );
-  createMenu( SplitPolylinesId, aHydroId, -1, -1 );
-  createMenu( MergePolylinesId, aHydroId, -1, -1 );
 }
 
 void HYDROGUI_Module::createPopups()

diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index 7f5cf26d9b0670a827c57901e705bfe1273368bb..e17eafe2250160fc7e498ca595052a7214321b44 100644 (file)
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -1166,6 +1166,14 @@ Would you like to remove all references from the image?</translation>
       <source>MEN_DESK_PROFILE</source>
       <translation>Profile</translation>
     </message>
+    <message>
+      <source>MEN_DESK_IMAGE</source>
+      <translation>Image</translation>
+    </message>
+    <message>
+      <source>MEN_DESK_POLYLINE</source>
+      <translation>Polyline</translation>
+    </message>
     <message>
       <source>MEN_EDIT_CALCULATION</source>
       <translation>Edit calculation case</translation>