diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index fed284a7b7bdb8a3538eabe1a78b02bbdc79f0ce..1b5f06e32d9d502a59d6f90dc3f6d1f245b46a13 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -57,7 +57,11 @@ define_model_action = [ "action_toolBar_stricklers", "action_toolBar_building", "action_toolBar_initial_cond", # Menu - "action_run_solver", + "action_menu_run_solver", "action_menu_numerical_parameter", + "action_menu_edit_network", "action_menu_edit_geometry", + "action_menu_boundary_conditions", "action_menu_initial_conditions", + "action_menu_edit_friction", "action_menu_edit_lateral_contribution", + "action_menu_run_solver", ] action = ( @@ -119,7 +123,13 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): "action_menu_save": self.save_study, "action_menu_save_as": self.save_as_study, "action_menu_numerical_parameter": self.open_solver_parameters, - "action_run_solver": self.run_solver, + "action_menu_edit_network": self.open_network, + "action_menu_edit_geometry": self.open_geometry, + "action_menu_boundary_conditions": self.open_boundary_cond, + "action_menu_initial_conditions": self.open_initial_conditions, + "action_menu_edit_friction": self.open_sections, + "action_menu_edit_lateral_contribution": self.open_lateral_contrib, + "action_menu_run_solver": self.run_solver, ## Help "action_menu_about": self.open_about, # ToolBar action diff --git a/src/View/ui/MainWindow.ui b/src/View/ui/MainWindow.ui index 777288fe2bb79be0b621dbd5a20cf870b53cf799..619b87e638847abac24efd0b85dec620487be857 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -152,7 +152,7 @@ <string>&Execute</string> </property> <addaction name="action_menu_numerical_parameter"/> - <addaction name="action_run_solver"/> + <addaction name="action_menu_run_solver"/> <addaction name="action_simulation_directory_management"/> <addaction name="separator"/> </widget> @@ -163,14 +163,14 @@ <property name="title"> <string>&Hydraulics</string> </property> - <addaction name="action_boundary_conditions"/> + <addaction name="action_menu_boundary_conditions"/> <addaction name="separator"/> - <addaction name="action_initial_conditions"/> + <addaction name="action_menu_initial_conditions"/> <addaction name="action_initia_conditions_export"/> <addaction name="action_import_final_conditions_as_initial"/> <addaction name="separator"/> - <addaction name="action_edit_friction"/> - <addaction name="action_edit_lateral_contribution"/> + <addaction name="action_menu_edit_friction"/> + <addaction name="action_menu_edit_lateral_contribution"/> <addaction name="action_edit_spills"/> <addaction name="separator"/> <addaction name="action_edi_cross_building"/> @@ -345,6 +345,9 @@ </property> </action> <action name="action_menu_import_mage"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Import data from MAGE</string> </property> @@ -353,6 +356,9 @@ </property> </action> <action name="action_menu_import_rubarbe"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Import data from RubarBE</string> </property> @@ -437,16 +443,25 @@ </property> </action> <action name="action_menu_import_geometry"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Import geometry</string> </property> </action> <action name="action_menu_export_geometry"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Export geometry</string> </property> </action> <action name="action_menu_run_meshing_tool"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Run extrenal meshing tool</string> </property> @@ -489,11 +504,17 @@ </property> </action> <action name="action_menu_abscisse_cote"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Abscisse - Cote</string> </property> </action> <action name="action_menu_XYZ"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>XYZ</string> </property> @@ -506,7 +527,7 @@ <string>Numerical parameter for solvers</string> </property> </action> - <action name="action_boundary_conditions"> + <action name="action_menu_boundary_conditions"> <property name="text"> <string>Boundary conditions and one-time contributions</string> </property> @@ -517,7 +538,7 @@ </font> </property> </action> - <action name="action_initial_conditions"> + <action name="action_menu_initial_conditions"> <property name="text"> <string>Initial conditions</string> </property> @@ -526,26 +547,35 @@ <property name="checkable"> <bool>true</bool> </property> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Export initial conditions</string> </property> </action> <action name="action_import_final_conditions_as_initial"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Import final state as initial condition</string> </property> </action> - <action name="action_edit_friction"> + <action name="action_menu_edit_friction"> <property name="text"> <string>Edit friction</string> </property> </action> - <action name="action_edit_lateral_contribution"> + <action name="action_menu_edit_lateral_contribution"> <property name="text"> <string>Edit lateral contributions</string> </property> </action> <action name="action_edit_spills"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Edit spills</string> </property> @@ -556,11 +586,14 @@ </property> </action> <action name="action_edi_cross_building"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Edit cross building</string> </property> </action> - <action name="action_run_solver"> + <action name="action_menu_run_solver"> <property name="text"> <string>Run solver</string> </property> @@ -576,6 +609,9 @@ </property> </action> <action name="action_simulation_directory_management"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Simulation directory management</string> </property> @@ -591,6 +627,9 @@ </property> </action> <action name="action_plot_hydrograph"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Hydrograph</string> </property> @@ -603,6 +642,9 @@ </property> </action> <action name="action_plot_limnigram"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Limnigram</string> </property> @@ -614,6 +656,9 @@ </property> </action> <action name="action_map_current_reach"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>Map current reach</string> </property> @@ -625,7 +670,7 @@ </action> <action name="action_menu_help_mage"> <property name="text"> - <string>help MAGE</string> + <string>Help MAGE</string> </property> </action> <action name="action_menu_about">