diff -r 24582cac737e -r d4e7f5a389e6 ProjectPyramid/PyramidRoutesDialog.py
--- a/ProjectPyramid/PyramidRoutesDialog.py Thu Dec 30 12:17:44 2021 +0100
+++ b/ProjectPyramid/PyramidRoutesDialog.py Wed Sep 21 16:24:54 2022 +0200
@@ -10,9 +10,7 @@
import os
from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer, QCoreApplication
-from PyQt6.QtWidgets import (
- QDialog, QDialogButtonBox, QLineEdit, QTreeWidgetItem
-)
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit, QTreeWidgetItem
from EricWidgets import EricMessageBox
@@ -26,10 +24,11 @@
"""
Class implementing a dialog showing the available routes.
"""
+
def __init__(self, project, parent=None):
"""
Constructor
-
+
@param project reference to the project object
@type Project
@param parent reference to the parent widget
@@ -37,85 +36,73 @@
"""
super().__init__(parent)
self.setupUi(self)
-
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setEnabled(False)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel).setDefault(True)
-
+
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True)
+
self.__project = project
self.proc = None
self.buffer = ""
-
+
self.show()
QCoreApplication.processEvents()
-
+
def finish(self):
"""
Public slot called when the process finished or the user pressed the
button.
"""
if (
- self.proc is not None and
- self.proc.state() != QProcess.ProcessState.NotRunning
+ self.proc is not None
+ and self.proc.state() != QProcess.ProcessState.NotRunning
):
self.proc.terminate()
QTimer.singleShot(2000, self.proc.kill)
self.proc.waitForFinished(3000)
-
+
self.inputGroup.setEnabled(False)
self.inputGroup.hide()
-
+
self.proc = None
-
+
self.__processBuffer()
-
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setEnabled(True)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setDefault(True)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setFocus(
- Qt.FocusReason.OtherFocusReason)
-
+
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setFocus(
+ Qt.FocusReason.OtherFocusReason
+ )
+
def on_buttonBox_clicked(self, button):
"""
Private slot called by a button of the button box clicked.
-
+
@param button button that was clicked (QAbstractButton)
"""
- if button == self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close
- ):
+ if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close):
self.close()
- elif button == self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel
- ):
+ elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel):
self.finish()
-
+
def __procFinished(self, exitCode, exitStatus):
"""
Private slot connected to the finished signal.
-
+
@param exitCode exit code of the process
@type int
@param exitStatus exit status of the process
@type QProcess.ExitStatus
"""
- self.normal = (
- exitStatus == QProcess.ExitStatus.NormalExit and
- exitCode == 0
- )
+ self.normal = exitStatus == QProcess.ExitStatus.NormalExit and exitCode == 0
self.finish()
-
+
def __processBuffer(self):
"""
Private slot to process the output buffer of the proutes command.
"""
self.routes.clear()
-
+
if not self.buffer:
QTreeWidgetItem(self.routes, [self.tr("No routes found.")])
self.routes.setHeaderHidden(True)
@@ -141,11 +128,11 @@
row += 1
for column in range(len(headers)):
self.routes.resizeColumnToContents(column)
-
+
def start(self, projectPath):
"""
Public slot used to start the process.
-
+
@param projectPath path to the Pyramid project
@type str
@return flag indicating a successful start of the process
@@ -153,30 +140,26 @@
"""
QTreeWidgetItem(self.routes, [self.tr("Getting routes...")])
self.routes.setHeaderHidden(True)
-
+
self.errorGroup.hide()
self.normal = False
self.intercept = False
-
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setEnabled(False)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel).setEnabled(True)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel).setDefault(True)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel).setFocus(
- Qt.FocusReason.OtherFocusReason)
-
+
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setFocus(
+ Qt.FocusReason.OtherFocusReason
+ )
+
self.proc = QProcess()
-
+
self.proc.finished.connect(self.__procFinished)
self.proc.readyReadStandardOutput.connect(self.__readStdout)
self.proc.readyReadStandardError.connect(self.__readStderr)
-
+
cmd = self.__project.getPyramidCommand(
- "proutes",
- virtualEnv=self.__project.getProjectVirtualEnvironment()
+ "proutes", virtualEnv=self.__project.getProjectVirtualEnvironment()
)
args = []
args.append("development.ini")
@@ -190,50 +173,55 @@
self.inputGroup.setEnabled(False)
EricMessageBox.critical(
self,
- self.tr('Process Generation Error'),
+ self.tr("Process Generation Error"),
self.tr(
- 'The process {0} could not be started. '
- 'Ensure, that it is in the search path.'
- ).format(cmd))
+ "The process {0} could not be started. "
+ "Ensure, that it is in the search path."
+ ).format(cmd),
+ )
else:
self.inputGroup.setEnabled(True)
self.inputGroup.show()
return procStarted
-
+
def __readStdout(self):
"""
Private slot to handle the readyReadStandardOutput signal.
-
+
It reads the output of the process and appends it to a buffer for
delayed processing.
"""
if self.proc is not None:
- out = str(self.proc.readAllStandardOutput(),
- Preferences.getSystem("IOEncoding"),
- 'replace')
+ out = str(
+ self.proc.readAllStandardOutput(),
+ Preferences.getSystem("IOEncoding"),
+ "replace",
+ )
self.buffer += out
-
+
def __readStderr(self):
"""
Private slot to handle the readyReadStandardError signal.
-
+
It reads the error output of the process and inserts it into the
error pane.
"""
if self.proc is not None:
- err = str(self.proc.readAllStandardError(),
- Preferences.getSystem("IOEncoding"),
- 'replace')
+ err = str(
+ self.proc.readAllStandardError(),
+ Preferences.getSystem("IOEncoding"),
+ "replace",
+ )
self.errorGroup.show()
self.errors.insertPlainText(err)
self.errors.ensureCursorVisible()
-
+
QCoreApplication.processEvents()
-
+
def on_passwordCheckBox_toggled(self, isOn):
"""
Private slot to handle the password checkbox toggled.
-
+
@param isOn flag indicating the status of the check box
@type bool
"""
@@ -241,7 +229,7 @@
self.input.setEchoMode(QLineEdit.EchoMode.Password)
else:
self.input.setEchoMode(QLineEdit.EchoMode.Normal)
-
+
@pyqtSlot()
def on_sendButton_clicked(self):
"""
@@ -249,27 +237,27 @@
"""
inputTxt = self.input.text()
inputTxt += os.linesep
-
+
if self.passwordCheckBox.isChecked():
self.errors.insertPlainText(os.linesep)
self.errors.ensureCursorVisible()
-
+
self.proc.write(strToQByteArray(inputTxt))
-
+
self.passwordCheckBox.setChecked(False)
self.input.clear()
-
+
def on_input_returnPressed(self):
"""
Private slot to handle the press of the return key in the input field.
"""
self.intercept = True
self.on_sendButton_clicked()
-
+
def keyPressEvent(self, evt):
"""
Protected slot to handle a key press event.
-
+
@param evt the key press event
@type QKeyEvent
"""
