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

added primitve helps

Browse Source
This commit is contained in:
nemu 2009-03-19 07:58:16 +00:00
parent e3eb423cbe
commit d3be43ff70
13 changed files with 226 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/musrgui/PAdmin.cpp
View File

@ -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("&lt;", "<");
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())

34
src/musrgui/PGetAsymmetryRunBlockDialog.cpp
View File

@ -32,6 +32,7 @@
#include <qlineedit.h>
#include <qvalidator.h>
#include <qcombobox.h>
#include <qmessagebox.h>
#include "PGetAsymmetryRunBlockDialog.h"
@ -39,7 +40,10 @@
/**
* <p>
*/
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()
/**
* <p>
*/
QString PGetAsymmetryRunBlockDialog::GetRunHeaderInfo()
QString PGetAsymmetryRunBlockDialog::getRunHeaderInfo()
{
QString str;
@ -82,7 +86,7 @@ QString PGetAsymmetryRunBlockDialog::GetRunHeaderInfo()
/**
* <p>
*/
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)
/**
* <p>
*/
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)
/**
* <p>
*/
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)
/**
* <p>
*/
QString PGetAsymmetryRunBlockDialog::GetBackground(bool &valid)
QString PGetAsymmetryRunBlockDialog::getBackground(bool &valid)
{
QString str = "";
@ -169,7 +173,7 @@ QString PGetAsymmetryRunBlockDialog::GetBackground(bool &valid)
/**
* <p>
*/
QString PGetAsymmetryRunBlockDialog::GetData(bool &valid)
QString PGetAsymmetryRunBlockDialog::getData(bool &valid)
{
QString str = "";
@ -192,7 +196,7 @@ QString PGetAsymmetryRunBlockDialog::GetData(bool &valid)
/**
* <p>
*/
QString PGetAsymmetryRunBlockDialog::GetT0(bool &present)
QString PGetAsymmetryRunBlockDialog::getT0(bool &present)
{
QString str = "";
@ -212,7 +216,7 @@ QString PGetAsymmetryRunBlockDialog::GetT0(bool &present)
/**
* <p>
*/
QString PGetAsymmetryRunBlockDialog::GetFitRange(bool &valid)
QString PGetAsymmetryRunBlockDialog::getFitRange(bool &valid)
{
QString str = "";
@ -233,7 +237,7 @@ QString PGetAsymmetryRunBlockDialog::GetFitRange(bool &valid)
/**
* <p>
*/
QString PGetAsymmetryRunBlockDialog::GetPacking(bool &present)
QString PGetAsymmetryRunBlockDialog::getPacking(bool &present)
{
QString str = "";
@ -248,6 +252,16 @@ QString PGetAsymmetryRunBlockDialog::GetPacking(bool &present)
return str;
}
//----------------------------------------------------------------------------------------------------
/**
* <p>
*/
void PGetAsymmetryRunBlockDialog::helpContents()
{
QMessageBox::information(this, "helpContents",
fHelp, QMessageBox::Ok);
}
//----------------------------------------------------------------------------------------------------
// END
//----------------------------------------------------------------------------------------------------

31
src/musrgui/PGetAsymmetryRunBlockDialog.h
View File

@ -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_

38
src/musrgui/PGetSingleHistoRunBlockDialog.cpp
View File

@ -33,6 +33,7 @@
#include <qvalidator.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qmessagebox.h>
#include "PGetSingleHistoRunBlockDialog.h"
@ -40,10 +41,11 @@
/**
* <p>
*/
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
/**
* <p>
*/
QString PGetSingleHistoRunBlockDialog::GetRunHeaderInfo()
QString PGetSingleHistoRunBlockDialog::getRunHeaderInfo()
{
QString str="";
@ -81,7 +83,7 @@ QString PGetSingleHistoRunBlockDialog::GetRunHeaderInfo()
/**
* <p>
*/
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)
/**
* <p>
*/
QString PGetSingleHistoRunBlockDialog::GetData(bool &valid)
QString PGetSingleHistoRunBlockDialog::getData(bool &valid)
{
QString str="";
@ -122,7 +124,7 @@ QString PGetSingleHistoRunBlockDialog::GetData(bool &valid)
/**
* <p>
*/
QString PGetSingleHistoRunBlockDialog::GetBackground(bool &valid)
QString PGetSingleHistoRunBlockDialog::getBackground(bool &valid)
{
QString str="";
@ -157,7 +159,7 @@ QString PGetSingleHistoRunBlockDialog::GetBackground(bool &valid)
/**
* <p>
*/
QString PGetSingleHistoRunBlockDialog::GetFitRange(bool &valid)
QString PGetSingleHistoRunBlockDialog::getFitRange(bool &valid)
{
QString str="";
@ -178,7 +180,7 @@ QString PGetSingleHistoRunBlockDialog::GetFitRange(bool &valid)
/**
* <p>
*/
QString PGetSingleHistoRunBlockDialog::GetPacking(bool &present)
QString PGetSingleHistoRunBlockDialog::getPacking(bool &present)
{
QString str="";
@ -197,7 +199,7 @@ QString PGetSingleHistoRunBlockDialog::GetPacking(bool &present)
/**
* <p>
*/
QString PGetSingleHistoRunBlockDialog::GetT0(bool &present)
QString PGetSingleHistoRunBlockDialog::getT0(bool &present)
{
QString str="";
@ -216,7 +218,7 @@ QString PGetSingleHistoRunBlockDialog::GetT0(bool &present)
/**
* <p>
*/
QString PGetSingleHistoRunBlockDialog::GetMuonLifetimeParam(bool &present)
QString PGetSingleHistoRunBlockDialog::getMuonLifetimeParam(bool &present)
{
QString str="";
@ -235,7 +237,7 @@ QString PGetSingleHistoRunBlockDialog::GetMuonLifetimeParam(bool &present)
/**
* <p>
*/
QString PGetSingleHistoRunBlockDialog::GetLifetimeCorrection(bool &present)
QString PGetSingleHistoRunBlockDialog::getLifetimeCorrection(bool &present)
{
QString str="";
@ -249,6 +251,16 @@ QString PGetSingleHistoRunBlockDialog::GetLifetimeCorrection(bool &present)
return str;
}
//----------------------------------------------------------------------------------------------------
/**
* <p>
*/
void PGetSingleHistoRunBlockDialog::helpContents()
{
QMessageBox::information(this, "helpContents",
fHelp, QMessageBox::Ok);
}
//----------------------------------------------------------------------------------------------------
// END
//----------------------------------------------------------------------------------------------------

33
src/musrgui/PGetSingleHistoRunBlockDialog.h
View File

@ -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_

55
src/musrgui/PSubTextEdit.cpp
View File

@ -48,8 +48,11 @@
/**
* <p>
*/
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**",

3
src/musrgui/PSubTextEdit.h
View File

@ -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;
};

8
src/musrgui/PTextEdit.cpp
View File

@ -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 );
}
//----------------------------------------------------------------------------------------------------

9
src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui
View File

@ -865,6 +865,12 @@
<receiver>PGetAsymmetryRunBlockDialogBase</receiver>
<slot>reject()</slot>
</connection>
<connection>
<sender>fHelp_button</sender>
<signal>clicked()</signal>
<receiver>PGetAsymmetryRunBlockDialogBase</receiver>
<slot>helpContents()</slot>
</connection>
</connections>
<tabstops>
<tabstop>fRunFileName_lineEdit</tabstop>
@ -895,5 +901,8 @@
<tabstop>fCancel_button</tabstop>
<tabstop>fHelp_button</tabstop>
</tabstops>
<slots>
<slot access="private">helpContents()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>

56
src/musrgui/forms/PGetParameterDialogBase.ui
View File

@ -245,6 +245,25 @@
<number>1</number>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fAdd_pushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>390</y>
<width>56</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Add</string>
</property>
<property name="accel">
<string>Alt+A</string>
</property>
</widget>
<widget class="QTextEdit">
<property name="name">
<cstring>fParam_textEdit</cstring>
@ -273,21 +292,24 @@ FITPARAMETER
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fAdd_pushButton</cstring>
<cstring>fCancel_pushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<x>575</x>
<y>390</y>
<width>56</width>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Add</string>
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string>Alt+A</string>
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
<spacer>
@ -321,7 +343,7 @@ FITPARAMETER
</property>
<property name="geometry">
<rect>
<x>600</x>
<x>515</x>
<y>390</y>
<width>49</width>
<height>26</height>
@ -340,28 +362,6 @@ FITPARAMETER
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fCancel_pushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>520</x>
<y>390</y>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</widget>
<images>
<image name="image0">

94
src/musrgui/forms/PGetPlotDialogBase.ui
View File

@ -214,53 +214,6 @@
<string>end value</string>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fCancel_button</cstring>
</property>
<property name="geometry">
<rect>
<x>370</x>
<y>270</y>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fOk_button</cstring>
</property>
<property name="geometry">
<rect>
<x>450</x>
<y>270</y>
<width>49</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;OK</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<spacer>
<property name="name">
<cstring>Horizontal Spacing2</cstring>
@ -305,6 +258,53 @@
<string>Alt+A</string>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fCancel_button</cstring>
</property>
<property name="geometry">
<rect>
<x>425</x>
<y>270</y>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fOk_button</cstring>
</property>
<property name="geometry">
<rect>
<x>367</x>
<y>270</y>
<width>49</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;OK</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</widget>
<images>
<image name="image0">

9
src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui
View File

@ -804,6 +804,12 @@
<receiver>PGetSingleHistoRunBlockDialogBase</receiver>
<slot>reject()</slot>
</connection>
<connection>
<sender>fHelp_button</sender>
<signal>clicked()</signal>
<receiver>PGetSingleHistoRunBlockDialogBase</receiver>
<slot>helpContents()</slot>
</connection>
</connections>
<tabstops>
<tabstop>fRunFileName_lineEdit</tabstop>
@ -829,5 +835,8 @@
<tabstop>fCancel_button</tabstop>
<tabstop>fHelp_button</tabstop>
</tabstops>
<slots>
<slot access="private">helpContents()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>

3
src/musrgui/musrgui_startup.xml
View File

@ -17,7 +17,8 @@
</msr_file_defaults>
<help_section>
<help_main>
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 &lt;b&gt;http://wiki.intranet.psi.ch.&lt;/b&gt;
Starting with &gt;= Qt4.2 this will be linked automatically but until then ...; sorry ;-)
</help_main>
</help_section>
</musrgui_startup>