Last refactoring before bump version

Author: yjg30737

pyqt_openai/main.py

@@ -1,6 +1,5 @@
 import os
 import sys
-import webbrowser
 
 import requests
 
@@ -35,12 +34,12 @@
 from pyqt_openai.chat_widget.openAiChatBotWidget import OpenAIChatBotWidget
 from pyqt_openai.replicate_widget.replicateWidget import ReplicateWidget
 from pyqt_openai.settingsDialog import SettingsDialog
-from pyqt_openai.util.script import get_font, restart_app, show_message_box
+from pyqt_openai.util.script import get_font, restart_app, show_message_box, goPayPal, goBuyMeCoffee
 from pyqt_openai.doNotAskAgainDialog import DoNotAskAgainDialog
 from pyqt_openai.sqlite import get_db_filename
 
 from pyqt_openai.pyqt_openai_data import OPENAI_STRUCT, LLAMAINDEX_WRAPPER
-from pyqt_openai import PAYPAL_URL, BUYMEACOFFEE_URL, INI_FILE_NAME, SHORTCUT_FULL_SCREEN, \
+from pyqt_openai import INI_FILE_NAME, SHORTCUT_FULL_SCREEN, \
     APP_INITIAL_WINDOW_SIZE, APP_NAME, APP_ICON, ICON_STACKONTOP, ICON_CUSTOMIZE, ICON_FULLSCREEN, ICON_CLOSE
 
 # HighDPI support
@@ -109,10 +108,10 @@ def __setActions(self):
         self.__aboutAction.triggered.connect(self.__showAboutDialog)
 
         self.__paypalAction = QAction('Paypal', self)
-        self.__paypalAction.triggered.connect(self.__paypal)
+        self.__paypalAction.triggered.connect(goPayPal)
 
         self.__buyMeCoffeeAction = QAction('Buy me a coffee!', self)
-        self.__buyMeCoffeeAction.triggered.connect(self.__buyMeCoffee)
+        self.__buyMeCoffeeAction.triggered.connect(goBuyMeCoffee)
 
         # toolbar action
         self.__chooseAiAction = QWidgetAction(self)
@@ -328,12 +327,6 @@ def __showAboutDialog(self):
         aboutDialog = AboutDialog()
         aboutDialog.exec()
 
-    def __paypal(self):
-        webbrowser.open(PAYPAL_URL)
-
-    def __buyMeCoffee(self):
-        webbrowser.open(BUYMEACOFFEE_URL)
-
     def __stackToggle(self, f):
         if f:
             self.setWindowFlags(self.windowFlags() | Qt.WindowType.WindowStaysOnTopHint)

pyqt_openai/util/script.py

@@ -5,6 +5,7 @@
 import re
 import string
 import sys
+import webbrowser
 import zipfile
 from datetime import datetime
 from pathlib import Path
@@ -15,7 +16,7 @@
 from qtpy.QtWidgets import QMessageBox
 
 from pyqt_openai import INI_FILE_NAME, DEFAULT_FONT_SIZE, DEFAULT_FONT_FAMILY, MAIN_INDEX, \
-    PROMPT_NAME_REGEX
+    PROMPT_NAME_REGEX, PAYPAL_URL, BUYMEACOFFEE_URL
 from pyqt_openai.models import ImagePromptContainer
 from pyqt_openai.pyqt_openai_data import DB
 
@@ -297,4 +298,10 @@ def get_prompt_data(prompt_type='form'):
                 'content': entry.content
             })
         data.append(group_obj)
-    return data
+    return data
+
+def goPayPal():
+    webbrowser.open(PAYPAL_URL)
+
+def goBuyMeCoffee():
+    webbrowser.open(BUYMEACOFFEE_URL)

pyqt_openai/widgets/linkLabel.py

@@ -16,6 +16,6 @@ def setUrl(self, url):
         self.__url = url
 
     def mouseReleaseEvent(self, QMouseEvent):
-        v = 1 if os.environ['QT_API'] == 'pyqt5' else Qt.MouseButtons.LeftButton
+        v = 1 if os.environ['QT_API'] == 'pyqt5' else Qt.MouseButton.LeftButton
         if QMouseEvent.button() == v:
             QDesktopServices.openUrl(QUrl(self.__url))