From 1d6f2e560813593156b7de406c58a1360f28c30c Mon Sep 17 00:00:00 2001 From: Cubic Love <7754483+cubiclove@users.noreply.github.com> Date: Fri, 5 May 2023 01:04:46 +0100 Subject: [PATCH] Base+LibCards: Move card backs from /icons/ to /graphics/ The graphics directory is a more suitable home for game assets. Also, move card backs into their own subfolder in preparation for a themes subfolder for card fronts. --- .../cards => graphics/cards/backs}/buggie-deck.png | Bin .../cards/backs}/ladyball-deck.png | Bin .../cards => graphics/cards/backs}/yak-deck.png | Bin .../GamesSettings/CardSettingsWidget.cpp | 4 ++-- Userland/Libraries/LibCards/CardPainter.cpp | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename Base/res/{icons/cards => graphics/cards/backs}/buggie-deck.png (100%) rename Base/res/{icons/cards => graphics/cards/backs}/ladyball-deck.png (100%) rename Base/res/{icons/cards => graphics/cards/backs}/yak-deck.png (100%) diff --git a/Base/res/icons/cards/buggie-deck.png b/Base/res/graphics/cards/backs/buggie-deck.png similarity index 100% rename from Base/res/icons/cards/buggie-deck.png rename to Base/res/graphics/cards/backs/buggie-deck.png diff --git a/Base/res/icons/cards/ladyball-deck.png b/Base/res/graphics/cards/backs/ladyball-deck.png similarity index 100% rename from Base/res/icons/cards/ladyball-deck.png rename to Base/res/graphics/cards/backs/ladyball-deck.png diff --git a/Base/res/icons/cards/yak-deck.png b/Base/res/graphics/cards/backs/yak-deck.png similarity index 100% rename from Base/res/icons/cards/yak-deck.png rename to Base/res/graphics/cards/backs/yak-deck.png diff --git a/Userland/Applications/GamesSettings/CardSettingsWidget.cpp b/Userland/Applications/GamesSettings/CardSettingsWidget.cpp index 6c5457e58d..4852fb9a4c 100644 --- a/Userland/Applications/GamesSettings/CardSettingsWidget.cpp +++ b/Userland/Applications/GamesSettings/CardSettingsWidget.cpp @@ -16,7 +16,7 @@ namespace GamesSettings { -static constexpr StringView default_card_back_image_path = "/res/icons/cards/buggie-deck.png"sv; +static constexpr StringView default_card_back_image_path = "/res/graphics/cards/backs/buggie-deck.png"sv; class CardGamePreview final : public Cards::CardGame { C_OBJECT_ABSTRACT(CardGamePreview) @@ -91,7 +91,7 @@ ErrorOr CardSettingsWidget::initialize() }; m_card_back_image_view = find_descendant_of_type_named("cards_back_image"); - m_card_back_image_view->set_model(GUI::FileSystemModel::create("/res/icons/cards")); + m_card_back_image_view->set_model(GUI::FileSystemModel::create("/res/graphics/cards/backs")); m_card_back_image_view->set_model_column(GUI::FileSystemModel::Column::Name); if (!set_card_back_image_path(Config::read_string("Games"sv, "Cards"sv, "CardBackImage"sv))) set_card_back_image_path(default_card_back_image_path); diff --git a/Userland/Libraries/LibCards/CardPainter.cpp b/Userland/Libraries/LibCards/CardPainter.cpp index b8cc7b2fbc..985ce2afb1 100644 --- a/Userland/Libraries/LibCards/CardPainter.cpp +++ b/Userland/Libraries/LibCards/CardPainter.cpp @@ -21,7 +21,7 @@ CardPainter& CardPainter::the() CardPainter::CardPainter() { - m_background_image_path = Config::read_string("Games"sv, "Cards"sv, "CardBackImage"sv, "/res/icons/cards/buggie-deck.png"sv); + m_background_image_path = Config::read_string("Games"sv, "Cards"sv, "CardBackImage"sv, "/res/graphics/cards/backs/buggie-deck.png"sv); } static constexpr Gfx::CharacterBitmap s_diamond {