X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=5f578f59958d70ac4f1fedb4bdd825c17b1c922d;hp=cabddac847502493e1984984b803ecae60fa14a4;hb=67f5c3e9c1ac4ee1b01f642872fdba797389b140;hpb=c6db8944e7792fe44a15c23aed10131b62115851

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index cabddac8..5f578f59 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -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>
@@ -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>
@@ -166,14 +166,6 @@
          <property name="enabled" >
           <bool>true</bool>
          </property>
-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>376</width>
-           <height>332</height>
-          </rect>
-         </property>
          <attribute name="title" >
           <string>Servers</string>
          </attribute>
@@ -225,7 +217,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>
                </widget>
@@ -242,7 +234,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>
@@ -271,7 +263,7 @@
                    <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>
@@ -285,7 +277,7 @@
                    <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>
@@ -335,14 +327,6 @@
          </layout>
         </widget>
         <widget class="QWidget" name="performTab" >
-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>376</width>
-           <height>332</height>
-          </rect>
-         </property>
          <attribute name="title" >
           <string>Perform</string>
          </attribute>
@@ -362,6 +346,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>
@@ -425,20 +413,11 @@
          </layout>
         </widget>
         <widget class="QWidget" name="advancedTab" >
-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>376</width>
-           <height>332</height>
-          </rect>
-         </property>
          <attribute name="title" >
           <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 +425,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 +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>
@@ -470,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>
@@ -478,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>
@@ -496,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>
@@ -517,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>
@@ -526,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>
@@ -542,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>
@@ -628,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>