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 +#include #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(e->objectName(), e));} void addEntry(QCheckBox * e) {checks.push_back(QPair(e->objectName(), e));}