#include "client.h"
#include "abstractmessageprocessor.h"
+#include "abstractui.h"
#include "bufferinfo.h"
#include "buffermodel.h"
#include "buffersettings.h"
#include "buffersyncer.h"
#include "bufferviewconfig.h"
-#include "bufferviewmanager.h"
#include "clientbacklogmanager.h"
+#include "clientbufferviewmanager.h"
#include "clientirclisthelper.h"
#include "clientidentity.h"
+#include "clientuserinputhandler.h"
#include "ircchannel.h"
#include "ircuser.h"
#include "message.h"
#include "network.h"
#include "networkmodel.h"
#include "quassel.h"
-#include "quasselui.h"
#include "signalproxy.h"
#include "util.h"
_backlogManager(new ClientBacklogManager(this)),
_bufferViewManager(0),
_ircListHelper(new ClientIrcListHelper(this)),
+ _inputHandler(new ClientUserInputHandler(this)),
_messageModel(0),
_messageProcessor(0),
_connectedToCore(false),
p->attachSlot(SIGNAL(displayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), _networkModel, SLOT(bufferUpdated(BufferInfo)));
- p->attachSignal(this, SIGNAL(sendInput(BufferInfo, QString)));
+ p->attachSignal(inputHandler(), SIGNAL(sendInput(BufferInfo, QString)));
p->attachSignal(this, SIGNAL(requestNetworkStates()));
p->attachSignal(this, SIGNAL(requestCreateIdentity(const Identity &, const QVariantMap &)), SIGNAL(createIdentity(const Identity &, const QVariantMap &)));
}
/*** ***/
-void Client::userInput(BufferInfo bufferInfo, QString message) {
- emit instance()->sendInput(bufferInfo, message);
+void Client::userInput(const BufferInfo &bufferInfo, const QString &message) {
+ inputHandler()->handleUserInput(bufferInfo, message);
}
/*** core connection stuff ***/
// create a new BufferViewManager
Q_ASSERT(!_bufferViewManager);
- _bufferViewManager = new BufferViewManager(signalProxy(), this);
+ _bufferViewManager = new ClientBufferViewManager(signalProxy(), this);
connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(createDefaultBufferView()));
- createDefaultIdentity();
- createDefaultNetworks();
-
_syncedToCore = true;
emit connected();
emit coreConnectionStateChanged(true);
}
}
-void Client::createDefaultIdentity() {
- if(_identities.isEmpty()) {
- Identity identity;
- identity.setToDefaults();
- identity.setIdentityName(tr("Default Identity"));
- createIdentity(identity);
- }
-}
-
-void Client::createDefaultNetworks() {
- if(_networks.isEmpty()) {
- QStringList defaultNets = Network::presetNetworks(true);
- foreach(QString net, defaultNets) {
- NetworkInfo info = Network::networkInfoFromPreset(net);
- if(info.networkName.isEmpty())
- continue;
- QStringList defaultChans = Network::presetDefaultChannels(net);
- createNetwork(info, defaultChans);
- }
- }
-}
-
-void Client::setSecuredConnection() {
- emit securedConnection();
-}
-
void Client::disconnectFromCore() {
if(!isConnected())
return;
bufferSyncer()->requestMergeBuffersPermanently(bufferId1, bufferId2);
}
+void Client::purgeKnownBufferIds() {
+ if(!bufferSyncer())
+ return;
+ bufferSyncer()->requestPurgeBufferIds();
+}
+
void Client::bufferRemoved(BufferId bufferId) {
// select a sane buffer (status buffer)
/* we have to manually select a buffer because otherwise inconsitent changes