LMU/musrfit
5
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 4 Activity

get rid of deprecated dialogs and make them more uniform.

Browse Source
This commit is contained in:
suter_a
2021-11-29 15:39:34 +01:00
parent e56c4bb450
commit 1fb60c0aae
22 changed files with 193 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/musredit_qt6/musredit/PAdmin.cpp
View File

@@ -100,7 +100,7 @@ bool PAdminXMLParser::parse(QIODevice *device)
if (fXml.hasError()) {
QString msg;
msg = QString("%1 Line %2, column %3").arg(fXml.errorString()).arg(fXml.lineNumber()).arg(fXml.columnNumber());
QMessageBox::critical(0, "**ERROR**", msg, QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::critical(nullptr, "ERROR", msg, QMessageBox::Ok, QMessageBox::NoButton);
return false;
}
@@ -699,14 +699,14 @@ QString PAdminXMLParser::expandPath(const QString &str)
token.remove('$');
if (!procEnv.contains(token)) {
msg = QString("Couldn't find '%1'. Some things might not work properly").arg(token);
QMessageBox::warning(0, "**WARNING**", msg, QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::warning(nullptr, "WARNING", msg, QMessageBox::Ok, QMessageBox::NoButton);
newStr = "";
break;
}
path = procEnv.value(token, "");
if (path.isEmpty()) {
msg = QString("Couldn't expand '%1'. Some things might not work properly").arg(token);
QMessageBox::warning(0, "**WARNING**", msg, QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::warning(nullptr, "WARNING", msg, QMessageBox::Ok, QMessageBox::NoButton);
newStr = "";
break;
}
@@ -807,9 +807,9 @@ PAdmin::PAdmin() : QObject()
QFileInfo info(str);
if (info.exists()) {
if (!info.isExecutable())
QMessageBox::critical(0, "ERROR", "musrfit found but not recognized as executable.\nPlease check!");
QMessageBox::critical(nullptr, "ERROR", "musrfit found but not recognized as executable.\nPlease check!");
} else {
QMessageBox::critical(0, "ERROR", "musrfit not found.\nHave you set the necessary system variables properly?\nPlease check the manual.\nBefore you can use musrfit, this needs to be fixed.");
QMessageBox::critical(nullptr, "ERROR", "musrfit not found.\nHave you set the necessary system variables properly?\nPlease check the manual.\nBefore you can use musrfit, this needs to be fixed.");
}
// check if system variables are set properly
@@ -827,7 +827,7 @@ PAdmin::PAdmin() : QObject()
}
if (sysVarMissing) {
msg += "Please set this/these system variables.";
QMessageBox::warning(0, "WARNING", msg);
QMessageBox::warning(nullptr, "WARNING", msg);
}
}
@@ -907,13 +907,13 @@ int PAdmin::loadPrefs(QString fln)
if (QFile::exists(fln)) { // administration file present
PAdminXMLParser handler(fln, this);
if (!handler.isValid()) {
QMessageBox::critical(0, "**ERROR**",
QMessageBox::critical(nullptr, "ERROR",
"Error parsing musredit_startup.xml settings file.\nProbably a few things will not work porperly.\nPlease fix this first.",
QMessageBox::Ok, QMessageBox::NoButton);
return 0;
}
} else {
QMessageBox::critical(0, "**ERROR**",
QMessageBox::critical(nullptr, "ERROR",
"Couldn't find the musredit_startup.xml settings file.\nProbably a few things will not work porperly.\nPlease fix this first.",
QMessageBox::Ok, QMessageBox::NoButton);
return 0;
@@ -1042,7 +1042,7 @@ int PAdmin::savePrefs(QString pref_fln)
file.close();
} else {
QString msg("Failed to write musredit_startup.xml. Neither a local nor a global copy found.");
QMessageBox::warning(0, "WARNING", msg, QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::warning(nullptr, "WARNING", msg, QMessageBox::Ok, QMessageBox::NoButton);
}
return 1;
@@ -1132,7 +1132,7 @@ void PAdmin::saveRecentFiles()
file.close();
} else {
QString msg("Failed to write musredit_startup.xml. Neither a local nor a global copy found.");
QMessageBox::warning(0, "WARNING", msg, QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::warning(nullptr, "WARNING", msg, QMessageBox::Ok, QMessageBox::NoButton);
}
}
@@ -1161,13 +1161,13 @@ void PAdmin::createMusreditStartupFile()
QFile fres(":/musredit_startup.xml.in");
if (!fres.exists()) {
QString msg = QString("Neither couldn't find nor create musredit_startup.xml. Things are likely not to work.");
QMessageBox::critical(0, "ERROR", msg);
QMessageBox::critical(nullptr, "ERROR", msg);
return;
}
if (!fres.open(QIODevice::ReadOnly | QIODevice::Text)) {
QString msg = QString("Couldn't open internal resource file musredit_startup.xml.in. Things are likely not to work.");
QMessageBox::critical(0, "ERROR", msg);
QMessageBox::critical(nullptr, "ERROR", msg);
return;
}
// text stream for fres

4
src/musredit_qt6/musredit/PChangeDefaultPathsDialog.cpp
View File

@@ -92,7 +92,7 @@ bool PDefaultPathsXMLParser::parse(QIODevice *device)
if (fXml.hasError()) {
QString msg;
msg = QString("%1 Line %2, column %3").arg(fXml.errorString()).arg(fXml.lineNumber()).arg(fXml.columnNumber());
QMessageBox::critical(0, "**ERROR**", msg, QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::critical(nullptr, "ERROR", msg, QMessageBox::Ok, QMessageBox::NoButton);
return false;
}
@@ -204,7 +204,7 @@ PDefaultPaths::PDefaultPaths() : QObject()
PDefaultPathsXMLParser handler(fPrefPathName, this);
if (!handler.isValid()) {
fValid = false;
QMessageBox::critical(0, "ERROR",
QMessageBox::critical(nullptr, "ERROR",
"Error parsing musrfit_startup.xml settings file.\nProbably a few things will not work porperly.\nPlease fix this first.",
QMessageBox::Ok, QMessageBox::NoButton);
return;

5
src/musredit_qt6/musredit/PDumpOutputHandler.cpp
View File

@@ -83,10 +83,7 @@ PDumpOutputHandler::PDumpOutputHandler(QVector<QString> &cmd)
if ( !fProc->waitForStarted() ) {
// error handling
QString msg(tr("Could not execute the output command: ")+cmd[0]);
QMessageBox::critical( 0,
tr("Fatal error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
done(0);
}

5
src/musredit_qt6/musredit/PFitOutputHandler.cpp
View File

@@ -87,10 +87,7 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QVector<QString>
if ( !fProc->waitForStarted() ) {
// error handling
QString msg(tr("Could not execute the output command: ")+cmd[0]);
QMessageBox::critical( nullptr,
tr("Fatal error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
done(0);
}
fProcPID = fProc->processId();

7
src/musredit_qt6/musredit/PGetAsymmetryRunBlockDialog.cpp
View File

@@ -282,15 +282,12 @@ QString PGetAsymmetryRunBlockDialog::getPacking(bool &present)
void PGetAsymmetryRunBlockDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

11
src/musredit_qt6/musredit/PGetFourierBlockDialog.cpp
View File

@@ -82,14 +82,14 @@ void PGetFourierBlockDialog::checkPhaseParameter()
ival = str.toInt(&ok);
if (!ok) {
fPhase_lineEdit->clear();
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Allowed phase entries are either a parameter number,\n or an parXX entry, where XX is a parameter number",
QMessageBox::Ok, QMessageBox::NoButton);
fPhase_lineEdit->setFocus();
}
} else { // neither a parXX nor a number
fPhase_lineEdit->clear();
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Allowed phase entries are either a parameter number,\n or an parXX entry, where XX is a parameter number",
QMessageBox::Ok, QMessageBox::NoButton);
fPhase_lineEdit->setFocus();
@@ -130,15 +130,12 @@ void PGetFourierBlockDialog::fillFourierBlock()
void PGetFourierBlockDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

7
src/musredit_qt6/musredit/PGetFunctionsBlockDialog.cpp
View File

@@ -106,15 +106,12 @@ void PGetFunctionsBlockDialog::addFunction()
void PGetFunctionsBlockDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

7
src/musredit_qt6/musredit/PGetMusrFTOptionsDialog.cpp
View File

@@ -585,15 +585,12 @@ void PGetMusrFTOptionsDialog::averagedPerDataSet(int state)
void PGetMusrFTOptionsDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

7
src/musredit_qt6/musredit/PGetNonMusrRunBlockDialog.cpp
View File

@@ -155,15 +155,12 @@ QString PGetNonMusrRunBlockDialog::getFitRange(bool &valid)
void PGetNonMusrRunBlockDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

17
src/musredit_qt6/musredit/PGetParameterBlockDialog.cpp
View File

@@ -105,7 +105,7 @@ void PGetParameterBlockDialog::paramAdd()
// get name
str = fName_lineEdit->text();
if (str.isEmpty()) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"empty parameter name not allowed!",
QMessageBox::Ok, QMessageBox::NoButton);
return;
@@ -120,7 +120,7 @@ void PGetParameterBlockDialog::paramAdd()
// get value
str = fValue_lineEdit->text();
if (str.isEmpty()) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"empty parameter value not allowed!",
QMessageBox::Ok, QMessageBox::NoButton);
return;
@@ -135,7 +135,7 @@ void PGetParameterBlockDialog::paramAdd()
// get step
str = fStep_lineEdit->text();
if (str.isEmpty()) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"empty parameter step not allowed!",
QMessageBox::Ok, QMessageBox::NoButton);
return;
@@ -156,7 +156,7 @@ void PGetParameterBlockDialog::paramAdd()
bool ok;
double val = str.toDouble(&ok);
if (!ok && (str != "none")) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"invalid lower boundary! Must be a double are the key word 'none'",
QMessageBox::Ok, QMessageBox::NoButton);
return;
@@ -172,7 +172,7 @@ void PGetParameterBlockDialog::paramAdd()
str = fUpper_lineEdit->text();
val = str.toDouble(&ok);
if (!ok && (str != "none")) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"invalid upper boundary! Must be a double are the key word 'none'",
QMessageBox::Ok, QMessageBox::NoButton);
return;
@@ -218,15 +218,12 @@ void PGetParameterBlockDialog::paramAdd()
void PGetParameterBlockDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

13
src/musredit_qt6/musredit/PGetPlotBlockDialog.cpp
View File

@@ -97,7 +97,7 @@ void PGetPlotBlockDialog::addPlot()
// lower x-/time range
str = fXRangeLow_lineEdit->text();
if (str.isEmpty()) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"empty lower time-/x-range name not allowed!",
QMessageBox::Ok, QMessageBox::NoButton);
return;
@@ -111,7 +111,7 @@ void PGetPlotBlockDialog::addPlot()
// upper x-/time range
str = fXRangeUp_lineEdit->text();
if (str.isEmpty()) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"empty upper time-/x-range name not allowed!",
QMessageBox::Ok, QMessageBox::NoButton);
return;
@@ -125,7 +125,7 @@ void PGetPlotBlockDialog::addPlot()
// check y-range: either none given or both
if ((fYRangeLow_lineEdit->text().isEmpty() && !fYRangeUp_lineEdit->text().isEmpty()) ||
(!fYRangeLow_lineEdit->text().isEmpty() && fYRangeUp_lineEdit->text().isEmpty())) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Only fully empty y-range, or give lower AND upper y-range is acceptable!\n Will ignore the y-range",
QMessageBox::Ok, QMessageBox::NoButton);
} else if (!fYRangeLow_lineEdit->text().isEmpty() && !fYRangeUp_lineEdit->text().isEmpty()) {
@@ -159,15 +159,12 @@ void PGetPlotBlockDialog::addPlot()
void PGetPlotBlockDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

7
src/musredit_qt6/musredit/PGetSingleHistoRunBlockDialog.cpp
View File

@@ -281,15 +281,12 @@ QString PGetSingleHistoRunBlockDialog::getLifetimeCorrection(bool &present)
void PGetSingleHistoRunBlockDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

7
src/musredit_qt6/musredit/PGetTheoryBlockDialog.cpp
View File

@@ -125,15 +125,12 @@ void PGetTheoryBlockDialog::addMultiply()
void PGetTheoryBlockDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

7
src/musredit_qt6/musredit/PGetTitleBlockDialog.cpp
View File

@@ -53,15 +53,12 @@ PGetTitleBlockDialog::PGetTitleBlockDialog(const QString helpUrl) : fHelpUrl(hel
void PGetTitleBlockDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

7
src/musredit_qt6/musredit/PMsr2DataDialog.cpp
View File

@@ -222,15 +222,12 @@ void PMsr2DataDialog::fitOnlyChanged(int buttonState)
void PMsr2DataDialog::helpContent()
{
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
QMessageBox::information(this, "INFO", "Will eventually show a help window");
} else {
bool ok = QDesktopServices::openUrl(QUrl(fHelpUrl, QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fHelpUrl);
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
}

30
src/musredit_qt6/musredit/PSubTextEdit.cpp
View File

@@ -252,7 +252,7 @@ void PSubTextEdit::insertAsymRunBlock()
if (valid) {
str += workStr;
} else {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Given map not valid, will add a default map line",
QMessageBox::Ok, QMessageBox::NoButton);
str += "map 0 0 0 0 0 0 0 0 0 0\n";
@@ -268,7 +268,7 @@ void PSubTextEdit::insertAsymRunBlock()
workStr = dlg->getBackground(valid);
str += workStr;
if (!valid) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Either <b>background</b> or <b>backgr.fix</b> is needed!\nWill set <b>background</b> to 0..10, please correct!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -278,7 +278,7 @@ void PSubTextEdit::insertAsymRunBlock()
if (valid) {
str += workStr;
} else {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Not all Data entries are present.Fix is needed!\nWill not set anything!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -288,7 +288,7 @@ void PSubTextEdit::insertAsymRunBlock()
if (present) {
str += workStr;
} else {
QMessageBox::warning(this, "**ERROR**",
QMessageBox::warning(this, "ERROR",
"T0's not given, assume that they are present in the data file!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -297,7 +297,7 @@ void PSubTextEdit::insertAsymRunBlock()
workStr = dlg->getFitRange(valid);
str += workStr;
if (!valid) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"No valid fit range is given.Fix is needed!\nWill add a default one!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -306,7 +306,7 @@ void PSubTextEdit::insertAsymRunBlock()
workStr = dlg->getPacking(present);
str += workStr;
if (!present) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"No valid packing/binning is given.Fix is needed!\nWill add a default one!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -347,7 +347,7 @@ void PSubTextEdit::insertSingleHistRunBlock()
if (valid) {
str += workStr;
} else {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Given map not valid, will add a default map line",
QMessageBox::Ok, QMessageBox::NoButton);
str += "map 0 0 0 0 0 0 0 0 0 0\n";
@@ -375,7 +375,7 @@ void PSubTextEdit::insertSingleHistRunBlock()
workStr = dlg->getBackground(valid);
str += workStr;
if (!valid) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Either <b>background</b>, <b>backgr.fix</b>, or <b>backgr.fit</b> is needed!\nWill set <b>background</b> to 0..10, please correct!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -385,7 +385,7 @@ void PSubTextEdit::insertSingleHistRunBlock()
if (present) {
str += workStr;
} else {
QMessageBox::warning(this, "**ERROR**",
QMessageBox::warning(this, "ERROR",
"T0's not given, assume that they are present in the data file!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -395,7 +395,7 @@ void PSubTextEdit::insertSingleHistRunBlock()
if (valid) {
str += workStr;
} else {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Not all Data entries are present.Fix is needed!\nWill not set anything!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -404,7 +404,7 @@ void PSubTextEdit::insertSingleHistRunBlock()
workStr = dlg->getFitRange(valid);
str += workStr;
if (!valid) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"No valid fit range is given.Fix is needed!\nWill add a default one!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -413,7 +413,7 @@ void PSubTextEdit::insertSingleHistRunBlock()
workStr = dlg->getPacking(present);
str += workStr;
if (!present) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"No valid packing/binning is given.Fix is needed!\nWill add a default one!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -453,7 +453,7 @@ void PSubTextEdit::insertNonMusrRunBlock()
if (valid) {
str += workStr;
} else {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Given map not valid, will add a default map line",
QMessageBox::Ok, QMessageBox::NoButton);
str += "map 0 0 0 0 0 0 0 0 0 0\n";
@@ -464,7 +464,7 @@ void PSubTextEdit::insertNonMusrRunBlock()
if (valid) {
str += workStr;
} else {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"Not all xy-data entries are present.Fix is needed!\nWill not set anything!",
QMessageBox::Ok, QMessageBox::NoButton);
}
@@ -473,7 +473,7 @@ void PSubTextEdit::insertNonMusrRunBlock()
workStr = dlg->getFitRange(valid);
str += workStr;
if (!valid) {
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"No valid fit range is given.Fix is needed!\nWill add a default one!",
QMessageBox::Ok, QMessageBox::NoButton);
}

123
src/musredit_qt6/musredit/PTextEdit.cpp
View File

@@ -110,7 +110,7 @@ PTextEdit::PTextEdit( QWidget *parent )
fFileSystemWatcherActive = true;
fFileSystemWatcher = new QFileSystemWatcher();
if (fFileSystemWatcher == nullptr) {
QMessageBox::information(this, "**ERROR**", "Couldn't invoke QFileSystemWatcher!");
QMessageBox::information(this, "ERROR", "Couldn't invoke QFileSystemWatcher!");
} else {
connect( fFileSystemWatcher, SIGNAL(fileChanged(const QString&)), this, SLOT(fileChanged(const QString&)));
}
@@ -1280,7 +1280,7 @@ void PTextEdit::fileOpenRecent()
void PTextEdit::fileReload()
{
if ( fFilenames.find( currentEditor() ) == fFilenames.end() ) {
QMessageBox::critical(this, "**ERROR**", "Cannot reload a file not previously saved ;-)");
QMessageBox::critical(this, "ERROR", "Cannot reload a file not previously saved ;-)");
} else {
int index = fTabWidget->currentIndex();
QString fln = *fFilenames.find( currentEditor() );
@@ -1308,7 +1308,7 @@ void PTextEdit::fileOpenPrefs()
} else if (result == 0) { // default dir
fln = fAdmin->getDefaultPrefPathName();
msg = QString("Current Default Preferences Path-Name:\n") + fln;
if (QMessageBox::information(this, "Info", msg, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel)
if (QMessageBox::information(this, "INFO", msg, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel)
return;
} else if (result == 1) { // custom dir
fln = QFileDialog::getOpenFileName( this, tr("Open Prefs"),
@@ -1318,7 +1318,7 @@ void PTextEdit::fileOpenPrefs()
if (fAdmin->loadPrefs(fln)) {
msg = QString("Prefs from '") + fln + QString("' loaded.");
QMessageBox::information(nullptr, "Info", msg);
QMessageBox::information(nullptr, "INFO", msg);
}
// make sure that dark/plain icon scheme is properly loaded
@@ -1354,7 +1354,7 @@ void PTextEdit::fileSave()
} else {
QFile file( *fFilenames.find( currentEditor() ) );
if ( !file.open( QIODevice::WriteOnly ) ) {
QMessageBox::critical(this, "**ERROR**", "Couldn't save the file!\nDisk full?\nNo write access?");
QMessageBox::critical(this, "ERROR", "Couldn't save the file!\nDisk full?\nNo write access?");
return;
}
QTextStream ts( &file );
@@ -1411,7 +1411,7 @@ void PTextEdit::fileSavePrefs()
} else if (result == 0) { // default dir
fln = fAdmin->getDefaultPrefPathName();
msg = QString("Current Default Preferences Path-Name:\n") + fln;
if (QMessageBox::information(this, "Info", msg, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel)
if (QMessageBox::information(this, "INFO", msg, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel)
return;
} else if (result == 1) { // custom dir
fln = QFileDialog::getSaveFileName( this,
@@ -1422,7 +1422,7 @@ void PTextEdit::fileSavePrefs()
if ( !fln.isEmpty() ) {
fAdmin->savePrefs(fln);
msg = QString("Prefs to '") + fln + QString("' saved.");
QMessageBox::information(nullptr, "Info", msg);
QMessageBox::information(nullptr, "INFO", msg);
}
}
@@ -1515,10 +1515,10 @@ void PTextEdit::fileClose(const bool check)
int idx = fTabWidget->currentIndex();
if ((fTabWidget->tabText(idx).indexOf("*")>0) && check) {
int result = QMessageBox::warning(this, "**WARNING**",
int result = QMessageBox::warning(this, "WARNING",
"Do you really want to close this file.\nChanges will be lost",
"Close", "Cancel");
if (result == 1) // Cancel
QMessageBox::Close, QMessageBox::Cancel);
if (result == QMessageBox::Cancel)
return;
}
@@ -1545,10 +1545,10 @@ void PTextEdit::fileCloseAll()
// check if there are any unsaved tabs
for (int i=0; i<fTabWidget->count(); i++) {
if (fTabWidget->tabText(i).indexOf("*") > 0) {
int result = QMessageBox::warning(this, "**WARNING**",
int result = QMessageBox::warning(this, "WARNING",
"Do you really want to close all files.\nChanges of unsaved files will be lost",
"Close", "Cancel");
if (result == 1) // Cancel
QMessageBox::Close, QMessageBox::Cancel);
if (result == QMessageBox::Cancel)
return;
break;
}
@@ -1582,10 +1582,10 @@ void PTextEdit::fileCloseAllOthers()
// check if there are any unsaved tabs
for (int i=0; i<fTabWidget->count(); i++) {
if (fTabWidget->tabText(i).indexOf("*") > 0) {
int result = QMessageBox::warning(this, "**WARNING**",
int result = QMessageBox::warning(this, "WARNING",
"Do you really want to close all files.\nChanges of unsaved files will be lost",
"Close", "Cancel");
if (result == 1) // Cancel
QMessageBox::Close, QMessageBox::Cancel);
if (result == QMessageBox::Cancel)
return;
break;
}
@@ -1625,10 +1625,10 @@ void PTextEdit::fileExit()
// check if there are still some modified files open
for (int i=0; i < fTabWidget->count(); i++) {
if (fTabWidget->tabText(i).indexOf("*") > 0) {
int result = QMessageBox::warning(this, "**WARNING**",
int result = QMessageBox::warning(this, "WARNING",
"Do you really want to exit from the applcation.\nChanges will be lost",
"Exit", "Cancel");
if (result == 1) // Cancel
QMessageBox::Close, QMessageBox::Cancel);
if (result == QMessageBox::Cancel)
return;
break;
}
@@ -1726,13 +1726,13 @@ void PTextEdit::editFind()
}
if (fFindReplaceData == nullptr) {
QMessageBox::critical(this, "**ERROR**", "Couldn't invoke find data structure, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::critical(this, "ERROR", "Couldn't invoke find data structure, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
return;
}
PFindDialog *dlg = new PFindDialog(fFindReplaceData, currentEditor()->textCursor().hasSelection());
if (dlg == nullptr) {
QMessageBox::critical(this, "**ERROR**", "Couldn't invoke find dialog, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::critical(this, "ERROR", "Couldn't invoke find dialog, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
return;
}
@@ -1818,13 +1818,13 @@ void PTextEdit::editFindAndReplace()
}
if (fFindReplaceData == nullptr) {
QMessageBox::critical(this, "**ERROR**", "Couldn't invoke find&replace data structure, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::critical(this, "ERROR", "Couldn't invoke find&replace data structure, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
return;
}
PReplaceDialog *dlg = new PReplaceDialog(fFindReplaceData, currentEditor()->textCursor().hasSelection());
if (dlg == nullptr) {
QMessageBox::critical(this, "**ERROR**", "Couldn't invoke find&replace dialog, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::critical(this, "ERROR", "Couldn't invoke find&replace dialog, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
return;
}
@@ -1998,7 +1998,7 @@ void PTextEdit::musrWiz()
QProcess *proc = new QProcess(this);
if (proc == nullptr) {
QMessageBox::critical(nullptr, "**ERROR**", "Couldn't invoke QProcess!");
QMessageBox::critical(nullptr, "ERROR", "Couldn't invoke QProcess!");
return;
}
@@ -2019,10 +2019,7 @@ void PTextEdit::musrWiz()
if (!proc->waitForStarted()) {
// error handling
QString msg(tr("Could not execute the output command: ")+cmd[0]);
QMessageBox::critical( nullptr,
tr("Fatal error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
return;
}
}
@@ -2044,7 +2041,7 @@ void PTextEdit::musrCalcChisq()
QString tabLabel = fTabWidget->tabText(fTabWidget->currentIndex());
if (tabLabel == "noname") {
QMessageBox::critical(this, "**ERROR**", "For a fit a real msr-file is needed.");
QMessageBox::critical(this, "ERROR", "For a fit a real msr-file is needed.");
return;
} else if (tabLabel == "noname*") {
fileSaveAs();
@@ -2077,7 +2074,7 @@ void PTextEdit::musrFit()
QString tabLabel = fTabWidget->tabText(fTabWidget->currentIndex());
if (tabLabel == "noname") {
QMessageBox::critical(this, "**ERROR**", "For a fit a real msr-file is needed.");
QMessageBox::critical(this, "ERROR", "For a fit a real msr-file is needed.");
return;
} else if (tabLabel == "noname*") {
fileSaveAs();
@@ -2196,7 +2193,7 @@ void PTextEdit::musrMsr2Data()
PMsr2DataDialog *dlg = new PMsr2DataDialog(fMsr2DataParam, fAdmin->getHelpUrl("msr2data"));
if (dlg == nullptr) {
QMessageBox::critical(this, "**ERROR**", "Couldn't invoke msr2data dialog, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::critical(this, "ERROR", "Couldn't invoke msr2data dialog, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton);
return;
}
@@ -2218,7 +2215,7 @@ void PTextEdit::musrMsr2Data()
// analyze parameters
switch (dlg->getRunTag()) {
case -1: // not valid
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"No valid run list input found :-(\nCannot do anything.",
QMessageBox::Ok, QMessageBox::NoButton);
return;
@@ -2231,13 +2228,13 @@ void PTextEdit::musrMsr2Data()
fi.setFile(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + runListFileName);
if (!fi.exists()) {
str = QString("Run List File '%1' doesn't exist.").arg(runListFileName);
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
str, QMessageBox::Ok, QMessageBox::NoButton);
return;
}
break;
default: // never should reach this point
QMessageBox::critical(this, "**ERROR**",
QMessageBox::critical(this, "ERROR",
"No idea how you could reach this point.\nPlease contact the developers.",
QMessageBox::Ok, QMessageBox::NoButton);
return;
@@ -2428,7 +2425,7 @@ void PTextEdit::musrMsr2Data()
file = new QFile(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fMsr2DataParam->runListFileName);
if (!file->open(QIODevice::ReadOnly)) {
str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName);
QMessageBox::critical(this, "**ERROR**", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::critical(this, "ERROR", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton);
return;
}
@@ -2478,7 +2475,7 @@ void PTextEdit::musrMsr2Data()
file = new QFile(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fMsr2DataParam->runListFileName);
if (!file->open(QIODevice::ReadOnly)) {
str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName);
QMessageBox::critical(this, "**ERROR**", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton);
QMessageBox::critical(this, "ERROR", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton);
return;
}
@@ -2526,7 +2523,7 @@ void PTextEdit::musrView()
QString tabLabel = fTabWidget->tabText(fTabWidget->currentIndex());
if (tabLabel == "noname") {
QMessageBox::critical(this, "**ERROR**", "For a view a real mlog/msr-file is needed.");
QMessageBox::critical(this, "ERROR", "For a view a real mlog/msr-file is needed.");
return;
} else if (tabLabel == "noname*") {
fileSaveAs();
@@ -2578,10 +2575,7 @@ void PTextEdit::musrView()
if (!proc->waitForStarted()) {
// error handling
QString msg(tr("Could not execute the output command: ")+cmd[0]);
QMessageBox::critical( nullptr,
tr("Fatal error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
return;
}
}
@@ -2599,7 +2593,7 @@ void PTextEdit::musrViewFinished(int exitCode, QProcess::ExitStatus)
msg += QString("* cannot read data-file.\n");
msg += QString("* many more things can go wrong.\n");
msg += QString("Please check!");
QMessageBox::critical(nullptr, tr("Fatal Error"), msg, tr("Quit"));
QMessageBox::critical(nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close);
}
}
@@ -2614,7 +2608,7 @@ void PTextEdit::musrT0()
QString tabLabel = fTabWidget->tabText(fTabWidget->currentIndex());
if (tabLabel == "noname") {
QMessageBox::critical(this, "**ERROR**", "For a view a real mlog/msr-file is needed.");
QMessageBox::critical(this, "ERROR", "For a view a real mlog/msr-file is needed.");
return;
} else if (tabLabel == "noname*") {
fileSaveAs();
@@ -2653,10 +2647,7 @@ void PTextEdit::musrT0()
if (!proc->waitForStarted()) {
// error handling
QString msg(tr("Could not execute the output command: ")+cmd[0]);
QMessageBox::critical( nullptr,
tr("Fatal error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
return;
}
}
@@ -2672,7 +2663,7 @@ void PTextEdit::musrFT()
PGetMusrFTOptionsDialog *dlg = new PGetMusrFTOptionsDialog(*fFilenames.find( currentEditor() ), fMusrFTPrevCmd, fAdmin->getHelpUrl("musrFT"));
if (dlg == nullptr) {
QMessageBox::critical(this, "**ERROR** musrFT", "Couldn't invoke musrFT Options Dialog.");
QMessageBox::critical(this, "ERROR musrFT", "Couldn't invoke musrFT Options Dialog.");
return;
}
@@ -2693,10 +2684,7 @@ void PTextEdit::musrFT()
if (!proc->waitForStarted()) {
// error handling
QString msg(tr("Could not execute the output command: ")+cmd[0]);
QMessageBox::critical( nullptr,
tr("Fatal error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
return;
}
}
@@ -2714,7 +2702,7 @@ void PTextEdit::musrPrefs()
PPrefsDialog *dlg = new PPrefsDialog(fAdmin);
if (dlg == nullptr) {
QMessageBox::critical(this, "**ERROR** musrPrefs", "Couldn't invoke Preferences Dialog.");
QMessageBox::critical(this, "ERROR musrPrefs", "Couldn't invoke Preferences Dialog.");
return;
}
@@ -2770,7 +2758,7 @@ void PTextEdit::musrSetSteps()
// make sure I have a saved msr-file to work on
QString tabLabel = fTabWidget->tabText(fTabWidget->currentIndex());
if (tabLabel == "noname") {
QMessageBox::critical(this, "**ERROR**", "For musrStep a real mlog/msr-file is needed.");
QMessageBox::critical(this, "ERROR", "For musrStep a real mlog/msr-file is needed.");
return;
} else if (tabLabel == "noname*") {
fileSaveAs();
@@ -2796,7 +2784,7 @@ void PTextEdit::musrSetSteps()
QProcess *proc = new QProcess(this);
if (proc == nullptr) {
QMessageBox::critical(nullptr, "**ERROR**", "Couldn't invoke QProcess!");
QMessageBox::critical(nullptr, "ERROR", "Couldn't invoke QProcess!");
return;
}
@@ -2817,10 +2805,7 @@ void PTextEdit::musrSetSteps()
if (!proc->waitForStarted()) {
// error handling
QString msg(tr("Could not execute the output command: ")+cmd[0]);
QMessageBox::critical( nullptr,
tr("Fatal error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
return;
}
}
@@ -2984,10 +2969,7 @@ void PTextEdit::mupp()
if (!proc->waitForStarted()) {
// error handling
QString msg(tr("Could not execute the output command: ")+cmd);
QMessageBox::critical( nullptr,
tr("Fatal error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
return;
}
}
@@ -3001,10 +2983,7 @@ void PTextEdit::helpContents()
bool ok = QDesktopServices::openUrl(QUrl(fAdmin->getHelpUrl("main"), QUrl::TolerantMode));
if (!ok) {
QString msg = QString("<p>Sorry: Couldn't open default web-browser for the help.<br>Please try: <a href=\"%1\">musrfit docu</a> in your web-browser.").arg(fAdmin->getHelpUrl("main"));
QMessageBox::critical( nullptr,
tr("Fatal Error"),
msg,
tr("Quit") );
QMessageBox::critical( nullptr, tr("FATAL ERROR"), msg, QMessageBox::Close );
}
}
@@ -3037,7 +3016,7 @@ void PTextEdit::helpAboutQt()
void PTextEdit::exitStatusMusrWiz(int exitCode, QProcess::ExitStatus exitStatus)
{
if (exitStatus == QProcess::CrashExit) {
QMessageBox::critical(nullptr, "**FATAL**", "musrWiz returned CrashExit.");
QMessageBox::critical(nullptr, "FATAL ERROR", "musrWiz returned CrashExit.");
return;
}
@@ -3053,7 +3032,7 @@ void PTextEdit::exitStatusMusrWiz(int exitCode, QProcess::ExitStatus exitStatus)
std::ifstream fin(pathName.toLatin1().data(), std::ifstream::in);
if (!fin.is_open()) {
errMsg = QString("PTextEdit::exitStatusMusrWiz: couldn't read %1 file.").arg(pathName);
QMessageBox::critical(nullptr, "**ERROR**", errMsg);
QMessageBox::critical(nullptr, "ERROR", errMsg);
return;
}
char line[128];
@@ -3088,7 +3067,7 @@ void PTextEdit::exitStatusMusrWiz(int exitCode, QProcess::ExitStatus exitStatus)
QFile logFile(pathName);
if (!logFile.remove()) {
errMsg = QString("PTextEdit::exitStatusMusrWiz: couldn't delete %1 file.").arg(pathName);
QMessageBox::critical(nullptr, "**ERROR**", errMsg);
QMessageBox::critical(nullptr, "ERROR", errMsg);
}
}
@@ -3101,7 +3080,7 @@ void PTextEdit::exitStatusMusrWiz(int exitCode, QProcess::ExitStatus exitStatus)
void PTextEdit::exitStatusMusrSetSteps(int exitCode, QProcess::ExitStatus exitStatus)
{
if (exitStatus == QProcess::CrashExit) {
QMessageBox::critical(nullptr, "**FATAL**", "musrStep returned CrashExit.");
QMessageBox::critical(nullptr, "FATAL ERROR", "musrStep returned CrashExit.");
return;
}
@@ -3260,7 +3239,7 @@ void PTextEdit::fileChanged(const QString &fileName)
fFileSystemWatcherActive = false;
QString str = "File '" + fileName + "' changed on the system.\nDo you want to reload it?";
int result = QMessageBox::question(this, "**INFO**", str, QMessageBox::Yes, QMessageBox::No);
int result = QMessageBox::question(this, "INFO", str, QMessageBox::Yes, QMessageBox::No);
if (result == QMessageBox::Yes) {
// find correct file
int idx = -1;