From ce1872a90f149eb9848c63529f5e82eb9d475a67 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Mon, 15 May 2023 14:35:41 +0200
Subject: [PATCH] pamhyr: Rename main sub window.
---
src/View/{Main/AboutWindow.py => About/Window.py} | 0
.../Solver/Window.py} | 4 ++--
src/View/{Main/ConfigureWindow.py => Configure/Window.py} | 6 +++---
src/View/MainWindow.py | 6 +++---
src/View/{Main/NewStudyWindow.py => Study/Window.py} | 0
5 files changed, 8 insertions(+), 8 deletions(-)
rename src/View/{Main/AboutWindow.py => About/Window.py} (100%)
rename src/View/{Main/ConfigureAddSolverWindow.py => Configure/Solver/Window.py} (96%)
rename src/View/{Main/ConfigureWindow.py => Configure/Window.py} (96%)
rename src/View/{Main/NewStudyWindow.py => Study/Window.py} (100%)
diff --git a/src/View/Main/AboutWindow.py b/src/View/About/Window.py
similarity index 100%
rename from src/View/Main/AboutWindow.py
rename to src/View/About/Window.py
diff --git a/src/View/Main/ConfigureAddSolverWindow.py b/src/View/Configure/Solver/Window.py
similarity index 96%
rename from src/View/Main/ConfigureAddSolverWindow.py
rename to src/View/Configure/Solver/Window.py
index 69bd69a5..cc98fd65 100644
--- a/src/View/Main/ConfigureAddSolverWindow.py
+++ b/src/View/Configure/Solver/Window.py
@@ -8,9 +8,9 @@ from PyQt5.QtWidgets import (
QPushButton,
)
-class ConfigureAddSolverWindow(ASubWindow):
+class ConfigureSolverWindow(ASubWindow):
def __init__(self, data=None, title="Configuration : Add Solver", parent=None):
- super(ConfigureAddSolverWindow, self).__init__(
+ super(ConfigureSolverWindow, self).__init__(
name=title, ui="ConfigureAddSolverDialog", parent=parent
)
self.ui.setWindowTitle(title)
diff --git a/src/View/Main/ConfigureWindow.py b/src/View/Configure/Window.py
similarity index 96%
rename from src/View/Main/ConfigureWindow.py
rename to src/View/Configure/Window.py
index 4988863b..659e92ed 100644
--- a/src/View/Main/ConfigureWindow.py
+++ b/src/View/Configure/Window.py
@@ -4,7 +4,7 @@ from config import Config
from View.ASubWindow import ASubWindow
from View.ListedSubWindow import ListedSubWindow
-from View.Main.ConfigureAddSolverWindow import ConfigureAddSolverWindow
+from View.Configure.Solver.Window import ConfigureSolverWindow
from PyQt5.QtCore import (
Qt, QVariant, QAbstractTableModel,
@@ -161,7 +161,7 @@ class ConfigureWindow(ASubWindow, ListedSubWindow):
def edit_solver(self):
indexes = self.find(QTableView, "tableView_solver").selectionModel().selectedRows()
for index in indexes:
- self.edit_solver = ConfigureAddSolverWindow(
+ self.edit_solver = ConfigureSolverWindow(
data=self.solver_table_model.rows[index.row()],
parent=self
)
@@ -169,7 +169,7 @@ class ConfigureWindow(ASubWindow, ListedSubWindow):
self.solver_table_model.change_solver(self.edit_solver.data, index)
def add_solver(self):
- dialog_solver = ConfigureAddSolverWindow(parent=self)
+ dialog_solver = ConfigureSolverWindow(parent=self)
if dialog_solver.exec_():
self.solver_table_model.add_solver(dialog_solver.data)
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index 187cedeb..68e8ef37 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -17,9 +17,9 @@ from View.ASubWindow import WindowToolKit
from View.ListedSubWindow import ListedSubWindow
from View.DummyWindow import DummyWindow
-from View.Main.ConfigureWindow import ConfigureWindow
-from View.Main.NewStudyWindow import NewStudyWindow
-from View.Main.AboutWindow import AboutWindow
+from View.Configure.Window import ConfigureWindow
+from View.Study.Window import NewStudyWindow
+from View.About.Window import AboutWindow
from View.Network.Window import NetworkWindow
from View.Geometry.Window import GeometryWindow
from View.BoundaryCondition.Window import BoundaryConditionWindow
diff --git a/src/View/Main/NewStudyWindow.py b/src/View/Study/Window.py
similarity index 100%
rename from src/View/Main/NewStudyWindow.py
rename to src/View/Study/Window.py
--
GitLab