X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fui%2Fcoreaccounteditdlg.ui;h=fcacc1c4159d25e275944d501e9d293a5c5c02dc;hp=5dda97de493fa13a90082864f6a8204d72225505;hb=224e969cf873338d2ff3e9c191558afd638e03a7;hpb=26c15c14a067c8709d2e04ef9d8965550dcee52d

diff --git a/src/qtui/ui/coreaccounteditdlg.ui b/src/qtui/ui/coreaccounteditdlg.ui
index 5dda97de..fcacc1c4 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>514</width>
-    <height>534</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>
@@ -177,8 +147,17 @@
            </item>
            <item row="2" column="2" >
             <widget class="QSpinBox" name="proxyPort" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimum" >
+              <number>1</number>
+             </property>
              <property name="maximum" >
-              <number>10000</number>
+              <number>65535</number>
              </property>
              <property name="value" >
               <number>8080</number>
@@ -216,7 +195,7 @@
        <property name="orientation" >
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>20</width>
          <height>40</height>
@@ -230,7 +209,7 @@
         <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>
@@ -238,9 +217,7 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
@@ -274,53 +251,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>useInternal</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>host</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>63</x>
-     <y>100</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>63</x>
-     <y>100</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>400</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>59</x>
-     <y>126</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>184</x>
-     <y>146</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>