Mercurial Repositories > MQTT Monitor / file diff

--- a/MqttMonitor/MqttConnectionOptionsDialog.ui	Sat Sep 01 20:18:11 2018 +0200
+++ b/MqttMonitor/MqttConnectionOptionsDialog.ui	Sun Sep 02 18:29:35 2018 +0200
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>550</width>
     <height>600</height>
    </rect>
   </property>
@@ -37,6 +37,16 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="2">
+       <widget class="QPushButton" name="generateIdButton">
+        <property name="toolTip">
+         <string>Press to generate a client ID</string>
+        </property>
+        <property name="text">
+         <string>Generate</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
@@ -44,7 +54,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="1" column="1" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QSpinBox" name="keepaliveSpinBox">
@@ -80,7 +90,7 @@
         </item>
        </layout>
       </item>
-      <item row="2" column="0" colspan="2">
+      <item row="2" column="0" colspan="3">
        <widget class="QCheckBox" name="cleanSessionCheckBox">
         <property name="text">
          <string>Clean Session</string>
@@ -135,62 +145,45 @@
      <property name="title">
       <string>Last Will and Testament</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>QoS:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="willQosSpinBox">
-          <property name="toolTip">
-           <string>Enter the desired QoS value</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="maximum">
-           <number>2</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="willRetainCheckBox">
-          <property name="toolTip">
-           <string>Select to retain the last will message</string>
-          </property>
-          <property name="text">
-           <string>Retain</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
        <widget class="QLineEdit" name="willTopicEdit">
         <property name="toolTip">
          <string>Enter the topic of the last will</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>QoS:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QSpinBox" name="willQosSpinBox">
+        <property name="toolTip">
+         <string>Enter the desired QoS value</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="maximum">
+         <number>2</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QCheckBox" name="willRetainCheckBox">
+        <property name="toolTip">
+         <string>Select to retain the last will message</string>
+        </property>
+        <property name="text">
+         <string>Retain</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="4">
        <widget class="QPlainTextEdit" name="willMessageEdit">
         <property name="maximumSize">
          <size>
@@ -227,14 +220,15 @@
  </customwidgets>
  <tabstops>
   <tabstop>clientIdEdit</tabstop>
+  <tabstop>generateIdButton</tabstop>
   <tabstop>keepaliveSpinBox</tabstop>
   <tabstop>cleanSessionCheckBox</tabstop>
   <tabstop>usernameEdit</tabstop>
   <tabstop>passwordEdit</tabstop>
+  <tabstop>willTopicEdit</tabstop>
+  <tabstop>willMessageEdit</tabstop>
   <tabstop>willQosSpinBox</tabstop>
   <tabstop>willRetainCheckBox</tabstop>
-  <tabstop>willTopicEdit</tabstop>
-  <tabstop>willMessageEdit</tabstop>
  </tabstops>
  <resources/>
  <connections>