X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=2d980dcf45ae1476f7ec9a0dea847a86bf285bc6;hp=0d4453d5993d7d41c02f25464d3bf43f98e98d3e;hb=1cefa3f0c0f3446d493ef534d34126544d211031;hpb=4bfbd8dcbcb398302aaad0b6707c561760d7a7ac diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 0d4453d5..2d980dcf 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -17,181 +17,246 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +//#define SPUTDEV #include "mainwin.h" +#include "chatwidget.h" #include "bufferview.h" #include "chatline-old.h" #include "client.h" #include "coreconnectdlg.h" +#include "networkmodel.h" +#include "buffermodel.h" #include "nicklistwidget.h" -#include "serverlist.h" #include "settingsdlg.h" #include "signalproxy.h" - #include "topicwidget.h" +#include "inputwidget.h" +#include "verticaldock.h" +#include "uisettings.h" #include "selectionmodelsynchronizer.h" #include "mappedselectionmodel.h" #include "settingspages/fontssettingspage.h" +#include "settingspages/identitiessettingspage.h" +#include "settingspages/networkssettingspage.h" + +#include "debugconsole.h" MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) { ui.setupUi(this); setWindowTitle("Quassel IRC"); - //setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη")); - setWindowIcon(QIcon(":/qirc-icon.png")); + setWindowIcon(QIcon(":icons/quassel-icon.png")); setWindowIconText("Quassel IRC"); statusBar()->showMessage(tr("Waiting for core...")); - serverListDlg = new ServerListDlg(this); settingsDlg = new SettingsDlg(this); - + debugConsole = new DebugConsole(this); } void MainWin::init() { + UiSettings s; + resize(s.value("MainWinSize").toSize()); + Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant))); + + connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId))); + connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId))); ui.bufferWidget->init(); show(); - //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(); - //setupSettingsDlg(); - - setupMenus(); - setupViews(); - setupSettingsDlg(); - - // create nick dock - nickDock = new QDockWidget("Nicks", this); - nickDock->setObjectName("NickDock"); - nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - - nickListWidget = new NickListWidget(nickDock); - nickDock->setWidget(nickListWidget); - - addDockWidget(Qt::RightDockWidgetArea, nickDock); - ui.menuViews->addAction(nickDock->toggleViewAction()); - - // restore mainwin state - QSettings s; - s.beginGroup("Geometry"); - //resize(s.value("MainWinSize", QSize(500, 400)).toSize()); - //move(s.value("MainWinPos", QPoint(50, 50)).toPoint()); - 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(); - - disconnectedFromCore(); // Disable menus and stuff - showCoreConnectionDlg(true); // autoconnect if appropriate - //ui.actionConnectCore->activate(QAction::Trigger); - - if(serverListDlg->showOnStartup()) { - showServerList(); - } - + // DOCK OPTIONS setDockNestingEnabled(true); - - - // TESTING + setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); - setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); + // setup stuff... + setupMenus(); + setupViews(); + setupNickWidget(); + setupChatMonitor(); + setupInputWidget(); + setupTopicWidget(); + setupSystray(); - QDockWidget *dock = new QDockWidget("Topic Dock", this); - dock->setObjectName("TopicDock"); - dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); + setupSettingsDlg(); - TopicWidget *topicwidget = new TopicWidget(dock); - dock->setWidget(topicwidget); + // restore mainwin state + restoreState(s.value("MainWinState").toByteArray()); - Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); + disconnectedFromCore(); // Disable menus and stuff + showCoreConnectionDlg(true); // autoconnect if appropriate - addDockWidget(Qt::TopDockWidgetArea, dock); + // attach the BufferWidget to the PropertyMapper + ui.bufferWidget->setModel(Client::bufferModel()); + ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - ui.menuViews->addAction(dock->toggleViewAction()); +#ifdef SPUTDEV + showSettingsDlg(); +#endif - //showSettingsDlg(); } MainWin::~MainWin() { - //typedef QHash 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 */ -/* -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.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList())); connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg())); - //ui.actionSettingsDlg->setEnabled(false); + connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole())); connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt())); + + actionEditNetworks = new QAction(QIcon(":/22x22/actions/configure"), tr("Edit &Networks..."), this); + actionEditNetworks->setEnabled(false); // FIXME + ui.menuNetworks->addAction(actionEditNetworks); } void MainWin::setupViews() { - - BufferTreeModel *model = Client::bufferModel(); - connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *))); - - addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList()); - addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList()); - addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList()); - addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList()); - addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList()); - + BufferModel *model = Client::bufferModel(); + + addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList()); + addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList()); + addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList()); + addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList()); + addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList()); + ui.menuViews->addSeparator(); } -void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList &nets) { +QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList &nets) { QDockWidget *dock = new QDockWidget(viewname, this); dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state! dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); - //dock->setContentsMargins(4,4,4,4); //create the view and initialize it's filter BufferView *view = new BufferView(dock); + view->show(); view->setFilteredModel(model, mode, nets); Client::bufferModel()->synchronizeView(view); dock->setWidget(view); - + dock->show(); + addDockWidget(Qt::LeftDockWidgetArea, dock); ui.menuViews->addAction(dock->toggleViewAction()); netViews.append(dock); + return dock; } void MainWin::setupSettingsDlg() { + settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg)); + settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); + settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg)); +#ifdef SPUTDEV + connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME +#endif +} + +void MainWin::setupNickWidget() { + // create nick dock + nickDock = new QDockWidget(tr("Nicks"), this); + nickDock->setObjectName("NickDock"); + nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + + nickListWidget = new NickListWidget(nickDock); + nickDock->setWidget(nickListWidget); + + addDockWidget(Qt::RightDockWidgetArea, nickDock); + ui.menuViews->addAction(nickDock->toggleViewAction()); + + Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer"); +} + +void MainWin::setupChatMonitor() { + VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this); + dock->setObjectName("ChatMonitorDock"); + + ChatWidget *chatWidget = new ChatWidget(this); + chatWidget->show(); + dock->setWidget(chatWidget); + dock->show(); + + Buffer *buf = Client::monitorBuffer(); + if(!buf) + return; + + chatWidget->init(BufferId(0)); + QList lines; + QList msgs = buf->contents(); + foreach(AbstractUiMsg *msg, msgs) { + lines.append(dynamic_cast(msg)); + } + chatWidget->setContents(lines); + connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *))); + connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *))); + + addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical); + ui.menuViews->addAction(dock->toggleViewAction()); +} + +void MainWin::setupInputWidget() { + VerticalDock *dock = new VerticalDock(tr("Inputline"), this); + dock->setObjectName("InputDock"); + + InputWidget *inputWidget = new InputWidget(dock); + dock->setWidget(inputWidget); + + addDockWidget(Qt::BottomDockWidgetArea, dock); + + ui.menuViews->addAction(dock->toggleViewAction()); + + inputWidget->setModel(Client::bufferModel()); + inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); + + ui.bufferWidget->setFocusProxy(inputWidget); +} + +void MainWin::setupTopicWidget() { + VerticalDock *dock = new VerticalDock(tr("Topic"), this); + dock->setObjectName("TopicDock"); + TopicWidget *topicwidget = new TopicWidget(dock); + dock->setWidget(topicwidget); + + Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); + + addDockWidget(Qt::TopDockWidgetArea, dock); + + ui.menuViews->addAction(dock->toggleViewAction()); +} + +void MainWin::setupSystray() { + systray = new QSystemTrayIcon(this); + systray->setIcon(QIcon(":/icons/quassel-icon.png")); + + QString toolTip("left click to minimize the quassel client to tray"); + systray->setToolTip(toolTip); + + QMenu *systrayMenu = new QMenu(this); + systrayMenu->addAction(ui.actionAboutQuassel); + systrayMenu->addSeparator(); + systrayMenu->addAction(ui.actionConnectCore); + systrayMenu->addAction(ui.actionDisconnectCore); + systrayMenu->addSeparator(); + systrayMenu->addAction(ui.actionQuit); + + systray->setContextMenu(systrayMenu); + + systray->show(); + connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), + this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason ))); } void MainWin::connectedToCore() { @@ -203,7 +268,7 @@ void MainWin::connectedToCore() { ui.menuCore->setEnabled(true); ui.actionConnectCore->setEnabled(false); ui.actionDisconnectCore->setEnabled(true); - ui.actionNetworkList->setEnabled(true); + //ui.actionNetworkList->setEnabled(true); ui.bufferWidget->show(); statusBar()->showMessage(tr("Connected to core.")); } @@ -212,7 +277,7 @@ void MainWin::disconnectedFromCore() { ui.menuViews->setEnabled(false); ui.menuCore->setEnabled(false); ui.actionDisconnectCore->setEnabled(false); - ui.actionNetworkList->setEnabled(false); + //ui.actionNetworkList->setEnabled(false); ui.bufferWidget->hide(); ui.actionConnectCore->setEnabled(true); nickListWidget->reset(); @@ -227,61 +292,103 @@ 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(); + coreConnectDlg->show(); } void MainWin::coreConnectionDlgFinished(int /*code*/) { - coreConnectDlg->close(); -} - - -void MainWin::showServerList() { -// if(!serverListDlg) { -// serverListDlg = new ServerListDlg(this); -// } - serverListDlg->show(); - serverListDlg->raise(); + //exit(1); } void MainWin::showSettingsDlg() { settingsDlg->show(); } +void MainWin::showDebugConsole() { + debugConsole->show(); +} + void MainWin::closeEvent(QCloseEvent *event) { //if (userReallyWantsToQuit()) { - ui.bufferWidget->saveState(); - QSettings s; - s.beginGroup("Geometry"); + UiSettings s; s.setValue("MainWinSize", size()); s.setValue("MainWinPos", pos()); s.setValue("MainWinState", saveState()); - s.endGroup(); - s.beginGroup("Buffers"); - //s.setValue("CurrentNetwork", currentNetwork); - s.setValue("CurrentBuffer", currentBuffer); - s.endGroup(); - delete systray; event->accept(); //} else { //event->ignore(); //} } -void MainWin::showBuffer(BufferInfo id) { - showBuffer(Client::buffer(id)); +void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) { + if (activationReason == QSystemTrayIcon::Trigger) { + if (isHidden()) + show(); + else + hide(); + } +} + +void MainWin::clientNetworkCreated(NetworkId id) { + const Network *net = Client::network(id); + QAction *act = new QAction(net->networkName(), this); + act->setData(QVariant::fromValue(id)); + connect(net, SIGNAL(updatedRemotely()), this, SLOT(clientNetworkUpdated())); + connect(act, SIGNAL(triggered()), this, SLOT(connectOrDisconnectFromNet())); + bool inserted = false; + for(int i = 0; i < networkActions.count(); i++) { + if(net->networkName().localeAwareCompare(networkActions[i]->text()) < 0) { + networkActions.insert(i, act); + inserted = true; + break; + } + } + if(!inserted) networkActions.append(act); + ui.menuNetworks->clear(); // why the f*** isn't there a QMenu::insertAction()??? + foreach(QAction *a, networkActions) ui.menuNetworks->addAction(a); + ui.menuNetworks->addSeparator(); + ui.menuNetworks->addAction(actionEditNetworks); +} + +void MainWin::clientNetworkUpdated() { + const Network *net = qobject_cast(sender()); + if(!net) return; + foreach(QAction *a, networkActions) { + if(a->data().value() == net->networkId()) { + a->setText(net->networkName()); + if(net->connectionState() == Network::Initialized) { + a->setIcon(QIcon(":/16x16/actions/network-connect")); + a->setEnabled(true); + } else if(net->connectionState() == Network::Disconnected) { + a->setIcon(QIcon(":/16x16/actions/network-disconnect")); + a->setEnabled(true); + } else { + a->setIcon(QIcon(":/16x16/actions/gear")); + a->setEnabled(false); + } + return; + } + } +} + +void MainWin::clientNetworkRemoved(NetworkId id) { + QList::iterator actionIter = networkActions.begin();; + QAction *action; + while(actionIter != networkActions.end()) { + action = *actionIter; + if(action->data().value() == id) + actionIter = networkActions.erase(actionIter); + else + actionIter++; + } } -void MainWin::showBuffer(Buffer *b) { - currentBuffer = b->bufferInfo().groupId(); - //emit bufferSelected(b); - //qApp->processEvents(); - ui.bufferWidget->setBuffer(b); - nickListWidget->setBuffer(b); - //if(b->bufferType() == Buffer::ChannelType) nickDock->show(); - //else nickDock->hide(); - //emit bufferSelected(b); +void MainWin::connectOrDisconnectFromNet() { + QAction *act = qobject_cast(sender()); + if(!act) return; + const Network *net = Client::network(act->data().value()); + if(!net) return; + if(net->connectionState() == Network::Disconnected) net->requestConnect(); + else net->requestDisconnect(); }