whitespace_around_hostnames--

Fixing BR #106.

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index d6022b7..3510926 100644 (file)
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -465,15 +465,15 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co
 }
 
 QVariantMap CoreAccountEditDlg::accountData() {
 }
 
 QVariantMap CoreAccountEditDlg::accountData() {

-  account["AccountName"] = ui.accountName->text();
-  account["Host"] = ui.host->text();
+  account["AccountName"] = ui.accountName->text().trimmed();
+  account["Host"] = ui.host->text().trimmed();

   account["Port"] = ui.port->value();
   account["UseInternal"] = ui.useInternal->isChecked();
   return account;
 }
 
 void CoreAccountEditDlg::setWidgetStates() {
   account["Port"] = ui.port->value();
   account["UseInternal"] = ui.useInternal->isChecked();
   return account;
 }
 
 void CoreAccountEditDlg::setWidgetStates() {

-  bool ok = !ui.accountName->text().isEmpty() && !existing.contains(ui.accountName->text()) && (ui.useInternal->isChecked() || !ui.host->text().isEmpty());
+  bool ok = !ui.accountName->text().trimmed().isEmpty() && !existing.contains(ui.accountName->text()) && (ui.useInternal->isChecked() || !ui.host->text().isEmpty());

   ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
 }
 
   ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
 }
 

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 614de27..8e03ce6 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -647,7 +647,7 @@ ServerEditDlg::ServerEditDlg(const QVariant &_serverData, QWidget *parent) : QDi
 
 QVariant ServerEditDlg::serverData() const {
   QVariantMap _serverData;
 
 QVariant ServerEditDlg::serverData() const {
   QVariantMap _serverData;

-  _serverData["Host"] = ui.host->text();
+  _serverData["Host"] = ui.host->text().trimmed();

   _serverData["Port"] = ui.port->value();
   _serverData["Password"] = ui.password->text();
   _serverData["UseSSL"] = ui.useSSL->isChecked();
   _serverData["Port"] = ui.port->value();
   _serverData["Password"] = ui.password->text();
   _serverData["UseSSL"] = ui.useSSL->isChecked();


@@ -655,7 +655,7 @@ QVariant ServerEditDlg::serverData() const {
 }
 
 void ServerEditDlg::on_host_textChanged() {
 }
 
 void ServerEditDlg::on_host_textChanged() {

-  ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().isEmpty());
+  ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().trimmed().isEmpty());

 }
 
 /**************************************************************************
 }
 
 /**************************************************************************

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index c635afc..f1260c7 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -166,7 +166,7 @@
            <bool>true</bool>
           </property>
           <property name="currentIndex" >
            <bool>true</bool>
           </property>
           <property name="currentIndex" >

-           <number>1</number>
+           <number>0</number>

           </property>
           <widget class="QWidget" name="serversTab" >
            <property name="enabled" >
           </property>
           <widget class="QWidget" name="serversTab" >
            <property name="enabled" >


@@ -176,8 +176,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
             <rect>
              <x>0</x>
              <y>0</y>

-             <width>800</width>
-             <height>480</height>
+             <width>394</width>
+             <height>340</height>

             </rect>
            </property>
            <attribute name="title" >
             </rect>
            </property>
            <attribute name="title" >

diff --git a/version.inc b/version.inc
index 9725dd0..eae3943 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -4,8 +4,8 @@
 { using namespace Global;
 
   quasselVersion = "0.2.0-pre";
 { using namespace Global;
 
   quasselVersion = "0.2.0-pre";

-  quasselDate = "2008-02-18";
-  quasselBuild = 551;
+  quasselDate = "2008-02-19";
+  quasselBuild = 554;

 
   //! Minimum client build number the core needs
   clientBuildNeeded = 526;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 526;