From e1fa77510b927bb21b55a107bd6b40e6aa5865aa Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Fri, 23 Apr 2021 18:03:16 +0300
Subject: [PATCH] Remember last selected export format.

---
 ChangeLog.txt                                  |  1 +
 src/app/valentina/dialogs/dialogsavelayout.cpp |  4 ++++
 src/libs/vmisc/vsettings.cpp                   | 13 +++++++++++++
 src/libs/vmisc/vsettings.h                     |  3 +++
 4 files changed, 21 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2caf16eae..51c2103b4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -5,6 +5,7 @@
 - Fix export to DXF AAMA/ASTM.
 - [smart-pattern/valentina#121] Incorrect elliptical arc end angle.
 - [smart-pattern/valentina#122] Extend piece bounding rect.
+- Remember last selected export format.
 
 # Version 0.7.46 Mar 31, 2021
 - Fix incorrect calculation of value for multisize measurements in Valentina.
diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp
index be039617f..dd8dd4c54 100644
--- a/src/app/valentina/dialogs/dialogsavelayout.cpp
+++ b/src/app/valentina/dialogs/dialogsavelayout.cpp
@@ -915,6 +915,8 @@ void DialogSaveLayout::ReadSettings()
     {
         ui->toolButtonLandscape->setChecked(true);
     }
+
+    SelectFormat(static_cast<LayoutExportFormats>(settings->GetLayoutExportFormat()));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -957,5 +959,7 @@ void DialogSaveLayout::WriteSettings() const
     {
         settings->SetTiledPDFOrientation(PageOrientation::Landscape);
     }
+
+    settings->SetLayoutExportFormat(static_cast<qint8>(Format()));
 }
 
diff --git a/src/libs/vmisc/vsettings.cpp b/src/libs/vmisc/vsettings.cpp
index eb7686786..446d8605d 100644
--- a/src/libs/vmisc/vsettings.cpp
+++ b/src/libs/vmisc/vsettings.cpp
@@ -103,6 +103,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingMultiplier, (QLatin1String("layo
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTextAsPaths, (QLatin1String("layout/textAsPaths")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingNestingTime, (QLatin1String("layout/time")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingEfficiencyCoefficient, (QLatin1String("layout/efficiencyCoefficient")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutExportFormat, (QLatin1String("layout/exportFormat")))
 
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTiledPDFPaperHeight, (QLatin1String("tiledPDF/paperHeight")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTiledPDFPaperWidth, (QLatin1String("tiledPDF/paperWidth")))
@@ -770,6 +771,18 @@ void VSettings::SetToolPanelScaling(const bool &value)
     setValue(*settingToolPanelScaling, value);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+auto VSettings::GetLayoutExportFormat() const -> qint8
+{
+    return qvariant_cast<qint8>(value(*settingLayoutExportFormat, 0));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VSettings::SetLayoutExportFormat(qint8 format)
+{
+    setValue(*settingLayoutExportFormat, format);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 template<typename T>
 T VSettings::GetCachedValue(T &cache, const QString &setting, T defValue, T valueMin, T valueMax) const
diff --git a/src/libs/vmisc/vsettings.h b/src/libs/vmisc/vsettings.h
index 3f9133426..41841b370 100644
--- a/src/libs/vmisc/vsettings.h
+++ b/src/libs/vmisc/vsettings.h
@@ -203,6 +203,9 @@ public:
     bool GetToolPanelScaling() const;
     void SetToolPanelScaling(const bool &value);
 
+    auto GetLayoutExportFormat() const -> qint8;
+    void SetLayoutExportFormat(qint8 format);
+
 private:
     Q_DISABLE_COPY(VSettings)