diff --git a/src/musredit/PGetAsymmetryRunBlockDialog.cpp b/src/musredit/PGetAsymmetryRunBlockDialog.cpp index cd26eab0..761f3976 100644 --- a/src/musredit/PGetAsymmetryRunBlockDialog.cpp +++ b/src/musredit/PGetAsymmetryRunBlockDialog.cpp @@ -34,15 +34,16 @@ #include #include +#include "PHelp.h" + #include "PGetAsymmetryRunBlockDialog.h" + //---------------------------------------------------------------------------------------------------- /** *

*/ -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(); + } } //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/PGetAsymmetryRunBlockDialog.h b/src/musredit/PGetAsymmetryRunBlockDialog.h index 14a3197b..1a98a9f5 100644 --- a/src/musredit/PGetAsymmetryRunBlockDialog.h +++ b/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_ diff --git a/src/musredit/PGetDefaultDialog.cpp b/src/musredit/PGetDefaultDialog.cpp index 1c4e37de..4da6b5c9 100644 --- a/src/musredit/PGetDefaultDialog.cpp +++ b/src/musredit/PGetDefaultDialog.cpp @@ -33,6 +33,8 @@ #include #include +#include "PHelp.h" + #include "PGetDefaultDialog.h" #define INSTITUTE_PSI 0 @@ -54,8 +56,7 @@ /** *

*/ -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(); } //--------------------------------------------------------------------------- diff --git a/src/musredit/PGetDefaultDialog.h b/src/musredit/PGetDefaultDialog.h index d19ad0a2..cfafa827 100644 --- a/src/musredit/PGetDefaultDialog.h +++ b/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(); } diff --git a/src/musredit/PGetFourierBlockDialog.cpp b/src/musredit/PGetFourierBlockDialog.cpp index 59b1c8b7..31c630b6 100644 --- a/src/musredit/PGetFourierBlockDialog.cpp +++ b/src/musredit/PGetFourierBlockDialog.cpp @@ -36,13 +36,15 @@ #include #include +#include "PHelp.h" + #include "PGetFourierBlockDialog.h" //---------------------------------------------------------------------------------------------------- /** *

*/ -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(); + } } //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/PGetFourierBlockDialog.h b/src/musredit/PGetFourierBlockDialog.h index eed5e505..d2e82eb9 100644 --- a/src/musredit/PGetFourierBlockDialog.h +++ b/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_ diff --git a/src/musredit/PGetFunctionsBlockDialog.cpp b/src/musredit/PGetFunctionsBlockDialog.cpp index c9068b14..b660ed61 100644 --- a/src/musredit/PGetFunctionsBlockDialog.cpp +++ b/src/musredit/PGetFunctionsBlockDialog.cpp @@ -37,14 +37,15 @@ #include +#include "PHelp.h" + #include "PGetFunctionsBlockDialog.h" //---------------------------------------------------------------------------------------------------- /** *

*/ -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(); + } } //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/PGetFunctionsBlockDialog.h b/src/musredit/PGetFunctionsBlockDialog.h index a1c1ee1c..e119b155 100644 --- a/src/musredit/PGetFunctionsBlockDialog.h +++ b/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_ diff --git a/src/musredit/PGetNonMusrRunBlockDialog.cpp b/src/musredit/PGetNonMusrRunBlockDialog.cpp index ba7bae59..1649cff0 100644 --- a/src/musredit/PGetNonMusrRunBlockDialog.cpp +++ b/src/musredit/PGetNonMusrRunBlockDialog.cpp @@ -34,15 +34,14 @@ #include #include +#include "PHelp.h" #include "PGetNonMusrRunBlockDialog.h" //---------------------------------------------------------------------------------------------------- /** *

*/ -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(); + } } //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/PGetNonMusrRunBlockDialog.h b/src/musredit/PGetNonMusrRunBlockDialog.h index e2c6dfed..2187b3dd 100644 --- a/src/musredit/PGetNonMusrRunBlockDialog.h +++ b/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_ diff --git a/src/musredit/PGetParameterBlockDialog.cpp b/src/musredit/PGetParameterBlockDialog.cpp index 9d10401a..c45abeb3 100644 --- a/src/musredit/PGetParameterBlockDialog.cpp +++ b/src/musredit/PGetParameterBlockDialog.cpp @@ -37,13 +37,14 @@ #include #include +#include "PHelp.h" #include "PGetParameterBlockDialog.h" //---------------------------------------------------------------------------------------------------- /** *

*/ -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(); + } } //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/PGetParameterBlockDialog.h b/src/musredit/PGetParameterBlockDialog.h index e4bbb55c..b58d0f22 100644 --- a/src/musredit/PGetParameterBlockDialog.h +++ b/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_ diff --git a/src/musredit/PGetPlotBlockDialog.cpp b/src/musredit/PGetPlotBlockDialog.cpp index 17f014d8..81023061 100644 --- a/src/musredit/PGetPlotBlockDialog.cpp +++ b/src/musredit/PGetPlotBlockDialog.cpp @@ -36,13 +36,14 @@ #include #include +#include "PHelp.h" #include "PGetPlotBlockDialog.h" //---------------------------------------------------------------------------------------------------- /** *

*/ -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(); + } } //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/PGetPlotBlockDialog.h b/src/musredit/PGetPlotBlockDialog.h index c773a6db..f4e06dc4 100644 --- a/src/musredit/PGetPlotBlockDialog.h +++ b/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_ diff --git a/src/musredit/PGetSingleHistoRunBlockDialog.cpp b/src/musredit/PGetSingleHistoRunBlockDialog.cpp index 1494c49b..0be381aa 100644 --- a/src/musredit/PGetSingleHistoRunBlockDialog.cpp +++ b/src/musredit/PGetSingleHistoRunBlockDialog.cpp @@ -35,18 +35,15 @@ #include #include +#include "PHelp.h" #include "PGetSingleHistoRunBlockDialog.h" //---------------------------------------------------------------------------------------------------- /** *

*/ -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(); + } } //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/PGetSingleHistoRunBlockDialog.h b/src/musredit/PGetSingleHistoRunBlockDialog.h index 7a92f739..94fb5303 100644 --- a/src/musredit/PGetSingleHistoRunBlockDialog.h +++ b/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_ diff --git a/src/musredit/PGetTheoryBlockDialog.cpp b/src/musredit/PGetTheoryBlockDialog.cpp index 037c2b56..4f08b960 100644 --- a/src/musredit/PGetTheoryBlockDialog.cpp +++ b/src/musredit/PGetTheoryBlockDialog.cpp @@ -37,30 +37,32 @@ #include +#include "PHelp.h" #include "PGetTheoryBlockDialog.h" //---------------------------------------------------------------------------------------------------- /** *

*/ -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; igetTheoryCounts(); 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(); + } } //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/PGetTheoryBlockDialog.h b/src/musredit/PGetTheoryBlockDialog.h index 4e3ddc1b..c228168c 100644 --- a/src/musredit/PGetTheoryBlockDialog.h +++ b/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_ diff --git a/src/musredit/PGetTitleBlockDialog.cpp b/src/musredit/PGetTitleBlockDialog.cpp index d8ccc9d0..07e28057 100644 --- a/src/musredit/PGetTitleBlockDialog.cpp +++ b/src/musredit/PGetTitleBlockDialog.cpp @@ -31,14 +31,14 @@ #include -#include "PGetTitleBlockDialog.h" #include "PHelp.h" +#include "PGetTitleBlockDialog.h" //--------------------------------------------------------------------------- /** *

*/ -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(); + } } //--------------------------------------------------------------------------- diff --git a/src/musredit/PGetTitleBlockDialog.h b/src/musredit/PGetTitleBlockDialog.h index f3f6c199..93dfc805 100644 --- a/src/musredit/PGetTitleBlockDialog.h +++ b/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_ diff --git a/src/musredit/PHelp.cpp b/src/musredit/PHelp.cpp index 65a4e499..93ac3214 100644 --- a/src/musredit/PHelp.cpp +++ b/src/musredit/PHelp.cpp @@ -29,7 +29,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include +#include +#include #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; + } +} + +//--------------------------------------------------------------------------- +/** + *

+ */ +void PHelp::done() +{ + close(); +} + +//--------------------------------------------------------------------------- +/** + *

+ */ +void PHelp::adjustLocation() +{ + fLocationEdit->setText(fView->url().toString()); +} + +//--------------------------------------------------------------------------- +/** + *

+ */ +void PHelp::changeLocation() +{ + QUrl url = QUrl(fLocationEdit->text()); + fView->load(url); + fView->setFocus(); +} + +//--------------------------------------------------------------------------- +/** + *

+ */ +void PHelp::adjustTitle() +{ + if (fProgress <= 0 || fProgress >= 100) + setWindowTitle(fView->title()); + else + setWindowTitle(QString("%1 (%2%)").arg(fView->title()).arg(fProgress)); +} + +//--------------------------------------------------------------------------- +/** + *

+ */ +void PHelp::setProgress(int p) +{ + fProgress = p; + adjustTitle(); +} + +//--------------------------------------------------------------------------- +/** + *

+ */ +void PHelp::finishLoading(bool) +{ + fProgress = 100; + adjustTitle(); } //--------------------------------------------------------------------------- diff --git a/src/musredit/PHelp.h b/src/musredit/PHelp.h index d1e0fe38..ab409cdc 100644 --- a/src/musredit/PHelp.h +++ b/src/musredit/PHelp.h @@ -32,16 +32,33 @@ #ifndef _PHELP_H_ #define _PHELP_H_ -#include -#include +#include -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_ diff --git a/src/musredit/PSubTextEdit.cpp b/src/musredit/PSubTextEdit.cpp index 23a5dfda..ef6c5c89 100644 --- a/src/musredit/PSubTextEdit.cpp +++ b/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; diff --git a/src/musredit/PTextEdit.cpp b/src/musredit/PTextEdit.cpp index a55eaf57..e09d7c50 100644 --- a/src/musredit/PTextEdit.cpp +++ b/src/musredit/PTextEdit.cpp @@ -61,6 +61,7 @@ using namespace std; #include #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(); } //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit/forms/PGetAsymmetryRunBlockDialog.ui b/src/musredit/forms/PGetAsymmetryRunBlockDialog.ui index 87430f83..8a7053cf 100644 --- a/src/musredit/forms/PGetAsymmetryRunBlockDialog.ui +++ b/src/musredit/forms/PGetAsymmetryRunBlockDialog.ui @@ -9,8 +9,8 @@ 0 0 - 446 - 503 + 462 + 506 @@ -23,7 +23,7 @@ - 0 + 10 0 441 121 @@ -193,7 +193,7 @@ - 0 + 10 120 441 241 @@ -495,7 +495,7 @@ - 0 + 10 360 441 91 @@ -593,10 +593,10 @@ - 0 + 10 460 441 - 36 + 39 diff --git a/src/musredit/forms/PGetDefaultDialog.ui b/src/musredit/forms/PGetDefaultDialog.ui index a635a699..899ddd5e 100644 --- a/src/musredit/forms/PGetDefaultDialog.ui +++ b/src/musredit/forms/PGetDefaultDialog.ui @@ -2,6 +2,9 @@ PGetDefaultDialog + + Qt::WindowModal + 0 @@ -23,7 +26,7 @@ 10 130 381 - 25 + 27 @@ -66,13 +69,13 @@ - 10 - 10 - 381 - 22 + 12 + 12 + 84 + 111 - + @@ -80,21 +83,6 @@ - - - - - - - - - 10 - 40 - 381 - 22 - - - @@ -108,21 +96,6 @@ - - - - - - - - - 10 - 70 - 156 - 22 - - - @@ -136,6 +109,37 @@ + + + + + 68 + 0 + + + + File Format + + + + + + + + + 99 + 12 + 291 + 111 + + + + + + + + + @@ -166,31 +170,6 @@ - - - - - - 10 - 100 - 156 - 22 - - - - - - - - 68 - 0 - - - - File Format - - - diff --git a/src/musredit/forms/PGetFourierBlockDialog.ui b/src/musredit/forms/PGetFourierBlockDialog.ui index dfc879ec..447bf439 100644 --- a/src/musredit/forms/PGetFourierBlockDialog.ui +++ b/src/musredit/forms/PGetFourierBlockDialog.ui @@ -2,6 +2,9 @@ PGetFourierBlockDialog + + Qt::WindowModal + 0 diff --git a/src/musredit/forms/PGetFunctionsBlockDialog.ui b/src/musredit/forms/PGetFunctionsBlockDialog.ui index dc8efe8a..2b0913a6 100644 --- a/src/musredit/forms/PGetFunctionsBlockDialog.ui +++ b/src/musredit/forms/PGetFunctionsBlockDialog.ui @@ -2,6 +2,9 @@ PGetFunctionsBlockDialog + + Qt::WindowModal + 0 @@ -79,17 +82,20 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande';">Supported basic arithmetics: </span><span style=" font-family:'Courier New,courier';">+, -, *, /, ()</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande';">Supported built-in functions; </span><span style=" font-family:'Courier New,courier';">cos(), sin(), tan(), acos(), asin(), atan(), cosh(), sinh(), tanh(), acosh(), asinh(), atanh(), exp(), log(), ln()</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande';">Supported pre-defined constants</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">gamma_mu = 0.0135538817 (MHz/G)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">pi = 3.1415926535897932846</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande';">Parameters and Maps are reached via parX, mapY, where X, Y are numbers, e.g. par1, map3</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande';">Examples:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">fun1 = gamma_mu * par3</span><span style=" font-family:'Lucida Grande';"> valid</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">fun2 = par2/map4 * sin(par3*par5)</span><span style=" font-family:'Lucida Grande';"> valid</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">fun3 = fun1 + par6</span><span style=" font-family:'Lucida Grande';"> invalid, since functions cannot be used with the functions definition</span></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">Supported basic arithmetics: </span><span style=" font-family:'Courier New,courier'; font-size:10pt;">+, -, *, /, ()</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">Supported built-in functions; </span><span style=" font-family:'Courier New,courier'; font-size:10pt;">cos(), sin(), tan(), acos(), asin(), atan(), cosh(), sinh(), tanh(), acosh(), asinh(), atanh(), exp(), log(), ln()</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">Supported pre-defined constants</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:10pt;">gamma_mu = 0.0135538817 (MHz/G)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:10pt;">pi = 3.1415926535897932846</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">Parameters and Maps are reached via parX, mapY, where X, Y are numbers, e.g. par1, map3</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">Examples:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:10pt;">fun1 = gamma_mu * par3</span><span style=" font-family:'Lucida Grande'; font-size:10pt;"> valid</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:10pt;">fun2 = par2/map4 * sin(par3*par5)</span><span style=" font-family:'Lucida Grande'; font-size:10pt;"> valid</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:10pt;">fun3 = fun1 + par6</span><span style=" font-family:'Lucida Grande'; font-size:10pt;"> invalid, since functions cannot be used with the functions definition</span></p></td></tr></table></body></html> diff --git a/src/musredit/forms/PGetNonMusrRunBlockDialog.ui b/src/musredit/forms/PGetNonMusrRunBlockDialog.ui index 06cd0514..cc4dd4f7 100644 --- a/src/musredit/forms/PGetNonMusrRunBlockDialog.ui +++ b/src/musredit/forms/PGetNonMusrRunBlockDialog.ui @@ -2,12 +2,15 @@ PGetNonMusrRunBlockDialog + + Qt::WindowModal + 0 0 - 402 - 300 + 419 + 307 @@ -20,7 +23,7 @@ - 0 + 10 0 401 131 @@ -199,7 +202,7 @@ - 0 + 10 130 401 131 @@ -347,7 +350,7 @@ 10 270 - 381 + 401 27 diff --git a/src/musredit/forms/PGetParameterBlockDialog.ui b/src/musredit/forms/PGetParameterBlockDialog.ui index 686a5c62..399a7ff0 100644 --- a/src/musredit/forms/PGetParameterBlockDialog.ui +++ b/src/musredit/forms/PGetParameterBlockDialog.ui @@ -2,6 +2,9 @@ PGetParameterBlockDialog + + Qt::WindowModal + 0 diff --git a/src/musredit/forms/PGetPlotBlockDialog.ui b/src/musredit/forms/PGetPlotBlockDialog.ui index c3f30adf..6da647ec 100644 --- a/src/musredit/forms/PGetPlotBlockDialog.ui +++ b/src/musredit/forms/PGetPlotBlockDialog.ui @@ -2,6 +2,9 @@ PGetPlotBlockDialog + + Qt::WindowModal + 0 diff --git a/src/musredit/forms/PGetSingleHistoRunBlockDialog.ui b/src/musredit/forms/PGetSingleHistoRunBlockDialog.ui index 09fdfc17..7d823aa3 100644 --- a/src/musredit/forms/PGetSingleHistoRunBlockDialog.ui +++ b/src/musredit/forms/PGetSingleHistoRunBlockDialog.ui @@ -9,8 +9,8 @@ 0 0 - 424 - 586 + 440 + 592 @@ -23,7 +23,7 @@ - 0 + 10 0 421 121 @@ -193,7 +193,7 @@ - 0 + 10 120 421 301 @@ -468,7 +468,7 @@ - 0 + 10 420 421 121 @@ -540,7 +540,7 @@ - 0 + 10 545 421 39 diff --git a/src/musredit/forms/PGetTheoryBlockDialog.ui b/src/musredit/forms/PGetTheoryBlockDialog.ui index 8fc9515e..5dce995a 100644 --- a/src/musredit/forms/PGetTheoryBlockDialog.ui +++ b/src/musredit/forms/PGetTheoryBlockDialog.ui @@ -9,8 +9,8 @@ 0 0 - 550 - 529 + 698 + 546 @@ -23,9 +23,9 @@ - 0 + 10 10 - 541 + 681 211 @@ -36,24 +36,27 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">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.</span></p> -<p style="-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;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">Example:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">asymmetry 2</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">simplExpo 3</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">TFieldCos map1 fun2</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">+</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">asymmetry 6</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">simplExpo 7</span></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">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.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Example:</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">asymmetry 2</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">simplExpo 3</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">TFieldCos map1 fun2</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">+</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">asymmetry 6</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">simplExpo 7</p></td></tr></table></body></html> - 0 + 10 220 - 541 + 681 71 @@ -64,16 +67,16 @@ p, li { white-space: pre-wrap; } 10 - 30 - 381 - 25 + 20 + 541 + 41 - 420 + 560 30 51 25 @@ -86,7 +89,7 @@ p, li { white-space: pre-wrap; } - 480 + 620 30 51 25 @@ -100,9 +103,9 @@ p, li { white-space: pre-wrap; } - 0 - 290 - 541 + 10 + 300 + 681 201 @@ -114,9 +117,9 @@ THEORY - 0 - 500 - 541 + 10 + 510 + 681 29 diff --git a/src/musredit/forms/PGetTitleBlockDialog.ui b/src/musredit/forms/PGetTitleBlockDialog.ui index 2385e5fe..64d0086f 100644 --- a/src/musredit/forms/PGetTitleBlockDialog.ui +++ b/src/musredit/forms/PGetTitleBlockDialog.ui @@ -2,12 +2,15 @@ PGetTitleBlockDialog + + Qt::WindowModal + 0 0 - 555 - 84 + 556 + 90 diff --git a/src/musredit/latex_images/abragam.png b/src/musredit/latex_images/abragam.png index d3ced8e4..d3c11151 100644 Binary files a/src/musredit/latex_images/abragam.png and b/src/musredit/latex_images/abragam.png differ diff --git a/src/musredit/latex_images/asymmetry.png b/src/musredit/latex_images/asymmetry.png index 2f6a8fb8..8d54c017 100644 Binary files a/src/musredit/latex_images/asymmetry.png and b/src/musredit/latex_images/asymmetry.png differ diff --git a/src/musredit/latex_images/bessel.png b/src/musredit/latex_images/bessel.png index 4f7fb850..d0801169 100644 Binary files a/src/musredit/latex_images/bessel.png and b/src/musredit/latex_images/bessel.png differ diff --git a/src/musredit/latex_images/combiLGKT.png b/src/musredit/latex_images/combiLGKT.png index 84b01e9a..01734338 100644 Binary files a/src/musredit/latex_images/combiLGKT.png and b/src/musredit/latex_images/combiLGKT.png differ diff --git a/src/musredit/latex_images/generalExp.png b/src/musredit/latex_images/generalExp.png index 7132b112..6cdc0248 100644 Binary files a/src/musredit/latex_images/generalExp.png and b/src/musredit/latex_images/generalExp.png differ diff --git a/src/musredit/latex_images/internalBessel.png b/src/musredit/latex_images/internalBessel.png index 9f632296..0220ead7 100644 Binary files a/src/musredit/latex_images/internalBessel.png and b/src/musredit/latex_images/internalBessel.png differ diff --git a/src/musredit/latex_images/internalField.png b/src/musredit/latex_images/internalField.png index 1f0e54d4..a75823cf 100644 Binary files a/src/musredit/latex_images/internalField.png and b/src/musredit/latex_images/internalField.png differ diff --git a/src/musredit/latex_images/polynom.png b/src/musredit/latex_images/polynom.png index e7f38046..ae2c018e 100644 Binary files a/src/musredit/latex_images/polynom.png and b/src/musredit/latex_images/polynom.png differ diff --git a/src/musredit/latex_images/simpleExp.png b/src/musredit/latex_images/simpleExp.png index 59364345..e033d578 100644 Binary files a/src/musredit/latex_images/simpleExp.png and b/src/musredit/latex_images/simpleExp.png differ diff --git a/src/musredit/latex_images/simpleGauss.png b/src/musredit/latex_images/simpleGauss.png index cfb85476..a5b8ed8c 100644 Binary files a/src/musredit/latex_images/simpleGauss.png and b/src/musredit/latex_images/simpleGauss.png differ diff --git a/src/musredit/latex_images/statExpKT.png b/src/musredit/latex_images/statExpKT.png index 0eba451d..60e13e78 100644 Binary files a/src/musredit/latex_images/statExpKT.png and b/src/musredit/latex_images/statExpKT.png differ diff --git a/src/musredit/latex_images/statGssKT.png b/src/musredit/latex_images/statGssKT.png index 485a5c46..e28023b5 100644 Binary files a/src/musredit/latex_images/statGssKT.png and b/src/musredit/latex_images/statGssKT.png differ diff --git a/src/musredit/latex_images/tfCos.png b/src/musredit/latex_images/tfCos.png index ade18c95..eb925afb 100644 Binary files a/src/musredit/latex_images/tfCos.png and b/src/musredit/latex_images/tfCos.png differ diff --git a/src/musredit/musredit.pro b/src/musredit/musredit.pro index c48b04bd..bc9a295d 100644 --- a/src/musredit/musredit.pro +++ b/src/musredit/musredit.pro @@ -31,6 +31,8 @@ CONFIG += qt \ debug QT += xml +QT += webkit +QT += network HEADERS = musredit.h \ PHelp.h \ diff --git a/src/musredit/musredit.qrc b/src/musredit/musredit.qrc index a3cd957f..6229aa6f 100644 --- a/src/musredit/musredit.qrc +++ b/src/musredit/musredit.qrc @@ -1,4 +1,4 @@ - + images/editcopy.xpm images/editcut.xpm @@ -23,6 +23,7 @@ images/musrt0.xpm images/musrview.xpm latex_images/abragam.png + latex_images/abragam.gif latex_images/asymmetry.png latex_images/bessel.png latex_images/combiLGKT.png