X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=0bd221d4134cd8a972a9847c4255ff2d4290fe77;hp=3a3a3fe3c7af1afbc0ff0854b47f378236a74bd2;hb=ef316d0db50a39efe45d71fe2eb4ea880724526b;hpb=11f042e025f1e8e304c3de2cb7d3b55de39d9ed6 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 3a3a3fe3..0bd221d4 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -26,6 +26,7 @@ # include # include # include +# include #endif #ifdef Q_WS_X11 @@ -37,6 +38,7 @@ #include "awaylogview.h" #include "action.h" #include "actioncollection.h" +#include "bufferhotlistfilter.h" #include "buffermodel.h" #include "bufferview.h" #include "bufferviewoverlay.h" @@ -55,8 +57,10 @@ #include "coreinfodlg.h" #include "coreconnectdlg.h" #include "contextmenuactionprovider.h" +#include "debugbufferviewoverlay.h" #include "debuglogwidget.h" #include "debugmessagemodelfilter.h" +#include "flatproxymodel.h" #include "iconloader.h" #include "inputwidget.h" #include "inputline.h" @@ -68,6 +72,7 @@ #include "qtuiapplication.h" #include "qtuimessageprocessor.h" #include "qtuisettings.h" +#include "qtuistyle.h" #include "settingsdlg.h" #include "settingspagedlg.h" #include "systemtray.h" @@ -94,6 +99,7 @@ #include "settingspages/bufferviewsettingspage.h" #include "settingspages/chatmonitorsettingspage.h" #include "settingspages/colorsettingspage.h" +#include "settingspages/connectionsettingspage.h" #include "settingspages/generalsettingspage.h" #include "settingspages/highlightsettingspage.h" #include "settingspages/identitiessettingspage.h" @@ -130,20 +136,9 @@ MainWin::MainWin(QWidget *parent) updateIcon(); installEventFilter(new JumpKeyHandler(this)); - - QtUiApplication* app = qobject_cast qApp; - connect(app, SIGNAL(saveStateToSession(const QString&)), SLOT(saveStateToSession(const QString&))); - connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), SLOT(saveStateToSessionSettings(SessionSettings&))); } void MainWin::init() { - QtUiSettings s; - if(s.value("MainWinSize").isValid()) - resize(s.value("MainWinSize").toSize()); - else - resize(QSize(800, 500)); - - 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)), @@ -169,6 +164,7 @@ void MainWin::init() { setupToolBars(); setupSystray(); setupTitleSetter(); + setupHotList(); #ifndef HAVE_KDE QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this)); @@ -184,16 +180,19 @@ void MainWin::init() { QtUi::registerNotificationBackend(new KNotificationBackend(this)); #endif /* HAVE_KDE */ + setDisconnectedState(); // Disable menus and stuff + +#ifdef HAVE_KDE + setAutoSaveSettings(); +#endif + // restore mainwin state - restoreState(s.value("MainWinState").toByteArray()); + QtUiSettings s; + restoreStateFromSettings(s); // restore locked state of docks QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool()); - setDisconnectedState(); // Disable menus and stuff - - show(); - if(Quassel::runMode() != Quassel::Monolithic) { showCoreConnectionDlg(true); // autoconnect if appropriate } else { @@ -202,10 +201,58 @@ void MainWin::init() { } MainWin::~MainWin() { + +} + +void MainWin::quit() { QtUiSettings s; - s.setValue("MainWinSize", size()); - s.setValue("MainWinPos", pos()); + saveStateToSettings(s); + saveLayout(); + QApplication::quit(); +} + +void MainWin::saveStateToSettings(UiSettings &s) { + s.setValue("MainWinSize", _normalSize); + s.setValue("MainWinPos", _normalPos); s.setValue("MainWinState", saveState()); + s.setValue("MainWinGeometry", saveGeometry()); + s.setValue("MainWinMinimized", isMinimized()); + s.setValue("MainWinMaximized", isMaximized()); + s.setValue("MainWinHidden", !isVisible()); + +#ifdef HAVE_KDE + saveAutoSaveSettings(); +#endif +} + +void MainWin::restoreStateFromSettings(UiSettings &s) { + _normalSize = s.value("MainWinSize", size()).toSize(); + _normalPos = s.value("MainWinPos", pos()).toPoint(); + bool maximized = s.value("MainWinMaximized", false).toBool(); + +#ifndef HAVE_KDE + restoreGeometry(s.value("MainWinGeometry").toByteArray()); + + if(maximized) { + // restoreGeometry() fails if the windows was maximized, so we resize and position explicitly + resize(_normalSize); + move(_normalPos); + } + + restoreState(s.value("MainWinState").toByteArray()); + +#else + move(_normalPos); +#endif + + if(s.value("MainWinHidden").toBool()) + hideToTray(); + else if(s.value("MainWinMinimized").toBool()) + showMinimized(); + else if(maximized) + showMaximized(); + else + show(); } void MainWin::updateIcon() { @@ -236,7 +283,7 @@ void MainWin::setupActions() { 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"))); + this, SLOT(quit()), tr("Ctrl+Q"))); // View coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll, @@ -268,8 +315,16 @@ void MainWin::setupActions() { this, SLOT(on_actionDebugBufferViewOverlay_triggered()))); coll->addAction("DebugMessageModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &MessageModel"), coll, this, SLOT(on_actionDebugMessageModel_triggered()))); + coll->addAction("DebugHotList", new Action(SmallIcon("tools-report-bug"), tr("Debug &HotList"), coll, + this, SLOT(on_actionDebugHotList_triggered()))); coll->addAction("DebugLog", new Action(SmallIcon("tools-report-bug"), tr("Debug &Log"), coll, this, SLOT(on_actionDebugLog_triggered()))); + coll->addAction("ReloadStyle", new Action(SmallIcon("view-refresh"), tr("Reload Stylesheet"), coll, + QtUi::style(), SLOT(loadStyleSheet()), QKeySequence::Refresh)); + + // Navigation + coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot buffer"), coll, + this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A))); } void MainWin::setupMenus() { @@ -328,7 +383,10 @@ void MainWin::setupMenus() { _helpDebugMenu->addAction(coll->action("DebugNetworkModel")); _helpDebugMenu->addAction(coll->action("DebugBufferViewOverlay")); _helpDebugMenu->addAction(coll->action("DebugMessageModel")); + _helpDebugMenu->addAction(coll->action("DebugHotList")); _helpDebugMenu->addAction(coll->action("DebugLog")); + _helpDebugMenu->addSeparator(); + _helpDebugMenu->addAction(coll->action("ReloadStyle")); } void MainWin::setupBufferWidget() { @@ -551,6 +609,12 @@ void MainWin::setupStatusBar() { connect(showStatusbar, SIGNAL(toggled(bool)), this, SLOT(saveStatusBarStatus(bool))); } +void MainWin::setupHotList() { + FlatProxyModel *flatProxy = new FlatProxyModel(this); + flatProxy->setSourceModel(Client::bufferModel()); + _bufferHotList = new BufferHotListFilter(flatProxy); +} + void MainWin::saveStatusBarStatus(bool enabled) { QtUiSettings uiSettings; uiSettings.setValue("ShowStatusBar", enabled); @@ -569,20 +633,18 @@ void MainWin::setupToolBars() { #ifdef Q_WS_MAC setUnifiedTitleAndToolBarOnMac(true); #endif - _mainToolBar = addToolBar(tr("Main Toolbar")); + +#ifdef HAVE_KDE + _mainToolBar = new KToolBar("MainToolBar", this, Qt::TopToolBarArea, false, true, true); +#else + _mainToolBar = new QToolBar(this); _mainToolBar->setObjectName("MainToolBar"); +#endif + _mainToolBar->setWindowTitle(tr("Main Toolbar")); + addToolBar(_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::connectedToCore() { @@ -756,6 +818,7 @@ void MainWin::showSettingsDlg() { //Category: Misc dlg->registerSettingsPage(new GeneralSettingsPage(dlg)); + dlg->registerSettingsPage(new ConnectionSettingsPage(dlg)); dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg)); dlg->registerSettingsPage(new NetworksSettingsPage(dlg)); dlg->registerSettingsPage(new AliasesSettingsPage(dlg)); @@ -773,43 +836,48 @@ void MainWin::showShortcutsDlg() { } #endif +/********************************************************************************************************/ + +bool MainWin::event(QEvent *event) { + if(event->type() == QEvent::WindowActivate) + QtUi::closeNotifications(); + return QMainWindow::event(event); +} + +void MainWin::moveEvent(QMoveEvent *event) { + if(!(windowState() & Qt::WindowMaximized)) + _normalPos = event->pos(); + + QMainWindow::moveEvent(event); +} + +void MainWin::resizeEvent(QResizeEvent *event) { + if(!(windowState() & Qt::WindowMaximized)) + _normalSize = event->size(); + + QMainWindow::resizeEvent(event); +} + void MainWin::closeEvent(QCloseEvent *event) { QtUiSettings s; QtUiApplication* app = qobject_cast qApp; Q_ASSERT(app); - if(!app->aboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) { - toggleMinimizedToTray(); + if(!app->isAboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) { + hideToTray(); event->ignore(); } else { event->accept(); - QApplication::quit(); + quit(); } } -bool MainWin::event(QEvent *event) { - if(event->type() == QEvent::WindowActivate) - QtUi::closeNotifications(); - return QMainWindow::event(event); -} - void MainWin::changeEvent(QEvent *event) { - if(event->type() == QEvent::WindowStateChange) { - if(windowState() & Qt::WindowMinimized) { - QtUiSettings s; - if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) { - hideToTray(); - event->accept(); - return; - } - } - } - #ifdef Q_WS_WIN - else if(event->type() == QEvent::ActivationChange) + if(event->type() == QEvent::ActivationChange) dwTickCount = GetTickCount(); // needed for toggleMinimizedToTray() #endif - event->ignore(); + QMainWindow::changeEvent(event); } void MainWin::hideToTray() { @@ -855,7 +923,8 @@ void MainWin::forceActivated() { setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); } - move(frameGeometry().topLeft()); // avoid placement policies + // this does not actually work on all platforms... and causes more evil than good + // move(frameGeometry().topLeft()); // avoid placement policies show(); raise(); activateWindow(); @@ -964,6 +1033,15 @@ void MainWin::connectOrDisconnectFromNet() { else net->requestDisconnect(); } +void MainWin::on_jumpHotBuffer_triggered() { + if(!_bufferHotList->rowCount()) + return; + + QModelIndex topIndex = _bufferHotList->index(0, 0); + BufferId bufferId = _bufferHotList->data(topIndex, NetworkModel::BufferIdRole).value(); + Client::bufferModel()->switchToBuffer(bufferId); +} + void MainWin::on_actionDebugNetworkModel_triggered() { QTreeView *view = new QTreeView; view->setAttribute(Qt::WA_DeleteOnClose); @@ -976,20 +1054,19 @@ void MainWin::on_actionDebugNetworkModel_triggered() { view->show(); } -void MainWin::on_actionDebugBufferViewOverlay_triggered() { +void MainWin::on_actionDebugHotList_triggered() { QTreeView *view = new QTreeView; view->setAttribute(Qt::WA_DeleteOnClose); - view->setWindowTitle("Debug BufferViewOverlay View"); - BufferViewOverlayFilter *filter = new BufferViewOverlayFilter(Client::bufferModel(), Client::bufferViewOverlay()); - filter->setParent(view); - view->setModel(filter); - view->setColumnWidth(0, 250); - view->setColumnWidth(1, 250); - view->setColumnWidth(2, 80); - view->resize(610, 300); + view->setModel(_bufferHotList); view->show(); } +void MainWin::on_actionDebugBufferViewOverlay_triggered() { + DebugBufferViewOverlay *overlay = new DebugBufferViewOverlay(0); + overlay->setAttribute(Qt::WA_DeleteOnClose); + overlay->show(); +} + void MainWin::on_actionDebugMessageModel_triggered() { QTableView *view = new QTableView(0); DebugMessageModelFilter *filter = new DebugMessageModelFilter(view); @@ -1006,22 +1083,6 @@ void MainWin::on_actionDebugLog_triggered() { logWidget->show(); } -void MainWin::saveStateToSession(const QString &sessionId) { - return; - SessionSettings s(sessionId); - - s.setValue("MainWinSize", size()); - s.setValue("MainWinPos", pos()); - s.setValue("MainWinState", saveState()); -} - -void MainWin::saveStateToSessionSettings(SessionSettings & s) -{ - s.setValue("MainWinSize", size()); - s.setValue("MainWinPos", pos()); - s.setValue("MainWinState", saveState()); -} - void MainWin::showStatusBarMessage(const QString &message) { statusBar()->showMessage(message, 10000); }