Skip to content

Commit 549d1c0

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 10e25f2 commit 549d1c0

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
@@ -983,7 +983,7 @@ QDoubleSpinBox::down-arrow {
983983

984984
#streamButton,
985985
#recordButton,
986-
QPushButton[themeID="replayBufferButton"],
986+
#replayBufferButton,
987987
#broadcastButton {
988988
padding: var(--padding_large);
989989
}
@@ -999,8 +999,8 @@ QPushButton[themeID="replayBufferButton"],
999999
/* Primary Control Button Checked Coloring */
10001000
#streamButton:!hover:!pressed:checked,
10011001
#recordButton:!hover:!pressed:checked,
1002-
QPushButton[themeID="replayBufferButton"]:!hover:!pressed:checked,
1003-
QPushButton[themeID="vcamButton"]:!hover:!pressed:checked,
1002+
#replayBufferButton:!hover:!pressed:checked,
1003+
#virtualCamButton:!hover:!pressed:checked,
10041004
#modeSwitch:!hover:!pressed:checked,
10051005
#broadcastButton:!hover:!pressed:checked {
10061006
background: var(--primary);
@@ -1009,8 +1009,8 @@ QPushButton[themeID="vcamButton"]:!hover:!pressed:checked,
10091009
/* Primary Control Button Hover Coloring */
10101010
#streamButton:hover:!pressed:checked,
10111011
#recordButton:hover:!pressed:checked,
1012-
QPushButton[themeID="replayBufferButton"]:!pressed:checked,
1013-
QPushButton[themeID="vcamButton"]:!pressed:checked,
1012+
#replayBufferButton:!pressed:checked,
1013+
#virtualCamButton:!pressed:checked,
10141014
#modeSwitch:hover:!pressed:checked,
10151015
#broadcastButton:hover:!pressed:checked {
10161016
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)