jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move settings cache and settings card preference provider out of libcockatrice_settings and into cockatrice

Browse source 
Took 52 minutes

Took 9 minutes

Took 1 minute
This commit is contained in:
Lukas Brübach 2025-11-04 18:50:16 +01:00
parent 3ccb0cbb23
commit 12a2d27dfd
118 changed files with 169 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/CMakeLists.txt
View file

@ -15,6 +15,8 @@ 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/client/settings/cache_settings.cpp
src/client/settings/shortcut_treeview.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

2
cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
View file

@ -2,6 +2,7 @@
#include "../../../../interface/window_main.h"
#include "../../../../main.h"
#include "../../../settings/cache_settings.h"
#include <QApplication>
#include <QCryptographicHash>
@ -15,7 +16,6 @@
#include <QtConcurrent>
#include <libcockatrice/card/database/card_database.h>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
#define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
#define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"

3
cockatrice/src/client/network/update/client/client_update_checker.cpp
View file

@ -1,9 +1,8 @@
#include "client_update_checker.h"
#include "../../../settings/cache_settings.h"
#include "release_channel.h"
#include <libcockatrice/settings/cache_settings.h>
ClientUpdateChecker::ClientUpdateChecker(QObject *parent) : QObject(parent)
{
}

6
libcockatrice_settings/libcockatrice/settings/cache_settings.cpp → cockatrice/src/client/settings/cache_settings.cpp
View file

@ -1,8 +1,8 @@
#include "cache_settings.h"
#include "../../../cockatrice/src/client/network/update/client/release_channel.h"
#include "card_counter_settings.h"
#include "card_override_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/card_counter_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/card_override_settings.h"
#include "../network/update/client/release_channel.h"
#include <QAbstractListModel>
#include <QApplication>

20
libcockatrice_settings/libcockatrice/settings/cache_settings.h → cockatrice/src/client/settings/cache_settings.h
View file

@ -7,16 +7,16 @@
#ifndef SETTINGSCACHE_H
#define SETTINGSCACHE_H
#include "card_database_settings.h"
#include "card_override_settings.h"
#include "debug_settings.h"
#include "download_settings.h"
#include "game_filters_settings.h"
#include "layouts_settings.h"
#include "message_settings.h"
#include "recents_settings.h"
#include "servers_settings.h"
#include "shortcuts_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/card_database_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/card_override_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/debug_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/download_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/game_filters_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/layouts_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/message_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/recents_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/servers_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h"
#include <QDate>
#include <QLoggingCategory>

2
libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp → cockatrice/src/client/settings/shortcut_treeview.cpp
View file

@ -1,7 +1,7 @@
#include "shortcut_treeview.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h"
#include "cache_settings.h"
#include "shortcuts_settings.h"
#include <QHeaderView>

0
libcockatrice_settings/libcockatrice/settings/shortcut_treeview.h → cockatrice/src/client/settings/shortcut_treeview.h
View file

3
cockatrice/src/client/sound_engine.cpp
View file

@ -1,8 +1,9 @@
#include "sound_engine.h"
#include "settings/cache_settings.h"
#include <QDir>
#include <QMediaPlayer>
#include <libcockatrice/settings/cache_settings.h>
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
#include <QAudioOutput>

5
cockatrice/src/database/interface/settings_card_preference_provider.h
View file

@ -1,7 +1,8 @@
#ifndef COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
#define COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
#include "../../settings/cache_settings.h"
#include "interface_card_preference_provider.h"
#include "../../client/settings/cache_settings.h"
#include <libcockatrice/card/database/interface/interface_card_preference_provider.h>
class SettingsCardPreferenceProvider : public ICardPreferenceProvider
{

3
cockatrice/src/game/board/abstract_card_drag_item.cpp
View file

@ -1,10 +1,11 @@
#include "abstract_card_drag_item.h"
#include "../../client/settings/cache_settings.h"
#include <QCursor>
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
#include <libcockatrice/settings/cache_settings.h>
static const float CARD_WIDTH_HALF = CARD_WIDTH / 2;
static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2;

1
cockatrice/src/game/board/abstract_card_item.cpp
View file

@ -10,7 +10,6 @@
#include <algorithm>
#include <libcockatrice/card/database/card_database.h>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id)
: ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0),

2
cockatrice/src/game/board/abstract_counter.cpp
View file

@ -1,5 +1,6 @@
#include "abstract_counter.h"
#include "../../client/settings/cache_settings.h"
#include "../../interface/widgets/tabs/tab_game.h"
#include "../player/player.h"
#include "translate_counter_name.h"
@ -14,7 +15,6 @@
#include <QString>
#include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/expression.h>
AbstractCounter::AbstractCounter(Player *_player,

2
cockatrice/src/game/board/arrow_item.cpp
View file

@ -1,6 +1,7 @@
#define _USE_MATH_DEFINES
#include "arrow_item.h"
#include "../../client/settings/cache_settings.h"
#include "../player/player.h"
#include "../player/player_target.h"
#include "../zones/card_zone.h"
@ -15,7 +16,6 @@
#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
#include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/color.h>
ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color)

2
cockatrice/src/game/board/card_item.cpp
View file

@ -1,5 +1,6 @@
#include "card_item.h"
#include "../../client/settings/cache_settings.h"
#include "../../interface/widgets/tabs/tab_game.h"
#include "../game_scene.h"
#include "../player/player.h"
@ -16,7 +17,6 @@
#include <QPainter>
#include <libcockatrice/card/card_info.h>
#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/settings/card_counter_settings.h>
CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone)

2
cockatrice/src/game/deckview/deck_view.cpp
View file

@ -1,5 +1,6 @@
#include "deck_view.h"
#include "../../client/settings/cache_settings.h"
#include "../../interface/theme_manager.h"
#include <QApplication>
@ -10,7 +11,6 @@
#include <libcockatrice/card/card_info.h>
#include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/deck_list/deck_list_card_node.h>
#include <libcockatrice/settings/cache_settings.h>
DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
const QPointF &_hotSpot,

2
cockatrice/src/game/deckview/deck_view_container.cpp
View file

@ -9,6 +9,7 @@
#include "../game_scene.h"
#include "deck_view.h"
#include <../../client/settings/cache_settings.h>
#include <QMessageBox>
#include <QMouseEvent>
#include <QToolButton>
@ -22,7 +23,6 @@
#include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false)

2
cockatrice/src/game/dialogs/dlg_create_token.cpp
View file

@ -1,5 +1,6 @@
#include "dlg_create_token.h"
#include "../../client/settings/cache_settings.h"
#include "../../interface/widgets/cards/card_info_picture_widget.h"
#include "../../main.h"
@ -20,7 +21,6 @@
#include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/models/database/card_database_model.h>
#include <libcockatrice/models/database/token/token_display_model.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent)

2
cockatrice/src/game/game_scene.cpp
View file

@ -1,5 +1,6 @@
#include "game_scene.h"
#include "../client/settings/cache_settings.h"
#include "board/card_item.h"
#include "phases_toolbar.h"
#include "player/player.h"
@ -14,7 +15,6 @@
#include <QGraphicsView>
#include <QSet>
#include <QtMath>
#include <libcockatrice/settings/cache_settings.h>
#include <numeric>
/**

2
cockatrice/src/game/game_view.cpp
View file

@ -1,11 +1,11 @@
#include "game_view.h"
#include "../client/settings/cache_settings.h"
#include "game_scene.h"
#include <QAction>
#include <QResizeEvent>
#include <QRubberBand>
#include <libcockatrice/settings/cache_settings.h>
GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0)
{

2
cockatrice/src/game/player/menu/hand_menu.cpp
View file

@ -1,5 +1,6 @@
#include "hand_menu.h"
#include "../../../client/settings/cache_settings.h"
#include "../../abstract_game.h"
#include "../../zones/hand_zone.h"
#include "../player.h"
@ -7,7 +8,6 @@
#include <QAction>
#include <QMenu>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/settings/shortcuts_settings.h>
HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player)

2
cockatrice/src/game/player/menu/library_menu.cpp
View file

@ -1,5 +1,6 @@
#include "library_menu.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../interface/widgets/tabs/tab_game.h"
#include "../../abstract_game.h"
#include "../player.h"
@ -7,7 +8,6 @@
#include <QAction>
#include <QMenu>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/settings/shortcuts_settings.h>
LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)

3
cockatrice/src/game/player/menu/say_menu.cpp
View file

@ -1,10 +1,9 @@
#include "say_menu.h"
#include "../../../client/settings/cache_settings.h"
#include "../player.h"
#include "../player_actions.h"
#include <libcockatrice/settings/cache_settings.h>
SayMenu::SayMenu(Player *_player) : player(_player)
{
connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu);

2
cockatrice/src/game/zones/hand_zone.cpp
View file

@ -5,9 +5,9 @@
#include "../board/card_item.h"
#include "../player/player.h"
#include <../../client/settings/cache_settings.h>
#include <QPainter>
#include <libcockatrice/protocol/pb/command_move_card.pb.h>
#include <libcockatrice/settings/cache_settings.h>
HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
: SelectZone(_logic, parent), zoneHeight(_zoneHeight)

3
cockatrice/src/game/zones/logic/view_zone_logic.cpp
View file

@ -1,9 +1,8 @@
#include "view_zone_logic.h"
#include "../../../client/settings/cache_settings.h"
#include "../../board/card_item.h"
#include <libcockatrice/settings/cache_settings.h>
/**
* @param _player the player that the cards are revealed to.
* @param _origZone the zone the cards were revealed from.

2
cockatrice/src/game/zones/select_zone.cpp
View file

@ -1,11 +1,11 @@
#include "select_zone.h"
#include "../../client/settings/cache_settings.h"
#include "../board/card_item.h"
#include "../game_scene.h"
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
#include <libcockatrice/settings/cache_settings.h>
qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse)
{

2
cockatrice/src/game/zones/stack_zone.cpp
View file

@ -7,10 +7,10 @@
#include "../player/player.h"
#include "logic/stack_zone_logic.h"
#include <../../client/settings/cache_settings.h>
#include <QPainter>
#include <QSet>
#include <libcockatrice/protocol/pb/command_move_card.pb.h>
#include <libcockatrice/settings/cache_settings.h>
StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
: SelectZone(_logic, parent), zoneHeight(_zoneHeight)

2
cockatrice/src/game/zones/table_zone.cpp
View file

@ -7,13 +7,13 @@
#include "../player/player.h"
#include "logic/table_zone_logic.h"
#include <../../client/settings/cache_settings.h>
#include <QGraphicsScene>
#include <QPainter>
#include <QSet>
#include <libcockatrice/card/card_info.h>
#include <libcockatrice/protocol/pb/command_move_card.pb.h>
#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
#include <libcockatrice/settings/cache_settings.h>
const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100);
const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80);

2
cockatrice/src/game/zones/view_zone_widget.cpp
View file

@ -7,6 +7,7 @@
#include "../player/player.h"
#include "view_zone.h"
#include <../../client/settings/cache_settings.h>
#include <QCheckBox>
#include <QGraphicsLinearLayout>
#include <QGraphicsProxyWidget>
@ -17,7 +18,6 @@
#include <QStyleOption>
#include <QStyleOptionTitleBar>
#include <libcockatrice/protocol/pb/command_shuffle.pb.h>
#include <libcockatrice/settings/cache_settings.h>
/**
* @param _player the player the cards were revealed to.

2
cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
View file

@ -1,5 +1,6 @@
#include "card_picture_loader.h"
#include <../../client/settings/cache_settings.h>
#include <QApplication>
#include <QBuffer>
#include <QDebug>
@ -15,7 +16,6 @@
#include <QStatusBar>
#include <QThread>
#include <algorithm>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
// never cache more than 300 cards at once for a single deck

2
cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
View file

@ -2,10 +2,10 @@
#include "card_picture_to_load.h"
#include <../../client/settings/cache_settings.h>
#include <QDirIterator>
#include <QMovie>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;

2
cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
View file

@ -3,13 +3,13 @@
#include "card_picture_loader_local.h"
#include "card_picture_loader_worker_work.h"
#include <../../client/settings/cache_settings.h>
#include <QDirIterator>
#include <QMovie>
#include <QNetworkDiskCache>
#include <QNetworkReply>
#include <QThread>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
static constexpr int MAX_REQUESTS_PER_SEC = 10;

2
cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
View file

@ -2,6 +2,7 @@
#include "card_picture_loader_worker.h"
#include <../../client/settings/cache_settings.h>
#include <QBuffer>
#include <QDirIterator>
#include <QLoggingCategory>
@ -11,7 +12,6 @@
#include <QThread>
#include <QThreadPool>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
// Card back returned by gatherer when card is not found
static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"};

2
cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
View file

@ -1,12 +1,12 @@
#include "card_picture_to_load.h"
#include <../../client/settings/cache_settings.h>
#include <QCoreApplication>
#include <QDate>
#include <QRegularExpression>
#include <QUrl>
#include <algorithm>
#include <libcockatrice/card/set/card_set_comparator.h>
#include <libcockatrice/settings/cache_settings.h>
CardPictureToLoad::CardPictureToLoad(const ExactCard &_card)
: card(_card), urlTemplates(SettingsCache::instance().downloads().getAllURLs())

3
cockatrice/src/interface/theme_manager.cpp
View file

@ -1,12 +1,13 @@
#include "theme_manager.h"
#include "../../client/settings/cache_settings.h"
#include <QApplication>
#include <QColor>
#include <QDebug>
#include <QLibraryInfo>
#include <QPixmapCache>
#include <QStandardPaths>
#include <libcockatrice/settings/cache_settings.h>
#define NONE_THEME_NAME "Default"
#define STYLE_CSS_NAME "style.css"

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

@ -1,5 +1,6 @@
#include "color_identity_widget.h"
#include "../../../../client/settings/cache_settings.h"
#include "mana_symbol_widget.h"
#include <QHBoxLayout>
@ -8,7 +9,6 @@
#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/mana_symbol_widget.cpp
View file

@ -1,7 +1,8 @@
#include "mana_symbol_widget.h"
#include "../../../../client/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)

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

@ -1,5 +1,6 @@
#include "card_info_frame_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../game/board/card_item.h"
#include "card_info_display_widget.h"
#include "card_info_picture_widget.h"
@ -9,7 +10,6 @@
#include <QVBoxLayout>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/card/relation/card_relation.h>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)

2
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 "../../../client/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>
/**

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

@ -1,5 +1,6 @@
#include "card_info_picture_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../game/board/card_item.h"
#include "../../../interface/card_picture_loader/card_picture_loader.h"
#include "../../../interface/widgets/tabs/tab_supervisor.h"
@ -12,7 +13,6 @@
#include <QWidget>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/card/relation/card_relation.h>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
/**

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

@ -1,10 +1,9 @@
#include "card_size_widget.h"
#include "../../../client/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.

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

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

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
View file

@ -1,5 +1,6 @@
#include "deck_editor_database_display_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../filters/syntax_help.h"
#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
#include "../../../interface/widgets/tabs/tab_supervisor.h"
@ -14,7 +15,6 @@
#include <QTreeView>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/card/relation/card_relation.h>
#include <libcockatrice/settings/cache_settings.h>
static bool canBeCommander(const CardInfo &cardInfo)
{

3
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -1,5 +1,7 @@
#include "deck_editor_deck_dock_widget.h"
#include "../../../client/settings/cache_settings.h"
#include <QComboBox>
#include <QDockWidget>
#include <QHeaderView>
@ -7,7 +9,6 @@
#include <QSplitter>
#include <QTextEdit>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent)

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
View file

@ -1,5 +1,6 @@
#include "deck_editor_filter_dock_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../filters/filter_builder.h"
#include "../../../filters/filter_tree_model.h"
@ -7,7 +8,6 @@
#include <QMenu>
#include <QToolButton>
#include <libcockatrice/models/database/card_database_model.h>
#include <libcockatrice/settings/cache_settings.h>
DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)
: QDockWidget(parent), deckEditor(parent)

3
cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
View file

@ -1,5 +1,7 @@
#include "dlg_connect.h"
#include "../../../client/settings/cache_settings.h"
#include <QCheckBox>
#include <QComboBox>
#include <QDebug>
@ -12,7 +14,6 @@
#include <QMessageBox>
#include <QPushButton>
#include <QRadioButton>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)

2
cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
View file

@ -1,5 +1,6 @@
#include "dlg_create_game.h"
#include "../../../client/settings/cache_settings.h"
#include "../interface/widgets/tabs/tab_room.h"
#include <QApplication>
@ -17,7 +18,6 @@
#include <QWizard>
#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
void DlgCreateGame::sharedCtor()

3
cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
View file

@ -1,8 +1,9 @@
#include "dlg_default_tags_editor.h"
#include "../../../client/settings/cache_settings.h"
#include <QMessageBox>
#include <QVBoxLayout>
#include <libcockatrice/settings/cache_settings.h>
DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent)
{

3
cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
View file

@ -1,11 +1,12 @@
#include "dlg_edit_password.h"
#include "../../../client/settings/cache_settings.h"
#include <QDialogButtonBox>
#include <QGridLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <QMessageBox>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)

3
cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
View file

@ -1,11 +1,12 @@
#include "dlg_edit_user.h"
#include "../../../client/settings/cache_settings.h"
#include <QDebug>
#include <QDialogButtonBox>
#include <QGridLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent)

3
cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
View file

@ -1,5 +1,7 @@
#include "dlg_forgot_password_challenge.h"
#include "../../../client/settings/cache_settings.h"
#include <QCheckBox>
#include <QDebug>
#include <QDialogButtonBox>
@ -7,7 +9,6 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QMessageBox>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent)

3
cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
View file

@ -1,5 +1,7 @@
#include "dlg_forgot_password_request.h"
#include "../../../client/settings/cache_settings.h"
#include <QCheckBox>
#include <QDebug>
#include <QDialogButtonBox>
@ -7,7 +9,6 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QMessageBox>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent)

3
cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
View file

@ -1,5 +1,7 @@
#include "dlg_forgot_password_reset.h"
#include "../../../client/settings/cache_settings.h"
#include <QCheckBox>
#include <QDebug>
#include <QDialogButtonBox>
@ -7,7 +9,6 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QMessageBox>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent)

3
cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
View file

@ -1,7 +1,8 @@
#include "dlg_load_deck.h"
#include <libcockatrice/models/deck_list/deck_loader.h>
#include <libcockatrice/settings/cache_settings.h>
#include "../../../client/settings/cache_settings.h"
DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
{

2
cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
View file

@ -1,5 +1,6 @@
#include "dlg_load_deck_from_clipboard.h"
#include "../../../client/settings/cache_settings.h"
#include "dlg_settings.h"
#include <QApplication>
@ -12,7 +13,6 @@
#include <QTextStream>
#include <QVBoxLayout>
#include <libcockatrice/models/deck_list/deck_loader.h>
#include <libcockatrice/settings/cache_settings.h>
/**
* Creates the main layout and connects the signals that are common to all versions of this window

2
cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
View file

@ -1,5 +1,6 @@
#include "dlg_manage_sets.h"
#include "../../../client/settings/cache_settings.h"
#include "../interface/card_picture_loader/card_picture_loader.h"
#include "../interface/widgets/utility/custom_line_edit.h"
#include "../main.h"
@ -21,7 +22,6 @@
#include <algorithm>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/models/database/card_set/card_sets_model.h>
#include <libcockatrice/settings/cache_settings.h>
#define SORT_RESET -1

3
cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
View file

@ -1,5 +1,7 @@
#include "dlg_register.h"
#include "../../../client/settings/cache_settings.h"
#include <QCheckBox>
#include <QDebug>
#include <QDialogButtonBox>
@ -8,7 +10,6 @@
#include <QLabel>
#include <QMessageBox>
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h>
DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)

4
cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
View file

@ -1,5 +1,7 @@
#include "dlg_settings.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../client/settings/shortcut_treeview.h"
#include "../client/network/update/card_spoiler/spoiler_background_updater.h"
#include "../client/network/update/client/release_channel.h"
#include "../client/sound_engine.h"
@ -45,9 +47,7 @@
#include <QVariant>
#include <libcockatrice/card/database/card_database.h>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/settings/card_counter_settings.h>
#include <libcockatrice/settings/shortcut_treeview.h>
#define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs"
#define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"

3
cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
View file

@ -1,7 +1,8 @@
#include "dlg_startup_card_check.h"
#include "../../../client/settings/cache_settings.h"
#include <QDate>
#include <libcockatrice/settings/cache_settings.h>
DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent)
{

2
cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
View file

@ -1,5 +1,6 @@
#include "dlg_tip_of_the_day.h"
#include "../../../client/settings/cache_settings.h"
#include "tip_of_the_day.h"
#include <QCheckBox>
@ -9,7 +10,6 @@
#include <QGridLayout>
#include <QLabel>
#include <QPushButton>
#include <libcockatrice/settings/cache_settings.h>
#define MIN_TIP_IMAGE_HEIGHT 200
#define MIN_TIP_IMAGE_WIDTH 200

2
cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
View file

@ -1,5 +1,6 @@
#include "dlg_update.h"
#include "../../../client/settings/cache_settings.h"
#include "../client/network/update/client/client_update_checker.h"
#include "../client/network/update/client/release_channel.h"
#include "../interface/window_main.h"
@ -13,7 +14,6 @@
#include <QPushButton>
#include <QVBoxLayout>
#include <QtNetwork>
#include <libcockatrice/settings/cache_settings.h>
#include <version_string.h>
DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent)

3
cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
View file

@ -1,5 +1,7 @@
#include "dlg_view_log.h"
#include "../../../client/settings/cache_settings.h"
#include "../../logger.h"
#include <QClipboard>
@ -7,7 +9,6 @@
#include <QPushButton>
#include <QRegularExpression>
#include <QVBoxLayout>
#include <libcockatrice/settings/cache_settings.h>
DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
{

2
cockatrice/src/interface/widgets/general/home_widget.cpp
View file

@ -1,5 +1,6 @@
#include "home_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../interface/widgets/tabs/tab_supervisor.h"
#include "../../window_main.h"
#include "background_sources.h"
@ -11,7 +12,6 @@
#include <QVBoxLayout>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/network/client/remote/remote_client.h>
#include <libcockatrice/settings/cache_settings.h>
HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
: QWidget(parent), tabSupervisor(_tabSupervisor), background("theme:backgrounds/home"), overlay("theme:cockatrice")

3
cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
View file

@ -1,6 +1,7 @@
#include "../../../interface/widgets/menus/deck_editor_menu.h"
#include <libcockatrice/settings/cache_settings.h>
#include "../../../client/settings/cache_settings.h"
#include <libcockatrice/settings/shortcuts_settings.h>
DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)

3
cockatrice/src/interface/widgets/menus/tearoff_menu.h
View file

@ -6,8 +6,9 @@
#pragma once
#include "../../../client/settings/cache_settings.h"
#include <QMenu>
#include <libcockatrice/settings/cache_settings.h>
class TearOffMenu : public QMenu
{

2
cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
View file

@ -1,5 +1,6 @@
#include "printing_selector.h"
#include "../../../client/settings/cache_settings.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"
@ -9,7 +10,6 @@
#include <QFrame>
#include <QScrollBar>
#include <libcockatrice/settings/cache_settings.h>
#include <qboxlayout.h>
/**

2
cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
View file

@ -1,5 +1,6 @@
#include "printing_selector_card_overlay_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "printing_selector_card_display_widget.h"
#include <QMenu>
@ -7,7 +8,6 @@
#include <QVBoxLayout>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/card/relation/card_relation.h>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
/**

3
cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
View file

@ -1,7 +1,8 @@
#include "printing_selector_card_sorting_widget.h"
#include "../../../client/settings/cache_settings.h"
#include <libcockatrice/card/set/card_set_comparator.h>
#include <libcockatrice/settings/cache_settings.h>
const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical");
const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference");

3
cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
View file

@ -1,10 +1,11 @@
#include "replay_timeline_widget.h"
#include "../../../client/settings/cache_settings.h"
#include <QPainter>
#include <QPainterPath>
#include <QPalette>
#include <QTimer>
#include <libcockatrice/settings/cache_settings.h>
ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent)
: QWidget(parent), maxBinValue(1), maxTime(1), timeScaleFactor(1.0), currentVisualTime(0), currentProcessedTime(0),

2
cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
View file

@ -1,5 +1,6 @@
#include "chat_view.h"
#include "../../../../client/settings/cache_settings.h"
#include "../../client/sound_engine.h"
#include "../../interface/pixel_map_generator.h"
#include "../../interface/widgets/tabs/tab_account.h"
@ -13,7 +14,6 @@
#include <QMouseEvent>
#include <QScrollBar>
#include <libcockatrice/network/server/remote/user_level.h>
#include <libcockatrice/settings/cache_settings.h>
const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47);

2
cockatrice/src/interface/widgets/server/games_model.cpp
View file

@ -1,5 +1,6 @@
#include "games_model.h"
#include "../../../client/settings/cache_settings.h"
#include "../interface/pixel_map_generator.h"
#include "../interface/widgets/tabs/tab_account.h"
#include "user/user_list_manager.h"
@ -12,7 +13,6 @@
#include <QTime>
#include <QTimeZone>
#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
#include <libcockatrice/settings/cache_settings.h>
enum GameListColumn
{

3
cockatrice/src/interface/widgets/server/handle_public_servers.cpp
View file

@ -1,11 +1,12 @@
#include "handle_public_servers.h"
#include "../../../client/settings/cache_settings.h"
#include <QJsonDocument>
#include <QMessageBox>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QUrl>
#include <libcockatrice/settings/cache_settings.h>
#define PUBLIC_SERVERS_JSON "https://cockatrice.github.io/public-servers.json"

3
cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
View file

@ -1,7 +1,8 @@
#include "user_info_connection.h"
#include "../../../../client/settings/cache_settings.h"
#include <QDebug>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
UserConnection_Information::UserConnection_Information() = default;

2
cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
View file

@ -1,5 +1,6 @@
#include "abstract_tab_deck_editor.h"
#include "../../../client/settings/cache_settings.h"
#include "../client/network/interfaces/deck_stats_interface.h"
#include "../client/network/interfaces/tapped_out_interface.h"
#include "../interface/card_picture_loader/card_picture_loader.h"
@ -37,7 +38,6 @@
#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)

2
cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
View file

@ -1,5 +1,6 @@
#include "tab_deck_editor.h"
#include "../../../client/settings/cache_settings.h"
#include "../client/network/interfaces/tapped_out_interface.h"
#include "../filters/filter_builder.h"
#include "../filters/filter_tree_model.h"
@ -36,7 +37,6 @@
#include <libcockatrice/models/database/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)

2
cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
View file

@ -1,5 +1,6 @@
#include "tab_deck_storage.h"
#include "../../../client/settings/cache_settings.h"
#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
#include "../interface/widgets/utility/get_text_with_max.h"
@ -28,7 +29,6 @@
#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,

2
cockatrice/src/interface/widgets/tabs/tab_game.cpp
View file

@ -1,5 +1,6 @@
#include "tab_game.h"
#include "../../../client/settings/cache_settings.h"
#include "../game/board/arrow_item.h"
#include "../game/board/card_item.h"
#include "../game/deckview/deck_view_container.h"
@ -44,7 +45,6 @@
#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)

2
cockatrice/src/interface/widgets/tabs/tab_message.cpp
View file

@ -1,5 +1,6 @@
#include "tab_message.h"
#include "../../../client/settings/cache_settings.h"
#include "../client/sound_engine.h"
#include "../interface/widgets/server/chat_view/chat_view.h"
#include "../interface/widgets/server/user/user_list_manager.h"
@ -16,7 +17,6 @@
#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,

2
cockatrice/src/interface/widgets/tabs/tab_replays.cpp
View file

@ -1,5 +1,6 @@
#include "tab_replays.h"
#include "../../../client/settings/cache_settings.h"
#include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
#include "tab_game.h"
@ -29,7 +30,6 @@
#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)

2
cockatrice/src/interface/widgets/tabs/tab_room.cpp
View file

@ -1,5 +1,6 @@
#include "tab_room.h"
#include "../../../client/settings/cache_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"
@ -30,7 +31,6 @@
#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,

2
cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
View file

@ -1,5 +1,6 @@
#include "tab_supervisor.h"
#include "../../../client/settings/cache_settings.h"
#include "../interface/pixel_map_generator.h"
#include "../interface/widgets/server/user/user_list_manager.h"
#include "../interface/widgets/server/user/user_list_widget.h"
@ -35,7 +36,6 @@
#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
{

2
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -1,5 +1,6 @@
#include "tab_deck_editor_visual.h"
#include "../../../../client/settings/cache_settings.h"
#include "../../client/network/interfaces/deck_stats_interface.h"
#include "../../filters/filter_builder.h"
#include "../../interface/pixel_map_generator.h"
@ -31,7 +32,6 @@
#include <libcockatrice/models/deck_list/deck_list_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)

3
cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
View file

@ -1,11 +1,12 @@
#include "custom_line_edit.h"
#include "../../../client/settings/cache_settings.h"
#include <QKeyEvent>
#include <QLineEdit>
#include <QObject>
#include <QTreeView>
#include <QWidget>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/settings/shortcuts_settings.h>
LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent)

3
cockatrice/src/interface/widgets/utility/sequence_edit.cpp
View file

@ -1,9 +1,10 @@
#include "sequence_edit.h"
#include "../../../client/settings/cache_settings.h"
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QToolTip>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWidget(parent)

2
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
View file

@ -1,5 +1,6 @@
#include "visual_database_display_filter_save_load_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../filters/filter_tree.h"
#include "visual_database_filter_display_widget.h"
@ -7,7 +8,6 @@
#include <QJsonArray>
#include <QJsonObject>
#include <QMessageBox>
#include <libcockatrice/settings/cache_settings.h>
VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWidget(QWidget *parent,
FilterTreeModel *_filterModel)

2
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
View file

@ -1,5 +1,6 @@
#include "visual_database_display_set_filter_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../filters/filter_tree.h"
#include "../../../filters/filter_tree_model.h"
@ -8,7 +9,6 @@
#include <QTimer>
#include <algorithm>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentSetFilterSettingsWidget(QWidget *parent)
: QWidget(parent)

2
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
View file

@ -1,5 +1,6 @@
#include "visual_database_display_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../filters/filter_tree_model.h"
#include "../../../filters/syntax_help.h"
#include "../../pixel_map_generator.h"
@ -18,7 +19,6 @@
#include <libcockatrice/card/card_info_comparator.h>
#include <libcockatrice/card/database/card_database.h>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
#include <qpropertyanimation.h>
#include <utility>

3
cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
View file

@ -1,12 +1,13 @@
#include "visual_database_filter_display_widget.h"
#include "../../../client/settings/cache_settings.h"
#include <QDir>
#include <QFile>
#include <QFontMetrics>
#include <QHBoxLayout>
#include <QMessageBox>
#include <QPushButton>
#include <libcockatrice/settings/cache_settings.h>
FilterDisplayWidget::FilterDisplayWidget(QWidget *parent, const QString &filename, FilterTreeModel *_filterModel)
: QWidget(parent), filterFilename(filename), filterModel(_filterModel)

2
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
View file

@ -1,10 +1,10 @@
#include "visual_deck_editor_sample_hand_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../cards/card_info_picture_widget.h"
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/models/deck_list/deck_loader.h>
#include <libcockatrice/settings/cache_settings.h>
#include <random>
VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *_deckListModel)

2
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
View file

@ -1,5 +1,6 @@
#include "deck_preview_deck_tags_display_widget.h"
#include "../../../../client/settings/cache_settings.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"
@ -12,7 +13,6 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QMessageBox>
#include <libcockatrice/settings/cache_settings.h>
DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList)
: QWidget(_parent), deckList(nullptr)

2
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
View file

@ -1,5 +1,6 @@
#include "deck_preview_tag_addition_widget.h"
#include "../../../../client/settings/cache_settings.h"
#include "../../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
#include "deck_preview_tag_dialog.h"
@ -7,7 +8,6 @@
#include <QHBoxLayout>
#include <QMouseEvent>
#include <QPainter>
#include <libcockatrice/settings/cache_settings.h>
#include <utility>
DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, QString _tagName)

2
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
View file

@ -1,5 +1,6 @@
#include "deck_preview_tag_dialog.h"
#include "../../../../client/settings/cache_settings.h"
#include "../../../../interface/widgets/dialogs/dlg_default_tags_editor.h"
#include "deck_preview_tag_item_widget.h"
@ -11,7 +12,6 @@
#include <QPushButton>
#include <QTimer>
#include <QVBoxLayout>
#include <libcockatrice/settings/cache_settings.h>
DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags,
const QStringList &_activeTags,

2
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
View file

@ -1,5 +1,6 @@
#include "deck_preview_widget.h"
#include "../../../../client/settings/cache_settings.h"
#include "../../cards/additional_info/color_identity_widget.h"
#include "../../cards/deck_preview_card_picture_widget.h"
#include "deck_preview_deck_tags_display_widget.h"
@ -14,7 +15,6 @@
#include <QStandardItemModel>
#include <QVBoxLayout>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
VisualDeckStorageWidget *_visualDeckStorageWidget,

2
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
View file

@ -1,10 +1,10 @@
#include "visual_deck_storage_folder_display_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "deck_preview/deck_preview_widget.h"
#include <QDirIterator>
#include <QMouseEvent>
#include <libcockatrice/settings/cache_settings.h>
VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget(
QWidget *parent,

2
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
View file

@ -1,11 +1,11 @@
#include "visual_deck_storage_quick_settings_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "visual_deck_storage_widget.h"
#include <QCheckBox>
#include <QComboBox>
#include <QSpinBox>
#include <libcockatrice/settings/cache_settings.h>
VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidget *parent)
: SettingsButtonWidget(parent)

2
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
View file

@ -1,11 +1,11 @@
#include "visual_deck_storage_search_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../filters/deck_filter_string.h"
#include "../../../filters/syntax_help.h"
#include "../../pixel_map_generator.h"
#include <QAction>
#include <libcockatrice/settings/cache_settings.h>
/**
* @brief Constructs a PrintingSelectorCardSearchWidget for searching cards by set name or set code.

2
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
View file

@ -1,6 +1,6 @@
#include "visual_deck_storage_sort_widget.h"
#include <libcockatrice/settings/cache_settings.h>
#include "../../../client/settings/cache_settings.h"
/**
* @brief Constructs a PrintingSelectorCardSortWidget for searching cards by set name or set code.

2
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
View file

@ -1,5 +1,6 @@
#include "visual_deck_storage_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../quick_settings/settings_button_widget.h"
#include "deck_preview/deck_preview_widget.h"
#include "visual_deck_storage_folder_display_widget.h"
@ -13,7 +14,6 @@
#include <QSpinBox>
#include <QVBoxLayout>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/settings/cache_settings.h>
VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent), folderWidget(nullptr)
{

2
cockatrice/src/interface/window_main.cpp
View file

@ -40,6 +40,7 @@
#include "version_string.h"
#include "widgets/utility/get_text_with_max.h"
#include <../client/settings/cache_settings.h>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
@ -71,7 +72,6 @@
#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
#include <libcockatrice/protocol/pb/game_replay.pb.h>
#include <libcockatrice/protocol/pb/room_commands.pb.h>
#include <libcockatrice/settings/cache_settings.h>
#define GITHUB_PAGES_URL "https://cockatrice.github.io"
#define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c"

5
cockatrice/src/main.cpp
View file

@ -22,6 +22,7 @@
#include "QtNetwork/QNetworkInterface"
#include "client/network/update/card_spoiler/spoiler_background_updater.h"
#include "client/settings/cache_settings.h"
#include "client/sound_engine.h"
#include "interface/logger.h"
#include "interface/pixel_map_generator.h"
@ -42,9 +43,9 @@
#include <QTextStream>
#include <QTranslator>
#include <QtPlugin>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/protocol/featureset.h>
#include <libcockatrice/rng/rng_sfmt.h>
#include <libcockatrice/settings/cache_settings.h>
QTranslator *translator, *qtTranslator;
RNG_Abstract *rng;
@ -266,6 +267,8 @@ int main(int argc, char *argv[])
SettingsCache::instance().setClientID(generateClientID());
CardDatabaseManager::setCardPreferenceProvider(QSharedPointer<SettingsCardPreferenceProvider>::create());
// If spoiler mode is enabled, we will download the spoilers
// then reload the DB. otherwise just reload the DB
SpoilerBackgroundUpdater spoilerBackgroundUpdater;

2
dbconverter/src/mocks.h
View file

@ -10,8 +10,8 @@
#define PICTURELOADER_H
#include <../../cockatrice/src/client/settings/cache_settings.h>
#include <libcockatrice/card/database/card_database.h>
#include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/macros.h>
extern SettingsCache *settingsCache;

Some files were not shown because too many files have changed in this diff Show more