diff --git a/arts/geometry.kra b/arts/geometry.kra index ee361048b0edb89092736bba4c6e5b29b77573d2..e35a1b7396174fb3ee5ef7f8a4ca7512c9a39a71 100644 Binary files a/arts/geometry.kra and b/arts/geometry.kra differ diff --git a/arts/run.kra b/arts/run.kra new file mode 100644 index 0000000000000000000000000000000000000000..5705f6f75eb5756fdd99301507a4abd2a99a6d1f Binary files /dev/null and b/arts/run.kra differ diff --git a/arts/sort.kra b/arts/sort.kra new file mode 100644 index 0000000000000000000000000000000000000000..fbdae4aa1ec775d7f80c200a42ef998f2216cc6e Binary files /dev/null and b/arts/sort.kra differ diff --git a/arts/up-down.kra b/arts/up-down.kra new file mode 100644 index 0000000000000000000000000000000000000000..1f89ea48cb13f0cdfd4325424d617baf80157f70 Binary files /dev/null and b/arts/up-down.kra differ diff --git a/src/View/ui/MainWindow.ui b/src/View/ui/MainWindow.ui index 07f8d8bfe2ec3c8ef06ba57113f2f2d49667b470..f496e76ec895c1087105c855d5169bce9680f71a 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -282,7 +282,6 @@ <addaction name="action_toolBar_close"/> <addaction name="separator"/> <addaction name="action_toolBar_run_solver"/> - <addaction name="separator"/> </widget> <widget class="QToolBar" name="toolBar_modelling"> <property name="font"> @@ -461,6 +460,10 @@ </property> </action> <action name="action_menu_run_solver"> + <property name="icon"> + <iconset> + <normaloff>ressources/run.png</normaloff>ressources/run.png</iconset> + </property> <property name="text"> <string>Run solver</string> </property> @@ -520,7 +523,7 @@ <action name="action_toolBar_run_solver"> <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="text"> <string>Run solver</string> diff --git a/src/View/ui/Network.ui b/src/View/ui/Network.ui index 1600b17e8e7e5e184560f0e754d0a03059866854..db2f4858f2a3702c86ac777bf48fe449352e7fca 100644 --- a/src/View/ui/Network.ui +++ b/src/View/ui/Network.ui @@ -33,56 +33,6 @@ </property> <widget class="QWidget" name="layoutWidget"> <layout class="QVBoxLayout" name="verticalLayout_9"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_10"> - <item> - <widget class="QPushButton" name="pushButton_26"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset> - <normaloff>ressources/gtk-sort-descending.png</normaloff>ressources/gtk-sort-descending.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton_27"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset> - <normaloff>ressources/go-up2.png</normaloff>ressources/go-up2.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton_28"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset> - <normaloff>ressources/go-down1.png</normaloff>ressources/go-down1.png</iconset> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_9"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> <item> <widget class="QTableView" name="tableView_reachs"> <property name="minimumSize"> @@ -103,56 +53,6 @@ </widget> <widget class="QWidget" name="layoutWidget"> <layout class="QVBoxLayout" name="verticalLayout_8"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_9"> - <item> - <widget class="QPushButton" name="pushButton_23"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset> - <normaloff>ressources/gtk-sort-descending.png</normaloff>ressources/gtk-sort-descending.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton_24"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset> - <normaloff>ressources/go-up2.png</normaloff>ressources/go-up2.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton_25"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset> - <normaloff>ressources/go-down1.png</normaloff>ressources/go-down1.png</iconset> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_8"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> <item> <widget class="QTableView" name="tableView_nodes"> <property name="minimumSize"> @@ -209,7 +109,7 @@ <action name="action_toolBar_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 node or edge</string> @@ -221,7 +121,7 @@ <action name="action_toolBar_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>Remove node or edge</string> diff --git a/src/View/ui/ressources/down.png b/src/View/ui/ressources/down.png index 8d7c502ea4512b4087a920ce11f0a10647b2fc93..ebb49fb30da7057a8d8c0c5fffa59cd0ebc1bd5e 100755 Binary files a/src/View/ui/ressources/down.png and b/src/View/ui/ressources/down.png differ diff --git a/src/View/ui/ressources/friction.png b/src/View/ui/ressources/friction.png index f96687ea826d4d26ef7aff685a3dee2838719c15..368f5614f2582b2df02d5273c40ddad157f02ef5 100644 Binary files a/src/View/ui/ressources/friction.png and b/src/View/ui/ressources/friction.png differ diff --git a/src/View/ui/ressources/run.png b/src/View/ui/ressources/run.png new file mode 100644 index 0000000000000000000000000000000000000000..4a8ae2b98c241d0a34ba582f11785a481c3cf99e Binary files /dev/null and b/src/View/ui/ressources/run.png differ diff --git a/src/View/ui/ressources/sort_1-9.png b/src/View/ui/ressources/sort_1-9.png new file mode 100644 index 0000000000000000000000000000000000000000..d67d6e5b41ad5bcf03537239e5a531f03cf45116 Binary files /dev/null and b/src/View/ui/ressources/sort_1-9.png differ diff --git a/src/View/ui/ressources/sort_9-1.png b/src/View/ui/ressources/sort_9-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0c96ea58e79fd4a6ed6c9c2042cf790338a33127 Binary files /dev/null and b/src/View/ui/ressources/sort_9-1.png differ diff --git a/src/View/ui/ressources/sort_A-Z.png b/src/View/ui/ressources/sort_A-Z.png new file mode 100644 index 0000000000000000000000000000000000000000..2e58a775e83dea917c21cd79222c6564deb0d68f Binary files /dev/null and b/src/View/ui/ressources/sort_A-Z.png differ diff --git a/src/View/ui/ressources/sort_Z-A.png b/src/View/ui/ressources/sort_Z-A.png new file mode 100644 index 0000000000000000000000000000000000000000..084b566d9952e091a5cd6f6b6c1e7cfb9f407700 Binary files /dev/null and b/src/View/ui/ressources/sort_Z-A.png differ diff --git a/src/View/ui/ressources/up.png b/src/View/ui/ressources/up.png index e5bed6088b20718b5b06b3f46112ec3c06068b57..31be6aeaf98e938fbef47f44ac2733397748997c 100755 Binary files a/src/View/ui/ressources/up.png and b/src/View/ui/ressources/up.png differ