diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini index 9c3f38777..a5c043843 100644 --- a/UI/data/locale/en-US.ini +++ b/UI/data/locale/en-US.ini @@ -925,6 +925,10 @@ Basic.Settings.General.ChannelDescription.stable="Latest stable release" Basic.Settings.General.ChannelName.beta="Betas / Release Candidates" Basic.Settings.General.ChannelDescription.beta="Potentially unstable pre-release versions" +# basic mode 'appearance' settings +Basic.Settings.Appearance="Appearance" +Basic.Settings.Appearance.General="General" + # basic mode 'stream' settings Basic.Settings.Stream="Stream" Basic.Settings.Stream.Custom.UseAuthentication="Use authentication" diff --git a/UI/data/themes/Dark/settings/appearance.svg b/UI/data/themes/Dark/settings/appearance.svg new file mode 100644 index 000000000..0038a7618 --- /dev/null +++ b/UI/data/themes/Dark/settings/appearance.svg @@ -0,0 +1,2 @@ + + diff --git a/UI/forms/OBSBasicSettings.ui b/UI/forms/OBSBasicSettings.ui index cbe2f31c0..18d02da6f 100644 --- a/UI/forms/OBSBasicSettings.ui +++ b/UI/forms/OBSBasicSettings.ui @@ -69,6 +69,15 @@ :/settings/images/settings/general.svg:/settings/images/settings/general.svg + + + Basic.Settings.Appearance + + + + :/settings/images/settings/appearance.svg:/settings/images/settings/appearance.svg + + Basic.Settings.Stream @@ -227,19 +236,6 @@ - - - Basic.Settings.General.Theme - - - theme - - - - - - - Qt::Horizontal @@ -255,14 +251,14 @@ - + Basic.Settings.General.OpenStatsOnStartup - + Basic.Settings.General.HideOBSWindowsFromCapture.Tooltip @@ -890,6 +886,90 @@ + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + + + 0 + 0 + 781 + 680 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + Basic.Settings.Appearance.General + + + false + + + + + + Basic.Settings.General.Theme + + + theme + + + + + + + + + + + + + + + + + + @@ -7874,7 +7954,6 @@ listWidget scrollArea_2 language - theme openStatsOnStartup hideOBSFromCapture updateChannelBox @@ -7911,6 +7990,7 @@ multiviewDrawNames multiviewDrawAreas multiviewLayout + theme service moreInfoButton connectAccount diff --git a/UI/forms/images/settings/appearance.svg b/UI/forms/images/settings/appearance.svg new file mode 100644 index 000000000..57a79c8e7 --- /dev/null +++ b/UI/forms/images/settings/appearance.svg @@ -0,0 +1,2 @@ + + diff --git a/UI/forms/obs.qrc b/UI/forms/obs.qrc index 4386adf7a..226ee6ed9 100644 --- a/UI/forms/obs.qrc +++ b/UI/forms/obs.qrc @@ -80,6 +80,7 @@ images/settings/general.svg images/settings/hotkeys.svg images/settings/accessibility.svg + images/settings/appearance.svg fonts/OpenSans-Regular.ttf diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index d94ff32fc..2a19e9131 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -1217,10 +1217,10 @@ void OBSBasicSettings::ReloadCodecs(const FFmpegFormat &format) for (auto &codec : supportedCodecs) { switch (codec.type) { - case AUDIO: + case FFmpegCodecType::AUDIO: AddCodec(ui->advOutFFAEncoder, codec); break; - case VIDEO: + case FFmpegCodecType::VIDEO: AddCodec(ui->advOutFFVEncoder, codec); break; default: @@ -4313,7 +4313,7 @@ void OBSBasicSettings::on_listWidget_itemSelectionChanged() if (loading || row == pageIndex) return; - if (!hotkeysLoaded && row == 5) { + if (!hotkeysLoaded && row == Pages::HOTKEYS) { setCursor(Qt::BusyCursor); /* Look, I know this /feels/ wrong, but the specific issue we're dealing with * here means that the UI locks up immediately even when using "invokeMethod". @@ -4511,7 +4511,8 @@ void OBSBasicSettings::on_advOutFFAEncoder_currentIndexChanged(int idx) if (!itemDataVariant.isNull()) { auto desc = itemDataVariant.value(); SetAdvOutputFFmpegEnablement( - AUDIO, desc.id != 0 || desc.name != nullptr, true); + FFmpegCodecType::AUDIO, + desc.id != 0 || desc.name != nullptr, true); } } @@ -4521,7 +4522,8 @@ void OBSBasicSettings::on_advOutFFVEncoder_currentIndexChanged(int idx) if (!itemDataVariant.isNull()) { auto desc = itemDataVariant.value(); SetAdvOutputFFmpegEnablement( - VIDEO, desc.id != 0 || desc.name != nullptr, true); + FFmpegCodecType::VIDEO, + desc.id != 0 || desc.name != nullptr, true); } } @@ -6089,6 +6091,11 @@ QIcon OBSBasicSettings::GetGeneralIcon() const return generalIcon; } +QIcon OBSBasicSettings::GetAppearanceIcon() const +{ + return appearanceIcon; +} + QIcon OBSBasicSettings::GetStreamIcon() const { return streamIcon; @@ -6126,42 +6133,47 @@ QIcon OBSBasicSettings::GetAdvancedIcon() const void OBSBasicSettings::SetGeneralIcon(const QIcon &icon) { - ui->listWidget->item(0)->setIcon(icon); + ui->listWidget->item(Pages::GENERAL)->setIcon(icon); +} + +void OBSBasicSettings::SetAppearanceIcon(const QIcon &icon) +{ + ui->listWidget->item(Pages::APPEARANCE)->setIcon(icon); } void OBSBasicSettings::SetStreamIcon(const QIcon &icon) { - ui->listWidget->item(1)->setIcon(icon); + ui->listWidget->item(Pages::STREAM)->setIcon(icon); } void OBSBasicSettings::SetOutputIcon(const QIcon &icon) { - ui->listWidget->item(2)->setIcon(icon); + ui->listWidget->item(Pages::OUTPUT)->setIcon(icon); } void OBSBasicSettings::SetAudioIcon(const QIcon &icon) { - ui->listWidget->item(3)->setIcon(icon); + ui->listWidget->item(Pages::AUDIO)->setIcon(icon); } void OBSBasicSettings::SetVideoIcon(const QIcon &icon) { - ui->listWidget->item(4)->setIcon(icon); + ui->listWidget->item(Pages::VIDEO)->setIcon(icon); } void OBSBasicSettings::SetHotkeysIcon(const QIcon &icon) { - ui->listWidget->item(5)->setIcon(icon); + ui->listWidget->item(Pages::HOTKEYS)->setIcon(icon); } void OBSBasicSettings::SetAccessibilityIcon(const QIcon &icon) { - ui->listWidget->item(6)->setIcon(icon); + ui->listWidget->item(Pages::ACCESSIBILITY)->setIcon(icon); } void OBSBasicSettings::SetAdvancedIcon(const QIcon &icon) { - ui->listWidget->item(7)->setIcon(icon); + ui->listWidget->item(Pages::ADVANCED)->setIcon(icon); } int OBSBasicSettings::CurrentFLVTrack() diff --git a/UI/window-basic-settings.hpp b/UI/window-basic-settings.hpp index 7f0db483d..62f5800f0 100644 --- a/UI/window-basic-settings.hpp +++ b/UI/window-basic-settings.hpp @@ -72,6 +72,8 @@ class OBSBasicSettings : public QDialog { Q_OBJECT Q_PROPERTY(QIcon generalIcon READ GetGeneralIcon WRITE SetGeneralIcon DESIGNABLE true) + Q_PROPERTY(QIcon appearanceIcon READ GetAppearanceIcon WRITE + SetAppearanceIcon DESIGNABLE true) Q_PROPERTY(QIcon streamIcon READ GetStreamIcon WRITE SetStreamIcon DESIGNABLE true) Q_PROPERTY(QIcon outputIcon READ GetOutputIcon WRITE SetOutputIcon @@ -87,6 +89,19 @@ class OBSBasicSettings : public QDialog { Q_PROPERTY(QIcon advancedIcon READ GetAdvancedIcon WRITE SetAdvancedIcon DESIGNABLE true) + enum Pages { + GENERAL, + APPEARANCE, + STREAM, + OUTPUT, + AUDIO, + VIDEO, + HOTKEYS, + ACCESSIBILITY, + ADVANCED, + NUM_PAGES + }; + private: OBSBasic *main; @@ -355,6 +370,7 @@ private: void UpdateYouTubeAppDockSettings(); QIcon generalIcon; + QIcon appearanceIcon; QIcon streamIcon; QIcon outputIcon; QIcon audioIcon; @@ -364,6 +380,7 @@ private: QIcon advancedIcon; QIcon GetGeneralIcon() const; + QIcon GetAppearanceIcon() const; QIcon GetStreamIcon() const; QIcon GetOutputIcon() const; QIcon GetAudioIcon() const; @@ -465,6 +482,7 @@ private slots: OBSService SpawnTempService(); void SetGeneralIcon(const QIcon &icon); + void SetAppearanceIcon(const QIcon &icon); void SetStreamIcon(const QIcon &icon); void SetOutputIcon(const QIcon &icon); void SetAudioIcon(const QIcon &icon);