mirror of
https://github.com/stenzek/duckstation.git
synced 2025-06-08 04:25:37 +00:00
Qt: Remove Apperance/Update settings from Game Properties
This commit is contained in:
parent
092e819a07
commit
6318223f58
@ -71,15 +71,21 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget
|
|||||||
connect(m_ui.renderToSeparateWindow, &QCheckBox::checkStateChanged, this,
|
connect(m_ui.renderToSeparateWindow, &QCheckBox::checkStateChanged, this,
|
||||||
&InterfaceSettingsWidget::onRenderToSeparateWindowChanged);
|
&InterfaceSettingsWidget::onRenderToSeparateWindowChanged);
|
||||||
|
|
||||||
|
if (!m_dialog->isPerGameSettings())
|
||||||
|
{
|
||||||
SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.theme, "UI", "Theme", THEME_NAMES, THEME_VALUES,
|
SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.theme, "UI", "Theme", THEME_NAMES, THEME_VALUES,
|
||||||
QtHost::GetDefaultThemeName(), "MainWindow");
|
QtHost::GetDefaultThemeName(), "MainWindow");
|
||||||
connect(m_ui.theme, QOverload<int>::of(&QComboBox::currentIndexChanged), [this]() { emit themeChanged(); });
|
connect(m_ui.theme, QOverload<int>::of(&QComboBox::currentIndexChanged), [this]() { emit themeChanged(); });
|
||||||
|
|
||||||
populateLanguageDropdown(m_ui.language);
|
populateLanguageDropdown(m_ui.language);
|
||||||
SettingWidgetBinder::BindWidgetToStringSetting(sif, m_ui.language, "Main", "Language", QtHost::GetDefaultLanguage());
|
SettingWidgetBinder::BindWidgetToStringSetting(sif, m_ui.language, "Main", "Language",
|
||||||
|
QtHost::GetDefaultLanguage());
|
||||||
connect(m_ui.language, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
connect(m_ui.language, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||||
&InterfaceSettingsWidget::onLanguageChanged);
|
&InterfaceSettingsWidget::onLanguageChanged);
|
||||||
|
|
||||||
|
m_ui.autoUpdateCurrentVersion->setText(tr("%1 (%2)").arg(g_scm_tag_str).arg(g_scm_date_str));
|
||||||
|
}
|
||||||
|
|
||||||
onRenderToSeparateWindowChanged();
|
onRenderToSeparateWindowChanged();
|
||||||
|
|
||||||
dialog->registerWidgetHelp(
|
dialog->registerWidgetHelp(
|
||||||
@ -114,13 +120,16 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget
|
|||||||
dialog->registerWidgetHelp(m_ui.enableDiscordPresence, tr("Enable Discord Presence"), tr("Unchecked"),
|
dialog->registerWidgetHelp(m_ui.enableDiscordPresence, tr("Enable Discord Presence"), tr("Unchecked"),
|
||||||
tr("Shows the game you are currently playing as part of your profile in Discord."));
|
tr("Shows the game you are currently playing as part of your profile in Discord."));
|
||||||
|
|
||||||
|
if (!m_dialog->isPerGameSettings())
|
||||||
|
{
|
||||||
dialog->registerWidgetHelp(m_ui.autoUpdateEnabled, tr("Enable Automatic Update Check"), tr("Checked"),
|
dialog->registerWidgetHelp(m_ui.autoUpdateEnabled, tr("Enable Automatic Update Check"), tr("Checked"),
|
||||||
tr("Automatically checks for updates to the program on startup. Updates can be deferred "
|
tr("Automatically checks for updates to the program on startup. Updates can be deferred "
|
||||||
"until later or skipped entirely."));
|
"until later or skipped entirely."));
|
||||||
|
}
|
||||||
|
|
||||||
m_ui.autoUpdateCurrentVersion->setText(tr("%1 (%2)").arg(g_scm_tag_str).arg(g_scm_date_str));
|
if (!m_dialog->isPerGameSettings())
|
||||||
|
{
|
||||||
if (!m_dialog->isPerGameSettings() && AutoUpdaterDialog::isSupported())
|
if (AutoUpdaterDialog::isSupported())
|
||||||
{
|
{
|
||||||
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.autoUpdateEnabled, "AutoUpdater", "CheckAtStartup", true);
|
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.autoUpdateEnabled, "AutoUpdater", "CheckAtStartup", true);
|
||||||
m_ui.autoUpdateTag->addItems(AutoUpdaterDialog::getTagList());
|
m_ui.autoUpdateTag->addItems(AutoUpdaterDialog::getTagList());
|
||||||
@ -136,6 +145,25 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget
|
|||||||
m_ui.checkForUpdates->setEnabled(false);
|
m_ui.checkForUpdates->setEnabled(false);
|
||||||
m_ui.updatesGroup->setEnabled(false);
|
m_ui.updatesGroup->setEnabled(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
delete m_ui.appearanceGroup;
|
||||||
|
m_ui.appearanceGroup = nullptr;
|
||||||
|
m_ui.languageLabel = nullptr;
|
||||||
|
m_ui.language = nullptr;
|
||||||
|
m_ui.themeLabel = nullptr;
|
||||||
|
m_ui.theme = nullptr;
|
||||||
|
|
||||||
|
delete m_ui.updatesGroup;
|
||||||
|
m_ui.autoUpdateTagLabel = nullptr;
|
||||||
|
m_ui.autoUpdateTag = nullptr;
|
||||||
|
m_ui.autoUpdateCurrentVersionLabel = nullptr;
|
||||||
|
m_ui.autoUpdateCurrentVersion = nullptr;
|
||||||
|
m_ui.autoUpdateCheckLayout = nullptr;
|
||||||
|
m_ui.autoUpdateEnabled = nullptr;
|
||||||
|
m_ui.checkForUpdates = nullptr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
InterfaceSettingsWidget::~InterfaceSettingsWidget() = default;
|
InterfaceSettingsWidget::~InterfaceSettingsWidget() = default;
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupBox_4">
|
<widget class="QGroupBox" name="behaviorGroup">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Behaviour</string>
|
<string>Behaviour</string>
|
||||||
</property>
|
</property>
|
||||||
@ -89,7 +89,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupBox_2">
|
<widget class="QGroupBox" name="gameDisplayGroup">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Game Display</string>
|
<string>Game Display</string>
|
||||||
</property>
|
</property>
|
||||||
@ -149,14 +149,14 @@
|
|||||||
<widget class="QComboBox" name="theme"/>
|
<widget class="QComboBox" name="theme"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="languageLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Language:</string>
|
<string>Language:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="2">
|
<item row="0" column="2">
|
||||||
<widget class="QLabel" name="label_2">
|
<widget class="QLabel" name="themeLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Theme:</string>
|
<string>Theme:</string>
|
||||||
</property>
|
</property>
|
||||||
@ -175,7 +175,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<layout class="QFormLayout" name="formLayout_2">
|
<layout class="QFormLayout" name="formLayout_2">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="label_4">
|
<widget class="QLabel" name="autoUpdateTagLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Update Channel:</string>
|
<string>Update Channel:</string>
|
||||||
</property>
|
</property>
|
||||||
@ -185,7 +185,7 @@
|
|||||||
<widget class="QComboBox" name="autoUpdateTag"/>
|
<widget class="QComboBox" name="autoUpdateTag"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="label_5">
|
<widget class="QLabel" name="autoUpdateCurrentVersionLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Current Version:</string>
|
<string>Current Version:</string>
|
||||||
</property>
|
</property>
|
||||||
@ -199,7 +199,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0" colspan="2">
|
<item row="2" column="0" colspan="2">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="autoUpdateCheckLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="autoUpdateEnabled">
|
<widget class="QCheckBox" name="autoUpdateEnabled">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user