From 82e6be90a4957aae069fde756f344360ea32403d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Sun, 12 Aug 2018 09:09:21 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@416
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 project_fs/projectfilesystemplugin.cpp |  3 ++-
 qad/graphic/graphic.h                  |  1 +
 qad/widgets/session_manager.cpp        | 12 ++++++++++++
 qad/widgets/session_manager.h          |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/project_fs/projectfilesystemplugin.cpp b/project_fs/projectfilesystemplugin.cpp
index a9d912c..37b3c58 100644
--- a/project_fs/projectfilesystemplugin.cpp
+++ b/project_fs/projectfilesystemplugin.cpp
@@ -54,7 +54,8 @@ namespace ProjectFilesystemPlugin {
 			Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
 
 			qDebug() << Core::IContext::widget();*/
-			addAutoReleasedObject(new ProjectFSWidgetFactory());
+			//addAutoReleasedObject(new ProjectFSWidgetFactory());
+			(new ProjectFSWidgetFactory())->setParent(this);
 
 			return true;
 		}
diff --git a/qad/graphic/graphic.h b/qad/graphic/graphic.h
index 2a6fc19..ed4cdc1 100644
--- a/qad/graphic/graphic.h
+++ b/qad/graphic/graphic.h
@@ -159,6 +159,7 @@ public:
 	bool paused() const {return pause_;}
 	bool onlyExpandY() const {return only_expand_y;}
 	bool onlyExpandX() const {return only_expand_x;}
+	bool isAutofitted() const {return isFit;}
 	int currentGraphic() const {return curGraphic;}
 	int graphicsCount() const {return graphics.size();}
 	Graphic::Buttons buttons() const {return buttons_;}
diff --git a/qad/widgets/session_manager.cpp b/qad/widgets/session_manager.cpp
index 7d2f15c..56a761b 100644
--- a/qad/widgets/session_manager.cpp
+++ b/qad/widgets/session_manager.cpp
@@ -1,6 +1,18 @@
+#include <QApplication>
+#include <QFileInfo>
 #include "session_manager.h"
 
 
+void SessionManager::setFile(const QString & file) {
+	QFileInfo fi(file);
+	if (fi.isAbsolute()) {
+		file_ = file;
+		return;
+	}
+	file_ = QApplication::applicationDirPath() + "/" + file;
+}
+
+
 void SessionManager::save() {
 	if (file_.isEmpty()) return;
 	QPIConfig sr(file_);
diff --git a/qad/widgets/session_manager.h b/qad/widgets/session_manager.h
index cd0ef0f..f851dfa 100644
--- a/qad/widgets/session_manager.h
+++ b/qad/widgets/session_manager.h
@@ -22,7 +22,7 @@ public:
 	SessionManager(const QString & file = QString()) {setFile(file);}
 	~SessionManager() {;}
 
-	void setFile(const QString & file) {file_ = file;}
+	void setFile(const QString & file);
 
 	void addEntry(QMainWindow * e) {mwindows.push_back(QPair<QString, QMainWindow * >(e->objectName(), e));}
 	void addEntry(QCheckBox * e) {checks.push_back(QPair<QString, QCheckBox * >(e->objectName(), e));}