X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=e18f9db9f31670f19bf339c26f177ede90dbf0e9;hp=8039f172ed521a2505eb6c92426ea0faeb52981e;hb=189c2def1996c6a25a8182794f2d6efbbf712867;hpb=59912f14782c193a2394a2b0d044902a59c96870

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 8039f172..e18f9db9 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -13,16 +13,7 @@
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
+   <property name="margin" >
     <number>0</number>
    </property>
    <item>
@@ -53,7 +44,8 @@
             <string>Re&amp;name...</string>
            </property>
            <property name="icon" >
-            <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
+            <iconset resource="../../icons/icons.qrc" >
+             <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
            </property>
           </widget>
          </item>
@@ -69,7 +61,8 @@
             <string>&amp;Add...</string>
            </property>
            <property name="icon" >
-            <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+            <iconset resource="../../icons/icons.qrc" >
+             <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
            </property>
            <property name="iconSize" >
             <size>
@@ -91,7 +84,8 @@
             <string>De&amp;lete</string>
            </property>
            <property name="icon" >
-            <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
+            <iconset resource="../../icons/icons.qrc" >
+             <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
            </property>
           </widget>
          </item>
@@ -100,7 +94,7 @@
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0" >
             <size>
              <width>20</width>
              <height>40</height>
@@ -123,7 +117,9 @@
             <string>Connect now</string>
            </property>
            <property name="icon" >
-            <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/network-connect.png</iconset>
+            <iconset>
+             <normaloff/>
+            </iconset>
            </property>
           </widget>
          </item>
@@ -134,7 +130,7 @@
      <item>
       <widget class="QGroupBox" name="detailsBox" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
          <horstretch>10</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -169,6 +165,10 @@
           <property name="enabled" >
            <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>
+          </property>
           <property name="currentIndex" >
            <number>0</number>
           </property>
@@ -176,6 +176,14 @@
            <property name="enabled" >
             <bool>true</bool>
            </property>
+           <property name="geometry" >
+            <rect>
+             <x>0</x>
+             <y>0</y>
+             <width>394</width>
+             <height>340</height>
+            </rect>
+           </property>
            <attribute name="title" >
             <string>Servers</string>
            </attribute>
@@ -208,7 +216,9 @@
                      <string>&amp;Edit...</string>
                     </property>
                     <property name="icon" >
-                     <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/configure.png</iconset>
+                     <iconset>
+                      <normaloff/>
+                     </iconset>
                     </property>
                    </widget>
                   </item>
@@ -224,7 +234,8 @@
                      <string>&amp;Add...</string>
                     </property>
                     <property name="icon" >
-                     <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+                     <iconset resource="../../icons/icons.qrc" >
+                      <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
                     </property>
                    </widget>
                   </item>
@@ -240,7 +251,8 @@
                      <string>De&amp;lete</string>
                     </property>
                     <property name="icon" >
-                     <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
+                     <iconset resource="../../icons/icons.qrc" >
+                      <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
                     </property>
                    </widget>
                   </item>
@@ -249,16 +261,7 @@
                     <property name="spacing" >
                      <number>6</number>
                     </property>
-                    <property name="leftMargin" >
-                     <number>0</number>
-                    </property>
-                    <property name="topMargin" >
-                     <number>0</number>
-                    </property>
-                    <property name="rightMargin" >
-                     <number>0</number>
-                    </property>
-                    <property name="bottomMargin" >
+                    <property name="margin" >
                      <number>0</number>
                     </property>
                     <item>
@@ -266,7 +269,7 @@
                       <property name="orientation" >
                        <enum>Qt::Horizontal</enum>
                       </property>
-                      <property name="sizeHint" >
+                      <property name="sizeHint" stdset="0" >
                        <size>
                         <width>0</width>
                         <height>20</height>
@@ -283,7 +286,8 @@
                        <string>...</string>
                       </property>
                       <property name="icon" >
-                       <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
+                       <iconset resource="../../icons/icons.qrc" >
+                        <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
                       </property>
                      </widget>
                     </item>
@@ -296,7 +300,8 @@
                        <string>...</string>
                       </property>
                       <property name="icon" >
-                       <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
+                       <iconset resource="../../icons/icons.qrc" >
+                        <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
                       </property>
                      </widget>
                     </item>
@@ -305,7 +310,7 @@
                       <property name="orientation" >
                        <enum>Qt::Horizontal</enum>
                       </property>
-                      <property name="sizeHint" >
+                      <property name="sizeHint" stdset="0" >
                        <size>
                         <width>0</width>
                         <height>20</height>
@@ -320,7 +325,7 @@
                     <property name="orientation" >
                      <enum>Qt::Vertical</enum>
                     </property>
-                    <property name="sizeHint" >
+                    <property name="sizeHint" stdset="0" >
                      <size>
                       <width>20</width>
                       <height>40</height>
@@ -335,7 +340,7 @@
               <item>
                <widget class="QCheckBox" name="randomServer" >
                 <property name="enabled" >
-                 <bool>false</bool>
+                 <bool>true</bool>
                 </property>
                 <property name="text" >
                  <string>Choose random server for connecting</string>
@@ -347,6 +352,14 @@
            </layout>
           </widget>
           <widget class="QWidget" name="performTab" >
+           <property name="geometry" >
+            <rect>
+             <x>0</x>
+             <y>0</y>
+             <width>394</width>
+             <height>340</height>
+            </rect>
+           </property>
            <attribute name="title" >
             <string>Perform</string>
            </attribute>
@@ -363,7 +376,7 @@
               <item>
                <widget class="QTextEdit" name="performEdit" >
                 <property name="enabled" >
-                 <bool>false</bool>
+                 <bool>true</bool>
                 </property>
                 <property name="lineWrapMode" >
                  <enum>QTextEdit::NoWrap</enum>
@@ -373,7 +386,7 @@
               <item>
                <widget class="QGroupBox" name="autoIdentify" >
                 <property name="enabled" >
-                 <bool>false</bool>
+                 <bool>true</bool>
                 </property>
                 <property name="title" >
                  <string>Auto Identify</string>
@@ -382,7 +395,7 @@
                  <bool>true</bool>
                 </property>
                 <property name="checked" >
-                 <bool>false</bool>
+                 <bool>true</bool>
                 </property>
                 <layout class="QVBoxLayout" >
                  <item>
@@ -395,7 +408,10 @@
                     </widget>
                    </item>
                    <item row="0" column="1" >
-                    <widget class="QLineEdit" name="autoIdentService" >
+                    <widget class="QLineEdit" name="autoIdentifyService" >
+                     <property name="enabled" >
+                      <bool>true</bool>
+                     </property>
                      <property name="text" >
                       <string>NickServ</string>
                      </property>
@@ -403,15 +419,21 @@
                    </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="autoIdentPassword" >
+                    <widget class="QLineEdit" name="autoIdentifyPassword" >
+                     <property name="enabled" >
+                      <bool>true</bool>
+                     </property>
                      <property name="echoMode" >
-                      <enum>QLineEdit::PasswordEchoOnEdit</enum>
+                      <enum>QLineEdit::Password</enum>
                      </property>
                     </widget>
                    </item>
@@ -425,24 +447,35 @@
            </layout>
           </widget>
           <widget class="QWidget" name="tab" >
+           <property name="geometry" >
+            <rect>
+             <x>0</x>
+             <y>0</y>
+             <width>394</width>
+             <height>340</height>
+            </rect>
+           </property>
            <attribute name="title" >
             <string>Advanced</string>
            </attribute>
-           <layout class="QVBoxLayout" >
+           <layout class="QVBoxLayout" name="verticalLayout_2" >
             <item>
              <widget class="QGroupBox" name="groupBox_3" >
+              <property name="enabled" >
+               <bool>true</bool>
+              </property>
               <property name="title" >
-               <string>Network Encoding</string>
+               <string>Encodings</string>
               </property>
-              <layout class="QVBoxLayout" >
+              <layout class="QVBoxLayout" name="verticalLayout" >
                <item>
-                <layout class="QHBoxLayout" >
+                <layout class="QHBoxLayout" name="horizontalLayout" >
                  <item>
                   <layout class="QGridLayout" >
                    <item row="0" column="0" >
                     <widget class="QLabel" name="label_4" >
                      <property name="text" >
-                      <string>Sending:</string>
+                      <string>Send messages in:</string>
                      </property>
                     </widget>
                    </item>
@@ -457,12 +490,18 @@
                        <verstretch>0</verstretch>
                       </sizepolicy>
                      </property>
+                     <property name="insertPolicy" >
+                      <enum>QComboBox::InsertAlphabetically</enum>
+                     </property>
                     </widget>
                    </item>
                    <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>
+                     </property>
                      <property name="text" >
-                      <string>Receiving:</string>
+                      <string>Receive fallback:</string>
                      </property>
                     </widget>
                    </item>
@@ -477,6 +516,27 @@
                        <verstretch>0</verstretch>
                       </sizepolicy>
                      </property>
+                     <property name="insertPolicy" >
+                      <enum>QComboBox::InsertAlphabetically</enum>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="0" >
+                    <widget class="QLabel" name="label_9" >
+                     <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>
+                     <property name="text" >
+                      <string>Server encoding:</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="1" >
+                    <widget class="QComboBox" name="serverEncoding" >
+                     <property name="enabled" >
+                      <bool>false</bool>
+                     </property>
                     </widget>
                    </item>
                   </layout>
@@ -486,7 +546,106 @@
                    <property name="orientation" >
                     <enum>Qt::Horizontal</enum>
                    </property>
-                   <property name="sizeHint" >
+                   <property name="sizeHint" stdset="0" >
+                    <size>
+                     <width>58</width>
+                     <height>61</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="useDefaultEncodings" >
+                 <property name="enabled" >
+                  <bool>true</bool>
+                 </property>
+                 <property name="text" >
+                  <string>Use defaults</string>
+                 </property>
+                 <property name="checked" >
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="autoReconnect" >
+              <property name="enabled" >
+               <bool>true</bool>
+              </property>
+              <property name="title" >
+               <string>Automatic Reconnect</string>
+              </property>
+              <property name="checkable" >
+               <bool>true</bool>
+              </property>
+              <layout class="QVBoxLayout" >
+               <item>
+                <layout class="QHBoxLayout" >
+                 <item>
+                  <layout class="QGridLayout" >
+                   <item row="0" column="0" >
+                    <widget class="QLabel" name="label_7" >
+                     <property name="text" >
+                      <string>Interval:</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="0" column="1" >
+                    <widget class="QSpinBox" name="reconnectInterval" >
+                     <property name="suffix" >
+                      <string> s</string>
+                     </property>
+                     <property name="minimum" >
+                      <number>10</number>
+                     </property>
+                     <property name="maximum" >
+                      <number>3600</number>
+                     </property>
+                     <property name="value" >
+                      <number>30</number>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="0" >
+                    <widget class="QLabel" name="label_8" >
+                     <property name="text" >
+                      <string>Retries:</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="1" >
+                    <widget class="QSpinBox" name="reconnectRetries" >
+                     <property name="minimum" >
+                      <number>1</number>
+                     </property>
+                     <property name="maximum" >
+                      <number>999</number>
+                     </property>
+                     <property name="value" >
+                      <number>10</number>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="2" >
+                    <widget class="QCheckBox" name="unlimitedRetries" >
+                     <property name="text" >
+                      <string>Unlimited</string>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <spacer>
+                   <property name="orientation" >
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0" >
                     <size>
                      <width>40</width>
                      <height>20</height>
@@ -497,12 +656,12 @@
                 </layout>
                </item>
                <item>
-                <widget class="QCheckBox" name="useDefaultEncodings" >
+                <widget class="QCheckBox" name="rejoinOnReconnect" >
                  <property name="enabled" >
                   <bool>false</bool>
                  </property>
                  <property name="text" >
-                  <string>Use defaults</string>
+                  <string>Rejoin all channels on reconnect</string>
                  </property>
                  <property name="checked" >
                   <bool>true</bool>
@@ -517,9 +676,9 @@
               <property name="orientation" >
                <enum>Qt::Vertical</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
-                <width>375</width>
+                <width>386</width>
                 <height>31</height>
                </size>
               </property>
@@ -547,12 +706,12 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>356</x>
-     <y>181</y>
+     <x>659</x>
+     <y>262</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>470</x>
-     <y>122</y>
+     <x>471</x>
+     <y>176</y>
     </hint>
    </hints>
   </connection>
@@ -563,12 +722,44 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>383</x>
-     <y>181</y>
+     <x>659</x>
+     <y>262</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>471</x>
+     <y>209</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>unlimitedRetries</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>reconnectRetries</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>512</x>
+     <y>373</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>420</x>
+     <y>377</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>useDefaultEncodings</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>serverEncoding</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>396</x>
+     <y>251</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>445</x>
-     <y>156</y>
+     <x>456</x>
+     <y>230</y>
     </hint>
    </hints>
   </connection>