diff --git a/arts/edit.kra b/arts/edit.kra new file mode 100644 index 0000000000000000000000000000000000000000..1c811352522e85d79481dbcd6d0024570d02b93e Binary files /dev/null and b/arts/edit.kra differ diff --git a/src/View/ui/BoundaryConditions.ui b/src/View/ui/BoundaryConditions.ui index c34f898b06bff8ee1021666d9894593933f9a297..9f2f1b99419c50c6e2ca7e1a4587468e55a4f15e 100644 --- a/src/View/ui/BoundaryConditions.ui +++ b/src/View/ui/BoundaryConditions.ui @@ -108,7 +108,7 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -123,7 +123,7 @@ <action name="action_del"> <property name="icon"> <iconset> - <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> <property name="text"> <string>Delete</string> @@ -153,7 +153,7 @@ <action name="action_sort"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset> + <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset> </property> <property name="text"> <string>Sort</string> diff --git a/src/View/ui/CheckList.ui b/src/View/ui/CheckList.ui index 001d92306f0726efbae46b67c0ac42aba3f71dfd..816c9097d33a5a53f923ffb1bec201a28c6a3c2a 100644 --- a/src/View/ui/CheckList.ui +++ b/src/View/ui/CheckList.ui @@ -67,7 +67,7 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/player_play.png</normaloff>ressources/player_play.png</iconset> + <normaloff>ressources/run.png</normaloff>ressources/run.png</iconset> </property> </widget> </item> diff --git a/src/View/ui/ConfigureDialog.ui b/src/View/ui/ConfigureDialog.ui index 60dc9354c6dc121ee6e9eebee8a090695008b488..590d0ca2ce4ea50d0537a09cd1b5a67613205c6f 100644 --- a/src/View/ui/ConfigureDialog.ui +++ b/src/View/ui/ConfigureDialog.ui @@ -58,7 +58,16 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/gtk_add.png</normaloff>ressources/gtk_add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> + </property> + <property name="flat"> + <bool>true</bool> </property> </widget> </item> @@ -71,6 +80,15 @@ <iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> + </property> + <property name="flat"> + <bool>true</bool> + </property> </widget> </item> <item> @@ -82,6 +100,15 @@ <iconset> <normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset> </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> + </property> + <property name="flat"> + <bool>true</bool> + </property> </widget> </item> <item> @@ -171,7 +198,7 @@ </time> </property> <property name="currentSection"> - <enum>QDateTimeEdit::MinuteSection</enum> + <enum>QDateTimeEdit::HourSection</enum> </property> <property name="displayFormat"> <string>HH:mm:ss</string> @@ -223,7 +250,16 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> + </property> + <property name="flat"> + <bool>true</bool> </property> </widget> </item> @@ -236,6 +272,15 @@ <iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> + </property> + <property name="flat"> + <bool>true</bool> + </property> </widget> </item> <item> @@ -245,7 +290,16 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset> + <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> + </property> + <property name="flat"> + <bool>true</bool> </property> </widget> </item> diff --git a/src/View/ui/DebugRepl.ui b/src/View/ui/DebugRepl.ui index c060c1c0b9898b15fd2a8deeb5bffc291649a21f..db4d069e5c599c88346dbd20c801103becc79680 100644 --- a/src/View/ui/DebugRepl.ui +++ b/src/View/ui/DebugRepl.ui @@ -27,7 +27,13 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/player_play.png</normaloff>ressources/player_play.png</iconset> + <normaloff>ressources/run.png</normaloff>ressources/run.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> </property> <property name="shortcut"> <string>Ctrl+Return</string> diff --git a/src/View/ui/EditBoundaryConditions.ui b/src/View/ui/EditBoundaryConditions.ui index e5fba32b7825acb72a25579c77c16df336518e0c..bfcf95052c191fd5d66efd9a4fdd009614f4cfb5 100644 --- a/src/View/ui/EditBoundaryConditions.ui +++ b/src/View/ui/EditBoundaryConditions.ui @@ -80,7 +80,7 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -95,7 +95,7 @@ <action name="action_del"> <property name="icon"> <iconset> - <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> <property name="text"> <string>Delete</string> @@ -110,7 +110,7 @@ <action name="action_sort"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset> + <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset> </property> <property name="text"> <string>Sort</string> diff --git a/src/View/ui/EditLateralContribution.ui b/src/View/ui/EditLateralContribution.ui index 37d8128ea583e76c1409ec69babd6c4bf5d2e03c..02e14bcba61effb9392b6108ba35f85941514708 100644 --- a/src/View/ui/EditLateralContribution.ui +++ b/src/View/ui/EditLateralContribution.ui @@ -73,7 +73,7 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -88,7 +88,7 @@ <action name="action_del"> <property name="icon"> <iconset> - <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> <property name="text"> <string>Delete</string> @@ -103,7 +103,7 @@ <action name="action_sort"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset> + <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset> </property> <property name="text"> <string>Sort</string> diff --git a/src/View/ui/Frictions.ui b/src/View/ui/Frictions.ui index 356766ee4d4e890bb573a7cad12b872f7676d7b8..e219bf7365efc584353af1f3bf6a8c23798ad6e8 100644 --- a/src/View/ui/Frictions.ui +++ b/src/View/ui/Frictions.ui @@ -68,7 +68,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -77,7 +77,7 @@ <action name="action_del"> <property name="icon"> <iconset> - <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> <property name="text"> <string>delete</string> @@ -86,7 +86,7 @@ <action name="action_sort"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset> + <normaloff>ressources/sort_1-9.png</normaloff>ressources/sort_1-9.png</iconset> </property> <property name="text"> <string>Sort</string> diff --git a/src/View/ui/InitialConditions.ui b/src/View/ui/InitialConditions.ui index 83a9b8436d32235c354904336729ef2073d2d93d..94a180dca131e4b084e874eccb9d43890438b58d 100644 --- a/src/View/ui/InitialConditions.ui +++ b/src/View/ui/InitialConditions.ui @@ -88,7 +88,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -100,7 +100,7 @@ <action name="action_del"> <property name="icon"> <iconset> - <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> <property name="text"> <string>delete</string> @@ -112,7 +112,7 @@ <action name="action_sort"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset> + <normaloff>ressources/sort_1-9.png</normaloff>ressources/sort_1-9.png</iconset> </property> <property name="text"> <string>sort</string> diff --git a/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui b/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui index 7e310e96f5a736ab3056985ad953bdae9aa41806..9545197a821c6c6ce081b905a94b9c3e1b1f4328 100644 --- a/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui +++ b/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui @@ -22,7 +22,7 @@ <item> <widget class="QLabel" name="label"> <property name="text"> - <string>Discharge</string> + <string>Discharge (m³/s)</string> </property> </widget> </item> diff --git a/src/View/ui/InitialConditions_Dialog_Generator_Height.ui b/src/View/ui/InitialConditions_Dialog_Generator_Height.ui index 3c13935ab73a64050bdc97448b7a9357e9426e4b..573734c8025da19c2459cabfdec081c88b0c59ff 100644 --- a/src/View/ui/InitialConditions_Dialog_Generator_Height.ui +++ b/src/View/ui/InitialConditions_Dialog_Generator_Height.ui @@ -22,7 +22,7 @@ <item> <widget class="QLabel" name="label"> <property name="text"> - <string>Height</string> + <string>Height (m)</string> </property> </widget> </item> diff --git a/src/View/ui/LateralContributions.ui b/src/View/ui/LateralContributions.ui index 11ffa52ae7a3d773dcb039826841d7f70cc91947..d8d81b79cadb6bd83a69b1a1c559bdba4aaf66ff 100644 --- a/src/View/ui/LateralContributions.ui +++ b/src/View/ui/LateralContributions.ui @@ -108,7 +108,7 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -123,7 +123,7 @@ <action name="action_del"> <property name="icon"> <iconset> - <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> <property name="text"> <string>Delete</string> @@ -153,7 +153,7 @@ <action name="action_sort"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset> + <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset> </property> <property name="text"> <string>Sort</string> diff --git a/src/View/ui/Results.ui b/src/View/ui/Results.ui index f687d918799ef0b80229588060a9a2fe7430c8a5..3926aff210c535e0269c561f879e6a2c1cffed6f 100644 --- a/src/View/ui/Results.ui +++ b/src/View/ui/Results.ui @@ -245,7 +245,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -260,6 +260,10 @@ </property> </action> <action name="action_export"> + <property name="icon"> + <iconset> + <normaloff>ressources/export.png</normaloff>ressources/export.png</iconset> + </property> <property name="text"> <string>Export</string> </property> diff --git a/src/View/ui/SelectSolver.ui b/src/View/ui/SelectSolver.ui index 7d5bd578262efcdf22f7858b06327f8bae6fcd3e..265c42aec40d973ee537b57a4aa8cf8911d0f970 100644 --- a/src/View/ui/SelectSolver.ui +++ b/src/View/ui/SelectSolver.ui @@ -42,7 +42,7 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/player_play.png</normaloff>ressources/player_play.png</iconset> + <normaloff>ressources/run.png</normaloff>ressources/run.png</iconset> </property> </widget> </item> diff --git a/src/View/ui/Stricklers.ui b/src/View/ui/Stricklers.ui index 67939f79f05bd5fad459fb46bffe5362701ad0f5..a7dbd8e9d7efdd562fbca1da0d9d912a147e1036 100644 --- a/src/View/ui/Stricklers.ui +++ b/src/View/ui/Stricklers.ui @@ -64,7 +64,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -76,7 +76,7 @@ <action name="action_del"> <property name="icon"> <iconset> - <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> <property name="text"> <string>Delete</string> @@ -88,7 +88,7 @@ <action name="action_sort"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset> + <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset> </property> <property name="text"> <string>Sort</string> diff --git a/src/View/ui/ressources/edit.png b/src/View/ui/ressources/edit.png index 1c5d322a3a00361e879dab1a5460f3571e1289ea..d95ebb9cb32372b899dc0d987d521ba371499b09 100644 Binary files a/src/View/ui/ressources/edit.png and b/src/View/ui/ressources/edit.png differ