X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=160c6b3e6f7ed946e673e1c459dec404882bef5c;hp=5b9316045832bdff2cc4275b9630e3e3f1dc1527;hb=d5b5dab4ffbdbf30612f49cb77e000ad07b800c2;hpb=7d30b18136eecbdf2089e5d5877c7e41c6f4bcb6

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 5b931604..160c6b3e 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -664,12 +664,15 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
-           <widget class="QGroupBox" name="autoIdentify">
+           <widget class="QGroupBox" name="sasl">
             <property name="enabled">
              <bool>true</bool>
             </property>
+            <property name="toolTip">
+             <string>Authenticate using your nickname and password before joining any channels</string>
+            </property>
             <property name="title">
-             <string>Auto Identify</string>
+             <string>Use SASL Authentication</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -677,41 +680,50 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
             <property name="checked">
              <bool>true</bool>
             </property>
-            <layout class="QGridLayout" name="gridLayout">
-             <item row="0" column="1">
-              <widget class="QLineEdit" name="autoIdentifyService">
+            <layout class="QGridLayout" name="gridLayout_2">
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="saslPassword">
                <property name="enabled">
                 <bool>true</bool>
                </property>
-               <property name="text">
-                <string>NickServ</string>
+               <property name="toolTip">
+                <string>Account password</string>
+               </property>
+               <property name="echoMode">
+                <enum>QLineEdit::Password</enum>
                </property>
               </widget>
              </item>
-             <item row="1" column="1">
-              <widget class="QLineEdit" name="autoIdentifyPassword">
+             <item row="1" column="0">
+              <widget class="QLabel" name="saslPasswordLabel">
                <property name="enabled">
                 <bool>true</bool>
                </property>
-               <property name="echoMode">
-                <enum>QLineEdit::Password</enum>
+               <property name="text">
+                <string>Password:</string>
                </property>
               </widget>
              </item>
              <item row="0" column="0">
-              <widget class="QLabel" name="label_2">
+              <widget class="QLabel" name="saslAccountLabel">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
                <property name="text">
-                <string>Service:</string>
+                <string>Account:</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_3">
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="saslAccount">
                <property name="enabled">
                 <bool>true</bool>
                </property>
+               <property name="toolTip">
+                <string>Account name, often the same as your nickname</string>
+               </property>
                <property name="text">
-                <string>Password:</string>
+                <string/>
                </property>
               </widget>
              </item>
@@ -719,12 +731,25 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="sasl">
+           <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>
+           <widget class="QGroupBox" name="autoIdentify">
             <property name="enabled">
              <bool>true</bool>
             </property>
+            <property name="toolTip">
+             <string>Authenticate to services using your password.  Use SASL instead to identify before joining channels.</string>
+            </property>
             <property name="title">
-             <string>Use SASL Authentication</string>
+             <string>Auto Identify</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -732,60 +757,53 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
             <property name="checked">
              <bool>true</bool>
             </property>
-            <layout class="QGridLayout" name="gridLayout_2">
+            <layout class="QGridLayout" name="gridLayout">
              <item row="0" column="1">
-              <widget class="QLineEdit" name="saslAccount">
+              <widget class="QLineEdit" name="autoIdentifyService">
                <property name="enabled">
                 <bool>true</bool>
                </property>
+               <property name="toolTip">
+                <string>Service user to send your password to, usually NickServ</string>
+               </property>
                <property name="text">
-                <string/>
+                <string>NickServ</string>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
-              <widget class="QLineEdit" name="saslPassword">
+              <widget class="QLineEdit" name="autoIdentifyPassword">
                <property name="enabled">
                 <bool>true</bool>
                </property>
+               <property name="toolTip">
+                <string>Account password</string>
+               </property>
                <property name="echoMode">
                 <enum>QLineEdit::Password</enum>
                </property>
               </widget>
              </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="saslPasswordLabel">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="identifyServiceLabel">
                <property name="text">
-                <string>Password:</string>
+                <string>Service:</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="saslAccountLabel">
+             <item row="1" column="0">
+              <widget class="QLabel" name="identifyPasswordLabel">
                <property name="enabled">
                 <bool>true</bool>
                </property>
                <property name="text">
-                <string>Account:</string>
+                <string>Password:</string>
                </property>
               </widget>
              </item>
             </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">
@@ -794,7 +812,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
-              <height>40</height>
+              <height>10</height>
              </size>
             </property>
            </spacer>
@@ -961,12 +979,12 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
   <tabstop>messageRateBurstSize</tabstop>
   <tabstop>unlimitedMessageRate</tabstop>
   <tabstop>messageRateDelay</tabstop>
-  <tabstop>autoIdentify</tabstop>
-  <tabstop>autoIdentifyService</tabstop>
-  <tabstop>autoIdentifyPassword</tabstop>
   <tabstop>sasl</tabstop>
   <tabstop>saslAccount</tabstop>
   <tabstop>saslPassword</tabstop>
+  <tabstop>autoIdentify</tabstop>
+  <tabstop>autoIdentifyService</tabstop>
+  <tabstop>autoIdentifyPassword</tabstop>
   <tabstop>useCustomEncodings</tabstop>
   <tabstop>sendEncoding</tabstop>
   <tabstop>recvEncoding</tabstop>