mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-06 07:36:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

UI: Add update channels (macOS)

Browse Source
This commit is contained in:
derrod
2022-11-05 22:32:43 +01:00
committed by Patrick Heyer
parent 634fd3231c
commit 12a27d8b99
9 changed files with 301 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
UI/window-basic-settings.cpp
View File

@@ -583,9 +583,6 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
ui->updateChannelBox = nullptr;
delete ui->updateSettingsGroupBox;
ui->updateSettingsGroupBox = nullptr;
#elif defined(__APPLE__)
delete ui->updateChannelBox;
ui->updateChannelBox = nullptr;
delete ui->updateChannelLabel;
ui->updateChannelLabel = nullptr;
#else
@@ -1207,7 +1204,7 @@ void OBSBasicSettings::LoadThemeList()
ui->theme->setCurrentIndex(idx);
}
#ifdef _WIN32
#if defined(_WIN32) || defined(ENABLE_SPARKLE_UPDATER)
void TranslateBranchInfo(const QString &name, QString &displayName,
QString &description)
{
@@ -1225,7 +1222,7 @@ void TranslateBranchInfo(const QString &name, QString &displayName,
void OBSBasicSettings::LoadBranchesList()
{
#ifdef _WIN32
#if defined(_WIN32) || defined(ENABLE_SPARKLE_UPDATER)
bool configBranchRemoved = true;
QString configBranch =
config_get_string(GetGlobalConfig(), "General", "UpdateBranch");
@@ -1286,7 +1283,7 @@ void OBSBasicSettings::LoadGeneralSettings()
"EnableAutoUpdates");
ui->enableAutoUpdates->setChecked(enableAutoUpdates);
#ifdef _WIN32
#if defined(_WIN32) || defined(ENABLE_SPARKLE_UPDATER)
LoadBranchesList();
#endif
#endif
@@ -3126,7 +3123,7 @@ void OBSBasicSettings::SaveGeneralSettings()
"EnableAutoUpdates",
ui->enableAutoUpdates->isChecked());
#endif
#ifdef _WIN32
#if defined(_WIN32) || defined(ENABLE_SPARKLE_UPDATER)
int branchIdx = ui->updateChannelBox->currentIndex();
QString branchName =
ui->updateChannelBox->itemData(branchIdx).toString();
@@ -3136,7 +3133,8 @@ void OBSBasicSettings::SaveGeneralSettings()
QT_TO_UTF8(branchName));
forceUpdateCheck = true;
}
#endif
#ifdef _WIN32
if (ui->hideOBSFromCapture && WidgetChanged(ui->hideOBSFromCapture)) {
bool hide_window = ui->hideOBSFromCapture->isChecked();
config_set_bool(GetGlobalConfig(), "BasicWindow",