From 6a84167a581240ce2d8fac91748e05dda0ac0dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 25 May 2020 11:49:49 +0300 Subject: [PATCH] add default session path --- qad/widgets/session_manager.cpp | 27 +++++++++++++++++---------- qad/widgets/session_manager.h | 3 +-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/qad/widgets/session_manager.cpp b/qad/widgets/session_manager.cpp index 065bcdb..e05d830 100644 --- a/qad/widgets/session_manager.cpp +++ b/qad/widgets/session_manager.cpp @@ -7,6 +7,15 @@ # include #endif #include "session_manager.h" +#include "qad_locations.h" + + +SessionManager::SessionManager(QString file) { + if (file.isEmpty() && !QCoreApplication::applicationName().isEmpty()) { + file = QAD::userPath(QAD::ltConfig, "session"); + } + setFile(file); +} void SessionManager::setFile(const QString & file) { @@ -34,7 +43,10 @@ void SessionManager::removeMainWidget(QWidget * e) { void SessionManager::save() { - if (file_.isEmpty()) return; + if (file_.isEmpty()) { + qDebug() << "[SessionManager] filename is empty"; + return; + } QPIConfig sr(file_); QObjectList tsc; for (int i = 0; i < mwindows.size(); ++i) { @@ -137,19 +149,14 @@ void restoreWindowState(QWidget * w, QPIConfig & sr, QString name) { srect.y() + (srect.height() - w->height()) / 2, w->width(), w->height()); } - /*if (w->windowState().testFlag(Qt::WindowMaximized)) { - foreach (QScreen * s, sl) { - if (s->geometry().contains(w->geometry())) { - //w->setGeometry(s->availableGeometry()); - break; - } - } - }*/ } void SessionManager::load(bool onlyMainwindow) { - if (file_.isEmpty()) return; + if (file_.isEmpty()) { + qDebug() << "[SessionManager] filename is empty"; + return; + } QPIConfig sr(file_); QObjectList tsc; for (int i = 0; i < mwindows.size(); ++i) { diff --git a/qad/widgets/session_manager.h b/qad/widgets/session_manager.h index faf058b..d788b2c 100644 --- a/qad/widgets/session_manager.h +++ b/qad/widgets/session_manager.h @@ -47,8 +47,7 @@ class QAD_EXPORT SessionManager: public QObject { Q_OBJECT public: - SessionManager(const QString & file = QString()) {setFile(file);} - ~SessionManager() {;} + SessionManager(QString file = QString()); void setFile(const QString & file);