From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 10 Feb 2008 17:04:38 +0000 (+0000)
Subject: Here's hoping this fixes CoreConnectDlg even on the Mac... :/
X-Git-Tag: 0.2.0-alpha1~81
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=b833d421907118038b8680f6184bb2dea444cc74

Here's hoping this fixes CoreConnectDlg even on the Mac... :/
---

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 524bd566..b9f498a1 100644
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -55,9 +55,9 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(pare
   else ui.accountList->setCurrentRow(0);
 
   setAccountWidgetStates();
-  ui.accountButtonBox->setFocus();
+  //ui.accountButtonBox->setFocus();
   ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setAutoDefault(true);
+  //ui.accountButtonBox->button(QDialogButtonBox::Ok)->setAutoDefault(true);
 
   connect(clientSyncer, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)),this, SLOT(initPhaseSocketState(QAbstractSocket::SocketState)));
   connect(clientSyncer, SIGNAL(connectionError(const QString &)), this, SLOT(initPhaseError(const QString &)));
@@ -110,6 +110,7 @@ void CoreConnectDlg::setAccountWidgetStates() {
     ui.autoConnect->setChecked(selectedItems[0]->data(Qt::UserRole).value<AccountId>() == autoConnectAccount);
   }
   ui.accountButtonBox->button(QDialogButtonBox::Ok)->setEnabled(ui.accountList->count());
+  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 }
 
 void CoreConnectDlg::on_autoConnect_clicked(bool state) {
@@ -218,8 +219,6 @@ void CoreConnectDlg::connectToCore() {
   disconnect(ui.loginButtonBox, 0, this, 0);
   connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(restartPhaseNull()));
 
-
-  //connect(Client::instance(), SIGNAL(coreConnectionPhaseOne(const QVariantMap &)), this, SLOT(phaseOneFinished
   clientSyncer->connectToCore(accountData);
 }
 
@@ -266,7 +265,7 @@ void CoreConnectDlg::restartPhaseNull() {
 void CoreConnectDlg::startLogin() {
   ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/actions/network-connect")));
   ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
-  ui.loginStack->setMinimumSize(ui.loginStack->sizeHint()); ui.loginStack->updateGeometry();
+  //ui.loginStack->setMinimumSize(ui.loginStack->sizeHint()); ui.loginStack->updateGeometry();
   ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
   ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
   if(!accountData["User"].toString().isEmpty()) {
diff --git a/src/qtui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui
index 74b81a1d..14196d89 100644
--- a/src/qtui/ui/coreconnectdlg.ui
+++ b/src/qtui/ui/coreconnectdlg.ui
@@ -5,18 +5,30 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>533</width>
-    <height>361</height>
+    <width>496</width>
+    <height>316</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle" >
    <string>Connect to Quassel Core</string>
   </property>
   <layout class="QHBoxLayout" >
    <item>
     <widget class="QStackedWidget" name="stackedWidget" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="currentIndex" >
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="accountPage" >
       <layout class="QVBoxLayout" >
@@ -110,10 +122,31 @@
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_2" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="title" >
           <string>Initializing your connection</string>
          </property>
          <layout class="QVBoxLayout" >
+          <property name="spacing" >
+           <number>0</number>
+          </property>
+          <property name="leftMargin" >
+           <number>4</number>
+          </property>
+          <property name="topMargin" >
+           <number>4</number>
+          </property>
+          <property name="rightMargin" >
+           <number>4</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>4</number>
+          </property>
           <item>
            <layout class="QGridLayout" >
             <item row="0" column="0" >
@@ -154,11 +187,17 @@
             </item>
             <item row="1" column="1" colspan="2" >
              <widget class="QLabel" name="coreInfoLabel" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="text" >
                <string>Core Info
-might be multiple
-lines
-so reserve some space</string>
+reserve
+some
+space</string>
               </property>
               <property name="alignment" >
                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -172,13 +211,51 @@ so reserve some space</string>
           </item>
           <item>
            <widget class="QStackedWidget" name="loginStack" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="currentIndex" >
              <number>0</number>
             </property>
             <widget class="QWidget" name="loginCredentialsPage" >
              <layout class="QVBoxLayout" >
+              <item>
+               <spacer>
+                <property name="orientation" >
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" >
+                 <size>
+                  <width>20</width>
+                  <height>40</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <spacer>
+                <property name="orientation" >
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" >
+                 <size>
+                  <width>20</width>
+                  <height>40</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
               <item>
                <widget class="QGroupBox" name="loginGroup" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="title" >
                  <string>Login</string>
                 </property>
@@ -237,25 +314,18 @@ so reserve some space</string>
                 </layout>
                </widget>
               </item>
-              <item>
-               <spacer>
-                <property name="orientation" >
-                 <enum>Qt::Vertical</enum>
-                </property>
-                <property name="sizeHint" >
-                 <size>
-                  <width>20</width>
-                  <height>40</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
              </layout>
             </widget>
             <widget class="QWidget" name="coreConfigPage" >
              <layout class="QVBoxLayout" >
               <item>
                <widget class="QGroupBox" name="groupBox_4" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="title" >
                  <string>Configure your Quassel Core</string>
                 </property>
@@ -491,7 +561,6 @@ so reserve some space</string>
   <tabstop>addAccount</tabstop>
   <tabstop>deleteAccount</tabstop>
   <tabstop>autoConnect</tabstop>
-  <tabstop>loginButtonBox</tabstop>
   <tabstop>user</tabstop>
   <tabstop>password</tabstop>
   <tabstop>rememberPasswd</tabstop>