From 7821faba35f9e80808ecae408bb10c763476d6a2 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Fri, 17 Mar 2023 09:48:54 +0100
Subject: [PATCH] MainWindow: Rename some action.
---
src/view/MainWindow.py | 72 ++++++++--------
src/view/ui/MainWindow.ui | 175 +++++++++++++++++++-------------------
2 files changed, 123 insertions(+), 124 deletions(-)
diff --git a/src/view/MainWindow.py b/src/view/MainWindow.py
index fd36a135..18521df4 100644
--- a/src/view/MainWindow.py
+++ b/src/view/MainWindow.py
@@ -18,27 +18,25 @@ from view.AboutWindow import AboutWindow
from model.Study import Study
no_model_action = [
- "actionOuvrir_une_tude", "actionR_seau", "actionNouvelle_tude_RubarBE",
- "actionOuvrir_une_tude_2", "actionImporter_un_jeu_de_donn_es_MAGE",
- "actionImporter_un_jeu_de_donn_es_RubarBE"
+ "action_menu_new", "action_menu_open", "action_menu_import_mage",
+ "action_menu_import_rubarbe", "action_toolBar_open",
]
model_action = [
- "actionenregistrer_etude_en_cours", "actionfermer_etude_en_cours",
- "actionFermer", "actionEnregistrer", "actionEnregistrer_2",
- "actionEnregistrer_sous", "actionArchiver",
+ "action_menu_close", "action_menu_save_maille", "action_menu_save",
+ "action_menu_save_as", "action_toolBar_close", "action_toolBar_save",
]
other_model_action = [
- "actionlancer_solveur",
+ "action_toolBar_run_solver", "action_toolBar_kill_solver"
]
define_model_action = [
- "actionReseau", "actionGeometrie",
- "actionMaillage", "actionlancer_mailleur_externe",
- "actionCond_Limites", "actionApp_Lat_raux",
- "actionDeversements", "actionTroncons",
- "actionFrottements", "actionOuvrages",
+ "action_toolBar_network", "action_toolBar_geometry",
+ "action_toolBar_maillage", "action_toolBar_run_mailleur",
+ "action_toolBar_cond_limites", "action_toolBar_App_Lateraux",
+ "action_toolBar_Deversements", "action_toolBar_Troncons",
+ "action_toolBar_Frottements", "action_toolBar_Ouvrages",
]
action = (
@@ -56,7 +54,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow):
self.model = None
# UI
self.ui = loadUi(
- os.path.join(os.path.dirname(__file__), "ui", "MainWindow_old.ui"),
+ os.path.join(os.path.dirname(__file__), "ui", "MainWindow.ui"),
self
)
@@ -83,30 +81,32 @@ class ApplicationWindow(QMainWindow, ListedSubWindow):
"""
actions = {
# Menu action
- "actionA_propos": self.open_about,
- "actionConfiguration_de_Pamhyr": self.open_configure,
- "actionR_seau": self.open_new_study,
- "actionEnregistrer_2": self.save_study,
- "actionEnregistrer_sous": self.save_as_study,
+ "action_menu_config": self.open_configure,
+ "action_menu_new": self.open_new_study,
+ "action_menu_open": self.open_model,
+ "action_menu_save": self.save_study,
+ "action_menu_save_as": self.save_as_study,
+ ## Help
+ "action_menu_about": self.open_about,
# ToolBar action
- "actionquitter_application": self.close,
- "actionOuvrir_une_tude": self.open_model,
- "actionenregistrer_etude_en_cours": self.save_study,
- "actionfermer_etude_en_cours": self.close_model,
- "actionlancer_solveur": self.open_dummy,
- "actioninterrompt_simulation_en_cours": self.open_dummy,
- "actionafficher_listings_simulation": self.open_dummy,
- "actionlancer_solveur": self.open_dummy,
- "actionReseau": lambda: self.open_dummy("Networks"),
- "actionGeometrie": lambda: self.open_dummy("Geomerty"),
- "actionMaillage": lambda: self.open_dummy("Maillage"),
- "actionlancer_mailleur_externe": lambda: self.open_dummy("Lancement mailleur externe"),
- "actionCond_Limites": lambda: self.open_dummy("Condition Limites"),
- "actionApp_Lat_raux": lambda: self.open_dummy("Apport Lateraux"),
- "actionDeversements": lambda: self.open_dummy("Deversement"),
- "actionTroncons": lambda: self.open_dummy("Tronçons"),
- "actionFrottements": lambda: self.open_dummy("Frottements"),
- "actionOuvrages": lambda: self.open_dummy("Ouvrages"),
+ "action_toolBar_quit": self.close,
+ "action_toolBar_open": self.open_model,
+ "action_toolBar_save": self.save_study,
+ "action_toolBar_close": self.close_model,
+ "action_toolBar_run_solver": self.open_dummy,
+ "action_toolBar_kill_solver": self.open_dummy,
+ "action_toolBar_listing": self.open_dummy,
+ ## Current actions
+ "action_toolBar_network": lambda: self.open_dummy("Network"),
+ "action_toolBar_geometry": lambda: self.open_dummy("Geomerty"),
+ "action_toolBar_maillage": lambda: self.open_dummy("Maillage"),
+ "action_toolBar_run_mailleur": lambda: self.open_dummy("Lancement mailleur externe"),
+ "action_toolBar_cond_limites": lambda: self.open_dummy("Condition Limites"),
+ "action_toolBar_App_Lateraux": lambda: self.open_dummy("Apport Lateraux"),
+ "action_toolBar_Deversements": lambda: self.open_dummy("Deversement"),
+ "action_toolBar_Troncons": lambda: self.open_dummy("Tronçons"),
+ "action_toolBar_Frottements": lambda: self.open_dummy("Frottements"),
+ "action_toolBar_Ouvrages": lambda: self.open_dummy("Ouvrages"),
}
for action in actions:
diff --git a/src/view/ui/MainWindow.ui b/src/view/ui/MainWindow.ui
index d9c42155..da74b972 100644
--- a/src/view/ui/MainWindow.ui
+++ b/src/view/ui/MainWindow.ui
@@ -75,33 +75,32 @@
<property name="title">
<string>&Fichier</string>
</property>
- <addaction name="m_a_new_mage"/>
- <addaction name="m_a_new_rubarbe"/>
+ <addaction name="action_menu_new"/>
<addaction name="separator"/>
- <addaction name="m_a_open"/>
+ <addaction name="action_menu_open"/>
<addaction name="separator"/>
- <addaction name="m_a_import_mage"/>
- <addaction name="m_a_import_rubarbe"/>
+ <addaction name="action_menu_import_mage"/>
+ <addaction name="action_menu_import_rubarbe"/>
<addaction name="separator"/>
<addaction name="separator"/>
- <addaction name="m_a_close"/>
+ <addaction name="action_menu_close"/>
<addaction name="separator"/>
- <addaction name="m_a_save_maille"/>
- <addaction name="m_a_save"/>
- <addaction name="m_a_save_as"/>
- <addaction name="m_a_archive"/>
+ <addaction name="action_menu_save_maille"/>
+ <addaction name="action_menu_save"/>
+ <addaction name="action_menu_save_as"/>
+ <addaction name="action_menu_archive"/>
<addaction name="separator"/>
<addaction name="separator"/>
- <addaction name="m_a_config"/>
+ <addaction name="action_menu_config"/>
<addaction name="separator"/>
- <addaction name="m_a_quit"/>
+ <addaction name="action_menu_quit"/>
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="menu_R_seau">
<property name="title">
<string>&Réseau</string>
</property>
- <addaction name="m_a_edit_network"/>
+ <addaction name="action_menu_edit_network"/>
</widget>
<widget class="QMenu" name="menuG_om_trie">
<property name="title">
@@ -115,22 +114,22 @@
<property name="title">
<string>Profil en travers</string>
</property>
- <addaction name="m_a_abscisse_cote"/>
- <addaction name="m_a_XYZ"/>
+ <addaction name="action_menu_abscisse_cote"/>
+ <addaction name="action_menu_XYZ"/>
</widget>
<addaction name="menuProfil_en_travers"/>
</widget>
- <addaction name="m_a_edit_geometry"/>
+ <addaction name="action_menu_edit_geometry"/>
<addaction name="separator"/>
- <addaction name="m_a_import_geometry"/>
- <addaction name="m_a_export_geometry"/>
+ <addaction name="action_menu_import_geometry"/>
+ <addaction name="action_menu_export_geometry"/>
<addaction name="separator"/>
- <addaction name="m_a_run_mailler"/>
- <addaction name="m_a_choose_maillieur_by_bief"/>
- <addaction name="m_a_view_maille"/>
- <addaction name="m_a_export_maillage"/>
- <addaction name="m_a_delete_maillage_for_current_bief"/>
- <addaction name="m_a_delete_maillage"/>
+ <addaction name="action_menu_run_mailler"/>
+ <addaction name="action_menu_choose_maillieur_by_bief"/>
+ <addaction name="action_menu_view_maille"/>
+ <addaction name="action_menu_export_maillage"/>
+ <addaction name="action_menu_delete_maillage_for_current_bief"/>
+ <addaction name="action_menu_delete_maillage"/>
<addaction name="separator"/>
<addaction name="separator"/>
<addaction name="menuComparer"/>
@@ -196,9 +195,9 @@
<property name="title">
<string>&Aide</string>
</property>
- <addaction name="actionAide_de_PAMHYR"/>
- <addaction name="actionAide_de_MAGE"/>
- <addaction name="actionA_propos"/>
+ <addaction name="action_menu_help_pamhyr"/>
+ <addaction name="action_menu_help_mage"/>
+ <addaction name="action_menu_about"/>
</widget>
<addaction name="menu_File"/>
<addaction name="menu_R_seau"/>
@@ -257,18 +256,18 @@
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
- <addaction name="actionOuvrir_une_tude"/>
- <addaction name="actionenregistrer_etude_en_cours"/>
- <addaction name="actionfermer_etude_en_cours"/>
- <addaction name="actionquitter_application"/>
- <addaction name="actionlancer_solveur"/>
- <addaction name="actioninterrompt_simulation_en_cours"/>
- <addaction name="actionafficher_listings_simulation"/>
+ <addaction name="action_toolBar_open"/>
+ <addaction name="action_toolBar_save"/>
+ <addaction name="action_toolBar_close"/>
+ <addaction name="action_toolBar_quit"/>
+ <addaction name="action_toolBar_run_solver"/>
+ <addaction name="action_toolBar_kill_solver"/>
+ <addaction name="action_toolBar_listing"/>
<addaction name="separator"/>
- <addaction name="actionReseau"/>
- <addaction name="actionGeometrie"/>
- <addaction name="actionMaillage"/>
- <addaction name="actionlancer_mailleur_externe"/>
+ <addaction name="action_toolBar_network"/>
+ <addaction name="action_toolBar_geometry"/>
+ <addaction name="action_toolBar_maillage"/>
+ <addaction name="action_toolBar_run_mailleur"/>
</widget>
<widget class="QToolBar" name="toolBar_2">
<property name="font">
@@ -289,20 +288,20 @@
<attribute name="toolBarBreak">
<bool>true</bool>
</attribute>
- <addaction name="actionCond_Limites"/>
+ <addaction name="action_toolBar_cond_limites"/>
<addaction name="separator"/>
- <addaction name="actionApp_Lat_raux"/>
+ <addaction name="action_toolBar_App_Lateraux"/>
<addaction name="separator"/>
- <addaction name="actionDeversements"/>
+ <addaction name="action_toolBar_Deversements"/>
<addaction name="separator"/>
- <addaction name="actionTroncons"/>
+ <addaction name="action_toolBar_Troncons"/>
<addaction name="separator"/>
- <addaction name="actionFrottements"/>
+ <addaction name="action_toolBar_Frottements"/>
<addaction name="separator"/>
- <addaction name="actionOuvrages"/>
+ <addaction name="action_toolBar_Ouvrages"/>
<addaction name="separator"/>
</widget>
- <action name="m_a_new_mage">
+ <action name="action_menu_new">
<property name="checkable">
<bool>false</bool>
</property>
@@ -311,7 +310,7 @@
<normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
</property>
<property name="text">
- <string>Nouvelle étude MAGE</string>
+ <string>Nouvelle étude</string>
</property>
<property name="font">
<font>
@@ -323,7 +322,7 @@
<string>Ctrl+N</string>
</property>
</action>
- <action name="actionOuvrir_une_tude">
+ <action name="action_toolBar_open">
<property name="icon">
<iconset>
<normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
@@ -340,7 +339,7 @@
<string>Ctrl+R</string>
</property>
</action>
- <action name="m_a_open">
+ <action name="action_menu_open">
<property name="icon">
<iconset>
<normalon>ressources/open.png</normalon>
@@ -353,7 +352,7 @@
<string>Ctrl+O</string>
</property>
</action>
- <action name="m_a_import_mage">
+ <action name="action_menu_import_mage">
<property name="text">
<string>Importer un jeu de données MAGE</string>
</property>
@@ -361,12 +360,12 @@
<string/>
</property>
</action>
- <action name="m_a_import_rubarbe">
+ <action name="action_menu_import_rubarbe">
<property name="text">
<string>Importer un jeu de données RubarBE</string>
</property>
</action>
- <action name="m_a_close">
+ <action name="action_menu_close">
<property name="icon">
<iconset>
<normaloff>../ressources/menu/gtk-close.png</normaloff>../ressources/menu/gtk-close.png</iconset>
@@ -375,7 +374,7 @@
<string>Fermer</string>
</property>
</action>
- <action name="m_a_save_maille">
+ <action name="action_menu_save_maille">
<property name="checkable">
<bool>true</bool>
</property>
@@ -386,7 +385,7 @@
<string>Enregistrer le maillage</string>
</property>
</action>
- <action name="m_a_save">
+ <action name="action_menu_save">
<property name="icon">
<iconset>
<normaloff>ressources/gtk-save.png</normaloff>ressources/gtk-save.png</iconset>
@@ -398,7 +397,7 @@
<string>Ctrl+S</string>
</property>
</action>
- <action name="m_a_save_as">
+ <action name="action_menu_save_as">
<property name="icon">
<iconset>
<normaloff>ressources/gtk-save-as.png</normaloff>ressources/gtk-save-as.png</iconset>
@@ -410,17 +409,17 @@
<string>Ctrl+Shift+S</string>
</property>
</action>
- <action name="m_a_archive">
+ <action name="action_menu_archive">
<property name="text">
<string>Archiver</string>
</property>
</action>
- <action name="m_a_config">
+ <action name="action_menu_config">
<property name="text">
<string>Configuration de Pamhyr</string>
</property>
</action>
- <action name="m_a_quit">
+ <action name="action_menu_quit">
<property name="icon">
<iconset>
<normaloff>../ressources/menu/gtk-quit.png</normaloff>../ressources/menu/gtk-quit.png</iconset>
@@ -432,37 +431,37 @@
<string>Ctrl+F4</string>
</property>
</action>
- <action name="m_a_edit_network">
+ <action name="action_menu_edit_network">
<property name="text">
<string> Éditer le réseau</string>
</property>
</action>
- <action name="m_a_edit_geometry">
+ <action name="action_menu_edit_geometry">
<property name="text">
<string>Éditer la géométrie </string>
</property>
</action>
- <action name="m_a_import_geometry">
+ <action name="action_menu_import_geometry">
<property name="text">
<string>Importer une géométrie</string>
</property>
</action>
- <action name="m_a_export_geometry">
+ <action name="action_menu_export_geometry">
<property name="text">
<string>Exporter la géométrie</string>
</property>
</action>
- <action name="m_a_run_mailler">
+ <action name="action_menu_run_mailler">
<property name="text">
<string>Lancer le mailleur externe</string>
</property>
</action>
- <action name="m_a_choose_maillieur_by_bief">
+ <action name="action_menu_choose_maillieur_by_bief">
<property name="text">
<string>Choix du mailleur par bief</string>
</property>
</action>
- <action name="m_a_view_maille">
+ <action name="action_menu_view_maille">
<property name="enabled">
<bool>false</bool>
</property>
@@ -470,7 +469,7 @@
<string>Visualiser la géométrie maillée</string>
</property>
</action>
- <action name="m_a_export_maillage">
+ <action name="action_menu_export_maillage">
<property name="enabled">
<bool>false</bool>
</property>
@@ -478,7 +477,7 @@
<string>Exporter le maillage </string>
</property>
</action>
- <action name="m_a_delete_maillage_for_current_bief">
+ <action name="action_menu_delete_maillage_for_current_bief">
<property name="enabled">
<bool>false</bool>
</property>
@@ -486,7 +485,7 @@
<string>Supprimer le maillage du bief courant</string>
</property>
</action>
- <action name="m_a_delete_maillage">
+ <action name="action_menu_delete_maillage">
<property name="enabled">
<bool>false</bool>
</property>
@@ -494,12 +493,12 @@
<string>Supprimer l'ensemble des maillages</string>
</property>
</action>
- <action name="m_a_abscisse_cote">
+ <action name="action_menu_abscisse_cote">
<property name="text">
<string>Abscisse - Cote</string>
</property>
</action>
- <action name="m_a_XYZ">
+ <action name="action_menu_XYZ">
<property name="text">
<string>XYZ</string>
</property>
@@ -678,17 +677,17 @@
<string>Cartographier le bief courant</string>
</property>
</action>
- <action name="actionAide_de_PAMHYR">
+ <action name="action_menu_help_pamhyr">
<property name="text">
<string>Aide de PAMHYR</string>
</property>
</action>
- <action name="actionAide_de_MAGE">
+ <action name="action_menu_help_mage">
<property name="text">
<string>Aide de MAGE</string>
</property>
</action>
- <action name="actionA_propos">
+ <action name="action_menu_about">
<property name="text">
<string>À propos</string>
</property>
@@ -705,7 +704,7 @@
<string>Ouvrir une étude</string>
</property>
</action>
- <action name="actionenregistrer_etude_en_cours">
+ <action name="action_toolBar_save">
<property name="icon">
<iconset>
<normaloff>ressources/save.png</normaloff>ressources/save.png</iconset>
@@ -720,7 +719,7 @@
<string/>
</property>
</action>
- <action name="actionfermer_etude_en_cours">
+ <action name="action_toolBar_close">
<property name="icon">
<iconset>
<normaloff>ressources/gtk-close.png</normaloff>ressources/gtk-close.png</iconset>
@@ -735,7 +734,7 @@
<string>Ctrl+F</string>
</property>
</action>
- <action name="actionquitter_application">
+ <action name="action_toolBar_quit">
<property name="icon">
<iconset>
<normaloff>ressources/exit_bis.png</normaloff>ressources/exit_bis.png</iconset>
@@ -750,7 +749,7 @@
<string>Ctrl+Q</string>
</property>
</action>
- <action name="actionlancer_solveur">
+ <action name="action_toolBar_run_solver">
<property name="icon">
<iconset>
<normaloff>ressources/gtk-execute.png</normaloff>ressources/gtk-execute.png</iconset>
@@ -765,7 +764,7 @@
<string>Ctrl+X</string>
</property>
</action>
- <action name="actioninterrompt_simulation_en_cours">
+ <action name="action_toolBar_kill_solver">
<property name="enabled">
<bool>false</bool>
</property>
@@ -783,7 +782,7 @@
<string>Ctrl+C</string>
</property>
</action>
- <action name="actionlancer_mailleur_externe">
+ <action name="action_toolBar_run_mailleur">
<property name="icon">
<iconset>
<normaloff>ressources/gnome-stock-insert-table.png</normaloff>ressources/gnome-stock-insert-table.png</iconset>
@@ -795,7 +794,7 @@
<string>Lancer le mailleur externe sur la géométrie du bief courant</string>
</property>
</action>
- <action name="actionafficher_listings_simulation">
+ <action name="action_toolBar_listing">
<property name="enabled">
<bool>false</bool>
</property>
@@ -810,7 +809,7 @@
<string>Aficher les listings de la simulation courante</string>
</property>
</action>
- <action name="actionReseau">
+ <action name="action_toolBar_network">
<property name="icon">
<iconset>
<normaloff>ressources/reseau3_24.png</normaloff>ressources/reseau3_24.png</iconset>
@@ -822,7 +821,7 @@
<string>Ouvrir l'éditeur de la topologie du réseau</string>
</property>
</action>
- <action name="actionGeometrie">
+ <action name="action_toolBar_geometry">
<property name="icon">
<iconset>
<normaloff>ressources/geometrie0.png</normaloff>ressources/geometrie0.png</iconset>
@@ -834,7 +833,7 @@
<string>Ouvrir l'éditeur de géométrie</string>
</property>
</action>
- <action name="actionMaillage">
+ <action name="action_toolBar_maillage">
<property name="icon">
<iconset>
<normaloff>ressources/mailles-50.png</normaloff>ressources/mailles-50.png</iconset>
@@ -846,7 +845,7 @@
<string>Afficher le maillage</string>
</property>
</action>
- <action name="actionCond_Limites">
+ <action name="action_toolBar_cond_limites">
<property name="text">
<string>Cond. Limites</string>
</property>
@@ -857,7 +856,7 @@
<font/>
</property>
</action>
- <action name="actionApp_Lat_raux">
+ <action name="action_toolBar_App_Lateraux">
<property name="text">
<string>App. Latéraux</string>
</property>
@@ -865,7 +864,7 @@
<string>Ouvrir l'éditeur des Apports Latéraux Distribués</string>
</property>
</action>
- <action name="actionDeversements">
+ <action name="action_toolBar_Deversements">
<property name="text">
<string>Déversements</string>
</property>
@@ -873,7 +872,7 @@
<string>Ouvrir l'éditeur des Déversements Latéraux</string>
</property>
</action>
- <action name="actionTroncons">
+ <action name="action_toolBar_Troncons">
<property name="text">
<string>Tronçons</string>
</property>
@@ -881,7 +880,7 @@
<string>Ouvrir l'éditeur des tronçons pour les frottements et Apports Latéraux</string>
</property>
</action>
- <action name="actionFrottements">
+ <action name="action_toolBar_Frottements">
<property name="text">
<string>Frottements</string>
</property>
@@ -889,7 +888,7 @@
<string>Ouvrir l'éditeur des frottements au fond</string>
</property>
</action>
- <action name="actionOuvrages">
+ <action name="action_toolBar_Ouvrages">
<property name="text">
<string>Ouvrages</string>
</property>
--
GitLab