diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 58bb48cae6..dc77966335 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -321,7 +321,7 @@ void Application::initializeGL() { Menu::getInstance()->checkForUpdates(); #endif - InfoView::showFirstTime(); + InfoView::showFirstTime(Menu::getInstance()); } void Application::paintGL() { diff --git a/interface/src/InfoView.cpp b/interface/src/InfoView.cpp index de1ba88c7a..78817b0f32 100644 --- a/interface/src/InfoView.cpp +++ b/interface/src/InfoView.cpp @@ -17,7 +17,8 @@ #define SETTINGS_VERSION_KEY "info-version" #define MAX_DIALOG_HEIGHT_RATIO 0.9 -InfoView::InfoView(bool forced) : +InfoView::InfoView(bool forced, QWidget* parent) : + QWebView(parent), _forced(forced) { switchToResourcesParentIfRequired(); @@ -28,12 +29,12 @@ InfoView::InfoView(bool forced) : connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loaded(bool))); } -void InfoView::showFirstTime() { - new InfoView(false); +void InfoView::showFirstTime(QWidget* parent) { + new InfoView(false, parent); } -void InfoView::forcedShow() { - new InfoView(true); +void InfoView::forcedShow(QWidget* parent) { + new InfoView(true, parent); } bool InfoView::shouldShow() { @@ -45,18 +46,15 @@ bool InfoView::shouldShow() { QString lastVersion = settings->value(SETTINGS_VERSION_KEY).toString(); - QWebFrame* mainFrame = page()->mainFrame(); - QWebElement versionTag = mainFrame->findFirstElement("#version"); + QWebElement versionTag = page()->mainFrame()->findFirstElement("#version"); QString version = versionTag.attribute("value"); - if (lastVersion == QString::null || version == QString::null || lastVersion != version) { - if (version != QString::null) { - settings->setValue(SETTINGS_VERSION_KEY, version); - } + if (version != QString::null && (lastVersion == QString::null || lastVersion != version)) { + settings->setValue(SETTINGS_VERSION_KEY, version); return true; - } - - return false; + } else { + return false; + } } void InfoView::loaded(bool ok) { diff --git a/interface/src/InfoView.h b/interface/src/InfoView.h index 009587c1d5..ffeae66828 100644 --- a/interface/src/InfoView.h +++ b/interface/src/InfoView.h @@ -14,11 +14,11 @@ class InfoView : public QWebView { Q_OBJECT public: - static void showFirstTime(); - static void forcedShow(); + static void showFirstTime(QWidget* parent); + static void forcedShow(QWidget* parent); private: - InfoView(bool forced); + InfoView(bool forced, QWidget* parent); bool _forced; bool shouldShow(); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index ca7e513f67..03f7db6251 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -684,7 +684,7 @@ bool Menu::isVoxelModeActionChecked() { } void Menu::aboutApp() { - InfoView::forcedShow(); + InfoView::forcedShow(this); } void updateDSHostname(const QString& domainServerHostname) {