From 8731318fefad35acb8a2df408ef809dead1c7c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 28 Oct 2016 03:36:29 +0200 Subject: GH-1652 save all instance settings on launch if instance window is already open --- application/widgets/PageContainer.cpp | 2 +- application/widgets/PageContainer.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'application/widgets') diff --git a/application/widgets/PageContainer.cpp b/application/widgets/PageContainer.cpp index 24814d57..840b39d4 100644 --- a/application/widgets/PageContainer.cpp +++ b/application/widgets/PageContainer.cpp @@ -215,7 +215,7 @@ void PageContainer::currentChanged(const QModelIndex ¤t) showPage(current.isValid() ? m_proxyModel->mapToSource(current).row() : -1); } -bool PageContainer::requestClose(QCloseEvent *event) +bool PageContainer::prepareToClose() { for (auto page : m_model->pages()) { diff --git a/application/widgets/PageContainer.h b/application/widgets/PageContainer.h index 93971209..e7dc8b08 100644 --- a/application/widgets/PageContainer.h +++ b/application/widgets/PageContainer.h @@ -41,7 +41,11 @@ public: void addButtons(QWidget * buttons); void addButtons(QLayout * buttons); - bool requestClose(QCloseEvent *event); + /* + * Save any unsaved state and prepare to be closed. + * @return true if everything can be saved, false if there is something that requires attention + */ + bool prepareToClose(); virtual bool selectPage(QString pageId) override; -- cgit v1.2.3