From dff01adf94f9d1560a038af7b3eb43d04e5c12ca Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Thu, 18 Jun 2020 21:21:25 +0200 Subject: [PATCH] AssetExport: Let user open export location Change-Id: Ie508552446c9eecd6c2ee47eeb43c25230579040 Reviewed-by: Leena Miettinen Reviewed-by: Tim Jenssen --- .../assetexporterplugin/assetexportdialog.cpp | 15 +++++++++++---- .../assetexporterplugin/assetexportdialog.ui | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp index ee5c9af64c1..dee7dc5462d 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp @@ -28,6 +28,8 @@ #include "assetexportpluginconstants.h" #include "filepathmodel.h" +#include "coreplugin/fileutils.h" +#include "coreplugin/icore.h" #include "projectexplorer/task.h" #include "projectexplorer/taskhub.h" #include "utils/fileutils.h" @@ -75,6 +77,14 @@ AssetExportDialog::AssetExportDialog(const Utils::FilePath &exportPath, m_outputFormatter(new Utils::OutputFormatter()) { m_ui->setupUi(this); + + m_ui->exportPath->setFileName(exportPath); + m_ui->exportPath->setPromptDialogTitle(tr("Choose Export Path")); + m_ui->exportPath->lineEdit()->setReadOnly(true); + m_ui->exportPath->addButton(tr("Open"), this, [this]() { + Core::FileUtils::showInGraphicalShell(Core::ICore::mainWindow(), m_ui->exportPath->path()); + }); + m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(false); m_ui->stackedWidget->addWidget(m_filesView); @@ -103,9 +113,6 @@ AssetExportDialog::AssetExportDialog(const Utils::FilePath &exportPath, }); m_ui->buttonBox->button(QDialogButtonBox::Close)->setVisible(false); - m_ui->exportPathEdit->setFileName(exportPath); - m_ui->exportPathEdit->setPromptDialogTitle(tr("Choose Export Path")); - connect(&m_assetExporter, &AssetExporter::stateChanged, this, &AssetExportDialog::onExportStateChanged); connect(&m_assetExporter, &AssetExporter::exportProgressChanged, @@ -129,7 +136,7 @@ void AssetExportDialog::onExport() TaskHub::clearTasks(Constants::TASK_CATEGORY_ASSET_EXPORT); m_exportLogs->clear(); - m_assetExporter.exportQml(m_filePathModel.files(), m_ui->exportPathEdit->fileName()); + m_assetExporter.exportQml(m_filePathModel.files(), m_ui->exportPath->fileName()); } void AssetExportDialog::onExportStateChanged(AssetExporter::ParsingState newState) diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui index fb45d9c19d2..38c2152098c 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui @@ -15,7 +15,7 @@ - +