fix run

Author: 892768447

.settings/org.eclipse.core.resources.prefs

@@ -1,5 +1,6 @@
 eclipse.preferences.version=1
 encoding//Resources/Data/Projects/PyQt/Demo/FacePoints.py=utf-8
+encoding//Resources/Data/Projects/PyQt/QWebView/GetCookie.py=utf-8
 encoding//Test/BaseApplyStyle.py=utf-8
 encoding//Test/CustomCursor.py=utf-8
 encoding//Test/GenerateLanguage.py=utf-8

PyQtClient.py

@@ -10,6 +10,7 @@
 @description:
 """
 
+from distutils.sysconfig import get_python_lib
 import os
 import sys
 import traceback
@@ -23,11 +24,19 @@
 
 sys.path.append(os.path.abspath('Library.zip'))
 
-# libpath = get_python_lib()
-# os.environ['QT_QPA_PLATFORM_PLUGIN_PATH'] = os.path.join(
-#     libpath, 'PyQt5', 'Qt', 'plugins', 'platforms')
-# os.environ['QML_IMPORT_PATH'] = os.path.join(libpath, 'Qt', 'qml')
-# os.environ['QML2_IMPORT_PATH'] = os.environ['QML_IMPORT_PATH']
+libpath = get_python_lib()
+os.environ['QT_QPA_PLATFORM_PLUGIN_PATH'] = os.path.join(
+    libpath, 'PyQt5', 'Qt', 'plugins', 'platforms')
+os.environ['QML_IMPORT_PATH'] = os.path.join(libpath, 'Qt', 'qml')
+os.environ['QML2_IMPORT_PATH'] = os.environ['QML_IMPORT_PATH']
+
+if os.name == 'nt':
+    os.environ['PATH'] = os.path.join(
+        libpath, 'PyQt5', 'Qt', 'bin') + os.pathsep + os.environ['PATH']
+os.environ['PATH'] = os.path.dirname(
+    os.path.abspath(sys.argv[0])) + os.pathsep + os.environ['PATH']
+
+print(os.environ['PATH'])
 
 
 def escape(s):

pyqtclient_zh_CN.ts renamed to Resources/pyqtclient_zh_CN.ts

@@ -289,6 +289,17 @@ def loadTheme(cls):
         except Exception as e:
             AppLog.exception(e)
 
+    @classmethod
+    def loadFont(cls):
+        """加载字体
+        """
+        ThemeManager.ThemeName = Setting.value('theme', 'Default', str)
+        # 加载主题中的字体
+        path = cls.fontPath()
+        AppLog.info('fontPath: {}'.format(path))
+        if os.path.isfile(path):
+            QFontDatabase.addApplicationFont(path)
+
     @classmethod
     def loadUserTheme(cls, theme='Default'):
         """加载主题目录里的主题

Utils/ThemeManager.py

@@ -15,7 +15,8 @@
 import sys
 
 from PyQt5 import QtCore
-from PyQt5.QtCore import QEvent, Qt, QTimer, pyqtSlot, QUrl, QProcess
+from PyQt5.QtCore import QEvent, Qt, QTimer, pyqtSlot, QUrl, QProcess,\
+    QProcessEnvironment, QLibraryInfo
 from PyQt5.QtGui import QEnterEvent, QIcon
 
 from UiFiles.Ui_MainWindow import Ui_FormMainWindow
@@ -137,20 +138,24 @@ def _runFile(self, file):
         process.setProperty('file', file)
         process.readChannelFinished.connect(self.onReadChannelFinished)
 
-#         if os.path.exists('platforms'):
-#             env = QProcessEnvironment.systemEnvironment()
-# #         libpath = get_python_lib()
-# #         env.insert('QT_QPA_PLATFORM_PLUGIN_PATH', os.path.join(
-# #             libpath, 'PyQt5', 'Qt', 'plugins', 'platforms'))
-#             env.insert('QT_QPA_PLATFORM_PLUGIN_PATH',
-#                        os.path.abspath('platforms'))
-#             env.insert('QML_IMPORT_PATH', os.path.abspath('qml'))
-#             env.insert('QML2_IMPORT_PATH', env.value('QML_IMPORT_PATH'))
-#             env.insert(
-#                 'PATH', QLibraryInfo.location(
-#                     QLibraryInfo.BinariesPath) + ';' + env.value('PATH')
-#             )
-#             process.setProcessEnvironment(env)
+        env = QProcessEnvironment.systemEnvironment()
+#         libpath = get_python_lib()
+#         env.insert('QT_QPA_PLATFORM_PLUGIN_PATH', os.path.join(
+#             libpath, 'PyQt5', 'Qt', 'plugins', 'platforms'))
+#         env.insert('QT_QPA_PLATFORM_PLUGIN_PATH',
+#                    os.path.abspath('platforms'))
+        env.insert('QML_IMPORT_PATH', os.path.abspath('qml'))
+        env.insert('QML2_IMPORT_PATH', env.value('QML_IMPORT_PATH'))
+        if os.name == 'nt':
+            env.insert(
+                'PATH', QLibraryInfo.location(
+                    QLibraryInfo.BinariesPath) + os.pathsep + env.value('PATH')
+            )
+        env.insert(
+            'PATH', os.path.dirname(
+                os.path.abspath(sys.argv[0])) + os.pathsep + env.value('PATH')
+        )
+        process.setProcessEnvironment(env)
 
         if sys.executable.endswith('python.exe'):
             process.setWorkingDirectory(os.path.dirname(file))
@@ -226,6 +231,9 @@ def main():
     else:
         # for Qt 5.5
         os.putenv('QT_DEVICE_PIXEL_RATIO', 'auto')
+    if os.name == 'nt':
+        os.environ['PATH'] = QLibraryInfo.location(
+            QLibraryInfo.BinariesPath) + os.pathsep + os.environ['PATH']
     os.makedirs(Constants.DirErrors, exist_ok=True)
     os.makedirs(Constants.DirProject, exist_ok=True)
     os.makedirs(os.path.dirname(Constants.UpgradeFile), exist_ok=True)

Widgets/MainWindow.py

@@ -64,8 +64,10 @@ def _initUi(self):
         AppLog.debug('colourful: %s', str(colourful))
         AppLog.debug('picture: %s', picture)
         if picture:
+            ThemeManager.loadFont()
             ThemeManager.loadPictureTheme(picture)
         elif colourful:
+            ThemeManager.loadFont()
             if isinstance(picture, QColor):
                 ThemeManager.loadColourfulTheme(colourful)
             else:
@@ -96,7 +98,7 @@ def _initLanguage(self):
         if QLocale.system().language() in (QLocale.China, QLocale.Chinese, QLocale.Taiwan, QLocale.HongKong):
             # 加载中文
             translator = QTranslator(self)
-            translator.load('translations/pyqtclient_zh_CN.qm')
+            translator.load('Resources/pyqtclient_zh_CN.qm')
             QApplication.instance().installTranslator(translator)
 
     def _initWebView(self):

Widgets/MainWindowBase.py

@@ -1,6 +1,7 @@
 requests
 pygit2==0.27.2
 PyQt5==5.10.1
+PyQtWebKit==5.10.1
 PyQt3D==5.10.1
 PyQtChart==5.10.1
 PyQtDataVisualization==5.10.1