From kde-commits  Wed Jan 31 22:42:47 2018
From: Michail Vourlakos <null () kde ! org>
Date: Wed, 31 Jan 2018 22:42:47 +0000
To: kde-commits
Subject: [latte-dock] app: fixes for import/export of MultipleLayouts etc...
Message-Id: <E1eh15b-0004ct-C3 () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=151743858130133

Git commit 973cf1bd58ab30e2e27ab9ae0c691211f2d42ee0 by Michail Vourlakos.
Committed on 31/01/2018 at 22:42.
Pushed by mvourlakos into branch 'master'.

fixes for import/export of MultipleLayouts etc...

M  +6    -1    app/importer.cpp
M  +2    -2    app/latteconfigdialog.cpp

https://commits.kde.org/latte-dock/973cf1bd58ab30e2e27ab9ae0c691211f2d42ee0

diff --git a/app/importer.cpp b/app/importer.cpp
index 39cae4b..78da790 100644
--- a/app/importer.cpp
+++ b/app/importer.cpp
@@ -331,7 +331,12 @@ bool Importer::exportFullConfiguration(QString file)
     }
 =

     archive.addLocalFile(QString(QDir::homePath() + "/.config/lattedockrc"=
), QStringLiteral("lattedockrc"));
-    archive.addLocalDirectory(QString(QDir::homePath() + "/.config/latte")=
, QStringLiteral("latte"));
+
+    foreach (auto layoutName, availableLayouts()) {
+        archive.addLocalFile(layoutFilePath(layoutName), QString("latte/" =
+ layoutName + ".layout.latte"));
+    }
+
+    //archive.addLocalDirectory(QString(QDir::homePath() + "/.config/latte=
"), QStringLiteral("latte"));
 =

     archive.close();
 =

diff --git a/app/latteconfigdialog.cpp b/app/latteconfigdialog.cpp
index 8019816..6a0340f 100644
--- a/app/latteconfigdialog.cpp
+++ b/app/latteconfigdialog.cpp
@@ -386,7 +386,7 @@ void LatteConfigDialog::on_importButton_clicked()
             connect(fullBtn, &QPushButton::clicked
             , this, [ &, file](bool check) {
                 //!NOTE: Restart latte for import the new configuration
-                QProcess::startDetached(qGuiApp->applicationFilePath() + "=
 --import \"" + file + "\"");
+                QProcess::startDetached(qGuiApp->applicationFilePath() + "=
 --import-full \"" + file + "\"");
                 qGuiApp->exit();
             });
         } else if (version =3D=3D Importer::ConfigVersion2) {
@@ -402,7 +402,7 @@ void LatteConfigDialog::on_importButton_clicked()
                 if (result =3D=3D QMessageBox::Yes) {
                     //!NOTE: Restart latte for import the new configuration
                     msg->deleteLater();
-                    QProcess::startDetached(qGuiApp->applicationFilePath()=
 + " --import \"" + file + "\"");
+                    QProcess::startDetached(qGuiApp->applicationFilePath()=
 + " --import-full \"" + file + "\"");
                     qGuiApp->exit();
                 }
             });