projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The Core Configuration Wizard is back! teH rul!
[quassel.git]
/
src
/
client
/
clientsyncer.cpp
diff --git
a/src/client/clientsyncer.cpp
b/src/client/clientsyncer.cpp
index
b8cf4b2
..
29b4973
100644
(file)
--- a/
src/client/clientsyncer.cpp
+++ b/
src/client/clientsyncer.cpp
@@
-59,6
+59,10
@@
void ClientSyncer::coreHasData() {
emit connectionError(msg["Error"].toString());
disconnectFromCore();
return;
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") {
} 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());
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();
}
}
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;
void ClientSyncer::loginToCore(const QString &user, const QString &passwd) {
emit connectionMsg(tr("Logging in..."));
QVariantMap clientLogin;