From 0f87a72d470196f5781053927d9b91e52cc363f2 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 24 Nov 2009 23:38:57 +0100 Subject: [PATCH] Make monolithic client work again --- src/client/clientsettings.cpp | 4 ++ src/client/clientsettings.h | 2 + src/client/coreaccountmodel.cpp | 11 ++-- src/client/coreconnection.cpp | 59 ++++++++++++++----- src/client/coreconnection.h | 5 +- src/qtui/monoapplication.cpp | 10 ++-- .../settingspages/coreaccountsettingspage.cpp | 24 ++++++-- 7 files changed, 82 insertions(+), 33 deletions(-) diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp index 55df8c45..42c26cd5 100644 --- a/src/client/clientsettings.cpp +++ b/src/client/clientsettings.cpp @@ -170,6 +170,10 @@ void CoreAccountSettings::removeAccount(AccountId id) { removeLocalKey(QString("%1").arg(id.toInt())); } +void CoreAccountSettings::clearAccounts() { + foreach(const QString &key, localChildGroups()) + removeLocalKey(key); +} /***********************************************************************************************/ // NotificationSettings: diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h index bf24410f..0e4b4102 100644 --- a/src/client/clientsettings.h +++ b/src/client/clientsettings.h @@ -64,6 +64,8 @@ public: bool autoConnectToFixedAccount(); void setAutoConnectToFixedAccount(bool); + void clearAccounts(); + void storeAccountData(AccountId id, const QVariantMap &data); QVariantMap retrieveAccountData(AccountId); void removeAccount(AccountId); diff --git a/src/client/coreaccountmodel.cpp b/src/client/coreaccountmodel.cpp index bcd69dce..1734c788 100644 --- a/src/client/coreaccountmodel.cpp +++ b/src/client/coreaccountmodel.cpp @@ -58,17 +58,16 @@ void CoreAccountModel::load() { // Make sure we have an internal account in monolithic mode CoreAccount intAcc; intAcc.setInternal(true); - insertAccount(intAcc); + intAcc.setAccountName(tr("Internal Core")); + _internalAccount = createOrUpdateAccount(intAcc); } } void CoreAccountModel::save() { CoreAccountSettings s; + s.clearAccounts(); foreach(const CoreAccount &acc, accounts()) { - if(acc.isInternal()) - continue; // FIXME don't save internal for now - but make sure to handle this correctly once mono can do remotes! - // we'll have to ensure that autoConnectAccount works with internal as well then - QVariantMap map = acc.toVariantMap(true); // TODO Hook into kwallet/password saving stuff + QVariantMap map = acc.toVariantMap(false); // TODO Hook into kwallet/password saving stuff s.storeAccountData(acc.accountId(), map); } } @@ -167,8 +166,6 @@ AccountId CoreAccountModel::createOrUpdateAccount(const CoreAccount &newAcc) { void CoreAccountModel::insertAccount(const CoreAccount &acc) { if(acc.isInternal()) { - if(Quassel::runMode() == Quassel::Monolithic) - return; if(internalAccount().isValid()) { qWarning() << "Trying to insert a second internal account in CoreAccountModel, ignoring"; return; diff --git a/src/client/coreconnection.cpp b/src/client/coreconnection.cpp index f290756d..0b342ed5 100644 --- a/src/client/coreconnection.cpp +++ b/src/client/coreconnection.cpp @@ -99,9 +99,9 @@ void CoreConnection::resetConnection() { _netsToSync.clear(); _numNetsToSync = 0; - _state = Disconnected; setProgressMaximum(-1); // disable + setState(Disconnected); emit connectionMsg(tr("Disconnected from core.")); } @@ -159,6 +159,8 @@ void CoreConnection::setState(ConnectionState state) { if(state != _state) { _state = state; emit stateChanged(state); + if(state == Disconnected) + emit disconnected(); } } @@ -178,7 +180,6 @@ void CoreConnection::coreSocketError(QAbstractSocket::SocketError) { } void CoreConnection::coreSocketDisconnected() { - setState(Disconnected); emit disconnected(); resetConnection(); // FIXME handle disconnects gracefully @@ -244,20 +245,30 @@ bool CoreConnection::connectToCore(AccountId accId) { CoreAccountSettings s; - if(!accId.isValid()) { - // check our settings and figure out what to do - if(!s.autoConnectOnStartup()) - return false; - if(s.autoConnectToFixedAccount()) - accId = s.autoConnectAccount(); - else - accId = s.lastAccount(); - if(!accId.isValid()) + // FIXME: Don't force connection to internal core in mono client + if(Quassel::runMode() == Quassel::Monolithic) { + _account = accountModel()->account(accountModel()->internalAccount()); + Q_ASSERT(_account.isValid()); + } else { + if(!accId.isValid()) { + // check our settings and figure out what to do + if(!s.autoConnectOnStartup()) + return false; + if(s.autoConnectToFixedAccount()) + accId = s.autoConnectAccount(); + else + accId = s.lastAccount(); + if(!accId.isValid()) + return false; + } + _account = accountModel()->account(accId); + if(!_account.accountId().isValid()) { return false; - } - _account = accountModel()->account(accId); - if(!_account.accountId().isValid()) { - return false; + } + if(Quassel::runMode() != Quassel::Monolithic) { + if(_account.isInternal()) + return false; + } } s.setLastAccount(accId); @@ -268,6 +279,16 @@ bool CoreConnection::connectToCore(AccountId accId) { void CoreConnection::connectToCurrentAccount() { resetConnection(); + if(currentAccount().isInternal()) { + if(Quassel::runMode() != Quassel::Monolithic) { + qWarning() << "Cannot connect to internal core in client-only mode!"; + return; + } + emit startInternalCore(); + emit connectToInternalCore(Client::instance()->signalProxy()); + return; + } + Q_ASSERT(!_socket); #ifdef HAVE_SSL QSslSocket *sock = new QSslSocket(Client::instance()); @@ -408,10 +429,16 @@ void CoreConnection::sessionStateReceived(const QVariantMap &state) { disconnect(_socket, SIGNAL(readyRead()), this, 0); disconnect(_socket, SIGNAL(connected()), this, 0); - //Client::instance()->setConnectedToCore(currentAccount().accountId(), _socket); syncToCore(state); } +void CoreConnection::internalSessionStateReceived(const QVariant &packedState) { + updateProgress(100, 100); + + setState(Synchronizing); + syncToCore(packedState.toMap()); +} + void CoreConnection::syncToCore(const QVariantMap &sessionState) { setProgressText(tr("Receiving network states")); updateProgress(0, 100); diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index a74c12d3..f1afab9f 100644 --- a/src/client/coreconnection.h +++ b/src/client/coreconnection.h @@ -36,6 +36,7 @@ class CoreAccountModel; class Network; +class SignalProxy; class CoreConnection : public QObject { Q_OBJECT @@ -83,6 +84,8 @@ signals: void progressTextChanged(const QString &); void startCoreSetup(const QVariantList &); + void startInternalCore(); + void connectToInternalCore(SignalProxy *proxy); // This signal MUST be handled synchronously! void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage = QString()); @@ -105,7 +108,7 @@ private slots: void checkSyncState(); void syncToCore(const QVariantMap &sessionState); - //void internalSessionStateReceived(const QVariant &packedState); + void internalSessionStateReceived(const QVariant &packedState); void sessionStateReceived(const QVariantMap &state); void setWarningsHandler(const char *slot); diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp index 60df4c5b..5ed2611d 100644 --- a/src/qtui/monoapplication.cpp +++ b/src/qtui/monoapplication.cpp @@ -39,9 +39,10 @@ bool MonolithicApplication::init() { if(!Quassel::init()) // parse args return false; + connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore())); + if(isOptionSet("port")) { - _internal->init(); - _internalInitDone = true; + startInternalCore(); } return QtUiApplication::init(); @@ -59,6 +60,7 @@ void MonolithicApplication::startInternalCore() { _internalInitDone = true; } Core *core = Core::instance(); - //connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *))); - //connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &))); + CoreConnection *connection = Client::coreConnection(); + connect(connection, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *))); + connect(core, SIGNAL(sessionState(const QVariant &)), connection, SLOT(internalSessionStateReceived(const QVariant &))); } diff --git a/src/qtui/settingspages/coreaccountsettingspage.cpp b/src/qtui/settingspages/coreaccountsettingspage.cpp index 0cee7367..be08cb53 100644 --- a/src/qtui/settingspages/coreaccountsettingspage.cpp +++ b/src/qtui/settingspages/coreaccountsettingspage.cpp @@ -54,10 +54,24 @@ void CoreAccountSettingsPage::setStandAlone(bool standalone) { void CoreAccountSettingsPage::load() { _model->update(Client::coreAccountModel()); - SettingsPage::load(); + + CoreAccountSettings s; + + if(Quassel::runMode() != Quassel::Monolithic) { + // make sure we don't have selected the internal account as autoconnect account + + if(s.autoConnectOnStartup() && s.autoConnectToFixedAccount()) { + CoreAccount acc = _model->account(s.autoConnectAccount()); + if(acc.isInternal()) + ui.autoConnectOnStartup->setChecked(false); + } + } ui.accountView->setCurrentIndex(model()->index(0, 0)); ui.accountView->selectionModel()->select(model()->index(0, 0), QItemSelectionModel::Select); + + QModelIndex idx = model()->accountIndex(s.autoConnectAccount()); + ui.autoConnectAccount->setCurrentIndex(idx.isValid() ? idx.row() : 0); setWidgetStates(); } @@ -74,7 +88,6 @@ QVariant CoreAccountSettingsPage::loadAutoWidgetValue(const QString &widgetName) AccountId id = s.autoConnectAccount(); if(!id.isValid()) return QVariant(); - ui.autoConnectAccount->setCurrentIndex(model()->accountIndex(id).row()); return id.toInt(); } return SettingsPage::loadAutoWidgetValue(widgetName); @@ -180,10 +193,11 @@ void CoreAccountSettingsPage::on_accountView_doubleClicked(const QModelIndex &in } void CoreAccountSettingsPage::setWidgetStates() { - bool selected = ui.accountView->selectionModel()->selectedIndexes().count(); + AccountId accId = selectedAccount(); + bool editable = accId.isValid() && accId != model()->internalAccount(); - ui.editAccountButton->setEnabled(selected); - ui.deleteAccountButton->setEnabled(selected); + ui.editAccountButton->setEnabled(editable); + ui.deleteAccountButton->setEnabled(editable); } void CoreAccountSettingsPage::widgetHasChanged() { -- 2.20.1