[Move refactor] Move tabs to interface/widgets (#6235)

* Move tabs to interface/widgets.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

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)

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 <QApplication>
 #include <QCheckBox>

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 <QAbstractButton>
 #include <QAbstractListModel>

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"
 

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"

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"
 

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)

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 <libcockatrice/protocol/pb/event_game_joined.pb.h>
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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)

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 <QAction>
 #include <QHeaderView>

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)
 {

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 <QMenu>

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 <QDockWidget>

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 <QClipboard>

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 <QHBoxLayout>

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"
 

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 <QDockWidget>
 #include <QTreeView>

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 <QVBoxLayout>
 

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 <QDockWidget>

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"

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"
 

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 <QMenu>
 

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 <QHBoxLayout>

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"
 

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"

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 <QHBoxLayout>
 #include <QToolButton>

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"

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 <QAction>

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"
 

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"
 

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"

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"

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"

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 <QLabel>

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 <QLabel>

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 <QResizeEvent>

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 <QLabel>

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"
 

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"

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"

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"
 

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"