Icons and tool bar operation for Digue(dam) object (Feature #192).

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 1114381aee4cc4816a9b4f8d480d6bdf4760fc58..c9fca653e8d192a0afdbc41b1b52cd5b54ef2d62 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -136,8 +136,8 @@ void HYDROGUI_Module::createActions()
   createAction( CreateChannelId, "CREATE_CHANNEL", "CREATE_CHANNEL_ICO" );
   createAction( EditChannelId, "EDIT_CHANNEL", "EDIT_CHANNEL_ICO" );
 
   createAction( CreateChannelId, "CREATE_CHANNEL", "CREATE_CHANNEL_ICO" );
   createAction( EditChannelId, "EDIT_CHANNEL", "EDIT_CHANNEL_ICO" );
 

-  createAction( CreateDigueId, "CREATE_DIGUE" );
-  createAction( EditDigueId, "EDIT_DIGUE" );
+  createAction( CreateDigueId, "CREATE_DIGUE", "CREATE_DIGUE_ICO" );
+  createAction( EditDigueId, "EDIT_DIGUE", "EDIT_DIGUE_ICO" );

 
   createAction( ImportObstacleFromFileId, "IMPORT_OBSTACLE_FROM_FILE", "IMPORT_OBSTACLE_FROM_FILE_ICO" );
   createAction( ImportGeomObjectId, "IMPORT_GEOM_OBJECT", "IMPORT_GEOM_OBJECT_ICO" );
 
   createAction( ImportObstacleFromFileId, "IMPORT_OBSTACLE_FROM_FILE", "IMPORT_OBSTACLE_FROM_FILE_ICO" );
   createAction( ImportGeomObjectId, "IMPORT_GEOM_OBJECT", "IMPORT_GEOM_OBJECT_ICO" );


@@ -239,6 +239,7 @@ void HYDROGUI_Module::createToolbars()
 
   createTool( separator(), aToolBar );
   createTool( CreateChannelId, aToolBar );
 
   createTool( separator(), aToolBar );
   createTool( CreateChannelId, aToolBar );

+  createTool( CreateDigueId, aToolBar );

 
   createTool( separator(), aToolBar );
   createTool( CreateImmersibleZoneId, aToolBar );
 
   createTool( separator(), aToolBar );
   createTool( CreateImmersibleZoneId, aToolBar );

diff --git a/src/HYDROGUI/resources/HYDROGUI_images.ts b/src/HYDROGUI/resources/HYDROGUI_images.ts
index 4b318be2d32dde09d5b932ffbc931b9e25aa585b..d21689e26f0f975bea51ee277c4b97be808a3dd4 100644 (file)
--- a/src/HYDROGUI/resources/HYDROGUI_images.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_images.ts
@@ -74,7 +74,7 @@
     </message>
     <message>
       <source>HYDRO_TYPE11_ICO</source>
     </message>
     <message>
       <source>HYDRO_TYPE11_ICO</source>

-      <translation>icon_hydro_obj.png</translation>
+      <translation>icon_digue.png</translation>

     </message>
     <message>
       <source>HYDRO_TYPE12_ICO</source>
     </message>
     <message>
       <source>HYDRO_TYPE12_ICO</source>


@@ -164,7 +164,7 @@
     </message>
     <message>
       <source>HYDRO_M_TYPE11_ICO</source>
     </message>
     <message>
       <source>HYDRO_M_TYPE11_ICO</source>

-      <translation>icon_mhydro_obj.png</translation>
+      <translation>icon_mdigue.png</translation>

     </message>
     <message>
       <source>HYDRO_M_TYPE12_ICO</source>
     </message>
     <message>
       <source>HYDRO_M_TYPE12_ICO</source>


@@ -295,6 +295,15 @@
       <translation>icon_edit_channel.png</translation>
     </message>
 
       <translation>icon_edit_channel.png</translation>
     </message>
 

+    <message>
+      <source>CREATE_DIGUE_ICO</source>
+      <translation>icon_create_digue.png</translation>
+    </message>
+    <message>
+      <source>EDIT_DIGUE_ICO</source>
+      <translation>icon_edit_digue.png</translation>
+    </message>
+

     <message>
       <source>IMPORT_OBSTACLE_FROM_FILE_ICO</source>
       <translation>icon_import_obstacle.png</translation>
     <message>
       <source>IMPORT_OBSTACLE_FROM_FILE_ICO</source>
       <translation>icon_import_obstacle.png</translation>

diff --git a/src/HYDROGUI/resources/icon_create_digue.png b/src/HYDROGUI/resources/icon_create_digue.png
new file mode 100644 (file)
index 0000000..0617664
Binary files /dev/null and b/src/HYDROGUI/resources/icon_create_digue.png differ

diff --git a/src/HYDROGUI/resources/icon_digue.png b/src/HYDROGUI/resources/icon_digue.png
new file mode 100644 (file)
index 0000000..0617664
Binary files /dev/null and b/src/HYDROGUI/resources/icon_digue.png differ

diff --git a/src/HYDROGUI/resources/icon_edit_digue.png b/src/HYDROGUI/resources/icon_edit_digue.png
new file mode 100644 (file)
index 0000000..0617664
Binary files /dev/null and b/src/HYDROGUI/resources/icon_edit_digue.png differ

diff --git a/src/HYDROGUI/resources/icon_mdigue.png b/src/HYDROGUI/resources/icon_mdigue.png
new file mode 100644 (file)
index 0000000..e079fb1
Binary files /dev/null and b/src/HYDROGUI/resources/icon_mdigue.png differ