1
0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-09 05:40:46 +00:00

Everywhere: Move Base/res/terminal-colors to Base/res/color-schemes

This commit is contained in:
implicitfield 2022-12-02 18:11:26 +02:00 committed by Andrew Kaster
parent 534f3faa2f
commit 4aec8491d6
19 changed files with 6 additions and 5 deletions

View File

@ -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"
}

View File

@ -121,7 +121,7 @@ TerminalSettingsViewWidget::TerminalSettingsViewWidget()
// this should cause no problems.
static Vector<DeprecatedString> 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));

View File

@ -48,7 +48,7 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, size_t board_rows, size_t bo
static Vector<DeprecatedString> 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));

View File

@ -42,7 +42,7 @@ static ErrorOr<Vector<Color>> 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()));

View File

@ -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());