# include <KStatusBar>
#endif
+#ifdef Q_WS_X11
+# include <QX11Info>
+#endif
+
#include "aboutdlg.h"
#include "awaylogfilter.h"
#include "awaylogview.h"
#include "qtuiapplication.h"
#include "qtuimessageprocessor.h"
#include "qtuisettings.h"
-#include "sessionsettings.h"
#include "settingsdlg.h"
#include "settingspagedlg.h"
#include "systemtray.h"
#include "settingspages/bufferviewsettingspage.h"
#include "settingspages/chatmonitorsettingspage.h"
#include "settingspages/colorsettingspage.h"
-#include "settingspages/fontssettingspage.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()) {
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() {
#endif
}
-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();
- }
- }
- }
-}
-
void MainWin::connectedToCore() {
Q_CHECK_PTR(Client::bufferViewManager());
connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigAdded(int)), this, SLOT(addBufferView(int)));
//Category: Appearance
dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
dlg->registerSettingsPage(new ColorSettingsPage(dlg));
- dlg->registerSettingsPage(new FontsSettingsPage(dlg));
dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
}
}
-void MainWin::systrayActivated(QSystemTrayIcon::ActivationReason activationReason) {
- if(activationReason == QSystemTrayIcon::Trigger) {
- toggleMinimizedToTray();
+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)
+ dwTickCount = GetTickCount(); // needed for toggleMinimizedToTray()
+#endif
+
+ event->ignore();
}
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();
}
+
+ move(frameGeometry().topLeft()); // avoid placement policies
+ show();
+ raise();
+ activateWindow();
}
void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
}
}
-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);