diff -r 0eae5f616154 -r 70b8858199f5 MqttMonitor/MqttMonitorWidget.ui --- a/MqttMonitor/MqttMonitorWidget.ui Tue Jul 20 18:10:55 2021 +0200 +++ b/MqttMonitor/MqttMonitorWidget.ui Wed Jul 21 20:10:36 2021 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>600</height> + <height>715</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -115,23 +115,30 @@ </layout> </item> <item row="0" column="2"> - <widget class="QToolButton" name="brokerConnectionOptionsButton"> - <property name="toolTip"> - <string>Press to open a dialog to enter connection options</string> + <layout class="QHBoxLayout" name="horizontalLayout_19"> + <property name="spacing"> + <number>0</number> </property> - </widget> + <item> + <widget class="QToolButton" name="brokerConnectionOptionsButton"> + <property name="toolTip"> + <string>Press to open a dialog to enter connection options</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="connectButton"> + <property name="toolTip"> + <string>Press to connect to/disconnect from the broker</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </item> - <item row="0" column="3"> - <widget class="QToolButton" name="connectButton"> - <property name="toolTip"> - <string>Press to connect to/disconnect from the broker</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="1" column="0" colspan="4"> + <item row="1" column="0" colspan="3"> <widget class="QLabel" name="brokerStatusLabel"> <property name="wordWrap"> <bool>true</bool> @@ -150,7 +157,7 @@ <attribute name="title"> <string>Pub/Sub</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_5"> + <layout class="QVBoxLayout" name="verticalLayout_7"> <item> <widget class="QGroupBox" name="subscribeGroup"> <property name="enabled"> @@ -159,7 +166,7 @@ <property name="title"> <string>Subscribe</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout_2"> + <layout class="QHBoxLayout" name="horizontalLayout_20"> <item> <widget class="QLabel" name="label"> <property name="text"> @@ -198,11 +205,28 @@ </widget> </item> <item> - <widget class="QToolButton" name="subscribeButton"> - <property name="toolTip"> - <string>Press to subscribe to the given topic</string> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>0</number> </property> - </widget> + <item> + <widget class="QToolButton" name="subscribeButton"> + <property name="toolTip"> + <string>Press to subscribe to the given topic</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="subscribePropertiesButton"> + <property name="toolTip"> + <string>Press to edit the user properties</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> @@ -215,7 +239,7 @@ <property name="title"> <string>Unsubscribe</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout_3"> + <layout class="QHBoxLayout" name="horizontalLayout_21"> <item> <widget class="QLabel" name="label_4"> <property name="text"> @@ -237,11 +261,28 @@ </widget> </item> <item> - <widget class="QToolButton" name="unsubscribeButton"> - <property name="toolTip"> - <string>Press to unsubscribe the selected topic</string> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="spacing"> + <number>0</number> </property> - </widget> + <item> + <widget class="QToolButton" name="unsubscribeButton"> + <property name="toolTip"> + <string>Press to unsubscribe the selected topic</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="unsubscribePropertiesButton"> + <property name="toolTip"> + <string>Press to edit the user properties</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> @@ -368,6 +409,16 @@ </widget> </item> <item> + <widget class="QPushButton" name="publishClearRetainedButton"> + <property name="toolTip"> + <string>Press to clear the retained messages of the selected topic</string> + </property> + <property name="text"> + <string>Clear Retained</string> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_3"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -403,17 +454,32 @@ </widget> </item> <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>MQTT V5 Properties</string> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <widget class="QPlainTextEdit" name="propertiesEdit"> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="textInteractionFlags"> + <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + </layout> + </widget> </item> </layout> </widget> @@ -548,7 +614,7 @@ <rect> <x>0</x> <y>0</y> - <width>178</width> + <width>344</width> <height>840</height> </rect> </property> @@ -1414,7 +1480,9 @@ <tabstop>publishRetainCheckBox</tabstop> <tabstop>publishButton</tabstop> <tabstop>publishClearButton</tabstop> + <tabstop>publishClearRetainedButton</tabstop> <tabstop>clearPublishCheckBox</tabstop> + <tabstop>propertiesEdit</tabstop> <tabstop>messagesSearchWidget</tabstop> <tabstop>messagesEdit</tabstop> <tabstop>saveMessagesButton</tabstop>