X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=ebd83f6cdb94b5683fe05306eff25b82b5b9519c;hp=d700b642b06bdeca5edef2c744a5928eb41fbc82;hb=7431a7bfe8419ed104621fb8e77b37e4e1943fd9;hpb=923ab935b9e2936d2512ef9344811e9bb2f436f3 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index d700b642..ebd83f6c 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -17,15 +17,17 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -//#define SPUTDEV - #include "mainwin.h" #include "aboutdlg.h" #include "chatwidget.h" #include "bufferview.h" +#include "bufferviewconfig.h" +#include "bufferviewfilter.h" +#include "bufferviewmanager.h" #include "chatline-old.h" #include "client.h" +#include "clientbacklogmanager.h" #include "coreconnectdlg.h" #include "networkmodel.h" #include "buffermodel.h" @@ -40,32 +42,56 @@ #include "qtuisettings.h" #include "jumpkeyhandler.h" +#include "uisettings.h" + #include "selectionmodelsynchronizer.h" #include "mappedselectionmodel.h" +#include "settingspages/appearancesettingspage.h" +#include "settingspages/bufferviewsettingspage.h" #include "settingspages/colorsettingspage.h" #include "settingspages/fontssettingspage.h" #include "settingspages/generalsettingspage.h" +#include "settingspages/highlightsettingspage.h" #include "settingspages/identitiessettingspage.h" #include "settingspages/networkssettingspage.h" #include "debugconsole.h" +#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"), + offlineTrayIcon(":/icons/quassel-icon-offline.png"), + trayIconActive(false), + timer(new QTimer(this)), settingsDlg(new SettingsDlg(this)), debugConsole(new DebugConsole(this)) { ui.setupUi(this); setWindowTitle("Quassel IRC"); - setWindowIcon(QIcon(":icons/quassel-icon.png")); + setWindowIcon(offlineTrayIcon); + qApp->setWindowIcon(offlineTrayIcon); + systray->setIcon(offlineTrayIcon); setWindowIconText("Quassel IRC"); statusBar()->showMessage(tr("Waiting for core...")); installEventFilter(new JumpKeyHandler(this)); + + UiSettings uiSettings; + QString style = uiSettings.value("Style", QString("")).toString(); + if(style != "") { + QApplication::setStyle(style); + } } void MainWin::init() { @@ -77,10 +103,12 @@ 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(); - + //ui.bufferWidget->init(); + show(); statusBar()->showMessage(tr("Not connected to core.")); @@ -100,28 +128,23 @@ void MainWin::init() { setupTopicWidget(); setupChatMonitor(); setupInputWidget(); + setupStatusBar(); setupSystray(); - setupSettingsDlg(); // 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 PropertyMapper + // attach the BufferWidget to the BufferModel and the default selection ui.bufferWidget->setModel(Client::bufferModel()); ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); -#ifdef SPUTDEV - //showSettingsDlg(); - //showAboutDlg(); - showNetworkDlg(); - exit(1); -#endif - + _titleSetter.setModel(Client::bufferModel()); + _titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel()); } MainWin::~MainWin() { @@ -144,60 +167,97 @@ 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() { //Category: Appearance settingsDlg->registerSettingsPage(new ColorSettingsPage(settingsDlg)); settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg)); + settingsDlg->registerSettingsPage(new AppearanceSettingsPage(settingsDlg)); //General //Category: Behaviour settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg)); + settingsDlg->registerSettingsPage(new HighlightSettingsPage(settingsDlg)); //Category: General settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg)); + settingsDlg->registerSettingsPage(new BufferViewSettingsPage(settingsDlg)); +} +void MainWin::showNetworkDlg() { + SettingsPageDlg dlg(new NetworksSettingsPage(this), this); + dlg.exec(); +} -#ifdef SPUTDEV - connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME -#endif +void MainWin::showManageViewsDlg() { + SettingsPageDlg dlg(new BufferViewSettingsPage(this), this); + dlg.exec(); } void MainWin::setupNickWidget() { // create nick dock - nickDock = new QDockWidget(tr("Nicks"), this); + NickListDock *nickDock = new NickListDock(tr("Nicks"), this); nickDock->setObjectName("NickDock"); nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); @@ -205,17 +265,20 @@ void MainWin::setupNickWidget() { nickDock->setWidget(nickListWidget); addDockWidget(Qt::RightDockWidgetArea, nickDock); - ui.menuViews->addAction(nickDock->toggleViewAction()); + // See NickListDock::NickListDock(); + // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool))); - Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer"); + // attach the NickListWidget to the BufferModel and the default selection + nickListWidget->setModel(Client::bufferModel()); + nickListWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); } void MainWin::setupChatMonitor() { VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this); dock->setObjectName("ChatMonitorDock"); - ChatWidget *chatWidget = new ChatWidget(this); + ChatWidget *chatWidget = new ChatWidget(0, this); chatWidget->show(); dock->setWidget(chatWidget); dock->show(); @@ -224,13 +287,7 @@ void MainWin::setupChatMonitor() { 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); + chatWidget->setContents(buf->contents()); connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *))); connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *))); @@ -263,18 +320,41 @@ void MainWin::setupTopicWidget() { dock->setWidget(topicwidget); - Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); + topicwidget->setModel(Client::bufferModel()); + topicwidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); addDockWidget(Qt::TopDockWidgetArea, dock); 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() { - systray = new QSystemTrayIcon(this); - systray->setIcon(QIcon(":/icons/quassel-icon.png")); -// systray->setToolTip("left click to minimize the quassel client to tray"); -// systray->setToolTip(toolTip); + connect(timer, SIGNAL(timeout()), this, SLOT(makeTrayIconBlink())); + connect(Client::instance(), SIGNAL(messageReceived(const Message &)), this, SLOT(receiveMessage(const Message &))); systrayMenu = new QMenu(this); systrayMenu->addAction(ui.actionAboutQuassel); @@ -290,11 +370,11 @@ void MainWin::setupSystray() { if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) { systray->show(); } - - #ifndef Q_WS_MAC + +#ifndef Q_WS_MAC connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason ))); - #endif +#endif } @@ -319,10 +399,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()) { - emit requestBacklog(id, 1000, -1); + Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1); } + setConnectedState(); +} +void MainWin::setConnectedState() { ui.menuViews->setEnabled(true); //ui.menuCore->setEnabled(true); ui.actionConnectCore->setEnabled(false); @@ -330,21 +418,73 @@ void MainWin::connectedToCore() { //ui.actionNetworkList->setEnabled(true); 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"; + + sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/ssl"))); } 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); //ui.actionNetworkList->setEnabled(false); ui.bufferWidget->hide(); ui.actionConnectCore->setEnabled(true); - nickListWidget->reset(); + // 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 ChatLine(msg); + return new ChatLineOld(msg); } void MainWin::showCoreConnectionDlg(bool autoConnect) { @@ -398,8 +538,9 @@ void MainWin::toggleVisibility() { showNormal(); raise(); - setFocus(Qt::ActiveWindowFocusReason); - // activateWindow(); + activateWindow(); + // setFocus(); //Qt::ActiveWindowFocusReason + } else { if(systray->isSystemTrayAvailable ()) { clearFocus(); @@ -413,11 +554,67 @@ void MainWin::toggleVisibility() { } } -void MainWin::showNetworkDlg() { - SettingsPageDlg dlg(new NetworksSettingsPage(this), this); - dlg.exec(); +void MainWin::receiveMessage(const Message &msg) { + if(QApplication::activeWindow() != 0) + return; + + if(msg.flags() & Message::Highlight || msg.bufferInfo().type() == BufferInfo::QueryBuffer) { + QString title = msg.bufferInfo().bufferName();; + if(msg.bufferInfo().type() != BufferInfo::QueryBuffer) { + QString sender = msg.sender(); + int i = sender.indexOf("!"); + if(i != -1) + sender = sender.left(i); + title += QString(" - %1").arg(sender); + } + + UiSettings uiSettings; + + 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; + displayTrayIconMessage(title, text); + } + + if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) { + QApplication::alert(this); + setTrayIconActivity(true); + } + } } +bool MainWin::event(QEvent *event) { + if(event->type() == QEvent::WindowActivate) + setTrayIconActivity(false); + return QMainWindow::event(event); +} + +void MainWin::displayTrayIconMessage(const QString &title, const QString &message) { + systray->showMessage(title, message); +} + +void MainWin::setTrayIconActivity(bool active) { + if(active) { + if(!timer->isActive()) + timer->start(500); + } else { + timer->stop(); + systray->setIcon(onlineTrayIcon); + } +} + +void MainWin::makeTrayIconBlink() { + if(trayIconActive) { + systray->setIcon(onlineTrayIcon); + trayIconActive = false; + } else { + systray->setIcon(activeTrayIcon); + trayIconActive = true; + } +} + + + void MainWin::clientNetworkCreated(NetworkId id) { const Network *net = Client::network(id); QAction *act = new QAction(net->networkName(), this);