bool Quassel::_initialized = false;
bool Quassel::DEBUG = false;
QString Quassel::_coreDumpFileName;
+Quassel *Quassel::_instance = 0;
Quassel::Quassel() {
+ Q_ASSERT(!_instance);
+ _instance = this;
+
// We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
signal(SIGTERM, handleSignal);
signal(SIGINT, handleSignal);
return true;
}
+void Quassel::quit() {
+ QCoreApplication::quit();
+}
+
//! Register our custom types with Qt's Meta Object System.
/** This makes them available for QVariant and in signals/slots, among other things.
*
case SIGTERM:
case SIGINT:
qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig)));
- QCoreApplication::quit();
+ if(_instance)
+ _instance->quit();
+ else
+ QCoreApplication::quit();
break;
case SIGABRT:
case SIGSEGV:
updateIcon();
installEventFilter(new JumpKeyHandler(this));
-
- QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
- connect(app, SIGNAL(aboutToQuit()), SLOT(aboutToQuit()));
}
void MainWin::init() {
- 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)),
setDisconnectedState(); // Disable menus and stuff
+#ifdef HAVE_KDE
+ setAutoSaveSettings();
+#endif
+
// restore mainwin state
QtUiSettings s;
restoreStateFromSettings(s);
}
-void MainWin::aboutToQuit() {
+void MainWin::quit() {
QtUiSettings s;
saveStateToSettings(s);
+ saveLayout();
+ QApplication::quit();
}
void MainWin::saveStateToSettings(UiSettings &s) {
s.setValue("MainWinGeometry", saveGeometry());
s.setValue("MainWinMinimized", isMinimized());
s.setValue("MainWinMaximized", isMaximized());
- s.setValue("MainWinHidden", _isHidden);
+ s.setValue("MainWinHidden", !isVisible());
+
+#ifdef HAVE_KDE
+ saveAutoSaveSettings();
+#endif
}
void MainWin::restoreStateFromSettings(UiSettings &s) {
_normalPos = s.value("MainWinPos", pos()).toPoint();
bool maximized = s.value("MainWinMaximized", false).toBool();
+#ifndef HAVE_KDE
restoreGeometry(s.value("MainWinGeometry").toByteArray());
if(maximized) {
restoreState(s.value("MainWinState").toByteArray());
- _isHidden = false;
+#else
+ move(_normalPos);
+#endif
+
if(s.value("MainWinHidden").toBool())
hideToTray();
else if(s.value("MainWinMinimized").toBool())
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,
event->ignore();
} else {
event->accept();
- QApplication::quit();
+ quit();
}
}
}
hide();
systemTray()->setIconVisible();
- _isHidden = true;
}
void MainWin::toggleMinimizedToTray() {
show();
raise();
activateWindow();
- _isHidden = false;
}
void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {