diff --git a/src/musrgui/PAdmin.cpp b/src/musrgui/PAdmin.cpp index d6b2bb3e..f0e5996a 100644 --- a/src/musrgui/PAdmin.cpp +++ b/src/musrgui/PAdmin.cpp @@ -108,6 +108,8 @@ bool PAdminXMLParser::endElement( const QString&, const QString&, const QString& */ bool PAdminXMLParser::characters(const QString& str) { + QString help; + switch (fKeyWord) { case eExecPath: fAdmin->setExecPath(QString(str.ascii()).stripWhiteSpace()); @@ -135,7 +137,10 @@ bool PAdminXMLParser::characters(const QString& str) fAdmin->setMsrDefaultFilePath(QString(str.ascii()).stripWhiteSpace()); break; case eHelpMain: - fAdmin->setHelpMain(str); + help = str; + help.replace(">", ">"); + help.replace("<", "<"); + fAdmin->setHelpMain(help); break; default: break; @@ -170,6 +175,8 @@ PAdmin::PAdmin() fInstitute = QString(""); fFileFormat = QString(""); + fHelpMain = QString(""); + // XML Parser part QString path = getenv("MUSRFITPATH"); if (path.isEmpty()) diff --git a/src/musrgui/PGetAsymmetryRunBlockDialog.cpp b/src/musrgui/PGetAsymmetryRunBlockDialog.cpp index 5c757a28..04ac738e 100644 --- a/src/musrgui/PGetAsymmetryRunBlockDialog.cpp +++ b/src/musrgui/PGetAsymmetryRunBlockDialog.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include "PGetAsymmetryRunBlockDialog.h" @@ -39,7 +40,10 @@ /** *

*/ -PGetAsymmetryRunBlockDialog::PGetAsymmetryRunBlockDialog() +PGetAsymmetryRunBlockDialog::PGetAsymmetryRunBlockDialog(const QString help, QWidget *parent, const char *name, + bool modal, WFlags f) : + fHelp(help), + PGetAsymmetryRunBlockDialogBase(parent, name, modal, f) { fForward_lineEdit->setValidator( new QIntValidator(fForward_lineEdit) ); fBackward_lineEdit->setValidator( new QIntValidator(fBackward_lineEdit) ); @@ -66,7 +70,7 @@ PGetAsymmetryRunBlockDialog::PGetAsymmetryRunBlockDialog() /** *

*/ -QString PGetAsymmetryRunBlockDialog::GetRunHeaderInfo() +QString PGetAsymmetryRunBlockDialog::getRunHeaderInfo() { QString str; @@ -82,7 +86,7 @@ QString PGetAsymmetryRunBlockDialog::GetRunHeaderInfo() /** *

*/ -QString PGetAsymmetryRunBlockDialog::GetAlphaParameter(bool &present) +QString PGetAsymmetryRunBlockDialog::getAlphaParameter(bool &present) { QString str = "alpha " + fAlpha_lineEdit->text() + "\n"; @@ -98,7 +102,7 @@ QString PGetAsymmetryRunBlockDialog::GetAlphaParameter(bool &present) /** *

*/ -QString PGetAsymmetryRunBlockDialog::GetBetaParameter(bool &present) +QString PGetAsymmetryRunBlockDialog::getBetaParameter(bool &present) { QString str = "beta " + fBeta_lineEdit->text() + "\n"; @@ -114,7 +118,7 @@ QString PGetAsymmetryRunBlockDialog::GetBetaParameter(bool &present) /** *

*/ -QString PGetAsymmetryRunBlockDialog::GetMap(bool &valid) +QString PGetAsymmetryRunBlockDialog::getMap(bool &valid) { QString str = fMap_lineEdit->text().stripWhiteSpace().remove(" "); @@ -135,7 +139,7 @@ QString PGetAsymmetryRunBlockDialog::GetMap(bool &valid) /** *

*/ -QString PGetAsymmetryRunBlockDialog::GetBackground(bool &valid) +QString PGetAsymmetryRunBlockDialog::getBackground(bool &valid) { QString str = ""; @@ -169,7 +173,7 @@ QString PGetAsymmetryRunBlockDialog::GetBackground(bool &valid) /** *

*/ -QString PGetAsymmetryRunBlockDialog::GetData(bool &valid) +QString PGetAsymmetryRunBlockDialog::getData(bool &valid) { QString str = ""; @@ -192,7 +196,7 @@ QString PGetAsymmetryRunBlockDialog::GetData(bool &valid) /** *

*/ -QString PGetAsymmetryRunBlockDialog::GetT0(bool &present) +QString PGetAsymmetryRunBlockDialog::getT0(bool &present) { QString str = ""; @@ -212,7 +216,7 @@ QString PGetAsymmetryRunBlockDialog::GetT0(bool &present) /** *

*/ -QString PGetAsymmetryRunBlockDialog::GetFitRange(bool &valid) +QString PGetAsymmetryRunBlockDialog::getFitRange(bool &valid) { QString str = ""; @@ -233,7 +237,7 @@ QString PGetAsymmetryRunBlockDialog::GetFitRange(bool &valid) /** *

*/ -QString PGetAsymmetryRunBlockDialog::GetPacking(bool &present) +QString PGetAsymmetryRunBlockDialog::getPacking(bool &present) { QString str = ""; @@ -248,6 +252,16 @@ QString PGetAsymmetryRunBlockDialog::GetPacking(bool &present) return str; } +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +void PGetAsymmetryRunBlockDialog::helpContents() +{ + QMessageBox::information(this, "helpContents", + fHelp, QMessageBox::Ok); +} + //---------------------------------------------------------------------------------------------------- // END //---------------------------------------------------------------------------------------------------- diff --git a/src/musrgui/PGetAsymmetryRunBlockDialog.h b/src/musrgui/PGetAsymmetryRunBlockDialog.h index 88a80c22..94c96fe1 100644 --- a/src/musrgui/PGetAsymmetryRunBlockDialog.h +++ b/src/musrgui/PGetAsymmetryRunBlockDialog.h @@ -37,19 +37,26 @@ class PGetAsymmetryRunBlockDialog : public PGetAsymmetryRunBlockDialogBase { public: - PGetAsymmetryRunBlockDialog(); + PGetAsymmetryRunBlockDialog(const QString help = "", QWidget * parent = 0, const char * name = 0, + bool modal = FALSE, WFlags f = 0); - QString GetRunHeaderInfo(); - QString GetAlphaParameter(bool &present); - QString GetBetaParameter(bool &present); - QString GetMap(bool &valid); - QString GetForward() { return QString("forward " + fForward_lineEdit->text() + "\n"); } - QString GetBackward() { return QString("backward " + fBackward_lineEdit->text() + "\n"); } - QString GetBackground(bool &valid); - QString GetData(bool &valid); - QString GetT0(bool &present); - QString GetFitRange(bool &valid); - QString GetPacking(bool &present); + QString getRunHeaderInfo(); + QString getAlphaParameter(bool &present); + QString getBetaParameter(bool &present); + QString getMap(bool &valid); + QString getForward() { return QString("forward " + fForward_lineEdit->text() + "\n"); } + QString getBackward() { return QString("backward " + fBackward_lineEdit->text() + "\n"); } + QString getBackground(bool &valid); + QString getData(bool &valid); + QString getT0(bool &present); + QString getFitRange(bool &valid); + QString getPacking(bool &present); + + private slots: + void helpContents(); + + private: + QString fHelp; }; #endif // _PGETASYMMETRYRUNBLOCKDIALOG_H_ diff --git a/src/musrgui/PGetSingleHistoRunBlockDialog.cpp b/src/musrgui/PGetSingleHistoRunBlockDialog.cpp index b4d6b0e6..83e3e6d8 100644 --- a/src/musrgui/PGetSingleHistoRunBlockDialog.cpp +++ b/src/musrgui/PGetSingleHistoRunBlockDialog.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include "PGetSingleHistoRunBlockDialog.h" @@ -40,10 +41,11 @@ /** *

*/ -PGetSingleHistoRunBlockDialog::PGetSingleHistoRunBlockDialog(QWidget * parent, const char *name, - bool modal, WFlags f, - const bool lifetimeCorrection) : - PGetSingleHistoRunBlockDialogBase(parent, name, modal, f) +PGetSingleHistoRunBlockDialog::PGetSingleHistoRunBlockDialog(const QString help, const bool lifetimeCorrection, + QWidget * parent, const char *name, + bool modal, WFlags f) : + PGetSingleHistoRunBlockDialogBase(parent, name, modal, f), + fHelp(help) { fForward_lineEdit->setValidator( new QIntValidator(fForward_lineEdit) ); fNorm_lineEdit->setValidator( new QIntValidator(fNorm_lineEdit) ); @@ -65,7 +67,7 @@ PGetSingleHistoRunBlockDialog::PGetSingleHistoRunBlockDialog(QWidget * parent, c /** *

*/ -QString PGetSingleHistoRunBlockDialog::GetRunHeaderInfo() +QString PGetSingleHistoRunBlockDialog::getRunHeaderInfo() { QString str=""; @@ -81,7 +83,7 @@ QString PGetSingleHistoRunBlockDialog::GetRunHeaderInfo() /** *

*/ -QString PGetSingleHistoRunBlockDialog::GetMap(bool &valid) +QString PGetSingleHistoRunBlockDialog::getMap(bool &valid) { QString str = fMap_lineEdit->text().stripWhiteSpace().remove(" "); @@ -102,7 +104,7 @@ QString PGetSingleHistoRunBlockDialog::GetMap(bool &valid) /** *

*/ -QString PGetSingleHistoRunBlockDialog::GetData(bool &valid) +QString PGetSingleHistoRunBlockDialog::getData(bool &valid) { QString str=""; @@ -122,7 +124,7 @@ QString PGetSingleHistoRunBlockDialog::GetData(bool &valid) /** *

*/ -QString PGetSingleHistoRunBlockDialog::GetBackground(bool &valid) +QString PGetSingleHistoRunBlockDialog::getBackground(bool &valid) { QString str=""; @@ -157,7 +159,7 @@ QString PGetSingleHistoRunBlockDialog::GetBackground(bool &valid) /** *

*/ -QString PGetSingleHistoRunBlockDialog::GetFitRange(bool &valid) +QString PGetSingleHistoRunBlockDialog::getFitRange(bool &valid) { QString str=""; @@ -178,7 +180,7 @@ QString PGetSingleHistoRunBlockDialog::GetFitRange(bool &valid) /** *

*/ -QString PGetSingleHistoRunBlockDialog::GetPacking(bool &present) +QString PGetSingleHistoRunBlockDialog::getPacking(bool &present) { QString str=""; @@ -197,7 +199,7 @@ QString PGetSingleHistoRunBlockDialog::GetPacking(bool &present) /** *

*/ -QString PGetSingleHistoRunBlockDialog::GetT0(bool &present) +QString PGetSingleHistoRunBlockDialog::getT0(bool &present) { QString str=""; @@ -216,7 +218,7 @@ QString PGetSingleHistoRunBlockDialog::GetT0(bool &present) /** *

*/ -QString PGetSingleHistoRunBlockDialog::GetMuonLifetimeParam(bool &present) +QString PGetSingleHistoRunBlockDialog::getMuonLifetimeParam(bool &present) { QString str=""; @@ -235,7 +237,7 @@ QString PGetSingleHistoRunBlockDialog::GetMuonLifetimeParam(bool &present) /** *

*/ -QString PGetSingleHistoRunBlockDialog::GetLifetimeCorrection(bool &present) +QString PGetSingleHistoRunBlockDialog::getLifetimeCorrection(bool &present) { QString str=""; @@ -249,6 +251,16 @@ QString PGetSingleHistoRunBlockDialog::GetLifetimeCorrection(bool &present) return str; } +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +void PGetSingleHistoRunBlockDialog::helpContents() +{ + QMessageBox::information(this, "helpContents", + fHelp, QMessageBox::Ok); +} + //---------------------------------------------------------------------------------------------------- // END //---------------------------------------------------------------------------------------------------- diff --git a/src/musrgui/PGetSingleHistoRunBlockDialog.h b/src/musrgui/PGetSingleHistoRunBlockDialog.h index 841d53be..72a497c0 100644 --- a/src/musrgui/PGetSingleHistoRunBlockDialog.h +++ b/src/musrgui/PGetSingleHistoRunBlockDialog.h @@ -40,20 +40,27 @@ class PGetSingleHistoRunBlockDialog : public PGetSingleHistoRunBlockDialogBase { public: - PGetSingleHistoRunBlockDialog(QWidget * parent = 0, const char * name = 0, bool modal = FALSE, - WFlags f = 0, const bool lifetimeCorrection = true); + PGetSingleHistoRunBlockDialog(const QString help = "", const bool lifetimeCorrection = true, + QWidget * parent = 0, const char * name = 0, bool modal = FALSE, + WFlags f = 0); - QString GetRunHeaderInfo(); - QString GetMap(bool &valid); - QString GetForward() { return QString("forward " + fForward_lineEdit->text() + "\n"); } - QString GetNorm() { return QString("norm " + fNorm_lineEdit->text() + "\n"); } - QString GetData(bool &valid); - QString GetBackground(bool &valid); - QString GetFitRange(bool &valid); - QString GetPacking(bool &present); - QString GetT0(bool &present); - QString GetMuonLifetimeParam(bool &present); - QString GetLifetimeCorrection(bool &present); + QString getRunHeaderInfo(); + QString getMap(bool &valid); + QString getForward() { return QString("forward " + fForward_lineEdit->text() + "\n"); } + QString getNorm() { return QString("norm " + fNorm_lineEdit->text() + "\n"); } + QString getData(bool &valid); + QString getBackground(bool &valid); + QString getFitRange(bool &valid); + QString getPacking(bool &present); + QString getT0(bool &present); + QString getMuonLifetimeParam(bool &present); + QString getLifetimeCorrection(bool &present); + + private slots: + void helpContents(); + + private: + QString fHelp; }; #endif // _PGETSINGLEHISTORUNBLOCKDIALOG_H_ diff --git a/src/musrgui/PSubTextEdit.cpp b/src/musrgui/PSubTextEdit.cpp index c737a721..aee1124d 100644 --- a/src/musrgui/PSubTextEdit.cpp +++ b/src/musrgui/PSubTextEdit.cpp @@ -48,8 +48,11 @@ /** *

*/ -PSubTextEdit::PSubTextEdit(QWidget *parent, const char *name, const bool lifetimeCorrectionFlag) : - QTextEdit(parent, name), fLifetimeCorrectionFlag(lifetimeCorrectionFlag) +PSubTextEdit::PSubTextEdit(const bool lifetimeCorrectionFlag, const QString help, + QWidget *parent, const char *name) : + QTextEdit(parent, name), + fLifetimeCorrectionFlag(lifetimeCorrectionFlag), + fHelp(help) { } @@ -160,7 +163,7 @@ void PSubTextEdit::insertFunctionBlock() */ void PSubTextEdit::insertAsymRunBlock() { - PGetAsymmetryRunBlockDialog *dlg = new PGetAsymmetryRunBlockDialog(); + PGetAsymmetryRunBlockDialog *dlg = new PGetAsymmetryRunBlockDialog(fHelp); if (dlg->exec() == QDialog::Accepted) { QString str, workStr; bool valid = true, present = true; @@ -168,25 +171,25 @@ void PSubTextEdit::insertAsymRunBlock() // STILL MISSING // add run line - str += dlg->GetRunHeaderInfo(); + str += dlg->getRunHeaderInfo(); // add fittype str += "fittype 2 (asymmetry fit)\n"; // add alpha if present - workStr = dlg->GetAlphaParameter(present); + workStr = dlg->getAlphaParameter(present); if (present) { str += workStr; } // add beta if present - workStr = dlg->GetBetaParameter(present); + workStr = dlg->getBetaParameter(present); if (present) { str += workStr; } // add map - workStr = dlg->GetMap(valid); + workStr = dlg->getMap(valid); if (valid) { str += workStr; } else { @@ -197,13 +200,13 @@ void PSubTextEdit::insertAsymRunBlock() } // add forward - str += dlg->GetForward(); + str += dlg->getForward(); // add backward - str += dlg->GetBackward(); + str += dlg->getBackward(); // add background or backgr.fix - workStr = dlg->GetBackground(valid); + workStr = dlg->getBackground(valid); str += workStr; if (!valid) { QMessageBox::critical(this, "**ERROR**", @@ -212,7 +215,7 @@ void PSubTextEdit::insertAsymRunBlock() } // add data - workStr = dlg->GetData(valid); + workStr = dlg->getData(valid); if (valid) { str += workStr; } else { @@ -222,7 +225,7 @@ void PSubTextEdit::insertAsymRunBlock() } // add t0 if present - workStr = dlg->GetT0(present); + workStr = dlg->getT0(present); if (present) { str += workStr; } else { @@ -232,7 +235,7 @@ void PSubTextEdit::insertAsymRunBlock() } // add fit range - workStr = dlg->GetFitRange(valid); + workStr = dlg->getFitRange(valid); str += workStr; if (!valid) { QMessageBox::critical(this, "**ERROR**", @@ -241,7 +244,7 @@ void PSubTextEdit::insertAsymRunBlock() } // add packing - workStr = dlg->GetPacking(present); + workStr = dlg->getPacking(present); str += workStr; if (!present) { QMessageBox::critical(this, "**ERROR**", @@ -260,7 +263,7 @@ void PSubTextEdit::insertAsymRunBlock() */ void PSubTextEdit::insertSingleHistRunBlock() { - PGetSingleHistoRunBlockDialog *dlg = new PGetSingleHistoRunBlockDialog(); + PGetSingleHistoRunBlockDialog *dlg = new PGetSingleHistoRunBlockDialog(fHelp); if (dlg->exec() == QDialog::Accepted) { QString str, workStr; bool valid = true, present = true; @@ -268,13 +271,13 @@ void PSubTextEdit::insertSingleHistRunBlock() // STILL MISSING // add run line - str += dlg->GetRunHeaderInfo(); + str += dlg->getRunHeaderInfo(); // add fittype str += "fittype 0 (single histogram fit)\n"; // add map - workStr = dlg->GetMap(valid); + workStr = dlg->getMap(valid); if (valid) { str += workStr; } else { @@ -285,25 +288,25 @@ void PSubTextEdit::insertSingleHistRunBlock() } // add forward - str += dlg->GetForward(); + str += dlg->getForward(); // add norm - str += dlg->GetNorm(); + str += dlg->getNorm(); // add lifetime parameter - workStr = dlg->GetMuonLifetimeParam(present); + workStr = dlg->getMuonLifetimeParam(present); if (present) { str += workStr; } // add lifetime correction flag if present - workStr = dlg->GetLifetimeCorrection(present); + workStr = dlg->getLifetimeCorrection(present); if (present) { str += workStr; } // add background, backgr.fix or backgr.fit - workStr = dlg->GetBackground(valid); + workStr = dlg->getBackground(valid); str += workStr; if (!valid) { QMessageBox::critical(this, "**ERROR**", @@ -312,7 +315,7 @@ void PSubTextEdit::insertSingleHistRunBlock() } // add t0 if present - workStr = dlg->GetT0(present); + workStr = dlg->getT0(present); if (present) { str += workStr; } else { @@ -322,7 +325,7 @@ void PSubTextEdit::insertSingleHistRunBlock() } // add data - workStr = dlg->GetData(valid); + workStr = dlg->getData(valid); if (valid) { str += workStr; } else { @@ -332,7 +335,7 @@ void PSubTextEdit::insertSingleHistRunBlock() } // add fit range - workStr = dlg->GetFitRange(valid); + workStr = dlg->getFitRange(valid); str += workStr; if (!valid) { QMessageBox::critical(this, "**ERROR**", @@ -341,7 +344,7 @@ void PSubTextEdit::insertSingleHistRunBlock() } // add packing - workStr = dlg->GetPacking(present); + workStr = dlg->getPacking(present); str += workStr; if (!present) { QMessageBox::critical(this, "**ERROR**", diff --git a/src/musrgui/PSubTextEdit.h b/src/musrgui/PSubTextEdit.h index 5a9e89d4..24ec6605 100644 --- a/src/musrgui/PSubTextEdit.h +++ b/src/musrgui/PSubTextEdit.h @@ -39,7 +39,7 @@ class PSubTextEdit : public QTextEdit Q_OBJECT public: - PSubTextEdit( QWidget *parent = 0, const char *name = 0 , const bool lifetimeCorrectionFlag = true); + PSubTextEdit(const bool lifetimeCorrectionFlag = true, const QString help ="", QWidget *parent = 0, const char *name = 0); protected: virtual QPopupMenu *createPopupMenu( const QPoint &pos); @@ -59,6 +59,7 @@ class PSubTextEdit : public QTextEdit private: bool fLifetimeCorrectionFlag; + QString fHelp; }; diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp index 6132a4ef..411a35ab 100644 --- a/src/musrgui/PTextEdit.cpp +++ b/src/musrgui/PTextEdit.cpp @@ -329,7 +329,7 @@ void PTextEdit::load( const QString &f ) { if ( !QFile::exists( f ) ) return; - PSubTextEdit *edit = new PSubTextEdit( fTabWidget, "PSubTextEdit", fAdmin->getLifetimeCorrectionFlag() ); + PSubTextEdit *edit = new PSubTextEdit( fAdmin->getLifetimeCorrectionFlag(), fAdmin->getHelpMain() ); edit->setTextFormat( PlainText ); edit->setFamily("Courier"); edit->setPointSize(11); // 11pt @@ -410,7 +410,7 @@ bool PTextEdit::validRunList(const QString runList) */ void PTextEdit::fileNew() { - PSubTextEdit *edit = new PSubTextEdit( fTabWidget, "PSubTextEdit", fAdmin->getLifetimeCorrectionFlag() ); + PSubTextEdit *edit = new PSubTextEdit( fAdmin->getLifetimeCorrectionFlag(), fAdmin->getHelpMain() ); edit->setTextFormat( PlainText ); edit->setFamily("Courier"); edit->setPointSize(11); // 11pt @@ -1168,8 +1168,8 @@ void PTextEdit::musrSwapMsrMlog() void PTextEdit::helpContents() { QMessageBox::information( this, "helpContents", - "Will deliver eventually a help content.\n" - "NOT IMPLEMENTED YET :-(" ); + fAdmin->getHelpMain(), + QMessageBox::Ok ); } //---------------------------------------------------------------------------------------------------- diff --git a/src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui b/src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui index 420cbc57..7abe723f 100644 --- a/src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui +++ b/src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui @@ -865,6 +865,12 @@ PGetAsymmetryRunBlockDialogBase reject() + + fHelp_button + clicked() + PGetAsymmetryRunBlockDialogBase + helpContents() + fRunFileName_lineEdit @@ -895,5 +901,8 @@ fCancel_button fHelp_button + + helpContents() + diff --git a/src/musrgui/forms/PGetParameterDialogBase.ui b/src/musrgui/forms/PGetParameterDialogBase.ui index 305ddbd0..68f6524f 100644 --- a/src/musrgui/forms/PGetParameterDialogBase.ui +++ b/src/musrgui/forms/PGetParameterDialogBase.ui @@ -245,6 +245,25 @@ 1 + + + fAdd_pushButton + + + + 10 + 390 + 56 + 26 + + + + &Add + + + Alt+A + + fParam_textEdit @@ -273,21 +292,24 @@ FITPARAMETER - fAdd_pushButton + fCancel_pushButton - 10 + 575 390 - 56 + 75 26 - &Add + &Cancel - Alt+A + + + + true @@ -321,7 +343,7 @@ FITPARAMETER - 600 + 515 390 49 26 @@ -340,28 +362,6 @@ FITPARAMETER true - - - fCancel_pushButton - - - - 520 - 390 - 75 - 26 - - - - &Cancel - - - - - - true - - diff --git a/src/musrgui/forms/PGetPlotDialogBase.ui b/src/musrgui/forms/PGetPlotDialogBase.ui index ac301b3a..a9dda97e 100644 --- a/src/musrgui/forms/PGetPlotDialogBase.ui +++ b/src/musrgui/forms/PGetPlotDialogBase.ui @@ -214,53 +214,6 @@ end value - - - fCancel_button - - - - 370 - 270 - 75 - 26 - - - - &Cancel - - - - - - true - - - - - fOk_button - - - - 450 - 270 - 49 - 26 - - - - &OK - - - - - - true - - - true - - Horizontal Spacing2 @@ -305,6 +258,53 @@ Alt+A + + + fCancel_button + + + + 425 + 270 + 75 + 26 + + + + &Cancel + + + + + + true + + + + + fOk_button + + + + 367 + 270 + 49 + 26 + + + + &OK + + + + + + true + + + true + + diff --git a/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui b/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui index 8af3a79f..6d2ec58f 100644 --- a/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui +++ b/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui @@ -804,6 +804,12 @@ PGetSingleHistoRunBlockDialogBase reject() + + fHelp_button + clicked() + PGetSingleHistoRunBlockDialogBase + helpContents() + fRunFileName_lineEdit @@ -829,5 +835,8 @@ fCancel_button fHelp_button + + helpContents() + diff --git a/src/musrgui/musrgui_startup.xml b/src/musrgui/musrgui_startup.xml index 3df63081..5f409175 100644 --- a/src/musrgui/musrgui_startup.xml +++ b/src/musrgui/musrgui_startup.xml @@ -17,7 +17,8 @@ - For a detailed description of the aim and structure of a msr-file see http://wiki.intranet.psi.ch. + For a detailed description of the aim and structure of a msr-file see <b>http://wiki.intranet.psi.ch.</b> + Starting with >= Qt4.2 this will be linked automatically but until then ...; sorry ;-)