X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=aa33d015887d261fd11d6be386aa3deb82bc9f07;hp=aae2401c7f40e58dafa478e5449539e512223695;hb=c2f45eb02e610ff44576b649ea075b23df1b8f1a;hpb=1abcb461979ff68943e16c5c1b3fe0536217ff59

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index aae2401c..aa33d015 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>514</width>
-    <height>452</height>
+    <width>565</width>
+    <height>468</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -121,7 +121,7 @@
    <item>
     <widget class="QGroupBox" name="detailsBox" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+      <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
        <horstretch>10</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -157,11 +157,10 @@
          <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/>
         </property>
         <property name="currentIndex" >
-         <number>1</number>
+         <number>0</number>
         </property>
         <widget class="QWidget" name="serversTab" >
          <property name="enabled" >
@@ -171,13 +170,16 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>301</width>
-           <height>326</height>
+           <width>364</width>
+           <height>348</height>
           </rect>
          </property>
          <attribute name="title" >
           <string>Servers</string>
          </attribute>
+         <attribute name="toolTip" >
+          <string>Manage servers for this network</string>
+         </attribute>
          <layout class="QVBoxLayout" >
           <item>
            <layout class="QHBoxLayout" >
@@ -337,13 +339,16 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>301</width>
-           <height>326</height>
+           <width>364</width>
+           <height>348</height>
           </rect>
          </property>
          <attribute name="title" >
           <string>Perform</string>
          </attribute>
+         <attribute name="toolTip" >
+          <string>Configure automatic identification or misc. commands to be executed after connecting to a server</string>
+         </attribute>
          <layout class="QVBoxLayout" name="verticalLayout" >
           <item>
            <widget class="QLabel" name="label" >
@@ -357,6 +362,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
             <property name="enabled" >
              <bool>true</bool>
             </property>
+            <property name="toolTip" >
+             <string>Specify a list of IRC commands to be executed upon connect.
+Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</string>
+            </property>
             <property name="lineWrapMode" >
              <enum>QTextEdit::NoWrap</enum>
             </property>
@@ -377,13 +386,6 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
              <bool>true</bool>
             </property>
             <layout class="QGridLayout" name="gridLayout" >
-             <item row="0" column="0" >
-              <widget class="QLabel" name="label_2" >
-               <property name="text" >
-                <string>Service:</string>
-               </property>
-              </widget>
-             </item>
              <item row="0" column="1" >
               <widget class="QLineEdit" name="autoIdentifyService" >
                <property name="enabled" >
@@ -394,53 +396,62 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="0" >
-              <widget class="QLabel" name="label_3" >
+             <item row="1" column="1" >
+              <widget class="QLineEdit" name="autoIdentifyPassword" >
                <property name="enabled" >
                 <bool>true</bool>
                </property>
+               <property name="echoMode" >
+                <enum>QLineEdit::Password</enum>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0" >
+              <widget class="QLabel" name="label_2" >
                <property name="text" >
-                <string>Password:</string>
+                <string>Service:</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="1" >
-              <widget class="QLineEdit" name="autoIdentifyPassword" >
+             <item row="1" column="0" >
+              <widget class="QLabel" name="label_3" >
                <property name="enabled" >
                 <bool>true</bool>
                </property>
-               <property name="echoMode" >
-                <enum>QLineEdit::Password</enum>
+               <property name="text" >
+                <string>Password:</string>
                </property>
               </widget>
              </item>
             </layout>
-            <zorder>autoIdentifyService</zorder>
-            <zorder>autoIdentifyPassword</zorder>
-            <zorder>label_2</zorder>
-            <zorder>label_3</zorder>
            </widget>
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab" >
+        <widget class="QWidget" name="advancedTab" >
          <property name="geometry" >
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>301</width>
-           <height>326</height>
+           <width>364</width>
+           <height>348</height>
           </rect>
          </property>
          <attribute name="title" >
           <string>Advanced</string>
          </attribute>
+         <attribute name="toolTip" >
+          <string>Configure advanced settings such as message encodings and automatic reconnect</string>
+         </attribute>
          <layout class="QVBoxLayout" >
           <item>
            <widget class="QGroupBox" name="groupBox_3" >
             <property name="enabled" >
              <bool>true</bool>
             </property>
+            <property name="toolTip" >
+             <string>Control encodings for in- and outgoing messages</string>
+            </property>
             <property name="title" >
              <string>Encodings</string>
             </property>
@@ -449,6 +460,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
               <layout class="QGridLayout" >
                <item row="0" column="0" >
                 <widget class="QLabel" name="label_4" >
+                 <property name="toolTip" >
+                  <string>Specify which encoding your messages will be sent in.
+UTF-8 should be a sane choice for most networks.</string>
+                 </property>
                  <property name="text" >
                   <string>Send messages in:</string>
                  </property>
@@ -465,6 +480,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
+                 <property name="toolTip" >
+                  <string>Specify which encoding your messages will be sent in.
+UTF-8 should be a sane choice for most networks.</string>
+                 </property>
                  <property name="insertPolicy" >
                   <enum>QComboBox::InsertAlphabetically</enum>
                  </property>
@@ -473,7 +492,8 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                <item row="1" column="0" >
                 <widget class="QLabel" name="label_5" >
                  <property name="toolTip" >
-                  <string>Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8.</string>
+                  <string>Incoming messages encoded in Utf8 will always be treated as such.
+This setting defines the encoding for messages that are not Utf8.</string>
                  </property>
                  <property name="text" >
                   <string>Receive fallback:</string>
@@ -491,6 +511,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
+                 <property name="toolTip" >
+                  <string>Incoming messages encoded in Utf8 will always be treated as such.
+This setting defines the encoding for messages that are not Utf8.</string>
+                 </property>
                  <property name="insertPolicy" >
                   <enum>QComboBox::InsertAlphabetically</enum>
                  </property>
@@ -512,6 +536,10 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                  <property name="enabled" >
                   <bool>false</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>
+                 </property>
                 </widget>
                </item>
               </layout>
@@ -521,6 +549,9 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                <property name="enabled" >
                 <bool>true</bool>
                </property>
+               <property name="toolTip" >
+                <string>Use default settings for encodings (recommended)</string>
+               </property>
                <property name="text" >
                 <string>Use defaults</string>
                </property>
@@ -537,6 +568,9 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
             <property name="enabled" >
              <bool>true</bool>
             </property>
+            <property name="toolTip" >
+             <string>Control automatic reconnect to the network</string>
+            </property>
             <property name="title" >
              <string>Automatic Reconnect</string>
             </property>