# include <KMenuBar>
# include <KShortcutsDialog>
# include <KStatusBar>
+# include <KToolBar>
+#endif
+
+#ifdef Q_WS_X11
+# include <QX11Info>
#endif
#include "aboutdlg.h"
#include "awaylogview.h"
#include "action.h"
#include "actioncollection.h"
+#include "bufferhotlistfilter.h"
#include "buffermodel.h"
#include "bufferview.h"
#include "bufferviewoverlay.h"
#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"
#include "qtuiapplication.h"
#include "qtuimessageprocessor.h"
#include "qtuisettings.h"
-#include "sessionsettings.h"
+#include "qtuistyle.h"
#include "settingsdlg.h"
#include "settingspagedlg.h"
#include "systemtray.h"
#include "settingspages/backlogsettingspage.h"
#include "settingspages/bufferviewsettingspage.h"
#include "settingspages/chatmonitorsettingspage.h"
-#include "settingspages/colorsettingspage.h"
+#include "settingspages/chatviewsettingspage.h"
+#include "settingspages/connectionsettingspage.h"
#include "settingspages/generalsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
_titleSetter(this),
_awayLog(0)
{
+#ifdef Q_WS_WIN
+ dwTickCount = 0;
+#endif
+
QtUiSettings uiSettings;
QString style = uiSettings.value("Style", QString()).toString();
if(!style.isEmpty()) {
updateIcon();
installEventFilter(new JumpKeyHandler(this));
-
- QtUiApplication* app = qobject_cast<QtUiApplication*> 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)),
setupToolBars();
setupSystray();
setupTitleSetter();
+ setupHotList();
#ifndef HAVE_KDE
QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
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 {
}
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() {
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,
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);
+ 0, 0, QKeySequence::Find))->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,
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(reload()), 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() {
_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() {
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);
void MainWin::setupSystray() {
_systemTray = new SystemTray(this);
-
-#ifndef Q_WS_MAC
- connect(systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(systrayActivated(QSystemTrayIcon::ActivationReason)));
-#endif
-
}
void MainWin::setupToolBars() {
#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);
+ _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);
-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();
- }
- }
- }
+ QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
+ _toolbarMenu->addAction(_mainToolBar->toggleViewAction());
}
void MainWin::connectedToCore() {
SettingsDlg *dlg = new SettingsDlg();
//Category: Appearance
- dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
- dlg->registerSettingsPage(new ColorSettingsPage(dlg));
+ dlg->registerSettingsPage(new AppearanceSettingsPage(dlg));
+ dlg->registerSettingsPage(new ChatViewSettingsPage(dlg));
dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
//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));
}
#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<QtUiApplication*> 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();
}
}
-void MainWin::systrayActivated(QSystemTrayIcon::ActivationReason activationReason) {
- if(activationReason == QSystemTrayIcon::Trigger) {
- toggleMinimizedToTray();
- }
+void MainWin::changeEvent(QEvent *event) {
+#ifdef Q_WS_WIN
+ if(event->type() == QEvent::ActivationChange)
+ dwTickCount = GetTickCount(); // needed for toggleMinimizedToTray()
+#endif
+
+ QMainWindow::changeEvent(event);
}
void MainWin::hideToTray() {
qWarning() << Q_FUNC_INFO << "was called with no SystemTray available!";
return;
}
- clearFocus();
hide();
systemTray()->setIconVisible();
}
void MainWin::toggleMinimizedToTray() {
+#ifdef Q_WS_WIN
+ // the problem is that we lose focus when the systray icon is activated
+ // and we don't know the former active window
+ // therefore we watch for activation event and use our stopwatch :)
+ // courtesy: KSystemTrayIcon
+ if(GetTickCount() - dwTickCount >= 300)
+ // we weren't active in the last 300ms -> activate
+ forceActivated();
+ else
+ hideToTray();
+
+#else
+
+ if(!isVisible() || isMinimized())
+ // restore
+ forceActivated();
+ else
+ hideToTray();
+
+#endif
+}
+
+void MainWin::forceActivated() {
+#ifdef Q_WS_X11
+ // Bypass focus stealing prevention
+ QX11Info::setAppUserTime(QX11Info::appTime());
+#endif
+
if(windowState() & Qt::WindowMinimized) {
// restore
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
- show();
- activateWindow();
- raise();
- } else {
- setWindowState((windowState() & ~Qt::WindowActive) | Qt::WindowMinimized);
- hideToTray();
}
+
+ // this does not actually work on all platforms... and causes more evil than good
+ // move(frameGeometry().topLeft()); // avoid placement policies
+ show();
+ raise();
+ activateWindow();
}
void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
Q_UNUSED(parent);
- if(QApplication::activeWindow() != 0)
- return;
+ bool hasFocus = QApplication::activeWindow() != 0;
for(int i = start; i <= end; i++) {
QModelIndex idx = Client::messageModel()->index(i, ChatLineModel::ContentsColumn);
continue;
}
Message::Flags flags = (Message::Flags)idx.data(ChatLineModel::FlagsRole).toInt();
- if(flags.testFlag(Message::Backlog) || flags.testFlag(Message::Self)) 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);
BufferId bufId = idx.data(ChatLineModel::BufferIdRole).value<BufferId>();
BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId);
+ if(hasFocus && bufId == _bufferWidget->currentBuffer())
+ continue;
+
if(flags & Message::Highlight || bufType == BufferInfo::QueryBuffer) {
QModelIndex senderIdx = Client::messageModel()->index(i, ChatLineModel::SenderColumn);
QString sender = senderIdx.data(ChatLineModel::EditRole).toString();
QString contents = idx.data(ChatLineModel::DisplayRole).toString();
- QtUi::invokeNotification(bufId, sender, contents);
+ AbstractNotificationBackend::NotificationType type;
+
+ if(bufType == BufferInfo::QueryBuffer && !hasFocus)
+ type = AbstractNotificationBackend::PrivMsg;
+ else if(bufType == BufferInfo::QueryBuffer && hasFocus)
+ type = AbstractNotificationBackend::PrivMsgFocused;
+ else if(flags & Message::Highlight && !hasFocus)
+ type = AbstractNotificationBackend::Highlight;
+ else
+ type = AbstractNotificationBackend::HighlightFocused;
+
+ QtUi::invokeNotification(bufId, type, sender, contents);
}
}
}
-bool MainWin::event(QEvent *event) {
- if(event->type() == QEvent::WindowActivate)
- QtUi::closeNotifications();
- return QMainWindow::event(event);
-}
-
void MainWin::clientNetworkCreated(NetworkId id) {
const Network *net = Client::network(id);
QAction *act = new QAction(net->networkName(), this);
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<BufferId>();
+ Client::bufferModel()->switchToBuffer(bufferId);
+}
+
void MainWin::on_actionDebugNetworkModel_triggered() {
QTreeView *view = new QTreeView;
view->setAttribute(Qt::WA_DeleteOnClose);
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);
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);
}