MQTT Monitor: comparison MqttMonitor/MqttMonitorWidget.py

-:70b8858199f5
+:5fe4f179975f
 self.__messagesFormat = self.messagesEdit.currentCharFormat()
 self.__messagesTopicFormat = self.messagesEdit.currentCharFormat()
 self.__messagesTopicFormat.setFontWeight(QFont.Weight.Bold)
 self.__messagesQosFormat = self.messagesEdit.currentCharFormat()
 self.__messagesQosFormat.setFontItalic(True)
+self.__messagesSubheaderFormat = self.messagesEdit.currentCharFormat()
+self.__messagesSubheaderFormat.setFontUnderline(True)
 self.__propertiesFormat = self.propertiesEdit.currentCharFormat()
 self.__propertiesTopicFormat = self.propertiesEdit.currentCharFormat()
 self.__propertiesTopicFormat.setFontWeight(QFont.Weight.Bold)
 self.__propertiesNameFormat = self.propertiesEdit.currentCharFormat()
 self.__updateUnsubscribeTopicComboBox()
 self.__publishedTopics = []
 self.__updatePublishTopicComboBox()
 self.publishButton.setEnabled(False)
+self.publishPropertiesButton.setIcon(
+UI.PixmapCache.getIcon("listSelection"))
+self.publishPropertiesButton.setEnabled(False)
+self.publishPropertiesButton.setVisible(False)
 self.__connectionOptions = None
 prefix = MqttMonitorWidget.BrokerStatusTopicPrefix
 self.__statusLabelMapping = {
 self.unsubscribeGroup.setEnabled(True)
 self.unsubscribePropertiesButton.setVisible(
 self.__client.getProtocol() == MqttProtocols.MQTTv5)
 self.publishGroup.setEnabled(True)
 self.brokerStatusButton.setEnabled(True)
+self.publishPropertiesButton.setVisible(
+self.__client.getProtocol() == MqttProtocols.MQTTv5)
 self.__statusLoadValues.clear()
 self.__clearBrokerStatusLabels()
 self.__setBrokerStatusSubscribed(False)
 else:
 self.subscribeGroup.setEnabled(False)
 self.subscribePropertiesButton.setVisible(False)
 self.unsubscribeGroup.setEnabled(False)
 self.unsubscribePropertiesButton.setVisible(False)
 self.publishGroup.setEnabled(False)
+self.publishPropertiesButton.setVisible(False)
 self.brokerStatusButton.setEnabled(False)
 self.__statusLoadValues.clear()
 @pyqtSlot(int, str)
 MQTT v3.1.1).
 @param mid ID of the subscribe request
 @type int
 """
+# TODO: remember the successfully subscribed topic
+# TODO: max. number of recent topics as a config item
 if mid in self.__topicQueue:
 topic = self.__topicQueue.pop(mid)
 self.__subscribedTopics.append(topic)
 self.subscribeTopicEdit.clear()
 )
 result, mid = self.__client.unsubscribe(
 topic, properties=properties)
 self.__topicQueue[mid] = topic
+@pyqtSlot()
+def on_publishPropertiesButton_clicked(self):
+"""
+Private slot to edit the publish user properties.
+"""
+topic = self.publishTopicComboBox.currentText()
+self.__editProperties(
+"publish",
+self.tr("PUBLISH: User Properties for '{0}'").format(topic),
+topic
+)
 @pyqtSlot(str)
 def on_publishTopicComboBox_editTextChanged(self, topic):
 """
 Private slot to handle changes of the publish topic name.
 @param topic topic text
 @type str
 """
 self.publishButton.setEnabled(bool(topic))
+self.publishPropertiesButton.setEnabled(bool(topic))
 @pyqtSlot()
 def on_publishButton_clicked(self):
 """
 Private slot to publish the entered message.
 payloadStr = self.publishPayloadEdit.toPlainText()
 if not payloadStr:
 # use empty string together with the retain flag to clean
 # a retained message by sending None instead
 payloadStr = None
+properties = (
-msgInfo = self.__client.publish(topic, payloadStr, qos, retain)
+self.__plugin.getPreferences("PublishProperties").get(topic, [])
+if self.__client.getProtocol() == MqttProtocols.MQTTv5 else
+None
+)
+msgInfo = self.__client.publish(
+topic, payload=payloadStr, qos=qos, retain=retain,
+properties=properties)
 if msgInfo.rc == 0:
 if topic not in self.__publishedTopics:
 self.__publishedTopics.append(topic)
 self.__updatePublishTopicComboBox(resetTopic=False)
 if self.clearPublishCheckBox.isChecked():
 def on_publishClearRetainedButton_clicked(self):
 """
 Private slot to clear the retained messages for the topic.
 """
 topic = self.publishTopicComboBox.currentText()
+properties = (
-msgInfo = self.__client.publish(topic, payload=None, retain=True)
+self.__plugin.getPreferences("PublishProperties").get(topic, [])
+if self.__client.getProtocol() == MqttProtocols.MQTTv5 else
+None
+)
+msgInfo = self.__client.publish(
+topic, payload=None, retain=True, properties=properties)
 if msgInfo.rc == 0:
 if topic not in self.__publishedTopics:
 self.__publishedTopics.append(topic)
 self.__updatePublishTopicComboBox(resetTopic=False)
 hostAndPort = [host, port]
 if hostAndPort in brokerList:
 brokerList.remove(hostAndPort)
 brokerList.insert(0, hostAndPort)
 # limit to most recently used 20 entries
+# TODO: make the amount of recent brokers a config item
 brokerList = brokerList[:20]
 self.__plugin.setPreferences("RecentBrokersWithPort", brokerList)
 self.__populateBrokerComboBoxes()
 if retain:
 self.messagesEdit.setCurrentCharFormat(self.__messagesQosFormat)
 self.messagesEdit.insertPlainText(self.tr("Retained Message\n"))
 if properties:
-self.messagesEdit.setCurrentCharFormat(self.__messagesTopicFormat)
+self.messagesEdit.setCurrentCharFormat(
+self.__messagesSubheaderFormat)
 self.messagesEdit.insertPlainText(self.tr("Properties:\n"))
 self.messagesEdit.setCurrentCharFormat(self.__messagesFormat)
-for name, value in sorted(properties.items):
+for name, value in sorted(properties.items()):
 self.messagesEdit.insertPlainText(
 self.tr("{0}: {1}\n", "property name, property value")
 .format(name, value)
 )
+self.messagesEdit.setCurrentCharFormat(self.__messagesSubheaderFormat)
+self.messagesEdit.insertPlainText(self.tr("Message:\n"))
 payloadStr = str(payload, encoding="utf-8", errors="replace")
+payloadStr = Utilities.filterAnsiSequences(payloadStr)
 self.messagesEdit.setCurrentCharFormat(self.__messagesFormat)
-self.messagesEdit.insertPlainText(
+if payloadStr:
-Utilities.filterAnsiSequences(payloadStr))
+self.messagesEdit.insertPlainText(payloadStr)
+else:
+self.messagesEdit.insertPlainText(self.tr("<empty>"))
 if self.followMessagesCheckBox.isChecked():
 self.messagesEdit.ensureCursorVisible()
 else:
 self.messagesEdit.verticalScrollBar().setValue(scrollbarValue)
 profileName = self.profileComboBox.currentText()
 if profileName:
 self.__plugin.setPreferences("MostRecentProfile", profileName)
 profilesDict = self.__plugin.getPreferences("BrokerProfiles")
-connectionProfile = copy.copy(profilesDict[profileName])
+connectionProfile = copy.deepcopy(profilesDict[profileName])
 host = connectionProfile["BrokerAddress"]
 port = connectionProfile["BrokerPort"]
 try:
 protocol = connectionProfile["Protocol"]
 except KeyError:
 @param header header to be shown in the edit dialog
 @type str
 @param key key to retrieve the right properties
 @type str
 """
-from .MqttUserPropertiesEditor import MqttUserPropertiesEditor
+from .MqttUserPropertiesEditor import MqttUserPropertiesEditorDialog
 preferencesKey = "{0}Properties".format(propertiesType.capitalize())
 properties = self.__plugin.getPreferences(preferencesKey)
-dlg = MqttUserPropertiesEditor(header, properties.get(key, []), self)
+dlg = MqttUserPropertiesEditorDialog(
+header, properties.get(key, []), self)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 properties[key] = dlg.getProperties()
 self.__plugin.setPreferences(preferencesKey, properties)

Mercurial Repositories > MQTT Monitor / file comparison

comparison: MqttMonitor/MqttMonitorWidget.py

MqttMonitor/MqttMonitorWidget.py