Skip to content
GitLab
Commit 77616431 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Arts: Add edit icon and some minor change.

parent 52ab9f4a
master 0.0.9 InitialConditions adists_new adists_num adists_release scenarios setup.py terraz_dev v1.2.0rc2 v1.0.2 v1.0.1 v1.0.0 v0.0.8 v0.0.8-patch-2 v0.0.8-patch-1
No related merge requests found
Pipeline #54514 passed with stages
in 56 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 95 additions and 31 deletions
+95 -31
arts/edit.kra 0 → 100644
+ 0
− 0
View file @ 77616431
File added
src/View/ui/BoundaryConditions.ui
+ 3
− 3
View file @ 77616431
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<action name="action_del"> <action name="action_del">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Delete</string> <string>Delete</string>
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<action name="action_sort"> <action name="action_sort">
<property name="icon"> <property name="icon">
<iconset> <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>
<property name="text"> <property name="text">
<string>Sort</string> <string>Sort</string>
......
src/View/ui/CheckList.ui
+ 1
− 1
View file @ 77616431
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/player_play.png</normaloff>ressources/player_play.png</iconset> <normaloff>ressources/run.png</normaloff>ressources/run.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
......
src/View/ui/ConfigureDialog.ui
+ 58
− 4
View file @ 77616431
...@@ -58,7 +58,16 @@ ...@@ -58,7 +58,16 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <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> </property>
</widget> </widget>
</item> </item>
...@@ -71,6 +80,15 @@ ...@@ -71,6 +80,15 @@
<iconset> <iconset>
<normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property> </property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -82,6 +100,15 @@ ...@@ -82,6 +100,15 @@
<iconset> <iconset>
<normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset> <normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
</property> </property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -171,7 +198,7 @@ ...@@ -171,7 +198,7 @@
</time> </time>
</property> </property>
<property name="currentSection"> <property name="currentSection">
<enum>QDateTimeEdit::MinuteSection</enum> <enum>QDateTimeEdit::HourSection</enum>
</property> </property>
<property name="displayFormat"> <property name="displayFormat">
<string>HH:mm:ss</string> <string>HH:mm:ss</string>
...@@ -223,7 +250,16 @@ ...@@ -223,7 +250,16 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <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> </property>
</widget> </widget>
</item> </item>
...@@ -236,6 +272,15 @@ ...@@ -236,6 +272,15 @@
<iconset> <iconset>
<normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property> </property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -245,7 +290,16 @@ ...@@ -245,7 +290,16 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <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> </property>
</widget> </widget>
</item> </item>
......
src/View/ui/DebugRepl.ui
+ 7
− 1
View file @ 77616431
...@@ -27,7 +27,13 @@ ...@@ -27,7 +27,13 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <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>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+Return</string> <string>Ctrl+Return</string>
......
src/View/ui/EditBoundaryConditions.ui
+ 3
− 3
View file @ 77616431
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<action name="action_del"> <action name="action_del">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Delete</string> <string>Delete</string>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<action name="action_sort"> <action name="action_sort">
<property name="icon"> <property name="icon">
<iconset> <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>
<property name="text"> <property name="text">
<string>Sort</string> <string>Sort</string>
......
src/View/ui/EditLateralContribution.ui
+ 3
− 3
View file @ 77616431
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<action name="action_del"> <action name="action_del">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Delete</string> <string>Delete</string>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<action name="action_sort"> <action name="action_sort">
<property name="icon"> <property name="icon">
<iconset> <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>
<property name="text"> <property name="text">
<string>Sort</string> <string>Sort</string>
......
src/View/ui/Frictions.ui
+ 3
− 3
View file @ 77616431
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<action name="action_add"> <action name="action_add">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<action name="action_del"> <action name="action_del">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>delete</string> <string>delete</string>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<action name="action_sort"> <action name="action_sort">
<property name="icon"> <property name="icon">
<iconset> <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>
<property name="text"> <property name="text">
<string>Sort</string> <string>Sort</string>
......
src/View/ui/InitialConditions.ui
+ 3
− 3
View file @ 77616431
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<action name="action_add"> <action name="action_add">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<action name="action_del"> <action name="action_del">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>delete</string> <string>delete</string>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<action name="action_sort"> <action name="action_sort">
<property name="icon"> <property name="icon">
<iconset> <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>
<property name="text"> <property name="text">
<string>sort</string> <string>sort</string>
......
src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui
+ 1
− 1
View file @ 77616431
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Discharge</string> <string>Discharge (m³/s)</string>
</property> </property>
</widget> </widget>
</item> </item>
......
src/View/ui/InitialConditions_Dialog_Generator_Height.ui
+ 1
− 1
View file @ 77616431
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Height</string> <string>Height (m)</string>
</property> </property>
</widget> </widget>
</item> </item>
......
src/View/ui/LateralContributions.ui
+ 3
− 3
View file @ 77616431
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<action name="action_del"> <action name="action_del">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Delete</string> <string>Delete</string>
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<action name="action_sort"> <action name="action_sort">
<property name="icon"> <property name="icon">
<iconset> <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>
<property name="text"> <property name="text">
<string>Sort</string> <string>Sort</string>
......
src/View/ui/Results.ui
+ 5
− 1
View file @ 77616431
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
<action name="action_add"> <action name="action_add">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
...@@ -260,6 +260,10 @@ ...@@ -260,6 +260,10 @@
</property> </property>
</action> </action>
<action name="action_export"> <action name="action_export">
<property name="icon">
<iconset>
<normaloff>ressources/export.png</normaloff>ressources/export.png</iconset>
</property>
<property name="text"> <property name="text">
<string>Export</string> <string>Export</string>
</property> </property>
......
src/View/ui/SelectSolver.ui
+ 1
− 1
View file @ 77616431
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/player_play.png</normaloff>ressources/player_play.png</iconset> <normaloff>ressources/run.png</normaloff>ressources/run.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
......
src/View/ui/Stricklers.ui
+ 3
− 3
View file @ 77616431
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<action name="action_add"> <action name="action_add">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<action name="action_del"> <action name="action_del">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Delete</string> <string>Delete</string>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<action name="action_sort"> <action name="action_sort">
<property name="icon"> <property name="icon">
<iconset> <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>
<property name="text"> <property name="text">
<string>Sort</string> <string>Sort</string>
......
src/View/ui/ressources/edit.png
+ 0
− 0
View replaced file @ 52ab9f4a View file @ 77616431
src/View/ui/ressources/edit.png

5.38 KB | W: | H:

src/View/ui/ressources/edit.png

12 KB | W: | H:

src/View/ui/ressources/edit.png
src/View/ui/ressources/edit.png
src/View/ui/ressources/edit.png
src/View/ui/ressources/edit.png
  • 2-up
  • Swipe
  • Onion skin
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment