diff options
| -rw-r--r-- | license.txt | 33 | ||||
| -rw-r--r-- | src/yuzu/uisettings.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/uisettings.h | 2 |
3 files changed, 24 insertions, 13 deletions
diff --git a/license.txt b/license.txt index 2b858f9a7..bf5aec0e6 100644 --- a/license.txt +++ b/license.txt | |||
| @@ -341,15 +341,24 @@ Public License instead of this License. | |||
| 341 | 341 | ||
| 342 | The icons used in this project have the following licenses: | 342 | The icons used in this project have the following licenses: |
| 343 | 343 | ||
| 344 | Icon Name | License | Origin/Author | 344 | Icon Name | License | Origin/Author |
| 345 | --- | --- | --- | 345 | --- | --- | --- |
| 346 | checked.png | Free for non-commercial use | 346 | checked.png | Free for non-commercial use |
| 347 | failed.png | Free for non-commercial use | 347 | failed.png | Free for non-commercial use |
| 348 | lock.png | CC BY-ND 3.0 | https://icons8.com | 348 | lock.png | CC BY-ND 3.0 | https://icons8.com |
| 349 | plus_folder.png | CC BY-ND 3.0 | https://icons8.com | 349 | plus_folder.png (Default, Dark) | CC BY-ND 3.0 | https://icons8.com |
| 350 | bad_folder.png | CC BY-ND 3.0 | https://icons8.com | 350 | bad_folder.png (Default, Dark) | CC BY-ND 3.0 | https://icons8.com |
| 351 | chip.png | CC BY-ND 3.0 | https://icons8.com | 351 | chip.png (Default, Dark) | CC BY-ND 3.0 | https://icons8.com |
| 352 | folder.png | CC BY-ND 3.0 | https://icons8.com | 352 | folder.png (Default, Dark) | CC BY-ND 3.0 | https://icons8.com |
| 353 | plus.png (Default, Dark) | CC0 1.0 | Designed by BreadFish64 from the Citra team | 353 | plus.png (Default, Dark) | CC0 1.0 | Designed by BreadFish64 from the Citra team |
| 354 | plus.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com | 354 | sd_card.png (Default, Dark) | CC BY-ND 3.0 | https://icons8.com |
| 355 | sd_card.png | CC BY-ND 3.0 | https://icons8.com | 355 | plus_folder.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com |
| 356 | bad_folder.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com | ||
| 357 | chip.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com | ||
| 358 | folder.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com | ||
| 359 | plus.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com | ||
| 360 | sd_card.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com | ||
| 361 | |||
| 362 | Note: | ||
| 363 | Some icons are different in different themes, and they are separately listed | ||
| 364 | only when they have different licenses/origins. | ||
diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp index 7f7d247a3..43bad9678 100644 --- a/src/yuzu/uisettings.cpp +++ b/src/yuzu/uisettings.cpp | |||
| @@ -9,6 +9,8 @@ namespace UISettings { | |||
| 9 | const Themes themes{{ | 9 | const Themes themes{{ |
| 10 | {"Default", "default"}, | 10 | {"Default", "default"}, |
| 11 | {"Dark", "qdarkstyle"}, | 11 | {"Dark", "qdarkstyle"}, |
| 12 | {"Colorful", "colorful"}, | ||
| 13 | {"Colorful Dark", "colorful_dark"}, | ||
| 12 | }}; | 14 | }}; |
| 13 | 15 | ||
| 14 | Values values = {}; | 16 | Values values = {}; |
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h index c57290006..a8eaf5f8c 100644 --- a/src/yuzu/uisettings.h +++ b/src/yuzu/uisettings.h | |||
| @@ -24,7 +24,7 @@ struct Shortcut { | |||
| 24 | ContextualShortcut shortcut; | 24 | ContextualShortcut shortcut; |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | using Themes = std::array<std::pair<const char*, const char*>, 2>; | 27 | using Themes = std::array<std::pair<const char*, const char*>, 4>; |
| 28 | extern const Themes themes; | 28 | extern const Themes themes; |
| 29 | 29 | ||
| 30 | struct GameDir { | 30 | struct GameDir { |