From 474c1d0d8992a535fd348a117c53df9569d0e0ff Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Thu, 9 Oct 2025 15:25:18 +0200 Subject: [PATCH] [Move refactor] Move dialogs to interface/widgets/ (#6234) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Move dialogs/ underneath interface/widgets since QDialog inherits from QWidget. --------- Co-authored-by: Lukas Brübach --- cockatrice/CMakeLists.txt | 50 +++++++++---------- .../src/game/deckview/deck_view_container.cpp | 8 +-- .../widgets}/dialogs/dlg_connect.cpp | 0 .../widgets}/dialogs/dlg_connect.h | 0 .../dlg_convert_deck_to_cod_format.cpp | 0 .../dialogs/dlg_convert_deck_to_cod_format.h | 0 .../widgets}/dialogs/dlg_create_game.cpp | 0 .../widgets}/dialogs/dlg_create_game.h | 0 .../dialogs/dlg_default_tags_editor.cpp | 0 .../dialogs/dlg_default_tags_editor.h | 0 .../widgets}/dialogs/dlg_edit_avatar.cpp | 0 .../widgets}/dialogs/dlg_edit_avatar.h | 0 .../widgets}/dialogs/dlg_edit_password.cpp | 0 .../widgets}/dialogs/dlg_edit_password.h | 0 .../widgets}/dialogs/dlg_edit_tokens.cpp | 0 .../widgets}/dialogs/dlg_edit_tokens.h | 0 .../widgets}/dialogs/dlg_edit_user.cpp | 0 .../widgets}/dialogs/dlg_edit_user.h | 0 .../widgets}/dialogs/dlg_filter_games.cpp | 0 .../widgets}/dialogs/dlg_filter_games.h | 0 .../dialogs/dlg_forgot_password_challenge.cpp | 0 .../dialogs/dlg_forgot_password_challenge.h | 0 .../dialogs/dlg_forgot_password_request.cpp | 0 .../dialogs/dlg_forgot_password_request.h | 0 .../dialogs/dlg_forgot_password_reset.cpp | 0 .../dialogs/dlg_forgot_password_reset.h | 0 .../widgets}/dialogs/dlg_load_deck.cpp | 0 .../widgets}/dialogs/dlg_load_deck.h | 0 .../dialogs/dlg_load_deck_from_clipboard.cpp | 0 .../dialogs/dlg_load_deck_from_clipboard.h | 0 .../dialogs/dlg_load_deck_from_website.cpp | 0 .../dialogs/dlg_load_deck_from_website.h | 0 .../widgets}/dialogs/dlg_load_remote_deck.cpp | 0 .../widgets}/dialogs/dlg_load_remote_deck.h | 0 .../widgets}/dialogs/dlg_manage_sets.cpp | 0 .../widgets}/dialogs/dlg_manage_sets.h | 0 .../widgets}/dialogs/dlg_register.cpp | 0 .../widgets}/dialogs/dlg_register.h | 0 .../dialogs/dlg_select_set_for_cards.cpp | 0 .../dialogs/dlg_select_set_for_cards.h | 0 .../widgets}/dialogs/dlg_settings.cpp | 0 .../widgets}/dialogs/dlg_settings.h | 0 .../dialogs/dlg_startup_card_check.cpp | 0 .../widgets}/dialogs/dlg_startup_card_check.h | 0 .../widgets}/dialogs/dlg_tip_of_the_day.cpp | 0 .../widgets}/dialogs/dlg_tip_of_the_day.h | 0 .../widgets}/dialogs/dlg_update.cpp | 0 .../widgets}/dialogs/dlg_update.h | 0 .../widgets}/dialogs/dlg_view_log.cpp | 0 .../widgets}/dialogs/dlg_view_log.h | 0 .../widgets}/dialogs/tip_of_the_day.cpp | 0 .../widgets}/dialogs/tip_of_the_day.h | 0 .../printing_selector/printing_selector.cpp | 2 +- ...rinting_selector_card_selection_widget.cpp | 2 +- .../widgets/server/game_selector.cpp | 4 +- .../widgets/server/user/user_info_box.cpp | 6 +-- .../widgets/tabs/abstract_tab_deck_editor.cpp | 6 +-- .../widgets/tabs/tab_deck_editor.cpp | 4 +- .../src/interface/widgets/tabs/tab_game.cpp | 2 +- .../src/interface/widgets/tabs/tab_logs.cpp | 2 +- .../src/interface/widgets/tabs/tab_room.cpp | 2 +- ...al_database_display_name_filter_widget.cpp | 2 +- .../deck_preview_deck_tags_display_widget.cpp | 2 +- .../deck_preview/deck_preview_tag_dialog.cpp | 2 +- cockatrice/src/interface/window_main.cpp | 24 ++++----- cockatrice/src/main.cpp | 2 +- 66 files changed, 60 insertions(+), 60 deletions(-) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_connect.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_connect.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_convert_deck_to_cod_format.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_convert_deck_to_cod_format.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_create_game.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_create_game.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_default_tags_editor.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_default_tags_editor.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_edit_avatar.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_edit_avatar.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_edit_password.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_edit_password.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_edit_tokens.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_edit_tokens.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_edit_user.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_edit_user.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_filter_games.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_filter_games.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_forgot_password_challenge.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_forgot_password_challenge.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_forgot_password_request.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_forgot_password_request.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_forgot_password_reset.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_forgot_password_reset.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_load_deck.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_load_deck.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_load_deck_from_clipboard.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_load_deck_from_clipboard.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_load_deck_from_website.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_load_deck_from_website.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_load_remote_deck.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_load_remote_deck.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_manage_sets.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_manage_sets.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_register.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_register.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_select_set_for_cards.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_select_set_for_cards.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_settings.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_settings.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_startup_card_check.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_startup_card_check.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_tip_of_the_day.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_tip_of_the_day.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_update.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_update.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_view_log.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/dlg_view_log.h (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/tip_of_the_day.cpp (100%) rename cockatrice/src/{ => interface/widgets}/dialogs/tip_of_the_day.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 14e3a11c8..bd14e3f4d 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -15,31 +15,31 @@ set(cockatrice_SOURCES src/client/network/update/client/release_channel.cpp src/client/network/update/card_spoiler/spoiler_background_updater.cpp src/client/sound_engine.cpp - src/dialogs/dlg_connect.cpp - src/dialogs/dlg_convert_deck_to_cod_format.cpp - src/dialogs/dlg_create_game.cpp - src/dialogs/dlg_default_tags_editor.cpp - src/dialogs/dlg_edit_avatar.cpp - src/dialogs/dlg_edit_password.cpp - src/dialogs/dlg_edit_tokens.cpp - src/dialogs/dlg_edit_user.cpp - src/dialogs/dlg_filter_games.cpp - src/dialogs/dlg_forgot_password_challenge.cpp - src/dialogs/dlg_forgot_password_request.cpp - src/dialogs/dlg_forgot_password_reset.cpp - src/dialogs/dlg_load_deck.cpp - src/dialogs/dlg_load_deck_from_clipboard.cpp - src/dialogs/dlg_load_deck_from_website.cpp - src/dialogs/dlg_load_remote_deck.cpp - src/dialogs/dlg_manage_sets.cpp - src/dialogs/dlg_register.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/interface/widgets/dialogs/dlg_connect.cpp + src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp + src/interface/widgets/dialogs/dlg_create_game.cpp + src/interface/widgets/dialogs/dlg_default_tags_editor.cpp + src/interface/widgets/dialogs/dlg_edit_avatar.cpp + src/interface/widgets/dialogs/dlg_edit_password.cpp + src/interface/widgets/dialogs/dlg_edit_tokens.cpp + src/interface/widgets/dialogs/dlg_edit_user.cpp + src/interface/widgets/dialogs/dlg_filter_games.cpp + src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp + src/interface/widgets/dialogs/dlg_forgot_password_request.cpp + src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp + src/interface/widgets/dialogs/dlg_load_deck.cpp + src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp + src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp + src/interface/widgets/dialogs/dlg_load_remote_deck.cpp + src/interface/widgets/dialogs/dlg_manage_sets.cpp + src/interface/widgets/dialogs/dlg_register.cpp + src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp + src/interface/widgets/dialogs/dlg_settings.cpp + src/interface/widgets/dialogs/dlg_startup_card_check.cpp + src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp + src/interface/widgets/dialogs/dlg_update.cpp + src/interface/widgets/dialogs/dlg_view_log.cpp + src/interface/widgets/dialogs/tip_of_the_day.cpp src/filters/deck_filter_string.cpp src/filters/filter_builder.cpp src/filters/filter_card.cpp diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 9a4999af6..3b3a938b2 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,10 +1,10 @@ #include "deck_view_container.h" -#include "../../dialogs/dlg_load_deck.h" -#include "../../dialogs/dlg_load_deck_from_clipboard.h" -#include "../../dialogs/dlg_load_deck_from_website.h" -#include "../../dialogs/dlg_load_remote_deck.h" #include "../../interface/card_picture_loader/card_picture_loader.h" +#include "../../interface/widgets/dialogs/dlg_load_deck.h" +#include "../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h" +#include "../../interface/widgets/dialogs/dlg_load_deck_from_website.h" +#include "../../interface/widgets/dialogs/dlg_load_remote_deck.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../game_scene.h" #include "deck_view.h" diff --git a/cockatrice/src/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_connect.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp diff --git a/cockatrice/src/dialogs/dlg_connect.h b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h similarity index 100% rename from cockatrice/src/dialogs/dlg_connect.h rename to cockatrice/src/interface/widgets/dialogs/dlg_connect.h diff --git a/cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp diff --git a/cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.h b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h similarity index 100% rename from cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.h rename to cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_create_game.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp diff --git a/cockatrice/src/dialogs/dlg_create_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h similarity index 100% rename from cockatrice/src/dialogs/dlg_create_game.h rename to cockatrice/src/interface/widgets/dialogs/dlg_create_game.h diff --git a/cockatrice/src/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_default_tags_editor.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp diff --git a/cockatrice/src/dialogs/dlg_default_tags_editor.h b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h similarity index 100% rename from cockatrice/src/dialogs/dlg_default_tags_editor.h rename to cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_edit_avatar.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h similarity index 100% rename from cockatrice/src/dialogs/dlg_edit_avatar.h rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h diff --git a/cockatrice/src/dialogs/dlg_edit_password.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_edit_password.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp diff --git a/cockatrice/src/dialogs/dlg_edit_password.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h similarity index 100% rename from cockatrice/src/dialogs/dlg_edit_password.h rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_edit_tokens.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h similarity index 100% rename from cockatrice/src/dialogs/dlg_edit_tokens.h rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h diff --git a/cockatrice/src/dialogs/dlg_edit_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_edit_user.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp diff --git a/cockatrice/src/dialogs/dlg_edit_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h similarity index 100% rename from cockatrice/src/dialogs/dlg_edit_user.h rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h diff --git a/cockatrice/src/dialogs/dlg_filter_games.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_filter_games.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp diff --git a/cockatrice/src/dialogs/dlg_filter_games.h b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h similarity index 100% rename from cockatrice/src/dialogs/dlg_filter_games.h rename to cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h diff --git a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp diff --git a/cockatrice/src/dialogs/dlg_forgot_password_challenge.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h similarity index 100% rename from cockatrice/src/dialogs/dlg_forgot_password_challenge.h rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h diff --git a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_forgot_password_request.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp diff --git a/cockatrice/src/dialogs/dlg_forgot_password_request.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h similarity index 100% rename from cockatrice/src/dialogs/dlg_forgot_password_request.h rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h diff --git a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_forgot_password_reset.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp diff --git a/cockatrice/src/dialogs/dlg_forgot_password_reset.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h similarity index 100% rename from cockatrice/src/dialogs/dlg_forgot_password_reset.h rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h diff --git a/cockatrice/src/dialogs/dlg_load_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_load_deck.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp diff --git a/cockatrice/src/dialogs/dlg_load_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h similarity index 100% rename from cockatrice/src/dialogs/dlg_load_deck.h rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h similarity index 100% rename from cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_website.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_load_deck_from_website.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_website.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h similarity index 100% rename from cockatrice/src/dialogs/dlg_load_deck_from_website.h rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h diff --git a/cockatrice/src/dialogs/dlg_load_remote_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_load_remote_deck.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp diff --git a/cockatrice/src/dialogs/dlg_load_remote_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h similarity index 100% rename from cockatrice/src/dialogs/dlg_load_remote_deck.h rename to cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_manage_sets.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp diff --git a/cockatrice/src/dialogs/dlg_manage_sets.h b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h similarity index 100% rename from cockatrice/src/dialogs/dlg_manage_sets.h rename to cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h diff --git a/cockatrice/src/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_register.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_register.cpp diff --git a/cockatrice/src/dialogs/dlg_register.h b/cockatrice/src/interface/widgets/dialogs/dlg_register.h similarity index 100% rename from cockatrice/src/dialogs/dlg_register.h rename to cockatrice/src/interface/widgets/dialogs/dlg_register.h diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_select_set_for_cards.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h similarity index 100% rename from cockatrice/src/dialogs/dlg_select_set_for_cards.h rename to cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_settings.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp diff --git a/cockatrice/src/dialogs/dlg_settings.h b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h similarity index 100% rename from cockatrice/src/dialogs/dlg_settings.h rename to cockatrice/src/interface/widgets/dialogs/dlg_settings.h diff --git a/cockatrice/src/dialogs/dlg_startup_card_check.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_startup_card_check.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp diff --git a/cockatrice/src/dialogs/dlg_startup_card_check.h b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h similarity index 100% rename from cockatrice/src/dialogs/dlg_startup_card_check.h rename to cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_tip_of_the_day.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h similarity index 100% rename from cockatrice/src/dialogs/dlg_tip_of_the_day.h rename to cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h diff --git a/cockatrice/src/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_update.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_update.cpp diff --git a/cockatrice/src/dialogs/dlg_update.h b/cockatrice/src/interface/widgets/dialogs/dlg_update.h similarity index 100% rename from cockatrice/src/dialogs/dlg_update.h rename to cockatrice/src/interface/widgets/dialogs/dlg_update.h diff --git a/cockatrice/src/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp similarity index 100% rename from cockatrice/src/dialogs/dlg_view_log.cpp rename to cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp diff --git a/cockatrice/src/dialogs/dlg_view_log.h b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h similarity index 100% rename from cockatrice/src/dialogs/dlg_view_log.h rename to cockatrice/src/interface/widgets/dialogs/dlg_view_log.h diff --git a/cockatrice/src/dialogs/tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp similarity index 100% rename from cockatrice/src/dialogs/tip_of_the_day.cpp rename to cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp diff --git a/cockatrice/src/dialogs/tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h similarity index 100% rename from cockatrice/src/dialogs/tip_of_the_day.h rename to cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp index f581312f2..8afd56f9a 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp @@ -1,7 +1,7 @@ #include "printing_selector.h" -#include "../../../dialogs/dlg_select_set_for_cards.h" #include "../../../interface/card_picture_loader/card_picture_loader.h" +#include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.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/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp index 5b2935b7b..9c046a51b 100644 --- a/cockatrice/src/interface/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 "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h" /** * @brief Constructs a PrintingSelectorCardSelectionWidget for navigating through cards in the deck. diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp index 2b7c7099b..e3fa1b64f 100644 --- a/cockatrice/src/interface/widgets/server/game_selector.cpp +++ b/cockatrice/src/interface/widgets/server/game_selector.cpp @@ -1,7 +1,7 @@ #include "game_selector.h" -#include "../dialogs/dlg_create_game.h" -#include "../dialogs/dlg_filter_games.h" +#include "../interface/widgets/dialogs/dlg_create_game.h" +#include "../interface/widgets/dialogs/dlg_filter_games.h" #include "../interface/widgets/tabs/tab_account.h" #include "../interface/widgets/tabs/tab_game.h" #include "../interface/widgets/tabs/tab_room.h" diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp index d795e9622..9ae4a42c2 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp @@ -1,9 +1,9 @@ #include "user_info_box.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 "../../interface/widgets/dialogs/dlg_edit_avatar.h" +#include "../../interface/widgets/dialogs/dlg_edit_password.h" +#include "../../interface/widgets/dialogs/dlg_edit_user.h" #include "../../interface/widgets/utility/get_text_with_max.h" #include diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp index 2a7a8a129..ebc0e0dee 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp @@ -2,12 +2,12 @@ #include "../client/network/interfaces/deck_stats_interface.h" #include "../client/network/interfaces/tapped_out_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/card_picture_loader/card_picture_loader.h" #include "../interface/pixel_map_generator.h" #include "../interface/widgets/cards/card_info_frame_widget.h" +#include "../interface/widgets/dialogs/dlg_load_deck.h" +#include "../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h" +#include "../interface/widgets/dialogs/dlg_load_deck_from_website.h" #include "tab_supervisor.h" #include diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp index 24548cb6c..ec746a89d 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp @@ -1,13 +1,13 @@ #include "tab_deck_editor.h" #include "../client/network/interfaces/tapped_out_interface.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 "../interface/widgets/dialogs/dlg_load_deck.h" +#include "../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h" #include "../interface/widgets/menus/deck_editor_menu.h" #include "tab_supervisor.h" diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp index 473e2caad..f7c24e22b 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp @@ -1,6 +1,5 @@ #include "tab_game.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" @@ -16,6 +15,7 @@ #include "../game/zones/card_zone.h" #include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/widgets/cards/card_info_frame_widget.h" +#include "../interface/widgets/dialogs/dlg_create_game.h" #include "../interface/widgets/replay/replay_timeline_widget.h" #include "../interface/widgets/server/user/user_list_manager.h" #include "../interface/widgets/utility/line_edit_completer.h" diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp index d27094c1a..86e10b755 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp @@ -1,6 +1,6 @@ #include "tab_logs.h" -#include "../dialogs/dlg_manage_sets.h" +#include "../interface/widgets/dialogs/dlg_manage_sets.h" #include "../interface/widgets/utility/custom_line_edit.h" #include diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp index b77693599..808c888cd 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp @@ -1,6 +1,6 @@ #include "tab_room.h" -#include "../dialogs/dlg_settings.h" +#include "../interface/widgets/dialogs/dlg_settings.h" #include "../interface/widgets/server/chat_view/chat_view.h" #include "../interface/widgets/server/game_selector.h" #include "../interface/widgets/server/user/user_list_manager.h" diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp index 8019f9e7c..33929341e 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp @@ -1,6 +1,6 @@ #include "visual_database_display_name_filter_widget.h" -#include "../../../dialogs/dlg_load_deck_from_clipboard.h" +#include "../../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h" #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp index dc36d56ac..4053de89b 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp @@ -1,6 +1,6 @@ #include "deck_preview_deck_tags_display_widget.h" -#include "../../../../dialogs/dlg_convert_deck_to_cod_format.h" +#include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h" #include "../../../../interface/widgets/tabs/tab_deck_editor.h" #include "../../general/layout_containers/flow_widget.h" #include "deck_preview_tag_addition_widget.h" diff --git a/cockatrice/src/interface/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 index 513c2543b..9d130946f 100644 --- a/cockatrice/src/interface/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,6 +1,6 @@ #include "deck_preview_tag_dialog.h" -#include "../../../../dialogs/dlg_default_tags_editor.h" +#include "../../../../interface/widgets/dialogs/dlg_default_tags_editor.h" #include "deck_preview_tag_item_widget.h" #include diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index 318285c3e..2e9ea18c3 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -21,18 +21,18 @@ #include "../client/network/update/client/client_update_checker.h" #include "../client/network/update/client/release_channel.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 "../interface/widgets/dialogs/dlg_connect.h" +#include "../interface/widgets/dialogs/dlg_edit_tokens.h" +#include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h" +#include "../interface/widgets/dialogs/dlg_forgot_password_request.h" +#include "../interface/widgets/dialogs/dlg_forgot_password_reset.h" +#include "../interface/widgets/dialogs/dlg_manage_sets.h" +#include "../interface/widgets/dialogs/dlg_register.h" +#include "../interface/widgets/dialogs/dlg_settings.h" +#include "../interface/widgets/dialogs/dlg_startup_card_check.h" +#include "../interface/widgets/dialogs/dlg_tip_of_the_day.h" +#include "../interface/widgets/dialogs/dlg_update.h" +#include "../interface/widgets/dialogs/dlg_view_log.h" #include "../interface/widgets/tabs/tab_game.h" #include "../interface/widgets/tabs/tab_supervisor.h" #include "../main.h" diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index fce44f8c6..2c79297ef 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -23,9 +23,9 @@ #include "QtNetwork/QNetworkInterface" #include "client/network/update/card_spoiler/spoiler_background_updater.h" #include "client/sound_engine.h" -#include "dialogs/dlg_settings.h" #include "interface/pixel_map_generator.h" #include "interface/theme_manager.h" +#include "interface/widgets/dialogs/dlg_settings.h" #include "interface/window_main.h" #include "version_string.h"