Yearly copyright bump :)

[quassel.git] / src / qtui / coreconnectdlg.cpp

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index dab92a2..2e2c094 100644 (file)
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -50,8 +50,9 @@ CoreConnectDlg::CoreConnectDlg(bool autoconnect, QWidget *parent)
   setWindowFlags(Qt::Sheet);
 
   clientSyncer = new ClientSyncer(this);
-  connect(this, SIGNAL(newClientSyncer(ClientSyncer *)), Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)));
-  emit newClientSyncer(clientSyncer); // announce the new client syncer via the client.
+  Client::registerClientSyncer(clientSyncer);
+//   connect(this, SIGNAL(newClientSyncer(ClientSyncer *)), Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)));
+//   emit newClientSyncer(clientSyncer); // announce the new client syncer via the client.
 
   wizard = 0;
 
@@ -219,15 +220,8 @@ void CoreConnectDlg::on_accountButtonBox_accepted() {
 }
 
 void CoreConnectDlg::on_useInternalCore_clicked() {
-  if(!_internalAccountId.isValid()) {
-    _internalAccountId = findFreeAccountId();
-    QVariantMap data;
-    data["InternalAccount"] = true;
-    CoreAccountSettings accountSettings;
-    accountSettings.storeAccountData(_internalAccountId, data);
-  }
-  clientSyncer->useInternalCore(_internalAccountId);
-  startSync();
+  clientSyncer->useInternalCore();
+  ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Cancel);
 }
 
 /*****************************************************
@@ -425,7 +419,8 @@ void CoreConnectDlg::startSync() {
   ui.user->setEnabled(true);
   ui.password->setEnabled(true);
   ui.rememberPasswd->setEnabled(true);
-  ui.loginButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+  if(ui.loginButtonBox->standardButtons() & QDialogButtonBox::Ok) // in mono mode we don't show an Ok Button
+    ui.loginButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
 }
 
 void CoreConnectDlg::coreSessionProgress(quint32 val, quint32 max) {