From 8b5ba5a3ca264fb6e63c65f9552f24c4bbe78f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 12 Jan 2025 11:50:21 +0100 Subject: [PATCH] Refactor DeckPreviewWidgets to reside in their own folder. --- cockatrice/CMakeLists.txt | 7 +++---- .../deck_preview_color_identity_filter_widget.cpp | 0 .../deck_preview_color_identity_filter_widget.h | 2 +- .../deck_preview_color_identity_widget.cpp | 2 +- .../deck_preview_color_identity_widget.h | 0 .../{ => deck_preview}/deck_preview_widget.cpp | 4 ++-- .../{ => deck_preview}/deck_preview_widget.h | 4 ++-- .../visual_deck_storage/visual_deck_storage_widget.cpp | 2 +- .../visual_deck_storage/visual_deck_storage_widget.h | 4 ++-- 9 files changed, 12 insertions(+), 13 deletions(-) rename cockatrice/src/client/ui/widgets/visual_deck_storage/{ => deck_preview}/deck_preview_color_identity_filter_widget.cpp (100%) rename cockatrice/src/client/ui/widgets/visual_deck_storage/{ => deck_preview}/deck_preview_color_identity_filter_widget.h (97%) rename cockatrice/src/client/ui/widgets/visual_deck_storage/{ => deck_preview}/deck_preview_color_identity_widget.cpp (98%) rename cockatrice/src/client/ui/widgets/visual_deck_storage/{ => deck_preview}/deck_preview_color_identity_widget.h (100%) rename cockatrice/src/client/ui/widgets/visual_deck_storage/{ => deck_preview}/deck_preview_widget.cpp (96%) rename cockatrice/src/client/ui/widgets/visual_deck_storage/{ => deck_preview}/deck_preview_widget.h (90%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 1ed1f2496..b99d84d15 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -161,10 +161,9 @@ set(cockatrice_SOURCES src/game/zones/view_zone_widget.cpp src/game/zones/view_zone.cpp src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp - src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_filter_widget.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview_widget.cpp + src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.cpp + src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp + src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_filter_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_filter_widget.cpp rename to cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_filter_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h similarity index 97% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_filter_widget.h rename to cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h index d0868a571..ccae866be 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_filter_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h @@ -1,7 +1,7 @@ #ifndef DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H #define DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H -#include "visual_deck_storage_widget.h" +#include "../visual_deck_storage_widget.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.cpp rename to cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.cpp index 50a704719..ed98913f3 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.cpp @@ -1,6 +1,6 @@ #include "deck_preview_color_identity_widget.h" -#include "../../../../settings/cache_settings.h" +#include "../../../../../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.h rename to cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp similarity index 96% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_widget.cpp rename to cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 420af493e..cad2613da 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -1,7 +1,7 @@ #include "deck_preview_widget.h" -#include "../../../../game/cards/card_database_manager.h" -#include "../cards/deck_preview_card_picture_widget.h" +#include "../../../../../game/cards/card_database_manager.h" +#include "../../cards/deck_preview_card_picture_widget.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h similarity index 90% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_widget.h rename to cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h index 4ad64cc18..d1348a1df 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h @@ -1,8 +1,8 @@ #ifndef DECK_PREVIEW_WIDGET_H #define DECK_PREVIEW_WIDGET_H -#include "../../../../deck/deck_loader.h" -#include "../cards/deck_preview_card_picture_widget.h" +#include "../../../../../deck/deck_loader.h" +#include "../../cards/deck_preview_card_picture_widget.h" #include "deck_preview_color_identity_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index 640741a99..63083024b 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -3,7 +3,7 @@ #include "../../../../deck/deck_loader.h" #include "../../../../game/cards/card_database_manager.h" #include "../../../../settings/cache_settings.h" -#include "deck_preview_widget.h" +#include "deck_preview/deck_preview_widget.h" #include "visual_deck_storage_search_widget.h" #include "visual_deck_storage_sort_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h index dca4e243a..39e8ec252 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h @@ -5,8 +5,8 @@ #include "../../../../deck/deck_view.h" #include "../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../cards/card_size_widget.h" -#include "deck_preview_color_identity_filter_widget.h" -#include "deck_preview_widget.h" +#include "deck_preview/deck_preview_color_identity_filter_widget.h" +#include "deck_preview/deck_preview_widget.h" #include "visual_deck_storage_search_widget.h" #include "visual_deck_storage_sort_widget.h"