#include "inputwidget.h"
#include "verticaldock.h"
#include "uisettings.h"
+#include "qtuisettings.h"
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
#include "settingspages/fontssettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/networkssettingspage.h"
+#include "settingspages/generalsettingspage.h"
#include "debugconsole.h"
}
void MainWin::init() {
- UiSettings s;
+ QtUiSettings s;
resize(s.value("MainWinSize").toSize());
Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
setupTopicWidget();
setupSystray();
+
setupSettingsDlg();
// restore mainwin state
}
MainWin::~MainWin() {
-
+ QtUiSettings s;
+ s.setValue("MainWinSize", size());
+ s.setValue("MainWinPos", pos());
+ s.setValue("MainWinState", saveState());
}
void MainWin::setupMenus() {
connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));
+ connect(ui.actionQuit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit()));
//connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
-
+ settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg));
+
#ifdef SPUTDEV
connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME
#endif
systrayMenu->addSeparator();
systrayMenu->addAction(ui.actionQuit);
-// systray->setContextMenu(systrayMenu);
+ systray->setContextMenu(systrayMenu);
- systray->show();
+ QtUiSettings s;
+ if(s.value("UseSystemTrayIcon").toBool()) {
+ systray->show();
+ }
+
+ #ifndef Q_WS_MAC
connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
+ #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()) {
+ toggleVisibility();
+ }
+ }
+ }
}
void MainWin::connectedToCore() {
debugConsole->show();
}
-void MainWin::closeEvent(QCloseEvent *event)
-{
- //if (userReallyWantsToQuit()) {
- UiSettings s;
- s.setValue("MainWinSize", size());
- s.setValue("MainWinPos", pos());
- s.setValue("MainWinState", saveState());
+void MainWin::closeEvent(QCloseEvent *event) {
+ QtUiSettings s;
+ if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
+ toggleVisibility();
+ event->ignore();
+ } else {
event->accept();
- //} else {
- //event->ignore();
- //}
+ }
}
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
if (activationReason == QSystemTrayIcon::Trigger) {
- if(isHidden()) {
- show();
- if(isMinimized()) {
- if(isMaximized()) {
- showMaximized();
- } else {
- showNormal();
- }
+ toggleVisibility();
+ }
+}
+
+void MainWin::toggleVisibility() {
+ if(isHidden()) {
+ show();
+ if(isMinimized()) {
+ if(isMaximized()) {
+ showMaximized();
+ } else {
+ showNormal();
}
- raise();
- activateWindow();
- } else {
- hide();
}
- }
- else {
- systrayMenu->popup(QCursor::pos());
+ raise();
+ activateWindow();
+ } else {
+ hide();
}
}