diff --git a/arts/friction.kra b/arts/friction.kra new file mode 100644 index 0000000000000000000000000000000000000000..15d065b955747e74dc176f6d5e6db10928a5f61c Binary files /dev/null and b/arts/friction.kra differ diff --git a/arts/geometry.kra b/arts/geometry.kra new file mode 100644 index 0000000000000000000000000000000000000000..ee361048b0edb89092736bba4c6e5b29b77573d2 Binary files /dev/null and b/arts/geometry.kra differ diff --git a/arts/logo.kra b/arts/logo.kra index 22e33a15d34b6725bf45fd93e8240e484bb20793..cc7ae22ab1aedb9f4dd9293252dd92fd70f982b6 100644 Binary files a/arts/logo.kra and b/arts/logo.kra differ diff --git a/arts/network.kra b/arts/network.kra new file mode 100644 index 0000000000000000000000000000000000000000..2f4ec24bc64c028cb28a3e91c946145c9d9cf146 Binary files /dev/null and b/arts/network.kra differ diff --git a/src/View/ui/MainWindow.ui b/src/View/ui/MainWindow.ui index 9e0f0fe56186fd711e607f8ce0e16e878706b95f..07f8d8bfe2ec3c8ef06ba57113f2f2d49667b470 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -283,6 +283,30 @@ <addaction name="separator"/> <addaction name="action_toolBar_run_solver"/> <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_geometry"/> <addaction name="action_toolBar_boundary_cond"/> @@ -508,7 +532,7 @@ <action name="action_toolBar_network"> <property name="icon"> <iconset> - <normaloff>ressources/reseau3_24.png</normaloff>ressources/reseau3_24.png</iconset> + <normaloff>ressources/network.png</normaloff>ressources/network.png</iconset> </property> <property name="text"> <string>River network</string> @@ -520,7 +544,7 @@ <action name="action_toolBar_geometry"> <property name="icon"> <iconset> - <normaloff>ressources/geometrie0.png</normaloff>ressources/geometrie0.png</iconset> + <normaloff>ressources/geometry.png</normaloff>ressources/geometry.png</iconset> </property> <property name="text"> <string>Geometry</string> @@ -530,6 +554,10 @@ </property> </action> <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"> <string>Boundary conditions</string> </property> @@ -541,6 +569,10 @@ </property> </action> <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"> <string>Lateral contribution</string> </property> @@ -549,6 +581,10 @@ </property> </action> <action name="action_toolBar_frictions"> + <property name="icon"> + <iconset> + <normaloff>ressources/friction.png</normaloff>ressources/friction.png</iconset> + </property> <property name="text"> <string>Friction</string> </property> @@ -569,6 +605,10 @@ </property> </action> <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"> <string>Initial conditions</string> </property> diff --git a/src/View/ui/ressources/boundary_condition.png b/src/View/ui/ressources/boundary_condition.png new file mode 100644 index 0000000000000000000000000000000000000000..49fb2975ac1453d56a9cfe04551c86b6ef3ef72d Binary files /dev/null and b/src/View/ui/ressources/boundary_condition.png differ diff --git a/src/View/ui/ressources/friction.png b/src/View/ui/ressources/friction.png new file mode 100644 index 0000000000000000000000000000000000000000..f96687ea826d4d26ef7aff685a3dee2838719c15 Binary files /dev/null and b/src/View/ui/ressources/friction.png differ diff --git a/src/View/ui/ressources/geometry.png b/src/View/ui/ressources/geometry.png new file mode 100644 index 0000000000000000000000000000000000000000..5bfa2cce24325e54ef8cbd5de547bf6e7f8a92b0 Binary files /dev/null and b/src/View/ui/ressources/geometry.png differ diff --git a/src/View/ui/ressources/initial_condition.png b/src/View/ui/ressources/initial_condition.png new file mode 100644 index 0000000000000000000000000000000000000000..ab3a20dc2b0191dc8c8443994a7a59bd95337ee5 Binary files /dev/null and b/src/View/ui/ressources/initial_condition.png differ diff --git a/src/View/ui/ressources/lateral_contribution.png b/src/View/ui/ressources/lateral_contribution.png new file mode 100644 index 0000000000000000000000000000000000000000..59bb72fb4526a65a56cc916cfa9027d34c581a12 Binary files /dev/null and b/src/View/ui/ressources/lateral_contribution.png differ diff --git a/src/View/ui/ressources/network.png b/src/View/ui/ressources/network.png new file mode 100644 index 0000000000000000000000000000000000000000..430dd26af985359f2f5f8a01b715f31c511d8003 Binary files /dev/null and b/src/View/ui/ressources/network.png differ diff --git a/src/motd.txt b/src/motd.txt index 245aa2eacfcdb01c111206eebd615361f9eb5192..64495bb57de46f1e0b9fd05aa5849415b09c5bee 100644 --- a/src/motd.txt +++ b/src/motd.txt @@ -23,7 +23,7 @@ @@@@@@ @@@**************@@@@@@@@ @@@@@@@@@@@@@ @@@@@@ @**************# @@@@@@ ******@@@@@@ @@@@@@ @@@@@@ +************** @@@@@ ********@@@@@ @@@@@@@ - @@@@@@ ***********************@@@@@**************@@@@ @@@@@@@ + @@@@@@ ******************************************@@@@ @@@@@@@ @@@@@@ ******************************************@@@@ @@@@@@@ @@@@@@@@@@@ ******************************************@@@@@@ @@@@@@@ ******************************************