#include <QtCore>
#include <QSqlDatabase>
+#include "gui.h"
#include "util.h"
#include "global.h"
#include "message.h"
#include "mainwin.h"
#include "buffer.h"
-#include "networkview.h"
+#include "bufferviewwidget.h"
#include "serverlist.h"
#include "coreconnectdlg.h"
#include "settingsdlg.h"
MainWin::MainWin() : QMainWindow() {
ui.setupUi(this);
//widget = 0;
- qDebug() << "Available DB drivers: " << QSqlDatabase::drivers ();
+ //qDebug() << "Available DB drivers: " << QSqlDatabase::drivers ();
setWindowTitle("Quassel IRC");
+ //setWindowTitle("Κυασελ Εγαρζη");
setWindowIcon(QIcon(":/qirc-icon.png"));
setWindowIconText("Quassel IRC");
}
void MainWin::init() {
-
+/*
connect(guiProxy, SIGNAL(csServerState(QString, QVariant)), this, SLOT(recvNetworkState(QString, QVariant)));
connect(guiProxy, SIGNAL(csServerConnected(QString)), this, SLOT(networkConnected(QString)));
connect(guiProxy, SIGNAL(csServerDisconnected(QString)), this, SLOT(networkDisconnected(QString)));
- connect(guiProxy, SIGNAL(csDisplayMsg(QString, Message)), this, SLOT(recvMessage(QString, Message)));
+ connect(guiProxy, SIGNAL(csDisplayMsg(Message)), this, SLOT(recvMessage(Message)));
connect(guiProxy, SIGNAL(csDisplayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
connect(guiProxy, SIGNAL(csTopicSet(QString, QString, QString)), this, SLOT(setTopic(QString, QString, QString)));
- connect(guiProxy, SIGNAL(csSetNicks(QString, QString, QStringList)), this, SLOT(setNicks(QString, QString, QStringList)));
connect(guiProxy, SIGNAL(csNickAdded(QString, QString, VarMap)), this, SLOT(addNick(QString, QString, VarMap)));
connect(guiProxy, SIGNAL(csNickRemoved(QString, QString)), this, SLOT(removeNick(QString, QString)));
connect(guiProxy, SIGNAL(csNickRenamed(QString, QString, QString)), this, SLOT(renameNick(QString, QString, QString)));
connect(guiProxy, SIGNAL(csNickUpdated(QString, QString, VarMap)), this, SLOT(updateNick(QString, QString, VarMap)));
connect(guiProxy, SIGNAL(csOwnNickSet(QString, QString)), this, SLOT(setOwnNick(QString, QString)));
- connect(this, SIGNAL(sendInput( QString, QString, QString )), guiProxy, SLOT(gsUserInput(QString, QString, QString)));
-
- layoutThread = new LayoutThread();
- layoutThread->start();
- while(!layoutThread->isRunning()) {};
+ connect(guiProxy, SIGNAL(csBacklogData(BufferId, QList<QVariant>, bool)), this, SLOT(recvBacklogData(BufferId, QList<QVariant>, bool)));
+ connect(guiProxy, SIGNAL(csUpdateBufferId(BufferId)), this, SLOT(updateBufferId(BufferId)));
+ connect(this, SIGNAL(sendInput(BufferId, QString)), guiProxy, SLOT(gsUserInput(BufferId, QString)));
+ connect(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), guiProxy, SLOT(gsRequestBacklog(BufferId, QVariant, QVariant)));
+
+ //layoutThread = new LayoutThread();
+ //layoutThread->start();
+ //while(!layoutThread->isRunning()) {};
+*/
ui.bufferWidget->init();
show();
- syncToCore();
+ //syncToCore();
statusBar()->showMessage(tr("Ready."));
systray = new QSystemTrayIcon(this);
systray->setIcon(QIcon(":/qirc-icon.png"));
setupSettingsDlg();
- //Buffer::init();
setupMenus();
setupViews();
- //bufferWidget = 0;
-
QSettings s;
s.beginGroup("Geometry");
//resize(s.value("MainWinSize", QSize(500, 400)).toSize());
if(s.contains("MainWinState")) restoreState(s.value("MainWinState").toByteArray());
s.endGroup();
- // replay backlog
- // FIXME do this right
- QHash<Buffer *, QList<Message> > hash;
- Buffer *b;
-
- foreach(QString net, coreBackLog.keys()) {
- //if(net != "MoepNet") continue;
- while(coreBackLog[net].count()) {
- //recvMessage(net, coreBackLog[net].takeFirst());
- Message msg = coreBackLog[net].takeLast();
- if(msg.flags & Message::PrivMsg) {
- // query
- if(msg.flags & Message::Self) b = getBuffer(net, msg.target);
- else b = getBuffer(net, nickFromMask(msg.sender));
- } else {
- b = getBuffer(net, msg.target);
- }
- hash[b].prepend(msg);
- if(hash[b].count() >= 5) {
- ui.bufferWidget->prependMessages(b, hash.take(b));
- }
- }
- }
- foreach(Buffer *buf, hash.keys()) {
- ui.bufferWidget->prependMessages(buf, hash.take(buf));
- }
-
-/*
- foreach(QString key, buffers.keys()) {
- foreach(Buffer *b, buffers[key].values()) {
- QWidget *widget = b->showWidget(this);
- workspace->addWindow(widget);
- widget->show();
- }
- }
-*/
-
s.beginGroup("Buffers");
QString net = s.value("CurrentNetwork", "").toString();
QString buf = s.value("CurrentBuffer", "").toString();
s.endGroup();
+ /*
if(!net.isEmpty()) {
if(buffers.contains(net)) {
if(buffers[net].contains(buf)) {
}
}
}
+ */
}
MainWin::~MainWin() {
- typedef QHash<QString, Buffer*> BufHash;
- foreach(BufHash h, buffers.values()) {
- foreach(Buffer *b, h.values()) {
- delete b;
- }
- }
+ //typedef QHash<QString, Buffer*> BufHash;
+ //foreach(BufHash h, buffers.values()) {
+ // foreach(Buffer *b, h.values()) {
+ // delete b;
+ // }
+ //}
+ //foreach(Buffer *buf, buffers.values()) delete buf;
}
/* This is implemented in settingspages.cpp */
connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
//ui.actionSettingsDlg->setEnabled(false);
connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt()));
+ // for debugging
+ connect(ui.actionImportBacklog, SIGNAL(triggered()), this, SLOT(importBacklog()));
+ connect(this, SIGNAL(importOldBacklog()), ClientProxy::instance(), SLOT(gsImportBacklog()));
}
void MainWin::setupViews() {
- NetworkView *all = new NetworkView(tr("All Buffers"), NetworkView::AllNets);
- registerNetView(all);
- addDockWidget(Qt::LeftDockWidgetArea, all);
- NetworkView *allchans = new NetworkView(tr("All Channels"), NetworkView::AllNets|NetworkView::NoQueries|NetworkView::NoServers);
- registerNetView(allchans);
- addDockWidget(Qt::LeftDockWidgetArea, allchans);
- NetworkView *allqrys = new NetworkView(tr("All Queries"), NetworkView::AllNets|NetworkView::NoChannels|NetworkView::NoServers);
- registerNetView(allqrys);
- addDockWidget(Qt::RightDockWidgetArea, allqrys);
- NetworkView *allnets = new NetworkView(tr("All Networks"), NetworkView::AllNets|NetworkView::NoChannels|NetworkView::NoQueries);
- registerNetView(allnets);
- addDockWidget(Qt::RightDockWidgetArea, allnets);
+ BufferTreeModel *model = Client::bufferModel(); // FIXME Where is the delete for that? :p
+ connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
+ //connect(this, SIGNAL(bufferSelected(Buffer *)), model, SLOT(selectBuffer(Buffer *)));
+ //connect(this, SIGNAL(bufferUpdated(Buffer *)), model, SLOT(bufferUpdated(Buffer *)));
+ //connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)), model, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+
+ BufferViewDock *all = new BufferViewDock(model, tr("All Buffers"), BufferViewFilter::AllNets);
+ registerBufferViewDock(all);
+
+ BufferViewDock *allchans = new BufferViewDock(model, tr("All Channels"), BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers);
+ registerBufferViewDock(allchans);
+
+ BufferViewDock *allqrys = new BufferViewDock(model, tr("All Queries"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers);
+ registerBufferViewDock(allqrys);
+
+
+ BufferViewDock *allnets = new BufferViewDock(model, tr("All Networks"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries);
+ registerBufferViewDock(allnets);
+
ui.menuViews->addSeparator();
}
-void MainWin::registerNetView(NetworkView *view) {
+void MainWin::registerBufferViewDock(BufferViewDock *dock) {
+ addDockWidget(Qt::LeftDockWidgetArea, dock);
+ dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
+ netViews.append(dock);
+ ui.menuViews->addAction(dock->toggleViewAction());
+
+ /*
connect(this, SIGNAL(bufferSelected(Buffer *)), view, SLOT(selectBuffer(Buffer *)));
- connect(this, SIGNAL(bufferUpdated(Buffer *)), view, SLOT(bufferUpdated(Buffer *)));
connect(this, SIGNAL(bufferDestroyed(Buffer *)), view, SLOT(bufferDestroyed(Buffer *)));
connect(view, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
- QList<Buffer *> bufs;
- typedef QHash<QString, Buffer *> bufhash;
- QList<bufhash> foo = buffers.values();
- foreach(bufhash h, foo) {
- bufs += h.values();
- }
- view->setBuffers(bufs);
- view->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
- netViews.append(view);
- ui.menuViews->addAction(view->toggleViewAction());
+ view->setBuffers(buffers.values());
+ */
}
void MainWin::showServerList() {
// serverListDlg = new ServerListDlg(this);
// }
serverListDlg->show();
+ serverListDlg->raise();
}
void MainWin::showSettingsDlg() {
s.setValue("MainWinState", saveState());
s.endGroup();
s.beginGroup("Buffers");
- s.setValue("CurrentNetwork", currentNetwork);
+ //s.setValue("CurrentNetwork", currentNetwork);
s.setValue("CurrentBuffer", currentBuffer);
s.endGroup();
delete systray;
//}
}
-void MainWin::showBuffer(QString net, QString buf) {
- showBuffer(getBuffer(net, buf));
+void MainWin::showBuffer(BufferId id) {
+ showBuffer(Client::buffer(id));
}
void MainWin::showBuffer(Buffer *b) {
- currentBuffer = b->bufferName(); currentNetwork = b->networkName();
+ currentBuffer = b->bufferId().groupId();
//emit bufferSelected(b);
//qApp->processEvents();
ui.bufferWidget->setBuffer(b);
- emit bufferSelected(b);
-}
-
-void MainWin::networkConnected(QString net) {
- connected[net] = true;
- Buffer *b = getBuffer(net, "");
- b->setActive(true);
- b->displayMsg(Message::server("", tr("Connected.")));
- // TODO buffersUpdated();
-}
-
-void MainWin::networkDisconnected(QString net) {
- //getBuffer(net, "")->setActive(false);
- foreach(QString buf, buffers[net].keys()) {
- Buffer *b = getBuffer(net, buf);
- b->displayMsg(Message::server(buf, tr("Server disconnected.")));
- b->setActive(false);
-
- }
- connected[net] = false;
+ //emit bufferSelected(b); // FIXME do we need this?
}
-Buffer * MainWin::getBuffer(QString net, QString buf) {
- if(!buffers[net].contains(buf)) {
- Buffer *b = new Buffer(net, buf);
- b->setOwnNick(ownNick[net]);
- connect(b, SIGNAL(userInput(QString, QString, QString)), this, SLOT(userInput(QString, QString, QString)));
- connect(b, SIGNAL(bufferUpdated(Buffer *)), this, SIGNAL(bufferUpdated(Buffer *)));
- connect(b, SIGNAL(bufferDestroyed(Buffer *)), this, SIGNAL(bufferDestroyed(Buffer *)));
- buffers[net][buf] = b;
- emit bufferUpdated(b);
+void MainWin::importBacklog() {
+ if(QMessageBox::warning(this, "Import old backlog?", "Do you want to import your old file-based backlog into new the backlog database?<br>"
+ "<b>This will permanently delete the contents of your database!</b>",
+ QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes) {
+ emit importOldBacklog();
}
- return buffers[net][buf];
}
-
-void MainWin::recvNetworkState(QString net, QVariant state) {
- connected[net] = true;
- setOwnNick(net, state.toMap()["OwnNick"].toString());
- getBuffer(net, "")->setActive(true);
- VarMap t = state.toMap()["Topics"].toMap();
- VarMap n = state.toMap()["Nicks"].toMap();
- foreach(QString buf, t.keys()) {
- getBuffer(net, buf)->setActive(true);
- setTopic(net, buf, t[buf].toString());
- }
- foreach(QString nick, n.keys()) {
- addNick(net, nick, n[nick].toMap());
- }
-}
-
-void MainWin::recvMessage(QString net, Message msg) {
- Buffer *b;
- if(msg.flags & Message::PrivMsg) {
- // query
- if(msg.flags & Message::Self) b = getBuffer(net, msg.target);
- else b = getBuffer(net, nickFromMask(msg.sender));
- } else {
- b = getBuffer(net, msg.target);
- }
- b->displayMsg(msg);
-}
-
-void MainWin::recvStatusMsg(QString net, QString msg) {
- recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
-
-}
-
-void MainWin::userInput(QString net, QString buf, QString msg) {
- emit sendInput(net, buf, msg);
-}
-
-void MainWin::setTopic(QString net, QString buf, QString topic) {
- if(!connected[net]) return;
- Buffer *b = getBuffer(net, buf);
- b->setTopic(topic);
- //if(!b->isActive()) {
- // b->setActive(true);
- // buffersUpdated();
- //}
-}
-
-void MainWin::setNicks(QString net, QString buf, QStringList nicks) {
- Q_ASSERT(false);
-}
-
-void MainWin::addNick(QString net, QString nick, VarMap props) {
- if(!connected[net]) return;
- nicks[net][nick] = props;
- VarMap chans = props["Channels"].toMap();
- QStringList c = chans.keys();
- foreach(QString bufname, c) {
- getBuffer(net, bufname)->addNick(nick, props);
- }
-}
-
-void MainWin::renameNick(QString net, QString oldnick, QString newnick) {
- if(!connected[net]) return;
- QStringList chans = nicks[net][oldnick]["Channels"].toMap().keys();
- foreach(QString c, chans) {
- getBuffer(net, c)->renameNick(oldnick, newnick);
- }
- nicks[net][newnick] = nicks[net].take(oldnick);
-}
-
-void MainWin::updateNick(QString net, QString nick, VarMap props) {
- if(!connected[net]) return;
- QStringList oldchans = nicks[net][nick]["Channels"].toMap().keys();
- QStringList newchans = props["Channels"].toMap().keys();
- foreach(QString c, newchans) {
- if(oldchans.contains(c)) getBuffer(net, c)->updateNick(nick, props);
- else getBuffer(net, c)->addNick(nick, props);
- }
- foreach(QString c, oldchans) {
- if(!newchans.contains(c)) getBuffer(net, c)->removeNick(nick);
- }
- nicks[net][nick] = props;
-}
-
-void MainWin::removeNick(QString net, QString nick) {
- if(!connected[net]) return;
- VarMap chans = nicks[net][nick]["Channels"].toMap();
- foreach(QString bufname, chans.keys()) {
- getBuffer(net, bufname)->removeNick(nick);
- }
- nicks[net].remove(nick);
-}
-
-void MainWin::setOwnNick(QString net, QString nick) {
- if(!connected[net]) return;
- ownNick[net] = nick;
- foreach(Buffer *b, buffers[net].values()) {
- b->setOwnNick(nick);
- }
-}
-
projects / quassel.git / blobdiff