diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp index 865b9bc96ecf4ed7a566df3105f57bfcfc9b9090..17be874e405162135ca7074c947f11dee416087c 100644 --- a/GUI/coregui/Views/WelcomeView.cpp +++ b/GUI/coregui/Views/WelcomeView.cpp @@ -4,31 +4,33 @@ #include <QLabel> #include <QComboBox> #include <QVBoxLayout> +#include <QtWebKit> WelcomeView::WelcomeView(QWidget *parent) - : QWidget(parent) + : QWebView(parent) { - QGroupBox *configGroup = new QGroupBox(tr("Server configuration")); + load(QUrl("http://apps.jcns.fz-juelich.de/doku/sc/bornagain")); +// QGroupBox *configGroup = new QGroupBox(tr("Server configuration")); - QLabel *serverLabel = new QLabel(tr("Server:")); - QComboBox *serverCombo = new QComboBox; - serverCombo->addItem(tr("Qt (Australia)")); - serverCombo->addItem(tr("Qt (Germany)")); - serverCombo->addItem(tr("Qt (Norway)")); - serverCombo->addItem(tr("Qt (People's Republic of China)")); - serverCombo->addItem(tr("Qt (USA)")); +// QLabel *serverLabel = new QLabel(tr("Server:")); +// QComboBox *serverCombo = new QComboBox; +// serverCombo->addItem(tr("Qt (Australia)")); +// serverCombo->addItem(tr("Qt (Germany)")); +// serverCombo->addItem(tr("Qt (Norway)")); +// serverCombo->addItem(tr("Qt (People's Republic of China)")); +// serverCombo->addItem(tr("Qt (USA)")); - QHBoxLayout *serverLayout = new QHBoxLayout; - serverLayout->addWidget(serverLabel); - serverLayout->addWidget(serverCombo); +// QHBoxLayout *serverLayout = new QHBoxLayout; +// serverLayout->addWidget(serverLabel); +// serverLayout->addWidget(serverCombo); - QVBoxLayout *configLayout = new QVBoxLayout; - configLayout->addLayout(serverLayout); - configGroup->setLayout(configLayout); +// QVBoxLayout *configLayout = new QVBoxLayout; +// configLayout->addLayout(serverLayout); +// configGroup->setLayout(configLayout); - QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(configGroup); - mainLayout->addStretch(1); - setLayout(mainLayout); +// QVBoxLayout *mainLayout = new QVBoxLayout; +// mainLayout->addWidget(configGroup); +// mainLayout->addStretch(1); +// setLayout(mainLayout); } diff --git a/GUI/coregui/Views/WelcomeView.h b/GUI/coregui/Views/WelcomeView.h index aef62217ed16749dc338405f7d1fa72a05f3c2cb..f0d4e900e86760404c15e5db99f8ead2fed39b34 100644 --- a/GUI/coregui/Views/WelcomeView.h +++ b/GUI/coregui/Views/WelcomeView.h @@ -1,13 +1,12 @@ #ifndef WELCOMEMANAGER_H #define WELCOMEMANAGER_H -#include <QWidget> +#include <QWebView> -class WelcomeView : public QWidget +class WelcomeView : public QWebView { public: WelcomeView(QWidget *parent = 0); - }; #endif // WELCOMEMANAGER_H diff --git a/GUI/coregui/coregui.pro b/GUI/coregui/coregui.pro index c1931ac89af7e087ed645ca99cd9c616e77385eb..81b106abf4ad32d9f1b619a0a310d807c9f2f4a7 100644 --- a/GUI/coregui/coregui.pro +++ b/GUI/coregui/coregui.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui designer designercomponents +QT += core gui webkit designer designercomponents greaterThan(QT_MAJOR_VERSION, 4): QT += widgets diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp index 3021b7ee19829aebd9438157dcda9130bbfecc76..85c0ebba2aa86509a72b68f564a80eee351c01f8 100644 --- a/GUI/coregui/mainwindow/mainwindow.cpp +++ b/GUI/coregui/mainwindow/mainwindow.cpp @@ -98,7 +98,7 @@ Instrument *MainWindow::createDefaultInstrument() Instrument *p_result = new Instrument; p_result->setBeamParameters(0.1*Units::nanometer, 0.4*Units::degree, 0.0); p_result->setBeamIntensity(1e7); - p_result->setDetectorParameters(100, 0.0, 6.0*Units::degree, + p_result->setDetectorParameters(100, 0.0, 3.0*Units::degree, 100, 0.0, 3.0*Units::degree); return p_result; }