Skip to content

Commit 0060ff2

Browse files
committed
ui: Replace themeID with class property
OBS Studio has switched to using the 'class' property in the UI elements for theming instead of themeID. See commit cb026965, "UI: Replace themeID and style hints with class property" in the obs-studio tree. Make the same change in this source base so that icons get themed correctly. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
1 parent f4a49ca commit 0060ff2

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

src/ptz-controls.ui

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,8 @@
603603
<property name="toolTip">
604604
<string>PTZ Camera Properties</string>
605605
</property>
606-
<property name="themeID" stdset="0">
607-
<string notr="true">propertiesIconSmall</string>
606+
<property name="class" stdset="0">
607+
<string notr="true">icon-gear</string>
608608
</property>
609609
</action>
610610
<action name="actionDisableLiveMoves">
@@ -622,6 +622,9 @@
622622
<property name="toolTip">
623623
<string>Block changes to live cameras</string>
624624
</property>
625+
<property name="class" stdset="0">
626+
<string notr="true">indicator-lock</string>
627+
</property>
625628
</action>
626629
<action name="actionTouchControl">
627630
<property name="checkable">
@@ -637,6 +640,9 @@
637640
<property name="toolTip">
638641
<string>Toggle between direction buttons and 'TouchPad' pan/tilt controls</string>
639642
</property>
643+
<property name="class" stdset="0">
644+
<string notr="true">icon-touch</string>
645+
</property>
640646
</action>
641647
<action name="actionPresetAdd">
642648
<property name="icon">
@@ -649,8 +655,8 @@
649655
<property name="toolTip">
650656
<string>Add preset</string>
651657
</property>
652-
<property name="themeID" stdset="0">
653-
<string notr="true">addIconSmall</string>
658+
<property name="class" stdset="0">
659+
<string notr="true">icon-plus</string>
654660
</property>
655661
</action>
656662
<action name="actionPresetRemove">
@@ -664,8 +670,8 @@
664670
<property name="toolTip">
665671
<string>Delete selected preset</string>
666672
</property>
667-
<property name="themeID" stdset="0">
668-
<string notr="true">removeIconSmall</string>
673+
<property name="class" stdset="0">
674+
<string notr="true">icon-trash</string>
669675
</property>
670676
</action>
671677
<action name="actionPresetMoveUp">
@@ -679,8 +685,8 @@
679685
<property name="toolTip">
680686
<string>Move selected preset up</string>
681687
</property>
682-
<property name="themeID" stdset="0">
683-
<string notr="true">upArrowIconSmall</string>
688+
<property name="class" stdset="0">
689+
<string notr="true">icon-up</string>
684690
</property>
685691
</action>
686692
<action name="actionPresetMoveDown">
@@ -694,8 +700,8 @@
694700
<property name="toolTip">
695701
<string>Move selected preset down</string>
696702
</property>
697-
<property name="themeID" stdset="0">
698-
<string notr="true">downArrowIconSmall</string>
703+
<property name="class" stdset="0">
704+
<string notr="true">icon-down</string>
699705
</property>
700706
</action>
701707
<actiongroup name="actionGroupFollowMode">

src/settings.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@
211211
<property name="flat">
212212
<bool>true</bool>
213213
</property>
214-
<property name="themeID" stdset="0">
215-
<string notr="true">addIconSmall</string>
214+
<property name="class" stdset="0">
215+
<string>icon-plus</string>
216216
</property>
217217
</widget>
218218
</item>
@@ -236,8 +236,8 @@
236236
<property name="flat">
237237
<bool>true</bool>
238238
</property>
239-
<property name="themeID" stdset="0">
240-
<string notr="true">removeIconSmall</string>
239+
<property name="class" stdset="0">
240+
<string>icon-trash</string>
241241
</property>
242242
</widget>
243243
</item>

0 commit comments

Comments
 (0)