From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 3 Mar 2010 01:44:46 +0000 (+0100)
Subject: Make network connection settings more understandable
X-Git-Tag: 0.6-rc1~21
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ee38d7649925876c692287135a310ff7be20df7c

Make network connection settings more understandable

Fixes #779.
---

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 4bbafbaa..7665e101 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -373,14 +373,14 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
          <attribute name="title">
           <string>Connection</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
+         <layout class="QVBoxLayout" name="verticalLayout_8">
           <item>
            <widget class="QGroupBox" name="autoReconnect">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="toolTip">
-             <string>Control automatic reconnect to the network</string>
+             <string>Automatically reconnect to the IRC network after connection failures</string>
             </property>
             <property name="title">
              <string>Automatic Reconnect</string>
@@ -388,17 +388,17 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
             <property name="checkable">
              <bool>true</bool>
             </property>
-            <layout class="QVBoxLayout" name="_2">
+            <layout class="QVBoxLayout" name="verticalLayout_5">
              <item>
-              <layout class="QGridLayout" name="_3">
-               <item row="0" column="0">
+              <layout class="QHBoxLayout" name="horizontalLayout_4">
+               <item>
                 <widget class="QLabel" name="label_7">
                  <property name="text">
-                  <string>Interval:</string>
+                  <string>Wait</string>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="1">
+               <item>
                 <widget class="QSpinBox" name="reconnectInterval">
                  <property name="suffix">
                   <string> s</string>
@@ -414,14 +414,38 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
                  </property>
                 </widget>
                </item>
-               <item row="1" column="0">
+               <item>
+                <widget class="QLabel" name="label_12">
+                 <property name="text">
+                  <string>between retries</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_3">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_3">
+               <item>
                 <widget class="QLabel" name="label_8">
                  <property name="text">
-                  <string>Retries:</string>
+                  <string>Number of retries:</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="1">
+               <item>
                 <widget class="QSpinBox" name="reconnectRetries">
                  <property name="minimum">
                   <number>1</number>
@@ -434,14 +458,14 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
                  </property>
                 </widget>
                </item>
-               <item row="1" column="2">
+               <item>
                 <widget class="QCheckBox" name="unlimitedRetries">
                  <property name="text">
                   <string>Unlimited</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="3">
+               <item>
                 <spacer name="horizontalSpacer">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
@@ -462,7 +486,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
                 <bool>true</bool>
                </property>
                <property name="text">
-                <string>Rejoin all channels on reconnect</string>
+                <string>Rejoin all channels after reconnect</string>
                </property>
                <property name="checked">
                 <bool>true</bool>