From 17dcaf9afaf72689673b28da649cb9edd7e65211 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Sat, 20 Sep 2025 14:35:52 +0200 Subject: [PATCH] squash #6158 (#6160) * move message_log_widget to game * move files * update headers * fix cmakelists * oracle fixes * split implementation out to cpp * fix recursive import * fix main file * format --- cockatrice/CMakeLists.txt | 315 +++++++++--------- cockatrice/src/card/card_info.cpp | 2 +- .../deck_editor => }/deck_editor_menu.cpp | 4 +- .../deck_editor => }/deck_editor_menu.h | 2 +- .../network/spoiler_background_updater.cpp | 2 +- cockatrice/src/client/replay_manager.cpp | 2 +- cockatrice/src/client/replay_manager.h | 5 +- cockatrice/src/database/card_database.cpp | 6 +- cockatrice/src/dialogs/dlg_create_game.cpp | 2 +- cockatrice/src/dialogs/dlg_filter_games.h | 2 +- cockatrice/src/dialogs/dlg_manage_sets.cpp | 2 +- .../src/dialogs/dlg_select_set_for_cards.cpp | 4 +- .../src/dialogs/dlg_select_set_for_cards.h | 2 +- cockatrice/src/dialogs/dlg_settings.cpp | 8 +- cockatrice/src/dialogs/dlg_tip_of_the_day.cpp | 2 +- cockatrice/src/dialogs/dlg_update.cpp | 2 +- .../{client/ui => dialogs}/tip_of_the_day.cpp | 0 .../{client/ui => dialogs}/tip_of_the_day.h | 0 cockatrice/src/filters/deck_filter_string.h | 2 +- .../src/game/board/abstract_card_item.cpp | 2 +- .../src/game/board/abstract_counter.cpp | 4 +- cockatrice/src/game/board/abstract_counter.h | 2 +- cockatrice/src/game/board/card_item.cpp | 2 +- cockatrice/src/game/board/counter_general.cpp | 2 +- .../board}/translate_counter_name.cpp | 0 .../board}/translate_counter_name.h | 0 cockatrice/src/game/deckview/deck_view.cpp | 2 +- .../src/game/deckview/deck_view_container.cpp | 4 +- .../deckview/tabbed_deck_view_container.cpp | 2 +- .../{ => game}/dialogs/dlg_create_token.cpp | 10 +- .../src/{ => game}/dialogs/dlg_create_token.h | 0 .../dialogs/dlg_move_top_cards_until.cpp | 6 +- .../dialogs/dlg_move_top_cards_until.h | 0 .../src/{ => game}/dialogs/dlg_roll_dice.cpp | 0 .../src/{ => game}/dialogs/dlg_roll_dice.h | 0 cockatrice/src/game/game.cpp | 2 +- cockatrice/src/game/game_event_handler.cpp | 6 +- cockatrice/src/game/game_scene.cpp | 2 +- cockatrice/src/game/hand_counter.h | 2 +- .../log}/message_log_widget.cpp | 16 +- .../{server => game/log}/message_log_widget.h | 6 +- .../{client/ui => game}/phases_toolbar.cpp | 2 +- .../src/{client/ui => game}/phases_toolbar.h | 2 +- cockatrice/src/game/player/menu/card_menu.cpp | 2 +- cockatrice/src/game/player/menu/grave_menu.h | 2 +- cockatrice/src/game/player/menu/hand_menu.h | 2 +- .../src/game/player/menu/library_menu.h | 2 +- .../src/game/player/menu/player_menu.cpp | 2 +- cockatrice/src/game/player/menu/player_menu.h | 2 +- cockatrice/src/game/player/menu/rfg_menu.h | 2 +- cockatrice/src/game/player/player.cpp | 4 +- cockatrice/src/game/player/player.h | 4 +- cockatrice/src/game/player/player_actions.cpp | 6 +- cockatrice/src/game/player/player_area.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 | 8 +- cockatrice/src/game/player/player_target.cpp | 2 +- cockatrice/src/game/replay.cpp | 2 +- cockatrice/src/game/zones/hand_zone.cpp | 2 +- cockatrice/src/game/zones/stack_zone.cpp | 2 +- cockatrice/src/game/zones/table_zone.cpp | 2 +- .../src/game/zones/view_zone_widget.cpp | 2 +- .../ui => interface}/layouts/flow_layout.cpp | 0 .../ui => interface}/layouts/flow_layout.h | 0 .../layouts/overlap_layout.cpp | 0 .../ui => interface}/layouts/overlap_layout.h | 0 .../ui => interface}/line_edit_completer.cpp | 0 .../ui => interface}/line_edit_completer.h | 2 +- .../ui => interface}/pixel_map_generator.cpp | 0 .../ui => interface}/pixel_map_generator.h | 0 .../src/{client => interface}/tearoff_menu.h | 0 .../ui => interface}/theme_manager.cpp | 2 +- .../{client/ui => interface}/theme_manager.h | 0 .../additional_info/color_identity_widget.cpp | 2 +- .../additional_info/color_identity_widget.h | 2 +- .../additional_info/mana_cost_widget.cpp | 0 .../cards/additional_info/mana_cost_widget.h | 2 +- .../additional_info/mana_symbol_widget.cpp | 2 +- .../additional_info/mana_symbol_widget.h | 0 .../card_group_display_widget.cpp | 8 +- .../card_group_display_widget.h | 4 +- .../flat_card_group_display_widget.cpp | 6 +- .../flat_card_group_display_widget.h | 0 .../overlapped_card_group_display_widget.cpp | 6 +- .../overlapped_card_group_display_widget.h | 0 .../cards/card_info_display_widget.cpp | 6 +- .../widgets/cards/card_info_display_widget.h | 2 +- .../widgets/cards/card_info_frame_widget.cpp | 6 +- .../widgets/cards/card_info_frame_widget.h | 2 +- .../card_info_picture_art_crop_widget.cpp | 2 +- .../cards/card_info_picture_art_crop_widget.h | 0 .../card_info_picture_enlarged_widget.cpp | 4 +- .../cards/card_info_picture_enlarged_widget.h | 2 +- .../cards/card_info_picture_widget.cpp | 8 +- .../widgets/cards/card_info_picture_widget.h | 2 +- ..._info_picture_with_text_overlay_widget.cpp | 0 ...rd_info_picture_with_text_overlay_widget.h | 0 .../widgets/cards/card_info_text_widget.cpp | 4 +- .../widgets/cards/card_info_text_widget.h | 2 +- .../widgets/cards/card_size_widget.cpp | 2 +- .../widgets/cards/card_size_widget.h | 0 .../cards/deck_card_zone_display_widget.cpp | 4 +- .../cards/deck_card_zone_display_widget.h | 4 +- .../deck_preview_card_picture_widget.cpp | 2 +- .../cards/deck_preview_card_picture_widget.h | 0 .../deck_analytics/deck_analytics_widget.cpp | 0 .../deck_analytics/deck_analytics_widget.h | 4 +- .../deck_analytics/mana_base_widget.cpp | 6 +- .../widgets/deck_analytics/mana_base_widget.h | 2 +- .../deck_analytics/mana_curve_widget.cpp | 8 +- .../deck_analytics/mana_curve_widget.h | 2 +- .../deck_analytics/mana_devotion_widget.cpp | 8 +- .../deck_analytics/mana_devotion_widget.h | 2 +- .../deck_editor_card_info_dock_widget.cpp | 0 .../deck_editor_card_info_dock_widget.h | 0 .../deck_editor_database_display_widget.cpp | 8 +- .../deck_editor_database_display_widget.h | 6 +- .../deck_editor_deck_dock_widget.cpp | 4 +- .../deck_editor_deck_dock_widget.h | 6 +- .../deck_editor_filter_dock_widget.cpp | 8 +- .../deck_editor_filter_dock_widget.h | 2 +- ...k_editor_printing_selector_dock_widget.cpp | 0 ...eck_editor_printing_selector_dock_widget.h | 0 .../widgets/general/background_sources.cpp | 0 .../widgets/general/background_sources.h | 0 .../widgets/general/display/banner_widget.cpp | 2 +- .../widgets/general/display/banner_widget.h | 0 .../widgets/general/display/bar_widget.cpp | 0 .../widgets/general/display/bar_widget.h | 0 .../display/dynamic_font_size_label.cpp | 0 .../general/display/dynamic_font_size_label.h | 0 .../display/dynamic_font_size_push_button.cpp | 0 .../display/dynamic_font_size_push_button.h | 0 .../widgets/general/display/labeled_input.cpp | 0 .../widgets/general/display/labeled_input.h | 0 .../general/display/percent_bar_widget.cpp | 0 .../general/display/percent_bar_widget.h | 0 .../display/shadow_background_label.cpp | 0 .../general/display/shadow_background_label.h | 0 .../widgets/general/home_styled_button.cpp | 0 .../widgets/general/home_styled_button.h | 0 .../widgets/general/home_widget.cpp | 6 +- .../widgets/general/home_widget.h | 2 +- .../general/layout_containers/flow_widget.cpp | 0 .../general/layout_containers/flow_widget.h | 0 .../overlap_control_widget.cpp | 0 .../overlap_control_widget.h | 0 .../layout_containers/overlap_widget.cpp | 2 +- .../layout_containers/overlap_widget.h | 0 .../all_zones_card_amount_widget.cpp | 0 .../all_zones_card_amount_widget.h | 4 +- .../printing_selector/card_amount_widget.cpp | 0 .../printing_selector/card_amount_widget.h | 6 +- .../printing_selector/printing_selector.cpp | 6 +- .../printing_selector/printing_selector.h | 4 +- .../printing_selector_card_display_widget.cpp | 0 .../printing_selector_card_display_widget.h | 4 +- .../printing_selector_card_overlay_widget.cpp | 4 +- .../printing_selector_card_overlay_widget.h | 6 +- .../printing_selector_card_search_widget.cpp | 0 .../printing_selector_card_search_widget.h | 0 ...rinting_selector_card_selection_widget.cpp | 2 +- .../printing_selector_card_selection_widget.h | 0 .../printing_selector_card_sorting_widget.cpp | 4 +- .../printing_selector_card_sorting_widget.h | 0 ...e_and_collectors_number_display_widget.cpp | 0 ...ame_and_collectors_number_display_widget.h | 0 .../quick_settings/settings_button_widget.cpp | 0 .../quick_settings/settings_button_widget.h | 0 .../quick_settings/settings_popup_widget.cpp | 0 .../quick_settings/settings_popup_widget.h | 0 ...l_database_display_color_filter_widget.cpp | 2 +- ...ual_database_display_color_filter_widget.h | 2 +- ...tabase_display_filter_save_load_widget.cpp | 4 +- ...database_display_filter_save_load_widget.h | 2 +- ...tabase_display_main_type_filter_widget.cpp | 6 +- ...database_display_main_type_filter_widget.h | 2 +- ...al_database_display_name_filter_widget.cpp | 2 +- ...sual_database_display_name_filter_widget.h | 2 +- ...ual_database_display_set_filter_widget.cpp | 8 +- ...isual_database_display_set_filter_widget.h | 2 +- ...atabase_display_sub_type_filter_widget.cpp | 6 +- ..._database_display_sub_type_filter_widget.h | 2 +- .../visual_database_display_widget.cpp | 14 +- .../visual_database_display_widget.h | 12 +- .../visual_database_filter_display_widget.cpp | 2 +- .../visual_database_filter_display_widget.h | 0 .../visual_deck_editor_sample_hand_widget.cpp | 6 +- .../visual_deck_editor_sample_hand_widget.h | 4 +- .../visual_deck_editor_widget.cpp | 18 +- .../visual_deck_editor_widget.h | 8 +- ...k_preview_color_identity_filter_widget.cpp | 0 ...eck_preview_color_identity_filter_widget.h | 0 .../deck_preview_deck_tags_display_widget.cpp | 4 +- .../deck_preview_deck_tags_display_widget.h | 2 +- .../deck_preview_tag_addition_widget.cpp | 2 +- .../deck_preview_tag_addition_widget.h | 0 .../deck_preview/deck_preview_tag_dialog.cpp | 4 +- .../deck_preview/deck_preview_tag_dialog.h | 0 .../deck_preview_tag_display_widget.cpp | 0 .../deck_preview_tag_display_widget.h | 0 .../deck_preview_tag_item_widget.cpp | 0 .../deck_preview_tag_item_widget.h | 0 .../deck_preview/deck_preview_widget.cpp | 4 +- .../deck_preview/deck_preview_widget.h | 2 +- ...ual_deck_storage_folder_display_widget.cpp | 2 +- ...isual_deck_storage_folder_display_widget.h | 0 ...ual_deck_storage_quick_settings_widget.cpp | 2 +- ...isual_deck_storage_quick_settings_widget.h | 0 .../visual_deck_storage_search_widget.cpp | 6 +- .../visual_deck_storage_search_widget.h | 0 .../visual_deck_storage_sort_widget.cpp | 2 +- .../visual_deck_storage_sort_widget.h | 0 .../visual_deck_storage_tag_filter_widget.cpp | 0 .../visual_deck_storage_tag_filter_widget.h | 0 .../visual_deck_storage_widget.cpp | 4 +- .../visual_deck_storage_widget.h | 4 +- .../{client/ui => interface}/window_main.cpp | 48 +-- .../{client/ui => interface}/window_main.h | 2 +- cockatrice/src/main.cpp | 6 +- .../ui => }/picture_loader/picture_loader.cpp | 2 +- .../ui => }/picture_loader/picture_loader.h | 2 +- .../picture_loader/picture_loader_local.cpp | 4 +- .../picture_loader/picture_loader_local.h | 2 +- ...e_loader_request_status_display_widget.cpp | 0 ...ure_loader_request_status_display_widget.h | 0 .../picture_loader_status_bar.cpp | 0 .../picture_loader_status_bar.h | 2 +- .../picture_loader/picture_loader_worker.cpp | 4 +- .../picture_loader/picture_loader_worker.h | 4 +- .../picture_loader_worker_work.cpp | 4 +- .../picture_loader_worker_work.h | 2 +- .../picture_loader/picture_to_load.cpp | 4 +- .../ui => }/picture_loader/picture_to_load.h | 2 +- cockatrice/src/server/chat_view/chat_view.cpp | 4 +- cockatrice/src/server/chat_view/chat_view.h | 2 +- .../src/{game => server}/game_selector.cpp | 14 +- .../src/{game => server}/game_selector.h | 0 .../src/{game => server}/game_type_map.h | 0 .../src/{game => server}/games_model.cpp | 8 +- cockatrice/src/{game => server}/games_model.h | 0 .../src/server/user/user_context_menu.cpp | 8 +- cockatrice/src/server/user/user_info_box.cpp | 2 +- .../src/server/user/user_list_widget.cpp | 10 +- .../tabs/abstract_tab_deck_editor.cpp | 26 +- .../tabs/abstract_tab_deck_editor.h | 16 +- .../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 | 2 +- .../average_deck/edhrec_deck_api_response.h | 2 +- .../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 | 2 +- ...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 | 2 +- ...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 | 4 +- ...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 .../tabs/api/edhrec/tab_edhrec.cpp | 0 .../{client => }/tabs/api/edhrec/tab_edhrec.h | 4 +- .../tabs/api/edhrec/tab_edhrec_main.cpp | 6 +- .../tabs/api/edhrec/tab_edhrec_main.h | 8 +- cockatrice/src/{client => }/tabs/tab.cpp | 4 +- cockatrice/src/{client => }/tabs/tab.h | 0 .../src/{client => }/tabs/tab_account.cpp | 14 +- .../src/{client => }/tabs/tab_account.h | 0 .../src/{client => }/tabs/tab_admin.cpp | 4 +- cockatrice/src/{client => }/tabs/tab_admin.h | 0 .../src/{client => }/tabs/tab_deck_editor.cpp | 28 +- .../src/{client => }/tabs/tab_deck_editor.h | 6 +- .../{client => }/tabs/tab_deck_storage.cpp | 10 +- .../src/{client => }/tabs/tab_deck_storage.h | 4 +- cockatrice/src/{client => }/tabs/tab_game.cpp | 50 +-- cockatrice/src/{client => }/tabs/tab_game.h | 12 +- cockatrice/src/{client => }/tabs/tab_home.cpp | 0 cockatrice/src/{client => }/tabs/tab_home.h | 4 +- cockatrice/src/{client => }/tabs/tab_logs.cpp | 8 +- cockatrice/src/{client => }/tabs/tab_logs.h | 0 .../src/{client => }/tabs/tab_message.cpp | 16 +- .../src/{client => }/tabs/tab_message.h | 0 .../src/{client => }/tabs/tab_replays.cpp | 8 +- .../src/{client => }/tabs/tab_replays.h | 2 +- cockatrice/src/{client => }/tabs/tab_room.cpp | 18 +- cockatrice/src/{client => }/tabs/tab_room.h | 2 +- .../src/{client => }/tabs/tab_server.cpp | 6 +- cockatrice/src/{client => }/tabs/tab_server.h | 0 .../src/{client => }/tabs/tab_supervisor.cpp | 12 +- .../src/{client => }/tabs/tab_supervisor.h | 4 +- .../tabs/tab_visual_database_display.cpp | 0 .../tabs/tab_visual_database_display.h | 2 +- .../tab_deck_editor_visual.cpp | 20 +- .../tab_deck_editor_visual.h | 0 .../tab_deck_editor_visual_tab_widget.cpp | 2 +- .../tab_deck_editor_visual_tab_widget.h | 10 +- .../tab_deck_storage_visual.cpp | 6 +- .../tab_deck_storage_visual.h | 0 .../deck_list_sort_filter_proxy_model.cpp | 55 +++ .../deck_list_sort_filter_proxy_model.h | 52 +-- oracle/CMakeLists.txt | 24 +- oracle/src/main.cpp | 2 +- 337 files changed, 728 insertions(+), 721 deletions(-) rename cockatrice/src/client/{menus/deck_editor => }/deck_editor_menu.cpp (99%) rename cockatrice/src/client/{menus/deck_editor => }/deck_editor_menu.h (95%) rename cockatrice/src/{client/ui => dialogs}/tip_of_the_day.cpp (100%) rename cockatrice/src/{client/ui => dialogs}/tip_of_the_day.h (100%) rename cockatrice/src/{client => game/board}/translate_counter_name.cpp (100%) rename cockatrice/src/{client => game/board}/translate_counter_name.h (100%) rename cockatrice/src/{ => game}/dialogs/dlg_create_token.cpp (97%) rename cockatrice/src/{ => game}/dialogs/dlg_create_token.h (100%) rename cockatrice/src/{ => game}/dialogs/dlg_move_top_cards_until.cpp (96%) rename cockatrice/src/{ => game}/dialogs/dlg_move_top_cards_until.h (100%) rename cockatrice/src/{ => game}/dialogs/dlg_roll_dice.cpp (100%) rename cockatrice/src/{ => game}/dialogs/dlg_roll_dice.h (100%) rename cockatrice/src/{server => game/log}/message_log_widget.cpp (99%) rename cockatrice/src/{server => game/log}/message_log_widget.h (97%) rename cockatrice/src/{client/ui => game}/phases_toolbar.cpp (99%) rename cockatrice/src/{client/ui => game}/phases_toolbar.h (97%) rename cockatrice/src/{client/ui => interface}/layouts/flow_layout.cpp (100%) rename cockatrice/src/{client/ui => interface}/layouts/flow_layout.h (100%) rename cockatrice/src/{client/ui => interface}/layouts/overlap_layout.cpp (100%) rename cockatrice/src/{client/ui => interface}/layouts/overlap_layout.h (100%) rename cockatrice/src/{client/ui => interface}/line_edit_completer.cpp (100%) rename cockatrice/src/{client/ui => interface}/line_edit_completer.h (93%) rename cockatrice/src/{client/ui => interface}/pixel_map_generator.cpp (100%) rename cockatrice/src/{client/ui => interface}/pixel_map_generator.h (100%) rename cockatrice/src/{client => interface}/tearoff_menu.h (100%) rename cockatrice/src/{client/ui => interface}/theme_manager.cpp (99%) rename cockatrice/src/{client/ui => interface}/theme_manager.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/cards/additional_info/color_identity_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/cards/additional_info/color_identity_widget.h (93%) rename cockatrice/src/{client/ui => interface}/widgets/cards/additional_info/mana_cost_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/cards/additional_info/mana_cost_widget.h (91%) rename cockatrice/src/{client/ui => interface}/widgets/cards/additional_info/mana_symbol_widget.cpp (97%) rename cockatrice/src/{client/ui => interface}/widgets/cards/additional_info/mana_symbol_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp (95%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_group_display_widgets/card_group_display_widget.h (96%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp (93%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp (94%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_display_widget.cpp (94%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_display_widget.h (94%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_frame_widget.cpp (97%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_frame_widget.h (96%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_picture_art_crop_widget.cpp (96%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_picture_art_crop_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_picture_enlarged_widget.cpp (97%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_picture_enlarged_widget.h (95%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_picture_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_picture_widget.h (98%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_picture_with_text_overlay_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_picture_with_text_overlay_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_text_widget.cpp (96%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_info_text_widget.h (92%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_size_widget.cpp (97%) rename cockatrice/src/{client/ui => interface}/widgets/cards/card_size_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/cards/deck_card_zone_display_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/cards/deck_card_zone_display_widget.h (96%) rename cockatrice/src/{client/ui => interface}/widgets/cards/deck_preview_card_picture_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/cards/deck_preview_card_picture_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/deck_analytics/deck_analytics_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/deck_analytics/deck_analytics_widget.h (88%) rename cockatrice/src/{client/ui => interface}/widgets/deck_analytics/mana_base_widget.cpp (96%) rename cockatrice/src/{client/ui => interface}/widgets/deck_analytics/mana_base_widget.h (95%) rename cockatrice/src/{client/ui => interface}/widgets/deck_analytics/mana_curve_widget.cpp (94%) rename cockatrice/src/{client/ui => interface}/widgets/deck_analytics/mana_curve_widget.h (93%) rename cockatrice/src/{client/ui => interface}/widgets/deck_analytics/mana_devotion_widget.cpp (96%) rename cockatrice/src/{client/ui => interface}/widgets/deck_analytics/mana_devotion_widget.h (95%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_card_info_dock_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_database_display_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_database_display_widget.h (92%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_deck_dock_widget.cpp (99%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_deck_dock_widget.h (95%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_filter_dock_widget.cpp (96%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_filter_dock_widget.h (95%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/background_sources.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/background_sources.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/banner_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/banner_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/bar_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/bar_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/dynamic_font_size_label.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/dynamic_font_size_label.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/dynamic_font_size_push_button.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/dynamic_font_size_push_button.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/labeled_input.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/labeled_input.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/percent_bar_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/percent_bar_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/shadow_background_label.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/display/shadow_background_label.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/home_styled_button.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/home_styled_button.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/home_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/general/home_widget.h (95%) rename cockatrice/src/{client/ui => interface}/widgets/general/layout_containers/flow_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/layout_containers/flow_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/layout_containers/overlap_control_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/layout_containers/overlap_control_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/general/layout_containers/overlap_widget.cpp (99%) rename cockatrice/src/{client/ui => interface}/widgets/general/layout_containers/overlap_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/all_zones_card_amount_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/all_zones_card_amount_widget.h (93%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/card_amount_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/card_amount_widget.h (93%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector.h (95%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_display_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_display_widget.h (93%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_overlay_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_overlay_widget.h (90%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_search_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_search_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_selection_widget.cpp (97%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_selection_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_sorting_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/printing_selector_card_sorting_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/printing_selector/set_name_and_collectors_number_display_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/quick_settings/settings_button_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/quick_settings/settings_button_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/quick_settings/settings_popup_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/quick_settings/settings_popup_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp (99%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_color_filter_widget.h (97%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h (95%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h (96%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp (99%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_name_filter_widget.h (96%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_set_filter_widget.h (97%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h (96%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_widget.cpp (97%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_display_widget.h (93%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_filter_display_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_database_display/visual_database_filter_display_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp (96%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h (88%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_editor/visual_deck_editor_widget.cpp (97%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_editor/visual_deck_editor_widget.h (93%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h (93%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp (99%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp (99%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp (99%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp (95%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_search_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h (100%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_widget.cpp (98%) rename cockatrice/src/{client/ui => interface}/widgets/visual_deck_storage/visual_deck_storage_widget.h (95%) rename cockatrice/src/{client/ui => interface}/window_main.cpp (98%) rename cockatrice/src/{client/ui => interface}/window_main.h (99%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader.cpp (99%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader.h (97%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_local.cpp (98%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_local.h (96%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_request_status_display_widget.cpp (100%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_request_status_display_widget.h (100%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_status_bar.cpp (100%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_status_bar.h (90%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_worker.cpp (98%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_worker.h (97%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_worker_work.cpp (98%) rename cockatrice/src/{client/ui => }/picture_loader/picture_loader_worker_work.h (97%) rename cockatrice/src/{client/ui => }/picture_loader/picture_to_load.cpp (99%) rename cockatrice/src/{client/ui => }/picture_loader/picture_to_load.h (96%) rename cockatrice/src/{game => server}/game_selector.cpp (98%) rename cockatrice/src/{game => server}/game_selector.h (100%) rename cockatrice/src/{game => server}/game_type_map.h (100%) rename cockatrice/src/{game => server}/games_model.cpp (99%) rename cockatrice/src/{game => server}/games_model.h (100%) rename cockatrice/src/{client => }/tabs/abstract_tab_deck_editor.cpp (96%) rename cockatrice/src/{client => }/tabs/abstract_tab_deck_editor.h (89%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp (92%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h (91%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h (90%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp (96%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h (93%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h (90%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp (93%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h (82%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h (89%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp (93%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h (93%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp (98%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/tab_edhrec.cpp (100%) rename cockatrice/src/{client => }/tabs/api/edhrec/tab_edhrec.h (88%) rename cockatrice/src/{client => }/tabs/api/edhrec/tab_edhrec_main.cpp (98%) rename cockatrice/src/{client => }/tabs/api/edhrec/tab_edhrec_main.h (87%) rename cockatrice/src/{client => }/tabs/tab.cpp (94%) rename cockatrice/src/{client => }/tabs/tab.h (100%) rename cockatrice/src/{client => }/tabs/tab_account.cpp (96%) rename cockatrice/src/{client => }/tabs/tab_account.h (100%) rename cockatrice/src/{client => }/tabs/tab_admin.cpp (99%) rename cockatrice/src/{client => }/tabs/tab_admin.h (100%) rename cockatrice/src/{client => }/tabs/tab_deck_editor.cpp (94%) rename cockatrice/src/{client => }/tabs/tab_deck_editor.h (83%) rename cockatrice/src/{client => }/tabs/tab_deck_storage.cpp (99%) rename cockatrice/src/{client => }/tabs/tab_deck_storage.h (96%) rename cockatrice/src/{client => }/tabs/tab_game.cpp (98%) rename cockatrice/src/{client => }/tabs/tab_game.h (95%) rename cockatrice/src/{client => }/tabs/tab_home.cpp (100%) rename cockatrice/src/{client => }/tabs/tab_home.h (82%) rename cockatrice/src/{client => }/tabs/tab_logs.cpp (98%) rename cockatrice/src/{client => }/tabs/tab_logs.h (100%) rename cockatrice/src/{client => }/tabs/tab_message.cpp (94%) rename cockatrice/src/{client => }/tabs/tab_message.h (100%) rename cockatrice/src/{client => }/tabs/tab_replays.cpp (99%) rename cockatrice/src/{client => }/tabs/tab_replays.h (98%) rename cockatrice/src/{client => }/tabs/tab_room.cpp (96%) rename cockatrice/src/{client => }/tabs/tab_room.h (98%) rename cockatrice/src/{client => }/tabs/tab_server.cpp (98%) rename cockatrice/src/{client => }/tabs/tab_server.h (100%) rename cockatrice/src/{client => }/tabs/tab_supervisor.cpp (99%) rename cockatrice/src/{client => }/tabs/tab_supervisor.h (98%) rename cockatrice/src/{client => }/tabs/tab_visual_database_display.cpp (100%) rename cockatrice/src/{client => }/tabs/tab_visual_database_display.h (85%) rename cockatrice/src/{client => }/tabs/visual_deck_editor/tab_deck_editor_visual.cpp (96%) rename cockatrice/src/{client => }/tabs/visual_deck_editor/tab_deck_editor_visual.h (100%) rename cockatrice/src/{client => }/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp (97%) rename cockatrice/src/{client => }/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h (84%) rename cockatrice/src/{client => }/tabs/visual_deck_storage/tab_deck_storage_visual.cpp (85%) rename cockatrice/src/{client => }/tabs/visual_deck_storage/tab_deck_storage_visual.h (100%) create mode 100644 cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index e02934128..8ab72174d 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -9,149 +9,17 @@ set(cockatrice_SOURCES # sort by alphabetical order, so that there is no debate about where to add new sources to the list src/card/card_info.cpp src/card/exact_card.cpp + src/client/deck_editor_menu.cpp src/client/get_text_with_max.cpp - src/client/menus/deck_editor/deck_editor_menu.cpp src/client/network/client_update_checker.cpp + src/client/network/parsers/deck_link_to_api_transformer.cpp src/client/network/release_channel.cpp src/client/network/replay_timeline_widget.cpp src/client/network/sets_model.cpp src/client/network/spoiler_background_updater.cpp - src/client/network/parsers/deck_link_to_api_transformer.cpp src/client/replay_manager.cpp src/client/sound_engine.cpp - src/client/tabs/abstract_tab_deck_editor.cpp - src/client/tabs/api/edhrec/tab_edhrec.cpp - src/client/tabs/api/edhrec/tab_edhrec_main.cpp - src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp - src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp - src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp - src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp - src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp - src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp - src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp - src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp - src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp - src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp - src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp - src/client/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp - src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp - src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp - src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp - src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp - src/client/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp - src/client/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp - src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp - src/client/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp - src/client/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp - src/client/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp - src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp - src/client/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp - src/client/tabs/tab.cpp - src/client/tabs/tab_account.cpp - src/client/tabs/tab_admin.cpp - src/client/tabs/tab_deck_editor.cpp - src/client/tabs/tab_deck_storage.cpp - src/client/tabs/tab_game.cpp - src/client/tabs/tab_home.cpp - src/client/tabs/tab_logs.cpp - src/client/tabs/tab_message.cpp - src/client/tabs/tab_replays.cpp - src/client/tabs/tab_room.cpp - src/client/tabs/tab_server.cpp - src/client/tabs/tab_supervisor.cpp - src/client/tabs/tab_visual_database_display.cpp - src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp - src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp - src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp src/client/tapped_out_interface.cpp - src/client/translate_counter_name.cpp - src/client/ui/layouts/flow_layout.cpp - src/client/ui/layouts/overlap_layout.cpp - src/client/ui/line_edit_completer.cpp - src/client/ui/phases_toolbar.cpp - src/client/ui/picture_loader/picture_loader.cpp - src/client/ui/picture_loader/picture_loader_local.cpp - src/client/ui/picture_loader/picture_loader_request_status_display_widget.cpp - src/client/ui/picture_loader/picture_loader_status_bar.cpp - src/client/ui/picture_loader/picture_loader_worker.cpp - src/client/ui/picture_loader/picture_loader_worker_work.cpp - src/client/ui/picture_loader/picture_to_load.cpp - src/client/ui/pixel_map_generator.cpp - src/client/ui/theme_manager.cpp - src/client/ui/tip_of_the_day.cpp - src/client/ui/widgets/cards/additional_info/color_identity_widget.cpp - src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp - src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp - src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp - src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp - src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp - src/client/ui/widgets/cards/card_info_display_widget.cpp - src/client/ui/widgets/cards/card_info_frame_widget.cpp - src/client/ui/widgets/cards/card_info_picture_art_crop_widget.cpp - src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp - src/client/ui/widgets/cards/card_info_picture_widget.cpp - src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.cpp - src/client/ui/widgets/cards/card_info_text_widget.cpp - src/client/ui/widgets/cards/card_size_widget.cpp - src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp - src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp - src/client/ui/widgets/deck_analytics/deck_analytics_widget.cpp - src/client/ui/widgets/deck_analytics/mana_base_widget.cpp - src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp - src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp - src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp - src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp - src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp - src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp - src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp - src/client/ui/widgets/general/background_sources.cpp - src/client/ui/widgets/general/home_styled_button.cpp - src/client/ui/widgets/general/home_widget.cpp - src/client/ui/widgets/general/display/banner_widget.cpp - src/client/ui/widgets/general/display/bar_widget.cpp - src/client/ui/widgets/general/display/dynamic_font_size_label.cpp - src/client/ui/widgets/general/display/dynamic_font_size_push_button.cpp - src/client/ui/widgets/general/display/labeled_input.cpp - src/client/ui/widgets/general/display/percent_bar_widget.cpp - src/client/ui/widgets/general/display/shadow_background_label.cpp - src/client/ui/widgets/general/layout_containers/flow_widget.cpp - src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp - src/client/ui/widgets/general/layout_containers/overlap_widget.cpp - src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp - src/client/ui/widgets/printing_selector/card_amount_widget.cpp - src/client/ui/widgets/printing_selector/printing_selector.cpp - src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp - src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp - src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp - src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp - src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp - src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp - src/client/ui/widgets/quick_settings/settings_button_widget.cpp - src/client/ui/widgets/quick_settings/settings_popup_widget.cpp - src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp - src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp - src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp - src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp - src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp - src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp - src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp - src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp - src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp - src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp - src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp - src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp - src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp - src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp - src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp - src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp - src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp - src/client/ui/window_main.cpp src/client/update_downloader.cpp src/database/card_completer_proxy_model.cpp src/database/card_database.cpp @@ -168,7 +36,6 @@ set(cockatrice_SOURCES src/dialogs/dlg_connect.cpp src/dialogs/dlg_convert_deck_to_cod_format.cpp src/dialogs/dlg_create_game.cpp - src/dialogs/dlg_create_token.cpp src/dialogs/dlg_default_tags_editor.cpp src/dialogs/dlg_edit_avatar.cpp src/dialogs/dlg_edit_password.cpp @@ -183,15 +50,14 @@ set(cockatrice_SOURCES src/dialogs/dlg_load_deck_from_website.cpp src/dialogs/dlg_load_remote_deck.cpp src/dialogs/dlg_manage_sets.cpp - src/dialogs/dlg_move_top_cards_until.cpp src/dialogs/dlg_register.cpp - src/dialogs/dlg_roll_dice.cpp src/dialogs/dlg_select_set_for_cards.cpp src/dialogs/dlg_settings.cpp src/dialogs/dlg_startup_card_check.cpp src/dialogs/dlg_tip_of_the_day.cpp src/dialogs/dlg_update.cpp src/dialogs/dlg_view_log.cpp + src/dialogs/tip_of_the_day.cpp src/filters/deck_filter_string.cpp src/filters/filter_builder.cpp src/filters/filter_card.cpp @@ -199,6 +65,7 @@ set(cockatrice_SOURCES src/filters/filter_tree.cpp src/filters/filter_tree_model.cpp src/filters/syntax_help.cpp + src/game/abstract_game.cpp src/game/board/abstract_card_drag_item.cpp src/game/board/abstract_card_item.cpp src/game/board/abstract_counter.cpp @@ -209,30 +76,23 @@ set(cockatrice_SOURCES src/game/board/card_item.cpp src/game/board/card_list.cpp src/game/board/counter_general.cpp + src/game/board/translate_counter_name.cpp src/game/deckview/deck_view.cpp src/game/deckview/deck_view_container.cpp src/game/deckview/tabbed_deck_view_container.cpp - src/game/abstract_game.cpp + src/game/dialogs/dlg_create_token.cpp + src/game/dialogs/dlg_move_top_cards_until.cpp + src/game/dialogs/dlg_roll_dice.cpp src/game/game.cpp src/game/game_event_handler.cpp src/game/game_meta_info.cpp src/game/game_scene.cpp - src/game/game_selector.cpp src/game/game_state.cpp src/game/game_view.cpp - src/game/games_model.cpp src/game/hand_counter.cpp + src/game/log/message_log_widget.cpp src/game/phase.cpp - src/game/player/event_processing_options.h - src/game/player/player.cpp - src/game/player/player_actions.cpp - src/game/player/player_area.cpp - src/game/player/player_event_handler.cpp - src/game/player/player_graphics_item.cpp - src/game/player/player_info.cpp - src/game/player/player_list_widget.cpp - src/game/player/player_manager.cpp - src/game/player/player_target.cpp + src/game/phases_toolbar.cpp src/game/player/menu/card_menu.cpp src/game/player/menu/custom_zone_menu.cpp src/game/player/menu/grave_menu.cpp @@ -245,29 +105,124 @@ set(cockatrice_SOURCES src/game/player/menu/say_menu.cpp src/game/player/menu/sideboard_menu.cpp src/game/player/menu/utility_menu.cpp + src/game/player/player.cpp + src/game/player/player_actions.cpp + src/game/player/player_area.cpp + src/game/player/player_event_handler.cpp + src/game/player/player_graphics_item.cpp + src/game/player/player_info.cpp + src/game/player/player_list_widget.cpp + src/game/player/player_manager.cpp + src/game/player/player_target.cpp src/game/replay.cpp src/game/zones/card_zone.cpp src/game/zones/hand_zone.cpp - src/game/zones/pile_zone.cpp - src/game/zones/select_zone.cpp - src/game/zones/stack_zone.cpp - src/game/zones/table_zone.cpp - src/game/zones/view_zone.cpp - src/game/zones/view_zone_widget.cpp src/game/zones/logic/card_zone_logic.cpp src/game/zones/logic/hand_zone_logic.cpp src/game/zones/logic/pile_zone_logic.cpp src/game/zones/logic/stack_zone_logic.cpp src/game/zones/logic/table_zone_logic.cpp src/game/zones/logic/view_zone_logic.cpp + src/game/zones/pile_zone.cpp + src/game/zones/select_zone.cpp + src/game/zones/stack_zone.cpp + src/game/zones/table_zone.cpp + src/game/zones/view_zone.cpp + src/game/zones/view_zone_widget.cpp + src/interface/layouts/flow_layout.cpp + src/interface/layouts/overlap_layout.cpp + src/interface/line_edit_completer.cpp + src/interface/pixel_map_generator.cpp + src/interface/theme_manager.cpp + src/interface/widgets/cards/additional_info/color_identity_widget.cpp + src/interface/widgets/cards/additional_info/mana_cost_widget.cpp + src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp + src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp + src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp + src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp + src/interface/widgets/cards/card_info_display_widget.cpp + src/interface/widgets/cards/card_info_frame_widget.cpp + src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp + src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp + src/interface/widgets/cards/card_info_picture_widget.cpp + src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp + src/interface/widgets/cards/card_info_text_widget.cpp + src/interface/widgets/cards/card_size_widget.cpp + src/interface/widgets/cards/deck_card_zone_display_widget.cpp + src/interface/widgets/cards/deck_preview_card_picture_widget.cpp + src/interface/widgets/deck_analytics/deck_analytics_widget.cpp + src/interface/widgets/deck_analytics/mana_base_widget.cpp + src/interface/widgets/deck_analytics/mana_curve_widget.cpp + src/interface/widgets/deck_analytics/mana_devotion_widget.cpp + src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp + src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp + src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp + src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp + src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp + src/interface/widgets/general/background_sources.cpp + src/interface/widgets/general/display/banner_widget.cpp + src/interface/widgets/general/display/bar_widget.cpp + src/interface/widgets/general/display/dynamic_font_size_label.cpp + src/interface/widgets/general/display/dynamic_font_size_push_button.cpp + src/interface/widgets/general/display/labeled_input.cpp + src/interface/widgets/general/display/percent_bar_widget.cpp + src/interface/widgets/general/display/shadow_background_label.cpp + src/interface/widgets/general/home_styled_button.cpp + src/interface/widgets/general/home_widget.cpp + src/interface/widgets/general/layout_containers/flow_widget.cpp + src/interface/widgets/general/layout_containers/overlap_control_widget.cpp + src/interface/widgets/general/layout_containers/overlap_widget.cpp + src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp + src/interface/widgets/printing_selector/card_amount_widget.cpp + src/interface/widgets/printing_selector/printing_selector.cpp + src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp + src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp + src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp + src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp + src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp + src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp + src/interface/widgets/quick_settings/settings_button_widget.cpp + src/interface/widgets/quick_settings/settings_popup_widget.cpp + src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp + src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp + src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp + src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp + src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp + src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp + src/interface/widgets/visual_database_display/visual_database_display_widget.cpp + src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp + src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp + src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp + src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp + src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp + src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp + src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp + src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp + src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp + src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp + src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp + src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp + src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp + src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp + src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp + src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp + src/interface/window_main.cpp src/main.cpp + src/picture_loader/picture_loader.cpp + src/picture_loader/picture_loader_local.cpp + src/picture_loader/picture_loader_request_status_display_widget.cpp + src/picture_loader/picture_loader_status_bar.cpp + src/picture_loader/picture_loader_worker.cpp + src/picture_loader/picture_loader_worker_work.cpp + src/picture_loader/picture_to_load.cpp src/server/abstract_client.cpp src/server/chat_view/chat_view.cpp + src/server/game_selector.cpp + src/server/games_model.cpp src/server/handle_public_servers.cpp src/server/local_client.cpp src/server/local_server.cpp src/server/local_server_interface.cpp - src/server/message_log_widget.cpp src/server/pending_command.cpp src/server/remote/remote_client.cpp src/server/remote/remote_decklist_tree_widget.cpp @@ -291,8 +246,52 @@ set(cockatrice_SOURCES src/settings/settings_manager.cpp src/settings/shortcut_treeview.cpp src/settings/shortcuts_settings.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/utility/card_info_comparator.cpp - src/utility/deck_list_sort_filter_proxy_model.h + src/utility/deck_list_sort_filter_proxy_model.cpp src/utility/key_signals.cpp src/utility/levenshtein.cpp src/utility/logger.cpp diff --git a/cockatrice/src/card/card_info.cpp b/cockatrice/src/card/card_info.cpp index 74ed3203e..e516a2dca 100644 --- a/cockatrice/src/card/card_info.cpp +++ b/cockatrice/src/card/card_info.cpp @@ -1,6 +1,6 @@ #include "card_info.h" -#include "../client/ui/picture_loader/picture_loader.h" +#include "../picture_loader/picture_loader.h" #include "../settings/cache_settings.h" #include "game_specific_terms.h" diff --git a/cockatrice/src/client/menus/deck_editor/deck_editor_menu.cpp b/cockatrice/src/client/deck_editor_menu.cpp similarity index 99% rename from cockatrice/src/client/menus/deck_editor/deck_editor_menu.cpp rename to cockatrice/src/client/deck_editor_menu.cpp index ae58d2878..b3c46d003 100644 --- a/cockatrice/src/client/menus/deck_editor/deck_editor_menu.cpp +++ b/cockatrice/src/client/deck_editor_menu.cpp @@ -1,7 +1,7 @@ #include "deck_editor_menu.h" -#include "../../../settings/cache_settings.h" -#include "../../../settings/shortcuts_settings.h" +#include "../settings/cache_settings.h" +#include "../settings/shortcuts_settings.h" DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent) { diff --git a/cockatrice/src/client/menus/deck_editor/deck_editor_menu.h b/cockatrice/src/client/deck_editor_menu.h similarity index 95% rename from cockatrice/src/client/menus/deck_editor/deck_editor_menu.h rename to cockatrice/src/client/deck_editor_menu.h index 7cac10bdc..af3dc65d5 100644 --- a/cockatrice/src/client/menus/deck_editor/deck_editor_menu.h +++ b/cockatrice/src/client/deck_editor_menu.h @@ -1,7 +1,7 @@ #ifndef DECK_EDITOR_MENU_H #define DECK_EDITOR_MENU_H -#include "../../tabs/abstract_tab_deck_editor.h" +#include "../tabs/abstract_tab_deck_editor.h" #include diff --git a/cockatrice/src/client/network/spoiler_background_updater.cpp b/cockatrice/src/client/network/spoiler_background_updater.cpp index 3e10b1bce..68fdc4c4c 100644 --- a/cockatrice/src/client/network/spoiler_background_updater.cpp +++ b/cockatrice/src/client/network/spoiler_background_updater.cpp @@ -2,9 +2,9 @@ #include "../../database/card_database.h" #include "../../database/card_database_manager.h" +#include "../../interface/window_main.h" #include "../../main.h" #include "../../settings/cache_settings.h" -#include "../ui/window_main.h" #include #include diff --git a/cockatrice/src/client/replay_manager.cpp b/cockatrice/src/client/replay_manager.cpp index 1890d3308..843632c99 100644 --- a/cockatrice/src/client/replay_manager.cpp +++ b/cockatrice/src/client/replay_manager.cpp @@ -1,6 +1,6 @@ #include "replay_manager.h" -#include "tabs/tab_game.h" +#include "../tabs/tab_game.h" #include #include diff --git a/cockatrice/src/client/replay_manager.h b/cockatrice/src/client/replay_manager.h index 4c5f0ea38..4dc7869b9 100644 --- a/cockatrice/src/client/replay_manager.h +++ b/cockatrice/src/client/replay_manager.h @@ -1,11 +1,14 @@ #ifndef REPLAY_MANAGER_H #define REPLAY_MANAGER_H + #include "network/replay_timeline_widget.h" #include "pb/game_replay.pb.h" -#include "tabs/tab_game.h" +#include #include +class TabGame; + class ReplayManager : public QWidget { Q_OBJECT diff --git a/cockatrice/src/database/card_database.cpp b/cockatrice/src/database/card_database.cpp index 294b8e659..315716884 100644 --- a/cockatrice/src/database/card_database.cpp +++ b/cockatrice/src/database/card_database.cpp @@ -1,10 +1,10 @@ #include "card_database.h" -#include "../client/ui/picture_loader/picture_loader.h" +#include "../picture_loader/picture_loader.h" #include "../settings/cache_settings.h" #include "../utility/card_set_comparator.h" -#include "./parser/cockatrice_xml_3.h" -#include "./parser/cockatrice_xml_4.h" +#include "parser/cockatrice_xml_3.h" +#include "parser/cockatrice_xml_4.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp index ea1c7a8f7..02c595121 100644 --- a/cockatrice/src/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/dialogs/dlg_create_game.cpp @@ -1,8 +1,8 @@ #include "dlg_create_game.h" -#include "../client/tabs/tab_room.h" #include "../server/pending_command.h" #include "../settings/cache_settings.h" +#include "../tabs/tab_room.h" #include "pb/serverinfo_game.pb.h" #include "trice_limits.h" diff --git a/cockatrice/src/dialogs/dlg_filter_games.h b/cockatrice/src/dialogs/dlg_filter_games.h index 1120a64ee..d805755d9 100644 --- a/cockatrice/src/dialogs/dlg_filter_games.h +++ b/cockatrice/src/dialogs/dlg_filter_games.h @@ -1,7 +1,7 @@ #ifndef DLG_FILTER_GAMES_H #define DLG_FILTER_GAMES_H -#include "../game/games_model.h" +#include "../server/games_model.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp index b6ed4c5ad..890afc075 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp @@ -1,10 +1,10 @@ #include "dlg_manage_sets.h" #include "../client/network/sets_model.h" -#include "../client/ui/picture_loader/picture_loader.h" #include "../database/card_database_manager.h" #include "../deck/custom_line_edit.h" #include "../main.h" +#include "../picture_loader/picture_loader.h" #include "../settings/cache_settings.h" #include diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index 53375f92e..ac23e4159 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp @@ -1,9 +1,9 @@ #include "dlg_select_set_for_cards.h" -#include "../client/ui/widgets/cards/card_info_picture_widget.h" -#include "../client/ui/widgets/general/layout_containers/flow_widget.h" #include "../database/card_database_manager.h" #include "../deck/deck_loader.h" +#include "../interface/widgets/cards/card_info_picture_widget.h" +#include "../interface/widgets/general/layout_containers/flow_widget.h" #include "dlg_select_set_for_cards.h" #include diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/dialogs/dlg_select_set_for_cards.h index 11d82ba7e..8b7b79a9f 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.h +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.h @@ -1,8 +1,8 @@ #ifndef DLG_SELECT_SET_FOR_CARDS_H #define DLG_SELECT_SET_FOR_CARDS_H -#include "../client/ui/widgets/general/layout_containers/flow_widget.h" #include "../deck/deck_list_model.h" +#include "../interface/widgets/general/layout_containers/flow_widget.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index 1c79d1cff..6948a8e8b 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -4,17 +4,17 @@ #include "../client/network/release_channel.h" #include "../client/network/spoiler_background_updater.h" #include "../client/sound_engine.h" -#include "../client/tabs/tab_supervisor.h" -#include "../client/ui/picture_loader/picture_loader.h" -#include "../client/ui/theme_manager.h" -#include "../client/ui/widgets/general/background_sources.h" #include "../database/card_database.h" #include "../database/card_database_manager.h" #include "../deck/custom_line_edit.h" +#include "../interface/theme_manager.h" +#include "../interface/widgets/general/background_sources.h" #include "../main.h" +#include "../picture_loader/picture_loader.h" #include "../settings/cache_settings.h" #include "../settings/card_counter_settings.h" #include "../settings/shortcut_treeview.h" +#include "../tabs/tab_supervisor.h" #include "../utility/sequence_edit.h" #include diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp index c4b579492..eb8e8dc47 100644 --- a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp +++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp @@ -1,7 +1,7 @@ #include "dlg_tip_of_the_day.h" -#include "../client/ui/tip_of_the_day.h" #include "../settings/cache_settings.h" +#include "tip_of_the_day.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_update.cpp b/cockatrice/src/dialogs/dlg_update.cpp index 7f4cdb56e..0edcb1512 100644 --- a/cockatrice/src/dialogs/dlg_update.cpp +++ b/cockatrice/src/dialogs/dlg_update.cpp @@ -2,7 +2,7 @@ #include "../client/network/client_update_checker.h" #include "../client/network/release_channel.h" -#include "../client/ui/window_main.h" +#include "../interface/window_main.h" #include "../settings/cache_settings.h" #include diff --git a/cockatrice/src/client/ui/tip_of_the_day.cpp b/cockatrice/src/dialogs/tip_of_the_day.cpp similarity index 100% rename from cockatrice/src/client/ui/tip_of_the_day.cpp rename to cockatrice/src/dialogs/tip_of_the_day.cpp diff --git a/cockatrice/src/client/ui/tip_of_the_day.h b/cockatrice/src/dialogs/tip_of_the_day.h similarity index 100% rename from cockatrice/src/client/ui/tip_of_the_day.h rename to cockatrice/src/dialogs/tip_of_the_day.h diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h index a7ab8601e..37e19b3ba 100644 --- a/cockatrice/src/filters/deck_filter_string.h +++ b/cockatrice/src/filters/deck_filter_string.h @@ -1,7 +1,7 @@ #ifndef DECK_FILTER_STRING_H #define DECK_FILTER_STRING_H -#include "../client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h" +#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h" #include #include diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp index 5fa3a71be..7fdc25ffe 100644 --- a/cockatrice/src/game/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -1,8 +1,8 @@ #include "abstract_card_item.h" -#include "../../client/ui/picture_loader/picture_loader.h" #include "../../database/card_database.h" #include "../../database/card_database_manager.h" +#include "../../picture_loader/picture_loader.h" #include "../../settings/cache_settings.h" #include "../game_scene.h" diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp index be5398029..c821dc4f8 100644 --- a/cockatrice/src/game/board/abstract_counter.cpp +++ b/cockatrice/src/game/board/abstract_counter.cpp @@ -1,12 +1,12 @@ #include "abstract_counter.h" -#include "../../client/tabs/tab_game.h" -#include "../../client/translate_counter_name.h" #include "../../settings/cache_settings.h" +#include "../../tabs/tab_game.h" #include "../player/player.h" #include "expression.h" #include "pb/command_inc_counter.pb.h" #include "pb/command_set_counter.pb.h" +#include "translate_counter_name.h" #include #include diff --git a/cockatrice/src/game/board/abstract_counter.h b/cockatrice/src/game/board/abstract_counter.h index 4c9ae064a..dca167ffa 100644 --- a/cockatrice/src/game/board/abstract_counter.h +++ b/cockatrice/src/game/board/abstract_counter.h @@ -1,7 +1,7 @@ #ifndef COUNTER_H #define COUNTER_H -#include "../../client/tearoff_menu.h" +#include "../../interface/tearoff_menu.h" #include #include diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index 98a745fd1..da347098f 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -1,9 +1,9 @@ #include "card_item.h" #include "../../card/card_info.h" -#include "../../client/tabs/tab_game.h" #include "../../settings/cache_settings.h" #include "../../settings/card_counter_settings.h" +#include "../../tabs/tab_game.h" #include "../game_scene.h" #include "../player/player.h" #include "../zones/card_zone.h" diff --git a/cockatrice/src/game/board/counter_general.cpp b/cockatrice/src/game/board/counter_general.cpp index 6bd94cbee..c71077324 100644 --- a/cockatrice/src/game/board/counter_general.cpp +++ b/cockatrice/src/game/board/counter_general.cpp @@ -1,6 +1,6 @@ #include "counter_general.h" -#include "../../client/ui/pixel_map_generator.h" +#include "../../interface/pixel_map_generator.h" #include "abstract_graphics_item.h" #include diff --git a/cockatrice/src/client/translate_counter_name.cpp b/cockatrice/src/game/board/translate_counter_name.cpp similarity index 100% rename from cockatrice/src/client/translate_counter_name.cpp rename to cockatrice/src/game/board/translate_counter_name.cpp diff --git a/cockatrice/src/client/translate_counter_name.h b/cockatrice/src/game/board/translate_counter_name.h similarity index 100% rename from cockatrice/src/client/translate_counter_name.h rename to cockatrice/src/game/board/translate_counter_name.h diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp index 3c95027bd..46b1cc524 100644 --- a/cockatrice/src/game/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -1,7 +1,7 @@ #include "deck_view.h" #include "../../card/card_info.h" -#include "../../client/ui/theme_manager.h" +#include "../../interface/theme_manager.h" #include "../../settings/cache_settings.h" #include "deck_list.h" #include "deck_list_card_node.h" diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 103ab49d2..2f6e9a105 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,7 +1,5 @@ #include "deck_view_container.h" -#include "../../client/tabs/tab_game.h" -#include "../../client/ui/picture_loader/picture_loader.h" #include "../../database/card_database.h" #include "../../database/card_database_manager.h" #include "../../deck/deck_loader.h" @@ -9,8 +7,10 @@ #include "../../dialogs/dlg_load_deck_from_clipboard.h" #include "../../dialogs/dlg_load_deck_from_website.h" #include "../../dialogs/dlg_load_remote_deck.h" +#include "../../picture_loader/picture_loader.h" #include "../../server/pending_command.h" #include "../../settings/cache_settings.h" +#include "../../tabs/tab_game.h" #include "../game_scene.h" #include "deck_view.h" #include "pb/command_deck_select.pb.h" diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp index fc3c63acf..34fb16260 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 "../../client/tabs/tab_game.h" +#include "../../tabs/tab_game.h" #include "deck_view.h" TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent) diff --git a/cockatrice/src/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp similarity index 97% rename from cockatrice/src/dialogs/dlg_create_token.cpp rename to cockatrice/src/game/dialogs/dlg_create_token.cpp index a92594979..132ee988c 100644 --- a/cockatrice/src/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp @@ -1,10 +1,10 @@ #include "dlg_create_token.h" -#include "../client/ui/widgets/cards/card_info_picture_widget.h" -#include "../database/card_database_manager.h" -#include "../database/card_database_model.h" -#include "../main.h" -#include "../settings/cache_settings.h" +#include "../../database/card_database_manager.h" +#include "../../database/card_database_model.h" +#include "../../interface/widgets/cards/card_info_picture_widget.h" +#include "../../main.h" +#include "../../settings/cache_settings.h" #include "deck_list.h" #include "trice_limits.h" diff --git a/cockatrice/src/dialogs/dlg_create_token.h b/cockatrice/src/game/dialogs/dlg_create_token.h similarity index 100% rename from cockatrice/src/dialogs/dlg_create_token.h rename to cockatrice/src/game/dialogs/dlg_create_token.h diff --git a/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp similarity index 96% rename from cockatrice/src/dialogs/dlg_move_top_cards_until.cpp rename to cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp index 23d8e22db..53b762fb4 100644 --- a/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp +++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp @@ -1,8 +1,8 @@ #include "dlg_move_top_cards_until.h" -#include "../database/card_database.h" -#include "../database/card_database_manager.h" -#include "../filters/filter_string.h" +#include "../../database/card_database.h" +#include "../../database/card_database_manager.h" +#include "../../filters/filter_string.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h similarity index 100% rename from cockatrice/src/dialogs/dlg_move_top_cards_until.h rename to cockatrice/src/game/dialogs/dlg_move_top_cards_until.h diff --git a/cockatrice/src/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_roll_dice.cpp rename to cockatrice/src/game/dialogs/dlg_roll_dice.cpp diff --git a/cockatrice/src/dialogs/dlg_roll_dice.h b/cockatrice/src/game/dialogs/dlg_roll_dice.h similarity index 100% rename from cockatrice/src/dialogs/dlg_roll_dice.h rename to cockatrice/src/game/dialogs/dlg_roll_dice.h diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp index 89009f8d6..d24d4cb51 100644 --- a/cockatrice/src/game/game.cpp +++ b/cockatrice/src/game/game.cpp @@ -1,6 +1,6 @@ #include "game.h" -#include "../client/tabs/tab_game.h" +#include "../tabs/tab_game.h" #include "pb/event_game_joined.pb.h" Game::Game(TabGame *_tab, diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index d2dd97a2c..ef5ca96db 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -1,11 +1,11 @@ #include "game_event_handler.h" -#include "../client/tabs/tab_game.h" #include "../server/abstract_client.h" -#include "../server/message_log_widget.h" #include "../server/pending_command.h" +#include "../tabs/tab_game.h" #include "abstract_game.h" #include "get_pb_extension.h" +#include "log/message_log_widget.h" #include "pb/command_concede.pb.h" #include "pb/command_delete_arrow.pb.h" #include "pb/command_game_say.pb.h" @@ -501,4 +501,4 @@ void GameEventHandler::eventSetActivePhase(const Event_SetActivePhase &event, } game->getGameState()->setCurrentPhase(phase); emitUserEvent(); -} \ No newline at end of file +} diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp index a9bce298a..f0e82532b 100644 --- a/cockatrice/src/game/game_scene.cpp +++ b/cockatrice/src/game/game_scene.cpp @@ -1,8 +1,8 @@ #include "game_scene.h" -#include "../client/ui/phases_toolbar.h" #include "../settings/cache_settings.h" #include "board/card_item.h" +#include "phases_toolbar.h" #include "player/player.h" #include "player/player_graphics_item.h" #include "zones/view_zone.h" diff --git a/cockatrice/src/game/hand_counter.h b/cockatrice/src/game/hand_counter.h index feb536fce..d1879b03d 100644 --- a/cockatrice/src/game/hand_counter.h +++ b/cockatrice/src/game/hand_counter.h @@ -1,7 +1,7 @@ #ifndef HANDCOUNTER_H #define HANDCOUNTER_H -#include "../game/board/abstract_graphics_item.h" +#include "board/abstract_graphics_item.h" #include "board/graphics_item_type.h" #include diff --git a/cockatrice/src/server/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp similarity index 99% rename from cockatrice/src/server/message_log_widget.cpp rename to cockatrice/src/game/log/message_log_widget.cpp index 7cf8522d9..ed8a4e49c 100644 --- a/cockatrice/src/server/message_log_widget.cpp +++ b/cockatrice/src/game/log/message_log_widget.cpp @@ -1,13 +1,13 @@ #include "message_log_widget.h" -#include "../client/sound_engine.h" -#include "../client/tabs/tab_game.h" -#include "../client/translate_counter_name.h" -#include "../game/board/card_item.h" -#include "../game/phase.h" -#include "../game/player/player.h" -#include "../game/zones/card_zone.h" -#include "../settings/card_counter_settings.h" +#include "../../client/sound_engine.h" +#include "../../settings/card_counter_settings.h" +#include "../../tabs/tab_game.h" +#include "../board/card_item.h" +#include "../board/translate_counter_name.h" +#include "../phase.h" +#include "../player/player.h" +#include "../zones/card_zone.h" #include "pb/context_move_card.pb.h" #include "pb/context_mulligan.pb.h" #include "pb/serverinfo_user.pb.h" diff --git a/cockatrice/src/server/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h similarity index 97% rename from cockatrice/src/server/message_log_widget.h rename to cockatrice/src/game/log/message_log_widget.h index e496bb4e9..b7b1c7902 100644 --- a/cockatrice/src/server/message_log_widget.h +++ b/cockatrice/src/game/log/message_log_widget.h @@ -1,9 +1,9 @@ #ifndef MESSAGELOGWIDGET_H #define MESSAGELOGWIDGET_H -#include "../client/translation.h" -#include "../game/zones/logic/card_zone_logic.h" -#include "chat_view/chat_view.h" +#include "../../client/translation.h" +#include "../../server/chat_view/chat_view.h" +#include "../zones/logic/card_zone_logic.h" #include "user_level.h" class AbstractGame; diff --git a/cockatrice/src/client/ui/phases_toolbar.cpp b/cockatrice/src/game/phases_toolbar.cpp similarity index 99% rename from cockatrice/src/client/ui/phases_toolbar.cpp rename to cockatrice/src/game/phases_toolbar.cpp index 7c3bede16..2fef5321c 100644 --- a/cockatrice/src/client/ui/phases_toolbar.cpp +++ b/cockatrice/src/game/phases_toolbar.cpp @@ -1,10 +1,10 @@ #include "phases_toolbar.h" +#include "../interface/pixel_map_generator.h" #include "pb/command_draw_cards.pb.h" #include "pb/command_next_turn.pb.h" #include "pb/command_set_active_phase.pb.h" #include "pb/command_set_card_attr.pb.h" -#include "pixel_map_generator.h" #include #include diff --git a/cockatrice/src/client/ui/phases_toolbar.h b/cockatrice/src/game/phases_toolbar.h similarity index 97% rename from cockatrice/src/client/ui/phases_toolbar.h rename to cockatrice/src/game/phases_toolbar.h index 3567e741b..1191d6a79 100644 --- a/cockatrice/src/client/ui/phases_toolbar.h +++ b/cockatrice/src/game/phases_toolbar.h @@ -1,7 +1,7 @@ #ifndef PHASESTOOLBAR_H #define PHASESTOOLBAR_H -#include "../../game/board/abstract_graphics_item.h" +#include "board/abstract_graphics_item.h" #include #include diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp index bf3ab5375..114655cb8 100644 --- a/cockatrice/src/game/player/menu/card_menu.cpp +++ b/cockatrice/src/game/player/menu/card_menu.cpp @@ -1,8 +1,8 @@ #include "card_menu.h" -#include "../../../client/tabs/tab_game.h" #include "../../../database/card_database_manager.h" #include "../../../settings/card_counter_settings.h" +#include "../../../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/grave_menu.h b/cockatrice/src/game/player/menu/grave_menu.h index 1e471aa6b..1f5ea5966 100644 --- a/cockatrice/src/game/player/menu/grave_menu.h +++ b/cockatrice/src/game/player/menu/grave_menu.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_GRAVE_MENU_H #define COCKATRICE_GRAVE_MENU_H -#include "../../../client/tearoff_menu.h" +#include "../../../interface/tearoff_menu.h" #include #include diff --git a/cockatrice/src/game/player/menu/hand_menu.h b/cockatrice/src/game/player/menu/hand_menu.h index d8aefb351..968832cc6 100644 --- a/cockatrice/src/game/player/menu/hand_menu.h +++ b/cockatrice/src/game/player/menu/hand_menu.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_HAND_MENU_H #define COCKATRICE_HAND_MENU_H -#include "../../../client/tearoff_menu.h" +#include "../../../interface/tearoff_menu.h" #include #include diff --git a/cockatrice/src/game/player/menu/library_menu.h b/cockatrice/src/game/player/menu/library_menu.h index a91aebcdd..9914a99a5 100644 --- a/cockatrice/src/game/player/menu/library_menu.h +++ b/cockatrice/src/game/player/menu/library_menu.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_LIBRARY_MENU_H #define COCKATRICE_LIBRARY_MENU_H -#include "../../../client/tearoff_menu.h" +#include "../../../interface/tearoff_menu.h" #include #include diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp index d6abb3168..4d3f12510 100644 --- a/cockatrice/src/game/player/menu/player_menu.cpp +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -1,8 +1,8 @@ #include "player_menu.h" -#include "../../../client/tabs/tab_game.h" #include "../../../common/pb/command_reveal_cards.pb.h" #include "../../../database/card_database_manager.h" +#include "../../../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/menu/player_menu.h b/cockatrice/src/game/player/menu/player_menu.h index b2059250d..a89b6a927 100644 --- a/cockatrice/src/game/player/menu/player_menu.h +++ b/cockatrice/src/game/player/menu/player_menu.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_PLAYER_MENU_H #define COCKATRICE_PLAYER_MENU_H -#include "../../../client/tearoff_menu.h" +#include "../../../interface/tearoff_menu.h" #include "../player.h" #include "custom_zone_menu.h" #include "grave_menu.h" diff --git a/cockatrice/src/game/player/menu/rfg_menu.h b/cockatrice/src/game/player/menu/rfg_menu.h index 506b3af61..0d9700f39 100644 --- a/cockatrice/src/game/player/menu/rfg_menu.h +++ b/cockatrice/src/game/player/menu/rfg_menu.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_RFG_MENU_H #define COCKATRICE_RFG_MENU_H -#include "../../../client/tearoff_menu.h" +#include "../../../interface/tearoff_menu.h" #include #include diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index 001b6bcec..b7faa0868 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -1,7 +1,7 @@ #include "player.h" -#include "../../client/tabs/tab_game.h" -#include "../../client/ui/theme_manager.h" +#include "../../interface/theme_manager.h" +#include "../../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.h b/cockatrice/src/game/player/player.h index acc262d01..7226f165b 100644 --- a/cockatrice/src/game/player/player.h +++ b/cockatrice/src/game/player/player.h @@ -2,10 +2,10 @@ #define PLAYER_H #include "../../card/card_info.h" -#include "../../client/tearoff_menu.h" -#include "../../dialogs/dlg_create_token.h" #include "../../filters/filter_string.h" +#include "../../interface/tearoff_menu.h" #include "../board/abstract_graphics_item.h" +#include "../dialogs/dlg_create_token.h" #include "menu/player_menu.h" #include "pb/card_attributes.pb.h" #include "pb/game_event.pb.h" diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index 4f9a79843..e7b50dac0 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -2,11 +2,11 @@ #include "../../../common/pb/context_move_card.pb.h" #include "../../client/get_text_with_max.h" -#include "../../client/tabs/tab_game.h" #include "../../database/card_database_manager.h" -#include "../../dialogs/dlg_move_top_cards_until.h" -#include "../../dialogs/dlg_roll_dice.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" #include "../zones/logic/view_zone_logic.h" #include "card_menu_action_type.h" #include "pb/command_attach_card.pb.h" diff --git a/cockatrice/src/game/player/player_area.cpp b/cockatrice/src/game/player/player_area.cpp index 2ac6821f2..86b8c2d1b 100644 --- a/cockatrice/src/game/player/player_area.cpp +++ b/cockatrice/src/game/player/player_area.cpp @@ -1,6 +1,6 @@ #include "player_area.h" -#include "../../client/ui/theme_manager.h" +#include "../../interface/theme_manager.h" #include diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp index 88697f010..969ffd4d2 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 "../../client/tabs/tab_game.h" +#include "../../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 d4f7d47e3..b4553694b 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 "../../client/tabs/tab_game.h" +#include "../../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 72bed247d..9df7e94da 100644 --- a/cockatrice/src/game/player/player_list_widget.cpp +++ b/cockatrice/src/game/player/player_list_widget.cpp @@ -1,13 +1,13 @@ #include "player_list_widget.h" -#include "../../client/tabs/tab_account.h" -#include "../../client/tabs/tab_game.h" -#include "../../client/tabs/tab_supervisor.h" -#include "../../client/ui/pixel_map_generator.h" +#include "../../interface/pixel_map_generator.h" #include "../../server/abstract_client.h" #include "../../server/user/user_context_menu.h" #include "../../server/user/user_list_manager.h" #include "../../server/user/user_list_widget.h" +#include "../../tabs/tab_account.h" +#include "../../tabs/tab_game.h" +#include "../../tabs/tab_supervisor.h" #include "pb/command_kick_from_game.pb.h" #include "pb/serverinfo_playerproperties.pb.h" #include "pb/session_commands.pb.h" diff --git a/cockatrice/src/game/player/player_target.cpp b/cockatrice/src/game/player/player_target.cpp index ffc934822..6ece3e261 100644 --- a/cockatrice/src/game/player/player_target.cpp +++ b/cockatrice/src/game/player/player_target.cpp @@ -1,6 +1,6 @@ #include "player_target.h" -#include "../../client/ui/pixel_map_generator.h" +#include "../../interface/pixel_map_generator.h" #include "pb/serverinfo_user.pb.h" #include "player.h" diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp index e52ed8a7c..ca57af9bc 100644 --- a/cockatrice/src/game/replay.cpp +++ b/cockatrice/src/game/replay.cpp @@ -1,6 +1,6 @@ #include "replay.h" -#include "../client/tabs/tab_game.h" +#include "../tabs/tab_game.h" Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab) { diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp index 298926ff5..19ea272b2 100644 --- a/cockatrice/src/game/zones/hand_zone.cpp +++ b/cockatrice/src/game/zones/hand_zone.cpp @@ -1,6 +1,6 @@ #include "hand_zone.h" -#include "../../client/ui/theme_manager.h" +#include "../../interface/theme_manager.h" #include "../../settings/cache_settings.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp index 3c940366b..0eedd5500 100644 --- a/cockatrice/src/game/zones/stack_zone.cpp +++ b/cockatrice/src/game/zones/stack_zone.cpp @@ -1,6 +1,6 @@ #include "stack_zone.h" -#include "../../client/ui/theme_manager.h" +#include "../../interface/theme_manager.h" #include "../../settings/cache_settings.h" #include "../board/arrow_item.h" #include "../board/card_drag_item.h" diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp index c46ff91de..4573cc5c3 100644 --- a/cockatrice/src/game/zones/table_zone.cpp +++ b/cockatrice/src/game/zones/table_zone.cpp @@ -1,7 +1,7 @@ #include "table_zone.h" #include "../../card/card_info.h" -#include "../../client/ui/theme_manager.h" +#include "../../interface/theme_manager.h" #include "../../settings/cache_settings.h" #include "../board/arrow_item.h" #include "../board/card_drag_item.h" diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp index aad7175bb..f0615d256 100644 --- a/cockatrice/src/game/zones/view_zone_widget.cpp +++ b/cockatrice/src/game/zones/view_zone_widget.cpp @@ -1,7 +1,7 @@ #include "view_zone_widget.h" -#include "../../client/ui/pixel_map_generator.h" #include "../../filters/syntax_help.h" +#include "../../interface/pixel_map_generator.h" #include "../../settings/cache_settings.h" #include "../board/card_item.h" #include "../game_scene.h" diff --git a/cockatrice/src/client/ui/layouts/flow_layout.cpp b/cockatrice/src/interface/layouts/flow_layout.cpp similarity index 100% rename from cockatrice/src/client/ui/layouts/flow_layout.cpp rename to cockatrice/src/interface/layouts/flow_layout.cpp diff --git a/cockatrice/src/client/ui/layouts/flow_layout.h b/cockatrice/src/interface/layouts/flow_layout.h similarity index 100% rename from cockatrice/src/client/ui/layouts/flow_layout.h rename to cockatrice/src/interface/layouts/flow_layout.h diff --git a/cockatrice/src/client/ui/layouts/overlap_layout.cpp b/cockatrice/src/interface/layouts/overlap_layout.cpp similarity index 100% rename from cockatrice/src/client/ui/layouts/overlap_layout.cpp rename to cockatrice/src/interface/layouts/overlap_layout.cpp diff --git a/cockatrice/src/client/ui/layouts/overlap_layout.h b/cockatrice/src/interface/layouts/overlap_layout.h similarity index 100% rename from cockatrice/src/client/ui/layouts/overlap_layout.h rename to cockatrice/src/interface/layouts/overlap_layout.h diff --git a/cockatrice/src/client/ui/line_edit_completer.cpp b/cockatrice/src/interface/line_edit_completer.cpp similarity index 100% rename from cockatrice/src/client/ui/line_edit_completer.cpp rename to cockatrice/src/interface/line_edit_completer.cpp diff --git a/cockatrice/src/client/ui/line_edit_completer.h b/cockatrice/src/interface/line_edit_completer.h similarity index 93% rename from cockatrice/src/client/ui/line_edit_completer.h rename to cockatrice/src/interface/line_edit_completer.h index 2eadb8347..28b176665 100644 --- a/cockatrice/src/client/ui/line_edit_completer.h +++ b/cockatrice/src/interface/line_edit_completer.h @@ -1,7 +1,7 @@ #ifndef LINEEDITCOMPLETER_H #define LINEEDITCOMPLETER_H -#include "../../deck/custom_line_edit.h" +#include "../deck/custom_line_edit.h" #include #include diff --git a/cockatrice/src/client/ui/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp similarity index 100% rename from cockatrice/src/client/ui/pixel_map_generator.cpp rename to cockatrice/src/interface/pixel_map_generator.cpp diff --git a/cockatrice/src/client/ui/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h similarity index 100% rename from cockatrice/src/client/ui/pixel_map_generator.h rename to cockatrice/src/interface/pixel_map_generator.h diff --git a/cockatrice/src/client/tearoff_menu.h b/cockatrice/src/interface/tearoff_menu.h similarity index 100% rename from cockatrice/src/client/tearoff_menu.h rename to cockatrice/src/interface/tearoff_menu.h diff --git a/cockatrice/src/client/ui/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp similarity index 99% rename from cockatrice/src/client/ui/theme_manager.cpp rename to cockatrice/src/interface/theme_manager.cpp index 78d1344a1..58a411c99 100644 --- a/cockatrice/src/client/ui/theme_manager.cpp +++ b/cockatrice/src/interface/theme_manager.cpp @@ -1,6 +1,6 @@ #include "theme_manager.h" -#include "../../settings/cache_settings.h" +#include "../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/ui/theme_manager.h b/cockatrice/src/interface/theme_manager.h similarity index 100% rename from cockatrice/src/client/ui/theme_manager.h rename to cockatrice/src/interface/theme_manager.h diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.cpp rename to cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp index 59388bfc3..c00fd7cb2 100644 --- a/cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp @@ -1,6 +1,6 @@ #include "color_identity_widget.h" -#include "../../../../../settings/cache_settings.h" +#include "../../../../settings/cache_settings.h" #include "mana_symbol_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h similarity index 93% rename from cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.h rename to cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h index 2e90b6973..6a2f4c180 100644 --- a/cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.h +++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h @@ -1,7 +1,7 @@ #ifndef COLOR_IDENTITY_WIDGET_H #define COLOR_IDENTITY_WIDGET_H -#include "../../../../../card/card_info.h" +#include "../../../../card/card_info.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp rename to cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h similarity index 91% rename from cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.h rename to cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h index 066f975d6..e9d1ce20d 100644 --- a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.h +++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h @@ -1,7 +1,7 @@ #ifndef MANA_COST_WIDGET_H #define MANA_COST_WIDGET_H -#include "../../../../../card/card_info.h" +#include "../../../../card/card_info.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp similarity index 97% rename from cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp rename to cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp index b17b0ff47..aae22190b 100644 --- a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp @@ -1,6 +1,6 @@ #include "mana_symbol_widget.h" -#include "../../../../../settings/cache_settings.h" +#include "../../../../settings/cache_settings.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.h rename to cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp similarity index 95% rename from cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index b9c38363e..260d23102 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp @@ -1,9 +1,9 @@ #include "card_group_display_widget.h" -#include "../../../../../database/card_database_manager.h" -#include "../../../../../deck/deck_list_model.h" -#include "../../../../../utility/card_info_comparator.h" -#include "../../../../../utility/deck_list_sort_filter_proxy_model.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../deck/deck_list_model.h" +#include "../../../../utility/card_info_comparator.h" +#include "../../../../utility/deck_list_sort_filter_proxy_model.h" #include "../card_info_picture_with_text_overlay_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h similarity index 96% rename from cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h rename to cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h index dea782255..14ac494cf 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h @@ -1,8 +1,8 @@ #ifndef CARD_GROUP_DISPLAY_WIDGET_H #define CARD_GROUP_DISPLAY_WIDGET_H -#include "../../../../../card/card_info.h" -#include "../../../../../deck/deck_list_model.h" +#include "../../../../card/card_info.h" +#include "../../../../deck/deck_list_model.h" #include "../../general/display/banner_widget.h" #include "../card_info_picture_with_text_overlay_widget.h" #include "../card_size_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp similarity index 93% rename from cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp index 6100eac09..391edb2da 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp @@ -1,8 +1,8 @@ #include "flat_card_group_display_widget.h" -#include "../../../../../database/card_database_manager.h" -#include "../../../../../deck/deck_list_model.h" -#include "../../../../../utility/card_info_comparator.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../deck/deck_list_model.h" +#include "../../../../utility/card_info_comparator.h" #include "../card_info_picture_with_text_overlay_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h rename to cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp similarity index 94% rename from cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp index 0caec281e..c549ceefe 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp @@ -1,8 +1,8 @@ #include "overlapped_card_group_display_widget.h" -#include "../../../../../database/card_database_manager.h" -#include "../../../../../deck/deck_list_model.h" -#include "../../../../../utility/card_info_comparator.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../deck/deck_list_model.h" +#include "../../../../utility/card_info_comparator.h" #include "../card_info_picture_with_text_overlay_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h rename to cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp similarity index 94% rename from cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp index 729fbc743..cf0626dd1 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp @@ -1,8 +1,8 @@ #include "card_info_display_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../game/board/card_item.h" -#include "../../../../main.h" +#include "../../../database/card_database_manager.h" +#include "../../../game/board/card_item.h" +#include "../../../main.h" #include "card_info_picture_widget.h" #include "card_info_text_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.h b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h similarity index 94% rename from cockatrice/src/client/ui/widgets/cards/card_info_display_widget.h rename to cockatrice/src/interface/widgets/cards/card_info_display_widget.h index 3d67c1036..070dcf835 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h @@ -1,7 +1,7 @@ #ifndef CARDINFOWIDGET_H #define CARDINFOWIDGET_H -#include "../../../../card/exact_card.h" +#include "../../../card/exact_card.h" #include "card_ref.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp similarity index 97% rename from cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp index dc405ff0f..44b56a9af 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp @@ -1,8 +1,8 @@ #include "card_info_frame_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../game/board/card_item.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_manager.h" +#include "../../../game/board/card_item.h" +#include "../../../settings/cache_settings.h" #include "card_info_display_widget.h" #include "card_info_picture_widget.h" #include "card_info_text_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h similarity index 96% rename from cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h rename to cockatrice/src/interface/widgets/cards/card_info_frame_widget.h index 4848fb54d..b23c447bf 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h @@ -1,7 +1,7 @@ #ifndef CARDFRAME_H #define CARDFRAME_H -#include "../../../../card/exact_card.h" +#include "../../../card/exact_card.h" #include "card_ref.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_art_crop_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp similarity index 96% rename from cockatrice/src/client/ui/widgets/cards/card_info_picture_art_crop_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp index 5f5962a1c..e7acabce9 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_art_crop_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp @@ -1,6 +1,6 @@ #include "card_info_picture_art_crop_widget.h" -#include "../../picture_loader/picture_loader.h" +#include "../../../picture_loader/picture_loader.h" CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent) : CardInfoPictureWidget(parent, false, false) diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_art_crop_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/cards/card_info_picture_art_crop_widget.h rename to cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp similarity index 97% rename from cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp index 0abc738c3..02ba37b74 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp @@ -1,7 +1,7 @@ #include "card_info_picture_enlarged_widget.h" -#include "../../../../settings/cache_settings.h" -#include "../../picture_loader/picture_loader.h" +#include "../../../picture_loader/picture_loader.h" +#include "../../../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h similarity index 95% rename from cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.h rename to cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h index 7344547df..6a2628847 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h @@ -1,7 +1,7 @@ #ifndef CARD_PICTURE_ENLARGED_WIDGET_H #define CARD_PICTURE_ENLARGED_WIDGET_H -#include "../../../../card/exact_card.h" +#include "../../../card/exact_card.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp index 1fc98e986..7ca14d490 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -1,10 +1,10 @@ #include "card_info_picture_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../game/board/card_item.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_manager.h" +#include "../../../game/board/card_item.h" +#include "../../../picture_loader/picture_loader.h" +#include "../../../settings/cache_settings.h" #include "../../../tabs/tab_supervisor.h" -#include "../../picture_loader/picture_loader.h" #include "../../window_main.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h similarity index 98% rename from cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h rename to cockatrice/src/interface/widgets/cards/card_info_picture_widget.h index 92822489f..f70104898 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h @@ -1,7 +1,7 @@ #ifndef CARD_INFO_PICTURE_H #define CARD_INFO_PICTURE_H -#include "../../../../card/exact_card.h" +#include "../../../card/exact_card.h" #include "card_info_picture_enlarged_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.h rename to cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp similarity index 96% rename from cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp index 9c954f8ad..9f217f603 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp @@ -1,7 +1,7 @@ #include "card_info_text_widget.h" -#include "../../../../card/game_specific_terms.h" -#include "../../../../game/board/card_item.h" +#include "../../../card/game_specific_terms.h" +#include "../../../game/board/card_item.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.h b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h similarity index 92% rename from cockatrice/src/client/ui/widgets/cards/card_info_text_widget.h rename to cockatrice/src/interface/widgets/cards/card_info_text_widget.h index f2ef4cb81..903bd541f 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h @@ -1,7 +1,7 @@ #ifndef CARDINFOTEXT_H #define CARDINFOTEXT_H -#include "../../../../card/card_info.h" +#include "../../../card/card_info.h" #include class QLabel; diff --git a/cockatrice/src/client/ui/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp similarity index 97% rename from cockatrice/src/client/ui/widgets/cards/card_size_widget.cpp rename to cockatrice/src/interface/widgets/cards/card_size_widget.cpp index 7ce8e71c4..2b81b26d5 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_size_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp @@ -1,6 +1,6 @@ #include "card_size_widget.h" -#include "../../../../settings/cache_settings.h" +#include "../../../settings/cache_settings.h" #include "../printing_selector/printing_selector.h" #include "../visual_deck_storage/visual_deck_storage_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/card_size_widget.h b/cockatrice/src/interface/widgets/cards/card_size_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/cards/card_size_widget.h rename to cockatrice/src/interface/widgets/cards/card_size_widget.h diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp rename to cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp index 4f599c4e8..4a8f55cab 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp @@ -1,7 +1,7 @@ #include "deck_card_zone_display_widget.h" -#include "../../../../deck/deck_list_model.h" -#include "../../../../utility/card_info_comparator.h" +#include "../../../deck/deck_list_model.h" +#include "../../../utility/card_info_comparator.h" #include "card_group_display_widgets/flat_card_group_display_widget.h" #include "card_group_display_widgets/overlapped_card_group_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h similarity index 96% rename from cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h rename to cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h index 28995bfba..e71d0792b 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h @@ -1,8 +1,8 @@ #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H #define DECK_CARD_ZONE_DISPLAY_WIDGET_H -#include "../../../../card/card_info.h" -#include "../../../../deck/deck_list_model.h" +#include "../../../card/card_info.h" +#include "../../../deck/deck_list_model.h" #include "../general/display/banner_widget.h" #include "../general/layout_containers/overlap_widget.h" #include "../visual_deck_editor/visual_deck_editor_widget.h" diff --git a/cockatrice/src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp rename to cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp index 1d508114f..b284b3f05 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp @@ -1,6 +1,6 @@ #include "deck_preview_card_picture_widget.h" -#include "../../../../settings/cache_settings.h" +#include "../../../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/cards/deck_preview_card_picture_widget.h b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/cards/deck_preview_card_picture_widget.h rename to cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.cpp rename to cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h similarity index 88% rename from cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.h rename to cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h index 59f37982e..4e9ce36ba 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h @@ -1,8 +1,8 @@ #ifndef DECK_ANALYTICS_WIDGET_H #define DECK_ANALYTICS_WIDGET_H -#include "../../../../deck/deck_list_model.h" -#include "../../../ui/widgets/general/layout_containers/flow_widget.h" +#include "../../../deck/deck_list_model.h" +#include "../general/layout_containers/flow_widget.h" #include "mana_base_widget.h" #include "mana_curve_widget.h" #include "mana_devotion_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp similarity index 96% rename from cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp rename to cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp index 49caab285..b2030612c 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp @@ -1,8 +1,8 @@ #include "mana_base_widget.h" -#include "../../../../database/card_database.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../deck/deck_loader.h" +#include "../../../database/card_database.h" +#include "../../../database/card_database_manager.h" +#include "../../../deck/deck_loader.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h similarity index 95% rename from cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h rename to cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h index 7b35bbfdc..ce79bc77b 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h @@ -1,7 +1,7 @@ #ifndef MANA_BASE_WIDGET_H #define MANA_BASE_WIDGET_H -#include "../../../../deck/deck_list_model.h" +#include "../../../deck/deck_list_model.h" #include "../general/display/banner_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp similarity index 94% rename from cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp rename to cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp index 5a191ee37..430e95f81 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp @@ -1,9 +1,9 @@ #include "mana_curve_widget.h" -#include "../../../../database/card_database.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../deck/deck_loader.h" -#include "../../../../main.h" +#include "../../../database/card_database.h" +#include "../../../database/card_database_manager.h" +#include "../../../deck/deck_loader.h" +#include "../../../main.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h similarity index 93% rename from cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.h rename to cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h index b45e5f862..186f59371 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h @@ -1,7 +1,7 @@ #ifndef MANA_CURVE_WIDGET_H #define MANA_CURVE_WIDGET_H -#include "../../../../deck/deck_list_model.h" +#include "../../../deck/deck_list_model.h" #include "../general/display/banner_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp similarity index 96% rename from cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp rename to cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp index 15acefe8f..d26e11763 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp @@ -1,9 +1,9 @@ #include "mana_devotion_widget.h" -#include "../../../../database/card_database.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../deck/deck_loader.h" -#include "../../../../main.h" +#include "../../../database/card_database.h" +#include "../../../database/card_database_manager.h" +#include "../../../deck/deck_loader.h" +#include "../../../main.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h similarity index 95% rename from cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.h rename to cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h index 3edaa52ff..36b99813e 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h @@ -1,7 +1,7 @@ #ifndef MANA_DEVOTION_WIDGET_H #define MANA_DEVOTION_WIDGET_H -#include "../../../../deck/deck_list_model.h" +#include "../../../deck/deck_list_model.h" #include "../general/display/banner_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp index 3b13ba21e..5e4cb4949 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -1,11 +1,11 @@ #include "deck_editor_database_display_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../filters/syntax_help.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_manager.h" +#include "../../../filters/syntax_help.h" +#include "../../../settings/cache_settings.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/tab_supervisor.h" -#include "../../../ui/pixel_map_generator.h" +#include "../../pixel_map_generator.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h similarity index 92% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h index b47835e6a..40bd95062 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h @@ -1,10 +1,10 @@ #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H -#include "../../../../database/card_database_model.h" -#include "../../../../deck/custom_line_edit.h" -#include "../../../../utility/key_signals.h" +#include "../../../database/card_database_model.h" +#include "../../../deck/custom_line_edit.h" #include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../utility/key_signals.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp similarity index 99% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 5daa69afd..bafe393a1 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -1,7 +1,7 @@ #include "deck_editor_deck_dock_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_manager.h" +#include "../../../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h similarity index 95% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index 92f49d1f6..2fbea169a 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -1,10 +1,10 @@ #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H #define DECK_EDITOR_DECK_DOCK_WIDGET_H -#include "../../../../card/card_info.h" -#include "../../../../deck/custom_line_edit.h" -#include "../../../../utility/key_signals.h" +#include "../../../card/card_info.h" +#include "../../../deck/custom_line_edit.h" #include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../utility/key_signals.h" #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp similarity index 96% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index 733b321ef..32b9c66c4 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp @@ -1,9 +1,9 @@ #include "deck_editor_filter_dock_widget.h" -#include "../../../../database/card_database_model.h" -#include "../../../../filters/filter_builder.h" -#include "../../../../filters/filter_tree_model.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_model.h" +#include "../../../filters/filter_builder.h" +#include "../../../filters/filter_tree_model.h" +#include "../../../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h similarity index 95% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h index 46d7f5de1..25c2d79e2 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h @@ -1,8 +1,8 @@ #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H #define DECK_EDITOR_FILTER_DOCK_WIDGET_H -#include "../../../../utility/key_signals.h" #include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../utility/key_signals.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h rename to cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h diff --git a/cockatrice/src/client/ui/widgets/general/background_sources.cpp b/cockatrice/src/interface/widgets/general/background_sources.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/background_sources.cpp rename to cockatrice/src/interface/widgets/general/background_sources.cpp diff --git a/cockatrice/src/client/ui/widgets/general/background_sources.h b/cockatrice/src/interface/widgets/general/background_sources.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/background_sources.h rename to cockatrice/src/interface/widgets/general/background_sources.h diff --git a/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp rename to cockatrice/src/interface/widgets/general/display/banner_widget.cpp index 1d70a72b5..f03869a4d 100644 --- a/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp +++ b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp @@ -1,6 +1,6 @@ #include "banner_widget.h" -#include "../../../../../client/ui/pixel_map_generator.h" +#include "../../../pixel_map_generator.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/general/display/banner_widget.h b/cockatrice/src/interface/widgets/general/display/banner_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/banner_widget.h rename to cockatrice/src/interface/widgets/general/display/banner_widget.h diff --git a/cockatrice/src/client/ui/widgets/general/display/bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/bar_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/bar_widget.cpp rename to cockatrice/src/interface/widgets/general/display/bar_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/general/display/bar_widget.h b/cockatrice/src/interface/widgets/general/display/bar_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/bar_widget.h rename to cockatrice/src/interface/widgets/general/display/bar_widget.h diff --git a/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.cpp rename to cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp diff --git a/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.h rename to cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h diff --git a/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_push_button.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_push_button.cpp rename to cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp diff --git a/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_push_button.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_push_button.h rename to cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h diff --git a/cockatrice/src/client/ui/widgets/general/display/labeled_input.cpp b/cockatrice/src/interface/widgets/general/display/labeled_input.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/labeled_input.cpp rename to cockatrice/src/interface/widgets/general/display/labeled_input.cpp diff --git a/cockatrice/src/client/ui/widgets/general/display/labeled_input.h b/cockatrice/src/interface/widgets/general/display/labeled_input.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/labeled_input.h rename to cockatrice/src/interface/widgets/general/display/labeled_input.h diff --git a/cockatrice/src/client/ui/widgets/general/display/percent_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/percent_bar_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/percent_bar_widget.cpp rename to cockatrice/src/interface/widgets/general/display/percent_bar_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/general/display/percent_bar_widget.h b/cockatrice/src/interface/widgets/general/display/percent_bar_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/percent_bar_widget.h rename to cockatrice/src/interface/widgets/general/display/percent_bar_widget.h diff --git a/cockatrice/src/client/ui/widgets/general/display/shadow_background_label.cpp b/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/shadow_background_label.cpp rename to cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp diff --git a/cockatrice/src/client/ui/widgets/general/display/shadow_background_label.h b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/display/shadow_background_label.h rename to cockatrice/src/interface/widgets/general/display/shadow_background_label.h diff --git a/cockatrice/src/client/ui/widgets/general/home_styled_button.cpp b/cockatrice/src/interface/widgets/general/home_styled_button.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/home_styled_button.cpp rename to cockatrice/src/interface/widgets/general/home_styled_button.cpp diff --git a/cockatrice/src/client/ui/widgets/general/home_styled_button.h b/cockatrice/src/interface/widgets/general/home_styled_button.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/home_styled_button.h rename to cockatrice/src/interface/widgets/general/home_styled_button.h diff --git a/cockatrice/src/client/ui/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/general/home_widget.cpp rename to cockatrice/src/interface/widgets/general/home_widget.cpp index 823c718b0..cdf510abe 100644 --- a/cockatrice/src/client/ui/widgets/general/home_widget.cpp +++ b/cockatrice/src/interface/widgets/general/home_widget.cpp @@ -1,8 +1,8 @@ #include "home_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../server/remote/remote_client.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_manager.h" +#include "../../../server/remote/remote_client.h" +#include "../../../settings/cache_settings.h" #include "../../../tabs/tab_supervisor.h" #include "../../window_main.h" #include "background_sources.h" diff --git a/cockatrice/src/client/ui/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h similarity index 95% rename from cockatrice/src/client/ui/widgets/general/home_widget.h rename to cockatrice/src/interface/widgets/general/home_widget.h index b8ec1408b..1e870d1b6 100644 --- a/cockatrice/src/client/ui/widgets/general/home_widget.h +++ b/cockatrice/src/interface/widgets/general/home_widget.h @@ -1,6 +1,6 @@ #ifndef HOME_WIDGET_H #define HOME_WIDGET_H -#include "../../../../server/abstract_client.h" +#include "../../../server/abstract_client.h" #include "../../../tabs/tab_supervisor.h" #include "../cards/card_info_picture_art_crop_widget.h" #include "home_styled_button.h" diff --git a/cockatrice/src/client/ui/widgets/general/layout_containers/flow_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/layout_containers/flow_widget.cpp rename to cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/general/layout_containers/flow_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/layout_containers/flow_widget.h rename to cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h diff --git a/cockatrice/src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp rename to cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/general/layout_containers/overlap_control_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/layout_containers/overlap_control_widget.h rename to cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h diff --git a/cockatrice/src/client/ui/widgets/general/layout_containers/overlap_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp similarity index 99% rename from cockatrice/src/client/ui/widgets/general/layout_containers/overlap_widget.cpp rename to cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp index 8aa90dfc9..ac5d9f520 100644 --- a/cockatrice/src/client/ui/widgets/general/layout_containers/overlap_widget.cpp +++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp @@ -1,6 +1,6 @@ #include "overlap_widget.h" -#include "../../../../../deck/deck_list_model.h" +#include "../../../../deck/deck_list_model.h" #include "../../../layouts/flow_layout.h" #include diff --git a/cockatrice/src/client/ui/widgets/general/layout_containers/overlap_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/general/layout_containers/overlap_widget.h rename to cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h diff --git a/cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp rename to cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h similarity index 93% rename from cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.h rename to cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h index f206bd7d6..9f45660ee 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h @@ -1,7 +1,7 @@ #ifndef ALL_ZONES_CARD_AMOUNT_WIDGET_H #define ALL_ZONES_CARD_AMOUNT_WIDGET_H -#include "../../../../deck/deck_list_model.h" -#include "../../../../deck/deck_loader.h" +#include "../../../deck/deck_list_model.h" +#include "../../../deck/deck_loader.h" #include "card_amount_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp rename to cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h similarity index 93% rename from cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h rename to cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h index 111f3bfd7..fbf159312 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h @@ -1,9 +1,9 @@ #ifndef CARD_AMOUNT_WIDGET_H #define CARD_AMOUNT_WIDGET_H -#include "../../../../card/card_info.h" -#include "../../../../deck/deck_list_model.h" -#include "../../../../deck/deck_loader.h" +#include "../../../card/card_info.h" +#include "../../../deck/deck_list_model.h" +#include "../../../deck/deck_loader.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../general/display/dynamic_font_size_push_button.h" diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp rename to cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp index 0a4a30ece..e49fd2c9d 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp @@ -1,8 +1,8 @@ #include "printing_selector.h" -#include "../../../../dialogs/dlg_select_set_for_cards.h" -#include "../../../../settings/cache_settings.h" -#include "../../picture_loader/picture_loader.h" +#include "../../../dialogs/dlg_select_set_for_cards.h" +#include "../../../picture_loader/picture_loader.h" +#include "../../../settings/cache_settings.h" #include "printing_selector_card_display_widget.h" #include "printing_selector_card_search_widget.h" #include "printing_selector_card_selection_widget.h" diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h similarity index 95% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h rename to cockatrice/src/interface/widgets/printing_selector/printing_selector.h index 799d6da7f..5afdd00f4 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h @@ -1,8 +1,8 @@ #ifndef PRINTING_SELECTOR_H #define PRINTING_SELECTOR_H -#include "../../../../card/card_info.h" -#include "../../../../deck/deck_list_model.h" +#include "../../../card/card_info.h" +#include "../../../deck/deck_list_model.h" #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" #include "../quick_settings/settings_button_widget.h" diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h similarity index 93% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h index f1dd32b63..b7e27547d 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h @@ -1,8 +1,8 @@ #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H -#include "../../../../card/card_info.h" -#include "../../../../deck/deck_list_model.h" +#include "../../../card/card_info.h" +#include "../../../deck/deck_list_model.h" #include "../../../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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index 222ba2b09..8e599ceb1 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp @@ -1,7 +1,7 @@ #include "printing_selector_card_overlay_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_manager.h" +#include "../../../settings/cache_settings.h" #include "printing_selector_card_display_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h similarity index 90% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.h rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h index eb8e97aa1..d981f5f9a 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h @@ -1,10 +1,10 @@ #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H -#include "../../../../card/card_info.h" -#include "../../../../client/ui/widgets/cards/card_info_picture_widget.h" -#include "../../../../deck/deck_list_model.h" +#include "../../../card/card_info.h" +#include "../../../deck/deck_list_model.h" #include "../../../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" #include "set_name_and_collectors_number_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.h rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp similarity index 97% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp index 238795273..5b2935b7b 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp @@ -1,6 +1,6 @@ #include "printing_selector_card_selection_widget.h" -#include "../../../../dialogs/dlg_select_set_for_cards.h" +#include "../../../dialogs/dlg_select_set_for_cards.h" /** * @brief Constructs a PrintingSelectorCardSelectionWidget for navigating through cards in the deck. diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.h rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp index 0c8126a36..2da987762 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp @@ -1,7 +1,7 @@ #include "printing_selector_card_sorting_widget.h" -#include "../../../../settings/cache_settings.h" -#include "../../../../utility/card_set_comparator.h" +#include "../../../settings/cache_settings.h" +#include "../../../utility/card_set_comparator.h" const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical"); const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference"); diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h rename to cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h diff --git a/cockatrice/src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp rename to cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.h rename to cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h diff --git a/cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp rename to cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.h rename to cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h diff --git a/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp rename to cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.h rename to cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp similarity index 99% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp index 8fbdd8644..e8eb97125 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp @@ -1,6 +1,6 @@ #include "visual_database_display_color_filter_widget.h" -#include "../../../../filters/filter_tree.h" +#include "../../../filters/filter_tree.h" #include "../cards/additional_info/mana_symbol_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h similarity index 97% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.h rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h index c739afe21..42498766c 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H -#include "../../../../filters/filter_tree_model.h" +#include "../../../filters/filter_tree_model.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp index 12d77dc91..15ef4a590 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp @@ -1,7 +1,7 @@ #include "visual_database_display_filter_save_load_widget.h" -#include "../../../../filters/filter_tree.h" -#include "../../../../settings/cache_settings.h" +#include "../../../filters/filter_tree.h" +#include "../../../settings/cache_settings.h" #include "visual_database_filter_display_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h similarity index 95% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h index b52ef4273..5b70fbd67 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H #define VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H -#include "../../../../filters/filter_tree_model.h" +#include "../../../filters/filter_tree_model.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp index 0e5fecef3..4ff2f8f1f 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp @@ -1,8 +1,8 @@ #include "visual_database_display_main_type_filter_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../filters/filter_tree.h" -#include "../../../../filters/filter_tree_model.h" +#include "../../../database/card_database_manager.h" +#include "../../../filters/filter_tree.h" +#include "../../../filters/filter_tree_model.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h similarity index 96% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h index 44af509be..9d6807b95 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H -#include "../../../../filters/filter_tree_model.h" +#include "../../../filters/filter_tree_model.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/client/ui/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 similarity index 99% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp index b74d49ab7..75ab238be 100644 --- a/cockatrice/src/client/ui/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,6 +1,6 @@ #include "visual_database_display_name_filter_widget.h" -#include "../../../../dialogs/dlg_load_deck_from_clipboard.h" +#include "../../../dialogs/dlg_load_deck_from_clipboard.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include diff --git a/cockatrice/src/client/ui/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 similarity index 96% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.h rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h index 95dd6a25e..b977eb507 100644 --- a/cockatrice/src/client/ui/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 @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H -#include "../../../../filters/filter_tree_model.h" +#include "../../../filters/filter_tree_model.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../general/layout_containers/flow_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp index 4139ead46..691292a2d 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp @@ -1,9 +1,9 @@ #include "visual_database_display_set_filter_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../filters/filter_tree.h" -#include "../../../../filters/filter_tree_model.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_manager.h" +#include "../../../filters/filter_tree.h" +#include "../../../filters/filter_tree_model.h" +#include "../../../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h similarity index 97% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.h rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h index 9a4472ee4..7960ec45c 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H -#include "../../../../filters/filter_tree_model.h" +#include "../../../filters/filter_tree_model.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp index f62a8b0be..6cc128a0d 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp @@ -1,8 +1,8 @@ #include "visual_database_display_sub_type_filter_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../filters/filter_tree.h" -#include "../../../../filters/filter_tree_model.h" +#include "../../../database/card_database_manager.h" +#include "../../../filters/filter_tree.h" +#include "../../../filters/filter_tree_model.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h similarity index 96% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h index db9328f81..d8a3c831e 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h @@ -1,7 +1,7 @@ #ifndef VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H #define VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H -#include "../../../../filters/filter_tree_model.h" +#include "../../../filters/filter_tree_model.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp similarity index 97% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index 2d6901add..cad28ace5 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -1,12 +1,12 @@ #include "visual_database_display_widget.h" -#include "../../../../database/card_database.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../deck/custom_line_edit.h" -#include "../../../../filters/filter_tree_model.h" -#include "../../../../filters/syntax_help.h" -#include "../../../../settings/cache_settings.h" -#include "../../../../utility/card_info_comparator.h" +#include "../../../database/card_database.h" +#include "../../../database/card_database_manager.h" +#include "../../../deck/custom_line_edit.h" +#include "../../../filters/filter_tree_model.h" +#include "../../../filters/syntax_help.h" +#include "../../../settings/cache_settings.h" +#include "../../../utility/card_info_comparator.h" #include "../../pixel_map_generator.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../quick_settings/settings_button_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h similarity index 93% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h index 35604aa1a..ea9deebc0 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h @@ -1,13 +1,13 @@ #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H #define VISUAL_DATABASE_DISPLAY_WIDGET_H -#include "../../../../database/card_database.h" -#include "../../../../database/card_database_model.h" -#include "../../../../deck/custom_line_edit.h" -#include "../../../../deck/deck_list_model.h" -#include "../../../../filters/filter_tree_model.h" -#include "../../../../utility/key_signals.h" +#include "../../../database/card_database.h" +#include "../../../database/card_database_model.h" +#include "../../../deck/custom_line_edit.h" +#include "../../../deck/deck_list_model.h" +#include "../../../filters/filter_tree_model.h" #include "../../../tabs/abstract_tab_deck_editor.h" +#include "../../../utility/key_signals.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/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp index a9d15fd1a..3f6c2d104 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp @@ -1,6 +1,6 @@ #include "visual_database_filter_display_widget.h" -#include "../../../../settings/cache_settings.h" +#include "../../../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.h rename to cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp similarity index 96% rename from cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index 170da56dc..a6f0734d3 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -1,8 +1,8 @@ #include "visual_deck_editor_sample_hand_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../deck/deck_loader.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_manager.h" +#include "../../../deck/deck_loader.h" +#include "../../../settings/cache_settings.h" #include "../cards/card_info_picture_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h similarity index 88% rename from cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h rename to cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h index 8facff557..4688c6ac4 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h @@ -1,8 +1,8 @@ #ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H #define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H -#include "../../../../client/ui/widgets/cards/card_size_widget.h" -#include "../../../../deck/deck_list_model.h" +#include "../../../deck/deck_list_model.h" +#include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp similarity index 97% rename from cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index fef993a26..0f73bbf6c 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -1,14 +1,14 @@ #include "visual_deck_editor_widget.h" -#include "../../../../database/card_completer_proxy_model.h" -#include "../../../../database/card_database.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../database/card_database_model.h" -#include "../../../../database/card_search_model.h" -#include "../../../../deck/deck_list_model.h" -#include "../../../../deck/deck_loader.h" -#include "../../../../main.h" -#include "../../../../utility/card_info_comparator.h" +#include "../../../database/card_completer_proxy_model.h" +#include "../../../database/card_database.h" +#include "../../../database/card_database_manager.h" +#include "../../../database/card_database_model.h" +#include "../../../database/card_search_model.h" +#include "../../../deck/deck_list_model.h" +#include "../../../deck/deck_loader.h" +#include "../../../main.h" +#include "../../../utility/card_info_comparator.h" #include "../../layouts/overlap_layout.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/deck_card_zone_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h similarity index 93% rename from cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h rename to cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h index b8b6a513a..2386c20b6 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h @@ -1,10 +1,10 @@ #ifndef VISUAL_DECK_EDITOR_H #define VISUAL_DECK_EDITOR_H -#include "../../../../database/card_completer_proxy_model.h" -#include "../../../../database/card_database.h" -#include "../../../../database/card_database_model.h" -#include "../../../../deck/deck_list_model.h" +#include "../../../database/card_completer_proxy_model.h" +#include "../../../database/card_database.h" +#include "../../../database/card_database_model.h" +#include "../../../deck/deck_list_model.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h diff --git a/cockatrice/src/client/ui/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 similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp index b77ebe7f7..6dc579c5b 100644 --- a/cockatrice/src/client/ui/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 "../../../../../settings/cache_settings.h" +#include "../../../../dialogs/dlg_convert_deck_to_cod_format.h" +#include "../../../../settings/cache_settings.h" #include "../../../../tabs/tab_deck_editor.h" #include "../../general/layout_containers/flow_widget.h" #include "deck_preview_tag_addition_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h similarity index 93% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h index 3b18c2232..30564074a 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h @@ -1,7 +1,7 @@ #ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H #define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H -#include "../../../../../deck/deck_loader.h" +#include "../../../../deck/deck_loader.h" #include "deck_preview_widget.h" #include diff --git a/cockatrice/src/client/ui/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 similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp index 2e575a842..df9fa72ae 100644 --- a/cockatrice/src/client/ui/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 "../../../../../settings/cache_settings.h" +#include "../../../../settings/cache_settings.h" #include "../../../../tabs/abstract_tab_deck_editor.h" #include "deck_preview_tag_dialog.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp index daf0cf745..601a03394 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp @@ -1,7 +1,7 @@ #include "deck_preview_tag_dialog.h" -#include "../../../../../dialogs/dlg_default_tags_editor.h" -#include "../../../../../settings/cache_settings.h" +#include "../../../../dialogs/dlg_default_tags_editor.h" +#include "../../../../settings/cache_settings.h" #include "deck_preview_tag_item_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp similarity index 99% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 208fd2212..3cdd2a72c 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -1,7 +1,7 @@ #include "deck_preview_widget.h" -#include "../../../../../database/card_database_manager.h" -#include "../../../../../settings/cache_settings.h" +#include "../../../../database/card_database_manager.h" +#include "../../../../settings/cache_settings.h" #include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/deck_preview_card_picture_widget.h" #include "deck_preview_deck_tags_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h index c6c6d377d..a87f5aad7 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h @@ -1,7 +1,7 @@ #ifndef DECK_PREVIEW_WIDGET_H #define DECK_PREVIEW_WIDGET_H -#include "../../../../../deck/deck_loader.h" +#include "../../../../deck/deck_loader.h" #include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/deck_preview_card_picture_widget.h" #include "../visual_deck_storage_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp similarity index 99% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp index 319393775..235e62deb 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp @@ -1,6 +1,6 @@ #include "visual_deck_storage_folder_display_widget.h" -#include "../../../../settings/cache_settings.h" +#include "../../../settings/cache_settings.h" #include "deck_preview/deck_preview_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp similarity index 99% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp index 385007c3e..6e269a9b5 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp @@ -1,6 +1,6 @@ #include "visual_deck_storage_quick_settings_widget.h" -#include "../../../../settings/cache_settings.h" +#include "../../../settings/cache_settings.h" #include "visual_deck_storage_widget.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp similarity index 95% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp index 04fd0da7c..69fb1025a 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp @@ -1,8 +1,8 @@ #include "visual_deck_storage_search_widget.h" -#include "../../../../filters/deck_filter_string.h" -#include "../../../../filters/syntax_help.h" -#include "../../../../settings/cache_settings.h" +#include "../../../filters/deck_filter_string.h" +#include "../../../filters/syntax_help.h" +#include "../../../settings/cache_settings.h" #include "../../pixel_map_generator.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp index 8b5356c08..c7917ed44 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp @@ -1,6 +1,6 @@ #include "visual_deck_storage_sort_widget.h" -#include "../../../../settings/cache_settings.h" +#include "../../../settings/cache_settings.h" /** * @brief Constructs a PrintingSelectorCardSortWidget for searching cards by set name or set code. diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h similarity index 100% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp similarity index 98% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index 47a2a8b9d..36f9c7705 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -1,7 +1,7 @@ #include "visual_deck_storage_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../settings/cache_settings.h" +#include "../../../database/card_database_manager.h" +#include "../../../settings/cache_settings.h" #include "../quick_settings/settings_button_widget.h" #include "deck_preview/deck_preview_widget.h" #include "visual_deck_storage_folder_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h similarity index 95% rename from cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h rename to cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h index 755243fdf..13323c326 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h @@ -1,9 +1,9 @@ #ifndef VISUAL_DECK_STORAGE_WIDGET_H #define VISUAL_DECK_STORAGE_WIDGET_H -#include "../../../../deck/deck_list_model.h" -#include "../../../ui/widgets/general/layout_containers/flow_widget.h" +#include "../../../deck/deck_list_model.h" #include "../cards/card_size_widget.h" +#include "../general/layout_containers/flow_widget.h" #include "../quick_settings/settings_button_widget.h" #include "deck_preview/deck_preview_color_identity_filter_widget.h" #include "deck_preview/deck_preview_widget.h" diff --git a/cockatrice/src/client/ui/window_main.cpp b/cockatrice/src/interface/window_main.cpp similarity index 98% rename from cockatrice/src/client/ui/window_main.cpp rename to cockatrice/src/interface/window_main.cpp index e6b54a8a6..7b5746520 100644 --- a/cockatrice/src/client/ui/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -19,32 +19,32 @@ ***************************************************************************/ #include "window_main.h" -#include "../../database/card_database.h" -#include "../../database/card_database_manager.h" -#include "../../dialogs/dlg_connect.h" -#include "../../dialogs/dlg_edit_tokens.h" -#include "../../dialogs/dlg_forgot_password_challenge.h" -#include "../../dialogs/dlg_forgot_password_request.h" -#include "../../dialogs/dlg_forgot_password_reset.h" -#include "../../dialogs/dlg_manage_sets.h" -#include "../../dialogs/dlg_register.h" -#include "../../dialogs/dlg_settings.h" -#include "../../dialogs/dlg_startup_card_check.h" -#include "../../dialogs/dlg_tip_of_the_day.h" -#include "../../dialogs/dlg_update.h" -#include "../../dialogs/dlg_view_log.h" -#include "../../main.h" -#include "../../server/local_client.h" -#include "../../server/local_server.h" -#include "../../server/local_server_interface.h" -#include "../../server/remote/remote_client.h" -#include "../../settings/cache_settings.h" -#include "../../utility/logger.h" -#include "../get_text_with_max.h" -#include "../network/client_update_checker.h" -#include "../network/release_channel.h" +#include "../client/get_text_with_max.h" +#include "../client/network/client_update_checker.h" +#include "../client/network/release_channel.h" +#include "../database/card_database.h" +#include "../database/card_database_manager.h" +#include "../dialogs/dlg_connect.h" +#include "../dialogs/dlg_edit_tokens.h" +#include "../dialogs/dlg_forgot_password_challenge.h" +#include "../dialogs/dlg_forgot_password_request.h" +#include "../dialogs/dlg_forgot_password_reset.h" +#include "../dialogs/dlg_manage_sets.h" +#include "../dialogs/dlg_register.h" +#include "../dialogs/dlg_settings.h" +#include "../dialogs/dlg_startup_card_check.h" +#include "../dialogs/dlg_tip_of_the_day.h" +#include "../dialogs/dlg_update.h" +#include "../dialogs/dlg_view_log.h" +#include "../main.h" +#include "../server/local_client.h" +#include "../server/local_server.h" +#include "../server/local_server_interface.h" +#include "../server/remote/remote_client.h" +#include "../settings/cache_settings.h" #include "../tabs/tab_game.h" #include "../tabs/tab_supervisor.h" +#include "../utility/logger.h" #include "pb/event_connection_closed.pb.h" #include "pb/event_server_shutdown.pb.h" #include "pb/game_replay.pb.h" diff --git a/cockatrice/src/client/ui/window_main.h b/cockatrice/src/interface/window_main.h similarity index 99% rename from cockatrice/src/client/ui/window_main.h rename to cockatrice/src/interface/window_main.h index a1ffd48cc..11f908c6f 100644 --- a/cockatrice/src/client/ui/window_main.h +++ b/cockatrice/src/interface/window_main.h @@ -20,7 +20,7 @@ #ifndef WINDOW_H #define WINDOW_H -#include "../../server/abstract_client.h" +#include "../server/abstract_client.h" #include "pb/response.pb.h" #include diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index be720a34e..3a047ef98 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -23,11 +23,11 @@ #include "QtNetwork/QNetworkInterface" #include "client/network/spoiler_background_updater.h" #include "client/sound_engine.h" -#include "client/ui/pixel_map_generator.h" -#include "client/ui/theme_manager.h" -#include "client/ui/window_main.h" #include "dialogs/dlg_settings.h" #include "featureset.h" +#include "interface/pixel_map_generator.h" +#include "interface/theme_manager.h" +#include "interface/window_main.h" #include "rng_sfmt.h" #include "settings/cache_settings.h" #include "utility/logger.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader.cpp b/cockatrice/src/picture_loader/picture_loader.cpp similarity index 99% rename from cockatrice/src/client/ui/picture_loader/picture_loader.cpp rename to cockatrice/src/picture_loader/picture_loader.cpp index 8ee159cbf..22f81c5dd 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader.cpp +++ b/cockatrice/src/picture_loader/picture_loader.cpp @@ -1,6 +1,6 @@ #include "picture_loader.h" -#include "../../../settings/cache_settings.h" +#include "../settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader.h b/cockatrice/src/picture_loader/picture_loader.h similarity index 97% rename from cockatrice/src/client/ui/picture_loader/picture_loader.h rename to cockatrice/src/picture_loader/picture_loader.h index cf8132448..793c611de 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader.h +++ b/cockatrice/src/picture_loader/picture_loader.h @@ -1,7 +1,7 @@ #ifndef PICTURELOADER_H #define PICTURELOADER_H -#include "../../../card/card_info.h" +#include "../card/card_info.h" #include "picture_loader_status_bar.h" #include "picture_loader_worker.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp b/cockatrice/src/picture_loader/picture_loader_local.cpp similarity index 98% rename from cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp rename to cockatrice/src/picture_loader/picture_loader_local.cpp index e71125b12..a939f2c66 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp +++ b/cockatrice/src/picture_loader/picture_loader_local.cpp @@ -1,7 +1,7 @@ #include "picture_loader_local.h" -#include "../../../database/card_database_manager.h" -#include "../../../settings/cache_settings.h" +#include "../database/card_database_manager.h" +#include "../settings/cache_settings.h" #include "picture_to_load.h" #include diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.h b/cockatrice/src/picture_loader/picture_loader_local.h similarity index 96% rename from cockatrice/src/client/ui/picture_loader/picture_loader_local.h rename to cockatrice/src/picture_loader/picture_loader_local.h index ba87456f2..f78510337 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.h +++ b/cockatrice/src/picture_loader/picture_loader_local.h @@ -1,7 +1,7 @@ #ifndef PICTURE_LOADER_LOCAL_H #define PICTURE_LOADER_LOCAL_H -#include "../../../card/exact_card.h" +#include "../card/exact_card.h" #include #include diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_request_status_display_widget.cpp b/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.cpp similarity index 100% rename from cockatrice/src/client/ui/picture_loader/picture_loader_request_status_display_widget.cpp rename to cockatrice/src/picture_loader/picture_loader_request_status_display_widget.cpp diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_request_status_display_widget.h b/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.h similarity index 100% rename from cockatrice/src/client/ui/picture_loader/picture_loader_request_status_display_widget.h rename to cockatrice/src/picture_loader/picture_loader_request_status_display_widget.h diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_status_bar.cpp b/cockatrice/src/picture_loader/picture_loader_status_bar.cpp similarity index 100% rename from cockatrice/src/client/ui/picture_loader/picture_loader_status_bar.cpp rename to cockatrice/src/picture_loader/picture_loader_status_bar.cpp diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_status_bar.h b/cockatrice/src/picture_loader/picture_loader_status_bar.h similarity index 90% rename from cockatrice/src/client/ui/picture_loader/picture_loader_status_bar.h rename to cockatrice/src/picture_loader/picture_loader_status_bar.h index d60279a97..759a8b7a2 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_status_bar.h +++ b/cockatrice/src/picture_loader/picture_loader_status_bar.h @@ -1,7 +1,7 @@ #ifndef PICTURE_LOADER_STATUS_BAR_H #define PICTURE_LOADER_STATUS_BAR_H -#include "../widgets/quick_settings/settings_button_widget.h" +#include "../interface/widgets/quick_settings/settings_button_widget.h" #include "picture_loader_worker_work.h" #include diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp b/cockatrice/src/picture_loader/picture_loader_worker.cpp similarity index 98% rename from cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp rename to cockatrice/src/picture_loader/picture_loader_worker.cpp index feffc7376..42429d0e3 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp +++ b/cockatrice/src/picture_loader/picture_loader_worker.cpp @@ -1,7 +1,7 @@ #include "picture_loader_worker.h" -#include "../../../database/card_database_manager.h" -#include "../../../settings/cache_settings.h" +#include "../database/card_database_manager.h" +#include "../settings/cache_settings.h" #include "picture_loader_local.h" #include "picture_loader_worker_work.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h b/cockatrice/src/picture_loader/picture_loader_worker.h similarity index 97% rename from cockatrice/src/client/ui/picture_loader/picture_loader_worker.h rename to cockatrice/src/picture_loader/picture_loader_worker.h index b9799ab39..1e9ca4be1 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h +++ b/cockatrice/src/picture_loader/picture_loader_worker.h @@ -1,8 +1,8 @@ #ifndef PICTURE_LOADER_WORKER_H #define PICTURE_LOADER_WORKER_H -#include "../../../card/card_info.h" -#include "../../../database/card_database.h" +#include "../card/card_info.h" +#include "../database/card_database.h" #include "picture_loader_local.h" #include "picture_loader_worker_work.h" #include "picture_to_load.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp b/cockatrice/src/picture_loader/picture_loader_worker_work.cpp similarity index 98% rename from cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp rename to cockatrice/src/picture_loader/picture_loader_worker_work.cpp index c51e1d11f..4d9fb9354 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp +++ b/cockatrice/src/picture_loader/picture_loader_worker_work.cpp @@ -1,7 +1,7 @@ #include "picture_loader_worker_work.h" -#include "../../../database/card_database_manager.h" -#include "../../../settings/cache_settings.h" +#include "../database/card_database_manager.h" +#include "../settings/cache_settings.h" #include "picture_loader_worker.h" #include diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h b/cockatrice/src/picture_loader/picture_loader_worker_work.h similarity index 97% rename from cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h rename to cockatrice/src/picture_loader/picture_loader_worker_work.h index 8d09e091f..aa3927c17 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h +++ b/cockatrice/src/picture_loader/picture_loader_worker_work.h @@ -1,7 +1,7 @@ #ifndef PICTURE_LOADER_WORKER_WORK_H #define PICTURE_LOADER_WORKER_WORK_H -#include "../../../database/card_database.h" +#include "../database/card_database.h" #include "picture_loader_worker.h" #include "picture_to_load.h" diff --git a/cockatrice/src/client/ui/picture_loader/picture_to_load.cpp b/cockatrice/src/picture_loader/picture_to_load.cpp similarity index 99% rename from cockatrice/src/client/ui/picture_loader/picture_to_load.cpp rename to cockatrice/src/picture_loader/picture_to_load.cpp index f3af6f5e8..f70f23d33 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_to_load.cpp +++ b/cockatrice/src/picture_loader/picture_to_load.cpp @@ -1,7 +1,7 @@ #include "picture_to_load.h" -#include "../../../settings/cache_settings.h" -#include "../../../utility/card_set_comparator.h" +#include "../settings/cache_settings.h" +#include "../utility/card_set_comparator.h" #include #include diff --git a/cockatrice/src/client/ui/picture_loader/picture_to_load.h b/cockatrice/src/picture_loader/picture_to_load.h similarity index 96% rename from cockatrice/src/client/ui/picture_loader/picture_to_load.h rename to cockatrice/src/picture_loader/picture_to_load.h index 309ff1870..2cfc13d59 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_to_load.h +++ b/cockatrice/src/picture_loader/picture_to_load.h @@ -1,7 +1,7 @@ #ifndef PICTURE_TO_LOAD_H #define PICTURE_TO_LOAD_H -#include "../../../card/exact_card.h" +#include "../card/exact_card.h" #include diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp index 2945127b7..b6a6b3f98 100644 --- a/cockatrice/src/server/chat_view/chat_view.cpp +++ b/cockatrice/src/server/chat_view/chat_view.cpp @@ -1,9 +1,9 @@ #include "chat_view.h" #include "../../client/sound_engine.h" -#include "../../client/tabs/tab_account.h" -#include "../../client/ui/pixel_map_generator.h" +#include "../../interface/pixel_map_generator.h" #include "../../settings/cache_settings.h" +#include "../../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/server/chat_view/chat_view.h b/cockatrice/src/server/chat_view/chat_view.h index fb601b4f1..1c7d2302d 100644 --- a/cockatrice/src/server/chat_view/chat_view.h +++ b/cockatrice/src/server/chat_view/chat_view.h @@ -1,7 +1,7 @@ #ifndef CHATVIEW_H #define CHATVIEW_H -#include "../../client/tabs/tab_supervisor.h" +#include "../../tabs/tab_supervisor.h" #include "../user/user_list_widget.h" #include "room_message_type.h" #include "user_level.h" diff --git a/cockatrice/src/game/game_selector.cpp b/cockatrice/src/server/game_selector.cpp similarity index 98% rename from cockatrice/src/game/game_selector.cpp rename to cockatrice/src/server/game_selector.cpp index e03feae36..3cfd3315a 100644 --- a/cockatrice/src/game/game_selector.cpp +++ b/cockatrice/src/server/game_selector.cpp @@ -1,19 +1,19 @@ #include "game_selector.h" #include "../client/get_text_with_max.h" -#include "../client/tabs/tab_account.h" -#include "../client/tabs/tab_game.h" -#include "../client/tabs/tab_room.h" -#include "../client/tabs/tab_supervisor.h" #include "../dialogs/dlg_create_game.h" #include "../dialogs/dlg_filter_games.h" -#include "../server/abstract_client.h" -#include "../server/pending_command.h" -#include "../server/user/user_list_manager.h" +#include "../tabs/tab_account.h" +#include "../tabs/tab_game.h" +#include "../tabs/tab_room.h" +#include "../tabs/tab_supervisor.h" +#include "abstract_client.h" #include "games_model.h" #include "pb/response.pb.h" #include "pb/room_commands.pb.h" #include "pb/serverinfo_game.pb.h" +#include "pending_command.h" +#include "user/user_list_manager.h" #include #include diff --git a/cockatrice/src/game/game_selector.h b/cockatrice/src/server/game_selector.h similarity index 100% rename from cockatrice/src/game/game_selector.h rename to cockatrice/src/server/game_selector.h diff --git a/cockatrice/src/game/game_type_map.h b/cockatrice/src/server/game_type_map.h similarity index 100% rename from cockatrice/src/game/game_type_map.h rename to cockatrice/src/server/game_type_map.h diff --git a/cockatrice/src/game/games_model.cpp b/cockatrice/src/server/games_model.cpp similarity index 99% rename from cockatrice/src/game/games_model.cpp rename to cockatrice/src/server/games_model.cpp index fa908344c..5c336738c 100644 --- a/cockatrice/src/game/games_model.cpp +++ b/cockatrice/src/server/games_model.cpp @@ -1,11 +1,11 @@ #include "games_model.h" -#include "../client/tabs/tab_account.h" -#include "../client/ui/pixel_map_generator.h" -#include "../server/user/user_list_manager.h" -#include "../server/user/user_list_widget.h" +#include "../interface/pixel_map_generator.h" #include "../settings/cache_settings.h" +#include "../tabs/tab_account.h" #include "pb/serverinfo_game.pb.h" +#include "user/user_list_manager.h" +#include "user/user_list_widget.h" #include #include diff --git a/cockatrice/src/game/games_model.h b/cockatrice/src/server/games_model.h similarity index 100% rename from cockatrice/src/game/games_model.h rename to cockatrice/src/server/games_model.h diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp index e4df15fdf..c6782ef18 100644 --- a/cockatrice/src/server/user/user_context_menu.cpp +++ b/cockatrice/src/server/user/user_context_menu.cpp @@ -1,11 +1,11 @@ #include "user_context_menu.h" -#include "../../client/tabs/tab_account.h" -#include "../../client/tabs/tab_game.h" -#include "../../client/tabs/tab_supervisor.h" -#include "../../game/game_selector.h" +#include "../../tabs/tab_account.h" +#include "../../tabs/tab_game.h" +#include "../../tabs/tab_supervisor.h" #include "../abstract_client.h" #include "../chat_view/chat_view.h" +#include "../game_selector.h" #include "../pending_command.h" #include "pb/command_kick_from_game.pb.h" #include "pb/commands.pb.h" diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp index 65868927f..cec0c38e8 100644 --- a/cockatrice/src/server/user/user_info_box.cpp +++ b/cockatrice/src/server/user/user_info_box.cpp @@ -1,10 +1,10 @@ #include "user_info_box.h" #include "../../client/get_text_with_max.h" -#include "../../client/ui/pixel_map_generator.h" #include "../../dialogs/dlg_edit_avatar.h" #include "../../dialogs/dlg_edit_password.h" #include "../../dialogs/dlg_edit_user.h" +#include "../../interface/pixel_map_generator.h" #include "../abstract_client.h" #include "../pending_command.h" #include "passwordhasher.h" diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp index b960d86ca..d4dad5919 100644 --- a/cockatrice/src/server/user/user_list_widget.cpp +++ b/cockatrice/src/server/user/user_list_widget.cpp @@ -1,11 +1,10 @@ #include "user_list_widget.h" -#include "../../client/tabs/tab_account.h" -#include "../../client/tabs/tab_supervisor.h" -#include "../../client/ui/pixel_map_generator.h" -#include "../../game/game_selector.h" -#include "../../server/user/user_list_manager.h" +#include "../../interface/pixel_map_generator.h" +#include "../../tabs/tab_account.h" +#include "../../tabs/tab_supervisor.h" #include "../abstract_client.h" +#include "../game_selector.h" #include "../pending_command.h" #include "pb/moderator_commands.pb.h" #include "pb/response_get_games_of_user.pb.h" @@ -13,6 +12,7 @@ #include "pb/session_commands.pb.h" #include "trice_limits.h" #include "user_context_menu.h" +#include "user_list_manager.h" #include #include diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp similarity index 96% rename from cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp rename to cockatrice/src/tabs/abstract_tab_deck_editor.cpp index bf245ab30..f5717cd85 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp @@ -1,18 +1,18 @@ #include "abstract_tab_deck_editor.h" -#include "../../client/tapped_out_interface.h" -#include "../../client/ui/widgets/cards/card_info_frame_widget.h" -#include "../../database/card_database_manager.h" -#include "../../database/card_database_model.h" -#include "../../deck/deck_stats_interface.h" -#include "../../dialogs/dlg_load_deck.h" -#include "../../dialogs/dlg_load_deck_from_clipboard.h" -#include "../../dialogs/dlg_load_deck_from_website.h" -#include "../../server/abstract_client.h" -#include "../../server/pending_command.h" -#include "../../settings/cache_settings.h" -#include "../ui/picture_loader/picture_loader.h" -#include "../ui/pixel_map_generator.h" +#include "../client/tapped_out_interface.h" +#include "../database/card_database_manager.h" +#include "../database/card_database_model.h" +#include "../deck/deck_stats_interface.h" +#include "../dialogs/dlg_load_deck.h" +#include "../dialogs/dlg_load_deck_from_clipboard.h" +#include "../dialogs/dlg_load_deck_from_website.h" +#include "../interface/pixel_map_generator.h" +#include "../interface/widgets/cards/card_info_frame_widget.h" +#include "../picture_loader/picture_loader.h" +#include "../server/abstract_client.h" +#include "../server/pending_command.h" +#include "../settings/cache_settings.h" #include "pb/command_deck_upload.pb.h" #include "pb/response.pb.h" #include "tab_supervisor.h" diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.h b/cockatrice/src/tabs/abstract_tab_deck_editor.h similarity index 89% rename from cockatrice/src/client/tabs/abstract_tab_deck_editor.h rename to cockatrice/src/tabs/abstract_tab_deck_editor.h index e281e42e3..e280d747f 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.h +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.h @@ -1,14 +1,14 @@ #ifndef TAB_GENERIC_DECK_EDITOR_H #define TAB_GENERIC_DECK_EDITOR_H -#include "../../card/card_info.h" -#include "../menus/deck_editor/deck_editor_menu.h" -#include "../ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h" -#include "../ui/widgets/deck_editor/deck_editor_database_display_widget.h" -#include "../ui/widgets/deck_editor/deck_editor_deck_dock_widget.h" -#include "../ui/widgets/deck_editor/deck_editor_filter_dock_widget.h" -#include "../ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h" -#include "../ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" +#include "../card/card_info.h" +#include "../client/deck_editor_menu.h" +#include "../interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h" +#include "../interface/widgets/deck_editor/deck_editor_database_display_widget.h" +#include "../interface/widgets/deck_editor/deck_editor_deck_dock_widget.h" +#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h" +#include "../interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h" +#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "tab.h" class CardDatabaseModel; diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp b/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h b/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h rename to cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h rename to cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp similarity index 92% rename from cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp index a2a015f72..c25f4e5aa 100644 --- a/cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp +++ b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp @@ -1,6 +1,6 @@ #include "edhrec_deck_api_response.h" -#include "../../../../../../deck/deck_loader.h" +#include "../../../../../deck/deck_loader.h" #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h similarity index 91% rename from cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h rename to cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h index b888cb134..fe8be7f6c 100644 --- a/cockatrice/src/client/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h +++ b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h @@ -1,7 +1,7 @@ #ifndef EDHREC_DECK_API_RESPONSE_H #define EDHREC_DECK_API_RESPONSE_H -#include "../../../../../../deck/deck_loader.h" +#include "../../../../../deck/deck_loader.h" #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp b/cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h b/cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h rename to cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h similarity index 90% rename from cockatrice/src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h rename to cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h index f1141a113..e859184d2 100644 --- a/cockatrice/src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h +++ b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h @@ -1,7 +1,7 @@ #ifndef DECKDATA_H #define DECKDATA_H -#include "../archidekt_links//edhrec_api_response_archidekt_links.h" +#include "../archidekt_links/edhrec_api_response_archidekt_links.h" #include "../cards/edhrec_api_response_card_container.h" #include "edhrec_commander_api_response_average_deck_statistics.h" diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h rename to cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h rename to cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h rename to cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp rename to cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h rename to cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h diff --git a/cockatrice/src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h diff --git a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp similarity index 96% rename from cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp index 4687077a5..71bf088eb 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp +++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp @@ -1,6 +1,6 @@ #include "edhrec_api_response_card_details_display_widget.h" -#include "../../../../../../database/card_database_manager.h" +#include "../../../../../database/card_database_manager.h" #include "../../tab_edhrec_main.h" EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget( diff --git a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h similarity index 93% rename from cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h index 820434612..1182bcf26 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h +++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h @@ -1,7 +1,7 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H -#include "../../../../../ui/widgets/cards/card_info_picture_widget.h" +#include "../../../../../interface/widgets/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/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h similarity index 90% rename from cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h index f0fbfdfc8..db55b2b41 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h +++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h @@ -1,7 +1,7 @@ #ifndef EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H #define EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H -#include "../../../../../ui/widgets/general/display/percent_bar_widget.h" +#include "../../../../../interface/widgets/general/display/percent_bar_widget.h" #include "../../api_response/cards/edhrec_api_response_card_details.h" #include diff --git a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp similarity index 93% rename from cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp index 068003fac..67372fd37 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp +++ b/cockatrice/src/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 "../../../../../ui/widgets/general/display/banner_widget.h" +#include "../../../../../interface/widgets/general/display/banner_widget.h" #include "edhrec_api_response_card_details_display_widget.h" #include diff --git a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h similarity index 82% rename from cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h index 291150cde..1f7e66887 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h +++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h @@ -1,8 +1,8 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H -#include "../../../../../ui/widgets/general/display/banner_widget.h" -#include "../../../../../ui/widgets/general/layout_containers/flow_widget.h" +#include "../../../../../interface/widgets/general/display/banner_widget.h" +#include "../../../../../interface/widgets/general/layout_containers/flow_widget.h" #include "../../api_response/cards/edhrec_api_response_card_list.h" #include diff --git a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h similarity index 89% rename from cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h index ebb252880..8877b4510 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h +++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h @@ -1,7 +1,7 @@ #ifndef EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H #define EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H -#include "../../../../../ui/widgets/general/display/percent_bar_widget.h" +#include "../../../../../interface/widgets/general/display/percent_bar_widget.h" #include "../../api_response/cards/edhrec_api_response_card_details.h" #include diff --git a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp similarity index 93% rename from cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp index 93604a817..cff480dfe 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp +++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp @@ -1,7 +1,7 @@ #include "edhrec_api_response_commander_details_display_widget.h" -#include "../../../../../../database/card_database_manager.h" -#include "../../../../../ui/widgets/cards/card_info_picture_widget.h" +#include "../../../../../database/card_database_manager.h" +#include "../../../../../interface/widgets/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/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h similarity index 93% rename from cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h index ba6a895b1..dbd396b0f 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h +++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h @@ -1,7 +1,7 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H -#include "../../../../../ui/widgets/cards/card_info_picture_widget.h" +#include "../../../../../interface/widgets/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/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp similarity index 98% rename from cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp index 9ea071546..722a8004c 100644 --- a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp +++ b/cockatrice/src/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 "../../../../../ui/widgets/cards/card_info_picture_widget.h" +#include "../../../../../interface/widgets/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/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h diff --git a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h diff --git a/cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h diff --git a/cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h diff --git a/cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp rename to cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h rename to cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp b/cockatrice/src/tabs/api/edhrec/tab_edhrec.cpp similarity index 100% rename from cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp rename to cockatrice/src/tabs/api/edhrec/tab_edhrec.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h similarity index 88% rename from cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h rename to cockatrice/src/tabs/api/edhrec/tab_edhrec.h index 15468915e..517a04051 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h @@ -1,8 +1,8 @@ #ifndef TAB_EDHREC_H #define TAB_EDHREC_H -#include "../../../../card/card_info.h" -#include "../../../ui/widgets/general/layout_containers/flow_widget.h" +#include "../../../card/card_info.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/client/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp similarity index 98% rename from cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp rename to cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp index 975db8d24..97bc6b5a9 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp @@ -1,8 +1,8 @@ #include "tab_edhrec_main.h" -#include "../../../../database/card_completer_proxy_model.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../database/card_search_model.h" +#include "../../../database/card_completer_proxy_model.h" +#include "../../../database/card_database_manager.h" +#include "../../../database/card_search_model.h" #include "../../tab_supervisor.h" #include "api_response/average_deck/edhrec_average_deck_api_response.h" #include "api_response/commander/edhrec_commander_api_response.h" diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h similarity index 87% rename from cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h rename to cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h index b9fdfd4c7..a7e2ab2f4 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h @@ -1,10 +1,10 @@ #ifndef TAB_EDHREC_MAIN_H #define TAB_EDHREC_MAIN_H -#include "../../../../database/card_database.h" -#include "../../../ui/widgets/cards/card_size_widget.h" -#include "../../../ui/widgets/general/layout_containers/flow_widget.h" -#include "../../../ui/widgets/quick_settings/settings_button_widget.h" +#include "../../../database/card_database.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/client/tabs/tab.cpp b/cockatrice/src/tabs/tab.cpp similarity index 94% rename from cockatrice/src/client/tabs/tab.cpp rename to cockatrice/src/tabs/tab.cpp index 8b098c280..3dcb3b523 100644 --- a/cockatrice/src/client/tabs/tab.cpp +++ b/cockatrice/src/tabs/tab.cpp @@ -1,7 +1,7 @@ #include "tab.h" -#include "../ui/widgets/cards/card_info_display_widget.h" -#include "./tab_supervisor.h" +#include "../interface/widgets/cards/card_info_display_widget.h" +#include "tab_supervisor.h" #include #include diff --git a/cockatrice/src/client/tabs/tab.h b/cockatrice/src/tabs/tab.h similarity index 100% rename from cockatrice/src/client/tabs/tab.h rename to cockatrice/src/tabs/tab.h diff --git a/cockatrice/src/client/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp similarity index 96% rename from cockatrice/src/client/tabs/tab_account.cpp rename to cockatrice/src/tabs/tab_account.cpp index 09261b63f..ba82857fe 100644 --- a/cockatrice/src/client/tabs/tab_account.cpp +++ b/cockatrice/src/tabs/tab_account.cpp @@ -1,12 +1,12 @@ #include "tab_account.h" -#include "../../deck/custom_line_edit.h" -#include "../../server/abstract_client.h" -#include "../../server/pending_command.h" -#include "../../server/user/user_info_box.h" -#include "../../server/user/user_list_manager.h" -#include "../../server/user/user_list_widget.h" -#include "../sound_engine.h" +#include "../client/sound_engine.h" +#include "../deck/custom_line_edit.h" +#include "../server/abstract_client.h" +#include "../server/pending_command.h" +#include "../server/user/user_info_box.h" +#include "../server/user/user_list_manager.h" +#include "../server/user/user_list_widget.h" #include "pb/event_add_to_list.pb.h" #include "pb/event_remove_from_list.pb.h" #include "pb/event_user_joined.pb.h" diff --git a/cockatrice/src/client/tabs/tab_account.h b/cockatrice/src/tabs/tab_account.h similarity index 100% rename from cockatrice/src/client/tabs/tab_account.h rename to cockatrice/src/tabs/tab_account.h diff --git a/cockatrice/src/client/tabs/tab_admin.cpp b/cockatrice/src/tabs/tab_admin.cpp similarity index 99% rename from cockatrice/src/client/tabs/tab_admin.cpp rename to cockatrice/src/tabs/tab_admin.cpp index 3a46441bd..a3d9e34e8 100644 --- a/cockatrice/src/client/tabs/tab_admin.cpp +++ b/cockatrice/src/tabs/tab_admin.cpp @@ -1,7 +1,7 @@ #include "tab_admin.h" -#include "../../server/abstract_client.h" -#include "../../server/pending_command.h" +#include "../server/abstract_client.h" +#include "../server/pending_command.h" #include "pb/admin_commands.pb.h" #include "pb/event_replay_added.pb.h" #include "pb/moderator_commands.pb.h" diff --git a/cockatrice/src/client/tabs/tab_admin.h b/cockatrice/src/tabs/tab_admin.h similarity index 100% rename from cockatrice/src/client/tabs/tab_admin.h rename to cockatrice/src/tabs/tab_admin.h diff --git a/cockatrice/src/client/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp similarity index 94% rename from cockatrice/src/client/tabs/tab_deck_editor.cpp rename to cockatrice/src/tabs/tab_deck_editor.cpp index 55f6920bd..e6e0258d4 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/tabs/tab_deck_editor.cpp @@ -1,19 +1,19 @@ #include "tab_deck_editor.h" -#include "../../client/tapped_out_interface.h" -#include "../../client/ui/widgets/cards/card_info_frame_widget.h" -#include "../../database/card_database_manager.h" -#include "../../database/card_database_model.h" -#include "../../dialogs/dlg_load_deck.h" -#include "../../dialogs/dlg_load_deck_from_clipboard.h" -#include "../../filters/filter_builder.h" -#include "../../filters/filter_tree_model.h" -#include "../../server/abstract_client.h" -#include "../../server/pending_command.h" -#include "../../settings/cache_settings.h" -#include "../menus/deck_editor/deck_editor_menu.h" -#include "../ui/pixel_map_generator.h" -#include "../ui/widgets/deck_editor/deck_editor_filter_dock_widget.h" +#include "../client/deck_editor_menu.h" +#include "../client/tapped_out_interface.h" +#include "../database/card_database_manager.h" +#include "../database/card_database_model.h" +#include "../dialogs/dlg_load_deck.h" +#include "../dialogs/dlg_load_deck_from_clipboard.h" +#include "../filters/filter_builder.h" +#include "../filters/filter_tree_model.h" +#include "../interface/pixel_map_generator.h" +#include "../interface/widgets/cards/card_info_frame_widget.h" +#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h" +#include "../server/abstract_client.h" +#include "../server/pending_command.h" +#include "../settings/cache_settings.h" #include "tab_supervisor.h" #include "trice_limits.h" diff --git a/cockatrice/src/client/tabs/tab_deck_editor.h b/cockatrice/src/tabs/tab_deck_editor.h similarity index 83% rename from cockatrice/src/client/tabs/tab_deck_editor.h rename to cockatrice/src/tabs/tab_deck_editor.h index 3ff4dd6e1..078560da1 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.h +++ b/cockatrice/src/tabs/tab_deck_editor.h @@ -1,9 +1,9 @@ #ifndef WINDOW_DECKEDITOR_H #define WINDOW_DECKEDITOR_H -#include "../../card/card_info.h" -#include "../../utility/key_signals.h" -#include "../ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" +#include "../card/card_info.h" +#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" +#include "../utility/key_signals.h" #include "abstract_tab_deck_editor.h" class CardDatabaseModel; diff --git a/cockatrice/src/client/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp similarity index 99% rename from cockatrice/src/client/tabs/tab_deck_storage.cpp rename to cockatrice/src/tabs/tab_deck_storage.cpp index ee7e40671..898612e6f 100644 --- a/cockatrice/src/client/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/tabs/tab_deck_storage.cpp @@ -1,10 +1,10 @@ #include "tab_deck_storage.h" -#include "../../deck/deck_loader.h" -#include "../../server/pending_command.h" -#include "../../server/remote/remote_decklist_tree_widget.h" -#include "../../settings/cache_settings.h" -#include "../get_text_with_max.h" +#include "../client/get_text_with_max.h" +#include "../deck/deck_loader.h" +#include "../server/pending_command.h" +#include "../server/remote/remote_decklist_tree_widget.h" +#include "../settings/cache_settings.h" #include "deck_list.h" #include "pb/command_deck_del.pb.h" #include "pb/command_deck_del_dir.pb.h" diff --git a/cockatrice/src/client/tabs/tab_deck_storage.h b/cockatrice/src/tabs/tab_deck_storage.h similarity index 96% rename from cockatrice/src/client/tabs/tab_deck_storage.h rename to cockatrice/src/tabs/tab_deck_storage.h index 45c6d9a82..6e9deb320 100644 --- a/cockatrice/src/client/tabs/tab_deck_storage.h +++ b/cockatrice/src/tabs/tab_deck_storage.h @@ -1,8 +1,8 @@ #ifndef TAB_DECK_STORAGE_H #define TAB_DECK_STORAGE_H -#include "../../server/abstract_client.h" -#include "../../server/remote/remote_decklist_tree_widget.h" +#include "../server/abstract_client.h" +#include "../server/remote/remote_decklist_tree_widget.h" #include "tab.h" class ServerInfo_User; diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp similarity index 98% rename from cockatrice/src/client/tabs/tab_game.cpp rename to cockatrice/src/tabs/tab_game.cpp index 6ffb6668d..c8ea5e7fe 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/cockatrice/src/tabs/tab_game.cpp @@ -1,30 +1,30 @@ #include "tab_game.h" -#include "../../client/ui/widgets/cards/card_info_frame_widget.h" -#include "../../database/card_database.h" -#include "../../database/card_database_manager.h" -#include "../../dialogs/dlg_create_game.h" -#include "../../game/board/arrow_item.h" -#include "../../game/board/card_item.h" -#include "../../game/deckview/deck_view_container.h" -#include "../../game/deckview/tabbed_deck_view_container.h" -#include "../../game/game.h" -#include "../../game/game_scene.h" -#include "../../game/game_view.h" -#include "../../game/player/player.h" -#include "../../game/player/player_list_widget.h" -#include "../../game/replay.h" -#include "../../game/zones/card_zone.h" -#include "../../main.h" -#include "../../server/abstract_client.h" -#include "../../server/message_log_widget.h" -#include "../../server/user/user_list_manager.h" -#include "../../settings/cache_settings.h" -#include "../network/replay_timeline_widget.h" -#include "../ui/line_edit_completer.h" -#include "../ui/phases_toolbar.h" -#include "../ui/picture_loader/picture_loader.h" -#include "../ui/window_main.h" +#include "../client/network/replay_timeline_widget.h" +#include "../database/card_database.h" +#include "../database/card_database_manager.h" +#include "../dialogs/dlg_create_game.h" +#include "../game/board/arrow_item.h" +#include "../game/board/card_item.h" +#include "../game/deckview/deck_view_container.h" +#include "../game/deckview/tabbed_deck_view_container.h" +#include "../game/game.h" +#include "../game/game_scene.h" +#include "../game/game_view.h" +#include "../game/log/message_log_widget.h" +#include "../game/phases_toolbar.h" +#include "../game/player/player.h" +#include "../game/player/player_list_widget.h" +#include "../game/replay.h" +#include "../game/zones/card_zone.h" +#include "../interface/line_edit_completer.h" +#include "../interface/widgets/cards/card_info_frame_widget.h" +#include "../interface/window_main.h" +#include "../main.h" +#include "../picture_loader/picture_loader.h" +#include "../server/abstract_client.h" +#include "../server/user/user_list_manager.h" +#include "../settings/cache_settings.h" #include "pb/event_game_joined.pb.h" #include "pb/game_replay.pb.h" #include "pb/serverinfo_player.pb.h" diff --git a/cockatrice/src/client/tabs/tab_game.h b/cockatrice/src/tabs/tab_game.h similarity index 95% rename from cockatrice/src/client/tabs/tab_game.h rename to cockatrice/src/tabs/tab_game.h index 1ebbef9d2..660e64506 100644 --- a/cockatrice/src/client/tabs/tab_game.h +++ b/cockatrice/src/tabs/tab_game.h @@ -1,12 +1,12 @@ #ifndef TAB_GAME_H #define TAB_GAME_H -#include "../../client/tearoff_menu.h" -#include "../../game/abstract_game.h" -#include "../../game/player/player.h" -#include "../../server/message_log_widget.h" -#include "../replay_manager.h" -#include "../ui/widgets/visual_deck_storage/visual_deck_storage_widget.h" +#include "../client/replay_manager.h" +#include "../game/abstract_game.h" +#include "../game/log/message_log_widget.h" +#include "../game/player/player.h" +#include "../interface/tearoff_menu.h" +#include "../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "pb/event_leave.pb.h" #include "tab.h" diff --git a/cockatrice/src/client/tabs/tab_home.cpp b/cockatrice/src/tabs/tab_home.cpp similarity index 100% rename from cockatrice/src/client/tabs/tab_home.cpp rename to cockatrice/src/tabs/tab_home.cpp diff --git a/cockatrice/src/client/tabs/tab_home.h b/cockatrice/src/tabs/tab_home.h similarity index 82% rename from cockatrice/src/client/tabs/tab_home.h rename to cockatrice/src/tabs/tab_home.h index 3a5317143..d2cacb65d 100644 --- a/cockatrice/src/client/tabs/tab_home.h +++ b/cockatrice/src/tabs/tab_home.h @@ -1,8 +1,8 @@ #ifndef TAB_HOME_H #define TAB_HOME_H -#include "../../server/abstract_client.h" -#include "../ui/widgets/general/home_widget.h" +#include "../interface/widgets/general/home_widget.h" +#include "../server/abstract_client.h" #include "tab.h" #include diff --git a/cockatrice/src/client/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp similarity index 98% rename from cockatrice/src/client/tabs/tab_logs.cpp rename to cockatrice/src/tabs/tab_logs.cpp index cf289b2ed..4a791a27e 100644 --- a/cockatrice/src/client/tabs/tab_logs.cpp +++ b/cockatrice/src/tabs/tab_logs.cpp @@ -1,9 +1,9 @@ #include "tab_logs.h" -#include "../../deck/custom_line_edit.h" -#include "../../dialogs/dlg_manage_sets.h" -#include "../../server/abstract_client.h" -#include "../../server/pending_command.h" +#include "../deck/custom_line_edit.h" +#include "../dialogs/dlg_manage_sets.h" +#include "../server/abstract_client.h" +#include "../server/pending_command.h" #include "pb/moderator_commands.pb.h" #include "pb/response_viewlog_history.pb.h" #include "trice_limits.h" diff --git a/cockatrice/src/client/tabs/tab_logs.h b/cockatrice/src/tabs/tab_logs.h similarity index 100% rename from cockatrice/src/client/tabs/tab_logs.h rename to cockatrice/src/tabs/tab_logs.h diff --git a/cockatrice/src/client/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp similarity index 94% rename from cockatrice/src/client/tabs/tab_message.cpp rename to cockatrice/src/tabs/tab_message.cpp index 12b52528e..6b4b7044b 100644 --- a/cockatrice/src/client/tabs/tab_message.cpp +++ b/cockatrice/src/tabs/tab_message.cpp @@ -1,13 +1,13 @@ #include "tab_message.h" -#include "../../deck/custom_line_edit.h" -#include "../../main.h" -#include "../../server/abstract_client.h" -#include "../../server/chat_view/chat_view.h" -#include "../../server/pending_command.h" -#include "../../server/user/user_list_manager.h" -#include "../../settings/cache_settings.h" -#include "../sound_engine.h" +#include "../client/sound_engine.h" +#include "../deck/custom_line_edit.h" +#include "../main.h" +#include "../server/abstract_client.h" +#include "../server/chat_view/chat_view.h" +#include "../server/pending_command.h" +#include "../server/user/user_list_manager.h" +#include "../settings/cache_settings.h" #include "pb/event_user_message.pb.h" #include "pb/serverinfo_user.pb.h" #include "pb/session_commands.pb.h" diff --git a/cockatrice/src/client/tabs/tab_message.h b/cockatrice/src/tabs/tab_message.h similarity index 100% rename from cockatrice/src/client/tabs/tab_message.h rename to cockatrice/src/tabs/tab_message.h diff --git a/cockatrice/src/client/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp similarity index 99% rename from cockatrice/src/client/tabs/tab_replays.cpp rename to cockatrice/src/tabs/tab_replays.cpp index e08cd35fb..2feb41383 100644 --- a/cockatrice/src/client/tabs/tab_replays.cpp +++ b/cockatrice/src/tabs/tab_replays.cpp @@ -1,9 +1,9 @@ #include "tab_replays.h" -#include "../../server/abstract_client.h" -#include "../../server/pending_command.h" -#include "../../server/remote/remote_replay_list_tree_widget.h" -#include "../../settings/cache_settings.h" +#include "../server/abstract_client.h" +#include "../server/pending_command.h" +#include "../server/remote/remote_replay_list_tree_widget.h" +#include "../settings/cache_settings.h" #include "pb/command_replay_delete_match.pb.h" #include "pb/command_replay_download.pb.h" #include "pb/command_replay_get_code.pb.h" diff --git a/cockatrice/src/client/tabs/tab_replays.h b/cockatrice/src/tabs/tab_replays.h similarity index 98% rename from cockatrice/src/client/tabs/tab_replays.h rename to cockatrice/src/tabs/tab_replays.h index af794535a..b3a1d5fad 100644 --- a/cockatrice/src/client/tabs/tab_replays.h +++ b/cockatrice/src/tabs/tab_replays.h @@ -1,7 +1,7 @@ #ifndef TAB_REPLAYS_H #define TAB_REPLAYS_H -#include "../../server/abstract_client.h" +#include "../server/abstract_client.h" #include "tab.h" class ServerInfo_User; diff --git a/cockatrice/src/client/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp similarity index 96% rename from cockatrice/src/client/tabs/tab_room.cpp rename to cockatrice/src/tabs/tab_room.cpp index 117673743..ff6507b29 100644 --- a/cockatrice/src/client/tabs/tab_room.cpp +++ b/cockatrice/src/tabs/tab_room.cpp @@ -1,14 +1,14 @@ #include "tab_room.h" -#include "../../dialogs/dlg_settings.h" -#include "../../game/game_selector.h" -#include "../../main.h" -#include "../../server/abstract_client.h" -#include "../../server/chat_view/chat_view.h" -#include "../../server/pending_command.h" -#include "../../server/user/user_list_manager.h" -#include "../../server/user/user_list_widget.h" -#include "../../settings/cache_settings.h" +#include "../dialogs/dlg_settings.h" +#include "../main.h" +#include "../server/abstract_client.h" +#include "../server/chat_view/chat_view.h" +#include "../server/game_selector.h" +#include "../server/pending_command.h" +#include "../server/user/user_list_manager.h" +#include "../server/user/user_list_widget.h" +#include "../settings/cache_settings.h" #include "get_pb_extension.h" #include "pb/event_join_room.pb.h" #include "pb/event_leave_room.pb.h" diff --git a/cockatrice/src/client/tabs/tab_room.h b/cockatrice/src/tabs/tab_room.h similarity index 98% rename from cockatrice/src/client/tabs/tab_room.h rename to cockatrice/src/tabs/tab_room.h index 4c0c6c18f..040130d10 100644 --- a/cockatrice/src/client/tabs/tab_room.h +++ b/cockatrice/src/tabs/tab_room.h @@ -1,7 +1,7 @@ #ifndef TAB_ROOM_H #define TAB_ROOM_H -#include "../ui/line_edit_completer.h" +#include "../interface/line_edit_completer.h" #include "tab.h" #include diff --git a/cockatrice/src/client/tabs/tab_server.cpp b/cockatrice/src/tabs/tab_server.cpp similarity index 98% rename from cockatrice/src/client/tabs/tab_server.cpp rename to cockatrice/src/tabs/tab_server.cpp index 989e98131..069f06313 100644 --- a/cockatrice/src/client/tabs/tab_server.cpp +++ b/cockatrice/src/tabs/tab_server.cpp @@ -1,8 +1,8 @@ #include "tab_server.h" -#include "../../server/abstract_client.h" -#include "../../server/pending_command.h" -#include "../../server/user/user_list_widget.h" +#include "../server/abstract_client.h" +#include "../server/pending_command.h" +#include "../server/user/user_list_widget.h" #include "pb/event_list_rooms.pb.h" #include "pb/event_server_message.pb.h" #include "pb/response_join_room.pb.h" diff --git a/cockatrice/src/client/tabs/tab_server.h b/cockatrice/src/tabs/tab_server.h similarity index 100% rename from cockatrice/src/client/tabs/tab_server.h rename to cockatrice/src/tabs/tab_server.h diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp similarity index 99% rename from cockatrice/src/client/tabs/tab_supervisor.cpp rename to cockatrice/src/tabs/tab_supervisor.cpp index ef7fc4e41..78fce4516 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.cpp +++ b/cockatrice/src/tabs/tab_supervisor.cpp @@ -1,11 +1,11 @@ #include "tab_supervisor.h" -#include "../../main.h" -#include "../../server/abstract_client.h" -#include "../../server/user/user_list_manager.h" -#include "../../server/user/user_list_widget.h" -#include "../../settings/cache_settings.h" -#include "../ui/pixel_map_generator.h" +#include "../interface/pixel_map_generator.h" +#include "../main.h" +#include "../server/abstract_client.h" +#include "../server/user/user_list_manager.h" +#include "../server/user/user_list_widget.h" +#include "../settings/cache_settings.h" #include "api/edhrec/tab_edhrec_main.h" #include "pb/event_game_joined.pb.h" #include "pb/event_notify_user.pb.h" diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/tabs/tab_supervisor.h similarity index 98% rename from cockatrice/src/client/tabs/tab_supervisor.h rename to cockatrice/src/tabs/tab_supervisor.h index 592f0b12e..165c3489b 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.h +++ b/cockatrice/src/tabs/tab_supervisor.h @@ -1,8 +1,8 @@ #ifndef TAB_SUPERVISOR_H #define TAB_SUPERVISOR_H -#include "../../deck/deck_loader.h" -#include "../../server/user/user_list_proxy.h" +#include "../deck/deck_loader.h" +#include "../server/user/user_list_proxy.h" #include "abstract_tab_deck_editor.h" #include "api/edhrec/tab_edhrec.h" #include "api/edhrec/tab_edhrec_main.h" diff --git a/cockatrice/src/client/tabs/tab_visual_database_display.cpp b/cockatrice/src/tabs/tab_visual_database_display.cpp similarity index 100% rename from cockatrice/src/client/tabs/tab_visual_database_display.cpp rename to cockatrice/src/tabs/tab_visual_database_display.cpp diff --git a/cockatrice/src/client/tabs/tab_visual_database_display.h b/cockatrice/src/tabs/tab_visual_database_display.h similarity index 85% rename from cockatrice/src/client/tabs/tab_visual_database_display.h rename to cockatrice/src/tabs/tab_visual_database_display.h index 55f895e5b..689f5269c 100644 --- a/cockatrice/src/client/tabs/tab_visual_database_display.h +++ b/cockatrice/src/tabs/tab_visual_database_display.h @@ -1,7 +1,7 @@ #ifndef TAB_VISUAL_DATABASE_DISPLAY_H #define TAB_VISUAL_DATABASE_DISPLAY_H -#include "../ui/widgets/visual_database_display/visual_database_display_widget.h" +#include "../interface/widgets/visual_database_display/visual_database_display_widget.h" #include "tab.h" #include diff --git a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp similarity index 96% rename from cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp rename to cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index 44277bfd4..502ef09e1 100644 --- a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -1,15 +1,15 @@ #include "tab_deck_editor_visual.h" -#include "../../../database/card_database_model.h" -#include "../../../deck/deck_list_model.h" -#include "../../../deck/deck_stats_interface.h" -#include "../../../filters/filter_builder.h" -#include "../../../server/pending_command.h" -#include "../../../settings/cache_settings.h" -#include "../../ui/pixel_map_generator.h" -#include "../../ui/widgets/cards/card_info_frame_widget.h" -#include "../../ui/widgets/deck_analytics/deck_analytics_widget.h" -#include "../../ui/widgets/visual_deck_editor/visual_deck_editor_widget.h" +#include "../../database/card_database_model.h" +#include "../../deck/deck_list_model.h" +#include "../../deck/deck_stats_interface.h" +#include "../../filters/filter_builder.h" +#include "../../interface/pixel_map_generator.h" +#include "../../interface/widgets/cards/card_info_frame_widget.h" +#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h" +#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h" +#include "../../server/pending_command.h" +#include "../../settings/cache_settings.h" #include "../tab_deck_editor.h" #include "../tab_supervisor.h" #include "pb/command_deck_upload.pb.h" diff --git a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.h b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.h similarity index 100% rename from cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.h rename to cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.h diff --git a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp similarity index 97% rename from cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp rename to cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp index f0bf008dd..f42b1ff70 100644 --- a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp +++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp @@ -1,6 +1,6 @@ #include "tab_deck_editor_visual_tab_widget.h" -#include "../../ui/widgets/visual_database_display/visual_database_display_widget.h" +#include "../../interface/widgets/visual_database_display/visual_database_display_widget.h" #include "../abstract_tab_deck_editor.h" TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent, diff --git a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h similarity index 84% rename from cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h rename to cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h index 37a17e7d2..36027f819 100644 --- a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h +++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h @@ -1,11 +1,11 @@ #ifndef TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H #define TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H -#include "../../ui/widgets/deck_analytics/deck_analytics_widget.h" -#include "../../ui/widgets/printing_selector/printing_selector.h" -#include "../../ui/widgets/visual_database_display/visual_database_display_widget.h" -#include "../../ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h" -#include "../../ui/widgets/visual_deck_editor/visual_deck_editor_widget.h" +#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h" +#include "../../interface/widgets/printing_selector/printing_selector.h" +#include "../../interface/widgets/visual_database_display/visual_database_display_widget.h" +#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h" +#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h" #include "../abstract_tab_deck_editor.h" #include diff --git a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp similarity index 85% rename from cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp rename to cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp index afe3ddb13..e8b6bce6f 100644 --- a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp +++ b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp @@ -1,8 +1,8 @@ #include "tab_deck_storage_visual.h" -#include "../../../database/card_database_model.h" -#include "../../ui/widgets/cards/deck_preview_card_picture_widget.h" -#include "../../ui/widgets/visual_deck_storage/visual_deck_storage_widget.h" +#include "../../database/card_database_model.h" +#include "../../interface/widgets/cards/deck_preview_card_picture_widget.h" +#include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "../tab_supervisor.h" #include "pb/command_deck_del.pb.h" diff --git a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.h similarity index 100% rename from cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h rename to cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.h diff --git a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp new file mode 100644 index 000000000..65d7d17e7 --- /dev/null +++ b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp @@ -0,0 +1,55 @@ +#include "deck_list_sort_filter_proxy_model.h" + +#include "../deck/deck_list_model.h" + +bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const +{ + auto *src = sourceModel(); + + // Inner nodes? -> sort alphabetically by column 1 + bool leftIsCard = src->data(left, Qt::UserRole + 1).toBool(); + bool rightIsCard = src->data(right, Qt::UserRole + 1).toBool(); + + if (!leftIsCard || !rightIsCard) { + QString lName = src->data(left.siblingAtColumn(1), Qt::EditRole).toString(); + QString rName = src->data(right.siblingAtColumn(1), Qt::EditRole).toString(); + return lName.localeAwareCompare(rName) < 0; + } + + // Both are cards -> apply sort criteria + auto *lNode = static_cast(left.internalPointer()); + auto *rNode = static_cast(right.internalPointer()); + + CardInfoPtr lInfo = CardDatabaseManager::getInstance()->guessCard({lNode->getName()}).getCardPtr(); + CardInfoPtr rInfo = CardDatabaseManager::getInstance()->guessCard({rNode->getName()}).getCardPtr(); + + // Example: multiple tie-break criteria (colors > cmc > name) + for (const QString &crit : sortCriteria) { + if (crit == "name") { + QString ln = lNode->getName(); + QString rn = rNode->getName(); + int cmp = ln.localeAwareCompare(rn); + if (cmp != 0) + return cmp < 0; + } else if (crit == "cmc") { + int lc = lInfo ? lInfo->getCmc().toInt() : 0; + int rc = rInfo ? rInfo->getCmc().toInt() : 0; + if (lc != rc) + return lc < rc; + } else if (crit == "colors") { + QString lr = lInfo ? lInfo->getColors() : QString(); + QString rr = rInfo ? rInfo->getColors() : QString(); + int cmp = lr.localeAwareCompare(rr); + if (cmp != 0) + return cmp < 0; + } else if (crit == "maintype") { + QString lr = lInfo ? lInfo->getMainCardType() : QString(); + QString rr = rInfo ? rInfo->getMainCardType() : QString(); + int cmp = lr.localeAwareCompare(rr); + if (cmp != 0) + return cmp < 0; + } + } + + return false; +} diff --git a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h index 414f02694..d21907c84 100644 --- a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h +++ b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h @@ -20,57 +20,7 @@ public: } protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const override - { - auto *src = sourceModel(); - - // Inner nodes? -> sort alphabetically by column 1 - bool leftIsCard = src->data(left, Qt::UserRole + 1).toBool(); - bool rightIsCard = src->data(right, Qt::UserRole + 1).toBool(); - - if (!leftIsCard || !rightIsCard) { - QString lName = src->data(left.siblingAtColumn(1), Qt::EditRole).toString(); - QString rName = src->data(right.siblingAtColumn(1), Qt::EditRole).toString(); - return lName.localeAwareCompare(rName) < 0; - } - - // Both are cards -> apply sort criteria - auto *lNode = static_cast(left.internalPointer()); - auto *rNode = static_cast(right.internalPointer()); - - CardInfoPtr lInfo = CardDatabaseManager::getInstance()->guessCard({lNode->getName()}).getCardPtr(); - CardInfoPtr rInfo = CardDatabaseManager::getInstance()->guessCard({rNode->getName()}).getCardPtr(); - - // Example: multiple tie-break criteria (colors > cmc > name) - for (const QString &crit : sortCriteria) { - if (crit == "name") { - QString ln = lNode->getName(); - QString rn = rNode->getName(); - int cmp = ln.localeAwareCompare(rn); - if (cmp != 0) - return cmp < 0; - } else if (crit == "cmc") { - int lc = lInfo ? lInfo->getCmc().toInt() : 0; - int rc = rInfo ? rInfo->getCmc().toInt() : 0; - if (lc != rc) - return lc < rc; - } else if (crit == "colors") { - QString lr = lInfo ? lInfo->getColors() : QString(); - QString rr = rInfo ? rInfo->getColors() : QString(); - int cmp = lr.localeAwareCompare(rr); - if (cmp != 0) - return cmp < 0; - } else if (crit == "maintype") { - QString lr = lInfo ? lInfo->getMainCardType() : QString(); - QString rr = rInfo ? rInfo->getMainCardType() : QString(); - int cmp = lr.localeAwareCompare(rr); - if (cmp != 0) - return cmp < 0; - } - } - - return false; - } + bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; private: QStringList sortCriteria; diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 7af66dbb5..50b3a20dc 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -18,26 +18,26 @@ set(oracle_SOURCES src/parsehelpers.cpp src/qt-json/json.cpp ../cockatrice/src/card/card_info.cpp - ../cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp - ../cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp + ../cockatrice/src/client/network/release_channel.cpp ../cockatrice/src/database/parser/card_database_parser.cpp ../cockatrice/src/database/parser/cockatrice_xml_3.cpp ../cockatrice/src/database/parser/cockatrice_xml_4.cpp + ../cockatrice/src/interface/theme_manager.cpp + ../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp + ../cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp ../cockatrice/src/settings/cache_settings.cpp - ../cockatrice/src/settings/shortcuts_settings.cpp ../cockatrice/src/settings/card_counter_settings.cpp ../cockatrice/src/settings/card_database_settings.cpp - ../cockatrice/src/settings/servers_settings.cpp - ../cockatrice/src/settings/settings_manager.cpp - ../cockatrice/src/settings/message_settings.cpp - ../cockatrice/src/settings/recents_settings.cpp - ../cockatrice/src/settings/game_filters_settings.cpp - ../cockatrice/src/settings/layouts_settings.cpp - ../cockatrice/src/settings/download_settings.cpp ../cockatrice/src/settings/card_override_settings.cpp ../cockatrice/src/settings/debug_settings.cpp - ../cockatrice/src/client/ui/theme_manager.cpp - ../cockatrice/src/client/network/release_channel.cpp + ../cockatrice/src/settings/download_settings.cpp + ../cockatrice/src/settings/game_filters_settings.cpp + ../cockatrice/src/settings/layouts_settings.cpp + ../cockatrice/src/settings/message_settings.cpp + ../cockatrice/src/settings/recents_settings.cpp + ../cockatrice/src/settings/servers_settings.cpp + ../cockatrice/src/settings/settings_manager.cpp + ../cockatrice/src/settings/shortcuts_settings.cpp ${VERSION_STRING_CPP} ) diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp index 19007a3ca..f2930f975 100644 --- a/oracle/src/main.cpp +++ b/oracle/src/main.cpp @@ -1,6 +1,6 @@ #include "main.h" -#include "client/ui/theme_manager.h" +#include "interface/theme_manager.h" #include "oraclewizard.h" #include "settings/cache_settings.h"