refactor: remove QPushButtonWrapper

Author: CyanVoxel

src/tagstudio/qt/mixed/migration_modal.py

@@ -16,6 +16,7 @@
     QLabel,
     QMessageBox,
     QProgressDialog,
+    QPushButton,
     QSizePolicy,
     QVBoxLayout,
     QWidget,
@@ -47,7 +48,6 @@
 from tagstudio.qt.utils.custom_runnable import CustomRunnable
 from tagstudio.qt.utils.function_iterator import FunctionIterator
 from tagstudio.qt.views.paged_body_wrapper import PagedBodyWrapper
-from tagstudio.qt.views.qbutton_wrapper import QPushButtonWrapper
 from tagstudio.qt.views.stylesheets.stylesheets import header
 
 logger = structlog.get_logger(__name__)
@@ -99,8 +99,8 @@ def init_page_info(self) -> None:
         body_wrapper.layout().addWidget(body_label)
         body_wrapper.layout().setContentsMargins(0, 36, 0, 0)
 
-        cancel_button = QPushButtonWrapper(Translations["generic.cancel"])
-        next_button = QPushButtonWrapper(Translations["generic.continue"])
+        cancel_button = QPushButton(Translations["generic.cancel"])
+        next_button = QPushButton(Translations["generic.continue"])
         cancel_button.clicked.connect(self.migration_cancelled.emit)
 
         self.stack.append(
@@ -289,14 +289,12 @@ def init_page_convert(self) -> None:
         self.body_wrapper_01.layout().addWidget(desc_label)
         self.body_wrapper_01.layout().setSpacing(12)
 
-        back_button = QPushButtonWrapper(Translations["generic.navigation.back"])
-        start_button = QPushButtonWrapper(Translations["json_migration.start_and_preview"])
+        back_button = QPushButton(Translations["generic.navigation.back"])
+        start_button = QPushButton(Translations["json_migration.start_and_preview"])
         start_button.setMinimumWidth(120)
         start_button.clicked.connect(self.migrate)
         start_button.clicked.connect(lambda: start_button.setDisabled(True))
-        finish_button: QPushButtonWrapper = QPushButtonWrapper(
-            Translations["json_migration.finish_migration"]
-        )
+        finish_button = QPushButton(Translations["json_migration.finish_migration"])
         finish_button.setMinimumWidth(120)
         finish_button.setDisabled(True)
         finish_button.clicked.connect(self.finish_migration)
@@ -381,7 +379,7 @@ def migration_progress(self, skip_ui: bool = False):
                     pb.setMinimum(1),
                     pb.setValue(1),
                     # Enable the finish button
-                    cast(QPushButtonWrapper, self.stack[1].buttons[4]).setDisabled(False),
+                    cast(QPushButton, self.stack[1].buttons[4]).setDisabled(False),
                 )
             )
             QThreadPool.globalInstance().start(r)

src/tagstudio/qt/mixed/pagination.py

@@ -5,24 +5,24 @@
 """A pagination widget created for TagStudio."""
 
 from typing import cast, override
+from warnings import catch_warnings
 
 from PIL import Image, ImageQt
 from PySide6.QtCore import QSize, Signal
 from PySide6.QtGui import QIntValidator, QPixmap
-from PySide6.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QSizePolicy, QWidget
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QPushButton, QSizePolicy, QWidget
 
 from tagstudio.qt.helpers.color_overlay import auto_theme_overlay
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.views.qbutton_wrapper import QPushButtonWrapper
 
 
 class Pagination(QWidget):
     """Widget containing controls for navigating between pages of items."""
 
     index = Signal(int)
 
-    def __init__(self, parent=None) -> None:
-        super().__init__(parent)
+    def __init__(self, parent: QWidget | None = None) -> None:
+        super().__init__(parent=parent)
         self.rm = ResourceManager()
         self.page_count: int = 0
         self.current_page_index: int = 0
@@ -43,7 +43,7 @@ def __init__(self, parent=None) -> None:
         self.root_layout.setSpacing(3)
 
         # [<] ----------------------------------
-        self.prev_button = QPushButtonWrapper()
+        self.prev_button = QPushButton()
         prev_icon: Image.Image = self.rm.bxs_left_arrow
         prev_icon = auto_theme_overlay(prev_icon, use_alpha=False)
         self.prev_button.setIcon(QPixmap.fromImage(ImageQt.ImageQt(prev_icon)))
@@ -52,7 +52,7 @@ def __init__(self, parent=None) -> None:
         self.prev_button.setMaximumSize(self.button_size)
 
         # --- [1] ------------------------------
-        self.start_button = QPushButtonWrapper()
+        self.start_button = QPushButton()
         self.start_button.setMinimumSize(self.button_size)
         self.start_button.setMaximumSize(self.button_size)
 
@@ -91,12 +91,12 @@ def __init__(self, parent=None) -> None:
         self.end_ellipses.setText(". . .")
 
         # ----------------------------- [42] ---
-        self.end_button = QPushButtonWrapper()
+        self.end_button = QPushButton()
         self.end_button.setMinimumSize(self.button_size)
         self.end_button.setMaximumSize(self.button_size)
 
         # ---------------------------------- [>]
-        self.next_button = QPushButtonWrapper()
+        self.next_button = QPushButton()
         next_icon: Image.Image = self.rm.bxs_right_arrow
         next_icon = auto_theme_overlay(next_icon, use_alpha=False)
         self.next_button.setIcon(QPixmap.fromImage(ImageQt.ImageQt(next_icon)))
@@ -223,7 +223,7 @@ def update_buttons(self, page_count: int, index: int, emit: bool = True):
                         )
                         self._assign_click(
                             cast(
-                                QPushButtonWrapper,
+                                QPushButton,
                                 self.start_buffer_layout.itemAt(i - start_offset).widget(),
                             ),
                             i,
@@ -240,7 +240,7 @@ def update_buttons(self, page_count: int, index: int, emit: bool = True):
                         self.end_buffer_layout.itemAt(i - end_offset).widget().setText(str(i + 1))  # pyright: ignore[reportAttributeAccessIssue]
                         self._assign_click(
                             cast(
-                                QPushButtonWrapper,
+                                QPushButton,
                                 self.end_buffer_layout.itemAt(i - end_offset).widget(),
                             ),
                             i,
@@ -268,21 +268,20 @@ def update_buttons(self, page_count: int, index: int, emit: bool = True):
     def _goto_page(self, index: int):
         self.update_buttons(self.page_count, index)
 
-    def _assign_click(self, button: QPushButtonWrapper, index):
-        if button.is_connected:
+    def _assign_click(self, button: QPushButton, index: int):
+        with catch_warnings(record=True):
             button.clicked.disconnect()
         button.clicked.connect(lambda checked=False, i=index: self._goto_page(i))
-        button.is_connected = True
 
     def _populate_buffer_buttons(self):
         for _ in range(max(self.buffer_page_count * 2, 5)):
-            button = QPushButtonWrapper()
+            button = QPushButton()
             button.setMinimumSize(self.button_size)
             button.setMaximumSize(self.button_size)
             button.setHidden(True)
             self.start_buffer_layout.addWidget(button)
 
-            end_button = QPushButtonWrapper()
+            end_button = QPushButton()
             end_button.setMinimumSize(self.button_size)
             end_button.setMaximumSize(self.button_size)
             end_button.setHidden(True)

src/tagstudio/qt/views/qbutton_wrapper.py

@@ -16,12 +16,10 @@
     QPalette,
     QPen,
 )
-from PySide6.QtWidgets import QWidget
+from PySide6.QtWidgets import QPushButton, QWidget
 
-from tagstudio.qt.views.qbutton_wrapper import QPushButtonWrapper
 
-
-class ThumbButton(QPushButtonWrapper):
+class ThumbButton(QPushButton):
     def __init__(self, parent: QWidget, thumb_size: tuple[int, int]) -> None:
         super().__init__(parent)
         self.thumb_size: tuple[int, int] = thumb_size