From 973cf1bd58ab30e2e27ab9ae0c691211f2d42ee0 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 1 Feb 2018 00:42:06 +0200 Subject: [PATCH] fixes for import/export of MultipleLayouts etc... --- app/importer.cpp | 7 ++++++- app/latteconfigdialog.cpp | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/importer.cpp b/app/importer.cpp index 39cae4b9d..78da7906f 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 801981680..6a0340f8c 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 == Importer::ConfigVersion2) { @@ -402,7 +402,7 @@ void LatteConfigDialog::on_importButton_clicked() if (result == 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(); } });