jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactor display widgets to their own folder, optimize some imports.

Browse source
This commit is contained in:
Lukas Brübach 2025-04-16 21:08:25 +02:00
parent 65222abba6
commit dab4037f98
21 changed files with 42 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/CMakeLists.txt
View file

@ -20,13 +20,13 @@ set(cockatrice_SOURCES
src/client/tabs/abstract_tab_deck_editor.cpp src/client/tabs/abstract_tab_deck_editor.cpp
src/client/tabs/api/edhrec/tab_edhrec.cpp src/client/tabs/api/edhrec/tab_edhrec.cpp
src/client/tabs/api/edhrec/tab_edhrec_main.cpp src/client/tabs/api/edhrec/tab_edhrec_main.cpp
src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.cpp src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.cpp src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.cpp
src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.cpp src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.cpp
src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.cpp src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.cpp
src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.cpp src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_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/top_tags/edhrec_top_tags_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/commander/edhrec_commander_api_response_archidekt_links.cpp src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_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/commander/edhrec_commander_api_response_average_deck_statistics.cpp
src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_card_details.cpp src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_card_details.cpp

2
cockatrice/src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
View file

@ -19,4 +19,4 @@ public:
void debugPrint() const; void debugPrint() const;
}; };
#endif //EDHREC_TOP_COMMANDERS_API_RESPONSE_H #endif // EDHREC_TOP_COMMANDERS_API_RESPONSE_H

4
cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.cpp → cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.cpp
View file

@ -1,7 +1,7 @@
#include "edhrec_commander_api_response_card_details_display_widget.h" #include "edhrec_commander_api_response_card_details_display_widget.h"
#include "../../../../../game/cards/card_database_manager.h" #include "../../../../../../game/cards/card_database_manager.h"
#include "../tab_edhrec_main.h" #include "../../tab_edhrec_main.h"
EdhrecCommanderApiResponseCardDetailsDisplayWidget::EdhrecCommanderApiResponseCardDetailsDisplayWidget( EdhrecCommanderApiResponseCardDetailsDisplayWidget::EdhrecCommanderApiResponseCardDetailsDisplayWidget(
QWidget *parent, QWidget *parent,

4
cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.h → cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.h
View file

@ -1,8 +1,8 @@
#ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
#define 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 "../../../../../ui/widgets/cards/card_info_picture_widget.h"
#include "../api_response/commander/edhrec_commander_api_response_card_details.h" #include "../../api_response/commander/edhrec_commander_api_response_card_details.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>

2
cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.cpp → cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.cpp
View file

@ -1,6 +1,6 @@
#include "edhrec_commander_api_response_card_list_display_widget.h" #include "edhrec_commander_api_response_card_list_display_widget.h"
#include "../../../../ui/widgets/general/display/banner_widget.h" #include "../../../../../ui/widgets/general/display/banner_widget.h"
#include "edhrec_commander_api_response_card_details_display_widget.h" #include "edhrec_commander_api_response_card_details_display_widget.h"
#include <QLabel> #include <QLabel>

6
cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.h → cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.h
View file

@ -1,9 +1,9 @@
#ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H
#define 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/display/banner_widget.h"
#include "../../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../../../../../ui/widgets/general/layout_containers/flow_widget.h"
#include "../api_response/commander/edhrec_commander_api_response_card_list.h" #include "../../api_response/commander/edhrec_commander_api_response_card_list.h"
#include <QResizeEvent> #include <QResizeEvent>
#include <QVBoxLayout> #include <QVBoxLayout>

4
cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.cpp → cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.cpp
View file

@ -1,7 +1,7 @@
#include "edhrec_commander_api_response_commander_details_display_widget.h" #include "edhrec_commander_api_response_commander_details_display_widget.h"
#include "../../../../../game/cards/card_database_manager.h" #include "../../../../../../game/cards/card_database_manager.h"
#include "../../../../ui/widgets/cards/card_info_picture_widget.h" #include "../../../../../ui/widgets/cards/card_info_picture_widget.h"
#include <QLabel> #include <QLabel>

4
cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.h → cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.h
View file

@ -1,8 +1,8 @@
#ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
#define 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 "../../../../../ui/widgets/cards/card_info_picture_widget.h"
#include "../api_response/commander/edhrec_commander_api_response_commander_details.h" #include "../../api_response/commander/edhrec_commander_api_response_commander_details.h"
#include <QLabel> #include <QLabel>
#include <QVBoxLayout> #include <QVBoxLayout>

4
cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.cpp → cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
View file

@ -1,7 +1,7 @@
#include "edhrec_commander_api_response_display_widget.h" #include "edhrec_commander_api_response_display_widget.h"
#include "../../../../ui/widgets/cards/card_info_picture_widget.h" #include "../../../../../ui/widgets/cards/card_info_picture_widget.h"
#include "../api_response/commander/edhrec_commander_api_response.h" #include "../../api_response/commander/edhrec_commander_api_response.h"
#include "edhrec_commander_api_response_card_list_display_widget.h" #include "edhrec_commander_api_response_card_list_display_widget.h"
#include "edhrec_commander_api_response_commander_details_display_widget.h" #include "edhrec_commander_api_response_commander_details_display_widget.h"

2
cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.h → cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
View file

@ -1,7 +1,7 @@
#ifndef EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H #ifndef EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
#define EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
#include "../api_response/commander/edhrec_commander_api_response.h" #include "../../api_response/commander/edhrec_commander_api_response.h"
#include <QScrollArea> #include <QScrollArea>
#include <QVBoxLayout> #include <QVBoxLayout>

9
cockatrice/src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.cpp → cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
View file

@ -1,15 +1,8 @@
#include "edhrec_top_cards_api_response_display_widget.h" #include "edhrec_top_cards_api_response_display_widget.h"
#include "../../../../ui/widgets/cards/card_info_picture_widget.h" #include "../../api_response/top_cards/edhrec_top_cards_api_response.h"
#include "../api_response/top_cards/edhrec_top_cards_api_response.h"
#include "../commander/edhrec_commander_api_response_card_list_display_widget.h" #include "../commander/edhrec_commander_api_response_card_list_display_widget.h"
#include <QListView>
#include <QResizeEvent>
#include <QScrollArea>
#include <QSplitter>
#include <QStringListModel>
EdhrecTopCardsApiResponseDisplayWidget::EdhrecTopCardsApiResponseDisplayWidget(QWidget *parent, EdhrecTopCardsApiResponseDisplayWidget::EdhrecTopCardsApiResponseDisplayWidget(QWidget *parent,
EdhrecTopCardsApiResponse response) EdhrecTopCardsApiResponse response)
: QWidget(parent) : QWidget(parent)

3
cockatrice/src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.h → cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
View file

@ -1,8 +1,9 @@
#ifndef EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H #ifndef EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H
#define EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H
#include "../api_response/top_cards/edhrec_top_cards_api_response.h" #include "../../api_response/top_cards/edhrec_top_cards_api_response.h"
#include <QResizeEvent>
#include <QScrollArea> #include <QScrollArea>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>

10
cockatrice/src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_api_response_display_widget.cpp → cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
View file

@ -1,15 +1,7 @@
#include "edhrec_top_commanders_api_response_display_widget.h" #include "edhrec_top_commanders_api_response_display_widget.h"
#include "../../../../ui/widgets/cards/card_info_picture_widget.h" #include "../../api_response/top_commanders/edhrec_top_commanders_api_response.h"
#include "../api_response/top_commanders/edhrec_top_commanders_api_response.h"
#include "../commander/edhrec_commander_api_response_card_list_display_widget.h" #include "../commander/edhrec_commander_api_response_card_list_display_widget.h"
#include "../commander/edhrec_commander_api_response_commander_details_display_widget.h"
#include <QListView>
#include <QResizeEvent>
#include <QScrollArea>
#include <QSplitter>
#include <QStringListModel>
EdhrecTopCommandersApiResponseDisplayWidget::EdhrecTopCommandersApiResponseDisplayWidget( EdhrecTopCommandersApiResponseDisplayWidget::EdhrecTopCommandersApiResponseDisplayWidget(
QWidget *parent, QWidget *parent,

3
cockatrice/src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_api_response_display_widget.h → cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
View file

@ -1,8 +1,9 @@
#ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H #ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H
#define EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H
#include "../api_response/top_commanders/edhrec_top_commanders_api_response.h" #include "../../api_response/top_commanders/edhrec_top_commanders_api_response.h"
#include <QResizeEvent>
#include <QScrollArea> #include <QScrollArea>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>

10
cockatrice/src/client/tabs/api/edhrec/top_tags/edhrec_top_tags_api_response_display_widget.cpp → cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
View file

@ -1,15 +1,7 @@
#include "edhrec_top_tags_api_response_display_widget.h" #include "edhrec_top_tags_api_response_display_widget.h"
#include "../../../../ui/widgets/cards/card_info_picture_widget.h" #include "../../api_response/top_tags/edhrec_top_tags_api_response.h"
#include "../api_response/top_commanders/edhrec_top_commanders_api_response.h"
#include "../commander/edhrec_commander_api_response_card_list_display_widget.h" #include "../commander/edhrec_commander_api_response_card_list_display_widget.h"
#include "../commander/edhrec_commander_api_response_commander_details_display_widget.h"
#include <QListView>
#include <QResizeEvent>
#include <QScrollArea>
#include <QSplitter>
#include <QStringListModel>
EdhrecTopTagsApiResponseDisplayWidget::EdhrecTopTagsApiResponseDisplayWidget(QWidget *parent, EdhrecTopTagsApiResponseDisplayWidget::EdhrecTopTagsApiResponseDisplayWidget(QWidget *parent,
EdhrecTopTagsApiResponse response) EdhrecTopTagsApiResponse response)

3
cockatrice/src/client/tabs/api/edhrec/top_tags/edhrec_top_tags_api_response_display_widget.h → cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
View file

@ -1,8 +1,9 @@
#ifndef EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H #ifndef EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
#define EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
#include "../api_response/top_tags/edhrec_top_tags_api_response.h" #include "../../api_response/top_tags/edhrec_top_tags_api_response.h"
#include <QResizeEvent>
#include <QScrollArea> #include <QScrollArea>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>

2
cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp
View file

@ -1,7 +1,7 @@
#include "tab_edhrec.h" #include "tab_edhrec.h"
#include "api_response/commander/edhrec_commander_api_response.h" #include "api_response/commander/edhrec_commander_api_response.h"
#include "commander/edhrec_commander_api_response_display_widget.h" #include "display/commander/edhrec_commander_api_response_display_widget.h"
#include <QDebug> #include <QDebug>
#include <QHBoxLayout> #include <QHBoxLayout>

3
cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h
View file

@ -4,9 +4,8 @@
#include "../../../../game/cards/card_database.h" #include "../../../../game/cards/card_database.h"
#include "../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../../../ui/widgets/general/layout_containers/flow_widget.h"
#include "../../tab.h" #include "../../tab.h"
#include "commander/edhrec_commander_api_response_display_widget.h" #include "display/commander/edhrec_commander_api_response_display_widget.h"
#include <QHBoxLayout>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
class TabEdhRec : public Tab class TabEdhRec : public Tab

8
cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp
View file

@ -7,10 +7,10 @@
#include "api_response/top_cards/edhrec_top_cards_api_response.h" #include "api_response/top_cards/edhrec_top_cards_api_response.h"
#include "api_response/top_commanders/edhrec_top_commanders_api_response.h" #include "api_response/top_commanders/edhrec_top_commanders_api_response.h"
#include "api_response/top_tags/edhrec_top_tags_api_response.h" #include "api_response/top_tags/edhrec_top_tags_api_response.h"
#include "commander/edhrec_commander_api_response_display_widget.h" #include "display/commander/edhrec_commander_api_response_display_widget.h"
#include "top_cards/edhrec_top_cards_api_response_display_widget.h" #include "display/top_cards/edhrec_top_cards_api_response_display_widget.h"
#include "top_commander/edhrec_top_commanders_api_response_display_widget.h" #include "display/top_commander/edhrec_top_commanders_api_response_display_widget.h"
#include "top_tags/edhrec_top_tags_api_response_display_widget.h" #include "display/top_tags/edhrec_top_tags_api_response_display_widget.h"
#include <QCompleter> #include <QCompleter>
#include <QDebug> #include <QDebug>

2
cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h
View file

@ -4,7 +4,7 @@
#include "../../../../game/cards/card_database.h" #include "../../../../game/cards/card_database.h"
#include "../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../../../ui/widgets/general/layout_containers/flow_widget.h"
#include "../../tab.h" #include "../../tab.h"
#include "commander/edhrec_commander_api_response_display_widget.h" #include "display/commander/edhrec_commander_api_response_display_widget.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLineEdit> #include <QLineEdit>

6
cockatrice/src/client/tabs/tab_supervisor.h
View file

@ -5,10 +5,10 @@
#include "../../server/user/user_list_proxy.h" #include "../../server/user/user_list_proxy.h"
#include "abstract_tab_deck_editor.h" #include "abstract_tab_deck_editor.h"
#include "api/edhrec/tab_edhrec.h" #include "api/edhrec/tab_edhrec.h"
#include "api/edhrec/tab_edhrec_main.h"
#include "tab_visual_database_display.h" #include "tab_visual_database_display.h"
#include "visual_deck_editor/tab_deck_editor_visual.h" #include "visual_deck_editor/tab_deck_editor_visual.h"
#include "visual_deck_editor/tab_deck_editor_visual_tab_widget.h" #include "visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
#include "api/edhrec/tab_edhrec_main.h"
#include "visual_deck_storage/tab_deck_storage_visual.h" #include "visual_deck_storage/tab_deck_storage_visual.h"
#include <QAbstractButton> #include <QAbstractButton>
@ -95,8 +95,8 @@ private:
QList<AbstractTabDeckEditor *> deckEditorTabs; QList<AbstractTabDeckEditor *> deckEditorTabs;
bool isLocalGame; bool isLocalGame;
QAction *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabVisualDeckStorage, *aTabVisualDatabaseDisplay, *aTabServer, QAction *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabVisualDeckStorage, *aTabVisualDatabaseDisplay,
*aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog; *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog;
int myAddTab(Tab *tab, QAction *manager = nullptr); int myAddTab(Tab *tab, QAction *manager = nullptr);
void addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager); void addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager);