MQTT Monitor: comparison MqttMonitor/MqttMonitorWidget.py

-:aeb276d76ec7
+:0f02baed8308
 except NameError:
 pass
 import os
 import collections
+import copy
 from PyQt5.QtCore import pyqtSlot, QTimer
 from PyQt5.QtGui import QTextCursor
 from PyQt5.QtWidgets import QWidget, QDialog
 self.pixmapLabel.setPixmap(UI.PixmapCache.getPixmap(
 os.path.join("MqttMonitor", "icons", "mqtt48.png")))
 self.brokerWidget.setCurrentIndex(0)
+self.__connectionModeProfile = True
+self.__setConnectionMode(True)  # initial mode is 'profile connection'
+self.__populateProfileComboBox()
 self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect.png"))
 self.brokerConnectionOptionsButton.setIcon(UI.PixmapCache.getIcon(
 os.path.join("MqttMonitor", "icons", "connectionOptions.png")))
 self.__populateBrokerComboBoxes()
 """
 self.brokerStatusLabel.setText(message)
 self.brokerStatusLabel.show()
 QTimer.singleShot(5000, self.brokerStatusLabel.hide)
+@pyqtSlot()
+def on_modeButton_clicked(self):
+"""
+Private slot to switch between connection profiles and direct
+connection mode.
+"""
+self.__setConnectionMode(not self.__connectionModeProfile)
 @pyqtSlot(str)
 def on_brokerComboBox_editTextChanged(self, host):
 """
 Private slot to handling entering or selecting a broker host name.
 @param host host name of the broker
 @type str
 """
-if not self.__connectedToBroker and not host:
+self.__setConnectButtonState()
-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.
+Private slot to show a dialog to modify connection options or a
-"""
+dialog to edit connection profiles.
-from .MqttConnectionOptionsDialog import MqttConnectionOptionsDialog
+"""
-dlg = MqttConnectionOptionsDialog(
+if self.__connectionModeProfile:
-self.__client, self.__connectionOptions, parent=self)
+from .MqttConnectionProfilesDialog import \
-if dlg.exec_() == QDialog.Accepted:
+MqttConnectionProfilesDialog
-self.__connectionOptions = dlg.getConnectionOptions()
+dlg = MqttConnectionProfilesDialog(
+self.__client, self.__plugin.getPreferences("BrokerProfiles"),
+parent=self)
+if dlg.exec_() == QDialog.Accepted:
+profilesDict = dlg.getProfiles()
+self.__plugin.setPreferences("BrokerProfiles", profilesDict)
+self.__populateProfileComboBox()
+else:
+from .MqttConnectionOptionsDialog import \
+MqttConnectionOptionsDialog
+dlg = MqttConnectionOptionsDialog(
+self.__client, self.__connectionOptions, parent=self)
+if dlg.exec_() == QDialog.Accepted:
+self.__connectionOptions = dlg.getConnectionOptions()
+if self.__connectionOptions["TlsEnable"]:
+port = self.brokerPortComboBox.currentText().strip()
+if port == "1883":
+# it is default non-encrypted port => set to TLS port
+self.brokerPortComboBox.setEditText("8883")
+else:
+port = self.brokerPortComboBox.currentText().strip()
+if port == "8883":
+# it is default TLS port => set to non-encrypted port
+self.brokerPortComboBox.setEditText("1883")
 @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()
+if self.__connectionModeProfile:
-port = self.brokerPortComboBox.currentText().strip()
+self.__profileConnectToBroker()
-try:
+else:
-port = int(port)
+self.__directConnectToBroker()
-except ValueError:
-# use standard port at 1883
-port = 1883
-if host:
-self.__addBrokerToRecent(host, port)
-if self.__connectionOptions is None:
-self.__client.connectToServer(host, port=port)
-else:
-self.__client.connectToServerWithOptions(
-host, port=port, options=self.__connectionOptions)
 @pyqtSlot(str)
 def on_subscribeTopicEdit_textChanged(self, topic):
 """
 Private slot to handle a change of the entered topic.
 self.brokerPortComboBox.clear()
 # step 2a: populate the broker name list
 self.brokerComboBox.addItems([b[0].strip() for b in brokerList])
+self.__setConnectButtonState()
 # step 2b: populate the broker ports list
 if brokerList:
 currentPort = brokerList[0][1]
 else:
 currentPort = 1883
 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 __populateProfileComboBox(self):
+"""
+Private method to populate the profiles selection box.
+"""
+profilesDict = self.__plugin.getPreferences("BrokerProfiles")
+self.profileComboBox.clear()
+self.profileComboBox.addItems(sorted(profilesDict.keys()))
+self.__setConnectButtonState()
 def __updateUnsubscribeTopicComboBox(self):
 """
 Private method to update the unsubcribe topic combo box.
 """
 return {
 "1min": "-",
 "5min": "-",
 "15min": "-",
 }
+def __setConnectionMode(self, profileMode):
+"""
+Private method to set the connection mode.
+@param profileMode flag indicating the profile connection mode
+@type bool
+"""
+self.__connectionModeProfile = profileMode
+if profileMode:
+self.modeButton.setIcon(UI.PixmapCache.getIcon(
+os.path.join("MqttMonitor", "icons", "profiles.png")))
+else:
+self.modeButton.setIcon(UI.PixmapCache.getIcon(
+os.path.join("MqttMonitor", "icons", "quickopen.png")))
+self.profileComboBox.setVisible(profileMode)
+self.brokerConnectionWidget.setVisible(not profileMode)
+self.__setConnectButtonState()
+def __setConnectButtonState(self):
+"""
+Private method to set the enabled state of the connect button.
+"""
+if self.__connectionModeProfile:
+self.connectButton.setEnabled(
+bool(self.profileComboBox.currentText()))
+else:
+self.connectButton.setEnabled(
+bool(self.brokerComboBox.currentText()))
+def __directConnectToBroker(self):
+"""
+Private method to connect to the broker with entered data.
+"""
+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, port)
+if self.__connectionOptions is None:
+self.__client.connectToServer(host, port=port)
+else:
+self.__client.connectToServerWithOptions(
+host, port=port, options=self.__connectionOptions)
+def __profileConnectToBroker(self):
+"""
+Private method to connect to the broker with selected profile.
+"""
+profileName = self.profileComboBox.currentText()
+if profileName:
+profilesDict = self.__plugin.getPreferences("BrokerProfiles")
+profile = copy.copy(profilesDict[profileName])      # play it save
+host = profile["BrokerAddress"]
+port = profile["BrokerPort"]
+self.__client.connectToServerWithOptions(host, port=port,
+options=profile)

Mercurial Repositories > MQTT Monitor / file comparison

comparison: MqttMonitor/MqttMonitorWidget.py

MqttMonitor/MqttMonitorWidget.py