From 9374f18d54e82acc6d641869911413300ec12224 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Sat, 1 Apr 2017 16:12:48 +0200 Subject: [PATCH] make save as msr-file path more transparent for the user. --- src/musredit_qt5/musrWiz/PMusrWiz.cpp | 12 +++++++++++- src/musredit_qt5/musrWiz/PMusrWiz.h | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/musredit_qt5/musrWiz/PMusrWiz.cpp b/src/musredit_qt5/musrWiz/PMusrWiz.cpp index b374740d..71179ba9 100644 --- a/src/musredit_qt5/musrWiz/PMusrWiz.cpp +++ b/src/musredit_qt5/musrWiz/PMusrWiz.cpp @@ -1769,15 +1769,23 @@ PConclusionPage::PConclusionPage(PAdmin *admin, PMsrData *data, QString *msrFile fAdmin(admin), fMsrData(data) { + QDir ddir = QDir(*fMsrFilePath); + setTitle("

Create

"); setSubTitle("Now we create the msr-file."); QVBoxLayout *vLayout = new QVBoxLayout; + fMsrPathFileLabel = new QLabel("Current msr-File Path:"); + fMsrFilePathLineEdit = new QLineEdit(ddir.absolutePath()); + fMsrFilePathLineEdit->setReadOnly(true); fSaveAsMsrFile = new QPushButton("Save As (msr-file path)"); fSaveAsTemplate = new QPushButton("Save As (template)"); + vLayout->addWidget(fMsrPathFileLabel); + vLayout->addWidget(fMsrFilePathLineEdit); vLayout->addWidget(fSaveAsMsrFile); + vLayout->addStretch(1); vLayout->addWidget(fSaveAsTemplate); setLayout(vLayout); @@ -1791,8 +1799,10 @@ void PConclusionPage::saveAsMsrFile() { QString str = QFileDialog::getExistingDirectory(this, tr("Save in Directory"), "./", QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); - if (!str.isEmpty()) + if (!str.isEmpty()) { *fMsrFilePath = str; + fMsrFilePathLineEdit->setText(str); + } } //------------------------------------------------------------------------- diff --git a/src/musredit_qt5/musrWiz/PMusrWiz.h b/src/musredit_qt5/musrWiz/PMusrWiz.h index d95a65d7..711d286a 100644 --- a/src/musredit_qt5/musrWiz/PMusrWiz.h +++ b/src/musredit_qt5/musrWiz/PMusrWiz.h @@ -370,6 +370,8 @@ class PConclusionPage : public QWizardPage PAdmin *fAdmin; PMsrData *fMsrData; + QLabel *fMsrPathFileLabel; + QLineEdit *fMsrFilePathLineEdit; QPushButton *fSaveAsMsrFile; QPushButton *fSaveAsTemplate; };