diff --git a/src/view/MainWindow.py b/src/view/MainWindow.py index 399d4d5ea1fb259994c42c2e50ff2fd5a2a0313b..530ff00711d66a141306b2676a2e5fb44856354a 100644 --- a/src/view/MainWindow.py +++ b/src/view/MainWindow.py @@ -20,7 +20,7 @@ class ApplicationWindow(QMainWindow): def set_icon(self): """ - Returns: Add icon to application window + Add icon to application window """ icon = QtGui.QIcon() _path= os.path.join(os.path.dirname(__file__), "ui", "resources", "M_icon.png") diff --git a/src/view/ui/MainWindow.ui b/src/view/ui/MainWindow.ui index 27e22741a4712eaa4ad21f3ffd7c1310e9f36f80..2acafd50c017833e06137d4a31f60ff7305291d8 100644 --- a/src/view/ui/MainWindow.ui +++ b/src/view/ui/MainWindow.ui @@ -59,7 +59,7 @@ <x>0</x> <y>0</y> <width>850</width> - <height>20</height> + <height>23</height> </rect> </property> <property name="font"> @@ -255,36 +255,27 @@ </attribute> <addaction name="actionOuvrir_une_tude"/> <addaction name="separator"/> - <addaction name="separator"/> <addaction name="actionenregistrer_etude_en_cours"/> <addaction name="separator"/> - <addaction name="separator"/> <addaction name="actionfermer_etude_en_cours"/> <addaction name="separator"/> - <addaction name="separator"/> <addaction name="actionquitter_application"/> <addaction name="separator"/> - <addaction name="separator"/> <addaction name="actionlancer_solveur"/> <addaction name="separator"/> - <addaction name="separator"/> <addaction name="actioninterrompt_simulation_en_cours"/> <addaction name="separator"/> - <addaction name="separator"/> <addaction name="actionafficher_listings_simulation"/> <addaction name="separator"/> <addaction name="separator"/> - <addaction name="actionlancer_mailleur_externe"/> - <addaction name="separator"/> - <addaction name="separator"/> <addaction name="actionReseau"/> <addaction name="separator"/> - <addaction name="separator"/> <addaction name="actionGeometrie"/> <addaction name="separator"/> - <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"> @@ -322,6 +313,10 @@ <property name="checkable"> <bool>false</bool> </property> + <property name="icon"> + <iconset> + <normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset> + </property> <property name="text"> <string>Nouvelle étude MAGE</string> </property> @@ -335,7 +330,7 @@ <action name="actionOuvrir_une_tude"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/open.png</normaloff>../ressources/menu/open.png</iconset> + <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset> </property> <property name="text"> <string>Ouvrir une étude</string> @@ -347,6 +342,11 @@ </property> </action> <action name="actionOuvrir_une_tude_2"> + <property name="icon"> + <iconset> + <normalon>ressources/open.png</normalon> + </iconset> + </property> <property name="text"> <string>Ouvrir une étude</string> </property> @@ -380,20 +380,24 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="icon"> - <iconset> - <normaloff>../ressources/menu/save.png</normaloff>../ressources/menu/save.png</iconset> - </property> <property name="text"> <string>Enregistrer le maillage</string> </property> </action> <action name="actionEnregistrer_2"> + <property name="icon"> + <iconset> + <normaloff>ressources/gtk-save.png</normaloff>ressources/gtk-save.png</iconset> + </property> <property name="text"> <string>Enregistrer</string> </property> </action> <action name="actionEnregistrer_sous"> + <property name="icon"> + <iconset> + <normaloff>ressources/gtk-save-as.png</normaloff>ressources/gtk-save-as.png</iconset> + </property> <property name="text"> <string>Enregistrer sous ...</string> </property> @@ -572,7 +576,7 @@ </property> <property name="font"> <font> - <family>Serif</family> + <family>Ubuntu</family> <weight>75</weight> <bold>true</bold> </font> @@ -681,7 +685,7 @@ <action name="actionenregistrer_etude_en_cours"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/gtk-save-as.png</normaloff>../ressources/menu/gtk-save-as.png</iconset> + <normaloff>ressources/save.png</normaloff>ressources/save.png</iconset> </property> <property name="text"> <string>enregistrer_etude_en_cours</string> @@ -696,7 +700,7 @@ <action name="actionfermer_etude_en_cours"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/gtk-close.png</normaloff>../ressources/menu/gtk-close.png</iconset> + <normaloff>ressources/gtk-close.png</normaloff>ressources/gtk-close.png</iconset> </property> <property name="text"> <string>fermer_etude_en_cours</string> @@ -711,7 +715,7 @@ <action name="actionquitter_application"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/exit_bis.png</normaloff>../ressources/menu/exit_bis.png</iconset> + <normaloff>ressources/exit_bis.png</normaloff>ressources/exit_bis.png</iconset> </property> <property name="text"> <string>quitter_application</string> @@ -726,7 +730,7 @@ <action name="actionlancer_solveur"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/gtk-execute.png</normaloff>../ressources/menu/gtk-execute.png</iconset> + <normaloff>ressources/gtk-execute.png</normaloff>ressources/gtk-execute.png</iconset> </property> <property name="text"> <string>lancer_solveur</string> @@ -738,7 +742,7 @@ <action name="actioninterrompt_simulation_en_cours"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/gtk-stop.png</normaloff>../ressources/menu/gtk-stop.png</iconset> + <normaloff>ressources/gtk-stop.png</normaloff>ressources/gtk-stop.png</iconset> </property> <property name="text"> <string>interrompt_simulation_en_cours</string> @@ -750,7 +754,7 @@ <action name="actionlancer_mailleur_externe"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/gnome-stock-insert-table.png</normaloff>../ressources/menu/gnome-stock-insert-table.png</iconset> + <normaloff>ressources/gnome-stock-insert-table.png</normaloff>ressources/gnome-stock-insert-table.png</iconset> </property> <property name="text"> <string>lancer_mailleur_externe</string> @@ -762,7 +766,7 @@ <action name="actionafficher_listings_simulation"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/gnome-stock-edit.png</normaloff>../ressources/menu/gnome-stock-edit.png</iconset> + <normaloff>ressources/gnome-stock-edit.png</normaloff>ressources/gnome-stock-edit.png</iconset> </property> <property name="text"> <string>afficher_listings_simulation</string> @@ -774,7 +778,7 @@ <action name="actionReseau"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/reseau3_24.png</normaloff>../ressources/menu/reseau3_24.png</iconset> + <normaloff>ressources/reseau3_24.png</normaloff>ressources/reseau3_24.png</iconset> </property> <property name="text"> <string>Réseau</string> @@ -786,7 +790,7 @@ <action name="actionGeometrie"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/geometrie0.png</normaloff>../ressources/menu/geometrie0.png</iconset> + <normaloff>ressources/geometrie0.png</normaloff>ressources/geometrie0.png</iconset> </property> <property name="text"> <string>Géométrie</string> @@ -798,7 +802,7 @@ <action name="actionMaillage"> <property name="icon"> <iconset> - <normaloff>../ressources/menu/mailles-50.png</normaloff>../ressources/menu/mailles-50.png</iconset> + <normaloff>ressources/mailles-50.png</normaloff>ressources/mailles-50.png</iconset> </property> <property name="text"> <string>Maillage</string> diff --git a/src/view/ui/resources/M_icon.png b/src/view/ui/ressources/M_icon.png similarity index 100% rename from src/view/ui/resources/M_icon.png rename to src/view/ui/ressources/M_icon.png