piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10307 from AdmiralCurtiss/config-port-autoupdate

Browse Source 
Config: Port AutoUpdate settings to new config system.
This commit is contained in:
JMC47
2021-12-30 14:12:36 -05:00
committed by GitHub
parent de91afaff3 96fa0919be
commit 1112b2a19e
13 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt/Main.cpp
View File

@ -286,7 +286,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
if (!Settings::Instance().IsBatchModeEnabled())
{
auto* updater = new Updater(&win);
auto* updater = new Updater(&win, Config::Get(Config::MAIN_AUTOUPDATE_UPDATE_TRACK),
Config::Get(Config::MAIN_AUTOUPDATE_HASH_OVERRIDE));
updater->start();
}

10
Source/Core/DolphinQt/MenuBar.cpp
View File

@ -548,12 +548,8 @@ void MenuBar::AddOptionsMenu()
void MenuBar::InstallUpdateManually()
{
auto& track = SConfig::GetInstance().m_auto_update_track;
auto previous_value = track;
track = "dev";
auto* updater = new Updater(this->parentWidget());
auto* updater =
new Updater(this->parentWidget(), "dev", Config::Get(Config::MAIN_AUTOUPDATE_HASH_OVERRIDE));
if (!updater->CheckForUpdate())
{
@ -561,8 +557,6 @@ void MenuBar::InstallUpdateManually()
this, tr("Update"),
tr("You are running the latest version available on this update track."));
}
track = previous_value;
}
void MenuBar::AddHelpMenu()

4
Source/Core/DolphinQt/Settings.cpp
View File

@ -614,14 +614,14 @@ void Settings::SetAutoUpdateTrack(const QString& mode)
if (mode == GetAutoUpdateTrack())
return;
SConfig::GetInstance().m_auto_update_track = mode.toStdString();
Config::SetBase(Config::MAIN_AUTOUPDATE_UPDATE_TRACK, mode.toStdString());
emit AutoUpdateTrackChanged(mode);
}
QString Settings::GetAutoUpdateTrack() const
{
return QString::fromStdString(SConfig::GetInstance().m_auto_update_track);
return QString::fromStdString(Config::Get(Config::MAIN_AUTOUPDATE_UPDATE_TRACK));
}
void Settings::SetFallbackRegion(const DiscIO::Region& region)

10
Source/Core/DolphinQt/Updater.cpp
View File

@ -3,6 +3,8 @@
#include "DolphinQt/Updater.h"
#include <utility>
#include <QCheckBox>
#include <QDialog>
#include <QDialogButtonBox>
@ -18,20 +20,22 @@
// Refer to docs/autoupdate_overview.md for a detailed overview of the autoupdate process
Updater::Updater(QWidget* parent) : m_parent(parent)
Updater::Updater(QWidget* parent, std::string update_track, std::string hash_override)
: m_parent(parent), m_update_track(std::move(update_track)),
m_hash_override(std::move(hash_override))
{
connect(this, &QThread::finished, this, &QObject::deleteLater);
}
void Updater::run()
{
AutoUpdateChecker::CheckForUpdate();
AutoUpdateChecker::CheckForUpdate(m_update_track, m_hash_override);
}
bool Updater::CheckForUpdate()
{
m_update_available = false;
AutoUpdateChecker::CheckForUpdate();
AutoUpdateChecker::CheckForUpdate(m_update_track, m_hash_override);
return m_update_available;
}

6
Source/Core/DolphinQt/Updater.h
View File

@ -3,6 +3,8 @@
#pragma once
#include <string>
#include <QThread>
#include "UICommon/AutoUpdate.h"
@ -15,7 +17,7 @@ class Updater : public QThread, public AutoUpdateChecker
{
Q_OBJECT
public:
explicit Updater(QWidget* parent);
explicit Updater(QWidget* parent, std::string update_track, std::string hash_override);
void run() override;
void OnUpdateAvailable(const NewVersionInformation& info) override;
@ -23,5 +25,7 @@ public:
private:
QWidget* m_parent;
std::string m_update_track;
std::string m_hash_override;
bool m_update_available = false;
};