From b8983f27ab42033e1b335e0adcd05d67abda4760 Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Thu, 9 Oct 2025 14:51:47 +0200 Subject: [PATCH] [Move refactor] Move tabs to interface/widgets (#6235) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Move tabs to interface/widgets. --------- Co-authored-by: Lukas Brübach --- cockatrice/CMakeLists.txt | 88 +++++++++---------- cockatrice/src/dialogs/dlg_create_game.cpp | 2 +- cockatrice/src/dialogs/dlg_settings.cpp | 2 +- .../src/game/board/abstract_counter.cpp | 2 +- cockatrice/src/game/board/card_item.cpp | 2 +- .../src/game/deckview/deck_view_container.cpp | 2 +- .../deckview/tabbed_deck_view_container.cpp | 2 +- cockatrice/src/game/game.cpp | 2 +- cockatrice/src/game/game_event_handler.cpp | 2 +- .../src/game/log/message_log_widget.cpp | 2 +- cockatrice/src/game/player/menu/card_menu.cpp | 2 +- .../src/game/player/menu/library_menu.cpp | 2 +- .../src/game/player/menu/player_menu.cpp | 2 +- cockatrice/src/game/player/player.cpp | 2 +- cockatrice/src/game/player/player_actions.cpp | 2 +- .../src/game/player/player_event_handler.cpp | 2 +- .../src/game/player/player_graphics_item.cpp | 2 +- .../src/game/player/player_list_widget.cpp | 6 +- cockatrice/src/game/replay.cpp | 2 +- .../cards/card_info_picture_widget.cpp | 2 +- .../deck_editor_card_info_dock_widget.h | 2 +- .../deck_editor_database_display_widget.cpp | 4 +- .../deck_editor_database_display_widget.h | 2 +- .../deck_editor_deck_dock_widget.h | 2 +- .../deck_editor_filter_dock_widget.h | 2 +- ...k_editor_printing_selector_dock_widget.cpp | 2 +- ...eck_editor_printing_selector_dock_widget.h | 2 +- .../interface/widgets/general/home_widget.cpp | 2 +- .../interface/widgets/general/home_widget.h | 2 +- .../widgets/menus/deck_editor_menu.h | 2 +- .../printing_selector/card_amount_widget.h | 2 +- .../printing_selector_card_display_widget.h | 2 +- .../printing_selector_card_overlay_widget.h | 2 +- .../widgets/replay/replay_manager.cpp | 2 +- .../widgets/server/chat_view/chat_view.cpp | 2 +- .../widgets/server/chat_view/chat_view.h | 2 +- .../widgets/server/game_selector.cpp | 8 +- .../interface/widgets/server/games_model.cpp | 2 +- .../widgets/server/user/user_context_menu.cpp | 6 +- .../widgets/server/user/user_list_widget.cpp | 4 +- .../tabs/abstract_tab_deck_editor.cpp | 0 .../widgets}/tabs/abstract_tab_deck_editor.h | 0 .../edhrec_api_response_archidekt_links.cpp | 0 .../edhrec_api_response_archidekt_links.h | 0 .../edhrec_average_deck_api_response.cpp | 0 .../edhrec_average_deck_api_response.h | 0 .../average_deck/edhrec_deck_api_response.cpp | 0 .../average_deck/edhrec_deck_api_response.h | 0 .../edhrec_api_response_card_prices.cpp | 0 .../edhrec_api_response_card_prices.h | 0 .../edhrec_api_response_card_container.cpp | 0 .../edhrec_api_response_card_container.h | 0 .../edhrec_api_response_card_details.cpp | 0 .../cards/edhrec_api_response_card_details.h | 0 .../cards/edhrec_api_response_card_list.cpp | 0 .../cards/edhrec_api_response_card_list.h | 0 ...mmander_api_response_commander_details.cpp | 0 ...commander_api_response_commander_details.h | 0 .../edhrec_commander_api_response.cpp | 0 .../commander/edhrec_commander_api_response.h | 0 ...r_api_response_average_deck_statistics.cpp | 0 ...der_api_response_average_deck_statistics.h | 0 .../edhrec_top_cards_api_response.cpp | 0 .../top_cards/edhrec_top_cards_api_response.h | 0 .../edhrec_top_commanders_api_response.cpp | 0 .../edhrec_top_commanders_api_response.h | 0 .../top_tags/edhrec_top_tags_api_response.cpp | 0 .../top_tags/edhrec_top_tags_api_response.h | 0 ...pi_response_card_prices_display_widget.cpp | 0 ..._api_response_card_prices_display_widget.h | 0 ...i_response_card_details_display_widget.cpp | 0 ...api_response_card_details_display_widget.h | 2 +- ...response_card_inclusion_display_widget.cpp | 0 ...i_response_card_inclusion_display_widget.h | 2 +- ..._api_response_card_list_display_widget.cpp | 2 +- ...ec_api_response_card_list_display_widget.h | 4 +- ...i_response_card_synergy_display_widget.cpp | 0 ...api_response_card_synergy_display_widget.h | 2 +- ...ponse_commander_details_display_widget.cpp | 2 +- ...esponse_commander_details_display_widget.h | 2 +- ..._commander_api_response_display_widget.cpp | 2 +- ...ec_commander_api_response_display_widget.h | 0 ...mmander_api_response_navigation_widget.cpp | 0 ...commander_api_response_navigation_widget.h | 0 ..._top_cards_api_response_display_widget.cpp | 0 ...ec_top_cards_api_response_display_widget.h | 0 ...commanders_api_response_display_widget.cpp | 0 ...p_commanders_api_response_display_widget.h | 0 ...c_top_tags_api_response_display_widget.cpp | 0 ...rec_top_tags_api_response_display_widget.h | 0 .../widgets}/tabs/api/edhrec/tab_edhrec.cpp | 0 .../widgets}/tabs/api/edhrec/tab_edhrec.h | 1 - .../tabs/api/edhrec/tab_edhrec_main.cpp | 0 .../tabs/api/edhrec/tab_edhrec_main.h | 6 +- .../src/{ => interface/widgets}/tabs/tab.cpp | 0 .../src/{ => interface/widgets}/tabs/tab.h | 0 .../widgets}/tabs/tab_account.cpp | 0 .../widgets}/tabs/tab_account.h | 0 .../widgets}/tabs/tab_admin.cpp | 0 .../{ => interface/widgets}/tabs/tab_admin.h | 0 .../widgets}/tabs/tab_deck_editor.cpp | 0 .../widgets}/tabs/tab_deck_editor.h | 0 .../widgets}/tabs/tab_deck_storage.cpp | 0 .../widgets}/tabs/tab_deck_storage.h | 0 .../{ => interface/widgets}/tabs/tab_game.cpp | 0 .../{ => interface/widgets}/tabs/tab_game.h | 0 .../{ => interface/widgets}/tabs/tab_home.cpp | 0 .../{ => interface/widgets}/tabs/tab_home.h | 0 .../{ => interface/widgets}/tabs/tab_logs.cpp | 0 .../{ => interface/widgets}/tabs/tab_logs.h | 0 .../widgets}/tabs/tab_message.cpp | 0 .../widgets}/tabs/tab_message.h | 0 .../widgets}/tabs/tab_replays.cpp | 0 .../widgets}/tabs/tab_replays.h | 0 .../{ => interface/widgets}/tabs/tab_room.cpp | 0 .../{ => interface/widgets}/tabs/tab_room.h | 0 .../widgets}/tabs/tab_server.cpp | 0 .../{ => interface/widgets}/tabs/tab_server.h | 0 .../widgets}/tabs/tab_supervisor.cpp | 0 .../widgets}/tabs/tab_supervisor.h | 0 .../tabs/tab_visual_database_display.cpp | 0 .../tabs/tab_visual_database_display.h | 0 .../tab_deck_editor_visual.cpp | 0 .../tab_deck_editor_visual.h | 0 .../tab_deck_editor_visual_tab_widget.cpp | 0 .../tab_deck_editor_visual_tab_widget.h | 0 .../tab_deck_storage_visual.cpp | 0 .../tab_deck_storage_visual.h | 0 ...al_database_display_name_filter_widget.cpp | 2 +- ...sual_database_display_name_filter_widget.h | 2 +- .../visual_database_display_widget.h | 2 +- .../deck_preview_deck_tags_display_widget.cpp | 2 +- .../deck_preview_tag_addition_widget.cpp | 2 +- cockatrice/src/interface/window_main.cpp | 4 +- 134 files changed, 111 insertions(+), 112 deletions(-) rename cockatrice/src/{ => interface/widgets}/tabs/abstract_tab_deck_editor.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/abstract_tab_deck_editor.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h (93%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h (91%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp (93%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h (84%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h (90%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp (96%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h (94%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp (98%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/tab_edhrec.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/tab_edhrec.h (92%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/tab_edhrec_main.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/api/edhrec/tab_edhrec_main.h (90%) rename cockatrice/src/{ => interface/widgets}/tabs/tab.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_account.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_account.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_admin.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_admin.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_deck_editor.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_deck_editor.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_deck_storage.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_deck_storage.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_game.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_game.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_home.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_home.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_logs.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_logs.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_message.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_message.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_replays.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_replays.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_room.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_room.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_server.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_server.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_supervisor.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_supervisor.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_visual_database_display.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/tab_visual_database_display.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/visual_deck_editor/tab_deck_editor_visual.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/visual_deck_editor/tab_deck_editor_visual.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h (100%) rename cockatrice/src/{ => interface/widgets}/tabs/visual_deck_storage/tab_deck_storage_visual.cpp (100%) rename cockatrice/src/{ => interface/widgets}/tabs/visual_deck_storage/tab_deck_storage_visual.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index f8097a126..14e3a11c8 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -214,50 +214,50 @@ set(cockatrice_SOURCES src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp src/interface/window_main.cpp src/main.cpp - src/tabs/abstract_tab_deck_editor.cpp - src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp - src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp - src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp - src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp - src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp - src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp - src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp - src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp - src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp - src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp - src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp - src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp - src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp - src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp - src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp - src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp - src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp - src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp - src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp - src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp - src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp - src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp - src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp - src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp - src/tabs/api/edhrec/tab_edhrec.cpp - src/tabs/api/edhrec/tab_edhrec_main.cpp - src/tabs/tab.cpp - src/tabs/tab_account.cpp - src/tabs/tab_admin.cpp - src/tabs/tab_deck_editor.cpp - src/tabs/tab_deck_storage.cpp - src/tabs/tab_game.cpp - src/tabs/tab_home.cpp - src/tabs/tab_logs.cpp - src/tabs/tab_message.cpp - src/tabs/tab_replays.cpp - src/tabs/tab_room.cpp - src/tabs/tab_server.cpp - src/tabs/tab_supervisor.cpp - src/tabs/tab_visual_database_display.cpp - src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp - src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp - src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp + src/interface/widgets/tabs/abstract_tab_deck_editor.cpp + src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp + src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp + src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp + src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp + src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp + src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp + src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp + src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp + src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp + src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp + src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp + src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp + src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp + src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp + src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp + src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp + src/interface/widgets/tabs/tab.cpp + src/interface/widgets/tabs/tab_account.cpp + src/interface/widgets/tabs/tab_admin.cpp + src/interface/widgets/tabs/tab_deck_editor.cpp + src/interface/widgets/tabs/tab_deck_storage.cpp + src/interface/widgets/tabs/tab_game.cpp + src/interface/widgets/tabs/tab_home.cpp + src/interface/widgets/tabs/tab_logs.cpp + src/interface/widgets/tabs/tab_message.cpp + src/interface/widgets/tabs/tab_replays.cpp + src/interface/widgets/tabs/tab_room.cpp + src/interface/widgets/tabs/tab_server.cpp + src/interface/widgets/tabs/tab_supervisor.cpp + src/interface/widgets/tabs/tab_visual_database_display.cpp + src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp + src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp + src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp ) add_subdirectory(sounds) diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp index a8f07c889..86b002c92 100644 --- a/cockatrice/src/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/dialogs/dlg_create_game.cpp @@ -1,6 +1,6 @@ #include "dlg_create_game.h" -#include "../tabs/tab_room.h" +#include "../interface/widgets/tabs/tab_room.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index b12b938b6..71e9349bd 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -6,11 +6,11 @@ #include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/theme_manager.h" #include "../interface/widgets/general/background_sources.h" +#include "../interface/widgets/tabs/tab_supervisor.h" #include "../interface/widgets/utility/custom_line_edit.h" #include "../interface/widgets/utility/get_text_with_max.h" #include "../interface/widgets/utility/sequence_edit.h" #include "../main.h" -#include "../tabs/tab_supervisor.h" #include #include diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp index cfc20341f..44340cc34 100644 --- a/cockatrice/src/game/board/abstract_counter.cpp +++ b/cockatrice/src/game/board/abstract_counter.cpp @@ -1,6 +1,6 @@ #include "abstract_counter.h" -#include "../../tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_game.h" #include "../player/player.h" #include "translate_counter_name.h" diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index 2bb36725f..64f905fee 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -1,6 +1,6 @@ #include "card_item.h" -#include "../../tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_game.h" #include "../game_scene.h" #include "../player/player.h" #include "../zones/card_zone.h" diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 7fae429e7..9a4999af6 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -5,7 +5,7 @@ #include "../../dialogs/dlg_load_deck_from_website.h" #include "../../dialogs/dlg_load_remote_deck.h" #include "../../interface/card_picture_loader/card_picture_loader.h" -#include "../../tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_game.h" #include "../game_scene.h" #include "deck_view.h" diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp index 34fb16260..984267cce 100644 --- a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp +++ b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp @@ -1,6 +1,6 @@ #include "tabbed_deck_view_container.h" -#include "../../tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_game.h" #include "deck_view.h" TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent) diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp index a81f838a3..38477f7f7 100644 --- a/cockatrice/src/game/game.cpp +++ b/cockatrice/src/game/game.cpp @@ -1,6 +1,6 @@ #include "game.h" -#include "../tabs/tab_game.h" +#include "../interface/widgets/tabs/tab_game.h" #include diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index 3ef1e1c1f..1cb47f368 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -1,6 +1,6 @@ #include "game_event_handler.h" -#include "../tabs/tab_game.h" +#include "../interface/widgets/tabs/tab_game.h" #include "abstract_game.h" #include "log/message_log_widget.h" diff --git a/cockatrice/src/game/log/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp index 1d76ba31f..b9ad47d61 100644 --- a/cockatrice/src/game/log/message_log_widget.cpp +++ b/cockatrice/src/game/log/message_log_widget.cpp @@ -1,7 +1,7 @@ #include "message_log_widget.h" #include "../../client/sound_engine.h" -#include "../../tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_game.h" #include "../board/card_item.h" #include "../board/translate_counter_name.h" #include "../phase.h" diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp index 86942258c..30d976993 100644 --- a/cockatrice/src/game/player/menu/card_menu.cpp +++ b/cockatrice/src/game/player/menu/card_menu.cpp @@ -1,6 +1,6 @@ #include "card_menu.h" -#include "../../../tabs/tab_game.h" +#include "../../../interface/widgets/tabs/tab_game.h" #include "../../board/card_item.h" #include "../../zones/logic/view_zone_logic.h" #include "../card_menu_action_type.h" diff --git a/cockatrice/src/game/player/menu/library_menu.cpp b/cockatrice/src/game/player/menu/library_menu.cpp index 53fd58eba..4303a6540 100644 --- a/cockatrice/src/game/player/menu/library_menu.cpp +++ b/cockatrice/src/game/player/menu/library_menu.cpp @@ -1,6 +1,6 @@ #include "library_menu.h" -#include "../../../tabs/tab_game.h" +#include "../../../interface/widgets/tabs/tab_game.h" #include "../../abstract_game.h" #include "../player.h" #include "../player_actions.h" diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp index cc9e284dd..7e4592616 100644 --- a/cockatrice/src/game/player/menu/player_menu.cpp +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -1,6 +1,6 @@ #include "player_menu.h" -#include "../../../tabs/tab_game.h" +#include "../../../interface/widgets/tabs/tab_game.h" #include "../../board/card_item.h" #include "../../zones/hand_zone.h" #include "../card_menu_action_type.h" diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index 6390bbd84..a18e464d6 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -1,7 +1,7 @@ #include "player.h" #include "../../interface/theme_manager.h" -#include "../../tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_game.h" #include "../board/arrow_item.h" #include "../board/card_item.h" #include "../board/card_list.h" diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index 2e2685ec8..08309c07f 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -1,7 +1,7 @@ #include "player_actions.h" +#include "../../interface/widgets/tabs/tab_game.h" #include "../../interface/widgets/utility/get_text_with_max.h" -#include "../../tabs/tab_game.h" #include "../board/card_item.h" #include "../dialogs/dlg_move_top_cards_until.h" #include "../dialogs/dlg_roll_dice.h" diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp index eacc2dd2b..972229489 100644 --- a/cockatrice/src/game/player/player_event_handler.cpp +++ b/cockatrice/src/game/player/player_event_handler.cpp @@ -1,6 +1,6 @@ #include "player_event_handler.h" -#include "../../tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_game.h" #include "../board/arrow_item.h" #include "../board/card_item.h" #include "../board/card_list.h" diff --git a/cockatrice/src/game/player/player_graphics_item.cpp b/cockatrice/src/game/player/player_graphics_item.cpp index b4553694b..e609591b3 100644 --- a/cockatrice/src/game/player/player_graphics_item.cpp +++ b/cockatrice/src/game/player/player_graphics_item.cpp @@ -1,6 +1,6 @@ #include "player_graphics_item.h" -#include "../../tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_game.h" #include "../hand_counter.h" PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player) diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp index 98cfd4ff9..3281d8541 100644 --- a/cockatrice/src/game/player/player_list_widget.cpp +++ b/cockatrice/src/game/player/player_list_widget.cpp @@ -4,9 +4,9 @@ #include "../../interface/widgets/server/user/user_context_menu.h" #include "../../interface/widgets/server/user/user_list_manager.h" #include "../../interface/widgets/server/user/user_list_widget.h" -#include "../../tabs/tab_account.h" -#include "../../tabs/tab_game.h" -#include "../../tabs/tab_supervisor.h" +#include "../../interface/widgets/tabs/tab_account.h" +#include "../../interface/widgets/tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_supervisor.h" #include #include diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp index ca57af9bc..6886f817a 100644 --- a/cockatrice/src/game/replay.cpp +++ b/cockatrice/src/game/replay.cpp @@ -1,6 +1,6 @@ #include "replay.h" -#include "../tabs/tab_game.h" +#include "../interface/widgets/tabs/tab_game.h" Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab) { diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp index 7e87d6587..bf7b72ca3 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -2,7 +2,7 @@ #include "../../../game/board/card_item.h" #include "../../../interface/card_picture_loader/card_picture_loader.h" -#include "../../../tabs/tab_supervisor.h" +#include "../../../interface/widgets/tabs/tab_supervisor.h" #include "../../window_main.h" #include diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h index dc31d58a7..086ca2ca4 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h @@ -8,7 +8,7 @@ #ifndef DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H #define DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../cards/card_info_frame_widget.h" #include diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp index d0bd43148..e14308056 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -1,8 +1,8 @@ #include "deck_editor_database_display_widget.h" #include "../../../filters/syntax_help.h" -#include "../../../tabs/abstract_tab_deck_editor.h" -#include "../../../tabs/tab_supervisor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/tab_supervisor.h" #include "../../pixel_map_generator.h" #include diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h index 849e4d56c..1a1ee438d 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h @@ -8,7 +8,7 @@ #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../utility/custom_line_edit.h" #include diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index 4d09088c9..06169aa3e 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -8,7 +8,7 @@ #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H #define DECK_EDITOR_DECK_DOCK_WIDGET_H -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../utility/custom_line_edit.h" #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h index 740f5c759..298f6c4e5 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h @@ -8,7 +8,7 @@ #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H #define DECK_EDITOR_FILTER_DOCK_WIDGET_H -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include #include diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp index 732c74cf2..0c068e043 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp @@ -1,6 +1,6 @@ #include "deck_editor_printing_selector_dock_widget.h" -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h index efb3e6c6b..d7836a938 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h @@ -7,7 +7,7 @@ #ifndef DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H #define DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../printing_selector/printing_selector.h" #include diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp index 14295858c..13539af28 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.cpp +++ b/cockatrice/src/interface/widgets/general/home_widget.cpp @@ -1,6 +1,6 @@ #include "home_widget.h" -#include "../../../tabs/tab_supervisor.h" +#include "../../../interface/widgets/tabs/tab_supervisor.h" #include "../../window_main.h" #include "background_sources.h" #include "home_styled_button.h" diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h index 3cc4d8da1..23598cc5a 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.h +++ b/cockatrice/src/interface/widgets/general/home_widget.h @@ -7,7 +7,7 @@ #ifndef HOME_WIDGET_H #define HOME_WIDGET_H -#include "../../../tabs/tab_supervisor.h" +#include "../../../interface/widgets/tabs/tab_supervisor.h" #include "../cards/card_info_picture_art_crop_widget.h" #include "home_styled_button.h" diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h index ce9bfeaaa..b35f35864 100644 --- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h +++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h @@ -7,7 +7,7 @@ #ifndef DECK_EDITOR_MENU_H #define DECK_EDITOR_MENU_H -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../interface/widgets/tabs/abstract_tab_deck_editor.h" #include diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h index 811e642ed..e4863be8a 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h @@ -8,7 +8,7 @@ #ifndef CARD_AMOUNT_WIDGET_H #define CARD_AMOUNT_WIDGET_H -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../general/display/dynamic_font_size_push_button.h" #include diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h index 17cb20dab..197e1adda 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h @@ -7,7 +7,7 @@ #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "printing_selector_card_overlay_widget.h" #include "set_name_and_collectors_number_display_widget.h" diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h index 712685925..8bc865920 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h @@ -7,7 +7,7 @@ #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../cards/card_info_picture_widget.h" #include "all_zones_card_amount_widget.h" #include "card_amount_widget.h" diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp index 7674eaa08..fac3576f2 100644 --- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp @@ -1,6 +1,6 @@ #include "replay_manager.h" -#include "../../../tabs/tab_game.h" +#include "../interface/widgets/tabs/tab_game.h" #include #include diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp index 3288f6143..10897b651 100644 --- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp +++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp @@ -2,7 +2,7 @@ #include "../../client/sound_engine.h" #include "../../interface/pixel_map_generator.h" -#include "../../tabs/tab_account.h" +#include "../../interface/widgets/tabs/tab_account.h" #include "../user/user_context_menu.h" #include "../user/user_list_manager.h" #include "../user/user_list_proxy.h" diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h index 3e4c21712..9b2287726 100644 --- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h +++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h @@ -8,7 +8,7 @@ #ifndef CHATVIEW_H #define CHATVIEW_H -#include "../../tabs/tab_supervisor.h" +#include "../../interface/widgets/tabs/tab_supervisor.h" #include "../user/user_list_widget.h" #include diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp index 61fd51d88..2b7c7099b 100644 --- a/cockatrice/src/interface/widgets/server/game_selector.cpp +++ b/cockatrice/src/interface/widgets/server/game_selector.cpp @@ -2,11 +2,11 @@ #include "../dialogs/dlg_create_game.h" #include "../dialogs/dlg_filter_games.h" +#include "../interface/widgets/tabs/tab_account.h" +#include "../interface/widgets/tabs/tab_game.h" +#include "../interface/widgets/tabs/tab_room.h" +#include "../interface/widgets/tabs/tab_supervisor.h" #include "../interface/widgets/utility/get_text_with_max.h" -#include "../tabs/tab_account.h" -#include "../tabs/tab_game.h" -#include "../tabs/tab_room.h" -#include "../tabs/tab_supervisor.h" #include "games_model.h" #include "user/user_list_manager.h" diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp index 3a8c626ea..f05d47efe 100644 --- a/cockatrice/src/interface/widgets/server/games_model.cpp +++ b/cockatrice/src/interface/widgets/server/games_model.cpp @@ -1,7 +1,7 @@ #include "games_model.h" #include "../interface/pixel_map_generator.h" -#include "../tabs/tab_account.h" +#include "../interface/widgets/tabs/tab_account.h" #include "user/user_list_manager.h" #include "user/user_list_widget.h" diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp index 405799ba0..a255a38d5 100644 --- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp @@ -1,8 +1,8 @@ #include "user_context_menu.h" -#include "../../tabs/tab_account.h" -#include "../../tabs/tab_game.h" -#include "../../tabs/tab_supervisor.h" +#include "../../interface/widgets/tabs/tab_account.h" +#include "../../interface/widgets/tabs/tab_game.h" +#include "../../interface/widgets/tabs/tab_supervisor.h" #include "../chat_view/chat_view.h" #include "../game_selector.h" #include "user_info_box.h" diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp index 68f2f97c8..b6d65c5fa 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp @@ -1,8 +1,8 @@ #include "user_list_widget.h" #include "../../interface/pixel_map_generator.h" -#include "../../tabs/tab_account.h" -#include "../../tabs/tab_supervisor.h" +#include "../../interface/widgets/tabs/tab_account.h" +#include "../../interface/widgets/tabs/tab_supervisor.h" #include "../game_selector.h" #include "user_context_menu.h" #include "user_list_manager.h" diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp similarity index 100% rename from cockatrice/src/tabs/abstract_tab_deck_editor.cpp rename to cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h similarity index 100% rename from cockatrice/src/tabs/abstract_tab_deck_editor.h rename to cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h diff --git a/cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp diff --git a/cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h similarity index 93% rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h index ae0777613..548cdc0af 100644 --- a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h @@ -7,7 +7,7 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H -#include "../../../../../interface/widgets/cards/card_info_picture_widget.h" +#include "../../../../../cards/card_info_picture_widget.h" #include "../../api_response/cards/edhrec_api_response_card_details.h" #include "edhrec_api_response_card_inclusion_display_widget.h" #include "edhrec_api_response_card_synergy_display_widget.h" diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h similarity index 91% rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h index cc5039c53..0174016f7 100644 --- a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h @@ -7,7 +7,7 @@ #ifndef EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H #define EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H -#include "../../../../../interface/widgets/general/display/percent_bar_widget.h" +#include "../../../../../general/display/percent_bar_widget.h" #include "../../api_response/cards/edhrec_api_response_card_details.h" #include diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp similarity index 93% rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp index 67372fd37..841ef315b 100644 --- a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp @@ -1,6 +1,6 @@ #include "edhrec_api_response_card_list_display_widget.h" -#include "../../../../../interface/widgets/general/display/banner_widget.h" +#include "../../../../../general/display/banner_widget.h" #include "edhrec_api_response_card_details_display_widget.h" #include diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h similarity index 84% rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h index bb278013f..0ebb9b927 100644 --- a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h @@ -7,8 +7,8 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H -#include "../../../../../interface/widgets/general/display/banner_widget.h" -#include "../../../../../interface/widgets/general/layout_containers/flow_widget.h" +#include "../../../../../general/display/banner_widget.h" +#include "../../../../../general/layout_containers/flow_widget.h" #include "../../api_response/cards/edhrec_api_response_card_list.h" #include diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h similarity index 90% rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h index e6a8c02fe..39d26a409 100644 --- a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h @@ -7,7 +7,7 @@ #ifndef EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H #define EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H -#include "../../../../../interface/widgets/general/display/percent_bar_widget.h" +#include "../../../../../general/display/percent_bar_widget.h" #include "../../api_response/cards/edhrec_api_response_card_details.h" #include diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp similarity index 96% rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp index 6c05320e0..cbf525b79 100644 --- a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp @@ -1,6 +1,6 @@ #include "edhrec_api_response_commander_details_display_widget.h" -#include "../../../../../interface/widgets/cards/card_info_picture_widget.h" +#include "../../../../../cards/card_info_picture_widget.h" #include "../../tab_edhrec_main.h" #include "../card_prices/edhrec_api_response_card_prices_display_widget.h" diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h similarity index 94% rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h index 3ab433a41..295e4228b 100644 --- a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h @@ -7,7 +7,7 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H -#include "../../../../../interface/widgets/cards/card_info_picture_widget.h" +#include "../../../../../cards/card_info_picture_widget.h" #include "../../api_response/cards/edhrec_commander_api_response_commander_details.h" #include "../card_prices/edhrec_api_response_card_prices_display_widget.h" #include "edhrec_commander_api_response_navigation_widget.h" diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp similarity index 98% rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp index 722a8004c..230858d6c 100644 --- a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp @@ -1,6 +1,6 @@ #include "edhrec_commander_api_response_display_widget.h" -#include "../../../../../interface/widgets/cards/card_info_picture_widget.h" +#include "../../../../../cards/card_info_picture_widget.h" #include "../../api_response/commander/edhrec_commander_api_response.h" #include "../cards/edhrec_api_response_card_list_display_widget.h" #include "edhrec_api_response_commander_details_display_widget.h" diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h diff --git a/cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp diff --git a/cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h diff --git a/cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp diff --git a/cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h diff --git a/cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp diff --git a/cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h similarity index 100% rename from cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/tab_edhrec.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h similarity index 92% rename from cockatrice/src/tabs/api/edhrec/tab_edhrec.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h index 0cf48c3e0..b6030578c 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h @@ -7,7 +7,6 @@ #ifndef TAB_EDHREC_H #define TAB_EDHREC_H -#include "../../../interface/widgets/general/layout_containers/flow_widget.h" #include "../../tab.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp similarity index 100% rename from cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp rename to cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h similarity index 90% rename from cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h rename to cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h index b6f8b5ce6..ba5e3d201 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h @@ -7,9 +7,9 @@ #ifndef TAB_EDHREC_MAIN_H #define TAB_EDHREC_MAIN_H -#include "../../../interface/widgets/cards/card_size_widget.h" -#include "../../../interface/widgets/general/layout_containers/flow_widget.h" -#include "../../../interface/widgets/quick_settings/settings_button_widget.h" +#include "../../interface/widgets/cards/card_size_widget.h" +#include "../../interface/widgets/general/layout_containers/flow_widget.h" +#include "../../interface/widgets/quick_settings/settings_button_widget.h" #include "../../tab.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" diff --git a/cockatrice/src/tabs/tab.cpp b/cockatrice/src/interface/widgets/tabs/tab.cpp similarity index 100% rename from cockatrice/src/tabs/tab.cpp rename to cockatrice/src/interface/widgets/tabs/tab.cpp diff --git a/cockatrice/src/tabs/tab.h b/cockatrice/src/interface/widgets/tabs/tab.h similarity index 100% rename from cockatrice/src/tabs/tab.h rename to cockatrice/src/interface/widgets/tabs/tab.h diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/interface/widgets/tabs/tab_account.cpp similarity index 100% rename from cockatrice/src/tabs/tab_account.cpp rename to cockatrice/src/interface/widgets/tabs/tab_account.cpp diff --git a/cockatrice/src/tabs/tab_account.h b/cockatrice/src/interface/widgets/tabs/tab_account.h similarity index 100% rename from cockatrice/src/tabs/tab_account.h rename to cockatrice/src/interface/widgets/tabs/tab_account.h diff --git a/cockatrice/src/tabs/tab_admin.cpp b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp similarity index 100% rename from cockatrice/src/tabs/tab_admin.cpp rename to cockatrice/src/interface/widgets/tabs/tab_admin.cpp diff --git a/cockatrice/src/tabs/tab_admin.h b/cockatrice/src/interface/widgets/tabs/tab_admin.h similarity index 100% rename from cockatrice/src/tabs/tab_admin.h rename to cockatrice/src/interface/widgets/tabs/tab_admin.h diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp similarity index 100% rename from cockatrice/src/tabs/tab_deck_editor.cpp rename to cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp diff --git a/cockatrice/src/tabs/tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h similarity index 100% rename from cockatrice/src/tabs/tab_deck_editor.h rename to cockatrice/src/interface/widgets/tabs/tab_deck_editor.h diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp similarity index 100% rename from cockatrice/src/tabs/tab_deck_storage.cpp rename to cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp diff --git a/cockatrice/src/tabs/tab_deck_storage.h b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h similarity index 100% rename from cockatrice/src/tabs/tab_deck_storage.h rename to cockatrice/src/interface/widgets/tabs/tab_deck_storage.h diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp similarity index 100% rename from cockatrice/src/tabs/tab_game.cpp rename to cockatrice/src/interface/widgets/tabs/tab_game.cpp diff --git a/cockatrice/src/tabs/tab_game.h b/cockatrice/src/interface/widgets/tabs/tab_game.h similarity index 100% rename from cockatrice/src/tabs/tab_game.h rename to cockatrice/src/interface/widgets/tabs/tab_game.h diff --git a/cockatrice/src/tabs/tab_home.cpp b/cockatrice/src/interface/widgets/tabs/tab_home.cpp similarity index 100% rename from cockatrice/src/tabs/tab_home.cpp rename to cockatrice/src/interface/widgets/tabs/tab_home.cpp diff --git a/cockatrice/src/tabs/tab_home.h b/cockatrice/src/interface/widgets/tabs/tab_home.h similarity index 100% rename from cockatrice/src/tabs/tab_home.h rename to cockatrice/src/interface/widgets/tabs/tab_home.h diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp similarity index 100% rename from cockatrice/src/tabs/tab_logs.cpp rename to cockatrice/src/interface/widgets/tabs/tab_logs.cpp diff --git a/cockatrice/src/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h similarity index 100% rename from cockatrice/src/tabs/tab_logs.h rename to cockatrice/src/interface/widgets/tabs/tab_logs.h diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/interface/widgets/tabs/tab_message.cpp similarity index 100% rename from cockatrice/src/tabs/tab_message.cpp rename to cockatrice/src/interface/widgets/tabs/tab_message.cpp diff --git a/cockatrice/src/tabs/tab_message.h b/cockatrice/src/interface/widgets/tabs/tab_message.h similarity index 100% rename from cockatrice/src/tabs/tab_message.h rename to cockatrice/src/interface/widgets/tabs/tab_message.h diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp similarity index 100% rename from cockatrice/src/tabs/tab_replays.cpp rename to cockatrice/src/interface/widgets/tabs/tab_replays.cpp diff --git a/cockatrice/src/tabs/tab_replays.h b/cockatrice/src/interface/widgets/tabs/tab_replays.h similarity index 100% rename from cockatrice/src/tabs/tab_replays.h rename to cockatrice/src/interface/widgets/tabs/tab_replays.h diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp similarity index 100% rename from cockatrice/src/tabs/tab_room.cpp rename to cockatrice/src/interface/widgets/tabs/tab_room.cpp diff --git a/cockatrice/src/tabs/tab_room.h b/cockatrice/src/interface/widgets/tabs/tab_room.h similarity index 100% rename from cockatrice/src/tabs/tab_room.h rename to cockatrice/src/interface/widgets/tabs/tab_room.h diff --git a/cockatrice/src/tabs/tab_server.cpp b/cockatrice/src/interface/widgets/tabs/tab_server.cpp similarity index 100% rename from cockatrice/src/tabs/tab_server.cpp rename to cockatrice/src/interface/widgets/tabs/tab_server.cpp diff --git a/cockatrice/src/tabs/tab_server.h b/cockatrice/src/interface/widgets/tabs/tab_server.h similarity index 100% rename from cockatrice/src/tabs/tab_server.h rename to cockatrice/src/interface/widgets/tabs/tab_server.h diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp similarity index 100% rename from cockatrice/src/tabs/tab_supervisor.cpp rename to cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp diff --git a/cockatrice/src/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h similarity index 100% rename from cockatrice/src/tabs/tab_supervisor.h rename to cockatrice/src/interface/widgets/tabs/tab_supervisor.h diff --git a/cockatrice/src/tabs/tab_visual_database_display.cpp b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp similarity index 100% rename from cockatrice/src/tabs/tab_visual_database_display.cpp rename to cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp diff --git a/cockatrice/src/tabs/tab_visual_database_display.h b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h similarity index 100% rename from cockatrice/src/tabs/tab_visual_database_display.h rename to cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp similarity index 100% rename from cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp rename to cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h similarity index 100% rename from cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.h rename to cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp similarity index 100% rename from cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp rename to cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h similarity index 100% rename from cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h rename to cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h diff --git a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp similarity index 100% rename from cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp rename to cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp diff --git a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h similarity index 100% rename from cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.h rename to cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp index 75ab238be..8019f9e7c 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp @@ -1,7 +1,7 @@ #include "visual_database_display_name_filter_widget.h" #include "../../../dialogs/dlg_load_deck_from_clipboard.h" -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h index 06f30370a..b98d83523 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h @@ -8,7 +8,7 @@ #define VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H #include "../../../filters/filter_tree_model.h" -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h index e41451e33..01143d939 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h @@ -8,7 +8,7 @@ #define VISUAL_DATABASE_DISPLAY_WIDGET_H #include "../../../filters/filter_tree_model.h" -#include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../../layouts/flow_layout.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_size_widget.h" diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp index 067318ab5..dc36d56ac 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp @@ -1,7 +1,7 @@ #include "deck_preview_deck_tags_display_widget.h" #include "../../../../dialogs/dlg_convert_deck_to_cod_format.h" -#include "../../../../tabs/tab_deck_editor.h" +#include "../../../../interface/widgets/tabs/tab_deck_editor.h" #include "../../general/layout_containers/flow_widget.h" #include "deck_preview_tag_addition_widget.h" #include "deck_preview_tag_dialog.h" diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp index 21e2b0364..a8979bae9 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp @@ -1,6 +1,6 @@ #include "deck_preview_tag_addition_widget.h" -#include "../../../../tabs/abstract_tab_deck_editor.h" +#include "../../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "deck_preview_tag_dialog.h" #include diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index ca616b7a9..318285c3e 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -33,9 +33,9 @@ #include "../dialogs/dlg_tip_of_the_day.h" #include "../dialogs/dlg_update.h" #include "../dialogs/dlg_view_log.h" +#include "../interface/widgets/tabs/tab_game.h" +#include "../interface/widgets/tabs/tab_supervisor.h" #include "../main.h" -#include "../tabs/tab_game.h" -#include "../tabs/tab_supervisor.h" #include "version_string.h" #include "widgets/utility/get_text_with_max.h"