winipedia-utils 0.1.30__tar.gz → 0.1.31__tar.gz

{winipedia_utils-0.1.30 → winipedia_utils-0.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: winipedia-utils
-Version: 0.1.30
+Version: 0.1.31
 Summary: A package with many utility functions
 License: MIT
 Author: Winipedia

{winipedia_utils-0.1.30 → winipedia_utils-0.1.31}/pyproject.toml

@@ -1,7 +1,7 @@
 # Project section
 [project]
 name = "winipedia-utils"
-version = "0.1.30"
+version = "0.1.31"
 description = "A package with many utility functions"
 readme = "README.md"
 requires-python = ">=3.12,<3.14"

{winipedia_utils-0.1.30 → winipedia_utils-0.1.31}/winipedia_utils/pyside/ui/base/base.py

@@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Any, Self, cast, final
 
 from PySide6.QtCore import QObject
 from PySide6.QtGui import QIcon
-from PySide6.QtWidgets import QApplication, QStackedWidget
+from PySide6.QtWidgets import QStackedWidget
 
 from winipedia_utils.modules.class_ import (
     get_all_nonabstract_subclasses,
@@ -83,36 +83,32 @@ class Base(metaclass=QABCImplementationLoggingMeta):
         children = get_all_nonabstract_subclasses(cls)
         return sorted(children, key=lambda cls: cls.__name__)
 
-    @classmethod
     @final
-    def set_current_page(cls, page_cls: type["BasePage"]) -> None:
+    def set_current_page(self, page_cls: type["BasePage"]) -> None:
         """Set the current page."""
-        cls.get_stack().setCurrentWidget(cls.get_page(page_cls))
+        self.get_stack().setCurrentWidget(self.get_page(page_cls))
 
-    @classmethod
     @final
-    def get_stack(cls) -> QStackedWidget:
+    def get_stack(self) -> QStackedWidget:
         """Get the stack of the window."""
-        window = cast("BaseWindow", (QApplication.activeWindow()))
+        window = cast("BaseWindow", (getattr(self, "window", lambda: None)()))
 
         return window.stack
 
-    @classmethod
     @final
-    def get_stack_pages(cls) -> list["BasePage"]:
+    def get_stack_pages(self) -> list["BasePage"]:
         """Get all the pages."""
         # Import here to avoid circular import
 
-        stack = cls.get_stack()
+        stack = self.get_stack()
         # get all the pages
         return [cast("BasePage", stack.widget(i)) for i in range(stack.count())]
 
-    @classmethod
     @final
-    def get_page[T: "BasePage"](cls, page_cls: type[T]) -> T:
+    def get_page[T: "BasePage"](self, page_cls: type[T]) -> T:
         """Get the page."""
         page = next(
-            page for page in cls.get_stack_pages() if page.__class__ is page_cls
+            page for page in self.get_stack_pages() if page.__class__ is page_cls
         )
         return cast("T", page)
 

{winipedia_utils-0.1.30 → winipedia_utils-0.1.31}/winipedia_utils/pyside/ui/pages/base/base.py

@@ -3,6 +3,7 @@
 This module contains the base page class for the VideoVault application.
 """
 
+from functools import partial
 from typing import final
 
 from PySide6.QtCore import Qt
@@ -50,7 +51,7 @@ class Base(BaseUI, QWidget):
 
         for page_cls in Base.get_subclasses():
             action = self.menu_dropdown.addAction(page_cls.get_display_name())
-            action.triggered.connect(page_cls.set_page)
+            action.triggered.connect(partial(self.set_current_page, page_cls))
 
     @final
     def add_to_page_button(
@@ -60,15 +61,9 @@ class Base(BaseUI, QWidget):
         button = QPushButton(to_page_cls.get_display_name())
 
         # connect to open page on click
-        button.clicked.connect(to_page_cls.set_page)
+        button.clicked.connect(lambda: self.set_current_page(to_page_cls))
 
         # add to layout
         layout.addWidget(button)
 
         return button
-
-    @classmethod
-    @final
-    def set_page(cls) -> None:
-        """Set the page."""
-        cls.set_current_page(cls)

{winipedia_utils-0.1.30 → winipedia_utils-0.1.31}/winipedia_utils/pyside/ui/pages/player.py

@@ -21,6 +21,6 @@ class Player(BasePage):
     def play_data(self, data: bytes, name: str) -> None:
         """Play the video."""
         # set current page to player
-        self.set_page()
+        self.set_current_page(self.__class__)
         # Stop current playback and clean up resources
         self.media_player.play_data(data, name)

{winipedia_utils-0.1.30 → winipedia_utils-0.1.31}/winipedia_utils/pyside/ui/windows/base/base.py

@@ -49,5 +49,4 @@ class Base(BaseUI, QMainWindow):
     @final
     def set_start_page(self) -> None:
         """Set the start page."""
-        start_page_cls = self.get_start_page_cls()
-        start_page_cls.set_page()
+        self.set_current_page(self.get_start_page_cls())