MQTT Monitor: comparison MqttMonitor/MqttMonitorWidget.py

-:f75a385e9127
+:7e0e921dc7ea
 import os
 import collections
 from PyQt5.QtCore import pyqtSlot, QTimer
 from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QWidget
+from PyQt5.QtWidgets import QWidget, QDialog
 from E5Gui import E5MessageBox
 from .Ui_MqttMonitorWidget import Ui_MqttMonitorWidget
 os.path.join("MqttMonitor", "icons", "mqtt48.png")))
 self.brokerWidget.setCurrentIndex(0)
 self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect.png"))
-self.brokerComboBox.addItems(
+self.brokerConnectionOptionsButton.setIcon(UI.PixmapCache.getIcon(
-self.__plugin.getPreferences("RecentBrokers"))
+os.path.join("MqttMonitor", "icons", "connectionOptions.png")))
+self.__populateBrokerComboBoxes()
 self.brokerStatusLabel.hide()
 self.subscribeButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
 self.subscribeButton.setEnabled(False)
 self.unsubscribeButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
 self.__updateUnsubscribeTopicComboBox()
 self.__publishedTopics = []
 self.__updatePublishTopicComboBox()
 self.publishButton.setEnabled(False)
+self.__connectionOptions = None
 prefix = MqttMonitorWidget.BrokerStatusTopicPrefix
 self.__statusLabelMapping = {
 # broker
 prefix + "version": self.versionLabel,
 @param rc CONNACK result code
 @type int
 """
 if rc == 0:
 self.__connectedToBroker = True
+self.__connectionOptions = None
 msg = mqttConnackMessage(rc)
 self.__flashBrokerStatusLabel(msg)
 self.connectButton.setIcon(UI.PixmapCache.getIcon("ircDisconnect.png"))
 self.connectButton.setEnabled(False)
 else:
 self.connectButton.setEnabled(True)
 @pyqtSlot()
+def on_brokerConnectionOptionsButton_clicked(self):
+"""
+Private slot to show a dialog to modify connection options.
+"""
+from .MqttConnectionOptionsDialog import MqttConnectionOptionsDialog
+dlg = MqttConnectionOptionsDialog(
+self.__client, self.__connectionOptions, parent=self)
+if dlg.exec_() == QDialog.Accepted:
+self.__connectionOptions = dlg.getConnectionOptions()
+@pyqtSlot()
 def on_connectButton_clicked(self):
 """
 Private slot to handle a connect or disconnect request.
 """
 if self.__connectedToBroker:
 self.__client.disconnectFromServer()
 else:
 host = self.brokerComboBox.currentText()
+port = self.brokerPortComboBox.currentText().strip()
+try:
+port = int(port)
+except ValueError:
+# use standard port at 1883
+port = 1883
 if host:
-self.__addBrokerToRecent(host)
+self.__addBrokerToRecent(host, port)
-self.__client.connectToServer(host)
+self.__client.connectToServer(host, port=port)
-# use standard port at 1883
 @pyqtSlot(str)
 def on_subscribeTopicEdit_textChanged(self, topic):
 """
 Private slot to handle a change of the entered topic.
 """
 topic = self.publishTopicComboBox.currentText()
 qos = self.publishQosSpinBox.value()
 retain = self.publishRetainCheckBox.isChecked()
 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
 msgInfo = self.__client.publish(topic, payloadStr, qos, retain)
 if msgInfo.rc == 0:
 if topic not in self.__publishedTopics:
 self.__publishedTopics.append(topic)
 #######################################################################
 ## Utility methods
 #######################################################################
-def __addBrokerToRecent(self, host):
+def __addBrokerToRecent(self, host, port):
 """
 Private method to add a host name to the list of recently connected
 brokers.
 @param host host name of broker
 @type str
-"""
+@param port port number of the connection
-brokerList = self.__plugin.getPreferences("RecentBrokers")
+@type int
-if host in brokerList:
+"""
-brokerList.remove(host)
+brokerList = self.__plugin.getPreferences("RecentBrokersWithPort")
-brokerList.insert(0, host)
+hostAndPort = [host, port]
-self.__plugin.setPreferences("RecentBrokers", brokerList)
+if hostAndPort in brokerList:
+brokerList.remove(hostAndPort)
+brokerList.insert(0, hostAndPort)
+self.__plugin.setPreferences("RecentBrokersWithPort", brokerList)
+self.__populateBrokerComboBoxes()
+def __populateBrokerComboBoxes(self):
+"""
+Private method to populate the broker name and port combo boxes.
+"""
+brokerList = self.__plugin.getPreferences("RecentBrokersWithPort")
+# step 1: clear combo boxes
 self.brokerComboBox.clear()
-self.brokerComboBox.addItems(brokerList)
+self.brokerPortComboBox.clear()
+# step 2a: populate the broker name list
+self.brokerComboBox.addItems([b[0].strip() for b in brokerList])
+# step 2b: populate the broker ports list
+if brokerList:
+currentPort = brokerList[0][1]
+else:
+currentPort = 1883
+currentPortStr = "{0:5}".format(currentPort)
+portsSet = set([b[1] for b in brokerList])
+portsSet.update([1883, 8883])
+self.brokerPortComboBox.addItems(
+sorted(["{0:5}".format(p) for p in portsSet]))
+index = self.brokerPortComboBox.findText(currentPortStr)
+self.brokerPortComboBox.setCurrentIndex(index)
 def __updateUnsubscribeTopicComboBox(self):
 """
 Private method to update the unsubcribe topic combo box.
 """

Mercurial Repositories > MQTT Monitor / file comparison

comparison: MqttMonitor/MqttMonitorWidget.py

MqttMonitor/MqttMonitorWidget.py