X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=76348e6dc49680d7fd90e385fd8150428e69d036;hb=007e46b69539d11ab5ceebfbb2dedd8eb928a73b;hp=cabddac847502493e1984984b803ecae60fa14a4;hpb=c16eb9721905646096bed117f876dc89c8525754;p=quassel.git

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index cabddac8..76348e6d 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>565</width>
-    <height>468</height>
+    <width>514</width>
+    <height>452</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -121,7 +121,7 @@
    <item>
     <widget class="QGroupBox" name="detailsBox" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
        <horstretch>10</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -170,7 +170,7 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>376</width>
+           <width>244</width>
            <height>332</height>
           </rect>
          </property>
@@ -339,7 +339,7 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>376</width>
+           <width>244</width>
            <height>332</height>
           </rect>
          </property>
@@ -362,6 +362,10 @@
             <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>
@@ -429,7 +433,7 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>376</width>
+           <width>244</width>
            <height>332</height>
           </rect>
          </property>
@@ -437,8 +441,7 @@
           <string>Advanced</string>
          </attribute>
          <attribute 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>Configure advanced settings such as message encodings and automatic reconnect</string>
          </attribute>
          <layout class="QVBoxLayout" >
           <item>
@@ -446,6 +449,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 encodings for in- and outgoing messages</string>
+            </property>
             <property name="title" >
              <string>Encodings</string>
             </property>
@@ -454,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>
@@ -470,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>
@@ -478,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>
@@ -496,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>
@@ -517,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>
@@ -526,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>
@@ -542,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>