diff --git a/arts/add.kra b/arts/add.kra new file mode 100644 index 00000000..3f0e5253 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 00000000..8427ca63 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 00000000..729512ca 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 00000000..1c811352 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 00000000..0158ed06 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 00000000..15d065b9 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 00000000..d48cc6ca 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 00000000..ea4dcbad 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 00000000..772f2c00 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 00000000..1276163d 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 00000000..9a0d1eb0 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 00000000..9bfe66fb 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 00000000..5705f6f7 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 00000000..8c8f6c6a 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 00000000..27d3d1d2 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 00000000..62ad0b40 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 00000000..a7fca5fd 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 6fe9ecfe..24931a08 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 ca6371a5..e1ab44f4 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 e568aa25..b3e131e1 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 a868332d..dcb4fdad 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 4455078b..0d060ec4 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 45da9fc6..841ba4ce 100644 --- a/src/View/ui/AdditionalFileList.ui +++ b/src/View/ui/AdditionalFileList.ui @@ -37,7 +37,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -49,7 +49,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/BasicHydraulicStructures.ui b/src/View/ui/BasicHydraulicStructures.ui index 5d16d92c..8754c420 100644 --- a/src/View/ui/BasicHydraulicStructures.ui +++ b/src/View/ui/BasicHydraulicStructures.ui @@ -103,7 +103,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -115,7 +115,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/BoundaryConditions.ui b/src/View/ui/BoundaryConditions.ui index 82064977..9f2f1b99 100644 --- a/src/View/ui/BoundaryConditions.ui +++ b/src/View/ui/BoundaryConditions.ui @@ -108,7 +108,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add @@ -123,7 +123,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png Delete @@ -153,7 +153,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_A-Z.pngressources/sort_A-Z.png Sort diff --git a/src/View/ui/CheckList.ui b/src/View/ui/CheckList.ui index 001d9230..816c9097 100644 --- a/src/View/ui/CheckList.ui +++ b/src/View/ui/CheckList.ui @@ -67,7 +67,7 @@ - ressources/player_play.pngressources/player_play.png + ressources/run.pngressources/run.png diff --git a/src/View/ui/ConfigureDialog.ui b/src/View/ui/ConfigureDialog.ui index 5ff289d0..590d0ca2 100644 --- a/src/View/ui/ConfigureDialog.ui +++ b/src/View/ui/ConfigureDialog.ui @@ -58,7 +58,16 @@ - ressources/gtk_add.pngressources/gtk_add.png + ressources/add.pngressources/add.png + + + + 24 + 24 + + + + true @@ -69,7 +78,16 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png + + + + 24 + 24 + + + + true @@ -82,6 +100,15 @@ ressources/edit.pngressources/edit.png + + + 24 + 24 + + + + true + @@ -171,7 +198,7 @@ - QDateTimeEdit::MinuteSection + QDateTimeEdit::HourSection HH:mm:ss @@ -223,7 +250,16 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png + + + + 24 + 24 + + + + true @@ -234,7 +270,16 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png + + + + 24 + 24 + + + + true @@ -245,7 +290,16 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_A-Z.pngressources/sort_A-Z.png + + + + 24 + 24 + + + + true diff --git a/src/View/ui/DebugRepl.ui b/src/View/ui/DebugRepl.ui index c060c1c0..db4d069e 100644 --- a/src/View/ui/DebugRepl.ui +++ b/src/View/ui/DebugRepl.ui @@ -27,7 +27,13 @@ - ressources/player_play.pngressources/player_play.png + ressources/run.pngressources/run.png + + + + 24 + 24 + Ctrl+Return diff --git a/src/View/ui/EditBoundaryConditions.ui b/src/View/ui/EditBoundaryConditions.ui index 101befa6..bfcf9505 100644 --- a/src/View/ui/EditBoundaryConditions.ui +++ b/src/View/ui/EditBoundaryConditions.ui @@ -80,7 +80,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add @@ -95,7 +95,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png Delete @@ -110,7 +110,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_A-Z.pngressources/sort_A-Z.png Sort diff --git a/src/View/ui/EditLateralContribution.ui b/src/View/ui/EditLateralContribution.ui index 6a36a552..02e14bcb 100644 --- a/src/View/ui/EditLateralContribution.ui +++ b/src/View/ui/EditLateralContribution.ui @@ -73,7 +73,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add @@ -88,7 +88,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png Delete @@ -103,7 +103,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_A-Z.pngressources/sort_A-Z.png Sort diff --git a/src/View/ui/EditSedimentLayers.ui b/src/View/ui/EditSedimentLayers.ui index 6fe4c11b..6b5756b9 100644 --- a/src/View/ui/EditSedimentLayers.ui +++ b/src/View/ui/EditSedimentLayers.ui @@ -57,7 +57,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add sediment layer @@ -72,7 +72,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete sediment layer diff --git a/src/View/ui/Frictions.ui b/src/View/ui/Frictions.ui index 55839197..e219bf73 100644 --- a/src/View/ui/Frictions.ui +++ b/src/View/ui/Frictions.ui @@ -68,7 +68,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add @@ -77,7 +77,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png delete @@ -86,7 +86,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_1-9.pngressources/sort_1-9.png Sort diff --git a/src/View/ui/GeometryCrossSection.ui b/src/View/ui/GeometryCrossSection.ui index f7c9158e..c9c29e61 100644 --- a/src/View/ui/GeometryCrossSection.ui +++ b/src/View/ui/GeometryCrossSection.ui @@ -64,7 +64,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png add @@ -76,7 +76,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png delete @@ -112,7 +112,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_1-9.pngressources/sort_1-9.png sort_asc @@ -124,7 +124,7 @@ - ressources/gtk-sort-descending.pngressources/gtk-sort-descending.png + ressources/sort_9-1.pngressources/sort_9-1.png sort_des diff --git a/src/View/ui/GeometryReach.ui b/src/View/ui/GeometryReach.ui index 22e54043..2ba38650 100644 --- a/src/View/ui/GeometryReach.ui +++ b/src/View/ui/GeometryReach.ui @@ -111,6 +111,12 @@ toolBar + + + 24 + 24 + + TopToolBarArea @@ -131,6 +137,10 @@ + + + ressources/import.pngressources/import.png + Import @@ -139,6 +149,10 @@ + + + ressources/export.pngressources/export.png + Export @@ -149,7 +163,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png add @@ -161,7 +175,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png delete @@ -185,7 +199,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_1-9.pngressources/sort_1-9.png sort_asc @@ -197,7 +211,7 @@ - ressources/gtk-sort-descending.pngressources/gtk-sort-descending.png + ressources/sort_9-1.pngressources/sort_9-1.png sort_des @@ -231,6 +245,10 @@ + + + ressources/meshing.pngressources/meshing.png + Meshing diff --git a/src/View/ui/HydraulicStructures.ui b/src/View/ui/HydraulicStructures.ui index 88056059..013bccdf 100644 --- a/src/View/ui/HydraulicStructures.ui +++ b/src/View/ui/HydraulicStructures.ui @@ -100,7 +100,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -112,7 +112,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/InitialConditions.ui b/src/View/ui/InitialConditions.ui index cdeb75bf..272398b2 100644 --- a/src/View/ui/InitialConditions.ui +++ b/src/View/ui/InitialConditions.ui @@ -88,7 +88,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add @@ -100,7 +100,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png delete @@ -112,7 +112,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_1-9.pngressources/sort_1-9.png sort diff --git a/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui b/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui index 70241c24..8a0b7a8a 100644 --- a/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui +++ b/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui @@ -22,7 +22,7 @@ - Discharge + Discharge (m³/s) diff --git a/src/View/ui/InitialConditions_Dialog_Generator_Height.ui b/src/View/ui/InitialConditions_Dialog_Generator_Height.ui index 8370359d..027fb621 100644 --- a/src/View/ui/InitialConditions_Dialog_Generator_Height.ui +++ b/src/View/ui/InitialConditions_Dialog_Generator_Height.ui @@ -22,7 +22,7 @@ - Height + Height (m) diff --git a/src/View/ui/LateralContributions.ui b/src/View/ui/LateralContributions.ui index ac32ee3e..d8d81b79 100644 --- a/src/View/ui/LateralContributions.ui +++ b/src/View/ui/LateralContributions.ui @@ -108,7 +108,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add @@ -123,7 +123,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png Delete @@ -153,7 +153,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_A-Z.pngressources/sort_A-Z.png Sort diff --git a/src/View/ui/MainWindow.ui b/src/View/ui/MainWindow.ui index 9e0f0fe5..cb40e142 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -88,6 +88,8 @@ Sans Serif + 50 + false @@ -197,7 +199,7 @@ - &Advansed + &Advanced @@ -268,6 +270,12 @@ true + + + 32 + 32 + + false @@ -282,7 +290,30 @@ - + + + + + Ubuntu + 50 + false + + + + toolBar_2 + + + + 36 + 36 + + + + LeftToolBarArea + + + false + @@ -396,11 +427,19 @@ + + + ressources/network.pngressources/network.png + Edit river network + + + ressources/geometry.pngressources/geometry.png + Edit geometry @@ -414,6 +453,10 @@ + + + ressources/boundary_condition.pngressources/boundary_condition.png + Boundary conditions and punctual contributions @@ -422,21 +465,37 @@ + + + ressources/initial_condition.pngressources/initial_condition.png + Initial conditions + + + ressources/friction.pngressources/friction.png + Edit friction + + + ressources/lateral_contribution.pngressources/lateral_contribution.png + Edit lateral contributions + + + ressources/run.pngressources/run.png + Run solver @@ -481,7 +540,7 @@ - ressources/gtk-close.pngressources/gtk-close.png + ressources/close.pngressources/close.png Close current study @@ -496,7 +555,7 @@ - ressources/player_play.pngressources/player_play.png + ressources/run.pngressources/run.png Run solver @@ -508,7 +567,7 @@ - ressources/reseau3_24.pngressources/reseau3_24.png + ressources/network.pngressources/network.png River network @@ -520,7 +579,7 @@ - ressources/geometrie0.pngressources/geometrie0.png + ressources/geometry.pngressources/geometry.png Geometry @@ -530,6 +589,10 @@ + + + ressources/boundary_condition.pngressources/boundary_condition.png + Boundary conditions @@ -541,6 +604,10 @@ + + + ressources/lateral_contribution.pngressources/lateral_contribution.png + Lateral contribution @@ -549,11 +616,15 @@ + + + ressources/friction.pngressources/friction.png + Friction - Edit friction frictions + Edit frictions @@ -569,6 +640,10 @@ + + + ressources/initial_condition.pngressources/initial_condition.png + Initial conditions @@ -637,6 +712,10 @@ + + + ressources/boundary_condition.pngressources/boundary_condition.png + Boundary conditions and punctual contributions diff --git a/src/View/ui/Network.ui b/src/View/ui/Network.ui index 812fc58f..db2f4858 100644 --- a/src/View/ui/Network.ui +++ b/src/View/ui/Network.ui @@ -33,56 +33,6 @@ - - - - - - - - - - ressources/gtk-sort-descending.pngressources/gtk-sort-descending.png - - - - - - - - - - - ressources/go-up2.pngressources/go-up2.png - - - - - - - - - - - ressources/go-down1.pngressources/go-down1.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -103,56 +53,6 @@ - - - - - - - - - - ressources/gtk-sort-descending.pngressources/gtk-sort-descending.png - - - - - - - - - - - ressources/go-up2.pngressources/go-up2.png - - - - - - - - - - - ressources/go-down1.pngressources/go-down1.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -209,7 +109,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add node or edge @@ -221,7 +121,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png Remove node or edge diff --git a/src/View/ui/ProfileSedimentLayers.ui b/src/View/ui/ProfileSedimentLayers.ui index 05f6618e..d777fe34 100644 --- a/src/View/ui/ProfileSedimentLayers.ui +++ b/src/View/ui/ProfileSedimentLayers.ui @@ -42,7 +42,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add sediment layers @@ -54,7 +54,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete sediment layers diff --git a/src/View/ui/REPLineList.ui b/src/View/ui/REPLineList.ui index f9722d37..ea3fe793 100644 --- a/src/View/ui/REPLineList.ui +++ b/src/View/ui/REPLineList.ui @@ -37,7 +37,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -52,7 +52,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/Reservoir.ui b/src/View/ui/Reservoir.ui index d2dc3902..97e0d7a1 100644 --- a/src/View/ui/Reservoir.ui +++ b/src/View/ui/Reservoir.ui @@ -69,7 +69,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add @@ -81,7 +81,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png Delete @@ -105,7 +105,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_1-9.pngressources/sort_1-9.png Sort diff --git a/src/View/ui/ReservoirList.ui b/src/View/ui/ReservoirList.ui index db3b822d..c53a7cd6 100644 --- a/src/View/ui/ReservoirList.ui +++ b/src/View/ui/ReservoirList.ui @@ -75,7 +75,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add @@ -87,7 +87,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete diff --git a/src/View/ui/Results.ui b/src/View/ui/Results.ui index 6269cda6..c7c319a0 100644 --- a/src/View/ui/Results.ui +++ b/src/View/ui/Results.ui @@ -245,7 +245,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add @@ -255,11 +255,19 @@ + + + ressources/reload.pngressources/reload.png + Reload + + + ressources/export.pngressources/export.png + Export diff --git a/src/View/ui/SedimentLayersList.ui b/src/View/ui/SedimentLayersList.ui index 399b0995..5074d1fe 100644 --- a/src/View/ui/SedimentLayersList.ui +++ b/src/View/ui/SedimentLayersList.ui @@ -56,7 +56,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/gtk-add.png Add sediment layer @@ -65,7 +65,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/gtk-remove.png Delete sediment layer diff --git a/src/View/ui/SelectSolver.ui b/src/View/ui/SelectSolver.ui index 7d5bd578..265c42ae 100644 --- a/src/View/ui/SelectSolver.ui +++ b/src/View/ui/SelectSolver.ui @@ -42,7 +42,7 @@ - ressources/player_play.pngressources/player_play.png + ressources/run.pngressources/run.png diff --git a/src/View/ui/SolverLog.ui b/src/View/ui/SolverLog.ui index bfb3cbee..4704212c 100644 --- a/src/View/ui/SolverLog.ui +++ b/src/View/ui/SolverLog.ui @@ -72,7 +72,7 @@ - ressources/gtk-stop.pngressources/gtk-stop.png + ressources/close.pngressources/close.png Stop @@ -81,7 +81,7 @@ - ressources/player_play.pngressources/player_play.png + ressources/run.pngressources/run.png Start diff --git a/src/View/ui/Stricklers.ui b/src/View/ui/Stricklers.ui index c27f9ff0..a7dbd8e9 100644 --- a/src/View/ui/Stricklers.ui +++ b/src/View/ui/Stricklers.ui @@ -64,7 +64,7 @@ - ressources/gtk-add.pngressources/gtk-add.png + ressources/add.pngressources/add.png Add @@ -76,7 +76,7 @@ - ressources/gtk-remove.pngressources/gtk-remove.png + ressources/del.pngressources/del.png Delete @@ -88,7 +88,7 @@ - ressources/gtk-sort-ascending.pngressources/gtk-sort-ascending.png + ressources/sort_A-Z.pngressources/sort_A-Z.png Sort diff --git a/src/View/ui/about.ui b/src/View/ui/about.ui index 273d9de0..36f0efd7 100644 --- a/src/View/ui/about.ui +++ b/src/View/ui/about.ui @@ -6,8 +6,8 @@ 0 0 - 553 - 262 + 640 + 360 @@ -17,18 +17,8 @@ - + - - - - - - - ressources/Logo-INRAE.png - - - @@ -89,6 +79,16 @@ + + + + + + + ressources/Pamhyr2_logo.png + + + 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 82a09b4e..00000000 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 efbf3902..00000000 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 081eaad5..00000000 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 9ca33605..00000000 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 00000000..c60f64a4 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 00000000..7ed9c4cd 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 00000000..00ec79a5 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 a61301ce..00000000 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 00000000..a943581d 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 0ced372c..00000000 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 c829de0a..4a18b2bb 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 6c4ee4f8..00000000 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 00000000..98386f23 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 8d7c502e..88d36485 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 1c5d322a..d95ebb9c 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 2e859e54..00000000 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 2e30abb0..00000000 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 ee25f1cd..791ff133 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 f953f9ff..00000000 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 0f4d1e8e..00000000 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 00000000..368f5614 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 553ef6fc..00000000 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 2d209086..00000000 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 c0155431..00000000 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 05bd5435..00000000 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 00000000..5bfa2cce 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 d7e03d6c..00000000 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 1f4669a2..00000000 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 8ebaea70..00000000 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 ba8528ac..00000000 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 97a9c12b..00000000 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 40957e28..00000000 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 4d839be4..00000000 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 728d1596..00000000 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 e517f411..00000000 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 894d38b1..00000000 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 e1032842..00000000 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 e8b35b89..00000000 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 99abc754..00000000 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 6da99c8a..00000000 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 ef9fbc2c..00000000 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 9c1c86bb..00000000 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 44bf99eb..00000000 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 ff7208ec..00000000 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 8f7ee434..00000000 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 6be2b482..00000000 --- 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 64b3f451..00000000 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 2ca86b21..00000000 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 68999b8e..00000000 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 0b87afaa..00000000 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 bfd5ddfd..00000000 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 e1641df0..00000000 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 07664e31..00000000 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 e7686f4d..00000000 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 f97e4c4b..00000000 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 b38f6d36..00000000 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 8f87a4c9..00000000 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 296bd0eb..00000000 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 3f20a611..00000000 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 aceed9b4..00000000 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 72f436a8..00000000 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 23edc21d..00000000 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 527fec86..00000000 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 112b6c56..00000000 --- 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 a822ea5b..00000000 --- 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 e517f411..00000000 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 efe7075a..00000000 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 00000000..8f71ca9d 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 00000000..5af2473e 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 11759dc1..00000000 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 95e8196d..00000000 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 184574fa..00000000 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 bfd80afd..00000000 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 00000000..5f103ef8 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 00000000..d9e8ff9d 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 c49e731a..00000000 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 295b180b..00000000 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 1c237746..00000000 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 448735f0..00000000 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 00000000..0213df9f 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 00000000..430dd26a 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 1c8e57a5..00000000 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 bc2f276e..00000000 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 c9ae2134..00000000 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 5e2bc7f8..00000000 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 4d4b5933..00000000 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 c91ecf95..00000000 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 17ec5aad..00000000 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 17a5dbc0..00000000 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 9a1467c8..00000000 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 d8738836..00000000 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 d1021b6d..00000000 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 d91a7b6a..00000000 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 48df359e..a5b0e5fa 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 98b70738..00000000 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 00000000..517ec88e 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 6b72296a..00000000 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 429c5589..00000000 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 4e66513b..00000000 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 69315f53..00000000 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 1762bdfd..00000000 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 af607cb4..00000000 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 591028a8..00000000 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 d12a2117..00000000 --- a/src/View/ui/ressources/reseau_2.svg +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - 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 efefd542..00000000 --- a/src/View/ui/ressources/reseau_2_svgsimple.svg +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/src/View/ui/ressources/right.png b/src/View/ui/ressources/right.png new file mode 100644 index 00000000..5c22c2b3 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 00000000..4a8ae2b9 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 535f84ab..ad902531 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 00000000..d67d6e5b 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 00000000..0c96ea58 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 00000000..2e58a775 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 00000000..084b566d 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 7f5303b8..00000000 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 744f315b..00000000 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 8c096123..00000000 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 3a34d379..00000000 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 e5bed608..7f7f0ab9 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 72a5f5b5..00000000 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 2e17fdb6..00000000 --- a/src/View/ui/ressources/xX.svg +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - X - X - - diff --git a/src/View/ui/ressources/xX_.png b/src/View/ui/ressources/xX_.png deleted file mode 100644 index b5052c90..00000000 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 0de86c91..00000000 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 d9700692..59711d40 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 444d4dcf..fe18b592 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 b1abb3d2..df443b28 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 61700327..551bf850 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 bfe03bf0..64495bb5 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 + ****************** + +*********************** + ***************************** + @@@@@@@@@@@@@ ************************@@@@@@@* @@@@@@@ + @@@@ @@@@#****************************@@@@@* @@@@@@ + @@@@ @@@@*********@@@@ *****@@@@@#*+ @@@@@@ + @@@@ @@@@*******@@ @@@@ +**@@@@@@** @@ @@@ + @@@@ @@@%****** @@ @@@@ *@@*@@@@** @@ @@@ + @@@@ @@@@#****** @@ @@@@ *@@**@@@@+ @@ @@@ + @@@@@@@@@@@ ****** @@ @@@@ *@@***@@@@ @@ @@@ + @@@@ @@@@@@@@@@@@@@ **@@****@@@@ @@ @@@ + @@@@ @@@ @@@@@ ***@@*****@@@@@@ @@@ + @@@@ @@ @@@@ +****@@*****@@@@@@ @@@ + @@@@ @@ @@@@*******@@**** @@@@ @@@@ + @@@@@@@@@@ @@@@@@@ @@@@@@@@#*%@@@@@@# @@ @@@@@@@@@ + ************* + @@@@@@@@@@@@ @@@@@@@@@@@@ @@@@@@@@@@@****@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@ @@@@@@ @@@@@@@*********@@@ @@@@@@ @@@@@@ + @@@@@@ @@@@@@ +@@@@@@@****** @@@ @@@@@@ @@@@@@ + @@@@@@ @@@@@@ ****%@@@@@@*** @@ @@@@@@ @@@@@@ + @@@@@@ @@@@@@ ********%@@@@@@ @@ @@@@@@ @@@@@@ + @@@@@@@@@@@@@@@@@@@***********@@@@@@ @@ @@@@@@ @@@@@@ + @@@@@@ @@@**************@@@@@@@@ @@@@@@@@@@@@@ + @@@@@@ @**************# @@@@@@ ******@@@@@@ @@@@@@ + @@@@@@ +************** @@@@@ ********@@@@@ @@@@@@@ + @@@@@@ ******************************************@@@@ @@@@@@@ + @@@@@@ ******************************************@@@@ @@@@@@@ + @@@@@@@@@@@ ******************************************@@@@@@ @@@@@@@ + ****************************************** + ****************************************** + ******************************************