From 5c5aad09ce754bbfefc36ad74a9fa52214595950 Mon Sep 17 00:00:00 2001 From: zhaowenlan1779 Date: Thu, 16 Aug 2018 16:39:23 +0800 Subject: [PATCH] qt_themes: add two colorful themes (#4004) * qt_themes: add two colorful themes These two colorful themes are based on the Default and Dark themes, and contain icons that are colored rather than black and white. These icons come from https://icons8.com and they have been slightly revised by me. I'm pretty sure I was licensed to use them for Citra. * Add license for icons --- dist/license.md | 10 +++ .../colorful/icons/16x16/connected.png | Bin 0 -> 362 bytes .../colorful/icons/16x16/disconnected.png | Bin 0 -> 784 bytes dist/qt_themes/colorful/icons/16x16/lock.png | Bin 0 -> 330 bytes .../colorful/icons/256x256/plus_folder.png | Bin 0 -> 4643 bytes .../colorful/icons/48x48/bad_folder.png | Bin 0 -> 15494 bytes dist/qt_themes/colorful/icons/48x48/chip.png | Bin 0 -> 582 bytes .../qt_themes/colorful/icons/48x48/folder.png | Bin 0 -> 460 bytes dist/qt_themes/colorful/icons/48x48/plus.png | Bin 0 -> 496 bytes .../colorful/icons/48x48/sd_card.png | Bin 0 -> 680 bytes dist/qt_themes/colorful/icons/index.theme | 14 +++++ dist/qt_themes/colorful/style.qrc | 17 +++++ dist/qt_themes/colorful/style.qss | 4 ++ .../colorful_dark/icons/16x16/lock.png | Bin 0 -> 401 bytes .../qt_themes/colorful_dark/icons/index.theme | 8 +++ dist/qt_themes/colorful_dark/style.qrc | 59 ++++++++++++++++++ license.txt | 36 +++++++---- src/citra_qt/ui_settings.h | 6 +- 18 files changed, 139 insertions(+), 15 deletions(-) create mode 100644 dist/qt_themes/colorful/icons/16x16/connected.png create mode 100644 dist/qt_themes/colorful/icons/16x16/disconnected.png create mode 100644 dist/qt_themes/colorful/icons/16x16/lock.png create mode 100644 dist/qt_themes/colorful/icons/256x256/plus_folder.png create mode 100644 dist/qt_themes/colorful/icons/48x48/bad_folder.png create mode 100644 dist/qt_themes/colorful/icons/48x48/chip.png create mode 100644 dist/qt_themes/colorful/icons/48x48/folder.png create mode 100644 dist/qt_themes/colorful/icons/48x48/plus.png create mode 100644 dist/qt_themes/colorful/icons/48x48/sd_card.png create mode 100644 dist/qt_themes/colorful/icons/index.theme create mode 100644 dist/qt_themes/colorful/style.qrc create mode 100644 dist/qt_themes/colorful/style.qss create mode 100644 dist/qt_themes/colorful_dark/icons/16x16/lock.png create mode 100644 dist/qt_themes/colorful_dark/icons/index.theme create mode 100644 dist/qt_themes/colorful_dark/style.qrc diff --git a/dist/license.md b/dist/license.md index b81337494..bd3ffb4f1 100644 --- a/dist/license.md +++ b/dist/license.md @@ -24,5 +24,15 @@ qt_themes/qdarkstyle/icons/48x48/chip.png | CC0 1.0 | Designed by BreadFish64 fr qt_themes/qdarkstyle/icons/48x48/folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC0 1.0 | Designed by BreadFish64 from the Citra team +qt_themes/colorful/icons/16x16/connected.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful/icons/16x16/disconnected.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful/icons/48x48/plus.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com +qt_themes/colorful_dark/icons/16x16/connected.png | CC BY-ND 3.0 | https://icons8.com diff --git a/dist/qt_themes/colorful/icons/16x16/connected.png b/dist/qt_themes/colorful/icons/16x16/connected.png new file mode 100644 index 0000000000000000000000000000000000000000..d6052f1a09a9a828bf8d43ad1827d4d9d9cbae0f GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!T+8vjv*HQ$r4owhbC=p{o8&0tK-fV$N!7I zG75{Wk2Xy_x$CCz^fmhIm;O7pIV>$~UU0|jc-Os|kq&3=6=xmz@v22N`_uxjg657l zK`STRITf1dYARnXzHVnz%7Op?j%KGjO-*Ef=z4Y2!JVP;O`o&4nm=o8Um(r&<$utM zpf?GRCYAmx4Sx2X_vGqd?TH*0tQ9I(1o>RpUa?m2%z2>1TX%C75w(D&HyAH45$5j4PH{Kc+44&>bodk5m->}@RC7fLxAcI z#!1f(d3s;Z@QK)^x266fTk#5$LRWfRG*xU)HfORdVHeMwzg(YsI)*YB#UnSgU(w<`ka z({=BSp$~)N!i*09^m-ixwy0%@^JLsMc);uRIsiZ) zuLI9}Ao~5H-7!{nzHnbt1h`(`n!P@CZF^;XOBDdj2{VlYef>Elg$2zM_TEx)f%gM| zUZ=yD!}+%K$gbM}Kq7aFCTBFu)Nxkps?w_aZPdD~J>>xKvH4(vCB=E_n|RDx~z-v`(u{Ck(>^ z0K?FTjg5ud&4Z?C%4}L$RQtHS76>VRIGUfI`z*_{6mBpK4XsuKH!pyuX^Kna4xOuM z+^h(UdmYV_Q&T;Qn}iUk)hg+yeWcSi;>fQo&hJ(N2*<9-;|zukPUl1ymtfdJ7=}o) zEICHUE|eYJU8xid7X<*9>zeX|uHNTr)5hE=LNY|r-*L8JZ`1$60Pq`<)BU@nD5;_V O0000ROSwGo6XvJPv zzlZ+oGn97-o-r-r&$VfgJ0KmA>2yufc!z{~qGQbm$8Tq=^*@-iIzITdZ+^wR?aTAG zy=^&a8Kl52V{ys6@63-oYYcdPN9cVtn5|nNv)ozk?u}LA z|1=jF*xy&`&-?QyY@&mH_rsJ||S^eTg=tDnm{r-UW|<05{U literal 0 HcmV?d00001 diff --git a/dist/qt_themes/colorful/icons/256x256/plus_folder.png b/dist/qt_themes/colorful/icons/256x256/plus_folder.png new file mode 100644 index 0000000000000000000000000000000000000000..760fe6245e72cd0144b4dd198465db6c902ad400 GIT binary patch literal 4643 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 N&`{A*F1u|N`hPMhH%|Zn literal 0 HcmV?d00001 diff --git a/dist/qt_themes/colorful/icons/48x48/bad_folder.png b/dist/qt_themes/colorful/icons/48x48/bad_folder.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ab7a1f635d6c2aaee7ce3490ecbf0082d34bba GIT binary patch literal 15494 zcmeI3e{2+G8po%F0G9AWW_E!ci(Q` zG*RO}?`C&)pZEJd&olFR-{;x+XP#(WS~sQQ)(VQErZm+1n&3BUd?rnR#}(y+kHfDU z;`J*vikkYa@hRJW@6=fo<+`G@1oVJ^i6E&_izurhU`a*ea5hD`=cVGJ6b8B}1lpBY zt@-NPN6jWht~IZ4_*sA43p$kgo&;#_S=u7?ge8}3p697>rvw-v3Utwwibi6Zkg7GO z;|lP%G0d1v=_z`+*1W(-XbSinOp-L?nG`vc!N0h=Q1|K|ijfU%W%rRjorEC1qY7H8EThzdxV5%FW~VA-M|nVCoozbY$j-6djJYXojsjG~!n3|K$1sEcEYQaraPjw}gn zY9cD?9wjQa11278cQb{-qM7+!C3w|{nt-PTJT^B|YPiTNz0-t-n5K&{2{iaTaKNG{ zvLHLe5HE!!TCzzlT9oY^?X&}UkQ^e*+hnVYv!@~Y{l)GhLi<#y)2J30I@4HWRf6FQ zr)34K!)lY-Xcx=1(HsYyvOKNEGh8yeot82<$kpQ0Q!-qRfQhk%3qI#+*YU5)R zHTWI;zD!Y_@Tt-MAVmo~C~Btq?3(xPr>OE74ZZ~}ssCI#yDWSre#^vb7k6Ksf4C(% z{lix!_M=6WCpY)qwC&u$k>h=j4pd#5b$b4Q=~VB{T{|xSE$0QTRZ!` zci(lx=O4W?V{?Eyc&Xy^|KCNw$eVA!wr%yd{=v7VH&F9Vl{;16(Bju_zBXijy{WwQ z#Kx-jTUXPzgLfbKV%Ld-y=5;xNG+-U>eCzR>q2uMJXAR?P<>(lx{V#nuDm-gaqZvF zPhwBZp7wWT&{S@s^6&3v9ozOs&6@Z7*4@TVo^*@*P}!>G!F?4Iwj7u_`IA|_mrgp$ z=d1h6&hMBz_1OBx$^Y2$DIb21N*&l63@;iV3|Ac9^XH*)&;OyPap%Nw*VorLlfUdA zoG=veKi+ljeDag~&U?d0A2>5OKEC(Ka}U{GezWc!%jQFCyy3UMZa?-y|79xj!8i8z zKf9;z6n~gmwRPZs(sugn(-U7?zIu;~ud9s3g4YL|rDf1R^*r*x+E z7qd64+j4v$`S9V-_;7IFo6{B_dhW_sJ#};5s5%;4+|^vUYwf>gbluU{)Vuxx_klZZ z^vU5T*EW4HPO6;vw=bQ)-&(zU-^sq)4xTuEa!TsItE8*GWxL+#tvuGcecIj)`X5*R s^QP0D`*wfPI<#j7RW|A3*VLll%v>_i@YJ7-CxsgpF7@sIb@0*e0i}o=LjV8( literal 0 HcmV?d00001 diff --git a/dist/qt_themes/colorful/icons/48x48/chip.png b/dist/qt_themes/colorful/icons/48x48/chip.png new file mode 100644 index 0000000000000000000000000000000000000000..6fa15899950c576b742d4bf340c40296d2673583 GIT binary patch literal 582 zcmV-M0=fN(P)7Hv$NlKH@gFOfWh#;p`a7> zHS|=Xi|Jg_aj&Q#lU501AZa|+UAa*$TBPeBeF7jKv8Dk59qm|`?ej*L3uX^12YbBVuC(8l1+gV$k**_t@c>ZJWBZB=;`hL$Y!X2M?Al&7anv=x5Djc` zF{wX=?AZ&m9kLRimbq{p`;P&?xFf(F2AivLfXd3&7a92KYV;p~>3ie@1>}zj8+*Yu zi1xtn5y8a+fD4SCBnjp`f!P{6Z7!DRe2Uhd-S73pU@#lExS?7!1ks16+4{ U)=xYDaR2}S07*qoM6N<$f@LZ5LI3~& literal 0 HcmV?d00001 diff --git a/dist/qt_themes/colorful/icons/48x48/folder.png b/dist/qt_themes/colorful/icons/48x48/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..498de4c62940559bcfa3c609f7e7474ee8d86ae3 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!hD1*n$B+!?x05z{F*}O5F27(eFndMoj+0rh z&40xH>tws))HAoNDb{TF1AmTbg1vvM{SK{ta!*3~yJ+!)lAVWV&RycPFhE13E=fG| z{;|wSu|F(+sy(|uFZrH++0<`EXXd#6OY88yk-96naQ3a=s-IZ*Mcjyg^Hped$L!qi z%Nu{^ytsFDZ`S68H$NYoZToJXVxeu_-lz9MzHG4Dnwk1|k- z)~iH;!ZoYKb0iMl`PS*vyLEB3S>J-KUs+~KW%p^nb}KG(nEz~9`TJGQDeI0eyQ*M+ z{q3idHxmD6Mc3=>-?Mj)jN*D=sBp1PxMbenmA6-}RqQ-41{geD{an^LB{Ts5V+X_j literal 0 HcmV?d00001 diff --git a/dist/qt_themes/colorful/icons/48x48/plus.png b/dist/qt_themes/colorful/icons/48x48/plus.png new file mode 100644 index 0000000000000000000000000000000000000000..bc2c47c91a761228dc4ebdc8df8713119d5fec3a GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!hE`7($B+!?w=*_+9dQt7YhDl$6_Ks1@vuz! z4tGT43+sponOiYwj~k;{wQG4DkAwy2Zg3Lya~2uNf$D f9I999vSW~)A5gpS^PYHMEHQYx`njxgN@xNA;AYB_ literal 0 HcmV?d00001 diff --git a/dist/qt_themes/colorful/icons/48x48/sd_card.png b/dist/qt_themes/colorful/icons/48x48/sd_card.png new file mode 100644 index 0000000000000000000000000000000000000000..29be71a0d4307c9653e22a31e77e43e87a907beb GIT binary patch literal 680 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq zm==RDW6GWQPN1MtHtq;Vd>H;fm=>1H|)A$7QK1qM}^gEEoP_8wuqkjd|Lj#mhYU6`YOzG z3OshJ?>c%a*Wj0cLaz!lBLfRd$Bl0)O(AZoA2_|2 zV@P=GEjIbIxbWIwx0MehCOz%?!g2CYInzR>!=Il@rdhfl;!oqh5W}o8|%MTCER?c{{{K)qQ-#P03e7iG|aY~7;VdMFE zKd)C6CoK!*SN^s;VEIDUki|rx&;Pjux^xdRKfQmY^1#l7q~L9Oq6;|U%=helTax6e zzT$mev19znYfG8le-f5Hw0{4G@7bZM|IJt)yuZHcj(x?xdHc7iW^>=wc`z;R9*bbP v;)UrshXgoQ?Ge;jBerh)oi~M#elm*noME_lluHAcsu(<7{an^LB{Ts5yq7Sw literal 0 HcmV?d00001 diff --git a/dist/qt_themes/colorful/icons/index.theme b/dist/qt_themes/colorful/icons/index.theme new file mode 100644 index 000000000..b452aca16 --- /dev/null +++ b/dist/qt_themes/colorful/icons/index.theme @@ -0,0 +1,14 @@ +[Icon Theme] +Name=colorful +Comment=Colorful theme +Inherits=default +Directories=16x16,48x48,256x256 + +[16x16] +Size=16 + +[48x48] +Size=48 + +[256x256] +Size=256 diff --git a/dist/qt_themes/colorful/style.qrc b/dist/qt_themes/colorful/style.qrc new file mode 100644 index 000000000..dcf8b06e8 --- /dev/null +++ b/dist/qt_themes/colorful/style.qrc @@ -0,0 +1,17 @@ + + + icons/index.theme + icons/16x16/connected.png + icons/16x16/disconnected.png + icons/16x16/lock.png + icons/48x48/bad_folder.png + icons/48x48/chip.png + icons/48x48/folder.png + icons/48x48/plus.png + icons/48x48/sd_card.png + icons/256x256/plus_folder.png + + + style.qss + + diff --git a/dist/qt_themes/colorful/style.qss b/dist/qt_themes/colorful/style.qss new file mode 100644 index 000000000..413fc81da --- /dev/null +++ b/dist/qt_themes/colorful/style.qss @@ -0,0 +1,4 @@ +/* + This file is intentionally left blank. + We do not want to apply any stylesheet for colorful, only icons. +*/ diff --git a/dist/qt_themes/colorful_dark/icons/16x16/lock.png b/dist/qt_themes/colorful_dark/icons/16x16/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..32c505848ebc0ac4c84f8b544e94d077270297f4 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?- zhak*YAR(g%WJs2{MwA5SrEak- z(Yth#q2FN#0oVHplb3L;y{vRmU?=wu<3*1dWLOjf-ZdN%e8456z{F)G{`in6E4zb( zsLw-%>gi08EH^83Kd!!b=8t`Sn)pA?pQ{(Fa#t$iN$Ars>l4@DZ z)p0^Xf#-0)mH6>OzJ#@Rv%Xw!+^eF|%AT;j*!}ck`zHZ@6~CV@5K2=2S^Z?ouO|z3 zHa)OBsk?XW`H07=?br82pMI}pr|-zpbnImnmydeMpR00AhtK92t+{)Et1q`cL3ocAD?=SeT-Z%G3H8A)XJYD@<);T3K0RZTKqN4x+ literal 0 HcmV?d00001 diff --git a/dist/qt_themes/colorful_dark/icons/index.theme b/dist/qt_themes/colorful_dark/icons/index.theme new file mode 100644 index 000000000..94d5ae8aa --- /dev/null +++ b/dist/qt_themes/colorful_dark/icons/index.theme @@ -0,0 +1,8 @@ +[Icon Theme] +Name=colorful_dark +Comment=Colorful theme (Dark style) +Inherits=default +Directories=16x16 + +[16x16] +Size=16 diff --git a/dist/qt_themes/colorful_dark/style.qrc b/dist/qt_themes/colorful_dark/style.qrc new file mode 100644 index 000000000..4b955998e --- /dev/null +++ b/dist/qt_themes/colorful_dark/style.qrc @@ -0,0 +1,59 @@ + + + icons/index.theme + ../colorful/icons/16x16/connected.png + ../colorful/icons/16x16/disconnected.png + icons/16x16/lock.png + ../colorful/icons/48x48/bad_folder.png + ../colorful/icons/48x48/chip.png + ../colorful/icons/48x48/folder.png + ../colorful/icons/48x48/plus.png + ../colorful/icons/48x48/sd_card.png + ../colorful/icons/256x256/plus_folder.png + + + + ../qdarkstyle/rc/up_arrow_disabled.png + ../qdarkstyle/rc/Hmovetoolbar.png + ../qdarkstyle/rc/stylesheet-branch-end.png + ../qdarkstyle/rc/branch_closed-on.png + ../qdarkstyle/rc/stylesheet-vline.png + ../qdarkstyle/rc/branch_closed.png + ../qdarkstyle/rc/branch_open-on.png + ../qdarkstyle/rc/transparent.png + ../qdarkstyle/rc/right_arrow_disabled.png + ../qdarkstyle/rc/sizegrip.png + ../qdarkstyle/rc/close.png + ../qdarkstyle/rc/close-hover.png + ../qdarkstyle/rc/close-pressed.png + ../qdarkstyle/rc/down_arrow.png + ../qdarkstyle/rc/Vmovetoolbar.png + ../qdarkstyle/rc/left_arrow.png + ../qdarkstyle/rc/stylesheet-branch-more.png + ../qdarkstyle/rc/up_arrow.png + ../qdarkstyle/rc/right_arrow.png + ../qdarkstyle/rc/left_arrow_disabled.png + ../qdarkstyle/rc/Hsepartoolbar.png + ../qdarkstyle/rc/branch_open.png + ../qdarkstyle/rc/Vsepartoolbar.png + ../qdarkstyle/rc/down_arrow_disabled.png + ../qdarkstyle/rc/undock.png + ../qdarkstyle/rc/checkbox_checked_disabled.png + ../qdarkstyle/rc/checkbox_checked_focus.png + ../qdarkstyle/rc/checkbox_checked.png + ../qdarkstyle/rc/checkbox_indeterminate.png + ../qdarkstyle/rc/checkbox_indeterminate_focus.png + ../qdarkstyle/rc/checkbox_unchecked_disabled.png + ../qdarkstyle/rc/checkbox_unchecked_focus.png + ../qdarkstyle/rc/checkbox_unchecked.png + ../qdarkstyle/rc/radio_checked_disabled.png + ../qdarkstyle/rc/radio_checked_focus.png + ../qdarkstyle/rc/radio_checked.png + ../qdarkstyle/rc/radio_unchecked_disabled.png + ../qdarkstyle/rc/radio_unchecked_focus.png + ../qdarkstyle/rc/radio_unchecked.png + + + ../qdarkstyle/style.qss + + diff --git a/license.txt b/license.txt index 1e693ac21..c23f25863 100644 --- a/license.txt +++ b/license.txt @@ -341,16 +341,26 @@ Public License instead of this License. The icons used in this project have the following licenses: -Icon Name | License | Origin/Author ---- | --- | --- -checked.png | Free for non-commercial use -connected.png | CC BY-ND 3.0 | https://icons8.com -disconnected.png | CC BY-ND 3.0 | https://icons8.com -failed.png | Free for non-commercial use -lock.png | CC BY-ND 3.0 | https://icons8.com -plus_folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team -bad_folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team -chip.png | CC0 1.0 | Designed by BreadFish64 from the Citra team -folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team -plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team -sd_card.png | CC0 1.0 | Designed by BreadFish64 from the Citra team +Icon Name (Themes they are used in) | License | Origin/Author +--- | --- | --- +checked.png | Free for non-commercial use +connected.png | CC BY-ND 3.0 | https://icons8.com +disconnected.png | CC BY-ND 3.0 | https://icons8.com +failed.png | Free for non-commercial use +lock.png | CC BY-ND 3.0 | https://icons8.com +plus_folder.png (Default, Dark) | CC0 1.0 | Designed by BreadFish64 from the Citra team +bad_folder.png (Default, Dark) | CC0 1.0 | Designed by BreadFish64 from the Citra team +chip.png (Default, Dark) | CC0 1.0 | Designed by BreadFish64 from the Citra team +folder.png (Default, Dark) | CC0 1.0 | Designed by BreadFish64 from the Citra team +plus.png (Default, Dark) | CC0 1.0 | Designed by BreadFish64 from the Citra team +sd_card.png (Default, Dark) | CC0 1.0 | Designed by BreadFish64 from the Citra team +plus_folder.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com +bad_folder.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com +chip.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com +folder.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com +plus.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com +sd_card.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com + +Note: +Some icons are different in different themes, and they are separately listed +only when they have different licenses/origins. diff --git a/src/citra_qt/ui_settings.h b/src/citra_qt/ui_settings.h index d8d1d7019..c0743de8e 100644 --- a/src/citra_qt/ui_settings.h +++ b/src/citra_qt/ui_settings.h @@ -16,9 +16,11 @@ namespace UISettings { using ContextualShortcut = std::pair; using Shortcut = std::pair; -static const std::array, 2> themes = { +static const std::array, 4> themes = { {std::make_pair(QString("Default"), QString("default")), - std::make_pair(QString("Dark"), QString("qdarkstyle"))}}; + std::make_pair(QString("Dark"), QString("qdarkstyle")), + std::make_pair(QString("Colorful"), QString("colorful")), + std::make_pair(QString("Colorful Dark"), QString("colorful_dark"))}}; struct GameDir { QString path;