diff --git a/arts/add.kra b/arts/add.kra new file mode 100644 index 0000000000000000000000000000000000000000..3f0e525380e1e44493043a278d7aab2abb0a2d1a Binary files /dev/null and b/arts/add.kra differ diff --git a/arts/close.kra b/arts/close.kra new file mode 100644 index 0000000000000000000000000000000000000000..8427ca634b58b6dbd58ff5a3c5e3e270da72f48f Binary files /dev/null and b/arts/close.kra differ diff --git a/arts/del.kra b/arts/del.kra new file mode 100644 index 0000000000000000000000000000000000000000..729512ca7025ceb29e638613249c569c25468aee Binary files /dev/null and b/arts/del.kra differ 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/arts/export.kra b/arts/export.kra new file mode 100644 index 0000000000000000000000000000000000000000..0158ed06ab29dcce6b83c692bc984d186aec078a Binary files /dev/null and b/arts/export.kra differ 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..d48cc6ca16fd93b7fbdc97c81e9d035f28abd60b Binary files /dev/null and b/arts/geometry.kra differ diff --git a/arts/logo.kra b/arts/logo.kra new file mode 100644 index 0000000000000000000000000000000000000000..ea4dcbadcf8852e715917ea347aaf9133ba04745 Binary files /dev/null and b/arts/logo.kra differ diff --git a/arts/meshing.kra b/arts/meshing.kra new file mode 100644 index 0000000000000000000000000000000000000000..772f2c00f78f80d47f43e4defa03633e15cc84a1 Binary files /dev/null and b/arts/meshing.kra differ diff --git a/arts/network.kra b/arts/network.kra new file mode 100644 index 0000000000000000000000000000000000000000..1276163d5badf8fa9caba998d1336999dded5e40 Binary files /dev/null and b/arts/network.kra differ diff --git a/arts/open.kra b/arts/open.kra new file mode 100644 index 0000000000000000000000000000000000000000..9a0d1eb00b408d3d760dfb583dd4df3eb08f9e43 Binary files /dev/null and b/arts/open.kra differ diff --git a/arts/reload.kra b/arts/reload.kra new file mode 100644 index 0000000000000000000000000000000000000000..9bfe66fb9cdf93a54d0344ce07ce30d2650c3527 Binary files /dev/null and b/arts/reload.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/save.kra b/arts/save.kra new file mode 100644 index 0000000000000000000000000000000000000000..8c8f6c6a3d11c04f4542ab1cfafee0e4732a29ec Binary files /dev/null and b/arts/save.kra differ diff --git a/arts/sort.kra b/arts/sort.kra new file mode 100644 index 0000000000000000000000000000000000000000..27d3d1d27cfd09bfb2ee125e78464d2435e6d05b 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..62ad0b40c1077b0e5e2ffa5fbf3e607b7ded643d Binary files /dev/null and b/arts/up-down.kra differ diff --git a/arts/zoom.kra b/arts/zoom.kra new file mode 100644 index 0000000000000000000000000000000000000000..a7fca5fd8c33608bce3a9dc2e07aca8c22246414 Binary files /dev/null and b/arts/zoom.kra differ diff --git a/src/View/About/Window.py b/src/View/About/Window.py index 6fe9ecfee47af88189319d05c867ab54ae3a5c36..24931a084e2adae44eaddf7cc3ccd656d0886fe3 100644 --- a/src/View/About/Window.py +++ b/src/View/About/Window.py @@ -67,5 +67,5 @@ class AboutWindow(PamhyrDialog): label = f"\n - {author}" + label except StopIteration: label = _translate("About", "Contributors: ") + label - label = "Copyright © 2023-2024 INRAE\n" + label + label = "Copyright © 2022-2024 INRAE\n" + label self.set_label_text("label_copyright", label) diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index ca6371a524815bb6a59baae5abb0f7ae02fdc6d1..e1ab44f49d5e4f126659c65f8de4105d9efecccd 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -28,7 +28,7 @@ from tools import logger_exception from PyQt5 import QtGui from PyQt5.QtGui import ( - QKeySequence, QDesktopServices, + QKeySequence, QDesktopServices, QIcon, ) from PyQt5.QtCore import ( @@ -333,6 +333,15 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): self.update_enable_action() # self.showMaximized() + image = os.path.abspath( + os.path.join( + os.path.dirname(__file__), + "ui", "ressources", + "Pamhyr2_logo.png" + ) + ) + self.setWindowIcon(QIcon(image)) + def set_debug_lvl(self, debug=True): if debug: logger.setLevel(logging.DEBUG) diff --git a/src/View/Tools/ASubWindow.py b/src/View/Tools/ASubWindow.py index e568aa25cc5dd17035056ad591178df3d607bc35..b3e131e17f9d6e08e7943224b8f77c245ff806f0 100644 --- a/src/View/Tools/ASubWindow.py +++ b/src/View/Tools/ASubWindow.py @@ -496,12 +496,7 @@ class ASubMainWindow(QMainWindow, ASubWindowFeatures, WindowToolKit): super(ASubMainWindow, self).__init__(parent=parent) if ui is not None: self.ui = loadUi( - os.path.abspath( - os.path.join( - os.path.dirname(__file__), - "..", "ui", f"{ui}.ui" - ) - ), + os.path.join(self._get_ui_directory(), f"{ui}.ui"), self ) @@ -510,6 +505,14 @@ class ASubMainWindow(QMainWindow, ASubWindowFeatures, WindowToolKit): if self.parent is not None: self.parent.sub_win_add(name, self) + def _get_ui_directory(self): + return os.path.abspath( + os.path.join( + os.path.dirname(__file__), + "..", "ui" + ) + ) + def closeEvent(self, event): if self.parent is not None: self.parent.sub_win_del(self.hash()) diff --git a/src/View/Tools/PamhyrWindow.py b/src/View/Tools/PamhyrWindow.py index a868332d0f1da7bef56e885c8ecf761f8239adcb..dcb4fdad0c2ee196ca725f894968e9070e191a09 100644 --- a/src/View/Tools/PamhyrWindow.py +++ b/src/View/Tools/PamhyrWindow.py @@ -16,10 +16,11 @@ # -*- coding: utf-8 -*- +import os import logging from PyQt5.QtGui import ( - QKeySequence, + QKeySequence, QIcon, ) from PyQt5.QtWidgets import ( @@ -93,6 +94,17 @@ class PamhyrWindowTools(object): """ self.ui.setWindowTitle(self._title) + def _set_icon(self): + self.setWindowIcon( + QIcon( + os.path.join( + self._get_ui_directory(), + "ressources", + "Pamhyr2_logo.png" + ) + ) + ) + def _update(self): """Update window display component @@ -169,6 +181,7 @@ class PamhyrWindow(ASubMainWindow, ListedSubWindow, PamhyrWindowTools): self._hash_data.append(self._config) self._set_title() + self._set_icon() def closeEvent(self, event): self._close_sub_window() diff --git a/src/View/Tools/Plot/PamhyrToolbar.py b/src/View/Tools/Plot/PamhyrToolbar.py index 4455078bbf86af8b563311e6ff479d6d268b7727..0d060ec43fbf200ecce8a5997959eaf871fc9512 100644 --- a/src/View/Tools/Plot/PamhyrToolbar.py +++ b/src/View/Tools/Plot/PamhyrToolbar.py @@ -58,23 +58,24 @@ class PamhyrPlotToolbar(NavigationToolbar2QT): if "home" in items: self.init_tool_home() - self.add_tool_separator() if "back/forward" in items: self.init_tool_back_forward() - self.add_tool_separator() if "move" in items: self.init_tool_move() self.add_tool_separator() + elif "home" in items or "back/forward" in items: + self.add_tool_separator() if "zoom" in items: self.init_tool_zoom() - self.add_tool_separator() if "iso" in items: self.init_tool_iso() self.add_tool_separator() + elif "zoom" in items: + self.add_tool_separator() if "save" in items: self.init_tool_save() @@ -188,6 +189,18 @@ class PamhyrPlotToolbar(NavigationToolbar2QT): ) ) + icon_save = QtGui.QIcon() + icon_save.addPixmap( + QtGui.QPixmap( + os.path.abspath( + f"{file_path}/../../ui/ressources/save.png" + ) + ) + ) + + self.icons.append(("save_figure", icon_save)) + + def save_figure(self, *args): file_types = self.canvas.get_supported_filetypes_grouped() default_file_type = self.canvas.get_default_filetype() diff --git a/src/View/ui/AdditionalFileList.ui b/src/View/ui/AdditionalFileList.ui index 45da9fc62b5bd0dec367472637f176e96e2d1747..841ba4ce9ef33422ad811cee4b3dc2a8314d75e6 100644 --- a/src/View/ui/AdditionalFileList.ui +++ b/src/View/ui/AdditionalFileList.ui @@ -37,7 +37,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -49,7 +49,7 @@ <action name="action_delete"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> </property> <property name="text"> <string>Delete</string> diff --git a/src/View/ui/BasicHydraulicStructures.ui b/src/View/ui/BasicHydraulicStructures.ui index 5d16d92c9846dc0224606fd79aa753c993cf9133..8754c420ca004e53b209f12f765da517492a04d7 100644 --- a/src/View/ui/BasicHydraulicStructures.ui +++ b/src/View/ui/BasicHydraulicStructures.ui @@ -103,7 +103,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -115,7 +115,7 @@ <action name="action_delete"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> </property> <property name="text"> <string>Delete</string> diff --git a/src/View/ui/BoundaryConditions.ui b/src/View/ui/BoundaryConditions.ui index 82064977d192f88229538217df76e91c74ab5736..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/gtk-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/gtk-remove.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 5ff289d08a86c8d1e1a40e726df4dddfcb2e5664..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> @@ -69,7 +78,16 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</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> @@ -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/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> @@ -234,7 +270,16 @@ </property> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</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> @@ -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 101befa640fb1208876da41249fa453efca77e3f..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/gtk-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/gtk-remove.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 6a36a552034f3178ae21bdc080da60ba65e2873a..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/gtk-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/gtk-remove.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/EditSedimentLayers.ui b/src/View/ui/EditSedimentLayers.ui index 6fe4c11b0c00dba95e08413308e8a8782fac1ede..6b5756b9c100c9d49fa86a6c59419eab64c9dbc0 100644 --- a/src/View/ui/EditSedimentLayers.ui +++ b/src/View/ui/EditSedimentLayers.ui @@ -57,7 +57,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> </property> <property name="text"> <string>Add sediment layer</string> @@ -72,7 +72,7 @@ <action name="action_del"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> </property> <property name="text"> <string>Delete sediment layer</string> diff --git a/src/View/ui/Frictions.ui b/src/View/ui/Frictions.ui index 558391970ec1edb436f3d233a691659948575c31..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/gtk-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/gtk-remove.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/GeometryCrossSection.ui b/src/View/ui/GeometryCrossSection.ui index f7c9158eb1a2a26836ce9d9361823b0bb163e2b2..c9c29e61d14e3cfc4f5c37e72562d6a0ae91aaee 100644 --- a/src/View/ui/GeometryCrossSection.ui +++ b/src/View/ui/GeometryCrossSection.ui @@ -64,7 +64,7 @@ <action name="action_add"> <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="text"> <string>add</string> @@ -76,7 +76,7 @@ <action name="action_delete"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.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_asc"> <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_asc</string> @@ -124,7 +124,7 @@ <action name="action_sort_des"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-descending.png</normaloff>ressources/gtk-sort-descending.png</iconset> + <normaloff>ressources/sort_9-1.png</normaloff>ressources/sort_9-1.png</iconset> </property> <property name="text"> <string>sort_des</string> diff --git a/src/View/ui/GeometryReach.ui b/src/View/ui/GeometryReach.ui index 22e5404324d2a74789346feeac75b12277c68811..2ba386506c8275818b928d84ae167a84a4cc9942 100644 --- a/src/View/ui/GeometryReach.ui +++ b/src/View/ui/GeometryReach.ui @@ -111,6 +111,12 @@ <property name="windowTitle"> <string>toolBar</string> </property> + <property name="iconSize"> + <size> + <width>24</width> + <height>24</height> + </size> + </property> <attribute name="toolBarArea"> <enum>TopToolBarArea</enum> </attribute> @@ -131,6 +137,10 @@ <addaction name="action_purge"/> </widget> <action name="action_import"> + <property name="icon"> + <iconset> + <normaloff>ressources/import.png</normaloff>ressources/import.png</iconset> + </property> <property name="text"> <string>Import</string> </property> @@ -139,6 +149,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> @@ -149,7 +163,7 @@ <action name="action_add"> <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="text"> <string>add</string> @@ -161,7 +175,7 @@ <action name="action_delete"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> <property name="text"> <string>delete</string> @@ -185,7 +199,7 @@ <action name="action_sort_asc"> <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_asc</string> @@ -197,7 +211,7 @@ <action name="action_sort_des"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-sort-descending.png</normaloff>ressources/gtk-sort-descending.png</iconset> + <normaloff>ressources/sort_9-1.png</normaloff>ressources/sort_9-1.png</iconset> </property> <property name="text"> <string>sort_des</string> @@ -231,6 +245,10 @@ </property> </action> <action name="action_meshing"> + <property name="icon"> + <iconset> + <normaloff>ressources/meshing.png</normaloff>ressources/meshing.png</iconset> + </property> <property name="text"> <string>Meshing</string> </property> diff --git a/src/View/ui/HydraulicStructures.ui b/src/View/ui/HydraulicStructures.ui index 880560598d29e3f461e21af51d24aee431180ecf..013bccdf6c2ff5148eab6465de9d6ca35c66a1be 100644 --- a/src/View/ui/HydraulicStructures.ui +++ b/src/View/ui/HydraulicStructures.ui @@ -100,7 +100,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -112,7 +112,7 @@ <action name="action_delete"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> </property> <property name="text"> <string>Delete</string> diff --git a/src/View/ui/InitialConditions.ui b/src/View/ui/InitialConditions.ui index cdeb75bfee9fe19dccecb3c516a3ba0b2cef03c4..272398b2b247dcc9f82c5713e36147fd60cccf6e 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/gtk-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/gtk-remove.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 70241c248062f1fcbb50953cf1b827e2fa130ef6..8a0b7a8ab080603bcceace0dc64843ac87c8043e 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 8370359d7c056b4a7c211a86f3bd24818354254e..027fb6210c2bae7055d326a3a604d24a1b057b9c 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 ac32ee3eb51b93295296aab914eb564d7dc4dd05..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/gtk-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/gtk-remove.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/MainWindow.ui b/src/View/ui/MainWindow.ui index 9e0f0fe56186fd711e607f8ce0e16e878706b95f..cb40e14277f9e0279420e02821adca31c058b496 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -88,6 +88,8 @@ <property name="font"> <font> <family>Sans Serif</family> + <weight>50</weight> + <bold>false</bold> </font> </property> <widget class="QMenu" name="menu_File"> @@ -197,7 +199,7 @@ </widget> <widget class="QMenu" name="menu_Avensed"> <property name="title"> - <string>&Advansed</string> + <string>&Advanced</string> </property> <widget class="QMenu" name="menuMage"> <property name="title"> @@ -268,6 +270,12 @@ <property name="movable"> <bool>true</bool> </property> + <property name="iconSize"> + <size> + <width>32</width> + <height>32</height> + </size> + </property> <property name="floatable"> <bool>false</bool> </property> @@ -282,7 +290,30 @@ <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"> + <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>36</width> + <height>36</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"/> @@ -396,11 +427,19 @@ </property> </action> <action name="action_menu_edit_network"> + <property name="icon"> + <iconset> + <normaloff>ressources/network.png</normaloff>ressources/network.png</iconset> + </property> <property name="text"> <string>Edit river network</string> </property> </action> <action name="action_menu_edit_geometry"> + <property name="icon"> + <iconset> + <normaloff>ressources/geometry.png</normaloff>ressources/geometry.png</iconset> + </property> <property name="text"> <string>Edit geometry</string> </property> @@ -414,6 +453,10 @@ </property> </action> <action name="action_menu_boundary_conditions"> + <property name="icon"> + <iconset> + <normaloff>ressources/boundary_condition.png</normaloff>ressources/boundary_condition.png</iconset> + </property> <property name="text"> <string>Boundary conditions and punctual contributions</string> </property> @@ -422,21 +465,37 @@ </property> </action> <action name="action_menu_initial_conditions"> + <property name="icon"> + <iconset> + <normaloff>ressources/initial_condition.png</normaloff>ressources/initial_condition.png</iconset> + </property> <property name="text"> <string>Initial conditions</string> </property> </action> <action name="action_menu_edit_friction"> + <property name="icon"> + <iconset> + <normaloff>ressources/friction.png</normaloff>ressources/friction.png</iconset> + </property> <property name="text"> <string>Edit friction</string> </property> </action> <action name="action_menu_edit_lateral_contribution"> + <property name="icon"> + <iconset> + <normaloff>ressources/lateral_contribution.png</normaloff>ressources/lateral_contribution.png</iconset> + </property> <property name="text"> <string>Edit lateral contributions</string> </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> @@ -481,7 +540,7 @@ <action name="action_toolBar_close"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-close.png</normaloff>ressources/gtk-close.png</iconset> + <normaloff>ressources/close.png</normaloff>ressources/close.png</iconset> </property> <property name="text"> <string>Close current study</string> @@ -496,7 +555,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> @@ -508,7 +567,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 +579,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 +589,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 +604,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,11 +616,15 @@ </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> <property name="toolTip"> - <string>Edit friction frictions</string> + <string>Edit frictions</string> </property> </action> <action name="action_menu_edit"> @@ -569,6 +640,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> @@ -637,6 +712,10 @@ </property> </action> <action name="action_menu_boundary_conditions_sediment"> + <property name="icon"> + <iconset> + <normaloff>ressources/boundary_condition.png</normaloff>ressources/boundary_condition.png</iconset> + </property> <property name="text"> <string>Boundary conditions and punctual contributions</string> </property> diff --git a/src/View/ui/Network.ui b/src/View/ui/Network.ui index 812fc58f6e0607d236ac69949bfed3939b060197..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/gtk-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/gtk-remove.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/ProfileSedimentLayers.ui b/src/View/ui/ProfileSedimentLayers.ui index 05f6618e7a98d509a9ed7f56f72bb4d60a73f915..d777fe34688eaaea53e0e73f9bde17b346a8b4a9 100644 --- a/src/View/ui/ProfileSedimentLayers.ui +++ b/src/View/ui/ProfileSedimentLayers.ui @@ -42,7 +42,7 @@ <action name="action_add_sediment_layers"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> </property> <property name="text"> <string>Add sediment layers</string> @@ -54,7 +54,7 @@ <action name="action_delete_sediment_layers"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> </property> <property name="text"> <string>Delete sediment layers</string> diff --git a/src/View/ui/REPLineList.ui b/src/View/ui/REPLineList.ui index f9722d372a5bef253b5f222b149b65fe6b851645..ea3fe793a471c9680229d8d66be671074eb572a5 100644 --- a/src/View/ui/REPLineList.ui +++ b/src/View/ui/REPLineList.ui @@ -37,7 +37,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -52,7 +52,7 @@ <action name="action_delete"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> </property> <property name="text"> <string>Delete</string> diff --git a/src/View/ui/Reservoir.ui b/src/View/ui/Reservoir.ui index d2dc390256c8dc70b8df08f12c872223930c3fb3..97e0d7a1972f79fcafd68dd2adeb7ee62fde570d 100644 --- a/src/View/ui/Reservoir.ui +++ b/src/View/ui/Reservoir.ui @@ -69,7 +69,7 @@ <action name="action_add"> <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="text"> <string>Add</string> @@ -81,7 +81,7 @@ <action name="action_delete"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset> </property> <property name="text"> <string>Delete</string> @@ -105,7 +105,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/ReservoirList.ui b/src/View/ui/ReservoirList.ui index db3b822d84f932c11e38bcc2b63864d58eeeaeb3..c53a7cd6602bc975f6f3fe7352eceb2db5c1464c 100644 --- a/src/View/ui/ReservoirList.ui +++ b/src/View/ui/ReservoirList.ui @@ -75,7 +75,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -87,7 +87,7 @@ <action name="action_delete"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> </property> <property name="text"> <string>Delete</string> diff --git a/src/View/ui/Results.ui b/src/View/ui/Results.ui index 6269cda63eab7c45afb6d336f0d366882165a321..c7c319a0bd6fe066d6ba46bcf777cb628e277905 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/gtk-add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset> </property> <property name="text"> <string>Add</string> @@ -255,11 +255,19 @@ </property> </action> <action name="action_reload"> + <property name="icon"> + <iconset> + <normaloff>ressources/reload.png</normaloff>ressources/reload.png</iconset> + </property> <property name="text"> <string>Reload</string> </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/SedimentLayersList.ui b/src/View/ui/SedimentLayersList.ui index 399b09953889574a12ecb6ce78373ab7b0389a77..5074d1fe016c73c0fefa33a916bbf3da6033ecad 100644 --- a/src/View/ui/SedimentLayersList.ui +++ b/src/View/ui/SedimentLayersList.ui @@ -56,7 +56,7 @@ <action name="action_add"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-add.png</normaloff>ressources/gtk-add.png</iconset> + <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset> </property> <property name="text"> <string>Add sediment layer</string> @@ -65,7 +65,7 @@ <action name="action_del"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset> + <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset> </property> <property name="text"> <string>Delete sediment layer</string> 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/SolverLog.ui b/src/View/ui/SolverLog.ui index bfb3cbee205a33cd0f7f09e492bc209d295a4773..4704212c0373370b3a52ab787a2fa43e5d1422a7 100644 --- a/src/View/ui/SolverLog.ui +++ b/src/View/ui/SolverLog.ui @@ -72,7 +72,7 @@ <action name="action_stop"> <property name="icon"> <iconset> - <normaloff>ressources/gtk-stop.png</normaloff>ressources/gtk-stop.png</iconset> + <normaloff>ressources/close.png</normaloff>ressources/close.png</iconset> </property> <property name="text"> <string>Stop</string> @@ -81,7 +81,7 @@ <action name="action_start"> <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>Start</string> diff --git a/src/View/ui/Stricklers.ui b/src/View/ui/Stricklers.ui index c27f9ff039ee25583c5b9dff1e3505b7ce57a520..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/gtk-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/gtk-remove.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/about.ui b/src/View/ui/about.ui index 273d9de05a112d3b0df41ccf7276b471f385aa5b..36f0efd799fd67ecf35783cdb455c7918c73e76c 100644 --- a/src/View/ui/about.ui +++ b/src/View/ui/about.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>553</width> - <height>262</height> + <width>640</width> + <height>360</height> </rect> </property> <property name="windowTitle"> @@ -17,18 +17,8 @@ <locale language="English" country="Europe"/> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <item row="0" column="1"> <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QLabel" name="label_logo"> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap>ressources/Logo-INRAE.png</pixmap> - </property> - </widget> - </item> <item> <widget class="QLabel" name="label_title"> <property name="font"> @@ -89,6 +79,16 @@ </item> </layout> </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_logo_pamhyr2"> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap>ressources/Pamhyr2_logo.png</pixmap> + </property> + </widget> + </item> </layout> </widget> <resources/> diff --git a/src/View/ui/ressources/14_layer_visible.png b/src/View/ui/ressources/14_layer_visible.png deleted file mode 100755 index 82a09b4edbe462ebff411d5ca22bd1158ecef353..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/14_layer_visible.png and /dev/null differ diff --git a/src/View/ui/ressources/Cemagref.gif b/src/View/ui/ressources/Cemagref.gif deleted file mode 100755 index efbf39026d126a125866b7caef7f76c41e058106..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/Cemagref.gif and /dev/null differ diff --git a/src/View/ui/ressources/Cemagref_apropos.gif b/src/View/ui/ressources/Cemagref_apropos.gif deleted file mode 100755 index 081eaad554e6e24a702ed052a7741d4555dc1b89..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/Cemagref_apropos.gif and /dev/null differ diff --git a/src/View/ui/ressources/Copie de Cemagref_apropos.gif b/src/View/ui/ressources/Copie de Cemagref_apropos.gif deleted file mode 100755 index 9ca33605a16e4a099fc623d9c2b30b4a684a4fea..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/Copie de Cemagref_apropos.gif and /dev/null differ diff --git a/src/View/ui/ressources/Pamhyr2_logo.png b/src/View/ui/ressources/Pamhyr2_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c60f64a4381b3d48e449bbca6a443374be7a9df0 Binary files /dev/null and b/src/View/ui/ressources/Pamhyr2_logo.png differ diff --git a/src/View/ui/ressources/Pamhyr2_logo_512x512.png b/src/View/ui/ressources/Pamhyr2_logo_512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..7ed9c4cd520a7911a3aaffb1d8de9625bb3ddd8e Binary files /dev/null and b/src/View/ui/ressources/Pamhyr2_logo_512x512.png differ diff --git a/src/View/ui/ressources/add.png b/src/View/ui/ressources/add.png new file mode 100644 index 0000000000000000000000000000000000000000..00ec79a599bcbfde1a0250cdfd956224dac32e84 Binary files /dev/null and b/src/View/ui/ressources/add.png differ diff --git a/src/View/ui/ressources/bold.png b/src/View/ui/ressources/bold.png deleted file mode 100755 index a61301ce9cf92287029f341eb69b41cf5f3f3f9d..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/bold.png and /dev/null differ diff --git a/src/View/ui/ressources/boundary_condition.png b/src/View/ui/ressources/boundary_condition.png new file mode 100644 index 0000000000000000000000000000000000000000..a943581d85afb9923116ceb79b64bc81326779ad Binary files /dev/null and b/src/View/ui/ressources/boundary_condition.png differ diff --git a/src/View/ui/ressources/cancel.png b/src/View/ui/ressources/cancel.png deleted file mode 100644 index 0ced372c552a4c6036a03d36e77a83de4831a058..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/cancel.png and /dev/null differ diff --git a/src/View/ui/ressources/close.png b/src/View/ui/ressources/close.png index c829de0a6b894b43fe1e25dcca5576ff2fbf26c4..4a18b2bbdd2588b17f2158807571deb2a77df8a2 100755 Binary files a/src/View/ui/ressources/close.png and b/src/View/ui/ressources/close.png differ diff --git a/src/View/ui/ressources/color.png b/src/View/ui/ressources/color.png deleted file mode 100755 index 6c4ee4f82457d46bf280cbd6c21de7970a2e49b3..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/color.png and /dev/null differ diff --git a/src/View/ui/ressources/del.png b/src/View/ui/ressources/del.png new file mode 100644 index 0000000000000000000000000000000000000000..98386f231f8523ba47eb5cfc5812531d78ae6912 Binary files /dev/null and b/src/View/ui/ressources/del.png differ diff --git a/src/View/ui/ressources/down.png b/src/View/ui/ressources/down.png index 8d7c502ea4512b4087a920ce11f0a10647b2fc93..88d364854d7a01624b869041b2a77db2ed4bf723 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/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 diff --git a/src/View/ui/ressources/edit2.png b/src/View/ui/ressources/edit2.png deleted file mode 100644 index 2e859e54aa02681e7e658a9afa0f6b3ebb6e58ea..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/edit2.png and /dev/null differ diff --git a/src/View/ui/ressources/exit_bis.png b/src/View/ui/ressources/exit_bis.png deleted file mode 100644 index 2e30abb0d4ef25d31e8017a253a3fb6af7afc6a1..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/exit_bis.png and /dev/null differ diff --git a/src/View/ui/ressources/export.png b/src/View/ui/ressources/export.png index ee25f1cde7cb7a170f760dbce9be1d04610d0c68..791ff133ab45acb2db91c8510eb468ad75cfd538 100644 Binary files a/src/View/ui/ressources/export.png and b/src/View/ui/ressources/export.png differ diff --git a/src/View/ui/ressources/file.png b/src/View/ui/ressources/file.png deleted file mode 100755 index f953f9ff19ffa2fed4829efb362d3b3be8282fc5..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/file.png and /dev/null differ diff --git a/src/View/ui/ressources/font.png b/src/View/ui/ressources/font.png deleted file mode 100755 index 0f4d1e8ececd3274598ec0e18d1fc0d645b30351..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/font.png and /dev/null differ diff --git a/src/View/ui/ressources/friction.png b/src/View/ui/ressources/friction.png new file mode 100644 index 0000000000000000000000000000000000000000..368f5614f2582b2df02d5273c40ddad157f02ef5 Binary files /dev/null and b/src/View/ui/ressources/friction.png differ diff --git a/src/View/ui/ressources/geometrie.png b/src/View/ui/ressources/geometrie.png deleted file mode 100644 index 553ef6fcea9de840f45eff14e6e3e9a27ee7b785..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/geometrie.png and /dev/null differ diff --git a/src/View/ui/ressources/geometrie0.png b/src/View/ui/ressources/geometrie0.png deleted file mode 100644 index 2d20908621f663254cb4a7fe59c63a1a374a8cb7..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/geometrie0.png and /dev/null differ diff --git a/src/View/ui/ressources/geometrie_80.png b/src/View/ui/ressources/geometrie_80.png deleted file mode 100644 index c01554318645dfa4ce8cd0dc0ebad91b94fd89ce..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/geometrie_80.png and /dev/null differ diff --git a/src/View/ui/ressources/geometrie_80_bis.png b/src/View/ui/ressources/geometrie_80_bis.png deleted file mode 100644 index 05bd543539aff3881b4e310d8a3dc6343d73d4bc..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/geometrie_80_bis.png and /dev/null 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/gnome-stock-edit.png b/src/View/ui/ressources/gnome-stock-edit.png deleted file mode 100755 index d7e03d6c0e7c8ba5611d6fd5157387e4f021f92c..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gnome-stock-edit.png and /dev/null differ diff --git a/src/View/ui/ressources/gnome-stock-insert-table.png b/src/View/ui/ressources/gnome-stock-insert-table.png deleted file mode 100755 index 1f4669a261d4fe61d858f461386ea15304604454..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gnome-stock-insert-table.png and /dev/null differ diff --git a/src/View/ui/ressources/go-down.png b/src/View/ui/ressources/go-down.png deleted file mode 100644 index 8ebaea702f4ed945fdcc6bbc9c0753fe83b7740f..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/go-down.png and /dev/null differ diff --git a/src/View/ui/ressources/go-down1.png b/src/View/ui/ressources/go-down1.png deleted file mode 100644 index ba8528acfba58f074292368f06bb0f435127c2a4..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/go-down1.png and /dev/null differ diff --git a/src/View/ui/ressources/go-up.png b/src/View/ui/ressources/go-up.png deleted file mode 100644 index 97a9c12bfd308e3e8f5bab112480f399b0c1421f..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/go-up.png and /dev/null differ diff --git a/src/View/ui/ressources/go-up1.png b/src/View/ui/ressources/go-up1.png deleted file mode 100644 index 40957e28161e8bc21f5c3ed6fca5d243b83fc28c..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/go-up1.png and /dev/null differ diff --git a/src/View/ui/ressources/go-up2.png b/src/View/ui/ressources/go-up2.png deleted file mode 100644 index 4d839be4ef4add436cbe937af512e053e448ae2c..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/go-up2.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-activer.png b/src/View/ui/ressources/gtk-activer.png deleted file mode 100755 index 728d1596750e612f8096b2eb88381803d79dda0f..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-activer.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-add.png b/src/View/ui/ressources/gtk-add.png deleted file mode 100755 index e517f4111fb2952386c72f260a0c1ac1f9d4888a..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-add.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-apply.png b/src/View/ui/ressources/gtk-apply.png deleted file mode 100755 index 894d38b1c9a6725195dfb39a767e0e14eb71506b..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-apply.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-close.png b/src/View/ui/ressources/gtk-close.png deleted file mode 100755 index e103284231511431272f5f87206ac4f75df6f646..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-close.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-copy.png b/src/View/ui/ressources/gtk-copy.png deleted file mode 100755 index e8b35b892aa6c33a7dadc870e5ffd3b575626e8e..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-copy.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-desactiver.png b/src/View/ui/ressources/gtk-desactiver.png deleted file mode 100755 index 99abc754cfe3322455e402486f45552ca1db27f9..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-desactiver.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-dialog-error.png b/src/View/ui/ressources/gtk-dialog-error.png deleted file mode 100755 index 6da99c8a26bc360d0e8de3dac8525cb73b1869f0..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-dialog-error.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-dialog-warning.png b/src/View/ui/ressources/gtk-dialog-warning.png deleted file mode 100755 index ef9fbc2c5421c0a82abba9446251fb8c8abfb78c..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-dialog-warning.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-dnd-multiple.png b/src/View/ui/ressources/gtk-dnd-multiple.png deleted file mode 100755 index 9c1c86bb170b9035022505883cdab3cc678cb41f..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-dnd-multiple.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-execute.png b/src/View/ui/ressources/gtk-execute.png deleted file mode 100755 index 44bf99eb5230bfbae3559a2eca05406bf0bbac48..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-execute.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-go-back.png b/src/View/ui/ressources/gtk-go-back.png deleted file mode 100755 index ff7208ececbe9075491bfe00db29db652283d08b..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-go-back.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-go-forward.png b/src/View/ui/ressources/gtk-go-forward.png deleted file mode 100755 index 8f7ee434baafb6c8788fef99714465e6c272e46a..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-go-forward.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-help.png b/src/View/ui/ressources/gtk-help.png deleted file mode 100755 index 6be2b482d5f84a193e2f5a7f99f6c6721ae59ebb..0000000000000000000000000000000000000000 --- a/src/View/ui/ressources/gtk-help.png +++ /dev/null @@ -1 +0,0 @@ -ßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßß \ No newline at end of file diff --git a/src/View/ui/ressources/gtk-new.png b/src/View/ui/ressources/gtk-new.png deleted file mode 100755 index 64b3f45138e2f502dc5aaa3f022cce8e042b1a17..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-new.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-ok.png b/src/View/ui/ressources/gtk-ok.png deleted file mode 100755 index 2ca86b211d7992a04bda99cccab0ac7cad9a776d..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-ok.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-open.png b/src/View/ui/ressources/gtk-open.png deleted file mode 100755 index 68999b8e1b4dcfc3eab11cf3f7c6ebb7d365d5f2..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-open.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-paste.png b/src/View/ui/ressources/gtk-paste.png deleted file mode 100755 index 0b87afaa41e5c1ea07f7a68a3d03e9a41d8f15f0..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-paste.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-print.png b/src/View/ui/ressources/gtk-print.png deleted file mode 100755 index bfd5ddfd00621e96f2b297aa1d70b82604860628..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-print.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-quit.png b/src/View/ui/ressources/gtk-quit.png deleted file mode 100755 index e1641df02a499a32c007b52f3ec107aafb0a9c67..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-quit.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-refresh.PNG b/src/View/ui/ressources/gtk-refresh.PNG deleted file mode 100755 index 07664e3130ffa3f64162dee6c525b49b142d0597..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-refresh.PNG and /dev/null differ diff --git a/src/View/ui/ressources/gtk-remove.png b/src/View/ui/ressources/gtk-remove.png deleted file mode 100755 index e7686f4dc91fbcf2133c5e9be528560ef05916d6..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-remove.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-save-as.png b/src/View/ui/ressources/gtk-save-as.png deleted file mode 100755 index f97e4c4bf7c3421883c122d9061d477bac3fc5e0..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-save-as.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-save.png b/src/View/ui/ressources/gtk-save.png deleted file mode 100755 index b38f6d362709e6b2fbad89be9ec1609d0068371a..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-save.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-select-color.png b/src/View/ui/ressources/gtk-select-color.png deleted file mode 100755 index 8f87a4c9a741da314e1dc51aae53523fc39c338e..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-select-color.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-sort-ascending.png b/src/View/ui/ressources/gtk-sort-ascending.png deleted file mode 100755 index 296bd0eb3b9315ea6a7d69c1f2de3fedd34afadf..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-sort-ascending.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-sort-descending.png b/src/View/ui/ressources/gtk-sort-descending.png deleted file mode 100755 index 3f20a61194960bc09469afe5a0d1ed0dfacfa536..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-sort-descending.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-stop.png b/src/View/ui/ressources/gtk-stop.png deleted file mode 100755 index aceed9b4d27f505f50df51639dda6eb7dcf3302b..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-stop.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-undo.png b/src/View/ui/ressources/gtk-undo.png deleted file mode 100755 index 72f436a8e0928374f4008efd255587ed2cdb5eae..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-undo.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-zoom-100.png b/src/View/ui/ressources/gtk-zoom-100.png deleted file mode 100755 index 23edc21d91be782b91f65a3158761d6585d3ba8b..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-zoom-100.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-zoom-fit.png b/src/View/ui/ressources/gtk-zoom-fit.png deleted file mode 100755 index 527fec86c15ff5d7e9c3febd7e8520281584ab9c..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk-zoom-fit.png and /dev/null differ diff --git a/src/View/ui/ressources/gtk-zoom-in.png b/src/View/ui/ressources/gtk-zoom-in.png deleted file mode 100755 index 112b6c569f26846331ab0cd13013bd387a44aad9..0000000000000000000000000000000000000000 --- a/src/View/ui/ressources/gtk-zoom-in.png +++ /dev/null @@ -1 +0,0 @@ -ßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßß \ No newline at end of file diff --git a/src/View/ui/ressources/gtk-zoom-out.png b/src/View/ui/ressources/gtk-zoom-out.png deleted file mode 100755 index a822ea5bf894d0b051b28802faad61463808fe29..0000000000000000000000000000000000000000 --- a/src/View/ui/ressources/gtk-zoom-out.png +++ /dev/null @@ -1 +0,0 @@ -ßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßß \ No newline at end of file diff --git a/src/View/ui/ressources/gtk_add.png b/src/View/ui/ressources/gtk_add.png deleted file mode 100755 index e517f4111fb2952386c72f260a0c1ac1f9d4888a..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/gtk_add.png and /dev/null differ diff --git a/src/View/ui/ressources/image989.png b/src/View/ui/ressources/image989.png deleted file mode 100644 index efe7075ab07f237a52eb6bdd1b1aecf9c17d2696..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/image989.png and /dev/null differ diff --git a/src/View/ui/ressources/import.png b/src/View/ui/ressources/import.png new file mode 100644 index 0000000000000000000000000000000000000000..8f71ca9d23a30cf2df766f99eb9adb68d32cf595 Binary files /dev/null and b/src/View/ui/ressources/import.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..5af2473e59ae10c79b072ee6b8ab8f672afc2b5e Binary files /dev/null and b/src/View/ui/ressources/initial_condition.png differ diff --git a/src/View/ui/ressources/italic.png b/src/View/ui/ressources/italic.png deleted file mode 100755 index 11759dc115fc3453634822e058db97cdca43c546..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/italic.png and /dev/null differ diff --git a/src/View/ui/ressources/justifyCenter.png b/src/View/ui/ressources/justifyCenter.png deleted file mode 100755 index 95e8196df47ef9352af28132508daa1849eaa2fc..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/justifyCenter.png and /dev/null differ diff --git a/src/View/ui/ressources/justifyLeft.png b/src/View/ui/ressources/justifyLeft.png deleted file mode 100755 index 184574fa56c8e5f8880d0fd50fcd4c7c88b823e7..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/justifyLeft.png and /dev/null differ diff --git a/src/View/ui/ressources/justifyRight.png b/src/View/ui/ressources/justifyRight.png deleted file mode 100755 index bfd80afd81fc7a025c8ddf92442e7fc840115fe3..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/justifyRight.png and /dev/null 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..5f103ef85543506230d77c64a55f8a188c6671c7 Binary files /dev/null and b/src/View/ui/ressources/lateral_contribution.png differ diff --git a/src/View/ui/ressources/left.png b/src/View/ui/ressources/left.png new file mode 100644 index 0000000000000000000000000000000000000000..d9e8ff9d4c721bfc08ebce4812129435800dea57 Binary files /dev/null and b/src/View/ui/ressources/left.png differ diff --git a/src/View/ui/ressources/linetool.png b/src/View/ui/ressources/linetool.png deleted file mode 100755 index c49e731ab9f274dc2aa0410915a30e48530b954d..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/linetool.png and /dev/null differ diff --git a/src/View/ui/ressources/logoCemagref.gif b/src/View/ui/ressources/logoCemagref.gif deleted file mode 100755 index 295b180beebc959b836a43cc82ba8dc65669635f..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/logoCemagref.gif and /dev/null differ diff --git a/src/View/ui/ressources/logoIsima.gif b/src/View/ui/ressources/logoIsima.gif deleted file mode 100755 index 1c237746873d4378505dc4168de18a391c8f598b..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/logoIsima.gif and /dev/null differ diff --git a/src/View/ui/ressources/mailles-50.png b/src/View/ui/ressources/mailles-50.png deleted file mode 100644 index 448735f02b3b8558acd4a220cb91caad2b241569..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/mailles-50.png and /dev/null differ diff --git a/src/View/ui/ressources/meshing.png b/src/View/ui/ressources/meshing.png new file mode 100644 index 0000000000000000000000000000000000000000..0213df9f8f9e870eaf74ea5191dfbfc45241cbb8 Binary files /dev/null and b/src/View/ui/ressources/meshing.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/View/ui/ressources/new.png b/src/View/ui/ressources/new.png deleted file mode 100755 index 1c8e57a506b4b3985e532bd83ff207931d738f6d..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/new.png and /dev/null differ diff --git a/src/View/ui/ressources/no_icone.PNG b/src/View/ui/ressources/no_icone.PNG deleted file mode 100755 index bc2f276e09224ceb11b549b33b747e8074088b7e..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/no_icone.PNG and /dev/null differ diff --git a/src/View/ui/ressources/noeud_amont.PNG b/src/View/ui/ressources/noeud_amont.PNG deleted file mode 100755 index c9ae213468bc35ad7e8e85a1cc1022f2b38c93b7..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_amont.PNG and /dev/null differ diff --git a/src/View/ui/ressources/noeud_amont.gif b/src/View/ui/ressources/noeud_amont.gif deleted file mode 100755 index 5e2bc7f8a3cc78959a52fe7eb85d85d5f413a775..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_amont.gif and /dev/null differ diff --git a/src/View/ui/ressources/noeud_aval.PNG b/src/View/ui/ressources/noeud_aval.PNG deleted file mode 100755 index 4d4b5933877c0d6f3d437d4ab511f30cc67e7fe7..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_aval.PNG and /dev/null differ diff --git a/src/View/ui/ressources/noeud_aval.gif b/src/View/ui/ressources/noeud_aval.gif deleted file mode 100755 index c91ecf95a1a1d3db3238c344d34c3b57cc149f68..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_aval.gif and /dev/null differ diff --git a/src/View/ui/ressources/noeud_desact.PNG b/src/View/ui/ressources/noeud_desact.PNG deleted file mode 100755 index 17ec5aadff344fb4d369b92ac5a50125866b6538..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_desact.PNG and /dev/null differ diff --git a/src/View/ui/ressources/noeud_desact.gif b/src/View/ui/ressources/noeud_desact.gif deleted file mode 100755 index 17a5dbc05ea7e44348489fcdc88b8745b21e90a5..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_desact.gif and /dev/null differ diff --git a/src/View/ui/ressources/noeud_int.PNG b/src/View/ui/ressources/noeud_int.PNG deleted file mode 100755 index 9a1467c893ee9e77a77e12f7178e20d6b99226f9..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_int.PNG and /dev/null differ diff --git a/src/View/ui/ressources/noeud_int.gif b/src/View/ui/ressources/noeud_int.gif deleted file mode 100755 index d87388366cc884a145709362597b5aa88360d0b7..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_int.gif and /dev/null differ diff --git a/src/View/ui/ressources/noeud_int_hs.PNG b/src/View/ui/ressources/noeud_int_hs.PNG deleted file mode 100755 index d1021b6d1fc2a0c34507eaa98a2b5a6c8e9f7504..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_int_hs.PNG and /dev/null differ diff --git a/src/View/ui/ressources/noeud_int_hs.gif b/src/View/ui/ressources/noeud_int_hs.gif deleted file mode 100755 index d91a7b6a9342c242af92fdd985b06eb48a1d68a5..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/noeud_int_hs.gif and /dev/null differ diff --git a/src/View/ui/ressources/open.png b/src/View/ui/ressources/open.png index 48df359efbcfdb997b1e5f2a95ee1ec35f57d587..a5b0e5fa0ebbdbd26d8389a8bdeea9976a565109 100755 Binary files a/src/View/ui/ressources/open.png and b/src/View/ui/ressources/open.png differ diff --git a/src/View/ui/ressources/query_erase.png b/src/View/ui/ressources/query_erase.png deleted file mode 100755 index 98b70738d6b88a98dc8d56de09057c38174656c7..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/query_erase.png and /dev/null differ diff --git a/src/View/ui/ressources/reload.png b/src/View/ui/ressources/reload.png new file mode 100644 index 0000000000000000000000000000000000000000..517ec88e6f2dafeaa7260b01397fa1c392913295 Binary files /dev/null and b/src/View/ui/ressources/reload.png differ diff --git a/src/View/ui/ressources/reseau.png b/src/View/ui/ressources/reseau.png deleted file mode 100644 index 6b72296a2f369c87bdcf533bfdab9919852f608f..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/reseau.png and /dev/null differ diff --git a/src/View/ui/ressources/reseau1.jpg b/src/View/ui/ressources/reseau1.jpg deleted file mode 100644 index 429c5589bcefa7aae8b7ba17e94c5cddc9649b5d..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/reseau1.jpg and /dev/null differ diff --git a/src/View/ui/ressources/reseau2.png b/src/View/ui/ressources/reseau2.png deleted file mode 100644 index 4e66513bdb25061234172092d198b40a29c93de9..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/reseau2.png and /dev/null differ diff --git a/src/View/ui/ressources/reseau3.png b/src/View/ui/ressources/reseau3.png deleted file mode 100644 index 69315f539566b04d183e11d82a65fd96a528a7a4..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/reseau3.png and /dev/null differ diff --git a/src/View/ui/ressources/reseau3_100.png b/src/View/ui/ressources/reseau3_100.png deleted file mode 100644 index 1762bdfd42d126d052fe6bd88fdb25462a28d9f9..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/reseau3_100.png and /dev/null differ diff --git a/src/View/ui/ressources/reseau3_24.png b/src/View/ui/ressources/reseau3_24.png deleted file mode 100644 index af607cb4819ce176800b2cc2e091f12eb0354780..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/reseau3_24.png and /dev/null differ diff --git a/src/View/ui/ressources/reseau4.png b/src/View/ui/ressources/reseau4.png deleted file mode 100644 index 591028a89b00cbe9806ca59ac69b9603075628ae..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/reseau4.png and /dev/null differ diff --git a/src/View/ui/ressources/reseau_2.svg b/src/View/ui/ressources/reseau_2.svg deleted file mode 100644 index d12a21174d07c0db14e809afcf02692b3ce288d0..0000000000000000000000000000000000000000 --- a/src/View/ui/ressources/reseau_2.svg +++ /dev/null @@ -1,155 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="21mm" - height="10mm" - viewBox="0 0 21 10" - version="1.1" - id="svg1032" - inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="reseau_2.svg"> - <defs - id="defs1026" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="2.8" - inkscape:cx="105.19108" - inkscape:cy="77.238224" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:window-width="1920" - inkscape:window-height="1012" - inkscape:window-x="1920" - inkscape:window-y="0" - inkscape:window-maximized="1" /> - <metadata - id="metadata1029"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Calque 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(0,-287)"> - <path - sodipodi:nodetypes="caacc" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 14.852354,292.06965 c -0.03773,-0.007 -1.306188,1.11969 -2.252095,1.34669 -1.525724,0.36616 -3.3530289,0.2724 -4.8553805,-0.13518 C 6.8960465,293.05087 5.68992,292.0558 5.68992,292.0558 v 0" - id="path945" - inkscape:connector-curvature="0" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - <path - inkscape:connector-curvature="0" - id="path892" - d="m 14.852354,292.06965 c -0.03773,0.006 -1.306188,-1.11969 -2.252095,-1.3467 -1.525724,-0.36615 -3.3530289,-0.27239 -4.8553805,0.13519 -0.848832,0.23028 -2.0549585,1.22536 -2.0549585,1.22536 v 0" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="caacc" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - <path - inkscape:connector-curvature="0" - id="path896" - d="m 5.68992,292.0835 -3.787491,0.0277" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - <path - inkscape:connector-curvature="0" - id="path937" - d="m 14.852354,292.06965 3.787491,0.0277" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - <path - inkscape:export-ydpi="200" - inkscape:export-xdpi="200" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - transform="scale(-1,1)" - d="m -5.4200366,292.10178 a 0.63674903,0.47092569 0 0 1 -0.6356043,0.47092 0.63674903,0.47092569 0 0 1 -0.6378896,-0.46923 0.63674903,0.47092569 0 0 1 0.6333109,-0.47261 0.63674903,0.47092569 0 0 1 0.6401666,0.46753" - sodipodi:open="true" - sodipodi:end="6.2759946" - sodipodi:start="0" - sodipodi:ry="0.47092569" - sodipodi:rx="0.63674903" - sodipodi:cy="292.10178" - sodipodi:cx="-6.0567856" - sodipodi:type="arc" - id="path988" - style="opacity:1;vector-effect:none;fill:#fcfdfd;fill-opacity:1;stroke:#f7db2e;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <path - style="opacity:1;fill:#fcfdfd;fill-opacity:1;stroke:#f7db2e;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path990" - sodipodi:type="arc" - sodipodi:cx="-14.469704" - sodipodi:cy="292.02344" - sodipodi:rx="0.63674903" - sodipodi:ry="0.47092569" - sodipodi:start="0" - sodipodi:end="6.2759946" - sodipodi:open="true" - d="m -13.832955,292.02344 a 0.63674903,0.47092569 0 0 1 -0.635604,0.47092 0.63674903,0.47092569 0 0 1 -0.63789,-0.46923 0.63674903,0.47092569 0 0 1 0.633311,-0.47261 0.63674903,0.47092569 0 0 1 0.640167,0.46753" - transform="scale(-1,1)" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - <path - inkscape:export-ydpi="200" - inkscape:export-xdpi="200" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - transform="scale(-1,1)" - d="m -1.3736875,292.08218 a 0.63674903,0.47092569 0 0 1 -0.6356044,0.47093 0.63674903,0.47092569 0 0 1 -0.6378895,-0.46923 0.63674903,0.47092569 0 0 1 0.6333109,-0.47262 0.63674903,0.47092569 0 0 1 0.6401665,0.46754" - sodipodi:open="true" - sodipodi:end="6.2759946" - sodipodi:start="0" - sodipodi:ry="0.47092569" - sodipodi:rx="0.63674903" - sodipodi:cy="292.08218" - sodipodi:cx="-2.0104365" - sodipodi:type="arc" - id="path992" - style="opacity:1;fill:#fcfdfd;fill-opacity:1;stroke:#0000fe;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - style="opacity:1;fill:#fcfdfd;fill-opacity:1;stroke:#00ff00;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path904" - sodipodi:type="arc" - sodipodi:cx="-19.127377" - sodipodi:cy="292.06262" - sodipodi:rx="0.63674903" - sodipodi:ry="0.47092569" - sodipodi:start="0" - sodipodi:end="6.2759946" - sodipodi:open="true" - d="m -18.490628,292.06262 a 0.63674903,0.47092569 0 0 1 -0.635604,0.47093 0.63674903,0.47092569 0 0 1 -0.637889,-0.46923 0.63674903,0.47092569 0 0 1 0.63331,-0.47262 0.63674903,0.47092569 0 0 1 0.640167,0.46754" - transform="scale(-1,1)" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - </g> -</svg> diff --git a/src/View/ui/ressources/reseau_2_svgsimple.svg b/src/View/ui/ressources/reseau_2_svgsimple.svg deleted file mode 100644 index efefd542f299a2c2dc5c120ee4d57d21c74d5f5b..0000000000000000000000000000000000000000 --- a/src/View/ui/ressources/reseau_2_svgsimple.svg +++ /dev/null @@ -1,161 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="21mm" - height="10mm" - viewBox="0 0 21 10" - version="1.1" - id="svg1032" - inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="reseau_2_svgsimple.svg" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200"> - <defs - id="defs1026" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="7.9195959" - inkscape:cx="42.177473" - inkscape:cy="11.076306" - inkscape:document-units="mm" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:window-width="1562" - inkscape:window-height="708" - inkscape:window-x="2107" - inkscape:window-y="190" - inkscape:window-maximized="0" /> - <metadata - id="metadata1029"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Calque 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(0,-287)"> - <g - id="g1639"> - <path - inkscape:connector-curvature="0" - id="path1635" - d="m 14.852354,292.06965 c -0.07245,3.88732 -9.1858414,3.91704 -9.162434,-0.0138 v 0" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="ccc" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - <path - inkscape:export-ydpi="200" - inkscape:export-xdpi="200" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - sodipodi:nodetypes="ccc" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 14.852354,292.06965 c -0.07245,-3.88732 -9.1858414,-3.91704 -9.162434,0.0138 v 0" - id="path892" - inkscape:connector-curvature="0" /> - </g> - <path - inkscape:connector-curvature="0" - id="path896" - d="m 5.68992,292.0558 -3.787491,0.0277" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - <path - inkscape:connector-curvature="0" - id="path937" - d="m 14.852354,292.0558 3.787491,0.0277" - style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - <path - inkscape:export-ydpi="200" - inkscape:export-xdpi="200" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - transform="scale(-1,1)" - d="m -4.7226987,292.06964 a 1,1 0 0 1 -0.9982023,1 1,1 0 0 1 -1.0017912,-0.9964 1,1 0 0 1 0.9946005,-1.00358 1,1 0 0 1 1.0053672,0.99279" - sodipodi:open="true" - sodipodi:end="6.2759946" - sodipodi:start="0" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="292.06964" - sodipodi:cx="-5.7226987" - sodipodi:type="arc" - id="path988" - style="opacity:1;vector-effect:none;fill:#fcfdfd;fill-opacity:1;stroke:#f7db2e;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <path - style="opacity:1;fill:#fcfdfd;fill-opacity:1;stroke:#f7db2e;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path990" - sodipodi:type="arc" - sodipodi:cx="-14.803791" - sodipodi:cy="292.06964" - sodipodi:rx="1" - sodipodi:ry="1" - sodipodi:start="0" - sodipodi:end="6.2759946" - sodipodi:open="true" - d="m -13.803791,292.06964 a 1,1 0 0 1 -0.998202,1 1,1 0 0 1 -1.001792,-0.9964 1,1 0 0 1 0.994601,-1.00358 1,1 0 0 1 1.005367,0.99279" - transform="scale(-1,1)" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - <path - inkscape:export-ydpi="200" - inkscape:export-xdpi="200" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - transform="scale(-1,1)" - d="m -0.54271483,292.06964 a 1,1 0 0 1 -0.99820237,1 1,1 0 0 1 -1.0017912,-0.9964 1,1 0 0 1 0.9946006,-1.00358 1,1 0 0 1 1.00536711,0.99279" - sodipodi:open="true" - sodipodi:end="6.2759946" - sodipodi:start="0" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="292.06964" - sodipodi:cx="-1.5427148" - sodipodi:type="arc" - id="path992" - style="opacity:1;fill:#fcfdfd;fill-opacity:1;stroke:#0000fe;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - style="opacity:1;fill:#fcfdfd;fill-opacity:1;stroke:#00ff00;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path904" - sodipodi:type="arc" - sodipodi:cx="-19.127377" - sodipodi:cy="292.06964" - sodipodi:rx="1" - sodipodi:ry="1" - sodipodi:start="0" - sodipodi:end="6.2759946" - sodipodi:open="true" - d="m -18.127377,292.06964 a 1,1 0 0 1 -0.998202,1 1,1 0 0 1 -1.001791,-0.9964 1,1 0 0 1 0.9946,-1.00358 1,1 0 0 1 1.005368,0.99279" - transform="scale(-1,1)" - inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/PAMHYR-Python3_Version_0.1/ressources/menu/reseau2.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" /> - </g> -</svg> diff --git a/src/View/ui/ressources/right.png b/src/View/ui/ressources/right.png new file mode 100644 index 0000000000000000000000000000000000000000..5c22c2b317d855b103fd7ffb450fed7aedb89925 Binary files /dev/null and b/src/View/ui/ressources/right.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/save.png b/src/View/ui/ressources/save.png index 535f84abea138960d5e767815ad8c719936e2b44..ad90253135dc5c5d3178492cef24891cd9e88031 100755 Binary files a/src/View/ui/ressources/save.png and b/src/View/ui/ressources/save.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/strikethrough.png b/src/View/ui/ressources/strikethrough.png deleted file mode 100755 index 7f5303b88e3d042c8031618832f4fa6eb8360f8c..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/strikethrough.png and /dev/null differ diff --git a/src/View/ui/ressources/test3_graph_24x24.png b/src/View/ui/ressources/test3_graph_24x24.png deleted file mode 100644 index 744f315b3b785866158195132f0b88de9e7d0241..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/test3_graph_24x24.png and /dev/null differ diff --git a/src/View/ui/ressources/test_graph_24x24.png b/src/View/ui/ressources/test_graph_24x24.png deleted file mode 100644 index 8c096123544c929f885f0643160b6651e363f0e9..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/test_graph_24x24.png and /dev/null differ diff --git a/src/View/ui/ressources/underline.png b/src/View/ui/ressources/underline.png deleted file mode 100755 index 3a34d379b33fab6ad06fe319edd605b8ab5cc3f0..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/underline.png and /dev/null differ diff --git a/src/View/ui/ressources/up.png b/src/View/ui/ressources/up.png index e5bed6088b20718b5b06b3f46112ec3c06068b57..7f7f0ab92f6d5073a92a2f647480983e9e21dd78 100755 Binary files a/src/View/ui/ressources/up.png and b/src/View/ui/ressources/up.png differ diff --git a/src/View/ui/ressources/xX.png b/src/View/ui/ressources/xX.png deleted file mode 100644 index 72a5f5b5adfadf1c962fb1f0086b87c0674e0429..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/xX.png and /dev/null differ diff --git a/src/View/ui/ressources/xX.svg b/src/View/ui/ressources/xX.svg deleted file mode 100644 index 2e17fdb69a354114fb24bfb093c6f4f58f4e29ca..0000000000000000000000000000000000000000 --- a/src/View/ui/ressources/xX.svg +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg8" version="1.1" viewBox="0 0 210 297" height="297mm" width="210mm" sodipodi:docname="xX.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)" inkscape:export-filename="/home/sylvain.coulibaly/Interface MAGE/interface-graphique-de-mage/ressources/menu/xX_.png" inkscape:export-xdpi="2.0354993" inkscape:export-ydpi="2.0354993"> - <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1052" id="namedview26" showgrid="false" inkscape:zoom="0.2102413" inkscape:cx="73.412518" inkscape:cy="561.25984" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg8" /> - <defs id="defs2"> - <linearGradient osb:paint="solid" id="linearGradient905"> - <stop id="stop903" offset="0" style="stop-color:#000000;stop-opacity:1;" /> - </linearGradient> - <linearGradient gradientTransform="matrix(0.31546833,0.46498407,-0.82023651,-0.23514782,266.41137,198.10536)" gradientUnits="userSpaceOnUse" y2="231.63637" x2="155.4417" y1="231.63637" x1="118.64856" id="linearGradient907-0" xlink:href="#linearGradient905" /> - </defs> - <metadata id="metadata5"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g id="layer1" inkscape:export-xdpi="2.0038972" inkscape:export-ydpi="2.0038972"> - <g style="fill:url(#linearGradient907-0);fill-opacity:1;stroke-width:0.55427003" transform="matrix(-0.78796436,-2.5766523,2.7485565,1.7481291,-339.16,158.47816)" id="g899-6"> - <g transform="matrix(1.01999,0.02946428,-0.06972871,0.89722347,13.661914,20.343895)" style="fill:#0000ff;stroke-width:0.57874358" id="g1005"> - <rect transform="matrix(0.30644142,0.45167888,-0.48181314,-0.13812762,181.8088,179.59726)" style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:11.52781487;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect817" width="4.024117" height="213.93452" x="153.20679" y="26.359362" ry="3.0855939" rx="3.3640957" /> - <g transform="matrix(0.30644142,0.45167888,-0.48181314,-0.13812762,181.8088,179.59726)" style="fill:#0000ff;stroke-width:0.57874358" id="g994"> - <g style="fill:#0000ff;fill-opacity:1;stroke-width:0.57874358" transform="matrix(-0.78796435,-2.5766523,2.7485566,1.7481291,-392.31251,160.67829)" id="g899"> - <rect rx="2.4307733" style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:1.22281325;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect817-3" width="1.8821323" height="21.374384" x="-315.9397" y="-121.56397" ry="0.055459872" transform="matrix(-0.7768179,-0.62972529,0.94916764,-0.31477103,0,0)" /> - </g> - </g> - <path style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:10.13041496;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 730.82422,681.35742 c -0.29816,3.8e-4 -0.49378,0.0521 -0.56055,0.16016 L 586.7832,913.82422 c -0.26709,0.43244 1.64195,1.60337 4.28125,2.625 2.63931,1.02163 4.97901,1.49494 5.2461,1.0625 L 739.79102,685.20703 c 0.26709,-0.43244 -1.64195,-1.60337 -4.28125,-2.625 -1.97948,-0.76622 -3.79109,-1.22575 -4.68555,-1.22461 z" transform="matrix(0.08107929,0.1195067,-0.12747972,-0.03654627,182.63287,179.57028)" id="rect817-3-2" /> - </g> - </g> - <text id="text952" y="153.02193" x="31.472593" style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" xml:space="preserve"><tspan style="stroke-width:0.26458332" y="162.3857" x="31.472593" id="tspan950" /></text> - <flowRoot style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;letter-spacing:0px;word-spacing:0px" id="flowRoot954" xml:space="preserve"><flowRegion id="flowRegion956"><rect y="575.61609" x="91.606354" height="101.17717" width="25.977922" id="rect958" /></flowRegion><flowPara id="flowPara960" /></flowRoot> <text transform="scale(0.6048482,1.6533074)" id="text964" y="128.22046" x="8.1448956" style="font-style:normal;font-weight:normal;font-size:19.09490776px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.26458332" xml:space="preserve"><tspan style="font-size:91.65555573px;line-height:3.25;fill:#1a1a1a;stroke-width:0.26458332" y="128.22046" x="8.1448956" id="tspan962">X</tspan> </text> - <text transform="scale(0.758647,1.3181361)" id="text964-3" y="162.37117" x="66.231461" style="font-style:normal;font-weight:normal;font-size:32.34230042px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" xml:space="preserve"><tspan style="font-size:155.24304199px;line-height:3.25;stroke-width:0.26458332" y="162.37117" x="66.231461" id="tspan962-8">X</tspan> </text> - </g> -</svg> diff --git a/src/View/ui/ressources/xX_.png b/src/View/ui/ressources/xX_.png deleted file mode 100644 index b5052c90beb38448690e50649d9442d3a4e55a9e..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/xX_.png and /dev/null differ diff --git a/src/View/ui/ressources/x_coiss.png b/src/View/ui/ressources/x_coiss.png deleted file mode 100644 index 0de86c9124b66a291524fb28b1e8863941d79157..0000000000000000000000000000000000000000 Binary files a/src/View/ui/ressources/x_coiss.png and /dev/null differ diff --git a/src/View/ui/ressources/zoom.png b/src/View/ui/ressources/zoom.png index d970069255078a20b58c7f235a6ae565bd328ccb..59711d40c6a6c12bf32306822c91c750d83651bb 100644 Binary files a/src/View/ui/ressources/zoom.png and b/src/View/ui/ressources/zoom.png differ diff --git a/src/View/ui/ressources/zoom_fit.png b/src/View/ui/ressources/zoom_fit.png index 444d4dcf1590ddda34d50cea3e6b11ee2bb02b6d..fe18b5922682797ed950e555c3674566409ec6be 100644 Binary files a/src/View/ui/ressources/zoom_fit.png and b/src/View/ui/ressources/zoom_fit.png differ diff --git a/src/View/ui/ressources/zoom_fit_11.png b/src/View/ui/ressources/zoom_fit_11.png index b1abb3d2d6983e2868f8b42b12f15b4171fe076e..df443b287c702f2609a899c19a2721b6c44dbb58 100644 Binary files a/src/View/ui/ressources/zoom_fit_11.png and b/src/View/ui/ressources/zoom_fit_11.png differ diff --git a/src/init.py b/src/init.py index 61700327255171c9ffbbcb6f4cc12faa61ed6a56..551bf850469f943e356485afba3363ba75318f60 100644 --- a/src/init.py +++ b/src/init.py @@ -70,7 +70,7 @@ def legal_info(): ) ), "r", encoding="utf-8") as f: for line in f: - blue(line.rstrip()) + print(line.rstrip()) with open(os.path.abspath( os.path.join( diff --git a/src/motd.txt b/src/motd.txt index bfe03bf07c00fe5ae7fa8e3f2824b06dad3c01cc..64495bb57de46f1e0b9fd05aa5849415b09c5bee 100644 --- a/src/motd.txt +++ b/src/motd.txt @@ -1,7 +1,31 @@ -`7MM"""Mq. db `7MMM. ,MMF'`7MMF' `7MMF'`YMM' `MM'`7MM"""Mq. - MM `MM. ;MM: MMMb dPMM MM MM VMA ,V MM `MM. - MM ,M9 ,V^MM. M YM ,M MM MM MM VMA ,V MM ,M9 pd*"*b. - MMmmdM9 ,M `MM M Mb M' MM MMmmmmmmMM VMMP MMmmdM9 (O) j8 - MM AbmmmqMA M YM.P' MM MM MM MM MM YM. ,;j9 - MM A' VML M `YM' MM MM MM MM MM `Mb. ,-=' -.JMML. .AMA. .AMMA..JML. `' .JMML..JMML. .JMML. .JMML. .JMML. .JMM. Ammmmmmm + ****************** + +*********************** + ***************************** + @@@@@@@@@@@@@ ************************@@@@@@@* @@@@@@@ + @@@@ @@@@#****************************@@@@@* @@@@@@ + @@@@ @@@@*********@@@@ *****@@@@@#*+ @@@@@@ + @@@@ @@@@*******@@ @@@@ +**@@@@@@** @@ @@@ + @@@@ @@@%****** @@ @@@@ *@@*@@@@** @@ @@@ + @@@@ @@@@#****** @@ @@@@ *@@**@@@@+ @@ @@@ + @@@@@@@@@@@ ****** @@ @@@@ *@@***@@@@ @@ @@@ + @@@@ @@@@@@@@@@@@@@ **@@****@@@@ @@ @@@ + @@@@ @@@ @@@@@ ***@@*****@@@@@@ @@@ + @@@@ @@ @@@@ +****@@*****@@@@@@ @@@ + @@@@ @@ @@@@*******@@**** @@@@ @@@@ + @@@@@@@@@@ @@@@@@@ @@@@@@@@#*%@@@@@@# @@ @@@@@@@@@ + ************* + @@@@@@@@@@@@ @@@@@@@@@@@@ @@@@@@@@@@@****@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@ @@@@@@ @@@@@@@*********@@@ @@@@@@ @@@@@@ + @@@@@@ @@@@@@ +@@@@@@@****** @@@ @@@@@@ @@@@@@ + @@@@@@ @@@@@@ ****%@@@@@@*** @@ @@@@@@ @@@@@@ + @@@@@@ @@@@@@ ********%@@@@@@ @@ @@@@@@ @@@@@@ + @@@@@@@@@@@@@@@@@@@***********@@@@@@ @@ @@@@@@ @@@@@@ + @@@@@@ @@@**************@@@@@@@@ @@@@@@@@@@@@@ + @@@@@@ @**************# @@@@@@ ******@@@@@@ @@@@@@ + @@@@@@ +************** @@@@@ ********@@@@@ @@@@@@@ + @@@@@@ ******************************************@@@@ @@@@@@@ + @@@@@@ ******************************************@@@@ @@@@@@@ + @@@@@@@@@@@ ******************************************@@@@@@ @@@@@@@ + ****************************************** + ****************************************** + ******************************************