python-visual-update-express 1.0.1__tar.gz → 1.0.3__tar.gz

{python_visual_update_express-1.0.1 → python_visual_update_express-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-visual-update-express
-Version: 1.0.1
+Version: 1.0.3
 Summary: A dialog for updating specific files by syncing them from a server. Designed to work like InstallForge's "Visual Update Express".
 Project-URL: Homepage, https://github.com/ChocolatePinecone/python-generic-updater
 Project-URL: Issues, https://github.com/ChocolatePinecone/python-generic-updater/issues
@@ -44,7 +44,13 @@ UPDATE_BASE_URL = 'https://yoursite.com/releases/yourapplication/'
 CURRENT_VERSION = '1.0.1'
 UPDATE_TARGET_DIR = 'C:/yourlocationpath'
 
-updater_window = UpdaterWindow(UPDATE_BASE_URL, CURRENT_VERSION, UPDATE_TARGET_DIR)
+# If you are using have a PyQt6 QApplication set up, please indicate this to the UpdaterWindow by 
+# setting the create_q_application parameter to 'False'.
+# Otherwise the UpdateWindow will create another QApplication, causing issues with PyQt.
+# If you don't have a PyQt6 QApplication set up, please omit the create_q_application parameter 
+# so the updater will a QApplication up internally.
+updater_window = UpdaterWindow(UPDATE_BASE_URL, CURRENT_VERSION, UPDATE_TARGET_DIR, False)
+
 ```
 
 Then when you are ready, simply call `show` on the window to start the updater:

{python_visual_update_express-1.0.1 → python_visual_update_express-1.0.3}/README.md

@@ -27,7 +27,13 @@ UPDATE_BASE_URL = 'https://yoursite.com/releases/yourapplication/'
 CURRENT_VERSION = '1.0.1'
 UPDATE_TARGET_DIR = 'C:/yourlocationpath'
 
-updater_window = UpdaterWindow(UPDATE_BASE_URL, CURRENT_VERSION, UPDATE_TARGET_DIR)
+# If you are using have a PyQt6 QApplication set up, please indicate this to the UpdaterWindow by 
+# setting the create_q_application parameter to 'False'.
+# Otherwise the UpdateWindow will create another QApplication, causing issues with PyQt.
+# If you don't have a PyQt6 QApplication set up, please omit the create_q_application parameter 
+# so the updater will a QApplication up internally.
+updater_window = UpdaterWindow(UPDATE_BASE_URL, CURRENT_VERSION, UPDATE_TARGET_DIR, False)
+
 ```
 
 Then when you are ready, simply call `show` on the window to start the updater:

{python_visual_update_express-1.0.1 → python_visual_update_express-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-visual-update-express"
-version = "1.0.1"
+version = "1.0.3"
 authors = [
     { name = "Jelmer Pijnappel", email = "chocolatepinecone@gmail.com" },
 ]

{python_visual_update_express-1.0.1 → python_visual_update_express-1.0.3}/python_visual_update_express/application.py

@@ -1,18 +1,10 @@
 from pathlib import Path
 
-from PyQt6.QtWidgets import QApplication
-
-from python_visual_update_express.data.general_settings import APP_STYLE
 from python_visual_update_express.ui.updater_window import UpdaterWindow
 
 TMP_UPDATE_BASE_URL = 'http://jelmerpijnappel.nl/releases/broers-optiek/lensplan-hulp-applicatie/'
 TMP_CURRENT_UPDATE_VERSION = '1.3.0'
 TMP_TARGET_DIR = str(Path(__file__).resolve().parent.parent / "target")
 
-app = QApplication([])
-app.setStyle(APP_STYLE)
-
 window = UpdaterWindow(TMP_UPDATE_BASE_URL, TMP_CURRENT_UPDATE_VERSION, TMP_TARGET_DIR)
 window.show()
-
-app.exec()

{python_visual_update_express-1.0.1 → python_visual_update_express-1.0.3}/python_visual_update_express/libs/update_manager.py

@@ -4,9 +4,9 @@ from typing import Union
 
 from PyQt6.QtCore import pyqtSignal, QObject
 
-from python_generic_updater.data import general_info
-from python_generic_updater.libs.file_download import download_file_to_location
-from python_generic_updater.libs.updates_info import UpdatesInfo
+from python_visual_update_express.data import general_info
+from python_visual_update_express.libs.file_download import download_file_to_location
+from python_visual_update_express.libs.updates_info import UpdatesInfo
 
 DOWNLOADABLE_FILES_PATH = 'Updates/'
 

{python_visual_update_express-1.0.1 → python_visual_update_express-1.0.3}/python_visual_update_express/ui/error_handling.py

@@ -1,7 +1,7 @@
 import traceback
 
-from python_generic_updater.data.general_settings import DEBUG_MODE
-from python_generic_updater.ui.notifications import error_notification
+from python_visual_update_express.data.general_settings import DEBUG_MODE
+from python_visual_update_express.ui.notifications import error_notification
 
 
 def process_error(ex: Exception, self=None) -> None:

{python_visual_update_express-1.0.1 → python_visual_update_express-1.0.3}/python_visual_update_express/ui/status_text_widget.py

@@ -4,7 +4,7 @@ from PyQt6.QtWidgets import QWidget, QLabel, QHBoxLayout
 from pyqtwaitingspinner import WaitingSpinner, SpinnerParameters, SpinDirection
 from qtawesome import IconWidget
 
-from python_generic_updater.libs.icons import IconsLib, Icon
+from python_visual_update_express.libs.icons import IconsLib, Icon
 
 SPINNER_PARAMS = SpinnerParameters(  # These can be generated in the spinner editor `spinner-conf`
     roundness=100.0,

{python_visual_update_express-1.0.1 → python_visual_update_express-1.0.3}/python_visual_update_express/ui/updater_window.py

@@ -1,23 +1,29 @@
 from PyQt6.QtCore import QThreadPool, Qt, QSize
 from PyQt6.QtGui import QGuiApplication
-from PyQt6.QtWidgets import QMainWindow, QVBoxLayout, QWidget
+from PyQt6.QtWidgets import QMainWindow, QVBoxLayout, QWidget, QApplication
 from semver import Version
 
-from python_generic_updater.data import general_info
-from python_generic_updater.data.general_info import GeneralInfo
-from python_generic_updater.data.general_settings import VERSION, WINDOW_WIDTH, WINDOW_HEIGHT
-from python_generic_updater.ui.window_content import WindowContent
+from python_visual_update_express.data import general_info
+from python_visual_update_express.data.general_info import GeneralInfo
+from python_visual_update_express.data.general_settings import VERSION, WINDOW_WIDTH, WINDOW_HEIGHT
+from python_visual_update_express.ui.window_content import WindowContent
 
 VERSION_PREFIX = 'v. '
 
 
 class UpdaterWindow(QMainWindow):
+    app: QApplication
     window_content: WindowContent
 
     threadpool: QThreadPool
     centered_on_init: bool = False
 
-    def __init__(self, update_base_url: str, current_update_version: str, target_directory_path: str) -> None:
+    def __init__(self, update_base_url: str, current_update_version: str, target_directory_path: str,
+                 create_q_application: bool = True) -> None:
+        if create_q_application:
+            self.app = QApplication([])
+            self.app.setStyle('Fusion')
+
         super().__init__()
 
         # GENERAL INFO
@@ -57,3 +63,9 @@ class UpdaterWindow(QMainWindow):
 
         self.centered_on_init = True
         return super().resizeEvent(event)
+
+    def show(self):
+        super().show()
+
+        if self.app:
+            self.app.exec()

{python_visual_update_express-1.0.1 → python_visual_update_express-1.0.3}/python_visual_update_express/ui/window_content.py

@@ -5,14 +5,14 @@ from tempfile import TemporaryDirectory
 from PyQt6.QtCore import Qt, QThreadPool, pyqtSignal
 from PyQt6.QtWidgets import QWidget, QVBoxLayout, QLayout, QPushButton, QHBoxLayout, QProgressBar
 
-from python_generic_updater.data import general_info
-from python_generic_updater.libs.file_download import download_text_file
-from python_generic_updater.libs.icons import Icon
-from python_generic_updater.libs.threading import Worker
-from python_generic_updater.libs.update_manager import UpdateManager
-from python_generic_updater.libs.updates_info import UpdatesInfo
-from python_generic_updater.ui.error_handling import process_error
-from python_generic_updater.ui.status_text_widget import StatusTextWidget
+from python_visual_update_express.data import general_info
+from python_visual_update_express.libs.file_download import download_text_file
+from python_visual_update_express.libs.icons import Icon
+from python_visual_update_express.libs.threading import Worker
+from python_visual_update_express.libs.update_manager import UpdateManager
+from python_visual_update_express.libs.updates_info import UpdatesInfo
+from python_visual_update_express.ui.error_handling import process_error
+from python_visual_update_express.ui.status_text_widget import StatusTextWidget
 
 TEXT_INITIAL_STATUS = 'Ready to update'
 TEXT_CHECKING_FOR_UPDATE = 'Checking for update...'