X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=925c64f71a7da5e155a80e390039a8757c58ffef;hp=2e7ce46babcd05fc9e1637e92b0d80eff1694730;hb=d1b2699b8a77947f1b7dd67841c6ecb4ea1fce1e;hpb=2bcb925e42921b124efd19d1978ff19f44a09113 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 2e7ce46b..925c64f7 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -22,7 +22,9 @@ #include "aboutdlg.h" #include "chatwidget.h" #include "bufferview.h" -#include "chatline-old.h" +#include "bufferviewconfig.h" +#include "bufferviewfilter.h" +#include "bufferviewmanager.h" #include "client.h" #include "clientbacklogmanager.h" #include "coreconnectdlg.h" @@ -58,10 +60,12 @@ #include "global.h" #include "qtuistyle.h" + MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui), sslLabel(new QLabel()), + _titleSetter(this), systray(new QSystemTrayIcon(this)), activeTrayIcon(":/icons/quassel-icon-active.png"), onlineTrayIcon(":/icons/quassel-icon.png"), @@ -74,6 +78,7 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) ui.setupUi(this); setWindowTitle("Quassel IRC"); setWindowIcon(offlineTrayIcon); + qApp->setWindowIcon(offlineTrayIcon); systray->setIcon(offlineTrayIcon); setWindowIconText("Quassel IRC"); @@ -97,6 +102,8 @@ void MainWin::init() { Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant))); + connect(QApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(saveLayout())); + connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId))); connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId))); //ui.bufferWidget->init(); @@ -128,13 +135,15 @@ void MainWin::init() { // restore mainwin state restoreState(s.value("MainWinState").toByteArray()); - disconnectedFromCore(); // Disable menus and stuff + setDisconnectedState(); // Disable menus and stuff showCoreConnectionDlg(true); // autoconnect if appropriate // attach the BufferWidget to the BufferModel and the default selection ui.bufferWidget->setModel(Client::bufferModel()); ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); + _titleSetter.setModel(Client::bufferModel()); + _titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel()); } MainWin::~MainWin() { @@ -157,39 +166,68 @@ void MainWin::setupMenus() { actionEditNetworks = new QAction(QIcon(":/22x22/actions/configure"), tr("Edit &Networks..."), this); ui.menuNetworks->addAction(actionEditNetworks); connect(actionEditNetworks, SIGNAL(triggered()), this, SLOT(showNetworkDlg())); + connect(ui.actionManageViews, SIGNAL(triggered()), this, SLOT(showManageViewsDlg())); } 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()); + QAction *separator = ui.menuViews->addSeparator(); + separator->setData("__EOBV__"); + addBufferView(); +} - ui.menuViews->addSeparator(); +void MainWin::addBufferView(int bufferViewConfigId) { + addBufferView(Client::bufferViewManager()->bufferViewConfig(bufferViewConfigId)); } -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); +void MainWin::addBufferView(BufferViewConfig *config) { + BufferViewDock *dock; + if(config) + dock = new BufferViewDock(config, this); + else + dock = new BufferViewDock(this); //create the view and initialize it's filter BufferView *view = new BufferView(dock); + view->setFilteredModel(Client::bufferModel(), config); 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()); + QAction *endOfBufferViews = 0; + foreach(QAction *action, ui.menuViews->actions()) { + if(action->data().toString() == "__EOBV__") { + endOfBufferViews = action; + break; + } + } + Q_CHECK_PTR(endOfBufferViews); + ui.menuViews->insertAction(endOfBufferViews, dock->toggleViewAction()); - netViews.append(dock); - return dock; + _netViews.append(dock); +} + +void MainWin::removeBufferView(int bufferViewConfigId) { + QVariant actionData; + BufferViewDock *dock; + foreach(QAction *action, ui.menuViews->actions()) { + actionData = action->data(); + if(!actionData.isValid()) + continue; + + if(actionData.toString() == "__EOBV__") + break; + + dock = qobject_cast(action->parent()); + if(dock && actionData.toInt() == bufferViewConfigId) { + removeAction(action); + dock->deleteLater(); + } + } } void MainWin::setupSettingsDlg() { @@ -203,7 +241,17 @@ void MainWin::setupSettingsDlg() { //Category: General settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg)); - // settingsDlg->registerSettingsPage(new BufferViewSettingsPage(settingsDlg)); + settingsDlg->registerSettingsPage(new BufferViewSettingsPage(settingsDlg)); +} + +void MainWin::showNetworkDlg() { + SettingsPageDlg dlg(new NetworksSettingsPage(this), this); + dlg.exec(); +} + +void MainWin::showManageViewsDlg() { + SettingsPageDlg dlg(new BufferViewSettingsPage(this), this); + dlg.exec(); } void MainWin::setupNickWidget() { @@ -217,7 +265,8 @@ void MainWin::setupNickWidget() { addDockWidget(Qt::RightDockWidgetArea, nickDock); ui.menuViews->addAction(nickDock->toggleViewAction()); - connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool))); + // See NickListDock::NickListDock(); + // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool))); // attach the NickListWidget to the BufferModel and the default selection nickListWidget->setModel(Client::bufferModel()); @@ -225,6 +274,7 @@ void MainWin::setupNickWidget() { } void MainWin::setupChatMonitor() { +#ifndef SPUTDEV VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this); dock->setObjectName("ChatMonitorDock"); @@ -243,6 +293,7 @@ void MainWin::setupChatMonitor() { addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical); ui.menuViews->addAction(dock->toggleViewAction()); +#endif /* SPUTDEV */ } void MainWin::setupInputWidget() { @@ -289,7 +340,6 @@ void MainWin::setupStatusBar() { UiSettings uiSettings; - //TODO: save status bool enabled = uiSettings.value("ShowStatusBar", QVariant(true)).toBool(); showStatusbar->setChecked(enabled); enabled ? statusBar()->show() : statusBar()->hide(); @@ -350,10 +400,18 @@ void MainWin::changeTopic(const QString &topic) { } void MainWin::connectedToCore() { + Q_CHECK_PTR(Client::bufferViewManager()); + connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigAdded(int)), this, SLOT(addBufferView(int))); + connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigDeleted(int)), this, SLOT(removeBufferView(int))); + connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout())); + foreach(BufferInfo id, Client::allBufferInfos()) { Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1); } + setConnectedState(); +} +void MainWin::setConnectedState() { ui.menuViews->setEnabled(true); //ui.menuCore->setEnabled(true); ui.actionConnectCore->setEnabled(false); @@ -362,11 +420,24 @@ void MainWin::connectedToCore() { ui.bufferWidget->show(); statusBar()->showMessage(tr("Connected to core.")); setWindowIcon(onlineTrayIcon); + qApp->setWindowIcon(onlineTrayIcon); systray->setIcon(onlineTrayIcon); if(sslLabel->width() == 0) sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl"))); } +void MainWin::loadLayout() { + QtUiSettings s; + int accountId = Client::currentCoreAccount().toInt(); + restoreState(s.value(QString("MainWinState-%1").arg(accountId)).toByteArray(), accountId); +} + +void MainWin::saveLayout() { + QtUiSettings s; + int accountId = Client::currentCoreAccount().toInt(); + if(accountId > 0) s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId)); +} + void MainWin::securedConnection() { // todo: make status bar entry qDebug() << "secured the connection"; @@ -375,6 +446,30 @@ void MainWin::securedConnection() { } void MainWin::disconnectedFromCore() { + // save core specific layout and remove bufferviews; + saveLayout(); + QVariant actionData; + BufferViewDock *dock; + foreach(QAction *action, ui.menuViews->actions()) { + actionData = action->data(); + if(!actionData.isValid()) + continue; + + if(actionData.toString() == "__EOBV__") + break; + + dock = qobject_cast(action->parent()); + if(dock && actionData.toInt() != -1) { + removeAction(action); + dock->deleteLater(); + } + } + QtUiSettings s; + restoreState(s.value("MainWinState").toByteArray()); + setDisconnectedState(); +} + +void MainWin::setDisconnectedState() { ui.menuViews->setEnabled(false); //ui.menuCore->setEnabled(false); ui.actionDisconnectCore->setEnabled(false); @@ -384,14 +479,11 @@ void MainWin::disconnectedFromCore() { // nickListWidget->reset(); statusBar()->showMessage(tr("Not connected to core.")); setWindowIcon(offlineTrayIcon); + qApp->setWindowIcon(offlineTrayIcon); systray->setIcon(offlineTrayIcon); sslLabel->setPixmap(QPixmap()); } -AbstractUiMsg *MainWin::layoutMsg(const Message &msg) { - return new ChatLineOld(msg); -} - void MainWin::showCoreConnectionDlg(bool autoConnect) { coreConnectDlg = new CoreConnectDlg(this, autoConnect); connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int))); @@ -428,7 +520,7 @@ void MainWin::closeEvent(QCloseEvent *event) { } void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) { - if (activationReason == QSystemTrayIcon::Trigger) { + if(activationReason == QSystemTrayIcon::Trigger) { toggleVisibility(); } } @@ -436,11 +528,12 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas void MainWin::toggleVisibility() { if(isHidden() /*|| !isActiveWindow()*/) { show(); - if(isMinimized()) - if (isMaximized()) + if(isMinimized()) { + if(isMaximized()) showMaximized(); else showNormal(); + } raise(); activateWindow(); @@ -475,12 +568,13 @@ void MainWin::receiveMessage(const Message &msg) { UiSettings uiSettings; +#ifndef SPUTDEV if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) { // FIXME don't invoke style engine for this! - QString text = QtUi::style()->styleString(Message::mircToInternal(msg.text())).text; + QString text = QtUi::style()->styleString(Message::mircToInternal(msg.contents())).plainText; displayTrayIconMessage(title, text); } - +#endif if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) { QApplication::alert(this); setTrayIconActivity(true); @@ -519,10 +613,6 @@ void MainWin::makeTrayIconBlink() { } -void MainWin::showNetworkDlg() { - SettingsPageDlg dlg(new NetworksSettingsPage(this), this); - dlg.exec(); -} void MainWin::clientNetworkCreated(NetworkId id) { const Network *net = Client::network(id);