From 2ba6e8a23040b65e9532ec549fa908252d836347 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Fri, 2 Sep 2022 13:26:49 +0200
Subject: [PATCH 1/4] make sure that the minimum height of musrStep is not
 larger than the available screen resolution height.

---
 src/musredit_qt5/musrStep/PMusrStep.cpp | 8 ++++++++
 src/musredit_qt6/musrStep/PMusrStep.cpp | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/src/musredit_qt5/musrStep/PMusrStep.cpp b/src/musredit_qt5/musrStep/PMusrStep.cpp
index 457394db..249dbe98 100644
--- a/src/musredit_qt5/musrStep/PMusrStep.cpp
+++ b/src/musredit_qt5/musrStep/PMusrStep.cpp
@@ -39,6 +39,8 @@
 #include <QDoubleValidator>
 #include <QTextStream>
 #include <QPixmap>
+#include <QGuiApplication>
+#include <QScreen>
 
 #include <QDebug>
 
@@ -175,6 +177,12 @@ PMusrStep::PMusrStep(const char *fln, QWidget *parent) :
     height = 20*fParamVec.size();
   else
     height = 900;
+  // make sure that the minimal height is not larger than the screen resolution height
+  QScreen *screen = QGuiApplication::primaryScreen();
+  int hh = screen->geometry().height();
+  if (height > hh)
+    height = hh - 70;
+
   setMinimumSize(400, height);
 
   // populate dialog
diff --git a/src/musredit_qt6/musrStep/PMusrStep.cpp b/src/musredit_qt6/musrStep/PMusrStep.cpp
index cef86072..422dfc72 100644
--- a/src/musredit_qt6/musrStep/PMusrStep.cpp
+++ b/src/musredit_qt6/musrStep/PMusrStep.cpp
@@ -39,6 +39,8 @@
 #include <QDoubleValidator>
 #include <QTextStream>
 #include <QPixmap>
+#include <QGuiApplication>
+#include <QScreen>
 
 #include <QDebug>
 
@@ -175,6 +177,11 @@ PMusrStep::PMusrStep(const char *fln, QWidget *parent) :
     height = 20*fParamVec.size();
   else
     height = 900;
+  // make sure that the minimal height is not larger than the screen resolution height
+  QScreen *screen = QGuiApplication::primaryScreen();
+  int hh = screen->geometry().height();
+  if (height > hh)
+    height = hh - 70;
   setMinimumSize(400, height);
 
   // populate dialog

From b4c7780ff5a653f088e5f677d78985777bdc8fb9 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Fri, 2 Sep 2022 13:53:34 +0200
Subject: [PATCH 2/4] 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 a1a1a366..aecaf414 100644
--- a/src/musredit_qt5/musredit/PTextEdit.cpp
+++ b/src/musredit_qt5/musredit/PTextEdit.cpp
@@ -2859,13 +2859,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

From ccc1dda352a852c3ddbf23c8f61bbc766405d3e0 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Fri, 2 Sep 2022 14:38:54 +0200
Subject: [PATCH 3/4] fixed typo.

---
 src/musredit_qt5/musredit/PMsr2DataDialog.cpp | 2 +-
 src/musredit_qt6/musredit/PMsr2DataDialog.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/musredit_qt5/musredit/PMsr2DataDialog.cpp b/src/musredit_qt5/musredit/PMsr2DataDialog.cpp
index 0d8054dc..ad86937a 100644
--- a/src/musredit_qt5/musredit/PMsr2DataDialog.cpp
+++ b/src/musredit_qt5/musredit/PMsr2DataDialog.cpp
@@ -103,7 +103,7 @@ PMsr2DataDialog::PMsr2DataDialog(PMsr2DataParam *msr2DataParam, const QString he
 
 //----------------------------------------------------------------------------------------------------
 /**
- * <p>returns the msr2data relavant parameters from the GUI.
+ * <p>returns the msr2data relevant parameters from the GUI.
  */
 PMsr2DataParam* PMsr2DataDialog::getMsr2DataParam()
 {
diff --git a/src/musredit_qt6/musredit/PMsr2DataDialog.cpp b/src/musredit_qt6/musredit/PMsr2DataDialog.cpp
index c1434639..5b6eb62f 100644
--- a/src/musredit_qt6/musredit/PMsr2DataDialog.cpp
+++ b/src/musredit_qt6/musredit/PMsr2DataDialog.cpp
@@ -103,7 +103,7 @@ PMsr2DataDialog::PMsr2DataDialog(PMsr2DataParam *msr2DataParam, const QString he
 
 //----------------------------------------------------------------------------------------------------
 /**
- * <p>returns the msr2data relavant parameters from the GUI.
+ * <p>returns the msr2data relevant parameters from the GUI.
  */
 PMsr2DataParam* PMsr2DataDialog::getMsr2DataParam()
 {

From 173d20f05eb9cd8e896524bbaef0531f334f99a1 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Fri, 2 Sep 2022 14:40:12 +0200
Subject: [PATCH 4/4] improved export parameter list behavior. Allow multiple
 deliminators: ',', ';', ' '

---
 src/musredit_qt5/musredit/PTextEdit.cpp | 7 ++++++-
 src/musredit_qt6/musredit/PTextEdit.cpp | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/musredit_qt5/musredit/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp
index aecaf414..bae91e88 100644
--- a/src/musredit_qt5/musredit/PTextEdit.cpp
+++ b/src/musredit_qt5/musredit/PTextEdit.cpp
@@ -61,6 +61,7 @@
 #include <QFileSystemWatcher>
 #include <QDesktopServices>
 #include <QUrl>
+#include <QRegExp>
 
 #include <QtDebug>
 
@@ -2287,7 +2288,11 @@ void PTextEdit::musrMsr2Data()
     // parameter export list
     if (!fMsr2DataParam->paramList.isEmpty()) {
       cmd.append("paramList");
-      QStringList list = fMsr2DataParam->paramList.split(' ');
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+      QStringList list = fMsr2DataParam->paramList.split(QRegExp("[(\\s|,|;)]"), QString::SkipEmptyParts);
+#else
+      QStringList list = fMsr2DataParam->paramList.split(QRegExp("[(\\s|,|;)]"), Qt::SkipEmptyParts);
+#endif
       for (int i=0; i<list.size(); i++)
         cmd.append(list[i]);
     }
diff --git a/src/musredit_qt6/musredit/PTextEdit.cpp b/src/musredit_qt6/musredit/PTextEdit.cpp
index 32321af3..4b9b14b6 100644
--- a/src/musredit_qt6/musredit/PTextEdit.cpp
+++ b/src/musredit_qt6/musredit/PTextEdit.cpp
@@ -2288,7 +2288,7 @@ void PTextEdit::musrMsr2Data()
     // parameter export list
     if (!fMsr2DataParam->paramList.isEmpty()) {
       cmd.append("paramList");
-      QStringList list = fMsr2DataParam->paramList.split(' ');
+      QStringList list = fMsr2DataParam->paramList.split(QRegExp("[(\\s|,|;)]"), Qt::SkipEmptyParts);
       for (int i=0; i<list.size(); i++)
         cmd.append(list[i]);
     }