X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=e9bb5512acf9c49ef6916a7842e5f56380069ebc;hp=38b07a22efc4ebda819c699b77bd7ad4ea8071a4;hb=c6764cb86a24e7f8bb43580fa00dc843d6e15b35;hpb=d28b9ec38b6ea0bc473200fc2f1e65abd1b56bd6 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 38b07a22..e9bb5512 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -21,6 +21,7 @@ #include "mainwin.h" +#include "chatwidget.h" #include "bufferview.h" #include "chatline-old.h" #include "client.h" @@ -28,11 +29,14 @@ #include "networkmodel.h" #include "buffermodel.h" #include "nicklistwidget.h" -#include "serverlist.h" #include "settingsdlg.h" +#include "settingspagedlg.h" #include "signalproxy.h" #include "topicwidget.h" +#include "inputwidget.h" +#include "verticaldock.h" #include "uisettings.h" +#include "qtuisettings.h" #include "selectionmodelsynchronizer.h" #include "mappedselectionmodel.h" @@ -40,102 +44,65 @@ #include "settingspages/fontssettingspage.h" #include "settingspages/identitiessettingspage.h" #include "settingspages/networkssettingspage.h" +#include "settingspages/generalsettingspage.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(":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() { + QtUiSettings s; + resize(s.value("MainWinSize").toSize()); + Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant))); - ui.bufferWidget->init(); + 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(":/icons/quassel-icon.png")); - systray->show(); - //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 stuff... setupMenus(); setupViews(); - setupSettingsDlg(); - - // create nick dock - nickDock = new QDockWidget(tr("Nicks"), this); - nickDock->setObjectName("NickDock"); - nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + setupNickWidget(); + setupChatMonitor(); + setupInputWidget(); + setupTopicWidget(); + setupSystray(); - nickListWidget = new NickListWidget(nickDock); - nickDock->setWidget(nickListWidget); - - addDockWidget(Qt::RightDockWidgetArea, nickDock); - ui.menuViews->addAction(nickDock->toggleViewAction()); + + setupSettingsDlg(); // restore mainwin state - UiSettings s; restoreState(s.value("MainWinState").toByteArray()); disconnectedFromCore(); // Disable menus and stuff showCoreConnectionDlg(true); // autoconnect if appropriate - //ui.actionConnectCore->activate(QAction::Trigger); - - if(serverListDlg->showOnStartup()) { - 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); - - - 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::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); - - addDockWidget(Qt::TopDockWidgetArea, dock); - - ui.menuViews->addAction(dock->toggleViewAction()); - // attach the BufferWidget to the PropertyMapper - Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer"); - connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)), - ui.bufferWidget, SLOT(removeBuffer(BufferId))); + ui.bufferWidget->setModel(Client::bufferModel()); + ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - // attach the NickList to the PropertyMapper - Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer"); - - #ifdef SPUTDEV showSettingsDlg(); #endif @@ -143,45 +110,39 @@ void MainWin::init() { } 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() { - + QtUiSettings s; + s.setValue("MainWinSize", size()); + s.setValue("MainWinPos", pos()); + s.setValue("MainWinState", saveState()); } -*/ 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.actionQuit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit())); + //connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList())); connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg())); 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); + ui.menuNetworks->addAction(actionEditNetworks); + connect(actionEditNetworks, SIGNAL(triggered()), this, SLOT(showNetworkDlg())); } void MainWin::setupViews() { 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()); + 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); @@ -198,12 +159,131 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, 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)); + settingsDlg->registerSettingsPage(new GeneralSettingsPage(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); + + 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); + + QtUiSettings s; + if(s.value("UseSystemTrayIcon").toBool()) { + systray->show(); + } + + #ifndef Q_WS_MAC + connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), + this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason ))); + #endif + +} + +void MainWin::changeEvent(QEvent *event) { + if(event->type() == QEvent::WindowStateChange) { + if(windowState() & Qt::WindowMinimized) { + QtUiSettings s; + if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) { + toggleVisibility(); + } + } + } } void MainWin::connectedToCore() { @@ -215,7 +295,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.")); } @@ -224,7 +304,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(); @@ -239,9 +319,7 @@ 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*/) { @@ -249,15 +327,6 @@ void MainWin::coreConnectionDlgFinished(int /*code*/) { //exit(1); } - -void MainWin::showServerList() { -// if(!serverListDlg) { -// serverListDlg = new ServerListDlg(this); -// } - serverListDlg->show(); - serverListDlg->raise(); -} - void MainWin::showSettingsDlg() { settingsDlg->show(); } @@ -266,18 +335,162 @@ void MainWin::showDebugConsole() { debugConsole->show(); } -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; +void MainWin::closeEvent(QCloseEvent *event) { + QtUiSettings s; + if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) { + toggleVisibility(); + event->ignore(); + } else { event->accept(); - //} else { - //event->ignore(); - //} + } } +void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) { + if (activationReason == QSystemTrayIcon::Trigger) { + toggleVisibility(); + } +} + +void MainWin::toggleVisibility() { + if(isHidden()) { + show(); + if(isMinimized()) { + if(isMaximized()) { + showMaximized(); + } else { + showNormal(); + } + } + raise(); + activateWindow(); + } else { + hide(); + } +} + +void MainWin::showNetworkDlg() { + SettingsPageDlg dlg(new NetworksSettingsPage(this), this); + dlg.exec(); +} + +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) { + action->deleteLater(); + actionIter = networkActions.erase(actionIter); + } else + actionIter++; + } +} + +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(); +} + +void MainWin::keyPressEvent(QKeyEvent *event) { +#ifdef Q_WS_MAC + int bindModifier = Qt::ControlModifier | Qt::AltModifier; + int jumpModifier = Qt::ControlModifier; +#else + int bindModifier = Qt::ControlModifier; + int jumpModifier = Qt::AltModifier; +#endif + + if(event->modifiers() == bindModifier) { + event->accept(); + return bindKey(event->key()); + } + + if(event->modifiers() == jumpModifier) { + event->accept(); + return jumpKey(event->key()); + } + + event->ignore(); +} + +void MainWin::bindKey(int key) { + if(key < Qt::Key_0 || Qt::Key_9 < key) + return; + + QModelIndex bufferIdx = Client::bufferModel()->standardSelectionModel()->currentIndex(); + NetworkId netId = bufferIdx.data(NetworkModel::NetworkIdRole).value(); + const Network *net = Client::network(netId); + if(!net) + return; + + QString bufferName = bufferIdx.sibling(bufferIdx.row(), 0).data().toString(); + BufferId bufferId = bufferIdx.data(NetworkModel::BufferIdRole).value(); + + _keyboardJump[key] = bufferId; + CoreAccountSettings().setJumpKeyMap(_keyboardJump); + statusBar()->showMessage(tr("Bound Buffer %1::%2 to Key %3").arg(net->networkName()).arg(bufferName).arg(key - Qt::Key_0), 10000); +} + +void MainWin::jumpKey(int key) { + if(key < Qt::Key_0 || Qt::Key_9 < key) + return; + + if(_keyboardJump.isEmpty()) + _keyboardJump = CoreAccountSettings().jumpKeyMap(); + + if(!_keyboardJump.contains(key)) + return; + + QModelIndex source_bufferIdx = Client::networkModel()->bufferIndex(_keyboardJump[key]); + QModelIndex bufferIdx = Client::bufferModel()->mapFromSource(source_bufferIdx); + + if(bufferIdx.isValid()) + Client::bufferModel()->standardSelectionModel()->setCurrentIndex(bufferIdx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); + +}