From 3840ea0275ca27e3403830fe6eaf492e961c5726 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Sun, 21 Apr 2024 11:56:33 +0200 Subject: [PATCH] UI: Remove replayBufferButton and vcamButton theme IDs Those IDs were used on buttons that were programatically added to the controls dock, now those buttons are always present inside the UI file with their own object name. The use of theme IDs can be replaced by their object names. --- UI/data/themes/Yami.obt | 10 +++++----- UI/data/themes/Yami_Acri.ovt | 12 ++++++------ UI/forms/OBSBasicControls.ui | 6 ------ 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/UI/data/themes/Yami.obt b/UI/data/themes/Yami.obt index f9bc6e07f..51e85a62a 100644 --- a/UI/data/themes/Yami.obt +++ b/UI/data/themes/Yami.obt @@ -985,7 +985,7 @@ QDoubleSpinBox::down-arrow { #streamButton, #recordButton, -QPushButton[themeID="replayBufferButton"], +#replayBufferButton, #broadcastButton { padding: var(--padding_large); } @@ -1001,8 +1001,8 @@ QPushButton[themeID="replayBufferButton"], /* Primary Control Button Checked Coloring */ #streamButton:!hover:!pressed:checked, #recordButton:!hover:!pressed:checked, -QPushButton[themeID="replayBufferButton"]:!hover:!pressed:checked, -QPushButton[themeID="vcamButton"]:!hover:!pressed:checked, +#replayBufferButton:!hover:!pressed:checked, +#virtualCamButton:!hover:!pressed:checked, #modeSwitch:!hover:!pressed:checked, #broadcastButton:!hover:!pressed:checked { background: var(--primary); @@ -1011,8 +1011,8 @@ QPushButton[themeID="vcamButton"]:!hover:!pressed:checked, /* Primary Control Button Hover Coloring */ #streamButton:hover:!pressed:checked, #recordButton:hover:!pressed:checked, -QPushButton[themeID="replayBufferButton"]:!pressed:checked, -QPushButton[themeID="vcamButton"]:!pressed:checked, +#replayBufferButton:!pressed:checked, +#virtualCamButton:!pressed:checked, #modeSwitch:hover:!pressed:checked, #broadcastButton:hover:!pressed:checked { background: var(--primary_light); diff --git a/UI/data/themes/Yami_Acri.ovt b/UI/data/themes/Yami_Acri.ovt index d727a804f..8f87eaebe 100644 --- a/UI/data/themes/Yami_Acri.ovt +++ b/UI/data/themes/Yami_Acri.ovt @@ -147,8 +147,8 @@ QTabBar QToolButton { /* Primary Control Button Checked Coloring */ #streamButton:!hover:!pressed:checked, #recordButton:!hover:!pressed:checked, -QPushButton[themeID="replayBufferButton"]:!hover:!pressed:checked, -QPushButton[themeID="vcamButton"]:!hover:!pressed:checked, +#replayBufferButton:!hover:!pressed:checked, +#virtualCamButton:!hover:!pressed:checked, #modeSwitch:!hover:!pressed:checked, #broadcastButton:!hover:!pressed:checked { background: var(--button_bg_red); @@ -158,8 +158,8 @@ QPushButton[themeID="vcamButton"]:!hover:!pressed:checked, /* Primary Control Button Hover Coloring */ #streamButton:hover:!pressed:checked, #recordButton:hover:!pressed:checked, -QPushButton[themeID="replayBufferButton"]:!pressed:checked, -QPushButton[themeID="vcamButton"]:!pressed:checked, +#replayBufferButton:hover:!pressed:checked, +#virtualCamButton:hover:!pressed:checked, #modeSwitch:hover:!pressed:checked, #broadcastButton:hover:!pressed:checked { background: var(--button_bg_red_hover); @@ -168,8 +168,8 @@ QPushButton[themeID="vcamButton"]:!pressed:checked, /* Primary Control Button Checked + Pressed Coloring */ #streamButton:pressed:checked, #recordButton:pressed:checked, -QPushButton[themeID="replayBufferButton"]:pressed:checked, -QPushButton[themeID="vcamButton"]:pressed:checked, +#replayBufferButton:pressed:checked, +#virtualCamButton:pressed:checked, #modeSwitch:pressed:checked, #broadcastButton:pressed:checked { background: var(--button_bg_red_down); diff --git a/UI/forms/OBSBasicControls.ui b/UI/forms/OBSBasicControls.ui index c70df6142..1a4ab1910 100644 --- a/UI/forms/OBSBasicControls.ui +++ b/UI/forms/OBSBasicControls.ui @@ -207,9 +207,6 @@ true - - replayBufferButton - @@ -276,9 +273,6 @@ true - - vcamButton -