MQTT Monitor: comparison MqttMonitor/MqttMonitorWidget.py

-:3cb08e5db764
+:2fb5c08019fd
 import os
 import collections
 import copy
 import contextlib
-from PyQt5.QtCore import pyqtSlot, Qt, QTimer, QFileInfo
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QFileInfo
-from PyQt5.QtGui import QFont, QTextCursor, QBrush
+from PyQt6.QtGui import QFont, QTextCursor, QBrush, QColor
-from PyQt5.QtWidgets import QWidget, QDialog
+from PyQt6.QtWidgets import QWidget, QDialog
-from E5Gui import E5MessageBox, E5FileDialog
+from EricWidgets import EricMessageBox, EricFileDialog
-from E5Gui.E5PathPicker import E5PathPickerModes
+from EricWidgets.EricPathPicker import EricPathPickerModes
 from .Ui_MqttMonitorWidget import Ui_MqttMonitorWidget
 from .MqttClient import (
 MqttClient, mqttConnackMessage, mqttErrorMessage, mqttLogLevelString
 """
 BrokerStatusTopicPrefix = "$SYS/broker/"
 BrokerStatusTopic = "$SYS/broker/#"
 BrokerStatusTopicLoadPrefix = "$SYS/broker/load/"
-def __init__(self, plugin, iconSuffix, parent=None):
+def __init__(self, plugin, usesDarkPalette, parent=None):
 """
 Constructor
 @param plugin reference to the plug-in object
 @type MqttMonitorPlugin
-@param iconSuffix suffix for the icons
+@param usesDarkPalette flag indicating the use of a dark application
-@type str
+palette
+@type bool
 @param parent reference to the parent widget
 @type QWidget
 """
 super().__init__(parent)
 self.setupUi(self)
 self.__plugin = plugin
-self.__iconSuffix = iconSuffix
+self.__iconSuffix = "dark" if usesDarkPalette else "light"
 self.__connectedToBroker = False
 self.__brokerStatusTopicSubscribed = False
 self.pixmapLabel.setPixmap(UI.PixmapCache.getPixmap(
 os.path.join("MqttMonitor", "icons",
 "mqtt48-{0}".format(self.__iconSuffix))
 ))
-self.publishPayloadFilePicker.setMode(E5PathPickerModes.OpenFileMode)
+self.publishPayloadFilePicker.setMode(
+EricPathPickerModes.OPEN_FILE_MODE)
 self.publishPayloadFilePicker.setFilters(self.tr("All Files (*)"))
 self.__messagesFormat = self.messagesEdit.currentCharFormat()
 self.__messagesTopicFormat = self.messagesEdit.currentCharFormat()
-self.__messagesTopicFormat.setFontWeight(QFont.Bold)
+self.__messagesTopicFormat.setFontWeight(QFont.Weight.Bold)
 self.__messagesQosFormat = self.messagesEdit.currentCharFormat()
 self.__messagesQosFormat.setFontItalic(True)
 self.messagesSearchWidget.attachTextEdit(self.messagesEdit)
 self.messagesSearchWidget.setWidthForHeight(False)
 self.logLevelComboBox.addItem(mqttLogLevelString(
 logLevel, isMqttLogLevel=False), logLevel)
 self.logLevelComboBox.setCurrentIndex(
 self.logLevelComboBox.count() - 1)
-self.__logMessagesBackgrounds = {
+if usesDarkPalette:
-MqttClient.LogDebug: QBrush(Qt.white),
+self.__logMessagesBackgrounds = {
-MqttClient.LogInfo: QBrush(Qt.lightGray),
+MqttClient.LogDebug: QBrush(QColor("#2f2f2f")),
-MqttClient.LogNotice: QBrush(Qt.green),
+MqttClient.LogInfo: QBrush(QColor("#868686")),
-MqttClient.LogWarning: QBrush(Qt.yellow),
+MqttClient.LogNotice: QBrush(QColor("#009900")),
-MqttClient.LogError: QBrush(Qt.red),
+MqttClient.LogWarning: QBrush(QColor("#999900")),
-MqttClient.LogDisabled: QBrush(Qt.magenta)
+MqttClient.LogError: QBrush(QColor("#990000")),
-# reuse LogDisabled for unknown log levels
+MqttClient.LogDisabled: QBrush(QColor("#990099")),
-}
+# reuse LogDisabled for unknown log levels
+}
+else:
+self.__logMessagesBackgrounds = {
+MqttClient.LogDebug: QBrush(Qt.GlobalColor.white),
+MqttClient.LogInfo: QBrush(Qt.GlobalColor.lightGray),
+MqttClient.LogNotice: QBrush(Qt.GlobalColor.green),
+MqttClient.LogWarning: QBrush(Qt.GlobalColor.yellow),
+MqttClient.LogError: QBrush(Qt.GlobalColor.red),
+MqttClient.LogDisabled: QBrush(Qt.GlobalColor.magenta)
+# reuse LogDisabled for unknown log levels
+}
 self.logSearchWidget.attachTextEdit(self.logEdit)
 self.logSearchWidget.setWidthForHeight(False)
 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.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect"))
 self.brokerConnectionOptionsButton.setIcon(UI.PixmapCache.getIcon(
 os.path.join("MqttMonitor", "icons",
 "connectionOptions-{0}".format(self.__iconSuffix))
 ))
 self.__populateBrokerComboBoxes()
 self.brokerStatusLabel.hide()
-self.subscribeButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
+self.subscribeButton.setIcon(UI.PixmapCache.getIcon("plus"))
 self.subscribeButton.setEnabled(False)
-self.unsubscribeButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
+self.unsubscribeButton.setIcon(UI.PixmapCache.getIcon("minus"))
 self.__subscribedTopics = []
 self.__topicQueue = {}
 self.__updateUnsubscribeTopicComboBox()
 if rc == 0:
 self.__connectedToBroker = True
 self.__connectionOptions = None
 self.connectButton.setIcon(
-UI.PixmapCache.getIcon("ircDisconnect.png"))
+UI.PixmapCache.getIcon("ircDisconnect"))
 self.subscribeGroup.setEnabled(True)
 self.unsubscribeGroup.setEnabled(True)
 self.publishGroup.setEnabled(True)
 self.brokerStatusButton.setEnabled(True)
 if rc > 0 else
 self.tr("Connection to Broker shut down cleanly.")
 )
 self.__flashBrokerStatusLabel(msg)
-self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect.png"))
+self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect"))
 self.__setConnectButtonState()
 self.__subscribedTopics = []
 self.__topicQueue = {}
 self.__updateUnsubscribeTopicComboBox()
 scrollbarValue = self.logEdit.verticalScrollBar().value()
 textCursor = self.logEdit.textCursor()
 if not self.logEdit.document().isEmpty():
-textCursor.movePosition(QTextCursor.End)
+textCursor.movePosition(QTextCursor.MoveOperation.End)
 self.logEdit.setTextCursor(textCursor)
 self.logEdit.insertPlainText("\n")
 textBlockFormat = textCursor.blockFormat()
 try:
 self.__logMessagesBackgrounds[MqttClient.LogLevelMap[level]])
 except KeyError:
 textBlockFormat.setBackground(
 self.__logMessagesBackgrounds[MqttClient.LogDisabled])
 textCursor.setBlockFormat(textBlockFormat)
-textCursor.movePosition(QTextCursor.End)
+textCursor.movePosition(QTextCursor.MoveOperation.End)
 self.logEdit.setTextCursor(textCursor)
 txt = self.tr("{0}: {1}").format(mqttLogLevelString(level), message)
 self.logEdit.insertPlainText(Utilities.filterAnsiSequences(txt))
 Private slot to handle a message being published.
 @param mid ID of the published message
 @type int
 """
+# TODO: check this 'pass' statement
 pass
 @pyqtSlot(int, tuple)
 def __topicSubscribed(self, mid, grantedQos):
 """
 MqttConnectionProfilesDialog
 )
 dlg = MqttConnectionProfilesDialog(
 self.__client, self.__plugin.getPreferences("BrokerProfiles"),
 parent=self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.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:
+if dlg.exec() == QDialog.DialogCode.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
 """
 topic = self.subscribeTopicEdit.text()
 qos = self.subscribeQosSpinBox.value()
 if topic:
 if topic.startswith(MqttMonitorWidget.BrokerStatusTopicPrefix):
-E5MessageBox.warning(
+EricMessageBox.warning(
 self,
 self.tr("Subscribe to Topic"),
 self.tr("Subscriptions to the Status topic '$SYS' shall"
 " be done on the 'Status' tab."))
 else:
 # payload size limit is 268,435,455 bytes
 try:
 with open(payloadFile, "rb") as f:
 payloadStr = f.read()
 except EnvironmentError as err:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr("Read Payload from File"),
 self.tr("""<p>The file <b>{0}</b> could not be read."""
 """ Aborting...</p><p>Reason: {1}</p>""").format(
 payloadFile, str(err)))
 @pyqtSlot()
 def on_saveMessagesButton_clicked(self):
 """
 Private slot to save the received messages.
 """
-fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+fn, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
 self,
 self.tr("Save Messages"),
 "",
 self.tr("Messages Files (*.txt);;All Files (*)"),
 "",
-E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
+EricFileDialog.DontConfirmOverwrite)
 if fn:
 if fn.endswith("."):
 fn = fn[:-1]
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fn += ex
 if QFileInfo(fn).exists():
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 self,
 self.tr("Save Messages"),
 self.tr("<p>The file <b>{0}</b> already exists."
 " Overwrite it?</p>").format(fn),
-icon=E5MessageBox.Warning)
+icon=EricMessageBox.Warning)
 if not res:
 return
 fn = Utilities.toNativeSeparators(fn)
 try:
 with open(fn, "w") as f:
 f.write(self.messagesEdit.toPlainText())
 except EnvironmentError as err:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr("Save Messages"),
 self.tr("""<p>The file <b>{0}</b> could not be written."""
 """</p><p>Reason: {1}</p>""").format(
 fn, str(err)))
 @pyqtSlot()
 def on_saveLogMessagesButton_clicked(self):
 """
 Private slot to save the log messages.
 """
-fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+fn, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
 self,
 self.tr("Save Log Messages"),
 "",
 self.tr("Log Files (*.log);;All Files (*)"),
 "",
-E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
+EricFileDialog.DontConfirmOverwrite)
 if fn:
 if fn.endswith("."):
 fn = fn[:-1]
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fn += ex
 if QFileInfo(fn).exists():
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 self,
 self.tr("Save Log Messages"),
 self.tr("<p>The file <b>{0}</b> already exists."
 " Overwrite it?</p>").format(fn),
-icon=E5MessageBox.Warning)
+icon=EricMessageBox.Warning)
 if not res:
 return
 fn = Utilities.toNativeSeparators(fn)
 try:
 with open(fn, "w") as f:
 f.write(self.logEdit.toPlainText())
 except EnvironmentError as err:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr("Save Log Messages"),
 self.tr("""<p>The file <b>{0}</b> could not be written."""
 """</p><p>Reason: {1}</p>""").format(
 fn, str(err)))
 """
 scrollbarValue = self.messagesEdit.verticalScrollBar().value()
 textCursor = self.messagesEdit.textCursor()
 if not self.messagesEdit.document().isEmpty():
-textCursor.movePosition(QTextCursor.End)
+textCursor.movePosition(QTextCursor.MoveOperation.End)
 self.messagesEdit.setTextCursor(textCursor)
 self.messagesEdit.insertPlainText("\n")
 textBlockFormat = textCursor.blockFormat()
 if self.__isAlternate:
 self.messagesEdit.palette().alternateBase())
 else:
 textBlockFormat.setBackground(
 self.messagesEdit.palette().base())
 textCursor.setBlockFormat(textBlockFormat)
-textCursor.movePosition(QTextCursor.End)
+textCursor.movePosition(QTextCursor.MoveOperation.End)
 self.messagesEdit.setTextCursor(textCursor)
 self.messagesEdit.setCurrentCharFormat(self.__messagesTopicFormat)
 self.messagesEdit.insertPlainText(topic + "\n")

Mercurial Repositories > MQTT Monitor / file comparison

comparison: MqttMonitor/MqttMonitorWidget.py

MqttMonitor/MqttMonitorWidget.py