X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=4c1563e2fbcd1e4ac77a8c89a2ff63cfd742485b;hp=b4d1f332038bc2528416a5da487de94b31e8584f;hb=d230a0e8119ea9d698259b9be876617bc5f37394;hpb=cc5cdfa183fd1cf4b507d9791cb98acb74a4fcad

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index b4d1f332..4c1563e2 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>736</width>
-    <height>452</height>
+    <width>565</width>
+    <height>468</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -37,7 +37,7 @@
         <string>Re&amp;name...</string>
        </property>
        <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >
+        <iconset>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
        </property>
       </widget>
@@ -54,7 +54,7 @@
         <string>&amp;Add...</string>
        </property>
        <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >
+        <iconset>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
        </property>
        <property name="iconSize" >
@@ -77,7 +77,7 @@
         <string>De&amp;lete</string>
        </property>
        <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >
+        <iconset>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
        </property>
       </widget>
@@ -157,27 +157,21 @@
          <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>2</number>
         </property>
         <widget class="QWidget" name="serversTab" >
          <property name="enabled" >
           <bool>true</bool>
          </property>
-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>398</width>
-           <height>326</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" >
@@ -223,7 +217,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                  <string>&amp;Add...</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
+                 <iconset>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
                 </property>
                </widget>
@@ -240,7 +234,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                  <string>De&amp;lete</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
+                 <iconset>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
                 </property>
                </widget>
@@ -269,7 +263,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                    <string>...</string>
                   </property>
                   <property name="icon" >
-                   <iconset resource="../../icons/icons.qrc" >
+                   <iconset>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
                   </property>
                  </widget>
@@ -283,7 +277,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                    <string>...</string>
                   </property>
                   <property name="icon" >
-                   <iconset resource="../../icons/icons.qrc" >
+                   <iconset>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
                   </property>
                  </widget>
@@ -333,17 +327,12 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
          </layout>
         </widget>
         <widget class="QWidget" name="performTab" >
-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>398</width>
-           <height>326</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 +346,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>
@@ -376,69 +369,65 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
             <property name="checked" >
              <bool>true</bool>
             </property>
+            <layout class="QGridLayout" name="gridLayout" >
+             <item row="0" column="1" >
+              <widget class="QLineEdit" name="autoIdentifyService" >
+               <property name="enabled" >
+                <bool>true</bool>
+               </property>
+               <property name="text" >
+                <string>NickServ</string>
+               </property>
+              </widget>
+             </item>
+             <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>Service:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0" >
+              <widget class="QLabel" name="label_3" >
+               <property name="enabled" >
+                <bool>true</bool>
+               </property>
+               <property name="text" >
+                <string>Password:</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
            </widget>
           </item>
-          <item>
-           <layout class="QGridLayout" >
-            <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" >
-               <bool>true</bool>
-              </property>
-              <property name="text" >
-               <string>NickServ</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0" >
-             <widget class="QLabel" name="label_3" >
-              <property name="enabled" >
-               <bool>true</bool>
-              </property>
-              <property name="text" >
-               <string>Password:</string>
-              </property>
-             </widget>
-            </item>
-            <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>
-           </layout>
-          </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab" >
-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>398</width>
-           <height>326</height>
-          </rect>
-         </property>
+        <widget class="QWidget" name="advancedTab" >
          <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>
@@ -447,6 +436,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>
@@ -463,6 +456,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>
@@ -471,7 +468,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>
@@ -489,6 +487,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>
@@ -510,6 +512,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>
@@ -519,6 +525,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>
@@ -535,6 +544,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>
@@ -621,9 +633,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>unlimitedRetries</sender>