X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=29b4973dbe05b02a50875c94ad3330a1c12e0c5c;hb=dd24b914045d1b38d8ae5347158aa2266166703b;hp=b8cf4b29c148f45f148d459046beffef374e4ab2;hpb=ee6e4f90ce63d7eb3a54937cffb33510398d2349;p=quassel.git diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp index b8cf4b29..29b4973d 100644 --- a/src/client/clientsyncer.cpp +++ b/src/client/clientsyncer.cpp @@ -59,6 +59,10 @@ void ClientSyncer::coreHasData() { emit connectionError(msg["Error"].toString()); disconnectFromCore(); return; + } else if(msg["MsgType"] == "CoreSetupAck") { + emit coreSetupSuccess(); + } else if(msg["MsgType"] == "CoreSetupReject") { + emit coreSetupFailed(msg["Error"].toString()); } else if(msg["MsgType"] == "ClientLoginReject") { emit loginFailed(msg["Error"].toString()); } else if(msg["MsgType"] == "ClientLoginAck") { @@ -173,11 +177,21 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) { return; } emit connectionMsg(msg["CoreInfo"].toString()); - if(msg["LoginEnabled"].toBool()) { + if(!msg["Configured"].toBool()) { + // start wizard + emit startCoreSetup(msg["StorageBackends"].toList()); + } else if(msg["LoginEnabled"].toBool()) { emit startLogin(); } } +void ClientSyncer::doCoreSetup(const QVariant &setupData) { + QVariantMap setup; + setup["MsgType"] = "CoreSetupData"; + setup["SetupData"] = setupData; + SignalProxy::writeDataToDevice(socket, setup); +} + void ClientSyncer::loginToCore(const QString &user, const QString &passwd) { emit connectionMsg(tr("Logging in...")); QVariantMap clientLogin;