mirror of
https://github.com/overte-org/overte.git
synced 2025-08-04 01:03:38 +02:00
More PR related changes
This commit is contained in:
parent
cd9f2fd240
commit
7748002db7
4 changed files with 12 additions and 3 deletions
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include <iostream>
|
||||
|
||||
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();
|
||||
|
|
Loading…
Reference in a new issue