parouby/Pamhyr2
1
0 Fork 0
mirror of https://gitlab.com/pamhyr/pamhyr2.git synced 2026-10-30 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'arts' into v0.0.8

Browse Source
This commit is contained in:
Pierre-Antoine Rouby committed 2024-05-14 14:41:14 +02:00
2 parents f4bf8d3766 8a0f214144
commit c1f4aaf957
177 files changed
+331 -558
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/View/Tools/ASubWindow.py
+9 -6
View File
@@ -496,12 +496,7 @@ class ASubMainWindow(QMainWindow, ASubWindowFeatures, WindowToolKit):
super(ASubMainWindow, self).__init__(parent=parent)
if ui is not None:
self.ui = loadUi(
os.path.abspath(
os.path.join(
os.path.dirname(__file__),
"..", "ui", f"{ui}.ui"
)
),
os.path.join(self._get_ui_directory(), f"{ui}.ui"),
self
)
@@ -510,6 +505,14 @@ class ASubMainWindow(QMainWindow, ASubWindowFeatures, WindowToolKit):
if self.parent is not None:
self.parent.sub_win_add(name, self)
def _get_ui_directory(self):
return os.path.abspath(
os.path.join(
os.path.dirname(__file__),
"..", "ui"
)
)
def closeEvent(self, event):
if self.parent is not None:
self.parent.sub_win_del(self.hash())