diff --git a/src/view/MainWindow.py b/src/view/MainWindow.py index 530ff00711d66a141306b2676a2e5fb44856354a..684d3c42707dc1b8c0a4cd5e0a71466b5d0232f9 100644 --- a/src/view/MainWindow.py +++ b/src/view/MainWindow.py @@ -15,14 +15,4 @@ class ApplicationWindow(QMainWindow): os.path.join(os.path.dirname(__file__), "ui", "MainWindow.ui"), self ) - self.set_icon() self.showMaximized() - - def set_icon(self): - """ - Add icon to application window - """ - icon = QtGui.QIcon() - _path= os.path.join(os.path.dirname(__file__), "ui", "resources", "M_icon.png") - icon.addPixmap(QtGui.QPixmap(f"{_path}"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.setWindowIcon(icon) diff --git a/src/view/ui/MainWindow.ui b/src/view/ui/MainWindow.ui index 2acafd50c017833e06137d4a31f60ff7305291d8..87a9e22b9a07bef25788ada555ec3c2ab06d8f1c 100644 --- a/src/view/ui/MainWindow.ui +++ b/src/view/ui/MainWindow.ui @@ -36,6 +36,10 @@ <property name="windowTitle"> <string>PAMHYR.2</string> </property> + <property name="windowIcon"> + <iconset> + <normaloff>ressources/M_icon.png</normaloff>ressources/M_icon.png</iconset> + </property> <property name="layoutDirection"> <enum>Qt::LeftToRight</enum> </property> @@ -254,28 +258,17 @@ <bool>false</bool> </attribute> <addaction name="actionOuvrir_une_tude"/> - <addaction name="separator"/> <addaction name="actionenregistrer_etude_en_cours"/> - <addaction name="separator"/> <addaction name="actionfermer_etude_en_cours"/> - <addaction name="separator"/> <addaction name="actionquitter_application"/> - <addaction name="separator"/> <addaction name="actionlancer_solveur"/> - <addaction name="separator"/> <addaction name="actioninterrompt_simulation_en_cours"/> - <addaction name="separator"/> <addaction name="actionafficher_listings_simulation"/> <addaction name="separator"/> - <addaction name="separator"/> <addaction name="actionReseau"/> - <addaction name="separator"/> <addaction name="actionGeometrie"/> - <addaction name="separator"/> <addaction name="actionMaillage"/> - <addaction name="separator"/> <addaction name="actionlancer_mailleur_externe"/> - <addaction name="separator"/> </widget> <widget class="QToolBar" name="toolBar_2"> <property name="font">