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 000000000..d6052f1a0 Binary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/connected.png differ diff --git a/dist/qt_themes/colorful/icons/16x16/disconnected.png b/dist/qt_themes/colorful/icons/16x16/disconnected.png new file mode 100644 index 000000000..bacee3aeb Binary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/disconnected.png differ diff --git a/dist/qt_themes/colorful/icons/16x16/lock.png b/dist/qt_themes/colorful/icons/16x16/lock.png new file mode 100644 index 000000000..fd27069d8 Binary files /dev/null and b/dist/qt_themes/colorful/icons/16x16/lock.png differ 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 000000000..760fe6245 Binary files /dev/null and b/dist/qt_themes/colorful/icons/256x256/plus_folder.png differ 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 000000000..a7ab7a1f6 Binary files /dev/null and b/dist/qt_themes/colorful/icons/48x48/bad_folder.png differ 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 000000000..6fa158999 Binary files /dev/null and b/dist/qt_themes/colorful/icons/48x48/chip.png differ 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 000000000..498de4c62 Binary files /dev/null and b/dist/qt_themes/colorful/icons/48x48/folder.png differ 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 000000000..bc2c47c91 Binary files /dev/null and b/dist/qt_themes/colorful/icons/48x48/plus.png differ 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 000000000..29be71a0d Binary files /dev/null and b/dist/qt_themes/colorful/icons/48x48/sd_card.png differ 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 000000000..32c505848 Binary files /dev/null and b/dist/qt_themes/colorful_dark/icons/16x16/lock.png differ 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;