From 41e39c7fe53ab4876609c5a294108497008af2c4 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Fri, 12 May 2023 09:39:38 +0200
Subject: [PATCH] BC: Rename window title with study name and other minor
change.
---
.../BoundaryConditionWindow.py | 4 ++-
src/View/BoundaryCondition/Edit/Window.py | 25 ++++++++++---------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/View/BoundaryCondition/BoundaryConditionWindow.py b/src/View/BoundaryCondition/BoundaryConditionWindow.py
index 9a22cf81..0c1864db 100644
--- a/src/View/BoundaryCondition/BoundaryConditionWindow.py
+++ b/src/View/BoundaryCondition/BoundaryConditionWindow.py
@@ -45,7 +45,9 @@ _translate = QCoreApplication.translate
class BoundaryConditionWindow(ASubMainWindow, ListedSubWindow):
- def __init__(self, title="BoundaryConditions", study=None, parent=None):
+ def __init__(self, title="Boundary conditions", study=None, parent=None):
+ title = title + " - " + study.name
+
super(BoundaryConditionWindow, self).__init__(
name=title, ui="BoundaryConditions", parent=parent
)
diff --git a/src/View/BoundaryCondition/Edit/Window.py b/src/View/BoundaryCondition/Edit/Window.py
index 35d3e9a5..4e8513fa 100644
--- a/src/View/BoundaryCondition/Edit/Window.py
+++ b/src/View/BoundaryCondition/Edit/Window.py
@@ -29,34 +29,35 @@ from View.BoundaryCondition.Edit.Plot import Plot
_translate = QCoreApplication.translate
class EditBoundaryConditionWindow(ASubMainWindow, ListedSubWindow):
- def __init__(self, title="Edit BoundaryConditions",
+ def __init__(self, title="Edit boundary condition",
data=None, study=None, parent=None):
- super(EditBoundaryConditionWindow, self).__init__(
- name=title, ui="EditBoundaryConditions", parent=parent
- )
-
self._data = data
self._study = study
self._title = title
- self.setup_window()
+ self.compute_title()
+
+ super(EditBoundaryConditionWindow, self).__init__(
+ name=self._title, ui="EditBoundaryConditions", parent=parent
+ )
+
+ self.ui.setWindowTitle(self._title)
+
self.setup_sc()
self.setup_table()
self.setup_plot()
self.setup_connections()
- def setup_window(self):
+ def compute_title(self):
if self._data is not None:
node_name = (self._data.node.name if self._data.node is not None
else _translate("BoundaryCondition", "Not associate"))
- title = (
- _translate("BoundaryCondition", self._title) +
+ self._title = (
+ _translate("Edit boundary condition", self._title) +
+ f" - {self._study.name} " +
f" - {self._data.name} " +
f"({long_types[self._data.bctype]} - {node_name})"
)
- self.ui.setWindowTitle(title)
- else:
- self.ui.setWindowTitle(_translate("BoundaryCondition", self._title))
def setup_sc(self):
self._undo_stack = QUndoStack()
--
GitLab