From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Fri, 18 Jul 2008 12:20:21 +0000 (+0200)
Subject: unconfusinating the core edit dialog
X-Git-Tag: 0.3.0~254
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=b34c7676d2080b313420f5b1472152e8339eb436;ds=sidebyside

unconfusinating the core edit dialog
---

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index d7d52de2..6591edea 100644
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -464,6 +464,14 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co
     ui.useSsl->setEnabled(false);
 #endif
   }
+
+#ifndef BUILD_MONO
+  // if we don't have a mono build we hide the option to use the internal connection and force the setting to use remote host
+  ui.useInternal->setChecked(false);
+  ui.useInternal->hide();
+  ui.useRemote->hide();
+  ui.labelUseBuiltinCore->hide();
+#endif
 }
 
 QVariantMap CoreAccountEditDlg::accountData() {
diff --git a/src/qtui/ui/coreaccounteditdlg.ui b/src/qtui/ui/coreaccounteditdlg.ui
index 30364a2b..7c67ef68 100644
--- a/src/qtui/ui/coreaccounteditdlg.ui
+++ b/src/qtui/ui/coreaccounteditdlg.ui
@@ -31,7 +31,11 @@
            </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>
@@ -48,7 +52,7 @@
            </widget>
           </item>
           <item row="0" column="1" colspan="2" >
-           <widget class="QLabel" name="label_4" >
+           <widget class="QLabel" name="labelUseBuiltinCore" >
             <property name="enabled" >
              <bool>false</bool>
             </property>
@@ -73,7 +77,7 @@
           <item row="1" column="1" >
            <widget class="QLabel" name="label_2" >
             <property name="text" >
-             <string>Remote host:</string>
+             <string>Hostname:</string>
             </property>
             <property name="buddy" >
              <cstring>useRemote</cstring>
@@ -88,7 +92,11 @@
            </widget>
           </item>
           <item row="2" column="1" >
-           <widget class="QLineEdit" name="host" />
+           <widget class="QLineEdit" name="host" >
+            <property name="text" >
+             <string>localhost</string>
+            </property>
+           </widget>
           </item>
           <item row="2" column="2" >
            <widget class="QSpinBox" name="port" >
@@ -109,7 +117,8 @@
              <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 resource="../../icons/icons.qrc" >
+              <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>
@@ -213,7 +222,7 @@
        <property name="orientation" >
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>20</width>
          <height>40</height>
@@ -227,7 +236,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>