X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fui%2Fcoreaccounteditdlg.ui;h=587bba86cdf5e2fc25c2de92aba49235a8c5cc17;hp=4f056bc8565c0431d8231cb018555c240c671c9b;hb=d230a0e8119ea9d698259b9be876617bc5f37394;hpb=d1b6499b0b848d4287efae89107576548533502c

diff --git a/src/qtui/ui/coreaccounteditdlg.ui b/src/qtui/ui/coreaccounteditdlg.ui
index 4f056bc8..587bba86 100644
--- a/src/qtui/ui/coreaccounteditdlg.ui
+++ b/src/qtui/ui/coreaccounteditdlg.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>395</width>
-    <height>242</height>
+    <width>509</width>
+    <height>458</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -31,66 +31,38 @@
            </widget>
           </item>
           <item>
-           <widget class="QLineEdit" name="accountName" />
+           <widget class="QLineEdit" name="accountName" >
+            <property name="text" >
+             <string>Local Core</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </item>
         <item>
          <layout class="QGridLayout" >
           <item row="0" column="0" >
-           <widget class="QRadioButton" name="useInternal" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
+           <widget class="QLabel" name="label_2" >
             <property name="text" >
-             <string/>
+             <string>Hostname:</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="2" >
-           <widget class="QLabel" name="label_4" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
+          <item row="0" column="1" >
+           <widget class="QLabel" name="label_3" >
             <property name="text" >
-             <string>Use built-in Quassel Core</string>
-            </property>
-            <property name="buddy" >
-             <cstring>useInternal</cstring>
+             <string>Port:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0" >
-           <widget class="QRadioButton" name="useRemote" >
+           <widget class="QLineEdit" name="host" >
             <property name="text" >
-             <string/>
-            </property>
-            <property name="checked" >
-             <bool>true</bool>
+             <string>localhost</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1" >
-           <widget class="QLabel" name="label_2" >
-            <property name="text" >
-             <string>Remote host:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>useRemote</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2" >
-           <widget class="QLabel" name="label_3" >
-            <property name="text" >
-             <string>Port:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1" >
-           <widget class="QLineEdit" name="host" />
-          </item>
-          <item row="2" column="2" >
            <widget class="QSpinBox" name="port" >
             <property name="minimum" >
              <number>1</number>
@@ -103,16 +75,14 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1" colspan="2" >
-           <widget class="QCheckBox" name="useSSL" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
+          <item row="2" column="0" colspan="2" >
+           <widget class="QCheckBox" name="useSsl" >
             <property name="text" >
              <string>Use secure connection (SSL)</string>
             </property>
             <property name="icon" >
-             <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/document-encrypt.png</iconset>
+             <iconset>
+              <normaloff>:/16x16/actions/oxygen/16x16/actions/document-encrypt.png</normaloff>:/16x16/actions/oxygen/16x16/actions/document-encrypt.png</iconset>
             </property>
             <property name="checked" >
              <bool>false</bool>
@@ -122,28 +92,115 @@
          </layout>
         </item>
         <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Vertical</enum>
+         <widget class="QGroupBox" name="useProxy" >
+          <property name="title" >
+           <string>Use a proxy:</string>
+          </property>
+          <property name="checkable" >
+           <bool>true</bool>
           </property>
-          <property name="sizeHint" >
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
+          <property name="checked" >
+           <bool>false</bool>
           </property>
-         </spacer>
+          <layout class="QGridLayout" >
+           <item row="0" column="0" colspan="2" >
+            <widget class="QLabel" name="label_5" >
+             <property name="text" >
+              <string>Proxy Type:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="2" >
+            <widget class="QComboBox" name="proxyType" >
+             <item>
+              <property name="text" >
+               <string>Socks 5</string>
+              </property>
+             </item>
+             <item>
+              <property name="text" >
+               <string>HTTP</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item row="1" column="0" colspan="2" >
+            <widget class="QLabel" name="label_6" >
+             <property name="text" >
+              <string>Proxy Host:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="2" >
+            <widget class="QLabel" name="label_7" >
+             <property name="text" >
+              <string>Proxy Port:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0" colspan="2" >
+            <widget class="QLineEdit" name="proxyHost" >
+             <property name="text" >
+              <string>localhost</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="2" >
+            <widget class="QSpinBox" name="proxyPort" >
+             <property name="maximum" >
+              <number>10000</number>
+             </property>
+             <property name="value" >
+              <number>8080</number>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0" >
+            <widget class="QLabel" name="label_8" >
+             <property name="text" >
+              <string>Proxy Username:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1" colspan="2" >
+            <widget class="QLineEdit" name="proxyUser" />
+           </item>
+           <item row="4" column="0" >
+            <widget class="QLabel" name="label_9" >
+             <property name="text" >
+              <string>Proxy Password:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1" colspan="2" >
+            <widget class="QLineEdit" name="proxyPassword" />
+           </item>
+          </layout>
+         </widget>
         </item>
        </layout>
       </widget>
      </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox" >
        <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="standardButtons" >
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
@@ -151,9 +208,7 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
@@ -162,8 +217,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>263</x>
-     <y>230</y>
+     <x>275</x>
+     <y>521</y>
     </hint>
     <hint type="destinationlabel" >
      <x>157</x>
@@ -178,8 +233,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>331</x>
-     <y>230</y>
+     <x>343</x>
+     <y>521</y>
     </hint>
     <hint type="destinationlabel" >
      <x>286</x>
@@ -187,53 +242,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>useInternal</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>host</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>30</x>
-     <y>79</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>92</x>
-     <y>143</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>useInternal</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>port</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>39</x>
-     <y>78</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>331</x>
-     <y>144</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>useRemote</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>host</receiver>
-   <slot>setFocus()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>26</x>
-     <y>113</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>184</x>
-     <y>146</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>