diff -r ee738a0efe9c -r bbfe5866b6aa MqttMonitor/MqttMonitorWidget.ui --- a/MqttMonitor/MqttMonitorWidget.ui Mon Sep 03 19:57:59 2018 +0200 +++ b/MqttMonitor/MqttMonitorWidget.ui Tue Sep 04 19:42:24 2018 +0200 @@ -35,12 +35,26 @@ </layout> </item> <item> - <widget class="QGroupBox" name="groupBox"> + <widget class="QGroupBox" name="brokerGroupBox"> <property name="title"> <string>Broker</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> + <widget class="QToolButton" name="modeButton"> + <property name="toolTip"> + <string>Press to switch the mode between profiles and direct connection</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="profileComboBox"> + <property name="toolTip"> + <string>Select the profile to be used to connect to the broker</string> + </property> + </widget> + </item> + <item row="0" column="2"> <widget class="E5ClearableComboBox" name="brokerComboBox"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> @@ -57,23 +71,6 @@ </widget> </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"> - <widget class="QLabel" name="brokerStatusLabel"> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="1"> <widget class="QComboBox" name="brokerPortComboBox"> <property name="toolTip"> <string>Enter the broker port to connect to</string> @@ -86,13 +83,30 @@ </property> </widget> </item> - <item row="0" column="2"> + <item row="0" column="4"> <widget class="QToolButton" name="brokerConnectionOptionsButton"> <property name="toolTip"> <string>Press to open a dialog to enter connection options</string> </property> </widget> </item> + <item row="0" column="5"> + <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="6"> + <widget class="QLabel" name="brokerStatusLabel"> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> </layout> </widget> </item> @@ -421,8 +435,8 @@ <rect> <x>0</x> <y>0</y> - <width>344</width> - <height>840</height> + <width>339</width> + <height>670</height> </rect> </property> <layout class="QFormLayout" name="formLayout"> @@ -1156,6 +1170,8 @@ </customwidget> </customwidgets> <tabstops> + <tabstop>modeButton</tabstop> + <tabstop>profileComboBox</tabstop> <tabstop>brokerComboBox</tabstop> <tabstop>brokerPortComboBox</tabstop> <tabstop>brokerConnectionOptionsButton</tabstop> @@ -1167,9 +1183,10 @@ <tabstop>unsubscribeTopicComboBox</tabstop> <tabstop>unsubscribeButton</tabstop> <tabstop>publishTopicComboBox</tabstop> + <tabstop>publishPayloadEdit</tabstop> <tabstop>publishQosSpinBox</tabstop> <tabstop>publishRetainCheckBox</tabstop> - <tabstop>publishPayloadEdit</tabstop> + <tabstop>publishClearButton</tabstop> <tabstop>publishButton</tabstop> <tabstop>messagesEdit</tabstop> <tabstop>pushButton</tabstop>