Skip to content

Commit 6d9a0fc

Browse files
committed
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.
1 parent 750d74c commit 6d9a0fc

3 files changed

Lines changed: 11 additions & 17 deletions

File tree

UI/data/themes/Yami.obt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ QDoubleSpinBox::down-arrow {
985985

986986
#streamButton,
987987
#recordButton,
988-
QPushButton[themeID="replayBufferButton"],
988+
#replayBufferButton,
989989
#broadcastButton {
990990
padding: var(--padding_large);
991991
}
@@ -1001,8 +1001,8 @@ QPushButton[themeID="replayBufferButton"],
10011001
/* Primary Control Button Checked Coloring */
10021002
#streamButton:!hover:!pressed:checked,
10031003
#recordButton:!hover:!pressed:checked,
1004-
QPushButton[themeID="replayBufferButton"]:!hover:!pressed:checked,
1005-
QPushButton[themeID="vcamButton"]:!hover:!pressed:checked,
1004+
#replayBufferButton:!hover:!pressed:checked,
1005+
#virtualCamButton:!hover:!pressed:checked,
10061006
#modeSwitch:!hover:!pressed:checked,
10071007
#broadcastButton:!hover:!pressed:checked {
10081008
background: var(--primary);
@@ -1011,8 +1011,8 @@ QPushButton[themeID="vcamButton"]:!hover:!pressed:checked,
10111011
/* Primary Control Button Hover Coloring */
10121012
#streamButton:hover:!pressed:checked,
10131013
#recordButton:hover:!pressed:checked,
1014-
QPushButton[themeID="replayBufferButton"]:!pressed:checked,
1015-
QPushButton[themeID="vcamButton"]:!pressed:checked,
1014+
#replayBufferButton:!pressed:checked,
1015+
#virtualCamButton:!pressed:checked,
10161016
#modeSwitch:hover:!pressed:checked,
10171017
#broadcastButton:hover:!pressed:checked {
10181018
background: var(--primary_light);

UI/data/themes/Yami_Acri.ovt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ QTabBar QToolButton {
147147
/* Primary Control Button Checked Coloring */
148148
#streamButton:!hover:!pressed:checked,
149149
#recordButton:!hover:!pressed:checked,
150-
QPushButton[themeID="replayBufferButton"]:!hover:!pressed:checked,
151-
QPushButton[themeID="vcamButton"]:!hover:!pressed:checked,
150+
#replayBufferButton:!hover:!pressed:checked,
151+
#virtualCamButton:!hover:!pressed:checked,
152152
#modeSwitch:!hover:!pressed:checked,
153153
#broadcastButton:!hover:!pressed:checked {
154154
background: var(--button_bg_red);
@@ -158,8 +158,8 @@ QPushButton[themeID="vcamButton"]:!hover:!pressed:checked,
158158
/* Primary Control Button Hover Coloring */
159159
#streamButton:hover:!pressed:checked,
160160
#recordButton:hover:!pressed:checked,
161-
QPushButton[themeID="replayBufferButton"]:!pressed:checked,
162-
QPushButton[themeID="vcamButton"]:!pressed:checked,
161+
#replayBufferButton:hover:!pressed:checked,
162+
#virtualCamButton:hover:!pressed:checked,
163163
#modeSwitch:hover:!pressed:checked,
164164
#broadcastButton:hover:!pressed:checked {
165165
background: var(--button_bg_red_hover);
@@ -168,8 +168,8 @@ QPushButton[themeID="vcamButton"]:!pressed:checked,
168168
/* Primary Control Button Checked + Pressed Coloring */
169169
#streamButton:pressed:checked,
170170
#recordButton:pressed:checked,
171-
QPushButton[themeID="replayBufferButton"]:pressed:checked,
172-
QPushButton[themeID="vcamButton"]:pressed:checked,
171+
#replayBufferButton:pressed:checked,
172+
#virtualCamButton:pressed:checked,
173173
#modeSwitch:pressed:checked,
174174
#broadcastButton:pressed:checked {
175175
background: var(--button_bg_red_down);

UI/forms/OBSBasicControls.ui

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,6 @@
207207
<property name="checkable">
208208
<bool>true</bool>
209209
</property>
210-
<property name="themeID" stdset="0">
211-
<string>replayBufferButton</string>
212-
</property>
213210
</widget>
214211
</item>
215212
<item>
@@ -276,9 +273,6 @@
276273
<property name="checkable">
277274
<bool>true</bool>
278275
</property>
279-
<property name="themeID" stdset="0">
280-
<string>vcamButton</string>
281-
</property>
282276
</widget>
283277
</item>
284278
<item>

0 commit comments

Comments
 (0)