Instead of calling setWindowFlags, made modals inherit QDialog rather…

… than QWidget.
TagStudioDev · Sep 7, 2024 · ce6ccee · ce6ccee
1 parent 95fb657
commit ce6ccee
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 20 deletions.
diff --git a/tagstudio/src/qt/modals/add_field.py b/tagstudio/src/qt/modals/add_field.py
@@ -6,6 +6,7 @@
 from PySide6.QtCore import Signal, Qt
 from PySide6.QtWidgets import (
     QWidget,
+    QDialog,
     QVBoxLayout,
     QHBoxLayout,
     QLabel,
@@ -16,7 +17,7 @@
 from src.core.library import Library
 
 
-class AddFieldModal(QWidget):
+class AddFieldModal(QDialog):
     done = Signal(int)
 
     def __init__(self, library: "Library"):
@@ -31,7 +32,6 @@ def __init__(self, library: "Library"):
         self.setMinimumSize(400, 300)
         self.root_layout = QVBoxLayout(self)
         self.root_layout.setContentsMargins(6, 6, 6, 6)
-        self.setWindowFlags(Qt.Dialog)
 
         self.title_widget = QLabel()
         self.title_widget.setObjectName("fieldTitle")

diff --git a/tagstudio/src/qt/modals/delete_unlinked.py b/tagstudio/src/qt/modals/delete_unlinked.py
@@ -8,6 +8,7 @@
 from PySide6.QtGui import QStandardItemModel, QStandardItem
 from PySide6.QtWidgets import (
     QWidget,
+    QDialog,
     QVBoxLayout,
     QHBoxLayout,
     QLabel,
@@ -25,7 +26,7 @@
     from src.qt.ts_qt import QtDriver
 
 
-class DeleteUnlinkedEntriesModal(QWidget):
+class DeleteUnlinkedEntriesModal(QDialog):
     done = Signal()
 
     def __init__(self, library: "Library", driver: "QtDriver"):
@@ -37,7 +38,6 @@ def __init__(self, library: "Library", driver: "QtDriver"):
         self.setMinimumSize(500, 400)
         self.root_layout = QVBoxLayout(self)
         self.root_layout.setContentsMargins(6, 6, 6, 6)
-        self.setWindowFlags(Qt.Dialog)
 
         self.desc_widget = QLabel()
         self.desc_widget.setObjectName("descriptionLabel")

diff --git a/tagstudio/src/qt/modals/file_extension.py b/tagstudio/src/qt/modals/file_extension.py
@@ -8,6 +8,7 @@
     QVBoxLayout,
     QHBoxLayout,
     QWidget,
+    QDialog,
     QPushButton,
     QTableWidget,
     QTableWidgetItem,
@@ -41,7 +42,6 @@ def __init__(self, library: "Library"):
         self.setMinimumSize(240, 400)
         self.root_layout = QVBoxLayout(self)
         self.root_layout.setContentsMargins(6, 6, 6, 6)
-        self.setWindowFlags(Qt.Dialog)
 
         # Create Table Widget --------------------------------------------------
         self.table = QTableWidget(len(self.lib.ext_list), 1)

diff --git a/tagstudio/src/qt/modals/fix_dupes.py b/tagstudio/src/qt/modals/fix_dupes.py
@@ -9,6 +9,7 @@
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import (
     QWidget,
+    QDialog,
     QVBoxLayout,
     QHBoxLayout,
     QLabel,
@@ -24,7 +25,7 @@
     from src.qt.ts_qt import QtDriver
 
 
-class FixDupeFilesModal(QWidget):
+class FixDupeFilesModal(QDialog):
     # done = Signal(int)
     def __init__(self, library: "Library", driver: "QtDriver"):
         super().__init__()
@@ -37,7 +38,6 @@ def __init__(self, library: "Library", driver: "QtDriver"):
         self.setMinimumSize(400, 300)
         self.root_layout = QVBoxLayout(self)
         self.root_layout.setContentsMargins(6, 6, 6, 6)
-        self.setWindowFlags(Qt.Dialog)
 
         self.desc_widget = QLabel()
         self.desc_widget.setObjectName("descriptionLabel")

diff --git a/tagstudio/src/qt/modals/fix_unlinked.py b/tagstudio/src/qt/modals/fix_unlinked.py
@@ -7,7 +7,7 @@
 import typing
 
 from PySide6.QtCore import Qt, QThreadPool
-from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel, QPushButton
+from PySide6.QtWidgets import QWidget, QDialog, QVBoxLayout, QHBoxLayout, QLabel, QPushButton
 
 from src.core.library import Library
 from src.qt.helpers.function_iterator import FunctionIterator
@@ -29,7 +29,7 @@
 logging.basicConfig(format="%(message)s", level=logging.INFO)
 
 
-class FixUnlinkedEntriesModal(QWidget):
+class FixUnlinkedEntriesModal(QDialog):
     def __init__(self, library: "Library", driver: "QtDriver"):
         super().__init__()
         self.lib = library
@@ -41,7 +41,6 @@ def __init__(self, library: "Library", driver: "QtDriver"):
         self.setMinimumSize(400, 300)
         self.root_layout = QVBoxLayout(self)
         self.root_layout.setContentsMargins(6, 6, 6, 6)
-        self.setWindowFlags(Qt.Dialog)
 
         self.unlinked_desc_widget = QLabel()
         self.unlinked_desc_widget.setObjectName("unlinkedDescriptionLabel")

diff --git a/tagstudio/src/qt/modals/folders_to_tags.py b/tagstudio/src/qt/modals/folders_to_tags.py
@@ -10,6 +10,7 @@
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import (
     QWidget,
+    QDialog,
     QVBoxLayout,
     QHBoxLayout,
     QLabel,
@@ -157,7 +158,7 @@ def cut_branches_adding_nothing(branch: dict):
     return tree
 
 
-class FoldersToTagsModal(QWidget):
+class FoldersToTagsModal(QDialog):
     # done = Signal(int)
     def __init__(self, library: "Library", driver: "QtDriver"):
         super().__init__()
@@ -171,7 +172,6 @@ def __init__(self, library: "Library", driver: "QtDriver"):
         self.setMinimumSize(640, 640)
         self.root_layout = QVBoxLayout(self)
         self.root_layout.setContentsMargins(6, 6, 6, 6)
-        self.setWindowFlags(Qt.Dialog)
 
         self.title_widget = QLabel()
         self.title_widget.setObjectName("title")

diff --git a/tagstudio/src/qt/modals/mirror_entities.py b/tagstudio/src/qt/modals/mirror_entities.py
@@ -10,6 +10,7 @@
 from PySide6.QtGui import QStandardItemModel, QStandardItem
 from PySide6.QtWidgets import (
     QWidget,
+    QDialog,
     QVBoxLayout,
     QHBoxLayout,
     QLabel,
@@ -27,7 +28,7 @@
     from src.qt.ts_qt import QtDriver
 
 
-class MirrorEntriesModal(QWidget):
+class MirrorEntriesModal(QDialog):
     done = Signal()
 
     def __init__(self, library: "Library", driver: "QtDriver"):
@@ -39,7 +40,6 @@ def __init__(self, library: "Library", driver: "QtDriver"):
         self.setMinimumSize(500, 400)
         self.root_layout = QVBoxLayout(self)
         self.root_layout.setContentsMargins(6, 6, 6, 6)
-        self.setWindowFlags(Qt.Dialog)
 
         self.desc_widget = QLabel()
         self.desc_widget.setObjectName("descriptionLabel")

diff --git a/tagstudio/src/qt/widgets/panel.py b/tagstudio/src/qt/widgets/panel.py
@@ -6,10 +6,10 @@
 from typing import Callable
 
 from PySide6.QtCore import Signal, Qt
-from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel, QPushButton
+from PySide6.QtWidgets import QWidget, QDialog, QVBoxLayout, QHBoxLayout, QLabel, QPushButton
 
 
-class PanelModal(QWidget):
+class PanelModal(QDialog):
     saved = Signal()
 
     # TODO: Separate callbacks from the buttons you want, and just generally
@@ -33,7 +33,6 @@ def __init__(
         self.setWindowModality(Qt.WindowModality.ApplicationModal)
         self.root_layout = QVBoxLayout(self)
         self.root_layout.setContentsMargins(6, 0, 6, 6)
-        self.setWindowFlags(Qt.Dialog)
 
         self.title_widget = QLabel()
         self.title_widget.setObjectName("fieldTitle")

diff --git a/tagstudio/src/qt/widgets/progress.py b/tagstudio/src/qt/widgets/progress.py
@@ -6,10 +6,10 @@
 from typing import Optional
 
 from PySide6.QtCore import Qt
-from PySide6.QtWidgets import QWidget, QVBoxLayout, QProgressDialog
+from PySide6.QtWidgets import QWidget, QDialog, QVBoxLayout, QProgressDialog
 
 
-class ProgressWidget(QWidget):
+class ProgressWidget(QDialog):
     """Prebuilt thread-safe progress bar widget."""
 
     def __init__(
@@ -35,7 +35,6 @@ def __init__(
         )
         self.setWindowTitle(window_title)
         self.setWindowModality(Qt.WindowModality.ApplicationModal)
-        self.setWindowFlags(Qt.Dialog)
 
     def update_label(self, text: str):
         self.pb.setLabelText(text)