X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=2b4b9b5f7686d23c5f5a153cf40dff1ccbc97fe8;hp=7e7d61a71e7a8ed7c773427bd9b0447cda52b6f1;hb=6623fd2d46dadd0168e4e28d1db6944c26c2a773;hpb=e5ef65b239e9a128a5cf86e6eef9bce1fd098448 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 7e7d61a7..2b4b9b5f 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" @@ -32,6 +33,8 @@ #include "settingsdlg.h" #include "signalproxy.h" #include "topicwidget.h" +#include "inputwidget.h" +#include "verticaldock.h" #include "uisettings.h" #include "selectionmodelsynchronizer.h" @@ -57,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(); @@ -68,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 @@ -101,41 +126,10 @@ 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); - - - 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"); - Client::bufferModel()->mapProperty(0, NetworkModel::NetworkIdRole, ui.bufferWidget, "currentNetwork"); - 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(); @@ -167,7 +161,9 @@ 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())); + connect(ui.actionDisconnectNet, SIGNAL(triggered()), this, SLOT(disconnectFromNet())); connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt())); + } void MainWin::setupViews() { @@ -175,9 +171,9 @@ void MainWin::setupViews() { 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())->hide(); - addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList())->hide(); - addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList())->hide(); + 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(); } @@ -203,13 +199,86 @@ QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel } void MainWin::setupSettingsDlg() { -#ifdef SPUTDEV - connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME -#endif 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::connectedToCore() { @@ -221,7 +290,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.")); } @@ -230,7 +299,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(); @@ -275,15 +344,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::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) { + if (activationReason == QSystemTrayIcon::Trigger) { + if (isHidden()) + show(); + else + hide(); + } +} + +void MainWin::disconnectFromNet() { + int i = QInputDialog::getInteger(this, tr("Disconnect from Network"), tr("Enter network id:")); + emit disconnectFromNetwork(NetworkId(i)); +} +