X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=53324ddefbbad8588754ab0a925d10f1e79d5873;hp=3bf5d811d874d47422098ba2e5f11c1f104587c9;hb=dcac65fc4beeb1167de8ebec5cc54608fc314fd3;hpb=6a590134d0ceca46e83a6b5b24e44550b68e9b4b diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 3bf5d811..53324dde 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -19,23 +19,43 @@ ***************************************************************************/ #include "mainwin.h" +#ifdef HAVE_KDE +# include +# include +# include +# include +# include +# include +#endif + #include "aboutdlg.h" +#include "awaylogfilter.h" +#include "awaylogview.h" #include "action.h" #include "actioncollection.h" #include "buffermodel.h" -#include "bufferviewmanager.h" +#include "bufferview.h" +#include "bufferwidget.h" #include "channellistdlg.h" #include "chatlinemodel.h" #include "chatmonitorfilter.h" #include "chatmonitorview.h" #include "chatview.h" #include "client.h" +#include "clientsyncer.h" #include "clientbacklogmanager.h" +#include "clientbufferviewconfig.h" +#include "clientbufferviewmanager.h" #include "coreinfodlg.h" #include "coreconnectdlg.h" +#include "contextmenuactionprovider.h" +#include "debuglogwidget.h" +#include "debugmessagemodelfilter.h" #include "iconloader.h" #include "inputwidget.h" +#include "inputline.h" #include "irclistmodel.h" +#include "ircconnectionwizard.h" #include "jumpkeyhandler.h" #include "msgprocessorstatuswidget.h" #include "nicklistwidget.h" @@ -45,18 +65,29 @@ #include "sessionsettings.h" #include "settingsdlg.h" #include "settingspagedlg.h" +#include "systemtray.h" +#include "toolbaractionprovider.h" #include "topicwidget.h" #include "verticaldock.h" -#ifdef HAVE_DBUS -# include "desktopnotificationbackend.h" -#endif -#include "systraynotificationbackend.h" -#include "taskbarnotificationbackend.h" +#ifndef HAVE_KDE +# ifdef HAVE_DBUS +# include "desktopnotificationbackend.h" +# endif +# ifdef HAVE_PHONON +# include "phononnotificationbackend.h" +# endif +# include "systraynotificationbackend.h" +# include "taskbarnotificationbackend.h" +#else /* HAVE_KDE */ +# include "knotificationbackend.h" +#endif /* HAVE_KDE */ #include "settingspages/aliasessettingspage.h" #include "settingspages/appearancesettingspage.h" +#include "settingspages/backlogsettingspage.h" #include "settingspages/bufferviewsettingspage.h" +#include "settingspages/chatmonitorsettingspage.h" #include "settingspages/colorsettingspage.h" #include "settingspages/fontssettingspage.h" #include "settingspages/generalsettingspage.h" @@ -66,39 +97,35 @@ #include "settingspages/notificationssettingspage.h" MainWin::MainWin(QWidget *parent) +#ifdef HAVE_KDE + : KMainWindow(parent), + _kHelpMenu(new KHelpMenu(this, KGlobal::mainComponent().aboutData())), +#else : QMainWindow(parent), +#endif coreLagLabel(new QLabel()), sslLabel(new QLabel()), msgProcessorStatusWidget(new MsgProcessorStatusWidget()), _titleSetter(this), - _trayIcon(new QSystemTrayIcon(this)), - _actionCollection(new ActionCollection(this)) + _awayLog(0) { QtUiSettings uiSettings; - QString style = uiSettings.value("Style", QString("")).toString(); - if(style != "") { + QString style = uiSettings.value("Style", QString()).toString(); + if(!style.isEmpty()) { QApplication::setStyle(style); } - ui.setupUi(this); + + QApplication::setQuitOnLastWindowClosed(false); + setWindowTitle("Quassel IRC"); setWindowIconText("Quassel IRC"); updateIcon(); - QtUi::actionCollection()->addAssociatedWidget(this); - - statusBar()->showMessage(tr("Waiting for core...")); - installEventFilter(new JumpKeyHandler(this)); - QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this)); - QtUi::registerNotificationBackend(new SystrayNotificationBackend(this)); -#ifdef HAVE_DBUS - QtUi::registerNotificationBackend(new DesktopNotificationBackend(this)); -#endif - QtUiApplication* app = qobject_cast qApp; - connect(app, SIGNAL(saveStateToSession(const QString&)), this, SLOT(saveStateToSession(const QString&))); - connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), this, SLOT(saveStateToSessionSettings(SessionSettings&))); + connect(app, SIGNAL(saveStateToSession(const QString&)), SLOT(saveStateToSession(const QString&))); + connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), SLOT(saveStateToSessionSettings(SessionSettings&))); } void MainWin::init() { @@ -108,50 +135,62 @@ void MainWin::init() { else resize(QSize(800, 500)); - 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))); - - show(); - - statusBar()->showMessage(tr("Not connected to core.")); + connect(QApplication::instance(), SIGNAL(aboutToQuit()), SLOT(saveLayout())); + connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), SLOT(clientNetworkCreated(NetworkId))); + connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), SLOT(clientNetworkRemoved(NetworkId))); + connect(Client::messageModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), + SLOT(messagesInserted(const QModelIndex &, int, int))); + connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showChannelList(NetworkId)), SLOT(showChannelList(NetworkId))); - // DOCK OPTIONS + // Setup Dock Areas setDockNestingEnabled(true); - setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); - // setup stuff... + // Order is sometimes important setupActions(); + setupBufferWidget(); setupMenus(); - setupViews(); - setupNickWidget(); setupTopicWidget(); setupChatMonitor(); + setupNickWidget(); setupInputWidget(); setupStatusBar(); + setupToolBars(); setupSystray(); + setupTitleSetter(); + +#ifndef HAVE_KDE + QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this)); + QtUi::registerNotificationBackend(new SystrayNotificationBackend(this)); +# ifdef HAVE_PHONON + QtUi::registerNotificationBackend(new PhononNotificationBackend(this)); +# endif +# ifdef HAVE_DBUS + QtUi::registerNotificationBackend(new DesktopNotificationBackend(this)); +# endif + +#else /* HAVE_KDE */ + QtUi::registerNotificationBackend(new KNotificationBackend(this)); +#endif /* HAVE_KDE */ // restore mainwin state restoreState(s.value("MainWinState").toByteArray()); // restore locked state of docks - ui.actionLockDockPositions->setChecked(s.value("LockDocks", false).toBool()); + QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool()); 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()); - ui.menuViews->addAction(QtUi::actionCollection()->action("toggleSearchBar")); + show(); - _titleSetter.setModel(Client::bufferModel()); - _titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel()); + if(Quassel::runMode() != Quassel::Monolithic) { + showCoreConnectionDlg(true); // autoconnect if appropriate + } else { + startInternalCore(); + } } MainWin::~MainWin() { @@ -162,76 +201,164 @@ MainWin::~MainWin() { } void MainWin::updateIcon() { +#ifdef Q_WS_MAC + const int size = 128; +#else + const int size = 48; +#endif + QPixmap icon; if(Client::isConnected()) - icon = DesktopIcon("quassel", IconLoader::SizeEnormous); + icon = DesktopIcon("quassel", size); else - icon = DesktopIcon("quassel_disconnected", IconLoader::SizeEnormous); + icon = DesktopIcon("quassel_inactive", size); setWindowIcon(icon); qApp->setWindowIcon(icon); - systemTrayIcon()->setIcon(icon); } void MainWin::setupActions() { - // TODO don't get these from *.ui anymore... we shouldn't need one - ui.actionQuit->setIcon(SmallIcon("application-exit")); - ui.actionSettingsDlg->setIcon(SmallIcon("configure")); - ui.actionManageViews->setIcon(SmallIcon("view-tree")); - ui.actionManageViews2->setIcon(SmallIcon("view-tree")); - ui.actionAboutQt->setIcon(SmallIcon("qt")); - ui.actionAboutQuassel->setIcon(SmallIcon("quassel")); - ui.actionConnectCore->setIcon(SmallIcon("network-connect")); - ui.actionDisconnectCore->setIcon(SmallIcon("network-disconnect")); - ui.actionCoreInfo->setIcon(SmallIcon("help-about")); + ActionCollection *coll = QtUi::actionCollection("General"); + // File + coll->addAction("ConnectCore", new Action(SmallIcon("network-connect"), tr("&Connect to Core..."), coll, + this, SLOT(showCoreConnectionDlg()))); + coll->addAction("DisconnectCore", new Action(SmallIcon("network-disconnect"), tr("&Disconnect from Core"), coll, + Client::instance(), SLOT(disconnectFromCore()))); + coll->addAction("CoreInfo", new Action(SmallIcon("help-about"), tr("Core &Info..."), coll, + this, SLOT(showCoreInfoDlg()))); + coll->addAction("ConfigureNetworks", new Action(SmallIcon("configure"), tr("Configure &Networks..."), coll, + this, SLOT(on_actionConfigureNetworks_triggered()))); + coll->addAction("Quit", new Action(SmallIcon("application-exit"), tr("&Quit"), coll, + qApp, SLOT(quit()), tr("Ctrl+Q"))); + + // View + coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll, + this, SLOT(on_actionConfigureViews_triggered()))); + + QAction *lockAct = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll)); + lockAct->setCheckable(true); + connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockLayout_toggled(bool))); + + coll->addAction("ToggleSearchBar", new Action(SmallIcon("edit-find"), tr("Show &Search Bar"), coll, + 0, 0, tr("Ctrl+F")))->setCheckable(true); + coll->addAction("ShowAwayLog", new Action(tr("Show Away Log"), coll, + this, SLOT(showAwayLog()))); + coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll, + 0, 0))->setCheckable(true); + + // Settings + coll->addAction("ConfigureQuassel", new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll, + this, SLOT(showSettingsDlg()), tr("F7"))); + + // Help + coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel"), coll, + this, SLOT(showAboutDlg()))); + coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll, + qApp, SLOT(aboutQt()))); + coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll, + this, SLOT(on_actionDebugNetworkModel_triggered()))); + coll->addAction("DebugMessageModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &MessageModel"), coll, + this, SLOT(on_actionDebugMessageModel_triggered()))); + coll->addAction("DebugLog", new Action(SmallIcon("tools-report-bug"), tr("Debug &Log"), coll, + this, SLOT(on_actionDebugLog_triggered()))); } void MainWin::setupMenus() { - connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg())); - connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore())); - connect(ui.actionCoreInfo, SIGNAL(triggered()), this, SLOT(showCoreInfoDlg())); - connect(ui.actionQuit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit())); - connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg())); - connect(ui.actionAboutQuassel, SIGNAL(triggered()), this, SLOT(showAboutDlg())); - connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt())); + ActionCollection *coll = QtUi::actionCollection("General"); + + _fileMenu = menuBar()->addMenu(tr("&File")); + + static const QStringList coreActions = QStringList() + << "ConnectCore" << "DisconnectCore" << "CoreInfo"; + + QAction *coreAction; + foreach(QString actionName, coreActions) { + coreAction = coll->action(actionName); + _fileMenu->addAction(coreAction); + flagRemoteCoreOnly(coreAction); + } + flagRemoteCoreOnly(_fileMenu->addSeparator()); + + _networksMenu = _fileMenu->addMenu(tr("&Networks")); + _networksMenu->addAction(coll->action("ConfigureNetworks")); + _networksMenu->addSeparator(); + _fileMenu->addSeparator(); + _fileMenu->addAction(coll->action("Quit")); + + _viewMenu = menuBar()->addMenu(tr("&View")); + _bufferViewsMenu = _viewMenu->addMenu(tr("&Buffer Views")); + _bufferViewsMenu->addAction(coll->action("ConfigureBufferViews")); + _toolbarMenu = _viewMenu->addMenu(tr("&Toolbars")); + _viewMenu->addSeparator(); + _viewMenu->addAction(coll->action("ToggleSearchBar")); + + coreAction = coll->action("ShowAwayLog"); + flagRemoteCoreOnly(coreAction); + _viewMenu->addAction(coreAction); + + _viewMenu->addAction(coll->action("ToggleStatusBar")); + _viewMenu->addSeparator(); + _viewMenu->addAction(coll->action("LockLayout")); + + _settingsMenu = menuBar()->addMenu(tr("&Settings")); +#ifdef HAVE_KDE + _settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this)); + _settingsMenu->addAction(KStandardAction::configureNotifications(this, SLOT(showNotificationsDlg()), this)); +#endif + _settingsMenu->addAction(coll->action("ConfigureQuassel")); + + _helpMenu = menuBar()->addMenu(tr("&Help")); + _helpMenu->addAction(coll->action("AboutQuassel")); +#ifndef HAVE_KDE + _helpMenu->addAction(coll->action("AboutQt")); +#else + _helpMenu->addAction(KStandardAction::aboutKDE(_kHelpMenu, SLOT(aboutKDE()), this)); +#endif + _helpMenu->addSeparator(); + _helpDebugMenu = _helpMenu->addMenu(SmallIcon("tools-report-bug"), tr("Debug")); + _helpDebugMenu->addAction(coll->action("DebugNetworkModel")); + _helpDebugMenu->addAction(coll->action("DebugMessageModel")); + _helpDebugMenu->addAction(coll->action("DebugLog")); } -void MainWin::setupViews() { - addBufferView(); +void MainWin::setupBufferWidget() { + _bufferWidget = new BufferWidget(this); + _bufferWidget->setModel(Client::bufferModel()); + _bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); + setCentralWidget(_bufferWidget); } void MainWin::addBufferView(int bufferViewConfigId) { - addBufferView(Client::bufferViewManager()->bufferViewConfig(bufferViewConfigId)); + addBufferView(Client::bufferViewManager()->clientBufferViewConfig(bufferViewConfigId)); } -void MainWin::addBufferView(BufferViewConfig *config) { - BufferViewDock *dock; - if(config) - dock = new BufferViewDock(config, this); - else - dock = new BufferViewDock(this); +void MainWin::addBufferView(ClientBufferViewConfig *config) { + if(!config) + return; + + config->setLocked(QtUiSettings().value("LockLayout", false).toBool()); + BufferViewDock *dock = new BufferViewDock(config, this); //create the view and initialize it's filter BufferView *view = new BufferView(dock); view->setFilteredModel(Client::bufferModel(), config); + view->installEventFilter(_inputWidget->inputLine()); // for key presses view->show(); - connect(&view->showChannelList, SIGNAL(triggered()), this, SLOT(showChannelList())); - Client::bufferModel()->synchronizeView(view); dock->setWidget(view); dock->show(); addDockWidget(Qt::LeftDockWidgetArea, dock); - ui.menuBufferViews->addAction(dock->toggleViewAction()); + _bufferViewsMenu->addAction(dock->toggleViewAction()); - _netViews.append(dock); + _bufferViews.append(dock); } void MainWin::removeBufferView(int bufferViewConfigId) { QVariant actionData; BufferViewDock *dock; - foreach(QAction *action, ui.menuBufferViews->actions()) { + foreach(QAction *action, _bufferViewsMenu->actions()) { actionData = action->data(); if(!actionData.isValid()) continue; @@ -244,22 +371,39 @@ void MainWin::removeBufferView(int bufferViewConfigId) { } } -void MainWin::on_actionEditNetworks_triggered() { +BufferView *MainWin::allBuffersView() const { + // "All Buffers" is always the first dock created + if(_bufferViews.count() > 0) + return _bufferViews[0]->bufferView(); + return 0; +} + +void MainWin::showNotificationsDlg() { + SettingsPageDlg dlg(new NotificationsSettingsPage(this), this); + dlg.exec(); +} + +void MainWin::on_actionConfigureNetworks_triggered() { SettingsPageDlg dlg(new NetworksSettingsPage(this), this); dlg.exec(); } -void MainWin::on_actionManageViews_triggered() { +void MainWin::on_actionConfigureViews_triggered() { SettingsPageDlg dlg(new BufferViewSettingsPage(this), this); dlg.exec(); } -void MainWin::on_actionLockDockPositions_toggled(bool lock) { +void MainWin::on_actionLockLayout_toggled(bool lock) { QList docks = findChildren(); foreach(VerticalDock *dock, docks) { dock->showTitle(!lock); } - QtUiSettings().setValue("LockDocks", lock); + if(Client::bufferViewManager()) { + foreach(ClientBufferViewConfig *config, Client::bufferViewManager()->clientBufferViewConfigs()) { + config->setLocked(lock); + } + } + QtUiSettings().setValue("LockLayout", lock); } void MainWin::setupNickWidget() { @@ -268,17 +412,19 @@ void MainWin::setupNickWidget() { nickDock->setObjectName("NickDock"); nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - nickListWidget = new NickListWidget(nickDock); - nickDock->setWidget(nickListWidget); + _nickListWidget = new NickListWidget(nickDock); + nickDock->setWidget(_nickListWidget); addDockWidget(Qt::RightDockWidgetArea, nickDock); - ui.menuViews->addAction(nickDock->toggleViewAction()); + _viewMenu->addAction(nickDock->toggleViewAction()); + nickDock->toggleViewAction()->setText(tr("Show Nick List")); + // 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()); - nickListWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); + _nickListWidget->setModel(Client::bufferModel()); + _nickListWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); } void MainWin::setupChatMonitor() { @@ -289,27 +435,31 @@ void MainWin::setupChatMonitor() { ChatMonitorView *chatView = new ChatMonitorView(filter, this); chatView->show(); dock->setWidget(chatView); - dock->show(); + dock->hide(); addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical); - ui.menuViews->addAction(dock->toggleViewAction()); + _viewMenu->addAction(dock->toggleViewAction()); + dock->toggleViewAction()->setText(tr("Show Chat Monitor")); } void MainWin::setupInputWidget() { VerticalDock *dock = new VerticalDock(tr("Inputline"), this); dock->setObjectName("InputDock"); - InputWidget *inputWidget = new InputWidget(dock); - dock->setWidget(inputWidget); + _inputWidget = new InputWidget(dock); + dock->setWidget(_inputWidget); addDockWidget(Qt::BottomDockWidgetArea, dock); - ui.menuViews->addAction(dock->toggleViewAction()); + _viewMenu->addAction(dock->toggleViewAction()); + dock->toggleViewAction()->setText(tr("Show Input Line")); - inputWidget->setModel(Client::bufferModel()); - inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); + _inputWidget->setModel(Client::bufferModel()); + _inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - ui.bufferWidget->setFocusProxy(inputWidget); + _bufferWidget->setFocusProxy(_inputWidget); + + _inputWidget->inputLine()->installEventFilter(_bufferWidget); } void MainWin::setupTopicWidget() { @@ -322,31 +472,35 @@ void MainWin::setupTopicWidget() { topicwidget->setModel(Client::bufferModel()); topicwidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - addDockWidget(Qt::TopDockWidgetArea, dock); + addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical); + + _viewMenu->addAction(dock->toggleViewAction()); + dock->toggleViewAction()->setText(tr("Show Topic Line")); +} - ui.menuViews->addAction(dock->toggleViewAction()); +void MainWin::setupTitleSetter() { + _titleSetter.setModel(Client::bufferModel()); + _titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel()); } void MainWin::setupStatusBar() { // MessageProcessor progress statusBar()->addPermanentWidget(msgProcessorStatusWidget); - connect(Client::messageProcessor(), SIGNAL(progressUpdated(int, int)), msgProcessorStatusWidget, SLOT(setProgress(int, int))); // Core Lag: - updateLagIndicator(0); + updateLagIndicator(); statusBar()->addPermanentWidget(coreLagLabel); + coreLagLabel->hide(); connect(Client::signalProxy(), SIGNAL(lagUpdated(int)), this, SLOT(updateLagIndicator(int))); // SSL indicator - connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection())); sslLabel->setPixmap(QPixmap()); statusBar()->addPermanentWidget(sslLabel); + sslLabel->hide(); - ui.menuViews->addSeparator(); - QAction *showStatusbar = ui.menuViews->addAction(tr("Statusbar")); - showStatusbar->setCheckable(true); + QAction *showStatusbar = QtUi::actionCollection("General")->action("ToggleStatusBar"); - UiSettings uiSettings; + QtUiSettings uiSettings; bool enabled = uiSettings.value("ShowStatusBar", QVariant(true)).toBool(); showStatusbar->setChecked(enabled); @@ -357,43 +511,51 @@ void MainWin::setupStatusBar() { } void MainWin::saveStatusBarStatus(bool enabled) { - UiSettings uiSettings; + QtUiSettings uiSettings; uiSettings.setValue("ShowStatusBar", enabled); } void MainWin::setupSystray() { - connect(Client::messageModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), - SLOT(messagesInserted(const QModelIndex &, int, int))); + _systemTray = new SystemTray(this); - systrayMenu = new QMenu(this); - systrayMenu->addAction(ui.actionAboutQuassel); - systrayMenu->addSeparator(); - systrayMenu->addAction(ui.actionConnectCore); - systrayMenu->addAction(ui.actionDisconnectCore); - systrayMenu->addSeparator(); - systrayMenu->addAction(ui.actionQuit); +#ifndef Q_WS_MAC + connect(systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(systrayActivated(QSystemTrayIcon::ActivationReason))); +#endif - systemTrayIcon()->setContextMenu(systrayMenu); +} - UiSettings s; - if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) { - systemTrayIcon()->show(); - } +void MainWin::setupToolBars() { + connect(_bufferWidget, SIGNAL(currentChanged(QModelIndex)), + QtUi::toolBarActionProvider(), SLOT(currentBufferChanged(QModelIndex))); + connect(_nickListWidget, SIGNAL(nickSelectionChanged(QModelIndexList)), + QtUi::toolBarActionProvider(), SLOT(nickSelectionChanged(QModelIndexList))); -#ifndef Q_WS_MAC - connect(systemTrayIcon(), SIGNAL(activated( QSystemTrayIcon::ActivationReason )), - this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason ))); +#ifdef Q_WS_MAC + setUnifiedTitleAndToolBarOnMac(true); #endif + _mainToolBar = addToolBar("Main Toolbar"); + _mainToolBar->setObjectName("MainToolBar"); + + QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar); + _toolbarMenu->addAction(_mainToolBar->toggleViewAction()); + //_nickToolBar = addToolBar("User"); + //_nickToolBar->setObjectName("NickToolBar"); + //QtUi::toolBarActionProvider()->addActions(_nickToolBar, ToolBarActionProvider::NickToolBar); + +#ifdef HAVE_KDE + _mainToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); + //_nickToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); +#endif } void MainWin::changeEvent(QEvent *event) { if(event->type() == QEvent::WindowStateChange) { if(windowState() & Qt::WindowMinimized) { - UiSettings s; + QtUiSettings s; if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) { - toggleVisibility(); - event->ignore(); + hideToTray(); + event->accept(); } } } @@ -405,21 +567,51 @@ void MainWin::connectedToCore() { connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigDeleted(int)), this, SLOT(removeBufferView(int))); connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout())); - Client::backlogManager()->requestInitialBacklog(); setConnectedState(); } void MainWin::setConnectedState() { - //ui.menuCore->setEnabled(true); - ui.actionConnectCore->setEnabled(false); - ui.actionDisconnectCore->setEnabled(true); - ui.actionCoreInfo->setEnabled(true); - ui.menuViews->setEnabled(true); - ui.bufferWidget->show(); - statusBar()->showMessage(tr("Connected to core.")); - if(sslLabel->width() == 0) + ActionCollection *coll = QtUi::actionCollection("General"); + + coll->action("ConnectCore")->setEnabled(false); + coll->action("DisconnectCore")->setEnabled(true); + coll->action("CoreInfo")->setEnabled(true); + + foreach(QAction *action, _fileMenu->actions()) { + if(isRemoteCoreOnly(action)) + action->setVisible(!Client::internalCore()); + } + + disconnect(Client::backlogManager(), SIGNAL(updateProgress(int, int)), msgProcessorStatusWidget, SLOT(setProgress(int, int))); + disconnect(Client::backlogManager(), SIGNAL(messagesRequested(const QString &)), this, SLOT(showStatusBarMessage(const QString &))); + disconnect(Client::backlogManager(), SIGNAL(messagesProcessed(const QString &)), this, SLOT(showStatusBarMessage(const QString &))); + if(!Client::internalCore()) { + connect(Client::backlogManager(), SIGNAL(updateProgress(int, int)), msgProcessorStatusWidget, SLOT(setProgress(int, int))); + connect(Client::backlogManager(), SIGNAL(messagesRequested(const QString &)), this, SLOT(showStatusBarMessage(const QString &))); + connect(Client::backlogManager(), SIGNAL(messagesProcessed(const QString &)), this, SLOT(showStatusBarMessage(const QString &))); + } + + // _viewMenu->setEnabled(true); + if(!Client::internalCore()) + statusBar()->showMessage(tr("Connected to core.")); + else + statusBar()->clearMessage(); + + if(Client::signalProxy()->isSecure()) { + sslLabel->setPixmap(SmallIcon("security-high")); + } else { sslLabel->setPixmap(SmallIcon("security-low")); + } + + sslLabel->setVisible(!Client::internalCore()); + coreLagLabel->setVisible(!Client::internalCore()); updateIcon(); + systemTray()->setState(SystemTray::Active); + + if(Client::networkIds().isEmpty()) { + IrcConnectionWizard *wizard = new IrcConnectionWizard(this, Qt::Sheet); + wizard->show(); + } } void MainWin::loadLayout() { @@ -435,13 +627,12 @@ void MainWin::saveLayout() { } void MainWin::updateLagIndicator(int lag) { - coreLagLabel->setText(QString(tr("Core Lag: %1 msec")).arg(lag)); -} - - -void MainWin::securedConnection() { - // todo: make status bar entry - sslLabel->setPixmap(SmallIcon("security-high")); + QString text = tr("Core Lag: %1"); + if(lag == -1) + text = text.arg('-'); + else + text = text.arg("%1 msec").arg(lag); + coreLagLabel->setText(text); } void MainWin::disconnectedFromCore() { @@ -449,7 +640,7 @@ void MainWin::disconnectedFromCore() { saveLayout(); QVariant actionData; BufferViewDock *dock; - foreach(QAction *action, ui.menuBufferViews->actions()) { + foreach(QAction *action, _bufferViewsMenu->actions()) { actionData = action->data(); if(!actionData.isValid()) continue; @@ -466,15 +657,28 @@ void MainWin::disconnectedFromCore() { } void MainWin::setDisconnectedState() { + ActionCollection *coll = QtUi::actionCollection("General"); //ui.menuCore->setEnabled(false); - ui.actionConnectCore->setEnabled(true); - ui.actionDisconnectCore->setEnabled(false); - ui.actionCoreInfo->setEnabled(false); - ui.menuViews->setEnabled(false); - ui.bufferWidget->hide(); + coll->action("ConnectCore")->setEnabled(true); + coll->action("DisconnectCore")->setEnabled(false); + coll->action("CoreInfo")->setEnabled(false); + //_viewMenu->setEnabled(false); statusBar()->showMessage(tr("Not connected to core.")); sslLabel->setPixmap(QPixmap()); + sslLabel->hide(); + updateLagIndicator(); + coreLagLabel->hide(); + if(msgProcessorStatusWidget) + msgProcessorStatusWidget->setProgress(0, 0); updateIcon(); + systemTray()->setState(SystemTray::Inactive); +} + +void MainWin::startInternalCore() { + ClientSyncer *syncer = new ClientSyncer(); + Client::registerClientSyncer(syncer); + connect(syncer, SIGNAL(syncFinished()), syncer, SLOT(deleteLater()), Qt::QueuedConnection); + syncer->useInternalCore(); } void MainWin::showCoreConnectionDlg(bool autoConnect) { @@ -499,22 +703,39 @@ void MainWin::showCoreInfoDlg() { CoreInfoDlg(this).exec(); } +void MainWin::showAwayLog() { + if(_awayLog) + return; + AwayLogFilter *filter = new AwayLogFilter(Client::messageModel()); + _awayLog = new AwayLogView(filter, 0); + filter->setParent(_awayLog); + connect(_awayLog, SIGNAL(destroyed()), this, SLOT(awayLogDestroyed())); + _awayLog->setAttribute(Qt::WA_DeleteOnClose); + _awayLog->show(); +} + +void MainWin::awayLogDestroyed() { + _awayLog = 0; +} + void MainWin::showSettingsDlg() { SettingsDlg *dlg = new SettingsDlg(); //Category: Appearance + dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General dlg->registerSettingsPage(new ColorSettingsPage(dlg)); dlg->registerSettingsPage(new FontsSettingsPage(dlg)); - dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General - //Category: Behaviour - dlg->registerSettingsPage(new GeneralSettingsPage(dlg)); dlg->registerSettingsPage(new HighlightSettingsPage(dlg)); - dlg->registerSettingsPage(new AliasesSettingsPage(dlg)); dlg->registerSettingsPage(new NotificationsSettingsPage(dlg)); - //Category: General + dlg->registerSettingsPage(new BacklogSettingsPage(dlg)); + dlg->registerSettingsPage(new BufferViewSettingsPage(dlg)); + dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg)); + + //Category: Misc + dlg->registerSettingsPage(new GeneralSettingsPage(dlg)); dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg)); dlg->registerSettingsPage(new NetworksSettingsPage(dlg)); - dlg->registerSettingsPage(new BufferViewSettingsPage(dlg)); + dlg->registerSettingsPage(new AliasesSettingsPage(dlg)); dlg->show(); } @@ -523,46 +744,51 @@ void MainWin::showAboutDlg() { AboutDlg(this).exec(); } +#ifdef HAVE_KDE +void MainWin::showShortcutsDlg() { + KShortcutsDialog::configure(QtUi::actionCollection("General"), KShortcutsEditor::LetterShortcutsDisallowed); +} +#endif + void MainWin::closeEvent(QCloseEvent *event) { - UiSettings s; - if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) { - toggleVisibility(); + QtUiSettings s; + QtUiApplication* app = qobject_cast qApp; + Q_ASSERT(app); + if(!app->aboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) { + toggleMinimizedToTray(); event->ignore(); } else { event->accept(); + QApplication::quit(); } } -void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) { +void MainWin::systrayActivated(QSystemTrayIcon::ActivationReason activationReason) { if(activationReason == QSystemTrayIcon::Trigger) { - toggleVisibility(); + toggleMinimizedToTray(); } } -void MainWin::toggleVisibility() { - if(isHidden() /*|| !isActiveWindow()*/) { - show(); - if(isMinimized()) { - if(isMaximized()) - showMaximized(); - else - showNormal(); - } +void MainWin::hideToTray() { + if(!systemTray()->isSystemTrayAvailable()) { + qWarning() << Q_FUNC_INFO << "was called with no SystemTray available!"; + return; + } + clearFocus(); + hide(); + systemTray()->setIconVisible(); +} - raise(); +void MainWin::toggleMinimizedToTray() { + if(windowState() & Qt::WindowMinimized) { + // restore + setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); + show(); activateWindow(); - // setFocus(); //Qt::ActiveWindowFocusReason - + raise(); } else { - if(systemTrayIcon()->isSystemTrayAvailable ()) { - clearFocus(); - hide(); - if(!systemTrayIcon()->isVisible()) { - systemTrayIcon()->show(); - } - } else { - lower(); - } + setWindowState((windowState() & ~Qt::WindowActive) | Qt::WindowMinimized); + hideToTray(); } } @@ -579,7 +805,7 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) { continue; } Message::Flags flags = (Message::Flags)idx.data(ChatLineModel::FlagsRole).toInt(); - if(flags.testFlag(Message::Backlog)) continue; + if(flags.testFlag(Message::Backlog) || flags.testFlag(Message::Self)) continue; flags |= Message::Backlog; // we only want to trigger a highlight once! Client::messageModel()->setData(idx, (int)flags, ChatLineModel::FlagsRole); @@ -610,18 +836,15 @@ void MainWin::clientNetworkCreated(NetworkId id) { connect(act, SIGNAL(triggered()), this, SLOT(connectOrDisconnectFromNet())); QAction *beforeAction = 0; - foreach(QAction *action, ui.menuNetworks->actions()) { - if(action->isSeparator()) { - beforeAction = action; - break; - } + foreach(QAction *action, _networksMenu->actions()) { + if(!action->data().isValid()) // ignore stock actions + continue; if(net->networkName().localeAwareCompare(action->text()) < 0) { beforeAction = action; break; } } - Q_CHECK_PTR(beforeAction); - ui.menuNetworks->insertAction(beforeAction, act); + _networksMenu->insertAction(beforeAction, act); } void MainWin::clientNetworkUpdated() { @@ -664,7 +887,7 @@ void MainWin::connectOrDisconnectFromNet() { else net->requestDisconnect(); } -void MainWin::on_actionDebugNetworkModel_triggered(bool) { +void MainWin::on_actionDebugNetworkModel_triggered() { QTreeView *view = new QTreeView; view->setAttribute(Qt::WA_DeleteOnClose); view->setWindowTitle("Debug NetworkModel View"); @@ -676,6 +899,22 @@ void MainWin::on_actionDebugNetworkModel_triggered(bool) { view->show(); } +void MainWin::on_actionDebugMessageModel_triggered() { + QTableView *view = new QTableView(0); + DebugMessageModelFilter *filter = new DebugMessageModelFilter(view); + filter->setSourceModel(Client::messageModel()); + view->setModel(filter); + view->setAttribute(Qt::WA_DeleteOnClose, true); + view->verticalHeader()->hide(); + view->horizontalHeader()->setStretchLastSection(true); + view->show(); +} + +void MainWin::on_actionDebugLog_triggered() { + DebugLogWidget *logWidget = new DebugLogWidget(0); + logWidget->show(); +} + void MainWin::saveStateToSession(const QString &sessionId) { return; SessionSettings s(sessionId); @@ -691,3 +930,8 @@ void MainWin::saveStateToSessionSettings(SessionSettings & s) s.setValue("MainWinPos", pos()); s.setValue("MainWinState", saveState()); } + +void MainWin::showStatusBarMessage(const QString &message) { + statusBar()->showMessage(message, 10000); +} +