From 64c12fafccc8893de1c16c03c6c7928f818e8380 Mon Sep 17 00:00:00 2001 From: Urban Wallasch Date: Tue, 25 May 2021 11:27:58 +0200 Subject: [PATCH] * Set Qt.WA_DeleteOnClose on dialogs, replacing ugly deleteLater() hack. --- ffpreview.py | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/ffpreview.py b/ffpreview.py index 629c251..1bb5d60 100755 --- a/ffpreview.py +++ b/ffpreview.py @@ -671,6 +671,7 @@ class tmDialog(QDialog): def __init__(self, *args, odir='', **kwargs): super().__init__(*args, **kwargs) self.outdir = odir + self.setAttribute(Qt.WA_DeleteOnClose) self.setWindowTitle("Thumbnail Manager") self.resize(800, 700) self.dlg_layout = QVBoxLayout(self) @@ -757,13 +758,8 @@ class tmDialog(QDialog): self.loadfile = item.vfile eprint(1, "load file ", item.vfile) break - self.deleteLater() super().accept() - def reject(self): - self.deleteLater() - super().reject() - def refresh_list(self): self.ilist = get_indexfiles(self.outdir) self.redraw_list() @@ -852,6 +848,7 @@ class tmDialog(QDialog): class aboutDialog(QDialog): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + self.setAttribute(Qt.WA_DeleteOnClose) self.setWindowTitle('Help & About') self.setFixedSize(600, 600) self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) @@ -882,14 +879,6 @@ class aboutDialog(QDialog): self.dlg_layout.addWidget(self.help_pane) self.dlg_layout.addLayout(self.btn_layout) - def accept(self): - self.deleteLater() - super().accept() - - def reject(self): - self.deleteLater() - super().reject() - class cfgDialog(QDialog): ilist = [] @@ -917,6 +906,7 @@ class cfgDialog(QDialog): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + self.setAttribute(Qt.WA_DeleteOnClose) self.setWindowTitle('Preferences') self.table_widget = QTableWidget() self.table_widget.setSelectionMode(QAbstractItemView.NoSelection) @@ -967,13 +957,8 @@ class cfgDialog(QDialog): self.dlg_layout.addLayout(self.btn_layout) self.refresh() - def reject(self): - self.deleteLater() - super().reject() - def accept(self): self.apply() - self.deleteLater() super().accept() def reset(self): -- 2.30.2