MQTT Monitor: comparison MqttMonitor/MqttConnectionProfilesDialog.py

-:3cb08e5db764
+:2fb5c08019fd
 Module implementing a dialog to edit the MQTT connection profiles.
 """
 import collections
-from PyQt5.QtCore import pyqtSlot, Qt, QUuid
+from PyQt6.QtCore import pyqtSlot, Qt, QUuid
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
 QDialog, QDialogButtonBox, QAbstractButton, QListWidgetItem, QInputDialog,
 QLineEdit
 )
-from E5Gui import E5MessageBox
+from EricWidgets import EricMessageBox
-from E5Gui.E5PathPicker import E5PathPickerModes
+from EricWidgets.EricPathPicker import EricPathPickerModes
 from .Ui_MqttConnectionProfilesDialog import Ui_MqttConnectionProfilesDialog
 import UI.PixmapCache
 from Utilities.crypto import pwConvert
 self.__profiles = collections.defaultdict(self.__defaultProfile)
 self.__profiles.update(profiles)
 self.__profilesChanged = False
-self.plusButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
+self.plusButton.setIcon(UI.PixmapCache.getIcon("plus"))
-self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy.png"))
+self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy"))
-self.minusButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
+self.minusButton.setIcon(UI.PixmapCache.getIcon("minus"))
-self.tlsCertsFilePicker.setMode(E5PathPickerModes.OpenFileMode)
+self.tlsCertsFilePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
 self.tlsCertsFilePicker.setFilters(
 self.tr("Certificate Files (*.crt *.pem);;All Files (*)"))
 self.tlsSelfSignedCertsFilePicker.setMode(
-E5PathPickerModes.OpenFileMode)
+EricPathPickerModes.OPEN_FILE_MODE)
 self.tlsSelfSignedCertsFilePicker.setFilters(
 self.tr("Certificate Files (*.crt *.pem);;All Files (*)"))
 self.tlsSelfSignedClientCertFilePicker.setMode(
-E5PathPickerModes.OpenFileMode)
+EricPathPickerModes.OPEN_FILE_MODE)
 self.tlsSelfSignedClientCertFilePicker.setFilters(
 self.tr("Certificate Files (*.crt *.pem);;All Files (*)"))
 self.tlsSelfSignedClientKeyFilePicker.setMode(
-E5PathPickerModes.OpenFileMode)
+EricPathPickerModes.OPEN_FILE_MODE)
 self.tlsSelfSignedClientKeyFilePicker.setFilters(
 self.tr("Key Files (*.key *.pem);;All Files (*)"))
 self.profileTabWidget.setCurrentIndex(0)
 Private slot handling presses of the profile buttons.
 @param button reference to the pressed button
 @type QAbstractButton
 """
-if button == self.profileButtonBox.button(QDialogButtonBox.Apply):
+if button == self.profileButtonBox.button(
+QDialogButtonBox.StandardButton.Apply
+):
 currentProfile = self.__applyProfile()
 self.__populateProfilesList(currentProfile)
-elif button == self.profileButtonBox.button(QDialogButtonBox.Reset):
+elif button == self.profileButtonBox.button(
+QDialogButtonBox.StandardButton.Reset
+):
 self.__resetProfile()
 elif button == self.profileButtonBox.button(
-QDialogButtonBox.RestoreDefaults):
+QDialogButtonBox.StandardButton.RestoreDefaults
+):
 self.__populateProfileDefault()
 @pyqtSlot(QListWidgetItem, QListWidgetItem)
 def on_profilesList_currentItemChanged(self, current, previous):
 """
 current is not previous and
 not self.__deletingProfile and
 self.__isChangedProfile()
 ):
 # modified profile belongs to previous
-yes = E5MessageBox.yesNo(
+yes = EricMessageBox.yesNo(
 self,
 self.tr("Changed Connection Profile"),
 self.tr("""The current profile has unsaved changes."""
 """ Shall these be saved?"""),
-icon=E5MessageBox.Warning,
+icon=EricMessageBox.Warning,
 yesDefault=True)
 if yes:
 self.__applyProfile()
 if current:
 """
 profileName, ok = QInputDialog.getText(
 self,
 self.tr("New Connection Profile"),
 self.tr("Enter name for the new Connection Profile:"),
-QLineEdit.Normal)
+QLineEdit.EchoMode.Normal)
 if ok and bool(profileName):
 if profileName in self.__profiles:
-E5MessageBox.warning(
+EricMessageBox.warning(
 self,
 self.tr("New Connection Profile"),
 self.tr("""<p>A connection named <b>{0}</b> exists"""
 """ already. Aborting...</p>""").format(
 profileName))
 else:
 itm = QListWidgetItem(profileName, self.profilesList)
 self.profilesList.setCurrentItem(itm)
-self.brokerAddressEdit.setFocus(Qt.OtherFocusReason)
+self.brokerAddressEdit.setFocus(
+Qt.FocusReason.OtherFocusReason)
 @pyqtSlot()
 def on_copyButton_clicked(self):
 """
 Private slot to copy the selected profile entry.
 profileName = itm.text()
 newProfileName, ok = QInputDialog.getText(
 self,
 self.tr("Copy Connection Profile"),
 self.tr("Enter name for the copied Connection Profile:"),
-QLineEdit.Normal)
+QLineEdit.EchoMode.Normal)
 if ok and bool(newProfileName):
 if newProfileName in self.__profiles:
-E5MessageBox.warning(
+EricMessageBox.warning(
 self,
 self.tr("Copy Connection Profile"),
 self.tr("""<p>A connection named <b>{0}</b> exists"""
 """ already. Aborting...</p>""").format(
 newProfileName))
 profile.update(self.__profiles[profileName])
 self.__profiles[newProfileName] = profile
 itm = QListWidgetItem(newProfileName, self.profilesList)
 self.profilesList.setCurrentItem(itm)
-self.brokerAddressEdit.setFocus(Qt.OtherFocusReason)
+self.brokerAddressEdit.setFocus(
+Qt.FocusReason.OtherFocusReason)
 @pyqtSlot()
 def on_minusButton_clicked(self):
 """
 Private slot to delete the selected entry.
 """
 itm = self.profilesList.currentItem()
 if itm:
 profileName = itm.text()
-yes = E5MessageBox.yesNo(
+yes = EricMessageBox.yesNo(
 self,
 self.tr("Delete Connection Profile"),
 self.tr("""<p>Shall the Connection Profile <b>{0}</b>"""
 """ really be deleted?</p>""").format(profileName)
 )
 del self.__profiles[profileName]
 self.__profilesChanged = True
 self.__populateProfilesList()
 self.__deletingProfile = False
-self.profilesList.setFocus(Qt.OtherFocusReason)
+self.profilesList.setFocus(Qt.FocusReason.OtherFocusReason)
 def getProfiles(self):
 """
 Public method to return a dictionary of profiles.
 self.profilesList.clear()
 self.profilesList.addItems(sorted(self.__profiles.keys()))
 if currentProfile:
 items = self.profilesList.findItems(
-currentProfile, Qt.MatchExactly)
+currentProfile, Qt.MatchFlag.MatchExactly)
 if items:
 self.profilesList.setCurrentItem(items[0])
 if len(self.__profiles) == 0:
 self.profileFrame.setEnabled(False)
 not self.__populatingProfile and
 self.clientIdEdit.text() == "" and
 not self.cleanSessionCheckBox.isChecked()
 ):
 enable = False
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr("Invalid Connection Parameters"),
 self.tr("An empty Client ID requires a clean session."))
 if self.tlsGroupBox.isChecked():
 bool(self.tlsSelfSignedCertsFilePicker.text()) and
 bool(self.tlsSelfSignedClientCertFilePicker.text()) and
 bool(self.tlsSelfSignedClientKeyFilePicker.text())
 )
-self.profileButtonBox.button(QDialogButtonBox.Apply).setEnabled(enable)
+self.profileButtonBox.button(
+QDialogButtonBox.StandardButton.Apply).setEnabled(enable)
 @pyqtSlot(str)
 def on_brokerAddressEdit_textChanged(self, address):
 """
 Private slot handling a change of the broker address.
 def on_generateIdButton_clicked(self):
 """
 Private slot to generate a client ID.
 """
 uuid = QUuid.createUuid()
-self.clientIdEdit.setText(uuid.toString(QUuid.WithoutBraces))
+self.clientIdEdit.setText(
+uuid.toString(QUuid.StringFormat.WithoutBraces))
 @pyqtSlot(str)
 def on_clientIdEdit_textChanged(self, clientId):
 """
 Private slot handling a change of the client ID string.
 @param checked state of the selection
 @type bool
 """
 if checked and self.brokerPortSpinBox.value() == 1883:
 # port is still standard non-TLS port
-yes = E5MessageBox.yesNo(
+yes = EricMessageBox.yesNo(
 self,
 self.tr("SSL/TLS Enabled"),
 self.tr(
 """Encrypted connection using SSL/TLS has been enabled."""
 """ However, the broker port is still the default"""
 """ unencrypted port (port 1883). Shall this be"""
 """ changed?"""),
-icon=E5MessageBox.Warning,
+icon=EricMessageBox.Warning,
 yesDefault=True)
 if yes:
 self.brokerPortSpinBox.setValue(8883)
 elif not checked and self.brokerPortSpinBox.value() == 8883:
 # port is still standard TLS port
-yes = E5MessageBox.yesNo(
+yes = EricMessageBox.yesNo(
 self,
 self.tr("SSL/TLS Disabled"),
 self.tr(
 """Encrypted connection using SSL/TLS has been disabled."""
 """ However, the broker port is still the default"""
 """ encrypted port (port 8883). Shall this be"""
 """ changed?"""),
-icon=E5MessageBox.Warning,
+icon=EricMessageBox.Warning,
 yesDefault=True)
 if yes:
 self.brokerPortSpinBox.setValue(1883)
 self.__updateApplyButton()
 def reject(self):
 """
 Public slot to reject the dialog changes.
 """
 if self.__isChangedProfile():
-button = E5MessageBox.warning(
+button = EricMessageBox.warning(
 self,
 self.tr("Changed Connection Profile"),
 self.tr("""The current profile has unsaved changes. Shall"""
 """ these be saved?"""),
-E5MessageBox.StandardButtons(
+EricMessageBox.Discard |
-E5MessageBox.Discard |
+EricMessageBox.Save,
-E5MessageBox.Save),
+EricMessageBox.Save)
-E5MessageBox.Save)
+if button == EricMessageBox.Save:
-if button == E5MessageBox.Save:
 self.__applyProfile()
 return
 if self.__profilesChanged:
-button = E5MessageBox.warning(
+button = EricMessageBox.warning(
 self,
 self.tr("Changed Connection Profiles"),
 self.tr("""The list of connection profiles has unsaved"""
 """ changes."""),
-E5MessageBox.StandardButtons(
+EricMessageBox.Abort |
-E5MessageBox.Abort |
+EricMessageBox.Discard |
-E5MessageBox.Discard |
+EricMessageBox.Save,
-E5MessageBox.Save),
+EricMessageBox.Save)
-E5MessageBox.Save)
+if button == EricMessageBox.Save:
-if button == E5MessageBox.Save:
 super().accept()
 return
-elif button == E5MessageBox.Abort:
+elif button == EricMessageBox.Abort:
 return
 super().reject()
 @pyqtSlot()
 def accept(self):
 """
 Public slot to accept the dialog.
 """
 if self.__isChangedProfile():
-yes = E5MessageBox.yesNo(
+yes = EricMessageBox.yesNo(
 self,
 self.tr("Changed Connection Profile"),
 self.tr("""The current profile has unsaved changes. Shall"""
 """ these be saved?"""),
-icon=E5MessageBox.Warning,
+icon=EricMessageBox.Warning,
 yesDefault=True)
 if yes:
 self.__applyProfile()
 super().accept()

Mercurial Repositories > MQTT Monitor / file comparison

comparison: MqttMonitor/MqttConnectionProfilesDialog.py

MqttMonitor/MqttConnectionProfilesDialog.py