feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AssetExport: Let user open export location

Browse Source 
Change-Id: Ie508552446c9eecd6c2ee47eeb43c25230579040
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Vikas Pachdha
2020-06-18 21:21:25 +02:00
parent c12e3d58ee
commit dff01adf94
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
View File

@@ -28,6 +28,8 @@
#include "assetexportpluginconstants.h" #include "assetexportpluginconstants.h"
#include "filepathmodel.h" #include "filepathmodel.h"
#include "coreplugin/fileutils.h"
#include "coreplugin/icore.h"
#include "projectexplorer/task.h" #include "projectexplorer/task.h"
#include "projectexplorer/taskhub.h" #include "projectexplorer/taskhub.h"
#include "utils/fileutils.h" #include "utils/fileutils.h"
@@ -75,6 +77,14 @@ AssetExportDialog::AssetExportDialog(const Utils::FilePath &exportPath,
m_outputFormatter(new Utils::OutputFormatter()) m_outputFormatter(new Utils::OutputFormatter())
{ {
m_ui->setupUi(this); 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->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
m_ui->stackedWidget->addWidget(m_filesView); 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->buttonBox->button(QDialogButtonBox::Close)->setVisible(false);
m_ui->exportPathEdit->setFileName(exportPath);
m_ui->exportPathEdit->setPromptDialogTitle(tr("Choose Export Path"));
connect(&m_assetExporter, &AssetExporter::stateChanged, connect(&m_assetExporter, &AssetExporter::stateChanged,
this, &AssetExportDialog::onExportStateChanged); this, &AssetExportDialog::onExportStateChanged);
connect(&m_assetExporter, &AssetExporter::exportProgressChanged, connect(&m_assetExporter, &AssetExporter::exportProgressChanged,
@@ -129,7 +136,7 @@ void AssetExportDialog::onExport()
TaskHub::clearTasks(Constants::TASK_CATEGORY_ASSET_EXPORT); TaskHub::clearTasks(Constants::TASK_CATEGORY_ASSET_EXPORT);
m_exportLogs->clear(); 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) void AssetExportDialog::onExportStateChanged(AssetExporter::ParsingState newState)

2
src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui
View File

@@ -15,7 +15,7 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="1"> <item row="0" column="1">
<widget class="Utils::PathChooser" name="exportPathEdit" native="true"/> <widget class="Utils::PathChooser" name="exportPath" native="true"/>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">