From 671e451cf1c10a6e3f442af82b58bfc4de0cb5a2 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Sat, 12 Jul 2008 15:17:42 +0200 Subject: [PATCH] updating the sync dialog according to the new sync system --- src/client/clientsyncer.cpp | 92 ++-------------------------- src/client/clientsyncer.h | 109 ++++++++++++++++------------------ src/qtui/coreconnectdlg.cpp | 31 ---------- src/qtui/coreconnectdlg.h | 2 - src/qtui/ui/coreconnectdlg.ui | 65 ++++---------------- 5 files changed, 65 insertions(+), 234 deletions(-) diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp index 6759973d..4ec529c0 100644 --- a/src/client/clientsyncer.cpp +++ b/src/client/clientsyncer.cpp @@ -178,8 +178,6 @@ void ClientSyncer::coreSocketDisconnected() { coreConnectionInfo.clear(); netsToSync.clear(); - channelsToSync.clear(); - usersToSync.clear(); blockSize = 0; //restartPhaseNull(); } @@ -264,17 +262,15 @@ void ClientSyncer::syncToCore(const QVariantMap &sessionState) { // create buffers // FIXME: get rid of this crap QVariantList bufferinfos = sessionState["BufferInfos"].toList(); - foreach(QVariant vinfo, bufferinfos) Client::buffer(vinfo.value()); // create Buffers and BufferItems + foreach(QVariant vinfo, bufferinfos) + Client::buffer(vinfo.value()); // create Buffers and BufferItems QVariantList networkids = sessionState["NetworkIds"].toList(); - // prepare sync progress thingys... FIXME: Care about removal of networks + // prepare sync progress thingys... + // FIXME: Care about removal of networks numNetsToSync = networkids.count(); - numChannelsToSync = 0; //sessionState["IrcChannelCount"].toUInt(); - numUsersToSync = 0; // sessionState["IrcUserCount"].toUInt(); qDebug() << numUsersToSync; emit networksProgress(0, numNetsToSync); - emit channelsProgress(0, numChannelsToSync); - emit ircUsersProgress(0, numUsersToSync); // create network objects foreach(QVariant networkid, networkids) { @@ -282,12 +278,6 @@ void ClientSyncer::syncToCore(const QVariantMap &sessionState) { Network *net = new Network(netid, Client::instance()); netsToSync.insert(net); connect(net, SIGNAL(initDone()), this, SLOT(networkInitDone())); - connect(net, SIGNAL(ircUserInitDone(IrcUser *)), this, SLOT(ircUserInitDone(IrcUser *))); - connect(net, SIGNAL(ircUserAdded(IrcUser *)), this, SLOT(ircUserAdded(IrcUser *))); - connect(net, SIGNAL(ircUserRemoved(QObject *)), this, SLOT(ircUserRemoved(QObject *))); - connect(net, SIGNAL(ircChannelInitDone(IrcChannel *)), this, SLOT(ircChannelInitDone(IrcChannel *))); - connect(net, SIGNAL(ircChannelAdded(IrcChannel *)), this, SLOT(ircChannelAdded(IrcChannel *))); - connect(net, SIGNAL(ircChannelRemoved(QObject *)), this, SLOT(ircChannelRemoved(QObject *))); Client::addNetwork(net); } checkSyncState(); @@ -299,84 +289,10 @@ void ClientSyncer::networkInitDone() { checkSyncState(); } -void ClientSyncer::ircChannelInitDone(IrcChannel *chan) { - channelsToSync.remove(chan); - emit channelsProgress(numChannelsToSync - channelsToSync.count(), numChannelsToSync); - checkSyncState(); -} - -void ClientSyncer::ircChannelAdded(IrcChannel *chan) { - if(!chan->isInitialized()) { - channelsToSync.insert(chan); - numChannelsToSync++; - emit channelsProgress(numChannelsToSync - channelsToSync.count(), numChannelsToSync); - checkSyncState(); - } -} - -void ClientSyncer::ircChannelRemoved(QObject *chan) { - if(channelsToSync.contains(chan)) { - numChannelsToSync--; - channelsToSync.remove(chan); - emit channelsProgress(numChannelsToSync - channelsToSync.count(), numChannelsToSync); - checkSyncState(); - } -} - -void ClientSyncer::ircUserInitDone(IrcUser *user) { - usersToSync.remove(user); - emit ircUsersProgress(numUsersToSync - usersToSync.count(), numUsersToSync); - checkSyncState(); -} - -void ClientSyncer::ircUserAdded(IrcUser *user) { - if(!user->isInitialized()) { - usersToSync.insert(user); - numUsersToSync++; - emit ircUsersProgress(numUsersToSync - usersToSync.count(), numUsersToSync); - checkSyncState(); - } -} - -void ClientSyncer::ircUserRemoved(QObject *user) { - if(usersToSync.contains(user)) { - numUsersToSync--; - usersToSync.remove(user); - emit ircUsersProgress(numUsersToSync - usersToSync.count(), numUsersToSync); - checkSyncState(); - } -} - void ClientSyncer::checkSyncState() { - // if(usersToSync.count() + channelsToSync.count() + netsToSync.count() == 0) { if(netsToSync.isEmpty()) { - // done syncing! - /* - qDebug() << "done"; - foreach(Network *net, _networks.values()) { - //disconnect(net, 0, this, SLOT(networkInitDone())); - //disconnect(net, 0, this, SLOT(ircUserInitDone(IrcUser *))); - //disconnect(net, 0, this, SLOT(ircUserAdded(IrcUser *))); - //disconnect(net, 0, this, SLOT(ircUserRemoved(QObject *))); - //disconnect(net, 0, this, SLOT(ircChannelInitDone(IrcChannel *))); - //disconnect(net, 0, this, SLOT(ircChannelAdded(IrcChannel *))); - //disconnect(net, 0, this, SLOT(ircChannelRemoved(QObject *))); - qDebug() << "disconnecting"; - disconnect(net, SIGNAL(initDone()), this, SLOT(networkInitDone())); - disconnect(net, SIGNAL(ircUserInitDone(IrcUser *)), this, SLOT(ircUserInitDone(IrcUser *))); - disconnect(net, SIGNAL(ircUserAdded(IrcUser *)), this, SLOT(ircUserAdded(IrcUser *))); - disconnect(net, SIGNAL(ircUserRemoved(QObject *)), this, SLOT(ircUserRemoved(QObject *))); - disconnect(net, SIGNAL(ircChannelInitDone(IrcChannel *)), this, SLOT(ircChannelInitDone(IrcChannel *))); - disconnect(net, SIGNAL(ircChannelAdded(IrcChannel *)), this, SLOT(ircChannelAdded(IrcChannel *))); - disconnect(net, SIGNAL(ircChannelRemoved(QObject *)), this, SLOT(ircChannelRemoved(QObject *))); - } - */ - Client::instance()->setSyncedToCore(); emit syncFinished(); - //emit connected(); - //emit connectionStateChanged(true); - } } diff --git a/src/client/clientsyncer.h b/src/client/clientsyncer.h index 44e33737..8f370483 100644 --- a/src/client/clientsyncer.h +++ b/src/client/clientsyncer.h @@ -37,70 +37,61 @@ class IrcChannel; class ClientSyncer : public QObject { Q_OBJECT - public: - ClientSyncer(QObject *parent = 0); - ~ClientSyncer(); - - signals: - void recvPartialItem(quint32 avail, quint32 size); - void connectionError(const QString &errorMsg); - void connectionMsg(const QString &msg); - void sessionProgress(quint32 part, quint32 total); - void networksProgress(quint32 part, quint32 total); - void channelsProgress(quint32 part, quint32 total); - void ircUsersProgress(quint32 part, quint32 total); - void socketStateChanged(QAbstractSocket::SocketState); - void socketDisconnected(); - - void startLogin(); - void loginFailed(const QString &error); - void loginSuccess(); - void syncFinished(); - void startCoreSetup(const QVariantList &); - void coreSetupSuccess(); - void coreSetupFailed(const QString &error); - - void encrypted(bool); - - public slots: - void connectToCore(const QVariantMap &); - void loginToCore(const QString &user, const QString &passwd); - void disconnectFromCore(); - - private slots: - void coreSocketError(QAbstractSocket::SocketError); - void coreHasData(); - void coreSocketConnected(); - void coreSocketDisconnected(); - - void clientInitAck(const QVariantMap &msg); - +public: + ClientSyncer(QObject *parent = 0); + ~ClientSyncer(); + +signals: + void recvPartialItem(quint32 avail, quint32 size); + void connectionError(const QString &errorMsg); + void connectionMsg(const QString &msg); + void sessionProgress(quint32 part, quint32 total); + void networksProgress(quint32 part, quint32 total); + void socketStateChanged(QAbstractSocket::SocketState); + void socketDisconnected(); + + void startLogin(); + void loginFailed(const QString &error); + void loginSuccess(); + void syncFinished(); + void startCoreSetup(const QVariantList &); + void coreSetupSuccess(); + void coreSetupFailed(const QString &error); + + void encrypted(bool); + +public slots: + void connectToCore(const QVariantMap &); + void loginToCore(const QString &user, const QString &passwd); + void disconnectFromCore(); + +private slots: + void coreSocketError(QAbstractSocket::SocketError); + void coreHasData(); + void coreSocketConnected(); + void coreSocketDisconnected(); + + void clientInitAck(const QVariantMap &msg); + // for sync progress - void networkInitDone(); - void ircUserAdded(IrcUser *); - void ircUserRemoved(QObject *); - void ircUserInitDone(IrcUser *); - void ircChannelAdded(IrcChannel *); - void ircChannelRemoved(QObject *); - void ircChannelInitDone(IrcChannel *); - void checkSyncState(); - - void syncToCore(const QVariantMap &sessionState); - void sessionStateReceived(const QVariantMap &state); - - void doCoreSetup(const QVariant &setupData); + void networkInitDone(); + void checkSyncState(); + + void syncToCore(const QVariantMap &sessionState); + void sessionStateReceived(const QVariantMap &state); + + void doCoreSetup(const QVariant &setupData); #ifndef QT_NO_OPENSSL void sslErrors(const QList &errors); #endif - private: - QPointer socket; - quint32 blockSize; - QVariantMap coreConnectionInfo; - - QSet netsToSync, channelsToSync, usersToSync; - int numNetsToSync, numChannelsToSync, numUsersToSync; - +private: + QPointer socket; + quint32 blockSize; + QVariantMap coreConnectionInfo; + + QSet netsToSync; + int numNetsToSync; }; #endif diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp index 7490cb41..d7d52de2 100644 --- a/src/qtui/coreconnectdlg.cpp +++ b/src/qtui/coreconnectdlg.cpp @@ -76,8 +76,6 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) connect(clientSyncer, SIGNAL(startCoreSetup(const QVariantList &)), this, SLOT(startCoreConfig(const QVariantList &))); connect(clientSyncer, SIGNAL(sessionProgress(quint32, quint32)), this, SLOT(coreSessionProgress(quint32, quint32))); connect(clientSyncer, SIGNAL(networksProgress(quint32, quint32)), this, SLOT(coreNetworksProgress(quint32, quint32))); - connect(clientSyncer, SIGNAL(channelsProgress(quint32, quint32)), this, SLOT(coreChannelsProgress(quint32, quint32))); - connect(clientSyncer, SIGNAL(ircUsersProgress(quint32, quint32)), this, SLOT(coreIrcUsersProgress(quint32, quint32))); connect(clientSyncer, SIGNAL(syncFinished()), this, SLOT(syncFinished())); connect(ui.user, SIGNAL(textChanged(const QString &)), this, SLOT(setLoginWidgetStates())); @@ -396,10 +394,6 @@ void CoreConnectDlg::startSync() { ui.sessionProgress->setValue(0); ui.networksProgress->setRange(0, 1); ui.networksProgress->setValue(0); - ui.channelsProgress->setRange(0, 1); - ui.channelsProgress->setValue(0); - ui.ircUsersProgress->setRange(0, 1); - ui.ircUsersProgress->setValue(0); ui.stackedWidget->setCurrentWidget(ui.syncPage); // clean up old page @@ -428,31 +422,6 @@ void CoreConnectDlg::coreNetworksProgress(quint32 val, quint32 max) { } } -void CoreConnectDlg::coreChannelsProgress(quint32 val, quint32 max) { - if(max == 0) { - ui.channelsProgress->setFormat("0/0"); - ui.channelsProgress->setRange(0, 1); - ui.channelsProgress->setValue(1); - } else { - ui.channelsProgress->setFormat("%v/%m"); - ui.channelsProgress->setRange(0, max); - ui.channelsProgress->setValue(val); - } -} - -void CoreConnectDlg::coreIrcUsersProgress(quint32 val, quint32 max) { - if(max == 0) { - ui.ircUsersProgress->setFormat("0/0"); - ui.ircUsersProgress->setRange(0, 1); - ui.ircUsersProgress->setValue(1); - } else { - if(val % 100) return; - ui.ircUsersProgress->setFormat("%v/%m"); - ui.ircUsersProgress->setRange(0, max); - ui.ircUsersProgress->setValue(val); - } -} - void CoreConnectDlg::syncFinished() { if(!wizard) accept(); else { diff --git a/src/qtui/coreconnectdlg.h b/src/qtui/coreconnectdlg.h index 08772472..3cd72947 100644 --- a/src/qtui/coreconnectdlg.h +++ b/src/qtui/coreconnectdlg.h @@ -81,8 +81,6 @@ class CoreConnectDlg : public QDialog { void coreSessionProgress(quint32, quint32); void coreNetworksProgress(quint32, quint32); - void coreChannelsProgress(quint32, quint32); - void coreIrcUsersProgress(quint32, quint32); private: Ui::CoreConnectDlg ui; diff --git a/src/qtui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui index 10b28abb..9b628843 100644 --- a/src/qtui/ui/coreconnectdlg.ui +++ b/src/qtui/ui/coreconnectdlg.ui @@ -5,8 +5,8 @@ 0 0 - 519 - 325 + 563 + 356 @@ -32,15 +32,15 @@ - 0 + 2 0 0 - 511 - 317 + 539 + 331 @@ -138,8 +138,8 @@ 0 0 - 511 - 317 + 539 + 332 @@ -249,8 +249,8 @@ space 0 0 - 485 - 147 + 501 + 145 @@ -458,8 +458,8 @@ space 0 0 - 511 - 317 + 539 + 332 @@ -523,49 +523,6 @@ space - - - - Channel states: - - - - - - - 1 - - - 0 - - - 0/0 - - - - - - - User states: - - - - - - - 0 - - - 1 - - - 0 - - - 0/0 - - - -- 2.20.1