diff --git a/src/musredit/PMsr2DataDialog.cpp b/src/musredit/PMsr2DataDialog.cpp index be39d033..83f4ca79 100644 --- a/src/musredit/PMsr2DataDialog.cpp +++ b/src/musredit/PMsr2DataDialog.cpp @@ -35,13 +35,15 @@ #include #include +#include "PHelp.h" + #include "PMsr2DataDialog.h" //---------------------------------------------------------------------------------------------------- /** *

*/ -PMsr2DataDialog::PMsr2DataDialog(PMsr2DataParam *msr2DataParam) : fMsr2DataParam(msr2DataParam) +PMsr2DataDialog::PMsr2DataDialog(PMsr2DataParam *msr2DataParam, const QString helpUrl) : fMsr2DataParam(msr2DataParam), fHelpUrl(helpUrl) { setupUi(this); @@ -246,6 +248,20 @@ void PMsr2DataDialog::fitOnlyChanged(int buttonState) } } +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +void PMsr2DataDialog::helpContent() +{ + if (fHelpUrl.isEmpty()) { + QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); + } else { + PHelp *help = new PHelp(fHelpUrl); + help->show(); + } +} + //---------------------------------------------------------------------------------------------------- // END //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/PMsr2DataDialog.h b/src/musredit/PMsr2DataDialog.h index cc19b69d..231c7a20 100644 --- a/src/musredit/PMsr2DataDialog.h +++ b/src/musredit/PMsr2DataDialog.h @@ -43,7 +43,7 @@ class PMsr2DataDialog : public QDialog, private Ui::PMsr2DataDialog Q_OBJECT public: - PMsr2DataDialog(PMsr2DataParam *msr2DataParam); + PMsr2DataDialog(PMsr2DataParam *msr2DataParam, const QString helpUrl); virtual int getRunTag() { return fRunTag; } virtual PMsr2DataParam* getMsr2DataParam(); @@ -56,10 +56,12 @@ class PMsr2DataDialog : public QDialog, private Ui::PMsr2DataDialog void templateRunEntered(const QString&); void createMsrFileOnlyChanged(int); void fitOnlyChanged(int); + void helpContent(); private: - int fRunTag; // -1 = not valid, 0 = first last, 1 = run list, 2 = run list file name + int fRunTag; ///< -1 = not valid, 0 = first last, 1 = run list, 2 = run list file name PMsr2DataParam *fMsr2DataParam; + QString fHelpUrl; ///< help url for the Fourier block }; #endif // _PMSR2DATADIALOG_H_ diff --git a/src/musredit/PTextEdit.cpp b/src/musredit/PTextEdit.cpp index 4a8940ff..d36f59b2 100644 --- a/src/musredit/PTextEdit.cpp +++ b/src/musredit/PTextEdit.cpp @@ -1668,7 +1668,7 @@ void PTextEdit::musrMsr2Data() fMsr2DataParam->fitOnly = false; } - PMsr2DataDialog *dlg = new PMsr2DataDialog(fMsr2DataParam); + PMsr2DataDialog *dlg = new PMsr2DataDialog(fMsr2DataParam, fAdmin->getHelpUrl("msr2data")); if (dlg == 0) { QMessageBox::critical(this, "**ERROR**", "Couldn't invoke msr2data dialog, sorry :-(", QMessageBox::Ok, QMessageBox::NoButton); diff --git a/src/musredit/forms/PMsr2DataDialog.ui b/src/musredit/forms/PMsr2DataDialog.ui index a4d5db54..71817a0c 100644 --- a/src/musredit/forms/PMsr2DataDialog.ui +++ b/src/musredit/forms/PMsr2DataDialog.ui @@ -564,8 +564,8 @@ accept() - 457 - 488 + 453 + 506 380 @@ -596,8 +596,8 @@ fitOnlyChanged(int) - 363 - 457 + 406 + 460 301 @@ -621,10 +621,95 @@ + + fFirst_lineEdit + textChanged(QString) + PMsr2DataDialog + runFirstEntered(QString) + + + 82 + 44 + + + 113 + 504 + + + + + fLast_lineEdit + textChanged(QString) + PMsr2DataDialog + runLastEntered(QString) + + + 229 + 44 + + + 348 + 500 + + + + + fRunList_lineEdit + textChanged(QString) + PMsr2DataDialog + runListEntered(QString) + + + 151 + 77 + + + 183 + 515 + + + + + fRunListFileName_lineEdit + textChanged(QString) + PMsr2DataDialog + runListFileNameEntered(QString) + + + 295 + 115 + + + 332 + 492 + + + + + fTemplateRunNumber_lineEdit + textChanged(QString) + PMsr2DataDialog + templateRunEntered(QString) + + + 190 + 245 + + + 137 + 516 + + + helpContent() fitOnlyChanged(int) createMsrFileOnlyChanged(int) + runFirstEntered(QString) + runLastEntered(QString) + runListEntered(QString) + runListFileNameEntered(QString) + templateRunEntered(QString)