X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=d16916df37d64cd45d3bad2126529bb494fc43ee;hp=669261c92025b09cb96a0f7d3130d890f28a0abe;hb=da28b86876edea39e97ffdd4cc5602072c001f93;hpb=4787ae231945b6d6ca8b3c255924c4f13178f83c diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 669261c9..d16916df 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.h" +#include "bufferviewconfig.h" +#include "bufferviewfilter.h" +#include "bufferviewmanager.h" #include "chatline-old.h" #include "client.h" #include "clientbacklogmanager.h" @@ -87,11 +89,6 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) if(style != "") { QApplication::setStyle(style); } - - connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection())); - sslLabel->setPixmap(QPixmap()); - statusBar()->addPermanentWidget(sslLabel); - } void MainWin::init() { @@ -103,6 +100,9 @@ void MainWin::init() { Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant))); + // let's hope here that nothing in disconnectedFromCore() needs user interaction/event loop... + connect(QApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(disconnectedFromCore())); + connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId))); connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId))); //ui.bufferWidget->init(); @@ -126,6 +126,7 @@ void MainWin::init() { setupTopicWidget(); setupChatMonitor(); setupInputWidget(); + setupStatusBar(); setupSystray(); setupSettingsDlg(); @@ -133,20 +134,13 @@ 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()); - if(Global::SPUTDEV) { - //showSettingsDlg(); - //showAboutDlg(); - //showNetworkDlg(); - //exit(1); - } - } MainWin::~MainWin() { @@ -169,39 +163,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); +} - netViews.append(dock); - return 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() { @@ -215,7 +238,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() { @@ -290,6 +323,30 @@ void MainWin::setupTopicWidget() { ui.menuViews->addAction(dock->toggleViewAction()); } +void MainWin::setupStatusBar() { + connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection())); + sslLabel->setPixmap(QPixmap()); + statusBar()->addPermanentWidget(sslLabel); + + ui.menuViews->addSeparator(); + QAction *showStatusbar = ui.menuViews->addAction(tr("Statusbar")); + showStatusbar->setCheckable(true); + + UiSettings uiSettings; + + bool enabled = uiSettings.value("ShowStatusBar", QVariant(true)).toBool(); + showStatusbar->setChecked(enabled); + enabled ? statusBar()->show() : statusBar()->hide(); + + connect(showStatusbar, SIGNAL(toggled(bool)), statusBar(), SLOT(setVisible(bool))); + connect(showStatusbar, SIGNAL(toggled(bool)), this, SLOT(saveStatusBarStatus(bool))); +} + +void MainWin::saveStatusBarStatus(bool enabled) { + UiSettings uiSettings; + uiSettings.setValue("ShowStatusBar", enabled); +} + void MainWin::setupSystray() { connect(timer, SIGNAL(timeout()), this, SLOT(makeTrayIconBlink())); connect(Client::instance(), SIGNAL(messageReceived(const Message &)), this, SLOT(receiveMessage(const Message &))); @@ -337,10 +394,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); @@ -354,6 +419,12 @@ void MainWin::connectedToCore() { 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::securedConnection() { // todo: make status bar entry qDebug() << "secured the connection"; @@ -362,6 +433,31 @@ void MainWin::securedConnection() { } void MainWin::disconnectedFromCore() { + // save core specific layout and remove bufferviews; + QtUiSettings s; + int accountId = Client::currentCoreAccount().toInt(); + s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId)); + 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(); + } + } + restoreState(s.value("MainWinState").toByteArray()); + setDisconnectedState(); +} + +void MainWin::setDisconnectedState() { ui.menuViews->setEnabled(false); //ui.menuCore->setEnabled(false); ui.actionDisconnectCore->setEnabled(false); @@ -376,7 +472,6 @@ void MainWin::disconnectedFromCore() { } AbstractUiMsg *MainWin::layoutMsg(const Message &msg) { - if(Global::SPUTDEV) return new ChatLine(msg); return new ChatLineOld(msg); } @@ -507,11 +602,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); QAction *act = new QAction(net->networkName(), this);