Mercurial Repositories > Flask Project / file diff

--- a/ProjectFlask/RunServerDialog.py	Sat May 29 15:04:41 2021 +0200
+++ b/ProjectFlask/RunServerDialog.py	Sun May 30 17:33:37 2021 +0200
@@ -9,12 +9,12 @@
 
 import re
 
-from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer
-from PyQt5.QtGui import QTextCharFormat
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QMenu
+from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer
+from PyQt6.QtGui import QTextCharFormat
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QMenu
 
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
+from EricWidgets import EricMessageBox
+from EricWidgets.EricApplication import ericApp
 
 from .Ui_RunServerDialog import Ui_RunServerDialog
 
@@ -57,8 +57,10 @@
         
         self.__urlRe = re.compile(r" \* Running on ([^(]+) \(.*")
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setDefault(True)
         
         self.__defaultTextFormat = self.outputEdit.currentCharFormat()
         
@@ -75,14 +77,16 @@
         
         # re-start server
         self.__actionsMenu.addAction(
-            self.tr("Re-start Server"), self.__restartServer)
+            self.tr("Re-start Server"),
+            self.__restartServer)
         self.__restartModeAct = self.__actionsMenu.addAction(
-            self.tr("Re-start Server"), self.__restartServerDifferentMode)
+            self.tr("Re-start Server"),
+            self.__restartServerDifferentMode)
         self.__actionsMenu.addSeparator()
+        # re-start server with options
         self.__actionsMenu.addAction(
             self.tr("Re-start Server with Options"),
             self.__restartServerWithOptions)
-        # start server with options
         
         self.menuButton.setIcon(UI.PixmapCache.getIcon("actionsToolButton"))
         self.menuButton.setMenu(self.__actionsMenu)
@@ -115,7 +119,7 @@
         
         if askForOptions:
             dlg = ServerStartOptionsDialog(self.__serverOptions)
-            if dlg.exec() != QDialog.Accepted:
+            if dlg.exec() != QDialog.DialogCode.Accepted:
                 return False
             
             self.__serverOptions.update(dlg.getDataDict())
@@ -128,7 +132,8 @@
             self.__process = QProcess()
             self.__process.setProcessEnvironment(env)
             self.__process.setWorkingDirectory(workdir)
-            self.__process.setProcessChannelMode(QProcess.MergedChannels)
+            self.__process.setProcessChannelMode(
+                QProcess.ProcessChannelMode.MergedChannels)
             
             self.__process.readyReadStandardOutput.connect(self.__readStdOut)
             self.__process.finished.connect(self.__processFinished)
@@ -148,13 +153,14 @@
             self.__process.start(command, args)
             ok = self.__process.waitForStarted(10000)
             if not ok:
-                E5MessageBox.critical(
+                EricMessageBox.critical(
                     None,
                     self.tr("Run Flask Server"),
                     self.tr("""The Flask server process could not be"""
                             """ started."""))
             else:
-                self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
+                self.buttonBox.button(
+                    QDialogButtonBox.StandardButton.Close).setEnabled(False)
                 self.stopServerButton.setEnabled(True)
                 self.stopServerButton.setDefault(True)
                 self.startBrowserButton.setEnabled(True)
@@ -210,7 +216,7 @@
         """
         if (
             self.__process is not None and
-            self.__process.state() != QProcess.NotRunning
+            self.__process.state() != QProcess.ProcessState.NotRunning
         ):
             self.__process.terminate()
             QTimer.singleShot(2000, self.__process.kill)
@@ -220,10 +226,12 @@
         
         self.startBrowserButton.setEnabled(False)
         self.stopServerButton.setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
-        self.buttonBox.button(QDialogButtonBox.Close).setFocus(
-            Qt.OtherFocusReason)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setDefault(True)
+        self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setFocus(
+            Qt.FocusReason.OtherFocusReason)
     
     @pyqtSlot()
     def on_stopServerButton_clicked(self):
@@ -241,7 +249,7 @@
             import webbrowser
             webbrowser.open(self.__serverUrl)
         else:
-            e5App().getObject("UserInterface").launchHelpViewer(
+            ericApp().getObject("UserInterface").launchHelpViewer(
                 self.__serverUrl)
     
     @pyqtSlot()