diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d8a906e06a..18202ee1b6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4384,6 +4384,10 @@ void Application::parseVersionXml() { QString operatingSystem("mac"); #endif + #ifdef Q_OS_LINUX + QString operatingSystem("ubuntu"); + #endif + QString releaseDate; QString releaseNotes; QString latestVersion; diff --git a/interface/src/Application.h b/interface/src/Application.h index 86a162e835..d66042149d 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -205,6 +205,7 @@ public: void setIsHighlightVoxel(bool isHighlightVoxel) { _isHighlightVoxel = isHighlightVoxel; } QUrl _downloadUrl; + void skipVersion(QString latestVersion); public slots: void domainChanged(const QString& domainHostname); @@ -504,7 +505,6 @@ private: void checkVersion(); void displayUpdateDialog(); bool shouldSkipVersion(QString latestVersion); - void skipVersion(QString latestVersion); QNetworkReply* _latestVersionReply; }; diff --git a/interface/src/ui/UpdateDialog.cpp b/interface/src/ui/UpdateDialog.cpp index 5ee6cd6812..adc2139634 100644 --- a/interface/src/ui/UpdateDialog.cpp +++ b/interface/src/ui/UpdateDialog.cpp @@ -20,10 +20,12 @@ #include "UpdateDialog.h" UpdateDialog::UpdateDialog(QWidget *parent, QString releaseNotes, QString latestVersion, QUrl downloadURL) : - QDialog(parent, Qt::Dialog) { + QWidget(parent, Qt::Widget) { Application* application = Application::getInstance(); + QString _latestVersion(latestVersion); + QUiLoader updateDialogLoader; QFile updateDialogUi("resources/ui/updateDialog.ui"); @@ -57,6 +59,8 @@ void UpdateDialog::handleDownload() { } void UpdateDialog::handleSkip() { + Application* application = Application::getInstance(); + application->skipVersion(_latestVersion); this->close(); } diff --git a/interface/src/ui/UpdateDialog.h b/interface/src/ui/UpdateDialog.h index 690d0a9f0d..6faca45974 100644 --- a/interface/src/ui/UpdateDialog.h +++ b/interface/src/ui/UpdateDialog.h @@ -14,7 +14,7 @@ #include -class UpdateDialog : public QDialog { +class UpdateDialog : public QWidget { Q_OBJECT public: @@ -22,6 +22,7 @@ public: private: QWidget* _dialogWidget; + QString _latestVersion; private slots: void handleDownload();