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

Directly use an AbstractTabDeckEditor as parent.

Browse source
This commit is contained in:
Lukas Brübach 2025-02-27 16:10:29 +01:00
parent e2a0b422b6
commit 57a64c97fd
11 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
View file

@ -42,11 +42,11 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta
{ {
setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks); setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
databaseDisplayDockWidget = new DeckEditorDatabaseDisplayWidget(this, this); databaseDisplayDockWidget = new DeckEditorDatabaseDisplayWidget(this);
deckDockWidget = new DeckEditorDeckDockWidget(this, this); deckDockWidget = new DeckEditorDeckDockWidget(this);
cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this, this); cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this);
filterDockWidget = new DeckEditorFilterDockWidget(this, this); filterDockWidget = new DeckEditorFilterDockWidget(this);
printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this, this); printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this);
connect(deckDockWidget, &DeckEditorDeckDockWidget::deckChanged, this, &AbstractTabDeckEditor::onDeckChanged); connect(deckDockWidget, &DeckEditorDeckDockWidget::deckChanged, this, &AbstractTabDeckEditor::onDeckChanged);
connect(deckDockWidget, &DeckEditorDeckDockWidget::cardChanged, this, &AbstractTabDeckEditor::updateCard); connect(deckDockWidget, &DeckEditorDeckDockWidget::cardChanged, this, &AbstractTabDeckEditor::updateCard);

4
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
View file

@ -4,8 +4,8 @@
#include <QVBoxLayout> #include <QVBoxLayout>
DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor) DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(AbstractTabDeckEditor *parent)
: QDockWidget(parent), deckEditor(_deckEditor) : QDockWidget(parent), deckEditor(parent)
{ {
setObjectName("cardInfoDock"); setObjectName("cardInfoDock");

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h
View file

@ -11,7 +11,7 @@ class DeckEditorCardInfoDockWidget : public QDockWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DeckEditorCardInfoDockWidget(QWidget *parent, AbstractTabDeckEditor *deckEditor); explicit DeckEditorCardInfoDockWidget(AbstractTabDeckEditor *parent);
void createCardInfoDock(); void createCardInfoDock();
void retranslateUi(); void retranslateUi();

4
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp
View file

@ -21,8 +21,8 @@ static bool canBeCommander(const CardInfoPtr &cardInfo)
cardInfo->getText().contains("can be your commander", Qt::CaseInsensitive); cardInfo->getText().contains("can be your commander", Qt::CaseInsensitive);
} }
DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor) DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(AbstractTabDeckEditor *parent)
: QWidget(parent), deckEditor(_deckEditor) : QWidget(parent), deckEditor(parent)
{ {
setObjectName("centralWidget"); setObjectName("centralWidget");

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
View file

@ -15,7 +15,7 @@ class DeckEditorDatabaseDisplayWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor); explicit DeckEditorDatabaseDisplayWidget(AbstractTabDeckEditor *parent);
AbstractTabDeckEditor *deckEditor; AbstractTabDeckEditor *deckEditor;
SearchLineEdit *searchEdit; SearchLineEdit *searchEdit;
CardDatabaseModel *databaseModel; CardDatabaseModel *databaseModel;

4
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -11,8 +11,8 @@
#include <QTextEdit> #include <QTextEdit>
#include <trice_limits.h> #include <trice_limits.h>
DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor) DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent)
: QDockWidget(parent), deckEditor(_deckEditor) : QDockWidget(parent), deckEditor(parent)
{ {
setObjectName("deckDock"); setObjectName("deckDock");

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h
View file

@ -19,7 +19,7 @@ class DeckEditorDeckDockWidget : public QDockWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DeckEditorDeckDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor); explicit DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent);
DeckListModel *deckModel; DeckListModel *deckModel;
QTreeView *deckView; QTreeView *deckView;
QComboBox *bannerCardComboBox; QComboBox *bannerCardComboBox;

4
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
View file

@ -9,8 +9,8 @@
#include <QMenu> #include <QMenu>
#include <QToolButton> #include <QToolButton>
DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor) DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)
: QDockWidget(parent), deckEditor(_deckEditor) : QDockWidget(parent), deckEditor(parent)
{ {
setObjectName("filterDock"); setObjectName("filterDock");

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h
View file

@ -13,7 +13,7 @@ class DeckEditorFilterDockWidget : public QDockWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DeckEditorFilterDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor); explicit DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent);
void createFiltersDock(); void createFiltersDock();
void retranslateUi(); void retranslateUi();
QAction *aClearFilterAll, *aClearFilterOne; QAction *aClearFilterAll, *aClearFilterOne;

5
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
View file

@ -4,9 +4,8 @@
#include <QVBoxLayout> #include <QVBoxLayout>
DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(QWidget *parent, DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent)
AbstractTabDeckEditor *_deckEditor) : QDockWidget(parent), deckEditor(parent)
: QDockWidget(parent), deckEditor(_deckEditor)
{ {
setObjectName("printingSelectorDock"); setObjectName("printingSelectorDock");

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
View file

@ -11,7 +11,7 @@ class DeckEditorPrintingSelectorDockWidget : public QDockWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DeckEditorPrintingSelectorDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor); explicit DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent);
void createPrintingSelectorDock(); void createPrintingSelectorDock();
void retranslateUi(); void retranslateUi();
PrintingSelector *printingSelector; PrintingSelector *printingSelector;