X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtgui%2Fmainwin.cpp;h=fc4f8ed8cbcb34ef118c92e843eb5398a2e4240e;hp=0ef57c18dac415be87fbb4a98e3193254c4769d2;hb=902c95728306e5ba115de84800fc8d5d239c9d62;hpb=73edffb5f0f6ecae4118c36a7ca2c0d479b7f8c6 diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp index 0ef57c18..fc4f8ed8 100644 --- a/src/qtgui/mainwin.cpp +++ b/src/qtgui/mainwin.cpp @@ -18,52 +18,47 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include -#include -#include - -#include "client.h" -#include "util.h" -#include "global.h" -#include "message.h" -#include "clientproxy.h" - #include "mainwin.h" -#include "buffer.h" + +#include "bufferview.h" #include "chatline.h" -#include "serverlist.h" +#include "client.h" #include "coreconnectdlg.h" +#include "serverlist.h" #include "settingsdlg.h" -#include "settingspages.h" +//#include "settingspage.h" +#include "signalproxy.h" -MainWin::MainWin() : QMainWindow() { +#include "topicwidget.h" + +MainWin::MainWin(QtGui *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) { ui.setupUi(this); - //widget = 0; - //qDebug() << "Available DB drivers: " << QSqlDatabase::drivers (); setWindowTitle("Quassel IRC"); - //setWindowTitle("Κυασελ Εγαρζη"); + //setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη")); setWindowIcon(QIcon(":/qirc-icon.png")); setWindowIconText("Quassel IRC"); - //workspace = new QWorkspace(this); - //setCentralWidget(workspace); statusBar()->showMessage(tr("Waiting for core...")); + } void MainWin::init() { + Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant))); ui.bufferWidget->init(); show(); - //syncToCore(); - statusBar()->showMessage(tr("Ready.")); + + //QVariantMap connInfo; + //connInfo["User"] = "Default"; + //connInfo["Password"] = "password"; + //connectToCore(connInfo); + + statusBar()->showMessage(tr("Not connected to core.")); systray = new QSystemTrayIcon(this); systray->setIcon(QIcon(":/qirc-icon.png")); systray->show(); - serverListDlg = new ServerListDlg(this); - serverListDlg->setVisible(serverListDlg->showOnStartup()); - - setupSettingsDlg(); + //setupSettingsDlg(); setupMenus(); setupViews(); @@ -75,21 +70,37 @@ void MainWin::init() { if(s.contains("MainWinState")) restoreState(s.value("MainWinState").toByteArray()); s.endGroup(); - 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)) { - showBuffer(net, buf); - } else { - showBuffer(net, ""); - } - } + //s.beginGroup("Buffers"); + //QString net = s.value("CurrentNetwork", "").toString(); + //QString buf = s.value("CurrentBuffer", "").toString(); + //s.endGroup(); + + disconnectedFromCore(); // Disable menus and stuff + showCoreConnectionDlg(true); // autoconnect if appropriate + //ui.actionConnectCore->activate(QAction::Trigger); + + serverListDlg = new ServerListDlg(this); + if(serverListDlg->showOnStartup()) { + showServerList(); } - */ + + // TESTING +// setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); +// setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); + +// setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); +// setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); + +// QDockWidget *dock = new QDockWidget("Topic Dock", this); +// dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); + +// TopicWidget *topicwidget = new TopicWidget(dock); +// dock->setWidget(topicwidget); + +// addDockWidget(Qt::TopDockWidgetArea, dock); + +// ui.menuViews->addAction(dock->toggleViewAction()); + } MainWin::~MainWin() { @@ -110,59 +121,91 @@ void MainWin::setupSettingsDlg() { */ void MainWin::setupMenus() { + connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg())); + connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore())); connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList())); connect(ui.actionEditIdentities, SIGNAL(triggered()), serverListDlg, SLOT(editIdentities())); connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg())); - //ui.actionSettingsDlg->setEnabled(false); + 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())); + Client::signalProxy()->attachSignal(this, SIGNAL(importOldBacklog())); } void MainWin::setupViews() { - BufferTreeModel *model = Client::bufferModel(); // FIXME Where is the delete for that? :p + BufferTreeModel *model = Client::bufferModel(); 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); + addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QStringList()); + addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QStringList()); + addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QStringList()); + addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QStringList()); + addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QStringList()); - BufferViewDock *allnets = new BufferViewDock(model, tr("All Networks"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries); - registerBufferViewDock(allnets); - - ui.menuViews->addSeparator(); } -void MainWin::registerBufferViewDock(BufferViewDock *dock) { - addDockWidget(Qt::LeftDockWidgetArea, dock); +void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QStringList &nets) { + QDockWidget *dock = new QDockWidget(viewname, this); + dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state! dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); - netViews.append(dock); - ui.menuViews->addAction(dock->toggleViewAction()); + //dock->setContentsMargins(4,4,4,4); + + //create the view and initialize it's filter + BufferView *view = new BufferView(dock); + view->setFilteredModel(model, mode, nets); + dock->setWidget(view); - /* - connect(this, SIGNAL(bufferSelected(Buffer *)), view, SLOT(selectBuffer(Buffer *))); - connect(this, SIGNAL(bufferDestroyed(Buffer *)), view, SLOT(bufferDestroyed(Buffer *))); - connect(view, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *))); - view->setBuffers(buffers.values()); - */ + addDockWidget(Qt::LeftDockWidgetArea, dock); + ui.menuViews->addAction(dock->toggleViewAction()); + + netViews.append(dock); +} + +void MainWin::connectedToCore() { + foreach(BufferInfo id, Client::allBufferInfos()) { + emit requestBacklog(id, 100, -1); + } + + ui.menuViews->setEnabled(true); + ui.menuCore->setEnabled(true); + ui.actionConnectCore->setEnabled(false); + ui.actionDisconnectCore->setEnabled(true); + ui.actionNetworkList->setEnabled(true); + ui.bufferWidget->show(); +} + +void MainWin::disconnectedFromCore() { + ui.menuViews->setEnabled(false); + ui.menuCore->setEnabled(false); + ui.actionDisconnectCore->setEnabled(false); + ui.actionNetworkList->setEnabled(false); + ui.bufferWidget->hide(); + ui.actionConnectCore->setEnabled(true); + //qDebug() << "mainwin disconnected"; } AbstractUiMsg *MainWin::layoutMsg(const Message &msg) { return new ChatLine(msg); } +void MainWin::showCoreConnectionDlg(bool autoConnect) { + coreConnectDlg = new CoreConnectDlg(this, autoConnect); + connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int))); + coreConnectDlg->setModal(true); + if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect()) + coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar + if(autoConnect) coreConnectDlg->doAutoConnect(); +} + +void MainWin::coreConnectionDlgFinished(int /*code*/) { + + coreConnectDlg->close(); +} + + void MainWin::showServerList() { // if(!serverListDlg) { // serverListDlg = new ServerListDlg(this); @@ -196,14 +239,15 @@ void MainWin::closeEvent(QCloseEvent *event) //} } -void MainWin::showBuffer(BufferId id) { +void MainWin::showBuffer(BufferInfo id) { showBuffer(Client::buffer(id)); } void MainWin::showBuffer(Buffer *b) { - currentBuffer = b->bufferId().groupId(); + currentBuffer = b->bufferInfo().groupId(); //emit bufferSelected(b); //qApp->processEvents(); + ui.bufferWidget->setBuffer(b); //emit bufferSelected(b); }