projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly translate messages
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
c25f193
..
b1c0ced
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-33,6
+33,7
@@
#include "clientbufferviewmanager.h"
#include "clientirclisthelper.h"
#include "clientidentity.h"
#include "clientbufferviewmanager.h"
#include "clientirclisthelper.h"
#include "clientidentity.h"
+#include "clientignorelistmanager.h"
#include "clientuserinputhandler.h"
#include "ircchannel.h"
#include "ircuser.h"
#include "clientuserinputhandler.h"
#include "ircchannel.h"
#include "ircuser.h"
@@
-91,6
+92,7
@@
Client::Client(QObject *parent)
_ircListHelper(new ClientIrcListHelper(this)),
_inputHandler(0),
_networkConfig(0),
_ircListHelper(new ClientIrcListHelper(this)),
_inputHandler(0),
_networkConfig(0),
+ _ignoreListManager(0),
_messageModel(0),
_messageProcessor(0),
_connectedToCore(false),
_messageModel(0),
_messageProcessor(0),
_connectedToCore(false),
@@
-336,6
+338,11
@@
void Client::setSyncedToCore() {
_networkConfig = new NetworkConfig("GlobalNetworkConfig", this);
signalProxy()->synchronize(networkConfig());
_networkConfig = new NetworkConfig("GlobalNetworkConfig", this);
signalProxy()->synchronize(networkConfig());
+ // create IgnoreListManager
+ Q_ASSERT(!_ignoreListManager);
+ _ignoreListManager = new ClientIgnoreListManager(this);
+ signalProxy()->synchronize(ignoreListManager());
+
// trigger backlog request once all active bufferviews are initialized
connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
// trigger backlog request once all active bufferviews are initialized
connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
@@
-359,7
+366,7
@@
void Client::requestInitialBacklog() {
void Client::createDefaultBufferView() {
if(bufferViewManager()->bufferViewConfigs().isEmpty()) {
BufferViewConfig config(-1);
void Client::createDefaultBufferView() {
if(bufferViewManager()->bufferViewConfigs().isEmpty()) {
BufferViewConfig config(-1);
- config.setBufferViewName(tr("All
Buffer
s"));
+ config.setBufferViewName(tr("All
Chat
s"));
config.initSetBufferList(networkModel()->allBufferIdsSorted());
bufferViewManager()->requestCreateBufferView(config.toVariantMap());
}
config.initSetBufferList(networkModel()->allBufferIdsSorted());
bufferViewManager()->requestCreateBufferView(config.toVariantMap());
}
@@
-399,6
+406,10
@@
void Client::disconnectedFromCore() {
_aliasManager = 0;
}
_aliasManager = 0;
}
+ if(_ignoreListManager) {
+ _ignoreListManager->deleteLater();
+ _ignoreListManager = 0;
+ }
// we probably don't want to save pending input for reconnect
_userInputBuffer.clear();
// we probably don't want to save pending input for reconnect
_userInputBuffer.clear();
@@
-532,4
+543,3
@@
void Client::logMessage(QtMsgType type, const char *msg) {
emit instance()->logUpdated(msgString);
}
}
emit instance()->logUpdated(msgString);
}
}
-