From 189e48835d729c501defc911bfdbe62a47a29552 Mon Sep 17 00:00:00 2001 From: Clayton Groeneveld Date: Sat, 20 Apr 2019 09:09:19 -0500 Subject: [PATCH 1/2] UI: Change icons to svg This changes all of the icons from png to svg. With svgs, scaling is unlimited. With the svgs, the issue of the @ symbols with the Windows updater is no longer an issue. I changed the colors of the icons to a light gray (#d2d2d2), in the dark themes, because I thought they looked better with this color. The mute, unmute, plus, minus, up, down and expand icons are from the Feather Icons set. https://feathericons.com/ The visibility icon is from the Octicons set. https://octicons.github.com/ The locked and unlocked icons are from the Open Iconic set. https://github.com/iconic/open-iconic --- UI/CMakeLists.txt | 2 - UI/data/themes/Acri.qss | 84 ++++++++++++++++------ UI/data/themes/Acri/cogwheel.png | Bin 255 -> 0 bytes UI/data/themes/Acri/cogwheel_2x.png | Bin 741 -> 0 bytes UI/data/themes/Acri/down_arrow.png | Bin 527 -> 0 bytes UI/data/themes/Acri/minus.png | Bin 110 -> 0 bytes UI/data/themes/Acri/mute.png | Bin 216 -> 0 bytes UI/data/themes/Acri/plus.png | Bin 115 -> 0 bytes UI/data/themes/Acri/unmute.png | Bin 289 -> 0 bytes UI/data/themes/Acri/up_arrow.png | Bin 505 -> 0 bytes UI/data/themes/Acri/updown.png | Bin 965 -> 0 bytes UI/data/themes/Dark.qss | 57 +++++++++++---- UI/data/themes/Dark/cogwheel.png | Bin 231 -> 0 bytes UI/data/themes/Dark/cogwheel_2x.png | Bin 741 -> 0 bytes UI/data/themes/Dark/collapse.png | Bin 3746 -> 0 bytes UI/data/themes/Dark/down.svg | 1 + UI/data/themes/Dark/down_arrow.png | Bin 527 -> 0 bytes UI/data/themes/Dark/expand.png | Bin 3545 -> 0 bytes UI/data/themes/Dark/expand.svg | 1 + UI/data/themes/Dark/locked.svg | 6 ++ UI/data/themes/Dark/minus.png | Bin 110 -> 0 bytes UI/data/themes/Dark/minus.svg | 1 + UI/data/themes/Dark/mute.png | Bin 216 -> 0 bytes UI/data/themes/Dark/mute.svg | 1 + UI/data/themes/Dark/no_sources.svg | 8 +-- UI/data/themes/Dark/plus.png | Bin 115 -> 0 bytes UI/data/themes/Dark/plus.svg | 1 + UI/data/themes/Dark/refresh.png | Bin 3275 -> 0 bytes UI/data/themes/Dark/refresh.svg | 1 + UI/data/themes/Dark/settings/advanced.svg | 2 +- UI/data/themes/Dark/settings/audio.svg | 2 +- UI/data/themes/Dark/settings/general.svg | 62 +--------------- UI/data/themes/Dark/settings/hotkeys.svg | 2 +- UI/data/themes/Dark/settings/output.svg | 2 +- UI/data/themes/Dark/settings/stream.svg | 2 +- UI/data/themes/Dark/settings/video.svg | 2 +- UI/data/themes/Dark/unmute.png | Bin 268 -> 0 bytes UI/data/themes/Dark/up.svg | 1 + UI/data/themes/Dark/up_arrow.png | Bin 505 -> 0 bytes UI/data/themes/Dark/updown.png | Bin 965 -> 0 bytes UI/data/themes/Dark/updown.svg | 1 + UI/data/themes/Dark/visible.svg | 1 + UI/data/themes/Rachni.qss | 78 +++++++++++++++----- UI/data/themes/System.qss | 50 ++++++++++--- UI/forms/OBSAbout.ui | 19 ++++- UI/forms/images/add.png | Bin 101 -> 0 bytes UI/forms/images/collapse.png | Bin 3442 -> 0 bytes UI/forms/images/configuration21_16.png | Bin 239 -> 0 bytes UI/forms/images/configuration21_16_2x.png | Bin 728 -> 0 bytes UI/forms/images/down.png | Bin 515 -> 0 bytes UI/forms/images/down.svg | 1 + UI/forms/images/editscene.png | Bin 511 -> 0 bytes UI/forms/images/expand.png | Bin 2962 -> 0 bytes UI/forms/images/expand.svg | 1 + UI/forms/images/invisible.svg | 1 + UI/forms/images/invisible_mask.png | Bin 265 -> 0 bytes UI/forms/images/invisible_mask_2x.png | Bin 815 -> 0 bytes UI/forms/images/list_remove.png | Bin 96 -> 0 bytes UI/forms/images/live.png | Bin 710 -> 0 bytes UI/forms/images/locked.svg | 6 ++ UI/forms/images/locked_mask.png | Bin 289 -> 0 bytes UI/forms/images/locked_mask_2x.png | Bin 478 -> 0 bytes UI/forms/images/minus.svg | 1 + UI/forms/images/mute.png | Bin 215 -> 0 bytes UI/forms/images/mute.svg | 1 + UI/forms/images/no_sources.svg | 8 +-- UI/forms/images/plus.svg | 1 + UI/forms/images/properties.png | Bin 239 -> 0 bytes UI/forms/images/properties_2x.png | Bin 728 -> 0 bytes UI/forms/images/refresh.png | Bin 2712 -> 0 bytes UI/forms/images/refresh.svg | 1 + UI/forms/images/settings/advanced.svg | 2 +- UI/forms/images/settings/audio.svg | 2 +- UI/forms/images/settings/general.svg | 62 +--------------- UI/forms/images/settings/hotkeys.svg | 2 +- UI/forms/images/settings/output.svg | 4 +- UI/forms/images/settings/stream.svg | 2 +- UI/forms/images/settings/video.svg | 2 +- UI/forms/images/sound.ico | Bin 1150 -> 0 bytes UI/forms/images/sound_muted.ico | Bin 1150 -> 0 bytes UI/forms/images/unlocked.svg | 6 ++ UI/forms/images/unlocked_mask.png | Bin 297 -> 0 bytes UI/forms/images/unlocked_mask_2x.png | Bin 501 -> 0 bytes UI/forms/images/unmute.png | Bin 296 -> 0 bytes UI/forms/images/up.png | Bin 489 -> 0 bytes UI/forms/images/up.svg | 1 + UI/forms/images/visible.svg | 1 + UI/forms/images/visible_mask.png | Bin 180 -> 0 bytes UI/forms/images/visible_mask_2x.png | Bin 610 -> 0 bytes UI/forms/obs.qrc | 34 +++------ UI/source-tree.cpp | 7 +- 91 files changed, 297 insertions(+), 236 deletions(-) delete mode 100644 UI/data/themes/Acri/cogwheel.png delete mode 100644 UI/data/themes/Acri/cogwheel_2x.png delete mode 100644 UI/data/themes/Acri/down_arrow.png delete mode 100644 UI/data/themes/Acri/minus.png delete mode 100644 UI/data/themes/Acri/mute.png delete mode 100644 UI/data/themes/Acri/plus.png delete mode 100644 UI/data/themes/Acri/unmute.png delete mode 100644 UI/data/themes/Acri/up_arrow.png delete mode 100644 UI/data/themes/Acri/updown.png delete mode 100644 UI/data/themes/Dark/cogwheel.png delete mode 100644 UI/data/themes/Dark/cogwheel_2x.png delete mode 100644 UI/data/themes/Dark/collapse.png create mode 100644 UI/data/themes/Dark/down.svg delete mode 100644 UI/data/themes/Dark/down_arrow.png delete mode 100644 UI/data/themes/Dark/expand.png create mode 100644 UI/data/themes/Dark/expand.svg create mode 100644 UI/data/themes/Dark/locked.svg delete mode 100644 UI/data/themes/Dark/minus.png create mode 100644 UI/data/themes/Dark/minus.svg delete mode 100644 UI/data/themes/Dark/mute.png create mode 100644 UI/data/themes/Dark/mute.svg delete mode 100644 UI/data/themes/Dark/plus.png create mode 100644 UI/data/themes/Dark/plus.svg delete mode 100644 UI/data/themes/Dark/refresh.png create mode 100644 UI/data/themes/Dark/refresh.svg delete mode 100644 UI/data/themes/Dark/unmute.png create mode 100644 UI/data/themes/Dark/up.svg delete mode 100644 UI/data/themes/Dark/up_arrow.png delete mode 100644 UI/data/themes/Dark/updown.png create mode 100644 UI/data/themes/Dark/updown.svg create mode 100644 UI/data/themes/Dark/visible.svg delete mode 100644 UI/forms/images/add.png delete mode 100644 UI/forms/images/collapse.png delete mode 100644 UI/forms/images/configuration21_16.png delete mode 100644 UI/forms/images/configuration21_16_2x.png delete mode 100644 UI/forms/images/down.png create mode 100644 UI/forms/images/down.svg delete mode 100644 UI/forms/images/editscene.png delete mode 100644 UI/forms/images/expand.png create mode 100644 UI/forms/images/expand.svg create mode 100644 UI/forms/images/invisible.svg delete mode 100644 UI/forms/images/invisible_mask.png delete mode 100644 UI/forms/images/invisible_mask_2x.png delete mode 100644 UI/forms/images/list_remove.png delete mode 100644 UI/forms/images/live.png create mode 100644 UI/forms/images/locked.svg delete mode 100644 UI/forms/images/locked_mask.png delete mode 100644 UI/forms/images/locked_mask_2x.png create mode 100644 UI/forms/images/minus.svg delete mode 100644 UI/forms/images/mute.png create mode 100644 UI/forms/images/mute.svg create mode 100644 UI/forms/images/plus.svg delete mode 100644 UI/forms/images/properties.png delete mode 100644 UI/forms/images/properties_2x.png delete mode 100644 UI/forms/images/refresh.png create mode 100644 UI/forms/images/refresh.svg delete mode 100644 UI/forms/images/sound.ico delete mode 100644 UI/forms/images/sound_muted.ico create mode 100644 UI/forms/images/unlocked.svg delete mode 100644 UI/forms/images/unlocked_mask.png delete mode 100644 UI/forms/images/unlocked_mask_2x.png delete mode 100644 UI/forms/images/unmute.png delete mode 100644 UI/forms/images/up.png create mode 100644 UI/forms/images/up.svg create mode 100644 UI/forms/images/visible.svg delete mode 100644 UI/forms/images/visible_mask.png delete mode 100644 UI/forms/images/visible_mask_2x.png diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt index 0711c69a4..8270baba7 100644 --- a/UI/CMakeLists.txt +++ b/UI/CMakeLists.txt @@ -238,8 +238,6 @@ set(obs_SOURCES volume-control.cpp adv-audio-control.cpp item-widget-helpers.cpp - visibility-checkbox.cpp - locked-checkbox.cpp horizontal-scroll-area.cpp vertical-scroll-area.cpp visibility-item-widget.cpp diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss index 62cbac30d..ab452ec78 100644 --- a/UI/data/themes/Acri.qss +++ b/UI/data/themes/Acri.qss @@ -330,27 +330,27 @@ QToolButton:pressed { } * [themeID="addIconSmall"] { - qproperty-icon: url(./Acri/plus.png); + qproperty-icon: url(./Dark/plus.svg); } * [themeID="removeIconSmall"] { - qproperty-icon: url(./Acri/minus.png); + qproperty-icon: url(./Dark/minus.svg); } * [themeID="propertiesIconSmall"] { - qproperty-icon: url(./Acri/cogwheel.png); + qproperty-icon: url(./Dark/settings/general.svg); } * [themeID="configIconSmall"] { - qproperty-icon: url(./Acri/cogwheel.png); + qproperty-icon: url(./Dark/settings/general.svg); } * [themeID="upArrowIconSmall"] { - qproperty-icon: url(./Acri/up_arrow.png); + qproperty-icon: url(./Dark/up.svg); } * [themeID="downArrowIconSmall"] { - qproperty-icon: url(./Acri/down_arrow.png); + qproperty-icon: url(./Dark/down.svg); } /* Tab Widget */ @@ -409,7 +409,7 @@ QComboBox::drop-down { QComboBox::down-arrow { qproperty-alignment: AlignTop; - image: url(./Acri/updown.png); + image: url(./Dark/updown.svg); width: 100%; } @@ -429,7 +429,7 @@ QComboBox::drop-down:editable { QComboBox::down-arrow:editable { qproperty-alignment: AlignTop; - image: url(./Acri/down_arrow.png); + image: url(./Dark/down.svg); width: 8%; } @@ -495,12 +495,12 @@ QDoubleSpinBox::up-button:disabled, QDoubleSpinBox::up-button:off, QDoubleSpinBo } QSpinBox::up-arrow, QDoubleSpinBox::up-arrow { - image: url(./Acri/up_arrow.png); + image: url(./Dark/up.svg); width: 100%; } QSpinBox::down-arrow, QDoubleSpinBox::down-arrow { - image: url(./Acri/down_arrow.png); + image: url(./Dark/down.svg); width: 100%; } @@ -772,34 +772,34 @@ MuteCheckBox { } MuteCheckBox::indicator:checked { - image: url(./Dark/mute.png); + image: url(./Dark/mute.svg); } MuteCheckBox::indicator:unchecked { - image: url(./Dark/unmute.png); + image: url(./Dark/settings/audio.svg); } MuteCheckBox::indicator:unchecked:hover { - image: url(./Dark/unmute.png); + image: url(./Dark/settings/audio.svg); } MuteCheckBox::indicator:unchecked:focus { - image: url(./Dark/unmute.png); + image: url(./Dark/settings/audio.svg); } MuteCheckBox::indicator:checked:hover { - image: url(./Dark/mute.png); + image: url(./Dark/mute.svg); } MuteCheckBox::indicator:checked:focus { - image: url(./Dark/mute.png); + image: url(./Dark/mute.svg); } MuteCheckBox::indicator:checked:disabled { - image: url(./Dark/mute.png); + image: url(./Dark/mute.svg); } MuteCheckBox::indicator:unchecked:disabled { - image: url(./Dark/unmute.png); + image: url(./Dark/settings/audio.svg); } OBSHotkeyLabel[hotkeyPairHover=true] { @@ -822,12 +822,12 @@ SourceTreeSubItemCheckBox::indicator { SourceTreeSubItemCheckBox::indicator:checked, SourceTreeSubItemCheckBox::indicator:checked:hover { - image: url(./Dark/expand.png); + image: url(./Dark/expand.svg); } SourceTreeSubItemCheckBox::indicator:unchecked, SourceTreeSubItemCheckBox::indicator:unchecked:hover { - image: url(./Dark/collapse.png); + image: url(./Dark/down.svg); } @@ -927,3 +927,47 @@ OBSBasicSettings { qproperty-hotkeysIcon: url(./Dark/settings/hotkeys.svg); qproperty-advancedIcon: url(./Dark/settings/advanced.svg); } + +/* Locked CheckBox */ + +LockedCheckBox { + outline: none; +} + +LockedCheckBox::indicator:checked { + image: url(./Dark/locked.svg); +} + +LockedCheckBox::indicator:unchecked { + image: url(:res/images/unlocked.svg); +} + +LockedCheckBox::indicator:checked:hover { + image: url(./Dark/locked.svg); +} + +LockedCheckBox::indicator:unchecked:hover { + image: url(:res/images/unlocked.svg); +} + +/* Visibilty CheckBox */ + +VisibilityCheckBox { + outline: none; +} + +VisibilityCheckBox::indicator:checked { + image: url(./Dark/visible.svg); +} + +VisibilityCheckBox::indicator:unchecked { + image: url(:res/images/invisible.svg); +} + +VisibilityCheckBox::indicator:checked:hover { + image: url(./Dark/visible.svg); +} + +VisibilityCheckBox::indicator:unchecked:hover { + image: url(:res/images/invisible.svg); +} diff --git a/UI/data/themes/Acri/cogwheel.png b/UI/data/themes/Acri/cogwheel.png deleted file mode 100644 index e0456ceea40598c64dd92e66f010f33a30af681a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 255 zcmV3krCYI*jAj4;002ovPDHLk FV1i+YZ8rb_ diff --git a/UI/data/themes/Acri/cogwheel_2x.png b/UI/data/themes/Acri/cogwheel_2x.png deleted file mode 100644 index 49c4070a7cb67ec987a517b1507ddca1ffad3d61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 741 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5m^kh={g8AI%&+V01C2~c>21sKjIK)<`XWO`|LOa1LI~-7sn8f<8!B2dou?Lw5E$U zcTH$R)lG$#pWx7F87 z?ygWfIpalS4HIAF0a3-HoPiZfTs;CF%@MPUoNDJ~%Tu?&siBLZ|M`Vg#yF7&Zy7cr=y{+PXTY0pjdd`a}ADX-IRHkpjEs5{18Wt+PpH#9>q>-_5a-!{( zt+V#cV7bRr-|jlU_}-U&ces^v9v;tlv{9`1AXmL;z=CVVJ-55Qd);Gd?jtsOdcy5}?}3MlqoceGbjZ91*w&T>b?{Aak*;gln%KFSKt=&YEuBx$Or>5}Vf zehG7lI5if1*I2&%$UdJAk6^Q_uRrw5v)`{QpE7Z7956;zOI#yLQW8s2t&)pUffR$0 zfuV)2frYM-afpGjm7$51p{2Hgk(GhL#^3kOqG-s?PsvQH#I51Lva~{=21$?&!TD(= p<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6cwc)I$ztaD0e0sxQcBHaK0 diff --git a/UI/data/themes/Acri/down_arrow.png b/UI/data/themes/Acri/down_arrow.png deleted file mode 100644 index 39d31da89d6edfef47f642073fda4202e2b08b9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV7%t(;uuoF`1U$uJ5#j8@rRjN zUlYZ$7=O1Os`N6rlk1|2)ZhF+l{J3ST>`qF%qDNFKd583`{CO5?}GpTT>D^9*&IAMeO6Kx>=SXD%`|P5g zu%8@i-;ccy>iDtnf?!Ae+R*9ddsY9{RJ=Z2zjcZo(?@5M?zYd-?ib>IK7N$I;xGKa z;A#KYZ|nYV?-9)Deem*8{^lQ-1?x5n_AL0q=BBVuup^)4k#yq^C^IjUB`<>|FP$YX zjU_LYB`<{~?{W98PW?Ax`*uiMG`xQ&uy1p7$9scE))Ri{muY;I^{HtWzR!5H+~cEc zNKL!w|C^X*A{h^2PVIO2Q{}!v{$BN-y+2C(9%#?|A=>v~#($lIdR+PlDZ@3IP{*Z?v2 XZxz<#oD^-J1mbwQ`njxgN@xNA6+!JL diff --git a/UI/data/themes/Acri/minus.png b/UI/data/themes/Acri/minus.png deleted file mode 100644 index 26e35b4e40d74afb525d36578380cf1f4bd93cae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0P3?wHke>@jRu?6^qxc&!&(3-C~KoQ20AirP+ zhi5m^fE+PT7srqa#$<-3z=Z$uJpU#fVR$9Y$}rns+dj8Ezze8?!PC{xWt~$(699=Z BAl(1} diff --git a/UI/data/themes/Acri/mute.png b/UI/data/themes/Acri/mute.png deleted file mode 100644 index 682f91edfac637fd742aecaab27751f3e2bcf290..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^F3W0Ln;`TUS?!taujL*cr#Qx zV)bd4MoahDMXO7i99DEN35XeTTOIDw6a4c#X~Us+cFp$>d`Ns|tNwoSm)LU~-Pno~ z8pRG>lDhGT*|kn%gR}JBg?)Jn?Y}4g=i~h_<6$fFvK0Z!J-ilI1lDCJywPnGV(dCM zBZ5g(N@Ldo3F#9b8VZ~n3O3n25@hwd^U>$O+i!)N?v+zF`A9!Dx>?J(SLv~l%nbWa QK&LWzy85}Sb4q9e0IU#H@c;k- diff --git a/UI/data/themes/Acri/plus.png b/UI/data/themes/Acri/plus.png deleted file mode 100644 index 69325d1d810f6a5bdac715a356a2d6ac9e55287b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0P3?wHke>@jRu?6^qxc&!&(3-C~KoQ20AirP+ zhi5m^fE;O07srqa#^eKBKlpoe+WyuX{BRaZW?>UiV_;ZyIP9gTfaMpUG6qjqKbLh* G2~7Y9L*)`>6r7gQLa|^RFhdevXTXrqZ-s0k{?3QQqfAxH4-&?=B7d_{&zrVjg z#oPDZ4#S;~QHf7f`wGa#wK&heagStA0d07LrQS7Lz%rsRsNJRsXu^RUL*)>#qrMBV zxKLkiS^mOPnSczusZT+x_B|}UlmcW%vnmwn@oFFewVI710YA76HXt#WfH}LjP;B0U zzaL@_KI}fkHtl=OOWTk`4*~n?I}nE(^_7;Tvj)661x#WQkr>l%58*BWl8q}jKjlLF n;1OxT{FzGeiCQxY`S1J>z?^g7k8|*Z00000NkvXXu0mjfWa58k diff --git a/UI/data/themes/Acri/up_arrow.png b/UI/data/themes/Acri/up_arrow.png deleted file mode 100644 index 89a5d470791916214b28709585ad0a1cd332bf13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 505 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU_9XI;uuoF`1Vd?nsT5B+k=^R zV;PtdQZt8ZHf4Bb2AK%_Q=i&QV-`@&NJMjHaMZL^-mP-A~V-|Ydo9=zsX(+N! zh$Eh}Wj&fH0!YHALzuinm`+EZlR0GG|KY4^&F9EIOWmV;rX}Wi8|;7h_TYtYi4oO? zOa4lno5zzH-?q`*`Nn*hbC3;ssD04+?|&OriPrTjk9GO)O@CFhGe%5kpHNL&sovFp z)BNlA{M$P(d1YM7{xw1-Gi8-eo86vorx6!^{d3H!@Q3<~S$xAL-p#U_T?zE~e$^SW zb-x$f7gn|4+<#kW&aDr(c~<{awV0Bn{O6t52F&c3-< z&g7WnE{ECfv#;)z`;z`bXkstF8gh^`Fxaf(&z$?2`{P2VCm;z=S3j3^P6<7gR`t)iS1tQ{Vq=8a+!t@=-S1EK zoA&0>|GTrRJ&#*50!;;hV});)U*78Z=hePfQjSf}D`U@z@2r1yOQFuP_MJV?;SbrB zb!jZUN7ldNe>{76(KWY%bwb;A)zANMyC|+_!NeawXZ}xa+TWMRl6xdxy`ZUGup^)4 zk#yq^w+l&s6pwRA_3U5$-t9uzpWJ!-pFS~F&d~frkUCaG&FdITIyJ3!ozu_QBnQojD;tX0C6Ia)j*f#@cz; zpZ+PC^|4ps?Yh^?jvsly`bYh|h#F;&%_eW|TQ}|gc=lb&BWcIGuk!5wZB)L|bJT#R zGWnypUDMqwT4wLN;%hIs+BQ`P)-P1{n0@04Z}K+5KXK=Je{@S8^qnQsXMdO@?`ZrV zj=c1a`VaS6=Ig)ye#xVIi|6VeD+JfpFD z<7KV4*GexR23oY2|6dBrav6Kx!<0rUG+9iyBPwb9IR^AVv+{~}_n)==@a;*^;M=2C z$E~c<_N(Lmv->RnWj@}PZTz9zhnC*FVdQ&MBb@00FSIrT_o{ diff --git a/UI/data/themes/Dark.qss b/UI/data/themes/Dark.qss index 34fa8d73c..f7089c8cf 100644 --- a/UI/data/themes/Dark.qss +++ b/UI/data/themes/Dark.qss @@ -236,31 +236,31 @@ QToolButton:pressed { } * [themeID="addIconSmall"] { - qproperty-icon: url(./Dark/plus.png); + qproperty-icon: url(./Dark/plus.svg); } * [themeID="removeIconSmall"] { - qproperty-icon: url(./Dark/minus.png); + qproperty-icon: url(./Dark/minus.svg); } * [themeID="propertiesIconSmall"] { - qproperty-icon: url(./Dark/cogwheel.png); + qproperty-icon: url(./Dark/settings/general.svg); } * [themeID="configIconSmall"] { - qproperty-icon: url(./Dark/cogwheel.png); + qproperty-icon: url(./Dark/settings/general.svg); } * [themeID="refreshIconSmall"] { - qproperty-icon: url(./Dark/refresh.png); + qproperty-icon: url(./Dark/refresh.svg); } * [themeID="upArrowIconSmall"] { - qproperty-icon: url(./Dark/up_arrow.png); + qproperty-icon: url(./Dark/up.svg); } * [themeID="downArrowIconSmall"] { - qproperty-icon: url(./Dark/down_arrow.png); + qproperty-icon: url(./Dark/down.svg); } @@ -342,7 +342,7 @@ QComboBox::drop-down { QComboBox::down-arrow { qproperty-alignment: AlignTop; - image: url(./Dark/updown.png); + image: url(./Dark/updown.svg); width: 100%; } @@ -362,7 +362,7 @@ QComboBox::drop-down:editable { QComboBox::down-arrow:editable { qproperty-alignment: AlignTop; - image: url(./Dark/down_arrow.png); + image: url(./Dark/down.svg); width: 8%; } @@ -433,12 +433,12 @@ QDoubleSpinBox::up-button:disabled, QDoubleSpinBox::up-button:off, QDoubleSpinBo } QSpinBox::up-arrow, QDoubleSpinBox::up-arrow { - image: url(./Dark/up_arrow.png); + image: url(./Dark/up.svg); width: 100%; } QSpinBox::down-arrow, QDoubleSpinBox::down-arrow { - image: url(./Dark/down_arrow.png); + image: url(./Dark/down.svg); width: 100%; } @@ -472,7 +472,7 @@ QPushButton:checked { } QPushButton::menu-indicator { - image: url(./Dark/down_arrow.png); + image: url(./Dark/down.svg); subcontrol-position: right; subcontrol-origin: padding; width: 25px; @@ -613,18 +613,17 @@ MuteCheckBox { } MuteCheckBox::indicator:checked { - image: url(./Dark/mute.png); + image: url(./Dark/mute.svg); } MuteCheckBox::indicator:unchecked { - image: url(./Dark/unmute.png); + image: url(./Dark/settings/audio.svg); } OBSHotkeyLabel[hotkeyPairHover=true] { color: red; } - /* Group Collapse Checkbox */ SourceTreeSubItemCheckBox { @@ -718,3 +717,31 @@ OBSBasicSettings { qproperty-hotkeysIcon: url(./Dark/settings/hotkeys.svg); qproperty-advancedIcon: url(./Dark/settings/advanced.svg); } + +/* Locked CheckBox */ + +LockedCheckBox { + outline: none; +} + +LockedCheckBox::indicator:checked { + image: url(./Dark/locked.svg); +} + +LockedCheckBox::indicator:unchecked { + image: url(:res/images/unlocked.svg); +} + +/* Visibilty CheckBox */ + +VisibilityCheckBox { + outline: none; +} + +VisibilityCheckBox::indicator:checked { + image: url(./Dark/visible.svg); +} + +VisibilityCheckBox::indicator:unchecked { + image: url(:res/images/invisible.svg); +} diff --git a/UI/data/themes/Dark/cogwheel.png b/UI/data/themes/Dark/cogwheel.png deleted file mode 100644 index 62ecce9448678450460098f070c32f1a453dcc57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6)_J-(hG>Z99yH`?F%WURcs)Bg zRlH#JwUc^5kvrL^t2i;WS^qrJz%y^LxfoYxv&Zx!P0tUd z%+ZpOEZ$^vS|Gz{qQ|n2uWtOk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5m^kh={g8AI%&+V01C2~c>21sKjIK)<`XWO`|LOa1LI~-7sn8f<8!B2dou?Lw5E$U zcTH$R)lG$#pWx7F87 z?ygWfIpalS4HIAF0a3-HoPiZfTs;CF%@MPUoNDJ~%Tu?&siBLZ|M`Vg#yF7&Zy7cr=y{+PXTY0pjdd`a}ADX-IRHkpjEs5{18Wt+PpH#9>q>-_5a-!{( zt+V#cV7bRr-|jlU_}-U&ces^v9v;tlv{9`1AXmL;z=CVVJ-55Qd);Gd?jtsOdcy5}?}3MlqoceGbjZ91*w&T>b?{Aak*;gln%KFSKt=&YEuBx$Or>5}Vf zehG7lI5if1*I2&%$UdJAk6^Q_uRrw5v)`{QpE7Z7956;zOI#yLQW8s2t&)pUffR$0 zfuV)2frYM-afpGjm7$51p{2Hgk(GhL#^3kOqG-s?PsvQH#I51Lva~{=21$?&!TD(= p<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6cwc)I$ztaD0e0sxQcBHaK0 diff --git a/UI/data/themes/Dark/collapse.png b/UI/data/themes/Dark/collapse.png deleted file mode 100644 index 1fd72a1167f1fb0d629b0312fd61fe8e2c4c05f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3746 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 u+*N=vTd5-QY5GevJflJA|Lng+{*Nah(QB6#A diff --git a/UI/data/themes/Dark/down_arrow.png b/UI/data/themes/Dark/down_arrow.png deleted file mode 100644 index 39d31da89d6edfef47f642073fda4202e2b08b9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV7%t(;uuoF`1U$uJ5#j8@rRjN zUlYZ$7=O1Os`N6rlk1|2)ZhF+l{J3ST>`qF%qDNFKd583`{CO5?}GpTT>D^9*&IAMeO6Kx>=SXD%`|P5g zu%8@i-;ccy>iDtnf?!Ae+R*9ddsY9{RJ=Z2zjcZo(?@5M?zYd-?ib>IK7N$I;xGKa z;A#KYZ|nYV?-9)Deem*8{^lQ-1?x5n_AL0q=BBVuup^)4k#yq^C^IjUB`<>|FP$YX zjU_LYB`<{~?{W98PW?Ax`*uiMG`xQ&uy1p7$9scE))Ri{muY;I^{HtWzR!5H+~cEc zNKL!w|C^X*A{h^2PVIO2Q{}!v{$BN-y+2C(9%#?|A=>v~#($lIdR+PlDZ@3IP{*Z?v2 XZxz<#oD^-J1mbwQ`njxgN@xNA6+!JL diff --git a/UI/data/themes/Dark/expand.png b/UI/data/themes/Dark/expand.png deleted file mode 100644 index dd5d2b5ecc54f6622af84ad2cc18a0b9b7d45d80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3545 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 yy!j;LC_8%VCKr9F4!oYOjm(vS|5yK0c{` diff --git a/UI/data/themes/Dark/locked.svg b/UI/data/themes/Dark/locked.svg new file mode 100644 index 000000000..58239eb6c --- /dev/null +++ b/UI/data/themes/Dark/locked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/UI/data/themes/Dark/minus.png b/UI/data/themes/Dark/minus.png deleted file mode 100644 index 26e35b4e40d74afb525d36578380cf1f4bd93cae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0P3?wHke>@jRu?6^qxc&!&(3-C~KoQ20AirP+ zhi5m^fE+PT7srqa#$<-3z=Z$uJpU#fVR$9Y$}rns+dj8Ezze8?!PC{xWt~$(699=Z BAl(1} diff --git a/UI/data/themes/Dark/minus.svg b/UI/data/themes/Dark/minus.svg new file mode 100644 index 000000000..8fdc03774 --- /dev/null +++ b/UI/data/themes/Dark/minus.svg @@ -0,0 +1 @@ + diff --git a/UI/data/themes/Dark/mute.png b/UI/data/themes/Dark/mute.png deleted file mode 100644 index 682f91edfac637fd742aecaab27751f3e2bcf290..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^F3W0Ln;`TUS?!taujL*cr#Qx zV)bd4MoahDMXO7i99DEN35XeTTOIDw6a4c#X~Us+cFp$>d`Ns|tNwoSm)LU~-Pno~ z8pRG>lDhGT*|kn%gR}JBg?)Jn?Y}4g=i~h_<6$fFvK0Z!J-ilI1lDCJywPnGV(dCM zBZ5g(N@Ldo3F#9b8VZ~n3O3n25@hwd^U>$O+i!)N?v+zF`A9!Dx>?J(SLv~l%nbWa QK&LWzy85}Sb4q9e0IU#H@c;k- diff --git a/UI/data/themes/Dark/mute.svg b/UI/data/themes/Dark/mute.svg new file mode 100644 index 000000000..d6c9c5de8 --- /dev/null +++ b/UI/data/themes/Dark/mute.svg @@ -0,0 +1 @@ + diff --git a/UI/data/themes/Dark/no_sources.svg b/UI/data/themes/Dark/no_sources.svg index 1710db96b..be6ad559a 100644 --- a/UI/data/themes/Dark/no_sources.svg +++ b/UI/data/themes/Dark/no_sources.svg @@ -3,16 +3,16 @@ - + - + - + - + diff --git a/UI/data/themes/Dark/plus.png b/UI/data/themes/Dark/plus.png deleted file mode 100644 index 69325d1d810f6a5bdac715a356a2d6ac9e55287b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0P3?wHke>@jRu?6^qxc&!&(3-C~KoQ20AirP+ zhi5m^fE;O07srqa#^eKBKlpoe+WyuX{BRaZW?>UiV_;ZyIP9gTfaMpUG6qjqKbLh* G2~7Y diff --git a/UI/data/themes/Dark/refresh.png b/UI/data/themes/Dark/refresh.png deleted file mode 100644 index 7a6f6e6dc4b8846b6a8c529284b3d0bf7e8541a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3275 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 diff --git a/UI/data/themes/Dark/settings/advanced.svg b/UI/data/themes/Dark/settings/advanced.svg index b05b7c5f1..9ee4de7d0 100644 --- a/UI/data/themes/Dark/settings/advanced.svg +++ b/UI/data/themes/Dark/settings/advanced.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/data/themes/Dark/settings/audio.svg b/UI/data/themes/Dark/settings/audio.svg index 1fbef7613..5a5a78a5f 100644 --- a/UI/data/themes/Dark/settings/audio.svg +++ b/UI/data/themes/Dark/settings/audio.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/data/themes/Dark/settings/general.svg b/UI/data/themes/Dark/settings/general.svg index 62e11fa23..a2b0c422d 100644 --- a/UI/data/themes/Dark/settings/general.svg +++ b/UI/data/themes/Dark/settings/general.svg @@ -1,61 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - + diff --git a/UI/data/themes/Dark/settings/hotkeys.svg b/UI/data/themes/Dark/settings/hotkeys.svg index 1ae542d1b..6fdd69539 100644 --- a/UI/data/themes/Dark/settings/hotkeys.svg +++ b/UI/data/themes/Dark/settings/hotkeys.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/data/themes/Dark/settings/output.svg b/UI/data/themes/Dark/settings/output.svg index 75bbe2dc5..83e4c5d73 100644 --- a/UI/data/themes/Dark/settings/output.svg +++ b/UI/data/themes/Dark/settings/output.svg @@ -1,5 +1,5 @@ - + diff --git a/UI/data/themes/Dark/settings/stream.svg b/UI/data/themes/Dark/settings/stream.svg index 1c8ea824b..982fd1a57 100644 --- a/UI/data/themes/Dark/settings/stream.svg +++ b/UI/data/themes/Dark/settings/stream.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/data/themes/Dark/settings/video.svg b/UI/data/themes/Dark/settings/video.svg index d3a8002a6..2aca1f306 100644 --- a/UI/data/themes/Dark/settings/video.svg +++ b/UI/data/themes/Dark/settings/video.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/data/themes/Dark/unmute.png b/UI/data/themes/Dark/unmute.png deleted file mode 100644 index ae73cd2ffa17264fbaaedcc98368abd082018b41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmV+n0rUQeP)FNKdm&1CCY!&-%D1dxVB;^atfx2H-#wel11)`|!l`qU_Hik~maeWl zS*5}ic1^j*diap9R9MiLs@X<6C;;IYO)Iz<4 diff --git a/UI/data/themes/Dark/up_arrow.png b/UI/data/themes/Dark/up_arrow.png deleted file mode 100644 index 89a5d470791916214b28709585ad0a1cd332bf13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 505 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU_9XI;uuoF`1Vd?nsT5B+k=^R zV;PtdQZt8ZHf4Bb2AK%_Q=i&QV-`@&NJMjHaMZL^-mP-A~V-|Ydo9=zsX(+N! zh$Eh}Wj&fH0!YHALzuinm`+EZlR0GG|KY4^&F9EIOWmV;rX}Wi8|;7h_TYtYi4oO? zOa4lno5zzH-?q`*`Nn*hbC3;ssD04+?|&OriPrTjk9GO)O@CFhGe%5kpHNL&sovFp z)BNlA{M$P(d1YM7{xw1-Gi8-eo86vorx6!^{d3H!@Q3<~S$xAL-p#U_T?zE~e$^SW zb-x$f7gn|4+<#kW&aDr(c~<{awV0Bn{O6t52F&c3-< z&g7WnE{ECfv#;)z`;z`bXkstF8gh^`Fxaf(&z$?2`{P2VCm;z=S3j3^P6<7gR`t)iS1tQ{Vq=8a+!t@=-S1EK zoA&0>|GTrRJ&#*50!;;hV});)U*78Z=hePfQjSf}D`U@z@2r1yOQFuP_MJV?;SbrB zb!jZUN7ldNe>{76(KWY%bwb;A)zANMyC|+_!NeawXZ}xa+TWMRl6xdxy`ZUGup^)4 zk#yq^w+l&s6pwRA_3U5$-t9uzpWJ!-pFS~F&d~frkUCaG&FdITIyJ3!ozu_QBnQojD;tX0C6Ia)j*f#@cz; zpZ+PC^|4ps?Yh^?jvsly`bYh|h#F;&%_eW|TQ}|gc=lb&BWcIGuk!5wZB)L|bJT#R zGWnypUDMqwT4wLN;%hIs+BQ`P)-P1{n0@04Z}K+5KXK=Je{@S8^qnQsXMdO@?`ZrV zj=c1a`VaS6=Ig)ye#xVIi|6VeD+JfpFD z<7KV4*GexR23oY2|6dBrav6Kx!<0rUG+9iyBPwb9IR^AVv+{~}_n)==@a;*^;M=2C z$E~c<_N(Lmv->RnWj@}PZTz9zhnC*FVdQ&MBb@00FSIrT_o{ diff --git a/UI/data/themes/Dark/updown.svg b/UI/data/themes/Dark/updown.svg new file mode 100644 index 000000000..a91e74021 --- /dev/null +++ b/UI/data/themes/Dark/updown.svg @@ -0,0 +1 @@ + diff --git a/UI/data/themes/Dark/visible.svg b/UI/data/themes/Dark/visible.svg new file mode 100644 index 000000000..ffe51ec87 --- /dev/null +++ b/UI/data/themes/Dark/visible.svg @@ -0,0 +1 @@ + diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss index 6855aa7b6..5ccd1e9c6 100644 --- a/UI/data/themes/Rachni.qss +++ b/UI/data/themes/Rachni.qss @@ -480,31 +480,31 @@ QToolButton:pressed { } * [themeID="addIconSmall"] { - qproperty-icon: url(./Dark/plus.png); + qproperty-icon: url(./Dark/plus.svg); } * [themeID="removeIconSmall"] { - qproperty-icon: url(./Dark/minus.png); + qproperty-icon: url(./Dark/minus.svg); } * [themeID="propertiesIconSmall"] { - qproperty-icon: url(./Dark/cogwheel.png); + qproperty-icon: url(./Dark/settings/general.svg); } * [themeID="configIconSmall"] { - qproperty-icon: url(./Dark/cogwheel.png); + qproperty-icon: url(./Dark/settings/general.svg); } * [themeID="refreshIconSmall"] { - qproperty-icon: url(./Dark/refresh.png); + qproperty-icon: url(./Dark/refresh.svg); } * [themeID="upArrowIconSmall"] { - qproperty-icon: url(./Dark/up_arrow.png); + qproperty-icon: url(./Dark/up.svg); } * [themeID="downArrowIconSmall"] { - qproperty-icon: url(./Dark/down_arrow.png); + qproperty-icon: url(./Dark/down.svg); } /***********************/ @@ -738,36 +738,36 @@ MuteCheckBox { } MuteCheckBox::indicator:checked { - image: url(./Dark/mute.png); + image: url(./Dark/mute.svg); } MuteCheckBox::indicator:unchecked { - image: url(./Dark/unmute.png); + image: url(./Dark/settings/audio.svg); } MuteCheckBox::indicator:unchecked:hover { background-color: rgba(240, 98, 146, 0.5); /* Pink (Secondary) */ - image: url(./Dark/unmute.png); + image: url(./Dark/settings/audio.svg); } MuteCheckBox::indicator:unchecked:focus { - image: url(./Dark/unmute.png); + image: url(./Dark/settings/audio.svg); } MuteCheckBox::indicator:checked:hover { background-color: rgba(240, 98, 146, 0.5); /* Pink (Secondary) */ - image: url(./Dark/mute.png); + image: url(./Dark/mute.svg); } MuteCheckBox::indicator:checked:focus { - image: url(./Dark/mute.png); + image: url(./Dark/mute.svg); } MuteCheckBox::indicator:checked:disabled { - image: url(./Dark/mute.png); + image: url(./Dark/mute.svg); } MuteCheckBox::indicator:unchecked:disabled { - image: url(./Dark/unmute.png); + image: url(./Dark/settings/audio.svg); } /****************************/ @@ -786,12 +786,12 @@ SourceTreeSubItemCheckBox::indicator { SourceTreeSubItemCheckBox::indicator:checked, SourceTreeSubItemCheckBox::indicator:checked:hover { - image: url(./Dark/expand.png); + image: url(./Dark/expand.svg); } SourceTreeSubItemCheckBox::indicator:unchecked, SourceTreeSubItemCheckBox::indicator:unchecked:hover { - image: url(./Dark/collapse.png); + image: url(./Dark/down.svg); } /*************************/ @@ -1283,3 +1283,47 @@ OBSBasicSettings { qproperty-hotkeysIcon: url(./Dark/settings/hotkeys.svg); qproperty-advancedIcon: url(./Dark/settings/advanced.svg); } + +/* Locked CheckBox */ + +LockedCheckBox { + outline: none; +} + +LockedCheckBox::indicator:checked { + image: url(./Dark/locked.svg); +} + +LockedCheckBox::indicator:unchecked { + image: url(:res/images/unlocked.svg); +} + +LockedCheckBox::indicator:checked:hover { + image: url(./Dark/locked.svg); +} + +LockedCheckBox::indicator:unchecked:hover { + image: url(:res/images/unlocked.svg); +} + +/* Visibilty CheckBox */ + +VisibilityCheckBox { + outline: none; +} + +VisibilityCheckBox::indicator:checked { + image: url(./Dark/visible.svg); +} + +VisibilityCheckBox::indicator:unchecked { + image: url(:res/images/invisible.svg); +} + +VisibilityCheckBox::indicator:checked:hover { + image: url(./Dark/visible.svg); +} + +VisibilityCheckBox::indicator:unchecked:hover { + image: url(:res/images/invisible.svg); +} diff --git a/UI/data/themes/System.qss b/UI/data/themes/System.qss index 543618924..192c7ce09 100644 --- a/UI/data/themes/System.qss +++ b/UI/data/themes/System.qss @@ -12,31 +12,31 @@ /* We need to set back the icons, or the preview wont stick. */ * [themeID="addIconSmall"] { - qproperty-icon: url(:/res/images/add.png); + qproperty-icon: url(:/res/images/plus.svg); } * [themeID="removeIconSmall"] { - qproperty-icon: url(:/res/images/list_remove.png); + qproperty-icon: url(:/res/images/minus.svg); } * [themeID="propertiesIconSmall"] { - qproperty-icon: url(:/res/images/properties.png); + qproperty-icon: url(:/settings/images/settings/general.svg); } * [themeID="configIconSmall"] { - qproperty-icon: url(:/res/images/configuration21_16.png); + qproperty-icon: url(:/settings/images/settings/general.svg); } * [themeID="upArrowIconSmall"] { - qproperty-icon: url(:/res/images/up.png); + qproperty-icon: url(:/res/images/up.svg); } * [themeID="refreshIconSmall"] { - qproperty-icon: url(:/res/images/refresh.png); + qproperty-icon: url(:/res/images/refresh.svg); } * [themeID="downArrowIconSmall"] { - qproperty-icon: url(:/res/images/down.png); + qproperty-icon: url(:/res/images/down.svg); } MuteCheckBox { @@ -44,11 +44,11 @@ MuteCheckBox { } MuteCheckBox::indicator:checked { - image: url(:/res/images/mute.png); + image: url(:/res/images/mute.svg); } MuteCheckBox::indicator:unchecked { - image: url(:/res/images/unmute.png); + image: url(:/settings/images/settings/audio.svg); } SourceTreeSubItemCheckBox { @@ -62,11 +62,11 @@ SourceTreeSubItemCheckBox::indicator { } SourceTreeSubItemCheckBox::indicator:checked { - image: url(:/res/images/expand.png); + image: url(:/res/images/expand.svg); } SourceTreeSubItemCheckBox::indicator:unchecked { - image: url(:/res/images/collapse.png); + image: url(:/res/images/down.svg); } OBSHotkeyLabel[hotkeyPairHover=true] { @@ -161,3 +161,31 @@ OBSBasicSettings { qproperty-hotkeysIcon: url(:settings/images/settings/hotkeys.svg); qproperty-advancedIcon: url(:settings/images/settings/advanced.svg); } + +/* Locked CheckBox */ + +LockedCheckBox { + outline: none; +} + +LockedCheckBox::indicator:checked { + image: url(:res/images/locked.svg); +} + +LockedCheckBox::indicator:unchecked { + image: url(:res/images/unlocked.svg); +} + +/* Visibilty CheckBox */ + +VisibilityCheckBox { + outline: none; +} + +VisibilityCheckBox::indicator:checked { + image: url(:res/images/visible.svg); +} + +VisibilityCheckBox::indicator:unchecked { + image: url(:res/images/invisible.svg); +} diff --git a/UI/forms/OBSAbout.ui b/UI/forms/OBSAbout.ui index 4679f1799..edac7bef5 100644 --- a/UI/forms/OBSAbout.ui +++ b/UI/forms/OBSAbout.ui @@ -18,16 +18,31 @@ 30 30 - 261 - 261 + 256 + 256 + + + 256 + 256 + + + + + 256 + 256 + + :res/images/obs.png + + true + diff --git a/UI/forms/images/add.png b/UI/forms/images/add.png deleted file mode 100644 index 5413c1edf6dca084f234ad1c2dbdf2ec2f9ee8e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^4j{}3Bp8~6e2Re-Q%R6tFasmwl)vkMJULGn$B+uf vIOL&erLw6N>JxIT&tDnm{r-UW|9=aIZ diff --git a/UI/forms/images/collapse.png b/UI/forms/images/collapse.png deleted file mode 100644 index 04707a44d211004b6369a376b8af99bc2279e993..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3442 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 E2ew*Y9RL6T diff --git a/UI/forms/images/configuration21_16.png b/UI/forms/images/configuration21_16.png deleted file mode 100644 index 3ddd7178bff38802616071a1508b902df518c79b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmVH?^(ve{@8!b`H)t*R5~?BZdv=3}uu0`oURD$?6z@-C+_1X_bvS$8GgiENUd zd_6f`)uu~3IQ|7Py;SP`wRjn{=Z*0(Wcs$4A8Rh3pKNYH@3ZSppt9O6QmMNc&9YVf pv8YSD;pW|_t_)YbR(9y`+7Gjl*9{GKEt3EM002ovPDHLkV1o5)XE6W( diff --git a/UI/forms/images/configuration21_16_2x.png b/UI/forms/images/configuration21_16_2x.png deleted file mode 100644 index fb56560360120e1799f5f05624cea0fd07788627..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 728 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5m^kh={g8AI%&+V01C2~c>21sKjIK)m| z@OF){ddj93T2)fQ-Ns=T8$?7M4;)M2>e%SpE2oyJZ|i)R(LVTC(Z$>x9iFJZ>k5y> zEGBW(&y~$*eZTO9tlBS^T!jkA68`N6e`y~bXv7RC((z`A zO?u5;P1e0A?%ToilZBJdfZ66zYs=2G%QI6xU8%ht@hK($snqluwv}2>r-i=1$YXOV zSJYPgRk{|>?ho133wM>j;Ptt{8G2CN_#KzoQ`48(hGlmd3s-J4nBu+l%;v|o25+zW zBwt#5%*-%>>#*zk2}~x}ERH|Aw|nyMWs^nsSngwObXA_{9qL9BJ!?Ocf;_10zwj#5JNMC9x#cD!C{XNHG{07+UBWSm+uVhZq=I z8Jb!d8)_RESs57kulHPpq9HdwB{QuOw+6dUALW1=BtbR==ckpFCl;kLl$V$5W#(lU cCnpx9>g5-u&wghk1ysb~>FVdQ&MBb@0FJ2~b^rhX diff --git a/UI/forms/images/down.png b/UI/forms/images/down.png deleted file mode 100644 index 35a8c4b2f41d9f43810d6ea32164b3426c8ba10b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 515 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU_9mN;uuoF`1X2Z+UEd?;}2Ed zKHojVG5SE>iW9BtFKpwPQ5Jpdb%#cWkNR-QSZ({`NM*{ygY&+>S`x8rS zu%y@IZ`&XL?>` z9n=K5q?~d5W^*)oiA2a_O{JkFZm*Yr(@GRM9HP$cQ)$G_|cb4PG{(C<++&lX> zZ)dl9%{sx3da0xFx?hicc6VUq?Qy747P!xG#GL74FM>J$8`GoR9Y6F`_H}p8f70}5 z_lh5SI{Uh-`S&osd)Hf#p5L)ss?l1iakpfnwPfRNiAHOQ#_M@3ahnAz*19R|6YR)m zc_iKV12qxi)#e@S^TuOQaY8G8^*sS&t=Gv?eft#64a8T-G@yGywn) CvE_*X diff --git a/UI/forms/images/down.svg b/UI/forms/images/down.svg new file mode 100644 index 000000000..c827bbd41 --- /dev/null +++ b/UI/forms/images/down.svg @@ -0,0 +1 @@ + diff --git a/UI/forms/images/editscene.png b/UI/forms/images/editscene.png deleted file mode 100644 index 65b96e8cc1ad37d4dc1420513cc14ae4cda4fed0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 511 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 diff --git a/UI/forms/images/invisible.svg b/UI/forms/images/invisible.svg new file mode 100644 index 000000000..0d1484d61 --- /dev/null +++ b/UI/forms/images/invisible.svg @@ -0,0 +1 @@ + diff --git a/UI/forms/images/invisible_mask.png b/UI/forms/images/invisible_mask.png deleted file mode 100644 index 479e13ee1e2f7e49ce7a37d24054f20bf4e50f42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmV+k0rvihP)VICDaL zk8j}klh8F*>j*tt>E}(TteiZgbn|O3?R8#+sf(13)*7<{4__c6XyHmzs=Kf&Y10m07+9C;A@rT4XM5VhMmQEdqYx&pmhJF? zC=2f9FPX#kw8px0UrgVh+)8`DMbE>@O7-@lmbQ9AM{TV8X;%F|H$#X&mxKCi8jzqJ P00000NkvXXu0mjfW2bgt diff --git a/UI/forms/images/invisible_mask_2x.png b/UI/forms/images/invisible_mask_2x.png deleted file mode 100644 index dffe83aa65a9e2ff269f17028e5fa52e3c1898f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 815 zcmV+~1JL}5P)kdg00002VoOIv0RM-N z%)bBt010qNS#tmY4c7nw4c7reD4Tcy000McNliru;s_QOBLbV0@Dl(40>DW`K~zY` z<(18A6Hye!&$}~88);(NVCq;a6$IVbm6Sql$^=Ca0tLa1;!1QUh)Me&2#qO<8(ru| zbSbn11hFJ#Y@ifZ-T8qnNNuM!N=!_XCi9+)Nv88*LEVXW_wKykd2jBVdk6UEgZ(*@ z@1P-LGye831?EEXBou&8nG*8eTeTpMq8H#BK7I6unJa`E6Hov^iefJTEhx_5r0C@V zb4@TXUtu3>4+8#13Wopy>wL+4>JoT;z&OWG!|zcgVE4e~yA86zME zScE_XHDqXur*PQ9OP;Tg?_xJ_%!aPA8MYED1B-!X2RH1v6gGC$b%#Jc%5I|9f;r3b ztjgQVLa1T8yy&J|Xo|Ec!2m$(=P7jA%rQGQ3kWtp$P|CB9$>A?V_l@t&63y$pkzuA z@J8ZS?KoC>7FY;t6YLs)=ftI+77pxZ$yWh@fXaFFJIpzwa>0!2;s~E+MLX_eyp01u zw|oJhTptoHcdr2RgI-)M$#rx(cB;7nlCHSCP>huUrnqrbf#GcwooCS{66CUs004i^ ziA!OM|EhNwC;rSttcWZI09Wb4JP94pf`~ZwHjO6~Uln;rvexV%!Ir&cP!%WGWBvBn7C;FM z*zgKHI%VuySz!~9`LtZLJiq3wc=@KEokANed$I7NpzwJ=BhkLK|EC(o_3xK$=16!r>KYQrftU#7NnP> zU+gKlJ!#qGZsm=-JnnKw4LVz9bFs2pvn4=7LUBx+dw>=+4nkp!Z^#?5(q5ytC17ll tXIRC`DC7Na|5$Rzr6^x&kIMflegcLyHxA@xP8|RM002ovPDHLkV1fw3%Nyy0o1WSr;eWS!}vTi1SDMu9XClJ1D^;I6Gi(fiosM2!5AcQv#S1l zPIu20;q>+%lwpj3s)iI_Ct#cdkUBdM(^^UZ3S0q7DNHdK)=izfI|q0v!tS0;fk!c^ znmz=%gA-uX0Ir34&IzVxfXO))S>|#8D+T?yDO$(~fKV(!rw}AE!N9dxk4QdPoMWmm zrU95ENZiMyTB;2cWRieWvw-Bif^!&TkfazlFgS)|6+_=qoL3lexKxe3QC~B;CK1zR z1Hwp5$(upn)5cAn-w&XlXAca1Ng|FtKZ#8hOd&9tn4~dGOg1$FGb{^TL5QrL-Vy+< z{9}F7w*jRx6CvkXOc=0uGHL^Y*2HuYYva#Nt?iwT`x8JrZ?T>3N41TqeM+{NVdig6aWAK diff --git a/UI/forms/images/locked.svg b/UI/forms/images/locked.svg new file mode 100644 index 000000000..bcb2cb755 --- /dev/null +++ b/UI/forms/images/locked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/UI/forms/images/locked_mask.png b/UI/forms/images/locked_mask.png deleted file mode 100644 index 4f05b1a56495c005e037ea94e921a3f7aee425b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtn~Z=Uo6`NLP@vE{PZ!4!i_=#p+j21(3bfvDIhrMY z)9qkz1xx;enQz|Y?Co6pBJR+!Q%)?b^-{TZ-0mESks`Cd9-MGy&z|Xu&P&3WUN8wK z@XIu42Gk{Qc+hIP;mhAw!5>es7B65ZN_e)lu*&XA1yAkTGjFoe%sr>7D6PBLAf=}g zll$5>fqBl}yTThjTU5Pe%4z%;JzaG>kIK_|)8!1gJm>D%{o(bA|CbLuQt>`k{@s1i f!3P)D^?zrv&~4yR{3sg;bUA~ktDnm{r-UW|XFhJy diff --git a/UI/forms/images/locked_mask_2x.png b/UI/forms/images/locked_mask_2x.png deleted file mode 100644 index 9cad6a4acc6854a8330ffd2df552bb57f967803d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmV<40U`d0P) zu-yO~f08^RmVifqi1?)jUV!zoxGtG|MAD`0S)lu&eE}TX&Lyn^3z9P10`6_k*?t;U z_nUoP9z?`MLd_Vk*B7%j%<&&4zz@Lq5Bg|D#8pDk5s(#OXC;znl4d?f4|Ht5e&f>4 zZJ#7@(~?Gu@LPo3jg*yrg!|f0opdl=sfNwlB)wc#HkFOM3a#^w%nBAmzQE+q!-w z4Wt4ZmS1@b>L|bJ6tc3wDIImGX((tYXejuX6to6(AGTl1{8H1H0zYpaHI4mbAMS7r U6Y6#EHvj+t07*qoM6N<$f{Pi+lmGw# diff --git a/UI/forms/images/minus.svg b/UI/forms/images/minus.svg new file mode 100644 index 000000000..8a2e2f971 --- /dev/null +++ b/UI/forms/images/minus.svg @@ -0,0 +1 @@ + diff --git a/UI/forms/images/mute.png b/UI/forms/images/mute.png deleted file mode 100644 index 97cb10a1c9e3e9acf30f871073f4ff15758d5e9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^E_P~Ln;`TUS?!taujL*xP5il zhOp_KOx1n6T*6id4oy5%j zMPS;>MqRsr3&)tOzZ{fi`p2Zov)?OOW6@C_eHjB+W_EkCgaUzeFBIMcGnv|m%rW%j zG diff --git a/UI/forms/images/no_sources.svg b/UI/forms/images/no_sources.svg index 84b87c5eb..55eb49203 100644 --- a/UI/forms/images/no_sources.svg +++ b/UI/forms/images/no_sources.svg @@ -3,16 +3,16 @@ - + - + - + - + diff --git a/UI/forms/images/plus.svg b/UI/forms/images/plus.svg new file mode 100644 index 000000000..de42f6b42 --- /dev/null +++ b/UI/forms/images/plus.svg @@ -0,0 +1 @@ + diff --git a/UI/forms/images/properties.png b/UI/forms/images/properties.png deleted file mode 100644 index 3ddd7178bff38802616071a1508b902df518c79b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmVH?^(ve{@8!b`H)t*R5~?BZdv=3}uu0`oURD$?6z@-C+_1X_bvS$8GgiENUd zd_6f`)uu~3IQ|7Py;SP`wRjn{=Z*0(Wcs$4A8Rh3pKNYH@3ZSppt9O6QmMNc&9YVf pv8YSD;pW|_t_)YbR(9y`+7Gjl*9{GKEt3EM002ovPDHLkV1o5)XE6W( diff --git a/UI/forms/images/properties_2x.png b/UI/forms/images/properties_2x.png deleted file mode 100644 index fb56560360120e1799f5f05624cea0fd07788627..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 728 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5m^kh={g8AI%&+V01C2~c>21sKjIK)m| z@OF){ddj93T2)fQ-Ns=T8$?7M4;)M2>e%SpE2oyJZ|i)R(LVTC(Z$>x9iFJZ>k5y> zEGBW(&y~$*eZTO9tlBS^T!jkA68`N6e`y~bXv7RC((z`A zO?u5;P1e0A?%ToilZBJdfZ66zYs=2G%QI6xU8%ht@hK($snqluwv}2>r-i=1$YXOV zSJYPgRk{|>?ho133wM>j;Ptt{8G2CN_#KzoQ`48(hGlmd3s-J4nBu+l%;v|o25+zW zBwt#5%*-%>>#*zk2}~x}ERH|Aw|nyMWs^nsSngwObXA_{9qL9BJ!?Ocf;_10zwj#5JNMC9x#cD!C{XNHG{07+UBWSm+uVhZq=I z8Jb!d8)_RESs57kulHPpq9HdwB{QuOw+6dUALW1=BtbR==ckpFCl;kLl$V$5W#(lU cCnpx9>g5-u&wghk1ysb~>FVdQ&MBb@0FJ2~b^rhX diff --git a/UI/forms/images/refresh.png b/UI/forms/images/refresh.png deleted file mode 100644 index e3e4c5b8b7e213b390b41e7d65f88c711107648f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2712 zcmV;J3TO3+P)ee4 z2z(d#3y>=?LW`INO0-~{k>6F})U0rVDqZVPZyR}J};w+Y~7V5GmP;_Xw`!IN1pt2QCKa z-)SU}#spB*a==r-SE{(bJAfy3saH;4U)Ono380{T1biz6eQpN63_Kk`1nW%zSMD9` zNlD*V0SAGxGG7O)O#qj-OTey_^uG}a963?u#4uw5SbXmwEwmzWk<$_TI$#1=y!EDR zJiZSMNAwdMF##;T)w(ZbW3m@GAEB>fq%gcb2~Xe$xJ4FK6I*~cBJ}kPRj`3nZ338g z4)vu>1e+p?;Biv4m7L^u@GRv;8&~Q{5ao5S*95S1+nzEJ?1?Zj93>@@MU@H&*`31G zf$tLW(KK}IjtU824md=*j;22xp`TmJ{n3V)J9Pu_LuBtfX%F0gkn@P|rN~+I4Dbby z&%A=1z^+;WG-}842@mFczorq_aavf1L@~8HUY`T*1Ac>16Eq?lNItKD6W9r)nqn1j z48Idd{ZW6csf^Dx>14|Y%LL-~?ZqtsHLI_JXIY4Hj-77c=jzQe!qbdI7Wo`VP0SV< z$8nD~9wZ^};6|2?)cGAX z7S>#0?$r0X>rnsa8lyZ8c?jTK+&A-S zPbbA%vtQY?;dczpD|?x5s@S_du000)+w2#_FYpJC>tj7QGvJ}bd(3vhxQi-@Aoh6_ z*=ishE0N5lF5~XC^Xl^o*y!Q#c|jjtM!5g+PB>n>LTwdX0JnKudy+aywww@CNWzQY zw(=1`5AN{;uOc2oBMg^-e>z^)WC1+da%1#kgL=3s|- z6~MU1#IBvNiJA?e1xbSKI$<0SDS#1=*FcwtQVn;qxCh$KxcUrS1u*O(fR*YuFv8M? zdywsn+ANp=rf_%etikSWJg$8z z&Kp^W`^lgwEPGW5IuX~d>$u+-_YIx%xS2y{zq0uO3)xSX8}GA8+|XeU0la1QE1L~m zo|30j`)Lw4)PrAj&s}E2vdIA7K#F6O8t)BB+)RhAGhLH5|Jm#pj5SE5@x_Gj5(y=V z${;DpT%Q6Lk(6gfIKGIa;K>z?^LI!v8fz1hoX}MSPhvqLp~)h}t6xF3es4+g$6Jwt z1wIunERSG3dF_8|$eOaMh3!99w#xY|hCRtLQ%fW;Yz*x_mQ6SStNuiH!jSCV1jI9ZhT zJQ9SOmc4^r_?LjMX#s$^PfwT8`7va_AuYRzdsseftF8n9upW55%t1J&p13pwmE4D9 z^)vw#aBBb&j3SXmJF5H%@GO^yYMB5Eo&=`@49Gf1d?Q06E$2UvDaa4Nu{ z%poD?Zy|?IDsckoMX6D0K|&3E)e}spNLT<|k-IQnXy7&Z<8J zzW<5|prL|7I0Af=@WG7JNT}M2NST!(eKe2h^nwDc>S1+T6Z%5MHtwIiATu0>-UBoJY zYM`5FyNLDDHd6<*>brHc4h;IP31DeD@DDFbQ~L!H=()`VP@1hswDCj@7=0Ys*C;OL z*z4H8x)i`X2X#h2l0w4|tHY|lME~}&{N6!b3jke`^#i}f??7s$+IzqwNEvsR)4B&J z9bQ)V0w|m)ZbFWx4_2Y!UqCj3dLk?x`&c^A)C91IC$U2Z`Y?Vui$b?Ez>k2>Ah~?Y zDU`9(1Q4Bdzys=Hp08Rq8^~QdSMYrk$Zp^Lc$8=LV0%5eg5zYP&boWl(R95ozcSjI zxH8gc-q17Ja!8=+n@H~6LH&2!>;{gqP;;TCUBOAxf@~CZs>?T9FiD%yC&xIl-8_u! z7gUP<$f@hDdT<3BORo;{#GG>1O1xDsN7X(PHWc+s6IO!HFbu;m48t&tp!^@zrY~HH Sm!w(%0000 diff --git a/UI/forms/images/settings/advanced.svg b/UI/forms/images/settings/advanced.svg index 67a598405..27fdfc84f 100644 --- a/UI/forms/images/settings/advanced.svg +++ b/UI/forms/images/settings/advanced.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/forms/images/settings/audio.svg b/UI/forms/images/settings/audio.svg index 19b375fb0..2cbca0005 100644 --- a/UI/forms/images/settings/audio.svg +++ b/UI/forms/images/settings/audio.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/forms/images/settings/general.svg b/UI/forms/images/settings/general.svg index d3877dcef..35212805c 100644 --- a/UI/forms/images/settings/general.svg +++ b/UI/forms/images/settings/general.svg @@ -1,61 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - + diff --git a/UI/forms/images/settings/hotkeys.svg b/UI/forms/images/settings/hotkeys.svg index 89712ade5..9a406bb85 100644 --- a/UI/forms/images/settings/hotkeys.svg +++ b/UI/forms/images/settings/hotkeys.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/forms/images/settings/output.svg b/UI/forms/images/settings/output.svg index e8a1f1c8a..a26cd0c56 100644 --- a/UI/forms/images/settings/output.svg +++ b/UI/forms/images/settings/output.svg @@ -1,5 +1,5 @@ - - + + diff --git a/UI/forms/images/settings/stream.svg b/UI/forms/images/settings/stream.svg index f89a7052a..6474c0686 100644 --- a/UI/forms/images/settings/stream.svg +++ b/UI/forms/images/settings/stream.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/forms/images/settings/video.svg b/UI/forms/images/settings/video.svg index 3671fd041..f278de5cc 100644 --- a/UI/forms/images/settings/video.svg +++ b/UI/forms/images/settings/video.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/UI/forms/images/sound.ico b/UI/forms/images/sound.ico deleted file mode 100644 index c7b86de5d40495ec25c4ff2a394f70f8cd7b7441..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmb7?ZAep57{_mK1QjL-`&I~js4u}RDCkQeSTF+%vA&2nYcxv*CB;^$n>k-{>Rip2 zyu;Zxw|RA&Zo8?NG6RRErlwhGENdS^%%LM{r^aGk^1Fs57{>mEkh$l8kzKp-L(9ZG|J+CoPSMx3V)A?Ti_! zOY-J7!EZ+mS79fkPs~hDoi8rThYni{Xvzvc^L#==LK*t8e7wr;LVu6BL7j5#O46r1 zSq`X5i@<4TKvSCkh1UT9E0IVlFpeQPu~@vj`H@CzOK9`-<+)x_=D-`fpjzIZ+WmWHZdYxwa|XIJXg#UZSHxzpu<@sUAz z_ht(G?`NUMZs7P;_jixKKT;Q-=b+#3Kg_c10ViY9wlqKHYM&S#f{(r#c;>eLCORDC z|HY8AM?^#vU>ru0Ylo}NY#@C%(BBKbnQ7>1)dzSD@_pDdDvY`Q;qz;)v(4-z=OE{2 zt-7E5x=17{L4Upec0=95e~X(891h3cm!pG27P@+TBV^??MJ?m> Y9;c|jC{#smJPU9wh?-^85{9sU0Jfi;_W%F@ diff --git a/UI/forms/images/sound_muted.ico b/UI/forms/images/sound_muted.ico deleted file mode 100644 index e68529b68ae162fdf051cf9256e642856d7c0d5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmb7BYe>nU6~YbFE^6sYBaCWRXcvRBqAa^e8EI1MVr5#H z*Ujm-P3M=HIp-x?UYpiR4Wk_NBg#glPWJR_{TNh(-k0Y+=Y7s|4(D(vY67{owiJ2i zQ1O!~icL|JCjp@d^NS~j;*r?@96Ilw@c7X@!}4X~A9i*PhM6-P4fgg*m5WQMz{yE% zv6`YFcl+Aa*N0qP+p%hu77-B|eNJRVS<*Vy%}pn9cGiN+)phv!^^e%um8*n8;k2SVqTQM4DSJh!$@@2M z2>o<0VGq`BEY{sk2_Nph<6IqcWr( zJMitu{#XR~dgH{Qc%+<4LRxAH_U)}kc-S*++1!HQpk{=w>rnXnYpllRoj0#C+`&OR z;@}`xDWwmF>B4M8hOI_n&NbY=A;N>ZS-6}bL-NTUtPj^>^Cq<^B&6Aq$E&mU@nOQ< z-RnNMxU?AE+@ylRPWABT_pgu;9}8Wp8fB6~Fy%DrYN~N5y%Fcm^&v8%4Ss(0dT;M1 z`V}i0MgjwyjSCl+qoP4X${C6X4KZbjE)0|2N2`=_ylB(l?VFbvc-My- zS^luup8s$GxDE^q%x4&8c7?Psv!o~wV?AiwpW{P+FB&Q(#y^rQ5X!RR{BpVkPwQ*Z z->bu;(%c^wQVpX}kLAnqZ-25N{bxunmrw6% o*E|>JTz&B`k!b=&jgnw9fy!LOGW!q>6-ZHM2!;qof5SxVPih00d;kCd diff --git a/UI/forms/images/unlocked.svg b/UI/forms/images/unlocked.svg new file mode 100644 index 000000000..33641a31c --- /dev/null +++ b/UI/forms/images/unlocked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/UI/forms/images/unlocked_mask.png b/UI/forms/images/unlocked_mask.png deleted file mode 100644 index 192be789c8bed7b49d434a2ddaddfecb6b71d865..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtn~Z><9o-U3d7N^f%+UVt+$iw>JeO$IH z*SWi*bGY^LUS1Iwh^g(^=Xc%CU85uUIbUqd(TyBI7oYOIJ^wZ6WdL*Jq{AmIJuON@ za*v+bbHMhU)ES}kf*%8uUdMOH8yvL0XK*Z8dPCmKx?aIJgZ!e#*=P3Xe%!lBKrq{f z`%-vKQpZ(AF}_<@dP|2z0!WyL?I nfPV+YxBYmxBP#qq%SYxLw^Ral-g$l$=mQ2%S3j3^P6{0VF-P{W_)eq|Mn|Z9ulClE$`?1aN8lLs1mh*}+GWUf6yv2}!%TPR{Rz0pK7< z2k;AcUl|98h#MdQ-)eg%DJAuGpe#!PPisrFh*+%RB4R1&i*53^+lJwd07;67cP*K^ z$t(fLc7FzPZFQDfz4R_ZcQxF*5v7zyz{?uOw?(!xe+G>5`n9APu*{f~h?uu!U^}7vWCTQSn0FNeRNLDtD{YykdcmO`N300000NkvXXu0mjfc3s>m diff --git a/UI/forms/images/unmute.png b/UI/forms/images/unmute.png deleted file mode 100644 index e849e3e8b92031551388a28c19b9d2e96e82a601..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmV+@0oVSCP)TQ)#?@d4p8@@ySj$i@VOgUCD6iSvjnC?c_e zV+e!D!##w0n12X>bpvJiz$Z%317R3OZVd=z8A1p(5O(}D&;nr&h4{lu&<2WvG_VRG zgjxtYUKgfHVvFX=tn-DAv9VQQaj#L8d$&vvM>wb6d87=vynv>XaF);kh^r&Igb6; zJUJ!WXK(lUx>=5+-u$fT=GU894*fq>62`RiU6Uf2I#Ka+1hU(0^^yl-9?o)`a{@$#*0&-MJy7Em?so5ODJNRP{bsmh`!>euFp|z#nDZlt@qekY^mkAAJ?*f z#b1j#ww6-)`}Ia}_hai($X|MbP1^W35Q zZ7k2V{-j74PkAsyI;Zu14Cl6!&n(h^lyb%`yUDTtrclnLK-qt9%(Z5k1w1$W_q;dE kd3A*9;&x`_U}j+W!%(|sPoSA>rXNV$)78&qol`;+05R#&%K!iX diff --git a/UI/forms/images/up.svg b/UI/forms/images/up.svg new file mode 100644 index 000000000..758bb33de --- /dev/null +++ b/UI/forms/images/up.svg @@ -0,0 +1 @@ + diff --git a/UI/forms/images/visible.svg b/UI/forms/images/visible.svg new file mode 100644 index 000000000..26b604e02 --- /dev/null +++ b/UI/forms/images/visible.svg @@ -0,0 +1 @@ + diff --git a/UI/forms/images/visible_mask.png b/UI/forms/images/visible_mask.png deleted file mode 100644 index 67e832672d6943a6a6bb904a5ee4bbc51b186594..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6sy$sCLp09My|_`Z*@4F;@T^Qq zhy&{thceL%;-(iEt_E;03LbPl-&pwIz_T39%Qc>>Lp$C}?q^#2P1qn}?t?8-_ZrW! ziA8Q}@cqtI#V*mR!l`WWMaksbYHOdaB%$k5VujPrpP0ndr4oO2C)1ADLhVhD&TuVW ewdUXV+57>f0R=9Pe|rO+!QkoY=d#Wzp$PyM$3vO` diff --git a/UI/forms/images/visible_mask_2x.png b/UI/forms/images/visible_mask_2x.png deleted file mode 100644 index 540180fdd560e9f12d9384681372c897d6fcac3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5m^kh={g8AI%&+V01C2~c>21sKjIK);^9(da@)kfz-Zv<;uzv_{Oy#zU55e$TK%0w zxJ= zve6}@FuZNwv@EH=HkCV<6lVG)pFCY^v}4({x?a)JHU6cXlY=-XzY>b^{SqO4N9z1V zm**1JIb3PZ&!-#O?e)-)cq(4AOuXj#dxi5dQpQr39=zLKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdtoOS3j3^P63!h8 diff --git a/UI/forms/obs.qrc b/UI/forms/obs.qrc index 8d7b9f3be..fb5fb6557 100644 --- a/UI/forms/obs.qrc +++ b/UI/forms/obs.qrc @@ -1,31 +1,19 @@ - images/mute.png - images/unmute.png - images/refresh.png + images/mute.svg + images/refresh.svg images/no_sources.svg - images/configuration21_16.png - images/configuration21_16_2x.png - images/invisible_mask.png - images/invisible_mask_2x.png - images/visible_mask.png - images/visible_mask_2x.png - images/list_remove.png - images/add.png - images/down.png - images/editscene.png - images/live.png - images/properties.png - images/properties_2x.png - images/up.png + images/minus.svg + images/plus.svg + images/down.svg + images/up.svg images/obs.png images/tray_active.png - images/locked_mask.png - images/locked_mask_2x.png - images/unlocked_mask.png - images/unlocked_mask_2x.png - images/collapse.png - images/expand.png + images/expand.svg + images/unlocked.svg + images/locked.svg + images/invisible.svg + images/visible.svg images/settings/output.svg diff --git a/UI/source-tree.cpp b/UI/source-tree.cpp index 95e774fb7..9750df479 100644 --- a/UI/source-tree.cpp +++ b/UI/source-tree.cpp @@ -60,12 +60,12 @@ SourceTreeItem::SourceTreeItem(SourceTree *tree_, OBSSceneItem sceneitem_) vis = new VisibilityCheckBox(); vis->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); - vis->setMaximumSize(16, 16); + vis->setFixedSize(16, 16); vis->setChecked(obs_sceneitem_visible(sceneitem)); lock = new LockedCheckBox(); lock->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); - lock->setMaximumSize(16, 16); + lock->setFixedSize(16, 16); lock->setChecked(obs_sceneitem_locked(sceneitem)); label = new QLabel(QT_UTF8(name)); @@ -79,10 +79,11 @@ SourceTreeItem::SourceTreeItem(SourceTree *tree_, OBSSceneItem sceneitem_) #endif boxLayout = new QHBoxLayout(); - boxLayout->setContentsMargins(1, 1, 2, 1); + boxLayout->setContentsMargins(1, 1, 1, 1); boxLayout->setSpacing(1); boxLayout->addWidget(label); boxLayout->addWidget(vis); + boxLayout->setSpacing(2); boxLayout->addWidget(lock); #ifdef __APPLE__ /* Hack: Fixes a bug where scrollbars would be above the lock icon */ From 21a32def3553ffafc23b2cb4925aa0edbdef0846 Mon Sep 17 00:00:00 2001 From: Clayton Groeneveld Date: Sat, 20 Apr 2019 09:08:36 -0500 Subject: [PATCH 2/2] UI: Simplify locked/visibility checkboxes --- UI/locked-checkbox.cpp | 42 -------------------------------------- UI/locked-checkbox.hpp | 12 ----------- UI/visibility-checkbox.cpp | 42 -------------------------------------- UI/visibility-checkbox.hpp | 12 ----------- 4 files changed, 108 deletions(-) delete mode 100644 UI/locked-checkbox.cpp delete mode 100644 UI/visibility-checkbox.cpp diff --git a/UI/locked-checkbox.cpp b/UI/locked-checkbox.cpp deleted file mode 100644 index 2d0d688ed..000000000 --- a/UI/locked-checkbox.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include -#include -#include "locked-checkbox.hpp" - -#include - -LockedCheckBox::LockedCheckBox() : QCheckBox() -{ - QString lockedFile; - QString unlockedFile; - if (devicePixelRatio() >= 2) { - lockedFile = ":/res/images/locked_mask_2x.png"; - unlockedFile = ":/res/images/unlocked_mask_2x.png"; - } else { - lockedFile = ":/res/images/locked_mask.png"; - unlockedFile = ":/res/images/unlocked_mask.png"; - } - lockedImage = QPixmap::fromImage(QImage(lockedFile)); - unlockedImage = QPixmap::fromImage(QImage(unlockedFile)); - setMinimumSize(16, 16); - - setStyleSheet("outline: none;"); -} - -void LockedCheckBox::paintEvent(QPaintEvent *event) -{ - UNUSED_PARAMETER(event); - - QPixmap &pixmap = isChecked() ? lockedImage : unlockedImage; - QImage image(pixmap.size(), QImage::Format_ARGB32); - - QPainter draw(&image); - draw.setCompositionMode(QPainter::CompositionMode_Source); - draw.drawPixmap(0, 0, pixmap.width(), pixmap.height(), pixmap); - draw.setCompositionMode(QPainter::CompositionMode_SourceIn); - draw.fillRect(QRectF(QPointF(0.0f, 0.0f), pixmap.size()), - palette().color(foregroundRole())); - - QPainter p(this); - p.drawPixmap(0, 0, 16, 16, QPixmap::fromImage(image)); -} diff --git a/UI/locked-checkbox.hpp b/UI/locked-checkbox.hpp index 8510f4668..0eb2d82ab 100644 --- a/UI/locked-checkbox.hpp +++ b/UI/locked-checkbox.hpp @@ -1,19 +1,7 @@ #pragma once #include -#include - -class QPaintEvernt; class LockedCheckBox : public QCheckBox { Q_OBJECT - - QPixmap lockedImage; - QPixmap unlockedImage; - -public: - LockedCheckBox(); - -protected: - void paintEvent(QPaintEvent *event) override; }; diff --git a/UI/visibility-checkbox.cpp b/UI/visibility-checkbox.cpp deleted file mode 100644 index d80cab2d4..000000000 --- a/UI/visibility-checkbox.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include -#include -#include "visibility-checkbox.hpp" - -#include - -VisibilityCheckBox::VisibilityCheckBox() : QCheckBox() -{ - QString checkedFile; - QString uncheckedFile; - if (devicePixelRatio() >= 2) { - checkedFile = ":/res/images/visible_mask_2x.png"; - uncheckedFile = ":/res/images/invisible_mask_2x.png"; - } else { - checkedFile = ":/res/images/visible_mask.png"; - uncheckedFile = ":/res/images/invisible_mask.png"; - } - checkedImage = QPixmap::fromImage(QImage(checkedFile)); - uncheckedImage = QPixmap::fromImage(QImage(uncheckedFile)); - setMinimumSize(16, 16); - - setStyleSheet("outline: none;"); -} - -void VisibilityCheckBox::paintEvent(QPaintEvent *event) -{ - UNUSED_PARAMETER(event); - - QPixmap &pixmap = isChecked() ? checkedImage : uncheckedImage; - QImage image(pixmap.size(), QImage::Format_ARGB32); - - QPainter draw(&image); - draw.setCompositionMode(QPainter::CompositionMode_Source); - draw.drawPixmap(0, 0, pixmap.width(), pixmap.height(), pixmap); - draw.setCompositionMode(QPainter::CompositionMode_SourceIn); - draw.fillRect(QRectF(QPointF(0.0f, 0.0f), pixmap.size()), - palette().color(foregroundRole())); - - QPainter p(this); - p.drawPixmap(0, 0, 16, 16, QPixmap::fromImage(image)); -} diff --git a/UI/visibility-checkbox.hpp b/UI/visibility-checkbox.hpp index 3112c5db1..ff21df2c4 100644 --- a/UI/visibility-checkbox.hpp +++ b/UI/visibility-checkbox.hpp @@ -1,19 +1,7 @@ #pragma once #include -#include - -class QPaintEvernt; class VisibilityCheckBox : public QCheckBox { Q_OBJECT - - QPixmap checkedImage; - QPixmap uncheckedImage; - -public: - VisibilityCheckBox(); - -protected: - void paintEvent(QPaintEvent *event) override; };