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

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

2
cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
View file

@ -1,6 +1,5 @@
#include "color_identity_widget.h"
#include "../../../../settings/cache_settings.h"
#include "mana_symbol_widget.h"
#include <QHBoxLayout>
@ -9,6 +8,7 @@
#include <QRegularExpression>
#include <QResizeEvent>
#include <QSize>
#include <libcockatrice/settings/cache_settings.h>
ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, CardInfoPtr _card) : QWidget(parent), card(_card)
{

3
cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
View file

@ -7,10 +7,9 @@
#ifndef COLOR_IDENTITY_WIDGET_H
#define COLOR_IDENTITY_WIDGET_H
#include "../../../../card/card_info.h"
#include <QHBoxLayout>
#include <QWidget>
#include <libcockatrice/card/card_info.h>
class ColorIdentityWidget : public QWidget
{

3
cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
View file

@ -7,10 +7,9 @@
#ifndef MANA_COST_WIDGET_H
#define MANA_COST_WIDGET_H
#include "../../../../card/card_info.h"
#include <QHBoxLayout>
#include <QWidget>
#include <libcockatrice/card/card_info.h>
class ManaCostWidget : public QWidget
{

3
cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
View file

@ -1,8 +1,7 @@
#include "mana_symbol_widget.h"
#include "../../../../settings/cache_settings.h"
#include <QResizeEvent>
#include <libcockatrice/settings/cache_settings.h>
ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isActive, bool _mayBeToggled)
: QLabel(parent), symbol(_symbol), isActive(_isActive), mayBeToggled(_mayBeToggled)

6
cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
View file

@ -1,12 +1,12 @@
#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 "../../../utility/deck_list_sort_filter_proxy_model.h"
#include "../card_info_picture_with_text_overlay_widget.h"
#include <QResizeEvent>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_info_comparator.h>
CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
DeckListModel *_deckListModel,

2
cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
View file

@ -7,7 +7,6 @@
#ifndef CARD_GROUP_DISPLAY_WIDGET_H
#define CARD_GROUP_DISPLAY_WIDGET_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"
@ -16,6 +15,7 @@
#include <QLabel>
#include <QVBoxLayout>
#include <QWidget>
#include <libcockatrice/card/card_info.h>
class CardGroupDisplayWidget : public QWidget
{

4
cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
View file

@ -1,11 +1,11 @@
#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 "../card_info_picture_with_text_overlay_widget.h"
#include <QResizeEvent>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_info_comparator.h>
#include <utility>
FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,

4
cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
View file

@ -1,11 +1,11 @@
#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 "../card_info_picture_with_text_overlay_widget.h"
#include <QResizeEvent>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_info_comparator.h>
OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
DeckListModel *_deckListModel,

2
cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
View file

@ -1,6 +1,5 @@
#include "card_info_display_widget.h"
#include "../../../database/card_database_manager.h"
#include "../../../game/board/card_item.h"
#include "../../../main.h"
#include "card_info_picture_widget.h"
@ -9,6 +8,7 @@
#include <QApplication>
#include <QScreen>
#include <QVBoxLayout>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <utility>
CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *parent, Qt::WindowFlags flags)

5
cockatrice/src/interface/widgets/cards/card_info_display_widget.h
View file

@ -7,12 +7,11 @@
#ifndef CARDINFOWIDGET_H
#define CARDINFOWIDGET_H
#include "../../../card/exact_card.h"
#include "card_ref.h"
#include <QComboBox>
#include <QFrame>
#include <QStringList>
#include <libcockatrice/card/card_printing/exact_card.h>
#include <libcockatrice/utility/card_ref.h>
class CardInfoPictureWidget;
class CardInfoTextWidget;

6
cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
View file

@ -1,15 +1,15 @@
#include "card_info_frame_widget.h"
#include "../../../card/card_relation.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"
#include <QSplitter>
#include <QVBoxLayout>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_relation/card_relation.h>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)

5
cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
View file

@ -7,11 +7,10 @@
#ifndef CARDFRAME_H
#define CARDFRAME_H
#include "../../../card/exact_card.h"
#include "card_ref.h"
#include <QPushButton>
#include <QTabWidget>
#include <libcockatrice/card/card_printing/exact_card.h>
#include <libcockatrice/utility/card_ref.h>
class AbstractCardItem;
class CardInfoPictureWidget;

6
cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
View file

@ -1,6 +1,6 @@
#include "card_info_picture_art_crop_widget.h"
#include "../../../picture_loader/picture_loader.h"
#include "../../../interface/card_picture_loader/card_picture_loader.h"
CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
: CardInfoPictureWidget(parent, false, false)
@ -13,9 +13,9 @@ QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &target
// Load the full-resolution card image, not a pre-scaled one
QPixmap fullResPixmap;
if (getCard()) {
PictureLoader::getPixmap(fullResPixmap, getCard(), QSize(745, 1040)); // or a high default size
CardPictureLoader::getPixmap(fullResPixmap, getCard(), QSize(745, 1040)); // or a high default size
} else {
PictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040));
CardPictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040));
}
// Fail-safe if loading failed

8
cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
View file

@ -1,10 +1,10 @@
#include "card_info_picture_enlarged_widget.h"
#include "../../../picture_loader/picture_loader.h"
#include "../../../settings/cache_settings.h"
#include "../../../interface/card_picture_loader/card_picture_loader.h"
#include <QPainterPath>
#include <QStylePainter>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
/**
@ -35,9 +35,9 @@ CardInfoPictureEnlargedWidget::CardInfoPictureEnlargedWidget(QWidget *parent) :
void CardInfoPictureEnlargedWidget::loadPixmap(const QSize &size)
{
if (card) {
PictureLoader::getPixmap(enlargedPixmap, card, size);
CardPictureLoader::getPixmap(enlargedPixmap, card, size);
} else {
PictureLoader::getCardBackPixmap(enlargedPixmap, size);
CardPictureLoader::getCardBackPixmap(enlargedPixmap, size);
}
pixmapDirty = false;
}

3
cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
View file

@ -8,10 +8,9 @@
#ifndef CARD_PICTURE_ENLARGED_WIDGET_H
#define CARD_PICTURE_ENLARGED_WIDGET_H
#include "../../../card/exact_card.h"
#include <QPixmap>
#include <QWidget>
#include <libcockatrice/card/card_printing/exact_card.h>
class CardInfoPictureEnlargedWidget final : public QWidget
{

14
cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
View file

@ -1,10 +1,7 @@
#include "card_info_picture_widget.h"
#include "../../../card/card_relation.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 "../../../interface/card_picture_loader/card_picture_loader.h"
#include "../../../tabs/tab_supervisor.h"
#include "../../window_main.h"
@ -13,6 +10,9 @@
#include <QScreen>
#include <QStylePainter>
#include <QWidget>
#include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_relation/card_relation.h>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
/**
@ -152,11 +152,11 @@ void CardInfoPictureWidget::updatePixmap()
*/
void CardInfoPictureWidget::loadPixmap()
{
PictureLoader::getCardBackLoadingInProgressPixmap(resizedPixmap, size());
CardPictureLoader::getCardBackLoadingInProgressPixmap(resizedPixmap, size());
if (exactCard) {
PictureLoader::getPixmap(resizedPixmap, exactCard, size());
CardPictureLoader::getPixmap(resizedPixmap, exactCard, size());
} else {
PictureLoader::getCardBackLoadingFailedPixmap(resizedPixmap, size());
CardPictureLoader::getCardBackLoadingFailedPixmap(resizedPixmap, size());
}
pixmapDirty = false;

2
cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
View file

@ -7,12 +7,12 @@
#ifndef CARD_INFO_PICTURE_H
#define CARD_INFO_PICTURE_H
#include "../../../card/exact_card.h"
#include "card_info_picture_enlarged_widget.h"
#include <QPropertyAnimation>
#include <QTimer>
#include <QWidget>
#include <libcockatrice/card/card_printing/exact_card.h>
inline Q_LOGGING_CATEGORY(CardInfoPictureWidgetLog, "card_info_picture_widget");

4
cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
View file

@ -1,7 +1,5 @@
#include "card_info_text_widget.h"
#include "../../../card/card_relation.h"
#include "../../../card/game_specific_terms.h"
#include "../../../game/board/card_item.h"
#include <QGridLayout>
@ -10,6 +8,8 @@
#include <QScrollBar>
#include <QSizePolicy>
#include <QTextEdit>
#include <libcockatrice/card/card_relation/card_relation.h>
#include <libcockatrice/card/game_specific_terms.h>
CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent), info(nullptr)
{

3
cockatrice/src/interface/widgets/cards/card_info_text_widget.h
View file

@ -7,9 +7,8 @@
#ifndef CARDINFOTEXT_H
#define CARDINFOTEXT_H
#include "../../../card/card_info.h"
#include <QFrame>
#include <libcockatrice/card/card_info.h>
class QLabel;
class QScrollArea;
class QTextEdit;

3
cockatrice/src/interface/widgets/cards/card_size_widget.cpp
View file

@ -1,9 +1,10 @@
#include "card_size_widget.h"
#include "../../../settings/cache_settings.h"
#include "../printing_selector/printing_selector.h"
#include "../visual_deck_storage/visual_deck_storage_widget.h"
#include <libcockatrice/settings/cache_settings.h>
/**
* @class CardSizeWidget
* @brief A widget for adjusting card sizes using a slider.

2
cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
View file

@ -1,11 +1,11 @@
#include "deck_card_zone_display_widget.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"
#include <QResizeEvent>
#include <libcockatrice/card/card_info_comparator.h>
DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
DeckListModel *_deckListModel,

2
cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
View file

@ -7,7 +7,6 @@
#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 "../general/display/banner_widget.h"
#include "../general/layout_containers/overlap_widget.h"
@ -18,6 +17,7 @@
#include <QVBoxLayout>
#include <QWidget>
#include <libcockatrice/card/card_info.h>
class DeckCardZoneDisplayWidget : public QWidget
{

3
cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
View file

@ -1,7 +1,5 @@
#include "deck_preview_card_picture_widget.h"
#include "../../../settings/cache_settings.h"
#include <QApplication>
#include <QFileInfo>
#include <QFontMetrics>
@ -9,6 +7,7 @@
#include <QPainterPath>
#include <QStylePainter>
#include <QTextOption>
#include <libcockatrice/settings/cache_settings.h>
/**
* @brief Constructs a CardPictureWithTextOverlay widget.