first version of a help sub-layer for musredit added

src/musredit/PGetAsymmetryRunBlockDialog.cpp

@@ -34,15 +34,16 @@
 #include <QComboBox>
 #include <QMessageBox>
 
+#include "PHelp.h"
+
 #include "PGetAsymmetryRunBlockDialog.h"
 
+
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
  */
-PGetAsymmetryRunBlockDialog::PGetAsymmetryRunBlockDialog(const QString help, QWidget *parent, Qt::WindowFlags f) :
-                                                         QDialog(parent, f),
-                                                         fHelp(help)
+PGetAsymmetryRunBlockDialog::PGetAsymmetryRunBlockDialog(const QString helpUrl) : fHelpUrl(helpUrl)
 {
   setupUi(this);
 
@@ -261,8 +262,12 @@ QString PGetAsymmetryRunBlockDialog::getPacking(bool &present)
  */
 void PGetAsymmetryRunBlockDialog::helpContent()
 {
-  QMessageBox::information(this, "helpContents",
-                            fHelp, QMessageBox::Ok);
+  if (fHelpUrl.isEmpty()) {
+    QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  } else {
+    PHelp *help = new PHelp(fHelpUrl);
+    help->show();
+  }
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit/PGetAsymmetryRunBlockDialog.h

@@ -39,7 +39,7 @@ class PGetAsymmetryRunBlockDialog : public QDialog, private Ui::PGetAsymmetryRun
   Q_OBJECT
 
   public:
-    PGetAsymmetryRunBlockDialog(const QString help = "", QWidget * parent = 0, Qt::WindowFlags f = 0);
+    PGetAsymmetryRunBlockDialog(const QString helpUrl);
 
     QString getRunHeaderInfo();
     QString getAlphaParameter(bool &present);
@@ -53,11 +53,11 @@ class PGetAsymmetryRunBlockDialog : public QDialog, private Ui::PGetAsymmetryRun
     QString getFitRange(bool &valid);
     QString getPacking(bool &present);
 
- private slots:
+  private slots:
     void helpContent();
 
   private:
-    QString fHelp;
+    QString fHelpUrl;
 };
 
 #endif // _PGETASYMMETRYRUNBLOCKDIALOG_H_

src/musredit/PGetDefaultDialog.cpp

@@ -33,6 +33,8 @@
 #include <QComboBox>
 #include <QMessageBox>
 
+#include "PHelp.h"
+
 #include "PGetDefaultDialog.h"
 
 #define INSTITUTE_PSI    0
@@ -54,8 +56,7 @@
 /**
  * <p>
  */
-PGetDefaultDialog::PGetDefaultDialog(QWidget *parent, Qt::WindowFlags f) :
-                      QDialog(parent, f)
+PGetDefaultDialog::PGetDefaultDialog()
 {
   setupUi(this);
 
@@ -100,7 +101,9 @@ void PGetDefaultDialog::setFileFormat(const QString &str)
  */
 void PGetDefaultDialog::helpContent()
 {
-  QMessageBox::information(this, "Help", "will eventually show help information.");
+  PHelp *help = new PHelp("https://wiki.intranet.psi.ch/MUSR/MusrFit#4_5_The_RUN_Block");
+
+  help->show();
 }
 
 //---------------------------------------------------------------------------

src/musredit/PGetDefaultDialog.h

@@ -44,7 +44,7 @@ class PGetDefaultDialog : public QDialog, private Ui::PGetDefaultDialog
   Q_OBJECT
 
   public:
-    PGetDefaultDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
+    PGetDefaultDialog();
     virtual ~PGetDefaultDialog() {}
 
     virtual const QString getRunFileName() const { return fRunFileName_lineEdit->text(); }

src/musredit/PGetFourierBlockDialog.cpp

@@ -36,13 +36,15 @@
 #include <QPushButton>
 #include <QMessageBox>
 
+#include "PHelp.h"
+
 #include "PGetFourierBlockDialog.h"
 
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
  */
-PGetFourierBlockDialog::PGetFourierBlockDialog()
+PGetFourierBlockDialog::PGetFourierBlockDialog(const QString helpUrl) : fHelpUrl(helpUrl)
 {
   setupUi(this);
 
@@ -127,7 +129,12 @@ void PGetFourierBlockDialog::fillFourierBlock()
  */
 void PGetFourierBlockDialog::helpContent()
 {
-  QMessageBox::information(this, "**HELP**", "Will eventually show a help.");
+  if (fHelpUrl.isEmpty()) {
+    QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  } else {
+    PHelp *help = new PHelp(fHelpUrl);
+    help->show();
+  }
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit/PGetFourierBlockDialog.h

@@ -41,7 +41,7 @@ class PGetFourierBlockDialog : public QDialog, private Ui::PGetFourierBlockDialo
   Q_OBJECT
 
   public:
-    PGetFourierBlockDialog();
+    PGetFourierBlockDialog(const QString helpUrl);
 
     QString getFourierBlock() { return fFourierBlock; }
 
@@ -52,6 +52,7 @@ class PGetFourierBlockDialog : public QDialog, private Ui::PGetFourierBlockDialo
 
   private:
     QString fFourierBlock;
+    QString fHelpUrl;
 };
 
 #endif // _PGETFOURIERBLOCKDIALOG_H_

src/musredit/PGetFunctionsBlockDialog.cpp

@@ -37,14 +37,15 @@
 
 #include <QtDebug>
 
+#include "PHelp.h"
+
 #include "PGetFunctionsBlockDialog.h"
 
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
  */
-PGetFunctionsBlockDialog::PGetFunctionsBlockDialog(const QString help, QWidget *parent, Qt::WindowFlags f) :
-                                                   QDialog(parent, f), fHelp(help)
+PGetFunctionsBlockDialog::PGetFunctionsBlockDialog(const QString helpUrl) : fHelpUrl(helpUrl)
 {
   setupUi(this);
 
@@ -103,8 +104,12 @@ void PGetFunctionsBlockDialog::addFunction()
  */
 void PGetFunctionsBlockDialog::helpContent()
 {
-  QMessageBox::information(this, "helpContents",
-                            fHelp, QMessageBox::Ok);
+  if (fHelpUrl.isEmpty()) {
+    QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  } else {
+    PHelp *help = new PHelp(fHelpUrl);
+    help->show();
+  }
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit/PGetFunctionsBlockDialog.h

@@ -39,7 +39,7 @@ class PGetFunctionsBlockDialog : public QDialog, private Ui::PGetFunctionsBlockD
   Q_OBJECT
 
   public:
-    PGetFunctionsBlockDialog(const QString help = "", QWidget * parent = 0, Qt::WindowFlags f = 0);
+    PGetFunctionsBlockDialog(const QString helpUrl = "");
 
     QString getFunctionsBlock() { return fFunctionBlock_plainTextEdit->toPlainText(); }
 
@@ -48,7 +48,7 @@ class PGetFunctionsBlockDialog : public QDialog, private Ui::PGetFunctionsBlockD
     void helpContent();
 
   private:
-    QString fHelp;
+    QString fHelpUrl;
 };
 
 #endif // _PGETFUNCTIONSBLOCKDIALOG_H_

src/musredit/PGetNonMusrRunBlockDialog.cpp

@@ -34,15 +34,14 @@
 #include <QComboBox>
 #include <QMessageBox>
 
+#include "PHelp.h"
 #include "PGetNonMusrRunBlockDialog.h"
 
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
  */
-PGetNonMusrRunBlockDialog::PGetNonMusrRunBlockDialog(const QString help, QWidget *parent, Qt::WindowFlags f) :
-                                                     QDialog(parent, f),
-                                                     fHelp(help)
+PGetNonMusrRunBlockDialog::PGetNonMusrRunBlockDialog(const QString helpUrl) : fHelpUrl(helpUrl)
 {
   setupUi(this);
 
@@ -147,8 +146,12 @@ QString PGetNonMusrRunBlockDialog::getFitRange(bool &valid)
  */
 void PGetNonMusrRunBlockDialog::helpContent()
 {
-  QMessageBox::information(this, "helpContent",
-                            fHelp, QMessageBox::Ok);
+  if (fHelpUrl.isEmpty()) {
+    QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  } else {
+    PHelp *help = new PHelp(fHelpUrl);
+    help->show();
+  }
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit/PGetNonMusrRunBlockDialog.h

@@ -39,7 +39,7 @@ class PGetNonMusrRunBlockDialog : public QDialog, private Ui::PGetNonMusrRunBloc
   Q_OBJECT
 
   public:
-    PGetNonMusrRunBlockDialog(const QString help = "", QWidget * parent = 0, Qt::WindowFlags f = 0);
+    PGetNonMusrRunBlockDialog(const QString helpUrl = "");
 
     QString getRunHeaderInfo();
     QString getMap(bool &valid);
@@ -50,7 +50,7 @@ class PGetNonMusrRunBlockDialog : public QDialog, private Ui::PGetNonMusrRunBloc
     void helpContent();
 
   private:
-    QString fHelp;
+    QString fHelpUrl;
 };
 
 #endif // _PGETNONMUSRRUNBLOCKDIALOG_H_

src/musredit/PGetParameterBlockDialog.cpp

@@ -37,13 +37,14 @@
 #include <QPushButton>
 #include <QEvent>
 
+#include "PHelp.h"
 #include "PGetParameterBlockDialog.h"
 
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
  */
-PGetParameterBlockDialog::PGetParameterBlockDialog()
+PGetParameterBlockDialog::PGetParameterBlockDialog(const QString helpUrl) : fHelpUrl(helpUrl)
 {
   setupUi(this);
 
@@ -212,7 +213,12 @@ void PGetParameterBlockDialog::paramAdd()
  */
 void PGetParameterBlockDialog::helpContent()
 {
-  QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  if (fHelpUrl.isEmpty()) {
+    QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  } else {
+    PHelp *help = new PHelp(fHelpUrl);
+    help->show();
+  }
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit/PGetParameterBlockDialog.h

@@ -39,7 +39,7 @@ class PGetParameterBlockDialog : public QDialog, private Ui::PGetParameterBlockD
   Q_OBJECT
 
   public:
-    PGetParameterBlockDialog();
+    PGetParameterBlockDialog(const QString helpUrl);
 
     QString getParams() { return fParam_plainTextEdit->toPlainText(); }
 
@@ -49,6 +49,9 @@ class PGetParameterBlockDialog : public QDialog, private Ui::PGetParameterBlockD
   private slots:
     void paramAdd();
     void helpContent();
+
+  private:
+    QString fHelpUrl;
 };
 
 #endif // _PGETPARAMETERBLOCKDIALOG_H_

src/musredit/PGetPlotBlockDialog.cpp

@@ -36,13 +36,14 @@
 #include <QTextEdit>
 #include <QComboBox>
 
+#include "PHelp.h"
 #include "PGetPlotBlockDialog.h"
 
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
  */
-PGetPlotBlockDialog::PGetPlotBlockDialog()
+PGetPlotBlockDialog::PGetPlotBlockDialog(const QString helpUrl) : fHelpUrl(helpUrl)
 {
   setupUi(this);
 
@@ -155,8 +156,12 @@ void PGetPlotBlockDialog::addPlot()
  */
 void PGetPlotBlockDialog::helpContent()
 {
-  QMessageBox::information(this, "helpContents",
-                           "Will eventually show a help", QMessageBox::Ok);
+  if (fHelpUrl.isEmpty()) {
+    QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  } else {
+    PHelp *help = new PHelp(fHelpUrl);
+    help->show();
+  }
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit/PGetPlotBlockDialog.h

@@ -39,7 +39,7 @@ class PGetPlotBlockDialog : public QDialog, private Ui::PGetPlotBlockDialog
   Q_OBJECT
 
   public:
-    PGetPlotBlockDialog();
+    PGetPlotBlockDialog(const QString helpUrl);
 
     QString getPlotBlock() { return fPlot_plainTextEdit->toPlainText(); }
 
@@ -49,6 +49,9 @@ class PGetPlotBlockDialog : public QDialog, private Ui::PGetPlotBlockDialog
 
   protected:
     bool eventFilter( QObject *obj, QEvent *ev );
+
+  private:
+    QString fHelpUrl;
 };
 
 #endif // _PGETPLOTBLOCKDIALOG_H_

src/musredit/PGetSingleHistoRunBlockDialog.cpp

@@ -35,18 +35,15 @@
 #include <QCheckBox>
 #include <QMessageBox>
 
+#include "PHelp.h"
 #include "PGetSingleHistoRunBlockDialog.h"
 
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
  */
-PGetSingleHistoRunBlockDialog::PGetSingleHistoRunBlockDialog(const QString help,
-                                                             const bool lifetimeCorrection,
-                                                             QWidget * parent,
-                                                             Qt::WindowFlags f) :
-              QDialog(parent, f),
-              fHelp(help)
+PGetSingleHistoRunBlockDialog::PGetSingleHistoRunBlockDialog(const QString helpUrl,
+                                                             const bool lifetimeCorrection) : fHelpUrl(helpUrl)
 {
   setupUi(this);
 
@@ -262,8 +259,12 @@ QString PGetSingleHistoRunBlockDialog::getLifetimeCorrection(bool &present)
  */
 void PGetSingleHistoRunBlockDialog::helpContent()
 {
-  QMessageBox::information(this, "helpContents",
-                            fHelp, QMessageBox::Ok);
+  if (fHelpUrl.isEmpty()) {
+    QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  } else {
+    PHelp *help = new PHelp(fHelpUrl);
+    help->show();
+  }
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit/PGetSingleHistoRunBlockDialog.h

@@ -42,8 +42,7 @@ class PGetSingleHistoRunBlockDialog : public QDialog, private Ui::PGetSingleHist
   Q_OBJECT
 
   public:
-    PGetSingleHistoRunBlockDialog(const QString help = "", const bool lifetimeCorrection = true,
-                                  QWidget * parent = 0, Qt::WindowFlags f = 0);
+    PGetSingleHistoRunBlockDialog(const QString helpUrl = "", const bool lifetimeCorrection = true);
 
     QString getRunHeaderInfo();
     QString getMap(bool &valid);
@@ -61,7 +60,7 @@ class PGetSingleHistoRunBlockDialog : public QDialog, private Ui::PGetSingleHist
     void helpContent();
 
   private:
-    QString fHelp;
+    QString fHelpUrl;
 };
 
 #endif // _PGETSINGLEHISTORUNBLOCKDIALOG_H_

src/musredit/PGetTheoryBlockDialog.cpp

@@ -37,30 +37,32 @@
 
 #include <QtDebug>
 
+#include "PHelp.h"
 #include "PGetTheoryBlockDialog.h"
 
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
  */
-PGetTheoryBlockDialog::PGetTheoryBlockDialog(PAdmin *admin, QWidget * parent, Qt::WindowFlags f) :
-              QDialog(parent, f),
-              fAdmin(admin)
+PGetTheoryBlockDialog::PGetTheoryBlockDialog(PAdmin *admin, const QString helpUrl) :
+              fAdmin(admin),
+              fHelpUrl(helpUrl)
 {
   setupUi(this);
 
   setModal(true);
 
   // feed theory function combo box
+  fTheoryFunction_comboBox->setIconSize(QSize(250, 20));
   PTheory *theoItem;
-  QIcon icon;
+  QIcon *icon;
   QString iconName;
   for (unsigned int i=0; i<fAdmin->getTheoryCounts();  i++) {
     theoItem = fAdmin->getTheoryItem(i);
     if (theoItem->pixmapName.length() > 0) {
-      iconName = QString(":/latex_images/") + theoItem->pixmapName;
-      icon.addPixmap(QPixmap(iconName));
-      fTheoryFunction_comboBox->insertItem(i, icon, theoItem->label);
+      iconName = QString(":/latex_images/") + theoItem->pixmapName;      
+      icon = new QIcon(QPixmap(iconName));
+      fTheoryFunction_comboBox->insertItem(i, *icon, theoItem->label);
     } else {
       fTheoryFunction_comboBox->insertItem(i, theoItem->label);
     }
@@ -120,8 +122,12 @@ void PGetTheoryBlockDialog::addMultiply()
  */
 void PGetTheoryBlockDialog::helpContent()
 {
-  QMessageBox::information(this, "helpContents",
-                           fAdmin->getHelpMain(), QMessageBox::Ok);
+  if (fHelpUrl.isEmpty()) {
+    QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  } else {
+    PHelp *help = new PHelp(fHelpUrl);
+    help->show();
+  }
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit/PGetTheoryBlockDialog.h

@@ -40,7 +40,7 @@ class PGetTheoryBlockDialog : public QDialog, private Ui::PGetTheoryBlockDialog
   Q_OBJECT
 
   public:
-    PGetTheoryBlockDialog(PAdmin *admin = 0, QWidget * parent = 0, Qt::WindowFlags f = 0);
+    PGetTheoryBlockDialog(PAdmin *admin = 0, const QString helpUrl = "");
 
     QString getTheoryBlock() { return fTheoryBlock_plainTextEdit->toPlainText(); }
 
@@ -52,6 +52,7 @@ class PGetTheoryBlockDialog : public QDialog, private Ui::PGetTheoryBlockDialog
 
   private:
     PAdmin *fAdmin;
+    QString fHelpUrl;
 };
 
 #endif // _PGETTHEORYBLOCKDIALOG_H_

src/musredit/PGetTitleBlockDialog.cpp

@@ -31,14 +31,14 @@
 
 #include <QMessageBox>
 
-#include "PGetTitleBlockDialog.h"
 #include "PHelp.h"
+#include "PGetTitleBlockDialog.h"
 
 //---------------------------------------------------------------------------
 /**
  * <p>
  */
-PGetTitleBlockDialog::PGetTitleBlockDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f)
+PGetTitleBlockDialog::PGetTitleBlockDialog(const QString helpUrl) : fHelpUrl(helpUrl)
 {
   setupUi(this);
 
@@ -51,8 +51,12 @@ PGetTitleBlockDialog::PGetTitleBlockDialog(QWidget *parent, Qt::WindowFlags f) :
  */
 void PGetTitleBlockDialog::helpContent()
 {
-  PHelp *help = new PHelp("http://lmu.web.psi.ch/musrfit/title.html");
-  //help->show();
+  if (fHelpUrl.isEmpty()) {
+    QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
+  } else {
+    PHelp *help = new PHelp(fHelpUrl);
+    help->show();
+  }
 }
 
 //---------------------------------------------------------------------------

src/musredit/PGetTitleBlockDialog.h

@@ -40,7 +40,7 @@ class PGetTitleBlockDialog : public QDialog, private Ui::PGetTitleBlockDialog
   Q_OBJECT
 
   public:
-    PGetTitleBlockDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
+    PGetTitleBlockDialog(const QString helpUrl);
     virtual ~PGetTitleBlockDialog() {}
 
     QString getTitle() { return fTitle_lineEdit->text(); }
@@ -48,6 +48,8 @@ class PGetTitleBlockDialog : public QDialog, private Ui::PGetTitleBlockDialog
   private slots:
     void helpContent();
 
+  private:
+    QString fHelpUrl;
 };
 
 #endif // _PGETTITLEBLOCKDIALOG_H_

src/musredit/PHelp.cpp

@@ -29,7 +29,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QMessageBox>
+#include <QtGui>
+#include <QtWebKit>
 
 #include "PHelp.h"
 
@@ -39,8 +40,33 @@
  */
 PHelp::PHelp(const QString &url)
 {
-  QString str = "Will eventually show the url:\n" + url;
-  QMessageBox::information(this, "**HELP**", str);
+  fProgress = 0;
+
+  QNetworkProxyFactory::setUseSystemConfiguration(true);
+
+  fView = new QWebView(this);
+  fView->load(QUrl(url));
+  connect(fView, SIGNAL(loadFinished(bool)), SLOT(adjustLocation()));
+  connect(fView, SIGNAL(titleChanged(QString)), SLOT(adjustTitle()));
+  connect(fView, SIGNAL(loadProgress(int)), SLOT(setProgress(int)));
+  connect(fView, SIGNAL(loadFinished(bool)), SLOT(finishLoading(bool)));
+
+  fLocationEdit = new QLineEdit(this);
+  fLocationEdit->setSizePolicy(QSizePolicy::Expanding, fLocationEdit->sizePolicy().verticalPolicy());
+  connect(fLocationEdit, SIGNAL(returnPressed()), SLOT(changeLocation()));
+
+  QToolBar *toolBar = addToolBar(tr("Navigation"));
+  toolBar->addAction(fView->pageAction(QWebPage::Back));
+  toolBar->addAction(fView->pageAction(QWebPage::Forward));
+  toolBar->addAction(fView->pageAction(QWebPage::Reload));
+  toolBar->addAction(fView->pageAction(QWebPage::Stop));
+  toolBar->addWidget(fLocationEdit);
+
+  QMenu *exitMenu = menuBar()->addMenu(tr("&File"));
+  exitMenu->addAction("&Exit", this, SLOT(done()), QKeySequence(tr("Ctrl+Q")));
+
+  setCentralWidget(fView);
+  setUnifiedTitleAndToolBarOnMac(true);
 }
 
 //---------------------------------------------------------------------------
@@ -49,6 +75,76 @@ PHelp::PHelp(const QString &url)
  */
 PHelp::~PHelp()
 {
+  if (fView) {
+    delete fView;
+    fView = 0;
+  }
+
+  if (fLocationEdit) {
+    delete fLocationEdit;
+    fLocationEdit = 0;
+  }
+}
+
+//---------------------------------------------------------------------------
+/**
+ * <p>
+ */
+void PHelp::done()
+{
+  close();
+}
+
+//---------------------------------------------------------------------------
+/**
+ * <p>
+ */
+void PHelp::adjustLocation()
+{
+  fLocationEdit->setText(fView->url().toString());
+}
+
+//---------------------------------------------------------------------------
+/**
+ * <p>
+ */
+void PHelp::changeLocation()
+{
+  QUrl url = QUrl(fLocationEdit->text());
+  fView->load(url);
+  fView->setFocus();
+}
+
+//---------------------------------------------------------------------------
+/**
+ * <p>
+ */
+void PHelp::adjustTitle()
+{
+  if (fProgress <= 0 || fProgress >= 100)
+    setWindowTitle(fView->title());
+  else
+    setWindowTitle(QString("%1 (%2%)").arg(fView->title()).arg(fProgress));
+}
+
+//---------------------------------------------------------------------------
+/**
+ * <p>
+ */
+void PHelp::setProgress(int p)
+{
+  fProgress = p;
+  adjustTitle();
+}
+
+//---------------------------------------------------------------------------
+/**
+ * <p>
+ */
+void PHelp::finishLoading(bool)
+{
+  fProgress = 100;
+  adjustTitle();
 }
 
 //---------------------------------------------------------------------------

src/musredit/PHelp.h

@@ -32,16 +32,33 @@
 #ifndef _PHELP_H_
 #define _PHELP_H_
 
-#include <QDialog>
-#include <QString>
+#include <QtGui>
 
-class PHelp : public QDialog
+class QWebView;
+QT_BEGIN_NAMESPACE
+class QLineEdit;
+QT_END_NAMESPACE
+
+class PHelp : public QMainWindow
 {
   Q_OBJECT
 
   public:
     PHelp(const QString &url);
     virtual ~PHelp();
+
+  protected slots:
+    void done();
+    void adjustLocation();
+    void changeLocation();
+    void adjustTitle();
+    void setProgress(int p);
+    void finishLoading(bool);
+
+  private:
+    QWebView *fView;
+    QLineEdit *fLocationEdit;
+    int fProgress;
 };
 
 #endif // _PHELP_H_

src/musredit/PSubTextEdit.cpp

@@ -150,7 +150,8 @@ QMenu* PSubTextEdit::createPopupMenu(const QPoint &pos)
  */
 void PSubTextEdit::insertTitle()
 {
-  PGetTitleBlockDialog *dlg = new PGetTitleBlockDialog();
+  // for the time being the url's are hard coded but should be transfered to the XML startup
+  PGetTitleBlockDialog *dlg = new PGetTitleBlockDialog("https://wiki.intranet.psi.ch/MUSR/MusrFit#4_1_The_Title");
 
   if (dlg == 0)
     return;
@@ -169,7 +170,8 @@ void PSubTextEdit::insertTitle()
  */
 void PSubTextEdit::insertParameterBlock()
 {
-  PGetParameterBlockDialog *dlg = new PGetParameterBlockDialog();
+  // for the time being the url's are hard coded but should be transfered to the XML startup
+  PGetParameterBlockDialog *dlg = new PGetParameterBlockDialog("https://wiki.intranet.psi.ch/MUSR/MusrFit#4_2_The_FITPARAMETER_Block");
 
   if (dlg == 0)
     return;
@@ -226,7 +228,8 @@ void PSubTextEdit::insertTheoryFunction(int idx)
  */
 void PSubTextEdit::insertTheoryBlock()
 {
-  PGetTheoryBlockDialog *dlg = new PGetTheoryBlockDialog(fAdmin);
+  // for the time being the url's are hard coded but should be transfered to the XML startup
+  PGetTheoryBlockDialog *dlg = new PGetTheoryBlockDialog(fAdmin, "https://wiki.intranet.psi.ch/MUSR/MusrFit#4_3_The_THEORY_Block");
 
   if (dlg == 0)
     return;
@@ -245,7 +248,8 @@ void PSubTextEdit::insertTheoryBlock()
  */
 void PSubTextEdit::insertFunctionBlock()
 {
-  PGetFunctionsBlockDialog *dlg = new PGetFunctionsBlockDialog(fAdmin->getHelpMain());
+  // for the time being the url's are hard coded but should be transfered to the XML startup
+  PGetFunctionsBlockDialog *dlg = new PGetFunctionsBlockDialog("https://wiki.intranet.psi.ch/MUSR/MusrFit#4_4_The_FUNCTIONS_Block");
 
   if (dlg == 0)
     return;
@@ -264,7 +268,8 @@ void PSubTextEdit::insertFunctionBlock()
  */
 void PSubTextEdit::insertAsymRunBlock()
 {
-  PGetAsymmetryRunBlockDialog *dlg = new PGetAsymmetryRunBlockDialog(fAdmin->getHelpMain());
+  // for the time being the url's are hard coded but should be transfered to the XML startup
+  PGetAsymmetryRunBlockDialog *dlg = new PGetAsymmetryRunBlockDialog("https://wiki.intranet.psi.ch/MUSR/MusrFit#4_5_The_RUN_Block");
 
   if (dlg == 0)
     return;
@@ -370,7 +375,8 @@ void PSubTextEdit::insertAsymRunBlock()
  */
 void PSubTextEdit::insertSingleHistRunBlock()
 {
-  PGetSingleHistoRunBlockDialog *dlg = new PGetSingleHistoRunBlockDialog(fAdmin->getHelpMain());
+  // for the time being the url's are hard coded but should be transfered to the XML startup
+  PGetSingleHistoRunBlockDialog *dlg = new PGetSingleHistoRunBlockDialog("https://wiki.intranet.psi.ch/MUSR/MusrFit#4_5_The_RUN_Block");
 
   if (dlg == 0)
     return;
@@ -476,7 +482,7 @@ void PSubTextEdit::insertSingleHistRunBlock()
  */
 void PSubTextEdit::insertNonMusrRunBlock()
 {
-  PGetNonMusrRunBlockDialog *dlg = new PGetNonMusrRunBlockDialog(fAdmin->getHelpMain());
+  PGetNonMusrRunBlockDialog *dlg = new PGetNonMusrRunBlockDialog("https://wiki.intranet.psi.ch/MUSR/MusrFit#4_5_The_RUN_Block");
 
   if (dlg == 0)
     return;
@@ -555,7 +561,8 @@ void PSubTextEdit::insertCommandBlock()
  */
 void PSubTextEdit::insertFourierBlock()
 {
-  PGetFourierBlockDialog *dlg = new PGetFourierBlockDialog();
+  // for the time being the url's are hard coded but should be transfered to the XML startup
+  PGetFourierBlockDialog *dlg = new PGetFourierBlockDialog("https://wiki.intranet.psi.ch/MUSR/MusrFit#4_7_The_FOURIER_Block");
 
   if (dlg == 0)
     return;
@@ -573,7 +580,8 @@ void PSubTextEdit::insertFourierBlock()
  */
 void PSubTextEdit::insertPlotBlock()
 {
-  PGetPlotBlockDialog *dlg = new PGetPlotBlockDialog();
+  // for the time being the url's are hard coded but should be transfered to the XML startup
+  PGetPlotBlockDialog *dlg = new PGetPlotBlockDialog("https://wiki.intranet.psi.ch/MUSR/MusrFit#4_8_The_PLOT_Block");
 
   if (dlg == 0)
     return;

src/musredit/PTextEdit.cpp

@@ -61,6 +61,7 @@ using namespace std;
 #include <QtDebug>
 
 #include "PTextEdit.h"
+#include "PHelp.h"
 #include "PSubTextEdit.h"
 #include "PAdmin.h"
 #include "PFindDialog.h"
@@ -2097,9 +2098,9 @@ void PTextEdit::musrSwapMsrMlog()
  */
 void PTextEdit::helpContents()
 {
-  QMessageBox::information( this, "helpContents",
-                            fAdmin->getHelpMain(),
-                            QMessageBox::Ok );
+  PHelp *help = new PHelp("https://wiki.intranet.psi.ch/MUSR/WebHome");
+
+  help->show();
 }
 
 //----------------------------------------------------------------------------------------------------

src/musredit/forms/PGetAsymmetryRunBlockDialog.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>446</width>
-    <height>503</height>
+    <width>462</width>
+    <height>506</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,7 +23,7 @@
   <widget class="QGroupBox" name="fRunHeaderInfo_groupBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>0</y>
      <width>441</width>
      <height>121</height>
@@ -193,7 +193,7 @@
   <widget class="QGroupBox" name="fRequiredEntries_groupBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>120</y>
      <width>441</width>
      <height>241</height>
@@ -495,7 +495,7 @@
   <widget class="QGroupBox" name="fOptionalEntries_groupBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>360</y>
      <width>441</width>
      <height>91</height>
@@ -593,10 +593,10 @@
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>460</y>
      <width>441</width>
-     <height>36</height>
+     <height>39</height>
     </rect>
    </property>
    <layout class="QVBoxLayout" name="verticalLayout">

src/musredit/forms/PGetDefaultDialog.ui

@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>PGetDefaultDialog</class>
  <widget class="QDialog" name="PGetDefaultDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -23,7 +26,7 @@
      <x>10</x>
      <y>130</y>
      <width>381</width>
-     <height>25</height>
+     <height>27</height>
     </rect>
    </property>
    <layout class="QHBoxLayout" name="horizontalLayout">
@@ -66,13 +69,13 @@
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>381</width>
-     <height>22</height>
+     <x>12</x>
+     <y>12</y>
+     <width>84</width>
+     <height>111</height>
     </rect>
    </property>
-   <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <widget class="QLabel" name="fRunFileName_label">
       <property name="text">
@@ -80,21 +83,6 @@
       </property>
      </widget>
     </item>
-    <item>
-     <widget class="QLineEdit" name="fRunFileName_lineEdit"/>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>40</y>
-     <width>381</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout_3">
     <item>
      <widget class="QLabel" name="fBeamline_label">
       <property name="minimumSize">
@@ -108,21 +96,6 @@
       </property>
      </widget>
     </item>
-    <item>
-     <widget class="QLineEdit" name="fBeamline_lineEdit"/>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>70</y>
-     <width>156</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout_4">
     <item>
      <widget class="QLabel" name="fInstitute_label">
       <property name="minimumSize">
@@ -136,6 +109,37 @@
       </property>
      </widget>
     </item>
+    <item>
+     <widget class="QLabel" name="fFileFormat_label">
+      <property name="minimumSize">
+       <size>
+        <width>68</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>File Format</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="layoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>99</x>
+     <y>12</y>
+     <width>291</width>
+     <height>111</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_2">
+    <item>
+     <widget class="QLineEdit" name="fRunFileName_lineEdit"/>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="fBeamline_lineEdit"/>
+    </item>
     <item>
      <widget class="QComboBox" name="fInstitute_comboBox">
       <property name="minimumSize">
@@ -166,31 +170,6 @@
       </item>
      </widget>
     </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>100</y>
-     <width>156</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout_5">
-    <item>
-     <widget class="QLabel" name="fFileFormat_label">
-      <property name="minimumSize">
-       <size>
-        <width>68</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>File Format</string>
-      </property>
-     </widget>
-    </item>
     <item>
      <widget class="QComboBox" name="fFileFormat_comboBox">
       <item>

src/musredit/forms/PGetFourierBlockDialog.ui

@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>PGetFourierBlockDialog</class>
  <widget class="QDialog" name="PGetFourierBlockDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>

src/musredit/forms/PGetFunctionsBlockDialog.ui

@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>PGetFunctionsBlockDialog</class>
  <widget class="QDialog" name="PGetFunctionsBlockDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -79,17 +82,20 @@
     <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande';&quot;&gt;Supported basic arithmetics: &lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;+, -, *, /, ()&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande';&quot;&gt;Supported built-in functions; &lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;cos(), sin(), tan(), acos(), asin(), atan(), cosh(), sinh(), tanh(), acosh(), asinh(), atanh(), exp(), log(), ln()&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande';&quot;&gt;Supported pre-defined constants&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;gamma_mu = 0.0135538817 (MHz/G)&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;pi = 3.1415926535897932846&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande';&quot;&gt;Parameters and Maps are reached via parX, mapY, where X, Y are numbers, e.g. par1, map3&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande';&quot;&gt;Examples:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;fun1 = gamma_mu * par3&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande';&quot;&gt; valid&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;fun2 = par2/map4 * sin(par3*par5)&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande';&quot;&gt; valid&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier';&quot;&gt;fun3 = fun1 + par6&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande';&quot;&gt; invalid, since functions cannot be used with the functions definition&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
+&lt;tr&gt;
+&lt;td style=&quot;border: none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:10pt;&quot;&gt;Supported basic arithmetics: &lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-size:10pt;&quot;&gt;+, -, *, /, ()&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:10pt;&quot;&gt;Supported built-in functions; &lt;/span&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-size:10pt;&quot;&gt;cos(), sin(), tan(), acos(), asin(), atan(), cosh(), sinh(), tanh(), acosh(), asinh(), atanh(), exp(), log(), ln()&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:10pt;&quot;&gt;Supported pre-defined constants&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-size:10pt;&quot;&gt;gamma_mu = 0.0135538817 (MHz/G)&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-size:10pt;&quot;&gt;pi = 3.1415926535897932846&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:10pt;&quot;&gt;Parameters and Maps are reached via parX, mapY, where X, Y are numbers, e.g. par1, map3&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:10pt;&quot;&gt;Examples:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-size:10pt;&quot;&gt;fun1 = gamma_mu * par3&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:10pt;&quot;&gt; valid&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-size:10pt;&quot;&gt;fun2 = par2/map4 * sin(par3*par5)&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:10pt;&quot;&gt; valid&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Courier New,courier'; font-size:10pt;&quot;&gt;fun3 = fun1 + par6&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:10pt;&quot;&gt; invalid, since functions cannot be used with the functions definition&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </widget>
   <widget class="QGroupBox" name="fInput_groupBox">

src/musredit/forms/PGetNonMusrRunBlockDialog.ui

@@ -2,12 +2,15 @@
 <ui version="4.0">
  <class>PGetNonMusrRunBlockDialog</class>
  <widget class="QDialog" name="PGetNonMusrRunBlockDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>402</width>
-    <height>300</height>
+    <width>419</width>
+    <height>307</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +23,7 @@
   <widget class="QGroupBox" name="fRunHeaderInfo_groupBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>0</y>
      <width>401</width>
      <height>131</height>
@@ -199,7 +202,7 @@
   <widget class="QGroupBox" name="fReqiredEntries_groupBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>130</y>
      <width>401</width>
      <height>131</height>
@@ -347,7 +350,7 @@
     <rect>
      <x>10</x>
      <y>270</y>
-     <width>381</width>
+     <width>401</width>
      <height>27</height>
     </rect>
    </property>

src/musredit/forms/PGetParameterBlockDialog.ui

@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>PGetParameterBlockDialog</class>
  <widget class="QDialog" name="PGetParameterBlockDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>

src/musredit/forms/PGetPlotBlockDialog.ui

@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>PGetPlotBlockDialog</class>
  <widget class="QDialog" name="PGetPlotBlockDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>

src/musredit/forms/PGetSingleHistoRunBlockDialog.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>424</width>
-    <height>586</height>
+    <width>440</width>
+    <height>592</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,7 +23,7 @@
   <widget class="QGroupBox" name="fRunHeaderInfo_groupBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>0</y>
      <width>421</width>
      <height>121</height>
@@ -193,7 +193,7 @@
   <widget class="QGroupBox" name="fRequiredEntries_groupBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>120</y>
      <width>421</width>
      <height>301</height>
@@ -468,7 +468,7 @@
   <widget class="QGroupBox" name="fOptionalEntries_groupBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>420</y>
      <width>421</width>
      <height>121</height>
@@ -540,7 +540,7 @@
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>545</y>
      <width>421</width>
      <height>39</height>

src/musredit/forms/PGetTheoryBlockDialog.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>550</width>
-    <height>529</height>
+    <width>698</width>
+    <height>546</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,9 +23,9 @@
   <widget class="QTextEdit" name="fDescription_textEdit">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>10</y>
-     <width>541</width>
+     <width>681</width>
      <height>211</height>
     </rect>
    </property>
@@ -36,24 +36,27 @@
     <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;Every theory function has to be written on a single line. It starts with the theory function name or its abbreviation followed by the parameters. Consecutive lines of theory functions will be multiplied. If theory functions need to be added, a line with a '+' has to separate them. The parameters are given as the numbers assigned to them in the FITPARAMETER-block.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;Example:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;asymmetry 2&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;simplExpo 3&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;TFieldCos map1 fun2&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;+&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;asymmetry 6&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;simplExpo 7&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
+&lt;tr&gt;
+&lt;td style=&quot;border: none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Every theory function has to be written on a single line. It starts with the theory function name or its abbreviation followed by the parameters. Consecutive lines of theory functions will be multiplied. If theory functions need to be added, a line with a '+' has to separate them. The parameters are given as the numbers assigned to them in the FITPARAMETER-block.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Example:&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;asymmetry 2&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;simplExpo 3&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TFieldCos map1 fun2&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;+&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;asymmetry 6&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;simplExpo 7&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </widget>
   <widget class="QGroupBox" name="fTheoryInput_groupBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>220</y>
-     <width>541</width>
+     <width>681</width>
      <height>71</height>
     </rect>
    </property>
@@ -64,16 +67,16 @@ p, li { white-space: pre-wrap; }
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>30</y>
-      <width>381</width>
-      <height>25</height>
+      <y>20</y>
+      <width>541</width>
+      <height>41</height>
      </rect>
     </property>
    </widget>
    <widget class="QPushButton" name="fPlus_pushButton">
     <property name="geometry">
      <rect>
-      <x>420</x>
+      <x>560</x>
       <y>30</y>
       <width>51</width>
       <height>25</height>
@@ -86,7 +89,7 @@ p, li { white-space: pre-wrap; }
    <widget class="QPushButton" name="fMultiply_pushButton">
     <property name="geometry">
      <rect>
-      <x>480</x>
+      <x>620</x>
       <y>30</y>
       <width>51</width>
       <height>25</height>
@@ -100,9 +103,9 @@ p, li { white-space: pre-wrap; }
   <widget class="QPlainTextEdit" name="fTheoryBlock_plainTextEdit">
    <property name="geometry">
     <rect>
-     <x>0</x>
-     <y>290</y>
-     <width>541</width>
+     <x>10</x>
+     <y>300</y>
+     <width>681</width>
      <height>201</height>
     </rect>
    </property>
@@ -114,9 +117,9 @@ THEORY</string>
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
-     <x>0</x>
-     <y>500</y>
-     <width>541</width>
+     <x>10</x>
+     <y>510</y>
+     <width>681</width>
      <height>29</height>
     </rect>
    </property>

src/musredit/forms/PGetTitleBlockDialog.ui

@@ -2,12 +2,15 @@
 <ui version="4.0">
  <class>PGetTitleBlockDialog</class>
  <widget class="QDialog" name="PGetTitleBlockDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>555</width>
-    <height>84</height>
+    <width>556</width>
+    <height>90</height>
    </rect>
   </property>
   <property name="windowTitle">

src/musredit/musredit.pro

@@ -31,6 +31,8 @@ CONFIG += qt \
     debug
 
 QT += xml
+QT += webkit 
+QT += network
 
 HEADERS = musredit.h \
     PHelp.h \

src/musredit/musredit.qrc

@@ -1,4 +1,4 @@
-<!DOCTYPE RCC><RCC version="1.0">
+<RCC>
   <qresource>
     <file>images/editcopy.xpm</file>
     <file>images/editcut.xpm</file>
@@ -23,6 +23,7 @@
     <file>images/musrt0.xpm</file>
     <file>images/musrview.xpm</file>
     <file>latex_images/abragam.png</file>
+    <file>latex_images/abragam.gif</file>
     <file>latex_images/asymmetry.png</file>
     <file>latex_images/bessel.png</file>
     <file>latex_images/combiLGKT.png</file>