From c77f057912c843fc35b99347e9892ca1c5e44078 Mon Sep 17 00:00:00 2001 From: adv Date: Wed, 11 Dec 2013 09:43:16 +0000 Subject: [PATCH] Icons and tool bar operation for Digue(dam) object (Feature #192). --- src/HYDROGUI/HYDROGUI_Operations.cxx | 5 +++-- src/HYDROGUI/resources/HYDROGUI_images.ts | 13 +++++++++++-- src/HYDROGUI/resources/icon_create_digue.png | Bin 0 -> 322 bytes src/HYDROGUI/resources/icon_digue.png | Bin 0 -> 322 bytes src/HYDROGUI/resources/icon_edit_digue.png | Bin 0 -> 322 bytes src/HYDROGUI/resources/icon_mdigue.png | Bin 0 -> 634 bytes 6 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 src/HYDROGUI/resources/icon_create_digue.png create mode 100644 src/HYDROGUI/resources/icon_digue.png create mode 100644 src/HYDROGUI/resources/icon_edit_digue.png create mode 100644 src/HYDROGUI/resources/icon_mdigue.png diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx index 1114381a..c9fca653 100644 --- 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( 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" ); @@ -239,6 +239,7 @@ void HYDROGUI_Module::createToolbars() createTool( separator(), aToolBar ); createTool( CreateChannelId, aToolBar ); + createTool( CreateDigueId, aToolBar ); createTool( separator(), aToolBar ); createTool( CreateImmersibleZoneId, aToolBar ); diff --git a/src/HYDROGUI/resources/HYDROGUI_images.ts b/src/HYDROGUI/resources/HYDROGUI_images.ts index 4b318be2..d21689e2 100644 --- a/src/HYDROGUI/resources/HYDROGUI_images.ts +++ b/src/HYDROGUI/resources/HYDROGUI_images.ts @@ -74,7 +74,7 @@ HYDRO_TYPE11_ICO - icon_hydro_obj.png + icon_digue.png HYDRO_TYPE12_ICO @@ -164,7 +164,7 @@ HYDRO_M_TYPE11_ICO - icon_mhydro_obj.png + icon_mdigue.png HYDRO_M_TYPE12_ICO @@ -295,6 +295,15 @@ icon_edit_channel.png + + CREATE_DIGUE_ICO + icon_create_digue.png + + + EDIT_DIGUE_ICO + icon_edit_digue.png + + IMPORT_OBSTACLE_FROM_FILE_ICO icon_import_obstacle.png diff --git a/src/HYDROGUI/resources/icon_create_digue.png b/src/HYDROGUI/resources/icon_create_digue.png new file mode 100644 index 0000000000000000000000000000000000000000..06176648d2687e6dedb9f8e05da7f2d110c323f0 GIT binary patch literal 322 zcmV-I0lof-P)Ko2Q`22w&KB+#<+vy12>jiiGdQv*s32yx+_OA--r%$lWuNLYH( zXrBGq;~~0(XuEfc_#=;w94p{=@UW)_Cl-n#=ckBxX1x&?eDeV!$EsL4A_Eh+Q9sFJ zD_-4wQq7*2L5ur@0T4`KR)r~TFcEK+axFbw3RSxIurVNo!;jYK1R2s#GXUJk^EfMD zxVxFa<0wfBQ=GNN11<4LbK@0~9no&xPAJ`ZdBIMQ-07*qoM6N<$f+W<8RR910 literal 0 HcmV?d00001 diff --git a/src/HYDROGUI/resources/icon_digue.png b/src/HYDROGUI/resources/icon_digue.png new file mode 100644 index 0000000000000000000000000000000000000000..06176648d2687e6dedb9f8e05da7f2d110c323f0 GIT binary patch literal 322 zcmV-I0lof-P)Ko2Q`22w&KB+#<+vy12>jiiGdQv*s32yx+_OA--r%$lWuNLYH( zXrBGq;~~0(XuEfc_#=;w94p{=@UW)_Cl-n#=ckBxX1x&?eDeV!$EsL4A_Eh+Q9sFJ zD_-4wQq7*2L5ur@0T4`KR)r~TFcEK+axFbw3RSxIurVNo!;jYK1R2s#GXUJk^EfMD zxVxFa<0wfBQ=GNN11<4LbK@0~9no&xPAJ`ZdBIMQ-07*qoM6N<$f+W<8RR910 literal 0 HcmV?d00001 diff --git a/src/HYDROGUI/resources/icon_edit_digue.png b/src/HYDROGUI/resources/icon_edit_digue.png new file mode 100644 index 0000000000000000000000000000000000000000..06176648d2687e6dedb9f8e05da7f2d110c323f0 GIT binary patch literal 322 zcmV-I0lof-P)Ko2Q`22w&KB+#<+vy12>jiiGdQv*s32yx+_OA--r%$lWuNLYH( zXrBGq;~~0(XuEfc_#=;w94p{=@UW)_Cl-n#=ckBxX1x&?eDeV!$EsL4A_Eh+Q9sFJ zD_-4wQq7*2L5ur@0T4`KR)r~TFcEK+axFbw3RSxIurVNo!;jYK1R2s#GXUJk^EfMD zxVxFa<0wfBQ=GNN11<4LbK@0~9no&xPAJ`ZdBIMQ-07*qoM6N<$f+W<8RR910 literal 0 HcmV?d00001 diff --git a/src/HYDROGUI/resources/icon_mdigue.png b/src/HYDROGUI/resources/icon_mdigue.png new file mode 100644 index 0000000000000000000000000000000000000000..e079fb17f642955dc90acb97051da17a214adeb9 GIT binary patch literal 634 zcmV-=0)_pFP)cKz>_?n;umWQjRsnb`@aygC)wSeG1V zd{Ih`qLdoLt=@B}^)7&U0Ole+Urwo?xuj%fLvmOPAq3BczXmW zv=DTE*MbLO8=_&mh((UqNV7uPXupSl#F8+`Tx&!zVnp#?m3_+deU*rstJdi`Gq6kf z{dADzP3DQRze(fZXszSW9wp2wt>f6*8lC4gy=gSAwNTEgK!>VQJ