jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-30 18:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Turn Card, Deck_List, Protocol, RNG, Network (Client, Server), Settings and Utility into libraries and remove cockatrice_common. (#6212)

Browse source 
---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: ebbit1q <ebbit1q@gmail.com>
This commit is contained in:
BruebachL 2025-10-09 07:36:12 +02:00 • committed by GitHub
parent be1403c920
commit 1ef07309d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
605 changed files with 3812 additions and 3408 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cockatrice/src/tabs/abstract_tab_deck_editor.cpp
View file

@ -1,22 +1,14 @@
#include "abstract_tab_deck_editor.h"
#include "../client/tapped_out_interface.h"
#include "../database/card_database_manager.h"
#include "../database/model/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/card_picture_loader/card_picture_loader.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"
#include "trice_limits.h"
#include <QAction>
#include <QApplication>
@ -39,6 +31,14 @@
#include <QTextStream>
#include <QTreeView>
#include <QUrl>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
#include <libcockatrice/protocol/pb/response.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
{
@ -164,7 +164,7 @@ void AbstractTabDeckEditor::openDeck(DeckLoader *deck)
void AbstractTabDeckEditor::setDeck(DeckLoader *_deck)
{
deckDockWidget->setDeck(_deck);
PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList()));
CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList()));
setModified(false);
// If they load a deck, make the deck list appear

2
cockatrice/src/tabs/abstract_tab_deck_editor.h
View file

@ -1,7 +1,6 @@
#ifndef TAB_GENERIC_DECK_EDITOR_H
#define TAB_GENERIC_DECK_EDITOR_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"
@ -24,6 +23,7 @@ class DeckEditorFilterDockWidget;
class DeckEditorPrintingSelectorDockWidget;
class DeckPreviewDeckTagsDisplayWidget;
class Response;
class FilterTree;
class FilterTreeModel;
class FilterBuilder;

3
cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
View file

@ -1,8 +1,9 @@
#include "edhrec_api_response_card_details_display_widget.h"
#include "../../../../../database/card_database_manager.h"
#include "../../tab_edhrec_main.h"
#include <libcockatrice/card/card_database/card_database_manager.h>
EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget(
QWidget *parent,
const EdhrecApiResponseCardDetails &_toDisplay)

3
cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
View file

@ -1,10 +1,11 @@
#include "edhrec_api_response_commander_details_display_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"
#include <libcockatrice/card/card_database/card_database_manager.h>
EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget(
QWidget *parent,
const EdhrecCommanderApiResponseCommanderDetails &_commanderDetails,

2
cockatrice/src/tabs/api/edhrec/tab_edhrec.h
View file

@ -7,12 +7,12 @@
#ifndef TAB_EDHREC_H
#define TAB_EDHREC_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"
#include <QNetworkAccessManager>
#include <libcockatrice/card/card_info.h>
class TabEdhRec : public Tab
{

6
cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp
View file

@ -1,8 +1,5 @@
#include "tab_edhrec_main.h"
#include "../../../database/card_database_manager.h"
#include "../../../database/model/card/card_completer_proxy_model.h"
#include "../../../database/model/card/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"
@ -25,6 +22,9 @@
#include <QPushButton>
#include <QRegularExpression>
#include <QResizeEvent>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_database/model/card/card_completer_proxy_model.h>
#include <libcockatrice/card/card_database/model/card/card_search_model.h>
static bool canBeCommander(const CardInfoPtr &cardInfo)
{

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

@ -7,7 +7,6 @@
#ifndef TAB_EDHREC_MAIN_H
#define TAB_EDHREC_MAIN_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"
@ -18,6 +17,7 @@
#include <QLineEdit>
#include <QNetworkAccessManager>
#include <QPushButton>
#include <libcockatrice/card/card_database/card_database.h>
class TabEdhRecMain : public Tab
{

3
cockatrice/src/tabs/tab.h
View file

@ -7,9 +7,8 @@
#ifndef TAB_H
#define TAB_H
#include "card_ref.h"
#include <QMainWindow>
#include <libcockatrice/utility/card_ref.h>
class QMenu;
class TabSupervisor;

18
cockatrice/src/tabs/tab_account.cpp
View file

@ -2,22 +2,22 @@
#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"
#include "pb/event_user_left.pb.h"
#include "pb/response_list_users.pb.h"
#include "pb/session_commands.pb.h"
#include "tab_supervisor.h"
#include "trice_limits.h"
#include <QPushButton>
#include <QVBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
#include <libcockatrice/protocol/pb/event_user_joined.pb.h>
#include <libcockatrice/protocol/pb/event_user_left.pb.h>
#include <libcockatrice/protocol/pb/response_list_users.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/utility/trice_limits.h>
TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo)
: Tab(_tabSupervisor), client(_client)

3
cockatrice/src/tabs/tab_account.h
View file

@ -7,9 +7,10 @@
#ifndef TAB_ACCOUNT_H
#define TAB_ACCOUNT_H
#include "pb/serverinfo_user.pb.h"
#include "tab.h"
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
class AbstractClient;
class Event_AddToList;
class Event_ListRooms;

13
cockatrice/src/tabs/tab_admin.cpp
View file

@ -1,12 +1,5 @@
#include "tab_admin.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"
#include "trice_limits.h"
#include <QDialogButtonBox>
#include <QGridLayout>
#include <QGroupBox>
@ -15,6 +8,12 @@
#include <QMessageBox>
#include <QPushButton>
#include <QSpinBox>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/admin_commands.pb.h>
#include <libcockatrice/protocol/pb/event_replay_added.pb.h>
#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/utility/trice_limits.h>
ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent)
{

4
cockatrice/src/tabs/tab_admin.h
View file

@ -7,11 +7,11 @@
#ifndef TAB_ADMIN_H
#define TAB_ADMIN_H
#include "pb/commands.pb.h"
#include "pb/response.pb.h"
#include "tab.h"
#include <QDialog>
#include <libcockatrice/protocol/pb/commands.pb.h>
#include <libcockatrice/protocol/pb/response.pb.h>
class AbstractClient;

12
cockatrice/src/tabs/tab_deck_editor.cpp
View file

@ -2,8 +2,6 @@
#include "../client/deck_editor_menu.h"
#include "../client/tapped_out_interface.h"
#include "../database/card_database_manager.h"
#include "../database/model/card_database_model.h"
#include "../dialogs/dlg_load_deck.h"
#include "../dialogs/dlg_load_deck_from_clipboard.h"
#include "../filters/filter_builder.h"
@ -11,11 +9,7 @@
#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"
#include <QAction>
#include <QApplication>
@ -38,6 +32,12 @@
#include <QToolButton>
#include <QTreeView>
#include <QVBoxLayout>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor)
{

5
cockatrice/src/tabs/tab_deck_editor.h
View file

@ -1,11 +1,12 @@
#ifndef WINDOW_DECKEDITOR_H
#define WINDOW_DECKEDITOR_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"
#include <libcockatrice/card/card_info.h>
#include <libcockatrice/utility/key_signals.h>
class CardDatabaseModel;
class CardDatabaseDisplayModel;
class DeckListModel;

22
cockatrice/src/tabs/tab_deck_storage.cpp
View file

@ -2,18 +2,7 @@
#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"
#include "pb/command_deck_download.pb.h"
#include "pb/command_deck_new_dir.pb.h"
#include "pb/command_deck_upload.pb.h"
#include "pb/response.pb.h"
#include "pb/response_deck_download.pb.h"
#include "pb/response_deck_upload.pb.h"
#include <QAction>
#include <QApplication>
@ -29,6 +18,17 @@
#include <QTreeView>
#include <QUrl>
#include <QVBoxLayout>
#include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/protocol/pb/command_deck_del.pb.h>
#include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
#include <libcockatrice/protocol/pb/command_deck_download.pb.h>
#include <libcockatrice/protocol/pb/command_deck_new_dir.pb.h>
#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
#include <libcockatrice/protocol/pb/response.pb.h>
#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
#include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h>
TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
AbstractClient *_client,

3
cockatrice/src/tabs/tab_deck_storage.h
View file

@ -8,10 +8,11 @@
#ifndef TAB_DECK_STORAGE_H
#define TAB_DECK_STORAGE_H
#include "../server/abstract_client.h"
#include "../server/remote/remote_decklist_tree_widget.h"
#include "tab.h"
#include <libcockatrice/network/client/abstract/abstract_client.h>
class ServerInfo_User;
class AbstractClient;
class QTreeView;

22
cockatrice/src/tabs/tab_game.cpp
View file

@ -1,8 +1,6 @@
#include "tab_game.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"
@ -17,20 +15,13 @@
#include "../game/player/player_list_widget.h"
#include "../game/replay.h"
#include "../game/zones/card_zone.h"
#include "../interface/card_picture_loader/card_picture_loader.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"
#include "pb/serverinfo_user.pb.h"
#include "tab_supervisor.h"
#include "trice_limits.h"
#include <QAction>
#include <QCompleter>
@ -46,6 +37,15 @@
#include <QTimer>
#include <QToolButton>
#include <QWidget>
#include <libcockatrice/card/card_database/card_database.h>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
#include <libcockatrice/protocol/pb/game_replay.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
: Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr)
@ -757,7 +757,7 @@ void TabGame::loadDeckForLocalPlayer(Player *localPlayer, int playerId, ServerIn
TabbedDeckViewContainer *deckViewContainer = deckViewContainers.value(playerId);
if (playerInfo.has_deck_list()) {
DeckLoader newDeck(QString::fromStdString(playerInfo.deck_list()));
PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
deckViewContainer->playerDeckView->setDeck(newDeck);
localPlayer->setDeck(newDeck);
}

2
cockatrice/src/tabs/tab_game.h
View file

@ -15,12 +15,12 @@
#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"
#include <QCompleter>
#include <QLoggingCategory>
#include <QMap>
#include <libcockatrice/protocol/pb/event_leave.pb.h>
class ServerInfo_PlayerProperties;
class TabbedDeckViewContainer;

2
cockatrice/src/tabs/tab_home.h
View file

@ -8,10 +8,10 @@
#define TAB_HOME_H
#include "../interface/widgets/general/home_widget.h"
#include "../server/abstract_client.h"
#include "tab.h"
#include <QHBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <qgroupbox.h>
class AbstractClient;

10
cockatrice/src/tabs/tab_logs.cpp
View file

@ -2,11 +2,6 @@
#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"
#include <QCheckBox>
#include <QDialogButtonBox>
@ -20,6 +15,11 @@
#include <QTabWidget>
#include <QtGui>
#include <QtWidgets>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
#include <libcockatrice/protocol/pb/response_viewlog_history.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/utility/trice_limits.h>
TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
{

14
cockatrice/src/tabs/tab_message.cpp
View file

@ -3,21 +3,21 @@
#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"
#include "trice_limits.h"
#include <QApplication>
#include <QDebug>
#include <QMenu>
#include <QSystemTrayIcon>
#include <QVBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_user_message.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
AbstractClient *_client,

26
cockatrice/src/tabs/tab_replays.cpp
View file

@ -1,19 +1,6 @@
#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 "pb/command_replay_delete_match.pb.h"
#include "pb/command_replay_download.pb.h"
#include "pb/command_replay_get_code.pb.h"
#include "pb/command_replay_modify_match.pb.h"
#include "pb/command_replay_submit_code.pb.h"
#include "pb/event_replay_added.pb.h"
#include "pb/game_replay.pb.h"
#include "pb/response.pb.h"
#include "pb/response_replay_download.pb.h"
#include "pb/response_replay_get_code.pb.h"
#include "tab_game.h"
#include <QAction>
@ -30,6 +17,19 @@
#include <QTreeView>
#include <QUrl>
#include <QVBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h>
#include <libcockatrice/protocol/pb/command_replay_download.pb.h>
#include <libcockatrice/protocol/pb/command_replay_get_code.pb.h>
#include <libcockatrice/protocol/pb/command_replay_modify_match.pb.h>
#include <libcockatrice/protocol/pb/command_replay_submit_code.pb.h>
#include <libcockatrice/protocol/pb/event_replay_added.pb.h>
#include <libcockatrice/protocol/pb/game_replay.pb.h>
#include <libcockatrice/protocol/pb/response.pb.h>
#include <libcockatrice/protocol/pb/response_replay_download.pb.h>
#include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h>
TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo)
: Tab(_tabSupervisor), client(_client)

3
cockatrice/src/tabs/tab_replays.h
View file

@ -8,9 +8,10 @@
#ifndef TAB_REPLAYS_H
#define TAB_REPLAYS_H
#include "../server/abstract_client.h"
#include "tab.h"
#include <libcockatrice/network/client/abstract/abstract_client.h>
class ServerInfo_User;
class Response;
class AbstractClient;

24
cockatrice/src/tabs/tab_room.cpp
View file

@ -2,24 +2,12 @@
#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"
#include "pb/event_list_games.pb.h"
#include "pb/event_remove_messages.pb.h"
#include "pb/event_room_say.pb.h"
#include "pb/room_commands.pb.h"
#include "pb/serverinfo_room.pb.h"
#include "tab_account.h"
#include "tab_supervisor.h"
#include "trice_limits.h"
#include <QApplication>
#include <QCompleter>
@ -32,6 +20,18 @@
#include <QToolButton>
#include <QVBoxLayout>
#include <QtCore/qdatetime.h>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/get_pb_extension.h>
#include <libcockatrice/protocol/pb/event_join_room.pb.h>
#include <libcockatrice/protocol/pb/event_leave_room.pb.h>
#include <libcockatrice/protocol/pb/event_list_games.pb.h>
#include <libcockatrice/protocol/pb/event_remove_messages.pb.h>
#include <libcockatrice/protocol/pb/event_room_say.pb.h>
#include <libcockatrice/protocol/pb/room_commands.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
AbstractClient *_client,

12
cockatrice/src/tabs/tab_server.cpp
View file

@ -1,12 +1,6 @@
#include "tab_server.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"
#include "pb/session_commands.pb.h"
#include "tab_supervisor.h"
#include <QCheckBox>
@ -20,6 +14,12 @@
#include <QTextEdit>
#include <QTreeView>
#include <QVBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
#include <libcockatrice/protocol/pb/event_server_message.pb.h>
#include <libcockatrice/protocol/pb/response_join_room.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent) : QGroupBox(parent), client(_client)
{

22
cockatrice/src/tabs/tab_supervisor.cpp
View file

@ -2,20 +2,9 @@
#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"
#include "pb/event_user_message.pb.h"
#include "pb/game_event_container.pb.h"
#include "pb/game_replay.pb.h"
#include "pb/room_commands.pb.h"
#include "pb/room_event.pb.h"
#include "pb/serverinfo_room.pb.h"
#include "pb/serverinfo_user.pb.h"
#include "tab_account.h"
#include "tab_admin.h"
#include "tab_deck_editor.h"
@ -36,6 +25,17 @@
#include <QMessageBox>
#include <QPainter>
#include <QSystemTrayIcon>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
#include <libcockatrice/protocol/pb/event_notify_user.pb.h>
#include <libcockatrice/protocol/pb/event_user_message.pb.h>
#include <libcockatrice/protocol/pb/game_event_container.pb.h>
#include <libcockatrice/protocol/pb/game_replay.pb.h>
#include <libcockatrice/protocol/pb/room_commands.pb.h>
#include <libcockatrice/protocol/pb/room_event.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
#include <libcockatrice/settings/cache_settings.h>
QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const
{

10
cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -1,6 +1,5 @@
#include "tab_deck_editor_visual.h"
#include "../../database/model/card_database_model.h"
#include "../../deck/deck_list_model.h"
#include "../../deck/deck_stats_interface.h"
#include "../../filters/filter_builder.h"
@ -8,13 +7,9 @@
#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"
#include "tab_deck_editor_visual_tab_widget.h"
#include "trice_limits.h"
#include <QAction>
#include <QApplication>
@ -33,6 +28,11 @@
#include <QTimer>
#include <QTreeView>
#include <QVBoxLayout>
#include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor)
{

4
cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
View file

@ -1,13 +1,13 @@
#include "tab_deck_storage_visual.h"
#include "../../database/model/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"
#include <QMessageBox>
#include <QMouseEvent>
#include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/protocol/pb/command_deck_del.pb.h>
TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)
: Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this))