X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcoreaccounteditdlg.ui;h=3760d05d0b7092cc9b27e8596b6ae86a205f4019;hp=9477c082537953c5bb7f05e3f45bf987d75d803e;hb=52209badc8e769e50aa3019b63689dda0e79e9d0;hpb=11d59689fd6e1fe322a18b29c86d24d0803d6a2d

diff --git a/src/qtui/settingspages/coreaccounteditdlg.ui b/src/qtui/settingspages/coreaccounteditdlg.ui
index 9477c082..3760d05d 100644
--- a/src/qtui/settingspages/coreaccounteditdlg.ui
+++ b/src/qtui/settingspages/coreaccounteditdlg.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>378</width>
-    <height>455</height>
+    <width>398</width>
+    <height>602</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -122,29 +122,26 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="useProxy">
+    <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
-      <string>Use a Proxy</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <property name="checked">
-      <bool>false</bool>
+      <string>Proxy Settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_5">
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_7">
         <property name="text">
-         <string>Proxy Type:</string>
+         <string>Port:</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" colspan="2">
+      <item row="1" column="2" colspan="2">
        <widget class="QComboBox" name="proxyType">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <item>
          <property name="text">
-          <string>Socks 5</string>
+          <string>SOCKS 5</string>
          </property>
         </item>
         <item>
@@ -154,7 +151,7 @@
         </item>
        </widget>
       </item>
-      <item row="0" column="3">
+      <item row="1" column="4">
        <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -167,29 +164,35 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="0">
+      <item row="2" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
          <string>Hostname:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="4">
+      <item row="2" column="2" colspan="4">
        <widget class="QLineEdit" name="proxyHostName">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="text">
          <string>localhost</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>Port:</string>
+      <item row="4" column="2" colspan="3">
+       <widget class="QLineEdit" name="proxyUser">
+        <property name="enabled">
+         <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="3" column="2">
        <widget class="QSpinBox" name="proxyPort">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -207,7 +210,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="2" colspan="2">
+      <item row="3" column="3" colspan="2">
        <spacer name="horizontalSpacer_3">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -220,31 +223,31 @@
         </property>
        </spacer>
       </item>
-      <item row="3" column="0">
+      <item row="4" column="0">
        <widget class="QLabel" name="label_8">
         <property name="text">
          <string>User:</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="3">
-       <widget class="QLineEdit" name="proxyUser"/>
-      </item>
-      <item row="4" column="0">
+      <item row="5" column="0">
        <widget class="QLabel" name="label_9">
         <property name="text">
          <string>Password:</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" colspan="3">
+      <item row="5" column="2" colspan="3">
        <widget class="QLineEdit" name="proxyPassword">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="echoMode">
          <enum>QLineEdit::Password</enum>
         </property>
        </widget>
       </item>
-      <item row="3" column="4">
+      <item row="4" column="5">
        <spacer name="horizontalSpacer_4">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -257,7 +260,7 @@
         </property>
        </spacer>
       </item>
-      <item row="4" column="4">
+      <item row="5" column="5">
        <spacer name="horizontalSpacer_5">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -270,6 +273,50 @@
         </property>
        </spacer>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Proxy Type:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <layout class="QVBoxLayout" name="verticalLayoutProxyRadioGroup">
+        <item>
+         <widget class="QRadioButton" name="radioButtonNoProxy">
+          <property name="text">
+           <string>No pro&amp;xy</string>
+          </property>
+          <attribute name="buttonGroup">
+           <string notr="true">buttonGroupProxyType</string>
+          </attribute>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioButtonSystemProxy">
+          <property name="text">
+           <string>S&amp;ystem proxy</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+          <attribute name="buttonGroup">
+           <string notr="true">buttonGroupProxyType</string>
+          </attribute>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioButtonManualProxy">
+          <property name="text">
+           <string>&amp;Manual proxy configuration</string>
+          </property>
+          <attribute name="buttonGroup">
+           <string notr="true">buttonGroupProxyType</string>
+          </attribute>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
@@ -298,6 +345,20 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>accountName</tabstop>
+  <tabstop>hostName</tabstop>
+  <tabstop>port</tabstop>
+  <tabstop>user</tabstop>
+  <tabstop>password</tabstop>
+  <tabstop>rememberPassword</tabstop>
+  <tabstop>proxyType</tabstop>
+  <tabstop>proxyHostName</tabstop>
+  <tabstop>proxyPort</tabstop>
+  <tabstop>proxyUser</tabstop>
+  <tabstop>proxyPassword</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
@@ -333,4 +394,7 @@
    </hints>
   </connection>
  </connections>
+ <buttongroups>
+  <buttongroup name="buttonGroupProxyType"/>
+ </buttongroups>
 </ui>