X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=7ef574ac803e652c5e1785612888a02fea98851e;hp=4bbafbaaec1e8a7582669629e9f48e60c4b044b6;hb=e56629542168c203cac8504085fc96c7f7b73d90;hpb=e4972a0ebce0d555d752ab2f34ffd6a6dcdef1dd

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 4bbafbaa..7ef574ac 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>515</width>
-    <height>503</height>
+    <width>510</width>
+    <height>505</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -373,14 +373,14 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
          <attribute name="title">
           <string>Connection</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
+         <layout class="QVBoxLayout" name="verticalLayout_8">
           <item>
            <widget class="QGroupBox" name="autoReconnect">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="toolTip">
-             <string>Control automatic reconnect to the network</string>
+             <string>Automatically reconnect to the IRC network after connection failures</string>
             </property>
             <property name="title">
              <string>Automatic Reconnect</string>
@@ -388,17 +388,17 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
             <property name="checkable">
              <bool>true</bool>
             </property>
-            <layout class="QVBoxLayout" name="_2">
+            <layout class="QVBoxLayout" name="verticalLayout_5">
              <item>
-              <layout class="QGridLayout" name="_3">
-               <item row="0" column="0">
+              <layout class="QHBoxLayout" name="horizontalLayout_4">
+               <item>
                 <widget class="QLabel" name="label_7">
                  <property name="text">
-                  <string>Interval:</string>
+                  <string>Wait</string>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="1">
+               <item>
                 <widget class="QSpinBox" name="reconnectInterval">
                  <property name="suffix">
                   <string> s</string>
@@ -414,14 +414,38 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
                  </property>
                 </widget>
                </item>
-               <item row="1" column="0">
+               <item>
+                <widget class="QLabel" name="label_12">
+                 <property name="text">
+                  <string>between retries</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_3">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_3">
+               <item>
                 <widget class="QLabel" name="label_8">
                  <property name="text">
-                  <string>Retries:</string>
+                  <string>Number of retries:</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="1">
+               <item>
                 <widget class="QSpinBox" name="reconnectRetries">
                  <property name="minimum">
                   <number>1</number>
@@ -434,14 +458,14 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
                  </property>
                 </widget>
                </item>
-               <item row="1" column="2">
+               <item>
                 <widget class="QCheckBox" name="unlimitedRetries">
                  <property name="text">
                   <string>Unlimited</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="3">
+               <item>
                 <spacer name="horizontalSpacer">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
@@ -462,7 +486,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
                 <bool>true</bool>
                </property>
                <property name="text">
-                <string>Rejoin all channels on reconnect</string>
+                <string>Rejoin all channels after reconnect</string>
                </property>
                <property name="checked">
                 <bool>true</bool>
@@ -583,7 +607,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
               </widget>
              </item>
              <item row="1" column="0">
-              <widget class="QLabel" name="label_11">
+              <widget class="QLabel" name="saslPasswordLabel">
                <property name="enabled">
                 <bool>true</bool>
                </property>
@@ -593,7 +617,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
               </widget>
              </item>
              <item row="0" column="0">
-              <widget class="QLabel" name="label_10">
+              <widget class="QLabel" name="saslAccountLabel">
                <property name="enabled">
                 <bool>true</bool>
                </property>
@@ -605,6 +629,16 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
             </layout>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="saslExtInfo">
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; because the identity has an ssl certificate set, SASL EXTERNAL will be used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
           <item>
            <spacer name="verticalSpacer_2">
             <property name="orientation">