diff --git a/Base/res/icons/chess/mini-board.png b/Base/res/graphics/chess/mini-board.png similarity index 100% rename from Base/res/icons/chess/mini-board.png rename to Base/res/graphics/chess/mini-board.png diff --git a/Base/res/icons/chess/sets/moderna/black-bishop.png b/Base/res/graphics/chess/sets/moderna/black-bishop.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/black-bishop.png rename to Base/res/graphics/chess/sets/moderna/black-bishop.png diff --git a/Base/res/icons/chess/sets/moderna/black-king.png b/Base/res/graphics/chess/sets/moderna/black-king.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/black-king.png rename to Base/res/graphics/chess/sets/moderna/black-king.png diff --git a/Base/res/icons/chess/sets/moderna/black-knight.png b/Base/res/graphics/chess/sets/moderna/black-knight.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/black-knight.png rename to Base/res/graphics/chess/sets/moderna/black-knight.png diff --git a/Base/res/icons/chess/sets/moderna/black-pawn.png b/Base/res/graphics/chess/sets/moderna/black-pawn.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/black-pawn.png rename to Base/res/graphics/chess/sets/moderna/black-pawn.png diff --git a/Base/res/icons/chess/sets/moderna/black-queen.png b/Base/res/graphics/chess/sets/moderna/black-queen.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/black-queen.png rename to Base/res/graphics/chess/sets/moderna/black-queen.png diff --git a/Base/res/icons/chess/sets/moderna/black-rook.png b/Base/res/graphics/chess/sets/moderna/black-rook.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/black-rook.png rename to Base/res/graphics/chess/sets/moderna/black-rook.png diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_black_bishop.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_black_bishop.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_black_bishop.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_black_bishop.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_black_king.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_black_king.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_black_king.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_black_king.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_black_knight.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_black_knight.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_black_knight.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_black_knight.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_black_pawn.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_black_pawn.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_black_pawn.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_black_pawn.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_black_queen.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_black_queen.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_black_queen.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_black_queen.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_black_rook.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_black_rook.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_black_rook.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_black_rook.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_white_outline_bishop.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_bishop.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_white_outline_bishop.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_bishop.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_white_outline_king.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_king.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_white_outline_king.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_king.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_white_outline_knight.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_knight.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_white_outline_knight.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_knight.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_white_outline_pawn.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_pawn.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_white_outline_pawn.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_pawn.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_white_outline_queen.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_queen.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_white_outline_queen.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_queen.svg diff --git a/Base/res/icons/chess/sets/moderna/moderna_final_white_outline_rook.svg b/Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_rook.svg similarity index 100% rename from Base/res/icons/chess/sets/moderna/moderna_final_white_outline_rook.svg rename to Base/res/graphics/chess/sets/moderna/moderna_final_white_outline_rook.svg diff --git a/Base/res/icons/chess/sets/moderna/white-bishop.png b/Base/res/graphics/chess/sets/moderna/white-bishop.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/white-bishop.png rename to Base/res/graphics/chess/sets/moderna/white-bishop.png diff --git a/Base/res/icons/chess/sets/moderna/white-king.png b/Base/res/graphics/chess/sets/moderna/white-king.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/white-king.png rename to Base/res/graphics/chess/sets/moderna/white-king.png diff --git a/Base/res/icons/chess/sets/moderna/white-knight.png b/Base/res/graphics/chess/sets/moderna/white-knight.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/white-knight.png rename to Base/res/graphics/chess/sets/moderna/white-knight.png diff --git a/Base/res/icons/chess/sets/moderna/white-pawn.png b/Base/res/graphics/chess/sets/moderna/white-pawn.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/white-pawn.png rename to Base/res/graphics/chess/sets/moderna/white-pawn.png diff --git a/Base/res/icons/chess/sets/moderna/white-queen.png b/Base/res/graphics/chess/sets/moderna/white-queen.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/white-queen.png rename to Base/res/graphics/chess/sets/moderna/white-queen.png diff --git a/Base/res/icons/chess/sets/moderna/white-rook.png b/Base/res/graphics/chess/sets/moderna/white-rook.png similarity index 100% rename from Base/res/icons/chess/sets/moderna/white-rook.png rename to Base/res/graphics/chess/sets/moderna/white-rook.png diff --git a/Base/res/icons/chess/sets/retro/black-bishop.png b/Base/res/graphics/chess/sets/retro/black-bishop.png similarity index 100% rename from Base/res/icons/chess/sets/retro/black-bishop.png rename to Base/res/graphics/chess/sets/retro/black-bishop.png diff --git a/Base/res/icons/chess/sets/retro/black-king.png b/Base/res/graphics/chess/sets/retro/black-king.png similarity index 100% rename from Base/res/icons/chess/sets/retro/black-king.png rename to Base/res/graphics/chess/sets/retro/black-king.png diff --git a/Base/res/icons/chess/sets/retro/black-knight.png b/Base/res/graphics/chess/sets/retro/black-knight.png similarity index 100% rename from Base/res/icons/chess/sets/retro/black-knight.png rename to Base/res/graphics/chess/sets/retro/black-knight.png diff --git a/Base/res/icons/chess/sets/retro/black-pawn.png b/Base/res/graphics/chess/sets/retro/black-pawn.png similarity index 100% rename from Base/res/icons/chess/sets/retro/black-pawn.png rename to Base/res/graphics/chess/sets/retro/black-pawn.png diff --git a/Base/res/icons/chess/sets/retro/black-queen.png b/Base/res/graphics/chess/sets/retro/black-queen.png similarity index 100% rename from Base/res/icons/chess/sets/retro/black-queen.png rename to Base/res/graphics/chess/sets/retro/black-queen.png diff --git a/Base/res/icons/chess/sets/retro/black-rook.png b/Base/res/graphics/chess/sets/retro/black-rook.png similarity index 100% rename from Base/res/icons/chess/sets/retro/black-rook.png rename to Base/res/graphics/chess/sets/retro/black-rook.png diff --git a/Base/res/icons/chess/sets/retro/white-bishop.png b/Base/res/graphics/chess/sets/retro/white-bishop.png similarity index 100% rename from Base/res/icons/chess/sets/retro/white-bishop.png rename to Base/res/graphics/chess/sets/retro/white-bishop.png diff --git a/Base/res/icons/chess/sets/retro/white-king.png b/Base/res/graphics/chess/sets/retro/white-king.png similarity index 100% rename from Base/res/icons/chess/sets/retro/white-king.png rename to Base/res/graphics/chess/sets/retro/white-king.png diff --git a/Base/res/icons/chess/sets/retro/white-knight.png b/Base/res/graphics/chess/sets/retro/white-knight.png similarity index 100% rename from Base/res/icons/chess/sets/retro/white-knight.png rename to Base/res/graphics/chess/sets/retro/white-knight.png diff --git a/Base/res/icons/chess/sets/retro/white-pawn.png b/Base/res/graphics/chess/sets/retro/white-pawn.png similarity index 100% rename from Base/res/icons/chess/sets/retro/white-pawn.png rename to Base/res/graphics/chess/sets/retro/white-pawn.png diff --git a/Base/res/icons/chess/sets/retro/white-queen.png b/Base/res/graphics/chess/sets/retro/white-queen.png similarity index 100% rename from Base/res/icons/chess/sets/retro/white-queen.png rename to Base/res/graphics/chess/sets/retro/white-queen.png diff --git a/Base/res/icons/chess/sets/retro/white-rook.png b/Base/res/graphics/chess/sets/retro/white-rook.png similarity index 100% rename from Base/res/icons/chess/sets/retro/white-rook.png rename to Base/res/graphics/chess/sets/retro/white-rook.png diff --git a/Base/res/icons/chess/sets/stelar7/black-bishop.png b/Base/res/graphics/chess/sets/stelar7/black-bishop.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/black-bishop.png rename to Base/res/graphics/chess/sets/stelar7/black-bishop.png diff --git a/Base/res/icons/chess/sets/stelar7/black-king.png b/Base/res/graphics/chess/sets/stelar7/black-king.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/black-king.png rename to Base/res/graphics/chess/sets/stelar7/black-king.png diff --git a/Base/res/icons/chess/sets/stelar7/black-knight.png b/Base/res/graphics/chess/sets/stelar7/black-knight.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/black-knight.png rename to Base/res/graphics/chess/sets/stelar7/black-knight.png diff --git a/Base/res/icons/chess/sets/stelar7/black-pawn.png b/Base/res/graphics/chess/sets/stelar7/black-pawn.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/black-pawn.png rename to Base/res/graphics/chess/sets/stelar7/black-pawn.png diff --git a/Base/res/icons/chess/sets/stelar7/black-queen.png b/Base/res/graphics/chess/sets/stelar7/black-queen.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/black-queen.png rename to Base/res/graphics/chess/sets/stelar7/black-queen.png diff --git a/Base/res/icons/chess/sets/stelar7/black-rook.png b/Base/res/graphics/chess/sets/stelar7/black-rook.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/black-rook.png rename to Base/res/graphics/chess/sets/stelar7/black-rook.png diff --git a/Base/res/icons/chess/sets/stelar7/white-bishop.png b/Base/res/graphics/chess/sets/stelar7/white-bishop.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/white-bishop.png rename to Base/res/graphics/chess/sets/stelar7/white-bishop.png diff --git a/Base/res/icons/chess/sets/stelar7/white-king.png b/Base/res/graphics/chess/sets/stelar7/white-king.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/white-king.png rename to Base/res/graphics/chess/sets/stelar7/white-king.png diff --git a/Base/res/icons/chess/sets/stelar7/white-knight.png b/Base/res/graphics/chess/sets/stelar7/white-knight.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/white-knight.png rename to Base/res/graphics/chess/sets/stelar7/white-knight.png diff --git a/Base/res/icons/chess/sets/stelar7/white-pawn.png b/Base/res/graphics/chess/sets/stelar7/white-pawn.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/white-pawn.png rename to Base/res/graphics/chess/sets/stelar7/white-pawn.png diff --git a/Base/res/icons/chess/sets/stelar7/white-queen.png b/Base/res/graphics/chess/sets/stelar7/white-queen.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/white-queen.png rename to Base/res/graphics/chess/sets/stelar7/white-queen.png diff --git a/Base/res/icons/chess/sets/stelar7/white-rook.png b/Base/res/graphics/chess/sets/stelar7/white-rook.png similarity index 100% rename from Base/res/icons/chess/sets/stelar7/white-rook.png rename to Base/res/graphics/chess/sets/stelar7/white-rook.png diff --git a/Userland/Applications/GamesSettings/ChessSettingsWidget.cpp b/Userland/Applications/GamesSettings/ChessSettingsWidget.cpp index 645a32d8bf..81d4c836e3 100644 --- a/Userland/Applications/GamesSettings/ChessSettingsWidget.cpp +++ b/Userland/Applications/GamesSettings/ChessSettingsWidget.cpp @@ -76,7 +76,7 @@ private: static ErrorOr> load_piece_image(StringView set, StringView image) { - auto path = TRY(String::formatted("/res/icons/chess/sets/{}/{}", set, image)); + auto path = TRY(String::formatted("/res/graphics/chess/sets/{}/{}", set, image)); return Gfx::Bitmap::load_from_file(path.bytes_as_string_view()); } @@ -246,7 +246,7 @@ ErrorOr ChessSettingsWidget::initialize() m_preview = find_descendant_of_type_named("chess_preview"); m_piece_set_combobox = find_descendant_of_type_named("piece_set"); - TRY(Core::Directory::for_each_entry("/res/icons/chess/sets/"sv, Core::DirIterator::SkipParentAndBaseDir, [&](auto const& entry, auto&) -> ErrorOr { + TRY(Core::Directory::for_each_entry("/res/graphics/chess/sets/"sv, Core::DirIterator::SkipParentAndBaseDir, [&](auto const& entry, auto&) -> ErrorOr { TRY(m_piece_sets.try_append(entry.name)); return IterationDecision::Continue; })); diff --git a/Userland/Games/Chess/ChessWidget.cpp b/Userland/Games/Chess/ChessWidget.cpp index e93c9ed01b..3438a27545 100644 --- a/Userland/Games/Chess/ChessWidget.cpp +++ b/Userland/Games/Chess/ChessWidget.cpp @@ -342,7 +342,7 @@ void ChessWidget::keydown_event(GUI::KeyEvent& event) update(); } -static constexpr StringView set_path = "/res/icons/chess/sets/"sv; +static constexpr StringView set_path = "/res/graphics/chess/sets/"sv; static RefPtr get_piece(StringView set, StringView image) {