From b6532ffe394b364cb1bfe52b4226fd9e922e6840 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Fri, 2 Sep 2022 13:53:34 +0200 Subject: [PATCH] improved msr<->mlog swap dialog. --- src/musredit_qt5/musredit/PTextEdit.cpp | 7 +++++-- src/musredit_qt6/musredit/PTextEdit.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/musredit_qt5/musredit/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp index 392447a8..ccafe48c 100644 --- a/src/musredit_qt5/musredit/PTextEdit.cpp +++ b/src/musredit_qt5/musredit/PTextEdit.cpp @@ -2871,13 +2871,16 @@ void PTextEdit::musrSwapMsrMlog() return; } + if (QMessageBox::information(this, "INFO", + QString("Will now swap files: %1 <-> %2").arg(currentFileName).arg(swapFileName), + QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) + return; + // check if the file needs to be saved if (fTabWidget->tabText(fTabWidget->currentIndex()).indexOf("*") > 0) { // needs to be saved first fileSave(); } - QMessageBox::information(nullptr, "INFO", QString("Will now swap files: %1 <-> %2").arg(currentFileName).arg(swapFileName)); - // swap files // copy currentFile -> tempFile diff --git a/src/musredit_qt6/musredit/PTextEdit.cpp b/src/musredit_qt6/musredit/PTextEdit.cpp index 2b99f3c5..32321af3 100644 --- a/src/musredit_qt6/musredit/PTextEdit.cpp +++ b/src/musredit_qt6/musredit/PTextEdit.cpp @@ -2848,13 +2848,16 @@ void PTextEdit::musrSwapMsrMlog() return; } + if (QMessageBox::information(this, "INFO", + QString("Will now swap files: %1 <-> %2").arg(currentFileName).arg(swapFileName), + QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) + return; + // check if the file needs to be saved if (fTabWidget->tabText(fTabWidget->currentIndex()).indexOf("*") > 0) { // needs to be saved first fileSave(); } - QMessageBox::information(nullptr, "INFO", QString("Will now swap files: %1 <-> %2").arg(currentFileName).arg(swapFileName)); - // swap files // copy currentFile -> tempFile