diff --git a/arts/add.kra b/arts/add.kra new file mode 100644 index 00000000..bb2dc3e4 Binary files /dev/null and b/arts/add.kra differ diff --git a/arts/del.kra b/arts/del.kra new file mode 100644 index 00000000..729512ca Binary files /dev/null and b/arts/del.kra differ diff --git a/arts/export.kra b/arts/export.kra new file mode 100644 index 00000000..9c088b37 Binary files /dev/null and b/arts/export.kra differ diff --git a/arts/import.kra b/arts/import.kra new file mode 100644 index 00000000..c3c15748 Binary files /dev/null and b/arts/import.kra differ diff --git a/arts/logo.kra b/arts/logo.kra index a9f016f5..da189f93 100644 Binary files a/arts/logo.kra and b/arts/logo.kra differ diff --git a/src/View/ui/AdditionalFileList.ui b/src/View/ui/AdditionalFileList.ui index 45da9fc6..841ba4ce 100644 --- a/src/View/ui/AdditionalFileList.ui +++ b/src/View/ui/AdditionalFileList.ui @@ -37,7 +37,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -49,7 +49,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/BasicHydraulicStructures.ui b/src/View/ui/BasicHydraulicStructures.ui index 5d16d92c..8754c420 100644 --- a/src/View/ui/BasicHydraulicStructures.ui +++ b/src/View/ui/BasicHydraulicStructures.ui @@ -103,7 +103,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -115,7 +115,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/BoundaryConditions.ui b/src/View/ui/BoundaryConditions.ui index 82064977..c34f898b 100644 --- a/src/View/ui/BoundaryConditions.ui +++ b/src/View/ui/BoundaryConditions.ui @@ -108,7 +108,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -123,7 +123,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/ConfigureDialog.ui b/src/View/ui/ConfigureDialog.ui index 5ff289d0..60dc9354 100644 --- a/src/View/ui/ConfigureDialog.ui +++ b/src/View/ui/ConfigureDialog.ui @@ -69,7 +69,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png @@ -223,7 +223,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png @@ -234,7 +234,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png diff --git a/src/View/ui/EditBoundaryConditions.ui b/src/View/ui/EditBoundaryConditions.ui index 101befa6..e5fba32b 100644 --- a/src/View/ui/EditBoundaryConditions.ui +++ b/src/View/ui/EditBoundaryConditions.ui @@ -80,7 +80,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -95,7 +95,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/EditLateralContribution.ui b/src/View/ui/EditLateralContribution.ui index 6a36a552..37d8128e 100644 --- a/src/View/ui/EditLateralContribution.ui +++ b/src/View/ui/EditLateralContribution.ui @@ -73,7 +73,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -88,7 +88,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/EditSedimentLayers.ui b/src/View/ui/EditSedimentLayers.ui index 6fe4c11b..6b5756b9 100644 --- a/src/View/ui/EditSedimentLayers.ui +++ b/src/View/ui/EditSedimentLayers.ui @@ -57,7 +57,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add sediment layer @@ -72,7 +72,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete sediment layer diff --git a/src/View/ui/Frictions.ui b/src/View/ui/Frictions.ui index 55839197..356766ee 100644 --- a/src/View/ui/Frictions.ui +++ b/src/View/ui/Frictions.ui @@ -68,7 +68,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -77,7 +77,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png delete diff --git a/src/View/ui/GeometryCrossSection.ui b/src/View/ui/GeometryCrossSection.ui index 6e6d62a5..18a9702f 100644 --- a/src/View/ui/GeometryCrossSection.ui +++ b/src/View/ui/GeometryCrossSection.ui @@ -62,7 +62,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png add @@ -74,7 +74,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png delete diff --git a/src/View/ui/GeometryReach.ui b/src/View/ui/GeometryReach.ui index 95e25be1..e07acdf8 100644 --- a/src/View/ui/GeometryReach.ui +++ b/src/View/ui/GeometryReach.ui @@ -129,6 +129,10 @@ + + + ressources/import.pngressources/import.png + Import @@ -137,6 +141,10 @@ + + + ressources/export.pngressources/export.png + Export @@ -147,7 +155,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png add @@ -159,7 +167,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png delete diff --git a/src/View/ui/HydraulicStructures.ui b/src/View/ui/HydraulicStructures.ui index 88056059..013bccdf 100644 --- a/src/View/ui/HydraulicStructures.ui +++ b/src/View/ui/HydraulicStructures.ui @@ -100,7 +100,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -112,7 +112,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/InitialConditions.ui b/src/View/ui/InitialConditions.ui index 405adee5..83a9b843 100644 --- a/src/View/ui/InitialConditions.ui +++ b/src/View/ui/InitialConditions.ui @@ -88,7 +88,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -100,7 +100,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png delete diff --git a/src/View/ui/LateralContributions.ui b/src/View/ui/LateralContributions.ui index ac32ee3e..11ffa52a 100644 --- a/src/View/ui/LateralContributions.ui +++ b/src/View/ui/LateralContributions.ui @@ -108,7 +108,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -123,7 +123,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/Network.ui b/src/View/ui/Network.ui index 812fc58f..1600b17e 100644 --- a/src/View/ui/Network.ui +++ b/src/View/ui/Network.ui @@ -209,7 +209,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add node or edge @@ -221,7 +221,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Remove node or edge diff --git a/src/View/ui/ProfileSedimentLayers.ui b/src/View/ui/ProfileSedimentLayers.ui index 05f6618e..d777fe34 100644 --- a/src/View/ui/ProfileSedimentLayers.ui +++ b/src/View/ui/ProfileSedimentLayers.ui @@ -42,7 +42,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add sediment layers @@ -54,7 +54,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete sediment layers diff --git a/src/View/ui/REPLineList.ui b/src/View/ui/REPLineList.ui index f9722d37..ea3fe793 100644 --- a/src/View/ui/REPLineList.ui +++ b/src/View/ui/REPLineList.ui @@ -37,7 +37,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -52,7 +52,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/Reservoir.ui b/src/View/ui/Reservoir.ui index d2dc3902..22e7e453 100644 --- a/src/View/ui/Reservoir.ui +++ b/src/View/ui/Reservoir.ui @@ -69,7 +69,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -81,7 +81,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/ReservoirList.ui b/src/View/ui/ReservoirList.ui index db3b822d..c53a7cd6 100644 --- a/src/View/ui/ReservoirList.ui +++ b/src/View/ui/ReservoirList.ui @@ -75,7 +75,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -87,7 +87,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/Results.ui b/src/View/ui/Results.ui index 6269cda6..f687d918 100644 --- a/src/View/ui/Results.ui +++ b/src/View/ui/Results.ui @@ -245,7 +245,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add diff --git a/src/View/ui/SedimentLayersList.ui b/src/View/ui/SedimentLayersList.ui index 399b0995..5074d1fe 100644 --- a/src/View/ui/SedimentLayersList.ui +++ b/src/View/ui/SedimentLayersList.ui @@ -56,7 +56,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add sediment layer @@ -65,7 +65,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete sediment layer diff --git a/src/View/ui/Stricklers.ui b/src/View/ui/Stricklers.ui index c27f9ff0..67939f79 100644 --- a/src/View/ui/Stricklers.ui +++ b/src/View/ui/Stricklers.ui @@ -64,7 +64,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -76,7 +76,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/about.ui b/src/View/ui/about.ui index 273d9de0..36f0efd7 100644 --- a/src/View/ui/about.ui +++ b/src/View/ui/about.ui @@ -6,8 +6,8 @@ 0 0 - 553 - 262 + 640 + 360 @@ -17,18 +17,8 @@ - + - - - - - - - ressources/Logo-INRAE.png - - - @@ -89,6 +79,16 @@ + + + + + + + ressources/Pamhyr2_logo.png + + + diff --git a/src/View/ui/ressources/Pamhyr2_logo.png b/src/View/ui/ressources/Pamhyr2_logo.png index 220199a2..b92e5184 100644 Binary files a/src/View/ui/ressources/Pamhyr2_logo.png and b/src/View/ui/ressources/Pamhyr2_logo.png differ diff --git a/src/View/ui/ressources/Pamhyr2_logo_512x512.png b/src/View/ui/ressources/Pamhyr2_logo_512x512.png new file mode 100644 index 00000000..220199a2 Binary files /dev/null and b/src/View/ui/ressources/Pamhyr2_logo_512x512.png differ diff --git a/src/View/ui/ressources/add.png b/src/View/ui/ressources/add.png new file mode 100644 index 00000000..00ec79a5 Binary files /dev/null and b/src/View/ui/ressources/add.png differ diff --git a/src/View/ui/ressources/del.png b/src/View/ui/ressources/del.png new file mode 100644 index 00000000..98386f23 Binary files /dev/null and b/src/View/ui/ressources/del.png differ diff --git a/src/View/ui/ressources/export.png b/src/View/ui/ressources/export.png index ee25f1cd..aa00493e 100644 Binary files a/src/View/ui/ressources/export.png and b/src/View/ui/ressources/export.png differ diff --git a/src/View/ui/ressources/import.png b/src/View/ui/ressources/import.png new file mode 100644 index 00000000..82d51b32 Binary files /dev/null and b/src/View/ui/ressources/import.png differ