Commit 6d476647 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

arts: Add network, geometry, friction, etc. icons and add toolbar on mainwindow.

Showing with 43 additions and 3 deletions
+43 -3
File added
File added
No preview for this file type
File added
...@@ -283,6 +283,30 @@ ...@@ -283,6 +283,30 @@
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="action_toolBar_run_solver"/> <addaction name="action_toolBar_run_solver"/>
<addaction name="separator"/> <addaction name="separator"/>
</widget>
<widget class="QToolBar" name="toolBar_modelling">
<property name="font">
<font>
<family>Ubuntu</family>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="windowTitle">
<string>toolBar_2</string>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<attribute name="toolBarArea">
<enum>LeftToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="action_toolBar_network"/> <addaction name="action_toolBar_network"/>
<addaction name="action_toolBar_geometry"/> <addaction name="action_toolBar_geometry"/>
<addaction name="action_toolBar_boundary_cond"/> <addaction name="action_toolBar_boundary_cond"/>
...@@ -508,7 +532,7 @@ ...@@ -508,7 +532,7 @@
<action name="action_toolBar_network"> <action name="action_toolBar_network">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/reseau3_24.png</normaloff>ressources/reseau3_24.png</iconset> <normaloff>ressources/network.png</normaloff>ressources/network.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>River network</string> <string>River network</string>
...@@ -520,7 +544,7 @@ ...@@ -520,7 +544,7 @@
<action name="action_toolBar_geometry"> <action name="action_toolBar_geometry">
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff>ressources/geometrie0.png</normaloff>ressources/geometrie0.png</iconset> <normaloff>ressources/geometry.png</normaloff>ressources/geometry.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Geometry</string> <string>Geometry</string>
...@@ -530,6 +554,10 @@ ...@@ -530,6 +554,10 @@
</property> </property>
</action> </action>
<action name="action_toolBar_boundary_cond"> <action name="action_toolBar_boundary_cond">
<property name="icon">
<iconset>
<normaloff>ressources/boundary_condition.png</normaloff>ressources/boundary_condition.png</iconset>
</property>
<property name="text"> <property name="text">
<string>Boundary conditions</string> <string>Boundary conditions</string>
</property> </property>
...@@ -541,6 +569,10 @@ ...@@ -541,6 +569,10 @@
</property> </property>
</action> </action>
<action name="action_toolBar_lateral_contrib"> <action name="action_toolBar_lateral_contrib">
<property name="icon">
<iconset>
<normaloff>ressources/lateral_contribution.png</normaloff>ressources/lateral_contribution.png</iconset>
</property>
<property name="text"> <property name="text">
<string>Lateral contribution</string> <string>Lateral contribution</string>
</property> </property>
...@@ -549,6 +581,10 @@ ...@@ -549,6 +581,10 @@
</property> </property>
</action> </action>
<action name="action_toolBar_frictions"> <action name="action_toolBar_frictions">
<property name="icon">
<iconset>
<normaloff>ressources/friction.png</normaloff>ressources/friction.png</iconset>
</property>
<property name="text"> <property name="text">
<string>Friction</string> <string>Friction</string>
</property> </property>
...@@ -569,6 +605,10 @@ ...@@ -569,6 +605,10 @@
</property> </property>
</action> </action>
<action name="action_toolBar_initial_cond"> <action name="action_toolBar_initial_cond">
<property name="icon">
<iconset>
<normaloff>ressources/initial_condition.png</normaloff>ressources/initial_condition.png</iconset>
</property>
<property name="text"> <property name="text">
<string>Initial conditions</string> <string>Initial conditions</string>
</property> </property>
......
src/View/ui/ressources/boundary_condition.png

26.2 KB

src/View/ui/ressources/friction.png

20.4 KB

src/View/ui/ressources/geometry.png

16.3 KB

src/View/ui/ressources/initial_condition.png

22.7 KB

src/View/ui/ressources/lateral_contribution.png

26.8 KB

src/View/ui/ressources/network.png

19.4 KB

...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
@@@@@@ @@@**************@@@@@@@@ @@@@@@@@@@@@@ @@@@@@ @@@**************@@@@@@@@ @@@@@@@@@@@@@
@@@@@@ @**************# @@@@@@ ******@@@@@@ @@@@@@ @@@@@@ @**************# @@@@@@ ******@@@@@@ @@@@@@
@@@@@@ +************** @@@@@ ********@@@@@ @@@@@@@ @@@@@@ +************** @@@@@ ********@@@@@ @@@@@@@
@@@@@@ ***********************@@@@@**************@@@@ @@@@@@@ @@@@@@ ******************************************@@@@ @@@@@@@
@@@@@@ ******************************************@@@@ @@@@@@@ @@@@@@ ******************************************@@@@ @@@@@@@
@@@@@@@@@@@ ******************************************@@@@@@ @@@@@@@ @@@@@@@@@@@ ******************************************@@@@@@ @@@@@@@
****************************************** ******************************************
......
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