From d820191e8a5a56e48db98577f49dbaf43d578843 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Tue, 12 Sep 2017 11:50:23 +0300
Subject: [PATCH] User "home" folder now supports label templates.

--HG--
branch : develop
---
 src/libs/vmisc/vcommonsettings.cpp            | 12 ++++++++
 src/libs/vmisc/vcommonsettings.h              |  2 ++
 .../dialogs/support/dialogeditlabel.cpp       | 28 ++++---------------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp
index a8856cc03..063423140 100644
--- a/src/libs/vmisc/vcommonsettings.cpp
+++ b/src/libs/vmisc/vcommonsettings.cpp
@@ -255,6 +255,12 @@ QString VCommonSettings::StandardTemplatesPath()
     return SharePath(QStringLiteral("/tables/templates"));
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QString VCommonSettings::LabelTemplatesPath()
+{
+    return SharePath(QStringLiteral("/labels"));
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QString VCommonSettings::PrepareStandardTemplates(const QString & currentPath)
 {
@@ -267,6 +273,12 @@ QString VCommonSettings::PrepareMultisizeTables(const QString &currentPath)
     return PrepareStandardFiles(currentPath, MultisizeTablesPath(), GetDefPathMultisizeMeasurements());
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QString VCommonSettings::PrepareLabelTemplates(const QString &currentPath)
+{
+    return PrepareStandardFiles(currentPath, LabelTemplatesPath(), GetDefPathLabelTemplate());
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QString VCommonSettings::GetDefPathIndividualMeasurements()
 {
diff --git a/src/libs/vmisc/vcommonsettings.h b/src/libs/vmisc/vcommonsettings.h
index 1d49f00ba..2232d0ec5 100644
--- a/src/libs/vmisc/vcommonsettings.h
+++ b/src/libs/vmisc/vcommonsettings.h
@@ -50,9 +50,11 @@ public:
     static QString SharePath(const QString &shareItem);
     static QString MultisizeTablesPath();
     static QString StandardTemplatesPath();
+    static QString LabelTemplatesPath();
 
     static QString PrepareStandardTemplates(const QString &currentPath);
     static QString PrepareMultisizeTables(const QString &currentPath);
+    static QString PrepareLabelTemplates(const QString &currentPath);
 
     static QString GetDefPathIndividualMeasurements();
     QString GetPathIndividualMeasurements() const;
diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
index ed7a34a7b..16925302e 100644
--- a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
+++ b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
@@ -287,31 +287,14 @@ void DialogEditLabel::NewTemplate()
 void DialogEditLabel::ExportTemplate()
 {
     QString filters(tr("Label template") + QLatin1String("(*.xml)"));
-    QString dir = qApp->Settings()->GetPathLabelTemplate();
-
-    bool usedNotExistedDir = false;
-    QDir directory(dir);
-    if (not directory.exists())
-    {
-        usedNotExistedDir = directory.mkpath(".");
-    }
+    const QString path = VCommonSettings::PrepareLabelTemplates(qApp->Settings()->GetPathLabelTemplate());
 
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export label template"),
-                                                    dir + QLatin1String("/") + tr("template") + QLatin1String(".xml"),
+                                                    path + QLatin1String("/") + tr("template") + QLatin1String(".xml"),
                                                     filters, nullptr, QFileDialog::DontUseNativeDialog);
 
-    auto RemoveTempDir = [usedNotExistedDir, dir]()
-    {
-        if (usedNotExistedDir)
-        {
-            QDir directory(dir);
-            directory.rmpath(".");
-        }
-    };
-
     if (fileName.isEmpty())
     {
-        RemoveTempDir();
         return;
     }
 
@@ -337,8 +320,6 @@ void DialogEditLabel::ExportTemplate()
         messageBox.setStandardButtons(QMessageBox::Ok);
         messageBox.exec();
     }
-
-    RemoveTempDir();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -357,8 +338,9 @@ void DialogEditLabel::ImportTemplate()
     }
 
     QString filter(tr("Label template") + QLatin1String("(*.xml)"));
-    const QString fileName = QFileDialog::getOpenFileName(this, tr("Import template"),
-                                                          qApp->Settings()->GetPathLabelTemplate(), filter, nullptr,
+    //Use standard path to label templates
+    const QString path = VCommonSettings::PrepareLabelTemplates(qApp->Settings()->GetPathLabelTemplate());
+    const QString fileName = QFileDialog::getOpenFileName(this, tr("Import template"), path, filter, nullptr,
                                                           QFileDialog::DontUseNativeDialog);
     if (fileName.isEmpty())
     {