MQTT Monitor: comparison MqttMonitor/MqttConnectionProfilesDialog.py

-:5fe4f179975f
+:9a4c9b7f078c
 class MqttConnectionProfilesDialog(QDialog, Ui_MqttConnectionProfilesDialog):
 """
 Class implementing a dialog to edit the MQTT connection profiles.
 """
-def __init__(self, profiles, parent=None):
+def __init__(self, profiles, currentProfile="", parent=None):
 """
 Constructor
 @param profiles dictionary containing dictionaries containing the
 connection parameters. Each entry must have the keys
 "BrokerAddress", "BrokerPort", "ClientId", "Protocol",
 "ConnectionTimeout", "Keepalive", "CleanSession", "Username",
 "Password", "WillTopic", "WillMessage", "WillQos", "WillRetain",
-"TlsEnable", "TlsCaCert", "TlsClientCert", "TlsClientKey",
+"WillProperties", "TlsEnable", "TlsCaCert", "TlsClientCert",
-"UserProperties".
+"TlsClientKey", "UserProperties".
 @type dict
+@param currentProfile name of the currently selected profile
+@type str
 @param parent reference to the parent widget
 @type QWidget
 """
 super().__init__(parent)
 self.setupUi(self)
 self.__profiles = collections.defaultdict(self.__defaultProfile)
-self.__profiles.update(profiles)
+self.__profiles.update(copy.deepcopy(profiles))
 self.__profilesChanged = False
 self.plusButton.setIcon(UI.PixmapCache.getIcon("plus"))
 self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy"))
 self.minusButton.setIcon(UI.PixmapCache.getIcon("minus"))
 self.showPasswordButton.setIcon(UI.PixmapCache.getIcon("showPassword"))
+self.willPropertiesButton.setIcon(
+UI.PixmapCache.getIcon("listSelection"))
 self.tlsCertsFilePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
 self.tlsCertsFilePicker.setFilters(
 self.tr("Certificate Files (*.crt *.pem);;All Files (*)"))
 self.tlsSelfSignedCertsFilePicker.setMode(
 self.profileFrame.setEnabled(False)
 self.__populatingProfile = False
 self.__deletingProfile = False
-self.__populateProfilesList()
+self.__populateProfilesList(currentProfile=currentProfile)
 @pyqtSlot(str)
 def on_profileEdit_textChanged(self, name):
 """
 Private slot to handle changes of the profile name.
 """
 if button == self.profileButtonBox.button(
 QDialogButtonBox.StandardButton.Apply
 ):
 currentProfile = self.__applyProfile()
-self.__populateProfilesList(currentProfile)
+self.__populateProfilesList(currentProfile=currentProfile)
 elif button == self.profileButtonBox.button(
 QDialogButtonBox.StandardButton.Reset
 ):
 self.__resetProfile()
 self.tr("Copy Connection Profile"),
 self.tr("""<p>A connection named <b>{0}</b> exists"""
 """ already. Aborting...</p>""").format(
 newProfileName))
 else:
-profile = self.__defaultProfile()
+connectionProfile = self.__defaultProfile()
-profile.update(self.__profiles[profileName])
+connectionProfile.update(
-self.__profiles[newProfileName] = profile
+copy.deepcopy(self.__profiles[profileName]))
+self.__profiles[newProfileName] = connectionProfile
+self.__profilesChanged = True
 itm = QListWidgetItem(newProfileName, self.profilesList)
 self.profilesList.setCurrentItem(itm)
 self.brokerAddressEdit.setFocus(
 Qt.FocusReason.OtherFocusReason)
 @return dictionary containing dictionaries containing the defined
 connection profiles. Each entry has the keys "BrokerAddress",
 "BrokerPort", "ClientId", "Protocol", "ConnectionTimeout",
 "Keepalive", "CleanSession", "Username", "Password", "WillTopic",
-"WillMessage", "WillQos", "WillRetain", "TlsEnable", "TlsCaCert",
+"WillMessage", "WillQos", "WillRetain", "WillProperties",
-"TlsClientCert", "TlsClientKey", "UserProperties".
+"TlsEnable", "TlsCaCert", "TlsClientCert", "TlsClientKey",
+"UserProperties".
 @rtype dict
 """
 profilesDict = {}
-profilesDict.update(self.__profiles)
+profilesDict.update(copy.deepcopy(dict(self.__profiles)))
 return profilesDict
 def __applyProfile(self):
 """
 Private method to apply the entered data to the list of profiles.
 self.propertiesWidget.getProperties())
 self.__userProperties["use_connect"] = (
 self.samePropertiesCheckBox.isChecked())
 else:
 self.__userProperties = {}
+self.__willProperties = []
 profileName = self.profileEdit.text()
 connectionProfile = {
 "BrokerAddress": self.brokerAddressEdit.text(),
 "BrokerPort": self.brokerPortSpinBox.value(),
 "Password": pwConvert(self.passwordEdit.text(), encode=True),
 "WillTopic": self.willTopicEdit.text(),
 "WillMessage": self.willMessageEdit.toPlainText(),
 "WillQos": self.willQosSpinBox.value(),
 "WillRetain": self.willRetainCheckBox.isChecked(),
+"WillProperties": copy.deepcopy(self.__willProperties),
 "TlsEnable": self.tlsGroupBox.isChecked(),
 "TlsCaCert": "",
 "TlsClientCert": "",
 "TlsClientKey": "",
 "UserProperties": copy.deepcopy(self.__userProperties),
 # will tab
 self.willTopicEdit.setText(connectionProfile["WillTopic"])
 self.willMessageEdit.setPlainText(connectionProfile["WillMessage"])
 self.willQosSpinBox.setValue(connectionProfile["WillQos"])
 self.willRetainCheckBox.setChecked(connectionProfile["WillRetain"])
+self.__willProperties = copy.deepcopy(
+connectionProfile.get("WillProperties", []))
 # SSL/TLS tab
 self.tlsGroupBox.setChecked(connectionProfile["TlsEnable"])
 if (
 connectionProfile["TlsCaCert"] and
 self.passwordEdit.setText("")
 self.willTopicEdit.setText("")
 self.willMessageEdit.setPlainText("")
 self.willQosSpinBox.setValue(0)
 self.willRetainCheckBox.setChecked(False)
+self.__willProperties = []
 self.tlsGroupBox.setChecked(False)
 self.tlsDefaultCertsButton.setChecked(True)
 self.tlsCertsFileButton.setChecked(True)
 self.tlsCertsFilePicker.setText("")
 self.tlsSelfSignedCertsButton.setChecked(False)
 self.willQosSpinBox.value() != connectionProfile["WillQos"] or
 self.willRetainCheckBox.isChecked() !=
 connectionProfile["WillRetain"] or
 self.tlsGroupBox.isChecked() != connectionProfile["TlsEnable"]
 )
+# check will properties only, ig not yet changed
+if not changed and protocol == MqttProtocols.MQTTv5:
+changed |= (
+sorted(self.__willProperties) !=
+sorted(connectionProfile["WillProperties"])
+)
 # check TLS stuff only, if not yet changed
 if not changed:
 if self.tlsCertsFileButton.isChecked():
 changed |= (
 self.tlsCertsFilePicker.text() !=
 """
 self.profileTabWidget.setTabEnabled(
 self.profileTabWidget.indexOf(self.propertiesTab),
 checked
 )
-# TODO: add code to enable the WILL properties button
+self.willPropertiesButton.setEnabled(checked)
+self.willPropertiesButton.setVisible(checked)
 @pyqtSlot(bool)
 def on_showPasswordButton_toggled(self, checked):
 """
 Private slot to show or hide the password.
 (
 self.passwordEdit.setEchoMode(QLineEdit.EchoMode.Normal)
 if checked else
 self.passwordEdit.setEchoMode(QLineEdit.EchoMode.Password)
 )
+@pyqtSlot()
+def on_willPropertiesButton_clicked(self):
+"""
+Private slot to edit the last will user properties.
+"""
+from .MqttUserPropertiesEditor import MqttUserPropertiesEditorDialog
+dlg = MqttUserPropertiesEditorDialog(
+self.tr("Last Will User Properties"), self.__willProperties, self)
+if dlg.exec() == QDialog.DialogCode.Accepted:
+self.__willProperties = dlg.getProperties()
 @pyqtSlot(str)
 def on_tlsCertsFilePicker_textChanged(self, path):
 """
 Private slot handling a change of the TLS CA certificates file.

Mercurial Repositories > MQTT Monitor / file comparison

comparison: MqttMonitor/MqttConnectionProfilesDialog.py

MqttMonitor/MqttConnectionProfilesDialog.py