diff --git a/Base/res/terminal-colors/Base16 Dark.ini b/Base/res/color-schemes/Base16 Dark.ini similarity index 100% rename from Base/res/terminal-colors/Base16 Dark.ini rename to Base/res/color-schemes/Base16 Dark.ini diff --git a/Base/res/terminal-colors/Base16 Light.ini b/Base/res/color-schemes/Base16 Light.ini similarity index 100% rename from Base/res/terminal-colors/Base16 Light.ini rename to Base/res/color-schemes/Base16 Light.ini diff --git a/Base/res/terminal-colors/C64.ini b/Base/res/color-schemes/C64.ini similarity index 100% rename from Base/res/terminal-colors/C64.ini rename to Base/res/color-schemes/C64.ini diff --git a/Base/res/terminal-colors/Default.ini b/Base/res/color-schemes/Default.ini similarity index 100% rename from Base/res/terminal-colors/Default.ini rename to Base/res/color-schemes/Default.ini diff --git a/Base/res/terminal-colors/Dracula.ini b/Base/res/color-schemes/Dracula.ini similarity index 100% rename from Base/res/terminal-colors/Dracula.ini rename to Base/res/color-schemes/Dracula.ini diff --git a/Base/res/terminal-colors/Gruvbox Dark.ini b/Base/res/color-schemes/Gruvbox Dark.ini similarity index 100% rename from Base/res/terminal-colors/Gruvbox Dark.ini rename to Base/res/color-schemes/Gruvbox Dark.ini diff --git a/Base/res/terminal-colors/Gruvbox Light.ini b/Base/res/color-schemes/Gruvbox Light.ini similarity index 100% rename from Base/res/terminal-colors/Gruvbox Light.ini rename to Base/res/color-schemes/Gruvbox Light.ini diff --git a/Base/res/terminal-colors/Monokai.ini b/Base/res/color-schemes/Monokai.ini similarity index 100% rename from Base/res/terminal-colors/Monokai.ini rename to Base/res/color-schemes/Monokai.ini diff --git a/Base/res/terminal-colors/Nord.ini b/Base/res/color-schemes/Nord.ini similarity index 100% rename from Base/res/terminal-colors/Nord.ini rename to Base/res/color-schemes/Nord.ini diff --git a/Base/res/terminal-colors/Octopus Cat.ini b/Base/res/color-schemes/Octopus Cat.ini similarity index 100% rename from Base/res/terminal-colors/Octopus Cat.ini rename to Base/res/color-schemes/Octopus Cat.ini diff --git a/Base/res/terminal-colors/Solarized Dark.ini b/Base/res/color-schemes/Solarized Dark.ini similarity index 100% rename from Base/res/terminal-colors/Solarized Dark.ini rename to Base/res/color-schemes/Solarized Dark.ini diff --git a/Base/res/terminal-colors/Solarized Light.ini b/Base/res/color-schemes/Solarized Light.ini similarity index 100% rename from Base/res/terminal-colors/Solarized Light.ini rename to Base/res/color-schemes/Solarized Light.ini diff --git a/Base/res/terminal-colors/XTerm.ini b/Base/res/color-schemes/XTerm.ini similarity index 100% rename from Base/res/terminal-colors/XTerm.ini rename to Base/res/color-schemes/XTerm.ini diff --git a/Base/res/terminal-colors/Zenburn.ini b/Base/res/color-schemes/Zenburn.ini similarity index 100% rename from Base/res/terminal-colors/Zenburn.ini rename to Base/res/color-schemes/Zenburn.ini diff --git a/Ports/serenity-theming/package.sh b/Ports/serenity-theming/package.sh index 40addda909..4d112f88cf 100755 --- a/Ports/serenity-theming/package.sh +++ b/Ports/serenity-theming/package.sh @@ -21,7 +21,8 @@ post_install() { cp -r "${workdir}/fonts" "${SERENITY_INSTALL_ROOT}/res/" cp -r "${workdir}/color-palettes" "${SERENITY_INSTALL_ROOT}/res/" cp -r "${workdir}/emoji" "${SERENITY_INSTALL_ROOT}/res/" - cp -r "${workdir}/terminal-colors" "${SERENITY_INSTALL_ROOT}/res/" + # FIXME: Update this path upstream. + cp -r "${workdir}/terminal-colors/*" "${SERENITY_INSTALL_ROOT}/res/color-schemes/" cp -r "${workdir}/wallpapers" "${SERENITY_INSTALL_ROOT}/res/" cp "${workdir}/emoji-theming.txt" "${SERENITY_INSTALL_ROOT}/home/anon/Documents/emoji-theming.txt" } diff --git a/Userland/Applications/TerminalSettings/TerminalSettingsWidget.cpp b/Userland/Applications/TerminalSettings/TerminalSettingsWidget.cpp index bc6c1c1424..178c9b2520 100644 --- a/Userland/Applications/TerminalSettings/TerminalSettingsWidget.cpp +++ b/Userland/Applications/TerminalSettings/TerminalSettingsWidget.cpp @@ -121,7 +121,7 @@ TerminalSettingsViewWidget::TerminalSettingsViewWidget() // this should cause no problems. static Vector color_scheme_names; color_scheme_names.clear(); - Core::DirIterator iterator("/res/terminal-colors", Core::DirIterator::SkipParentAndBaseDir); + Core::DirIterator iterator("/res/color-schemes", Core::DirIterator::SkipParentAndBaseDir); while (iterator.has_next()) { auto path = iterator.next_path(); color_scheme_names.append(path.replace(".ini"sv, ""sv, ReplaceMode::FirstOnly)); diff --git a/Userland/Games/Flood/SettingsDialog.cpp b/Userland/Games/Flood/SettingsDialog.cpp index 98335612ce..83f0132ec9 100644 --- a/Userland/Games/Flood/SettingsDialog.cpp +++ b/Userland/Games/Flood/SettingsDialog.cpp @@ -48,7 +48,7 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, size_t board_rows, size_t bo static Vector color_scheme_names; color_scheme_names.clear(); - Core::DirIterator iterator("/res/terminal-colors", Core::DirIterator::SkipParentAndBaseDir); + Core::DirIterator iterator("/res/color-schemes", Core::DirIterator::SkipParentAndBaseDir); while (iterator.has_next()) { auto path = iterator.next_path(); color_scheme_names.append(path.replace(".ini"sv, ""sv, ReplaceMode::FirstOnly)); diff --git a/Userland/Games/Flood/main.cpp b/Userland/Games/Flood/main.cpp index 69bca1deb6..98f76a3a06 100644 --- a/Userland/Games/Flood/main.cpp +++ b/Userland/Games/Flood/main.cpp @@ -42,7 +42,7 @@ static ErrorOr> get_color_scheme_from_string(StringView name) "White"sv }; - auto const path = DeprecatedString::formatted("/res/terminal-colors/{}.ini", name); + auto const path = DeprecatedString::formatted("/res/color-schemes/{}.ini", name); auto color_config_or_error = Core::ConfigFile::open(path); if (color_config_or_error.is_error()) { return Error::from_string_view(DeprecatedString::formatted("Unable to read color scheme file '{}': {}", path, color_config_or_error.error())); diff --git a/Userland/Libraries/LibVT/TerminalWidget.cpp b/Userland/Libraries/LibVT/TerminalWidget.cpp index f88cb98362..89b15a97cb 100644 --- a/Userland/Libraries/LibVT/TerminalWidget.cpp +++ b/Userland/Libraries/LibVT/TerminalWidget.cpp @@ -1218,7 +1218,7 @@ void TerminalWidget::set_color_scheme(StringView name) "White"sv }; - auto path = DeprecatedString::formatted("/res/terminal-colors/{}.ini", name); + auto path = DeprecatedString::formatted("/res/color-schemes/{}.ini", name); auto color_config_or_error = Core::ConfigFile::open(path); if (color_config_or_error.is_error()) { dbgln("Unable to read color scheme file '{}': {}", path, color_config_or_error.error());