X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=cdbe71b960d3a62ff77f65ea88e2d68d9f9def4f;hp=d244dc856f4d34514f955a213743ae6e83fa9522;hb=e7696b65e76e50137b8bab0ec3e43ce66a94f190;hpb=cf28e7152c5d940aec586be1b29fbf8ddc99f087 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index d244dc85..cdbe71b9 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,19 +17,24 @@ * 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" @@ -37,6 +42,7 @@ #include "settingspages/fontssettingspage.h" #include "settingspages/identitiessettingspage.h" +#include "settingspages/networkssettingspage.h" #include "debugconsole.h" @@ -54,7 +60,11 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) { } void MainWin::init() { + UiSettings s; + resize(s.value("MainWinSize").toSize()); + Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant))); + Client::signalProxy()->attachSignal(this, SIGNAL(disconnectFromNetwork(NetworkId))); ui.bufferWidget->init(); show(); @@ -65,29 +75,47 @@ void MainWin::init() { //connectToCore(connInfo); statusBar()->showMessage(tr("Not connected to core.")); + 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(); + 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 ))); - //setupSettingsDlg(); + // DOCK OPTIONS + setDockNestingEnabled(true); + + setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); + setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); + setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); + setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); + + // setup the docks etc... setupMenus(); setupViews(); + setupNickWidget(); + setupChatMonitor(); + setupInputWidget(); + setupTopicWidget(); + setupSettingsDlg(); - // 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()); - // restore mainwin state - UiSettings s; restoreState(s.value("MainWinState").toByteArray()); disconnectedFromCore(); // Disable menus and stuff @@ -98,32 +126,14 @@ void MainWin::init() { showServerList(); } - setDockNestingEnabled(true); - - - // new Topic Stuff... should be probably refactored out into a separate method - - setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); - setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); - - setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); - setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); - + // attach the BufferWidget to the PropertyMapper + ui.bufferWidget->setModel(Client::bufferModel()); + ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - QDockWidget *dock = new QDockWidget(tr("Topic Dock"), this); - dock->setObjectName("TopicDock"); - dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); - - TopicWidget *topicwidget = new TopicWidget(dock); - dock->setWidget(topicwidget); - - Client::networkModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); - - addDockWidget(Qt::TopDockWidgetArea, dock); - - ui.menuViews->addAction(dock->toggleViewAction()); - - //showSettingsDlg(); + +#ifdef SPUTDEV + showSettingsDlg(); +#endif } @@ -151,46 +161,123 @@ void MainWin::setupMenus() { connect(ui.actionEditIdentities, SIGNAL(triggered()), serverListDlg, SLOT(editIdentities())); connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg())); connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole())); - //ui.actionSettingsDlg->setEnabled(false); + connect(ui.actionDisconnectNet, SIGNAL(triggered()), this, SLOT(disconnectFromNet())); connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt())); + } void MainWin::setupViews() { - - NetworkModel *model = Client::networkModel(); - 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::networkModel()->synchronizeView(view); + 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)); +#ifdef SPUTDEV + settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg)); + 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::connectedToCore() { @@ -226,14 +313,14 @@ 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()) + //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(); + //if(autoConnect) coreConnectDlg->doAutoConnect(); } void MainWin::coreConnectionDlgFinished(int /*code*/) { - coreConnectDlg->close(); + //exit(1); } @@ -256,29 +343,27 @@ void MainWin::showDebugConsole() { void MainWin::closeEvent(QCloseEvent *event) { //if (userReallyWantsToQuit()) { - ui.bufferWidget->saveState(); UiSettings s; s.setValue("MainWinSize", size()); s.setValue("MainWinPos", pos()); s.setValue("MainWinState", saveState()); - 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::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::disconnectFromNet() { + int i = QInputDialog::getInteger(this, tr("Disconnect from Network"), tr("Enter network id:")); + emit disconnectFromNetwork(NetworkId(i)); } +