mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-06-10 12:43:15 +00:00
Allow disable the auto updater (#1490)
This commit is contained in:
parent
f45cad6bc9
commit
a547b2774f
6 changed files with 49 additions and 7 deletions
|
@ -7,7 +7,9 @@
|
|||
|
||||
#include "about_dialog.h"
|
||||
#include "cheats_patches.h"
|
||||
#ifdef ENABLE_UPDATER
|
||||
#include "check_update.h"
|
||||
#endif
|
||||
#include "common/io_file.h"
|
||||
#include "common/path_util.h"
|
||||
#include "common/scm_rev.h"
|
||||
|
@ -59,8 +61,10 @@ bool MainWindow::Init() {
|
|||
this->show();
|
||||
// load game list
|
||||
LoadGameLists();
|
||||
#ifdef ENABLE_UPDATER
|
||||
// Check for update
|
||||
CheckUpdateMain(true);
|
||||
#endif
|
||||
|
||||
auto end = std::chrono::steady_clock::now();
|
||||
auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
|
||||
|
@ -183,6 +187,7 @@ void MainWindow::LoadGameLists() {
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef ENABLE_UPDATER
|
||||
void MainWindow::CheckUpdateMain(bool checkSave) {
|
||||
if (checkSave) {
|
||||
if (!Config::autoUpdate()) {
|
||||
|
@ -192,6 +197,7 @@ void MainWindow::CheckUpdateMain(bool checkSave) {
|
|||
auto checkUpdate = new CheckUpdate(false);
|
||||
checkUpdate->exec();
|
||||
}
|
||||
#endif
|
||||
|
||||
void MainWindow::GetPhysicalDevices() {
|
||||
Vulkan::Instance instance(false, false);
|
||||
|
@ -254,10 +260,12 @@ void MainWindow::CreateConnects() {
|
|||
settingsDialog->exec();
|
||||
});
|
||||
|
||||
#ifdef ENABLE_UPDATER
|
||||
connect(ui->updaterAct, &QAction::triggered, this, [this]() {
|
||||
auto checkUpdate = new CheckUpdate(true);
|
||||
checkUpdate->exec();
|
||||
});
|
||||
#endif
|
||||
|
||||
connect(ui->aboutAct, &QAction::triggered, this, [this]() {
|
||||
auto aboutDialog = new AboutDialog(this);
|
||||
|
@ -933,7 +941,9 @@ void MainWindow::SetUiIcons(bool isWhite) {
|
|||
ui->bootInstallPkgAct->setIcon(RecolorIcon(ui->bootInstallPkgAct->icon(), isWhite));
|
||||
ui->bootGameAct->setIcon(RecolorIcon(ui->bootGameAct->icon(), isWhite));
|
||||
ui->exitAct->setIcon(RecolorIcon(ui->exitAct->icon(), isWhite));
|
||||
#ifdef ENABLE_UPDATER
|
||||
ui->updaterAct->setIcon(RecolorIcon(ui->updaterAct->icon(), isWhite));
|
||||
#endif
|
||||
ui->downloadCheatsPatchesAct->setIcon(
|
||||
RecolorIcon(ui->downloadCheatsPatchesAct->icon(), isWhite));
|
||||
ui->dumpGameListAct->setIcon(RecolorIcon(ui->dumpGameListAct->icon(), isWhite));
|
||||
|
|
|
@ -56,7 +56,9 @@ private:
|
|||
void CreateDockWindows();
|
||||
void GetPhysicalDevices();
|
||||
void LoadGameLists();
|
||||
#ifdef ENABLE_UPDATER
|
||||
void CheckUpdateMain(bool checkSave);
|
||||
#endif
|
||||
void CreateConnects();
|
||||
void SetLastUsedTheme();
|
||||
void SetLastIconSizeBullet();
|
||||
|
|
|
@ -26,7 +26,9 @@ public:
|
|||
QAction* downloadCheatsPatchesAct;
|
||||
QAction* dumpGameListAct;
|
||||
QAction* pkgViewerAct;
|
||||
#ifdef ENABLE_UPDATER
|
||||
QAction* updaterAct;
|
||||
#endif
|
||||
QAction* aboutAct;
|
||||
QAction* configureAct;
|
||||
QAction* setThemeDark;
|
||||
|
@ -130,9 +132,11 @@ public:
|
|||
pkgViewerAct = new QAction(MainWindow);
|
||||
pkgViewerAct->setObjectName("pkgViewer");
|
||||
pkgViewerAct->setIcon(QIcon(":images/file_icon.png"));
|
||||
#ifdef ENABLE_UPDATER
|
||||
updaterAct = new QAction(MainWindow);
|
||||
updaterAct->setObjectName("updaterAct");
|
||||
updaterAct->setIcon(QIcon(":images/update_icon.png"));
|
||||
#endif
|
||||
aboutAct = new QAction(MainWindow);
|
||||
aboutAct->setObjectName("aboutAct");
|
||||
aboutAct->setIcon(QIcon(":images/about_icon.png"));
|
||||
|
@ -291,7 +295,9 @@ public:
|
|||
menuUtils->addAction(downloadCheatsPatchesAct);
|
||||
menuUtils->addAction(dumpGameListAct);
|
||||
menuUtils->addAction(pkgViewerAct);
|
||||
#ifdef ENABLE_UPDATER
|
||||
menuHelp->addAction(updaterAct);
|
||||
#endif
|
||||
menuHelp->addAction(aboutAct);
|
||||
|
||||
retranslateUi(MainWindow);
|
||||
|
@ -306,8 +312,10 @@ public:
|
|||
bootInstallPkgAct->setText(
|
||||
QCoreApplication::translate("MainWindow", "Install Packages (PKG)", nullptr));
|
||||
bootGameAct->setText(QCoreApplication::translate("MainWindow", "Boot Game", nullptr));
|
||||
#ifdef ENABLE_UPDATER
|
||||
updaterAct->setText(
|
||||
QCoreApplication::translate("MainWindow", "Check for Updates", nullptr));
|
||||
#endif
|
||||
aboutAct->setText(QCoreApplication::translate("MainWindow", "About shadPS4", nullptr));
|
||||
configureAct->setText(QCoreApplication::translate("MainWindow", "Configure...", nullptr));
|
||||
#if QT_CONFIG(tooltip)
|
||||
|
|
|
@ -6,7 +6,9 @@
|
|||
#include <QHoverEvent>
|
||||
|
||||
#include <common/version.h>
|
||||
#ifdef ENABLE_UPDATER
|
||||
#include "check_update.h"
|
||||
#endif
|
||||
#include "common/logging/backend.h"
|
||||
#include "common/logging/filter.h"
|
||||
#include "main_window.h"
|
||||
|
@ -143,6 +145,7 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
|
|||
connect(ui->logFilterLineEdit, &QLineEdit::textChanged, this,
|
||||
[](const QString& text) { Config::setLogFilter(text.toStdString()); });
|
||||
|
||||
#ifdef ENABLE_UPDATER
|
||||
connect(ui->updateCheckBox, &QCheckBox::stateChanged, this,
|
||||
[](int state) { Config::setAutoUpdate(state == Qt::Checked); });
|
||||
|
||||
|
@ -153,6 +156,10 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
|
|||
auto checkUpdate = new CheckUpdate(true);
|
||||
checkUpdate->exec();
|
||||
});
|
||||
#else
|
||||
ui->updaterGroupBox->setVisible(false);
|
||||
ui->GUIgroupBox->setMaximumSize(265, 16777215);
|
||||
#endif
|
||||
|
||||
connect(ui->playBGMCheckBox, &QCheckBox::stateChanged, this, [](int val) {
|
||||
Config::setPlayBGM(val);
|
||||
|
@ -278,7 +285,9 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
|
|||
ui->userName->installEventFilter(this);
|
||||
ui->logTypeGroupBox->installEventFilter(this);
|
||||
ui->logFilter->installEventFilter(this);
|
||||
#ifdef ENABLE_UPDATER
|
||||
ui->updaterGroupBox->installEventFilter(this);
|
||||
#endif
|
||||
ui->GUIgroupBox->installEventFilter(this);
|
||||
|
||||
// Input
|
||||
|
@ -340,6 +349,7 @@ void SettingsDialog::LoadValuesFromConfig() {
|
|||
ui->vkSyncValidationCheckBox->setChecked(Config::vkValidationSyncEnabled());
|
||||
ui->rdocCheckBox->setChecked(Config::isRdocEnabled());
|
||||
|
||||
#ifdef ENABLE_UPDATER
|
||||
ui->updateCheckBox->setChecked(Config::autoUpdate());
|
||||
std::string updateChannel = Config::getUpdateChannel();
|
||||
if (updateChannel != "Release" && updateChannel != "Nightly") {
|
||||
|
@ -350,6 +360,7 @@ void SettingsDialog::LoadValuesFromConfig() {
|
|||
}
|
||||
}
|
||||
ui->updateComboBox->setCurrentText(QString::fromStdString(updateChannel));
|
||||
#endif
|
||||
|
||||
for (const auto& dir : Config::getGameInstallDirs()) {
|
||||
QString path_string;
|
||||
|
@ -451,8 +462,10 @@ void SettingsDialog::updateNoteTextEdit(const QString& elementName) {
|
|||
text = tr("logTypeGroupBox");
|
||||
} else if (elementName == "logFilter") {
|
||||
text = tr("logFilter");
|
||||
#ifdef ENABLE_UPDATER
|
||||
} else if (elementName == "updaterGroupBox") {
|
||||
text = tr("updaterGroupBox");
|
||||
#endif
|
||||
} else if (elementName == "GUIgroupBox") {
|
||||
text = tr("GUIgroupBox");
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue