summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--license.txt33
-rw-r--r--src/yuzu/uisettings.cpp2
-rw-r--r--src/yuzu/uisettings.h2
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.
The icons used in this project have the following licenses:
-Icon Name | License | Origin/Author
---- | --- | ---
-checked.png | Free for non-commercial use
-failed.png | Free for non-commercial use
-lock.png | CC BY-ND 3.0 | https://icons8.com
-plus_folder.png | CC BY-ND 3.0 | https://icons8.com
-bad_folder.png | CC BY-ND 3.0 | https://icons8.com
-chip.png | CC BY-ND 3.0 | https://icons8.com
-folder.png | CC BY-ND 3.0 | https://icons8.com
-plus.png (Default, Dark) | CC0 1.0 | Designed by BreadFish64 from the Citra team
-plus.png (Colorful, Colorful Dark) | CC BY-ND 3.0 | https://icons8.com
-sd_card.png | CC BY-ND 3.0 | https://icons8.com
+Icon Name | License | Origin/Author
+--- | --- | ---
+checked.png | Free for non-commercial use
+failed.png | Free for non-commercial use
+lock.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 (Default, Dark) | CC BY-ND 3.0 | https://icons8.com
+chip.png (Default, Dark) | 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
+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
+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/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 {
const Themes themes{{
{"Default", "default"},
{"Dark", "qdarkstyle"},
+ {"Colorful", "colorful"},
+ {"Colorful Dark", "colorful_dark"},
}};
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 {
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;
struct GameDir {