X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=1f7983a9e94f815ef58143ca3569a75bd448a814;hp=8426dd0c76e04e866f3c3905b9466c0db30a623b;hb=HEAD;hpb=1e936d5f780e6fd410f114980057d48477435d83

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 8426dd0c..1f7983a9 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -352,7 +352,7 @@
              <bool>true</bool>
             </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -368,7 +368,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab">
+        <widget class="QWidget" name="connectionTab">
          <attribute name="title">
           <string>Connection</string>
          </attribute>
@@ -658,7 +658,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab_2">
+        <widget class="QWidget" name="autoIdentifyTab">
          <attribute name="title">
           <string>Auto Identify</string>
          </attribute>
@@ -682,7 +682,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_11">
              <item>
-              <widget class="QFrame" name="saslContents">
+              <widget class="QFrame" name="saslPlainContents">
                <property name="frameShape">
                 <enum>QFrame::NoFrame</enum>
                </property>
@@ -755,53 +755,53 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
                   </item>
                  </layout>
                 </item>
-                <item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_7">
-                  <item>
-                   <widget class="QLabel" name="saslStatusIcon">
-                    <property name="text">
-                     <string notr="true">[icon]</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QLabel" name="saslStatusLabel">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Could not detect if supported by server</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QPushButton" name="saslStatusDetails">
-                    <property name="text">
-                     <string>Details...</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </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>
+              <layout class="QHBoxLayout" name="horizontalLayout_7">
+               <item>
+                <widget class="QLabel" name="saslStatusIcon">
+                 <property name="text">
+                  <string notr="true">[icon]</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="saslStatusLabel">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="text">
+                  <string>Could not detect if supported by server</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="saslStatusDetails">
+                 <property name="text">
+                  <string>Details...</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </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>
            <widget class="QGroupBox" name="autoIdentify">
             <property name="enabled">
@@ -881,14 +881,155 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="advancedTab">
+        <widget class="QWidget" name="featuresTab">
+         <attribute name="title">
+          <string>Features</string>
+         </attribute>
+         <attribute name="toolTip">
+          <string>Configure the modern IRC messaging features Quassel supports</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_14">
+          <item>
+           <widget class="QWidget" name="enableCapsStatusWidget" native="true">
+            <layout class="QHBoxLayout" name="horizontalLayout_8">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QLabel" name="enableCapsStatusIcon">
+               <property name="text">
+                <string notr="true">[icon]</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="enableCapsStatusLabel">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>These features require support from the network</string>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="enableCapsStatusDetails">
+               <property name="text">
+                <string>Details...</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QWidget" name="enableCapsConfigWidget" native="true">
+            <layout class="QVBoxLayout" name="verticalLayout_6">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QCheckBox" name="enableCapServerTime">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="toolTip">
+                <string>&lt;p&gt;Let the IRC network control the timestamps for messages, such as when viewing messages from the past.&lt;/p&gt;
+&lt;p&gt;This is useful when connecting to bouncers, IRC bridges, or networks that send messages you've missed when reconnecting.&lt;/p&gt;
+&lt;p&gt;&lt;i&gt;Toggles the IRCv3 'server-time' capability.&lt;/i&gt;&lt;/p&gt;</string>
+               </property>
+               <property name="text">
+                <string>Use network timestamps for messages</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_9">
+               <item>
+                <widget class="QPushButton" name="enableCapsAdvanced">
+                 <property name="toolTip">
+                  <string>Configure which IRC capabilities Quassel will ignore during negotiation</string>
+                 </property>
+                 <property name="text">
+                  <string>Advanced...</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_6">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>13</width>
+                   <height>35</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <widget class="QLabel" name="enableCapsReconnectNotice">
+               <property name="text">
+                <string>&lt;i&gt;Changes apply after reconnecting to the network&lt;/i&gt;</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>178</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="encodingsTab">
          <attribute name="title">
           <string>Encodings</string>
          </attribute>
          <attribute name="toolTip">
-          <string>Configure advanced settings such as message encodings and automatic reconnect</string>
+          <string>Configure advanced settings such as message encodings</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_6">
+         <layout class="QVBoxLayout" name="verticalLayout_13">
           <item>
            <widget class="QGroupBox" name="useCustomEncodings">
             <property name="enabled">
@@ -971,8 +1112,7 @@ This setting defines the encoding for messages that are not UTF-8.</string>
                <item row="2" column="0">
                 <widget class="QLabel" name="label_9">
                  <property name="toolTip">
-                  <string>This specifies how control messages, nicks and servernames are encoded.
-Unless you *really* know what you do, leave this as ISO-8859-1!</string>
+                  <string>&lt;qt&gt;&lt;p&gt;This specifies how control messages, nicks and servernames are encoded.&lt;/p&gt;&lt;p&gt;&lt;b&gt;UTF-8&lt;/b&gt; should be fine for modern networks.  On other networks, you may need to use &lt;b&gt;ISO-8859-1&lt;/b&gt; to avoid errors with illegal characters and invalid encoding.&lt;/p&gt;&lt;/qt&gt;</string>
                  </property>
                  <property name="text">
                   <string>Server encoding:</string>
@@ -985,8 +1125,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                   <bool>true</bool>
                  </property>
                  <property name="toolTip">
-                  <string>This specifies how control messages, nicks and servernames are encoded.
-Unless you *really* know what you do, leave this as ISO-8859-1!</string>
+                  <string>&lt;qt&gt;&lt;p&gt;This specifies how control messages, nicks and servernames are encoded.&lt;/p&gt;&lt;p&gt;&lt;b&gt;UTF-8&lt;/b&gt; should be fine for modern networks.  On other networks, you may need to use &lt;b&gt;ISO-8859-1&lt;/b&gt; to avoid errors with illegal characters and invalid encoding.&lt;/p&gt;&lt;/qt&gt;</string>
                  </property>
                 </widget>
                </item>
@@ -1048,6 +1187,9 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
   <tabstop>autoIdentify</tabstop>
   <tabstop>autoIdentifyService</tabstop>
   <tabstop>autoIdentifyPassword</tabstop>
+  <tabstop>enableCapsStatusDetails</tabstop>
+  <tabstop>enableCapServerTime</tabstop>
+  <tabstop>enableCapsAdvanced</tabstop>
   <tabstop>useCustomEncodings</tabstop>
   <tabstop>sendEncoding</tabstop>
   <tabstop>recvEncoding</tabstop>