diff --git a/dist/qt_themes/default/icons_light/16x16/checked.png b/dist/qt_themes/default/icons_light/16x16/checked.png new file mode 100644 index 000000000..3e017b715 Binary files /dev/null and b/dist/qt_themes/default/icons_light/16x16/checked.png differ diff --git a/dist/qt_themes/default/icons_light/16x16/connected.png b/dist/qt_themes/default/icons_light/16x16/connected.png new file mode 100644 index 000000000..73acf1df1 Binary files /dev/null and b/dist/qt_themes/default/icons_light/16x16/connected.png differ diff --git a/dist/qt_themes/default/icons_light/16x16/connected_notification.png b/dist/qt_themes/default/icons_light/16x16/connected_notification.png new file mode 100644 index 000000000..61f95ef02 Binary files /dev/null and b/dist/qt_themes/default/icons_light/16x16/connected_notification.png differ diff --git a/dist/qt_themes/default/icons_light/16x16/disconnected.png b/dist/qt_themes/default/icons_light/16x16/disconnected.png new file mode 100644 index 000000000..73961ed48 Binary files /dev/null and b/dist/qt_themes/default/icons_light/16x16/disconnected.png differ diff --git a/dist/qt_themes/default/icons_light/16x16/failed.png b/dist/qt_themes/default/icons_light/16x16/failed.png new file mode 100644 index 000000000..7c4047dd0 Binary files /dev/null and b/dist/qt_themes/default/icons_light/16x16/failed.png differ diff --git a/dist/qt_themes/default/icons_light/16x16/lock.png b/dist/qt_themes/default/icons_light/16x16/lock.png new file mode 100644 index 000000000..e247b2ed3 Binary files /dev/null and b/dist/qt_themes/default/icons_light/16x16/lock.png differ diff --git a/dist/qt_themes/default/icons_light/256x256/citra.png b/dist/qt_themes/default/icons_light/256x256/citra.png new file mode 100644 index 000000000..fb78d56c8 Binary files /dev/null and b/dist/qt_themes/default/icons_light/256x256/citra.png differ diff --git a/dist/qt_themes/default/icons_light/256x256/plus_folder.png b/dist/qt_themes/default/icons_light/256x256/plus_folder.png new file mode 100644 index 000000000..496978418 Binary files /dev/null and b/dist/qt_themes/default/icons_light/256x256/plus_folder.png differ diff --git a/dist/qt_themes/default/icons_light/48x48/bad_folder.png b/dist/qt_themes/default/icons_light/48x48/bad_folder.png new file mode 100644 index 000000000..421521c99 Binary files /dev/null and b/dist/qt_themes/default/icons_light/48x48/bad_folder.png differ diff --git a/dist/qt_themes/default/icons_light/48x48/chip.png b/dist/qt_themes/default/icons_light/48x48/chip.png new file mode 100644 index 000000000..2c103ec27 Binary files /dev/null and b/dist/qt_themes/default/icons_light/48x48/chip.png differ diff --git a/dist/qt_themes/default/icons_light/48x48/folder.png b/dist/qt_themes/default/icons_light/48x48/folder.png new file mode 100644 index 000000000..da3076637 Binary files /dev/null and b/dist/qt_themes/default/icons_light/48x48/folder.png differ diff --git a/dist/qt_themes/default/icons_light/48x48/no_avatar.png b/dist/qt_themes/default/icons_light/48x48/no_avatar.png new file mode 100644 index 000000000..9a317e1e2 Binary files /dev/null and b/dist/qt_themes/default/icons_light/48x48/no_avatar.png differ diff --git a/dist/qt_themes/default/icons_light/48x48/plus.png b/dist/qt_themes/default/icons_light/48x48/plus.png new file mode 100644 index 000000000..1816b113f Binary files /dev/null and b/dist/qt_themes/default/icons_light/48x48/plus.png differ diff --git a/dist/qt_themes/default/icons_light/48x48/sd_card.png b/dist/qt_themes/default/icons_light/48x48/sd_card.png new file mode 100644 index 000000000..0d2fe1514 Binary files /dev/null and b/dist/qt_themes/default/icons_light/48x48/sd_card.png differ diff --git a/dist/qt_themes/default/icons_light/48x48/star.png b/dist/qt_themes/default/icons_light/48x48/star.png new file mode 100644 index 000000000..1ada1a846 Binary files /dev/null and b/dist/qt_themes/default/icons_light/48x48/star.png differ diff --git a/dist/qt_themes/default/icons_light/index.theme b/dist/qt_themes/default/icons_light/index.theme new file mode 100644 index 000000000..1edbe6408 --- /dev/null +++ b/dist/qt_themes/default/icons_light/index.theme @@ -0,0 +1,13 @@ +[Icon Theme] +Name=default +Comment=default theme +Directories=16x16,48x48,256x256 + +[16x16] +Size=16 + +[48x48] +Size=48 + +[256x256] +Size=256 \ No newline at end of file diff --git a/dist/qt_themes/default/theme_default.qrc b/dist/qt_themes/default/theme_default.qrc index 9c8e8f13e..4fa70ee8e 100644 --- a/dist/qt_themes/default/theme_default.qrc +++ b/dist/qt_themes/default/theme_default.qrc @@ -17,7 +17,28 @@ icons/48x48/star.png icons/256x256/plus_folder.png + + icons_light/index.theme + icons_light/16x16/checked.png + icons_light/16x16/failed.png + icons_light/16x16/connected.png + icons_light/16x16/disconnected.png + icons_light/16x16/connected_notification.png + icons_light/16x16/lock.png + icons_light/48x48/bad_folder.png + icons_light/48x48/chip.png + icons_light/48x48/folder.png + icons_light/48x48/no_avatar.png + icons_light/48x48/plus.png + icons_light/48x48/sd_card.png + icons_light/256x256/citra.png + icons_light/48x48/star.png + icons_light/256x256/plus_folder.png + style.qss + + style.qss + diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp index 3f2b06e76..731a65f6e 100644 --- a/src/citra_qt/citra_qt.cpp +++ b/src/citra_qt/citra_qt.cpp @@ -3488,9 +3488,20 @@ void GMainWindow::filterBarSetChecked(bool state) { emit(OnToggleFilterBar()); } +inline bool isDarkMode() { + const auto scheme = QGuiApplication::styleHints()->colorScheme(); + return scheme == Qt::ColorScheme::Dark; +} + void GMainWindow::UpdateUITheme() { const QString icons_base_path = QStringLiteral(":/icons/"); - const QString default_theme = QStringLiteral("default"); + QString default_theme; + if (!isDarkMode()) { + default_theme = QStringLiteral("default"); + } else { + default_theme = QStringLiteral("default_with_light_icons"); + } + const QString default_theme_path = icons_base_path + default_theme; const QString& current_theme = UISettings::values.theme; diff --git a/src/citra_qt/uisettings.cpp b/src/citra_qt/uisettings.cpp index 44ea165cd..b09c4e2cd 100644 --- a/src/citra_qt/uisettings.cpp +++ b/src/citra_qt/uisettings.cpp @@ -7,8 +7,8 @@ namespace UISettings { const Themes themes{{ - {"Light", "default"}, - {"Light Colorful", "colorful"}, + {"System", "default"}, + {"System With Colorful Icons", "colorful"}, {"Dark", "qdarkstyle"}, {"Dark Colorful", "colorful_dark"}, {"Midnight Blue", "qdarkstyle_midnight_blue"},