yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #2898 from FearlessTobi/port-4004 

Port citra-emu/citra#4004: "qt_themes: add two colorful themes"
This commit is contained in:
bunnei 2019-10-03 21:34:40 -04:00 committed by GitHub
parent 9aac7fbc22 855e7237ff
commit c818728513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
license.txt
View File

@ -346,10 +346,19 @@ Icon Name | License | Origin/Author
checked.png | Free for non-commercial use checked.png | Free for non-commercial use
failed.png | Free for non-commercial use failed.png | Free for non-commercial use
lock.png | CC BY-ND 3.0 | https://icons8.com lock.png | CC BY-ND 3.0 | https://icons8.com
plus_folder.png | CC BY-ND 3.0 | https://icons8.com plus_folder.png (Default, Dark) | CC BY-ND 3.0 | https://icons8.com
bad_folder.png | CC BY-ND 3.0 | https://icons8.com bad_folder.png (Default, Dark) | CC BY-ND 3.0 | https://icons8.com
chip.png | CC BY-ND 3.0 | https://icons8.com chip.png (Default, Dark) | CC BY-ND 3.0 | https://icons8.com
folder.png | CC BY-ND 3.0 | https://icons8.com folder.png (Default, Dark) | CC BY-ND 3.0 | https://icons8.com
plus.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) | CC BY-ND 3.0 | https://icons8.com
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 plus.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com
sd_card.png | 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.

2
src/yuzu/uisettings.cpp
View File

@ -9,6 +9,8 @@ namespace UISettings {
const Themes themes{{ const Themes themes{{
{"Default", "default"}, {"Default", "default"},
{"Dark", "qdarkstyle"}, {"Dark", "qdarkstyle"},
{"Colorful", "colorful"},
{"Colorful Dark", "colorful_dark"},
}}; }};
Values values = {}; Values values = {};

2
src/yuzu/uisettings.h
View File

@ -24,7 +24,7 @@ struct Shortcut {
ContextualShortcut shortcut; ContextualShortcut shortcut;
}; };
using Themes = std::array<std::pair<const char*, const char*>, 2>; using Themes = std::array<std::pair<const char*, const char*>, 4>;
extern const Themes themes; extern const Themes themes;
struct GameDir { struct GameDir {