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

Connect dockTopLevelChanged signals.

Browse source
This commit is contained in:
Lukas Brübach 2025-02-26 18:44:27 +01:00
parent b49d6930cc
commit 82b71773ae
6 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/client/tabs/tab_generic_deck_editor.cpp
View file

@ -20,11 +20,9 @@
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
#include <QCloseEvent> #include <QCloseEvent>
#include <QComboBox>
#include <QDebug> #include <QDebug>
#include <QDesktopServices> #include <QDesktopServices>
#include <QDir> #include <QDir>
#include <QDockWidget>
#include <QFileDialog> #include <QFileDialog>
#include <QHeaderView> #include <QHeaderView>
#include <QLineEdit> #include <QLineEdit>
@ -35,8 +33,6 @@
#include <QPushButton> #include <QPushButton>
#include <QRegularExpression> #include <QRegularExpression>
#include <QSplitter> #include <QSplitter>
#include <QTextBrowser>
#include <QTextEdit>
#include <QTextStream> #include <QTextStream>
#include <QTreeView> #include <QTreeView>
#include <QUrl> #include <QUrl>

5
cockatrice/src/client/tabs/tab_generic_deck_editor.h
View file

@ -1,7 +1,6 @@
#ifndef TAB_GENERIC_DECK_EDITOR_H #ifndef TAB_GENERIC_DECK_EDITOR_H
#define TAB_GENERIC_DECK_EDITOR_H #define TAB_GENERIC_DECK_EDITOR_H
#include "../../deck/custom_line_edit.h"
#include "../../game/cards/card_database.h" #include "../../game/cards/card_database.h"
#include "../menus/deck_editor/deck_editor_menu.h" #include "../menus/deck_editor/deck_editor_menu.h"
#include "../ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h" #include "../ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h"
@ -9,11 +8,9 @@
#include "../ui/widgets/deck_editor/deck_editor_deck_dock_widget.h" #include "../ui/widgets/deck_editor/deck_editor_deck_dock_widget.h"
#include "../ui/widgets/deck_editor/deck_editor_filter_dock_widget.h" #include "../ui/widgets/deck_editor/deck_editor_filter_dock_widget.h"
#include "../ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h" #include "../ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h"
#include "../ui/widgets/printing_selector/printing_selector.h"
#include "../ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "../ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
#include "tab.h" #include "tab.h"
#include <QAbstractItemModel>
#include <QDir> #include <QDir>
class CardDatabaseModel; class CardDatabaseModel;
@ -77,7 +74,6 @@ protected slots:
bool eventFilter(QObject *o, QEvent *e) override; bool eventFilter(QObject *o, QEvent *e) override;
virtual void dockVisibleTriggered() = 0; virtual void dockVisibleTriggered() = 0;
virtual void dockFloatingTriggered() = 0; virtual void dockFloatingTriggered() = 0;
virtual void dockTopLevelChanged(bool topLevel) = 0;
protected: protected:
/** /**
@ -135,6 +131,7 @@ public slots:
void actOpenRecent(const QString &fileName); // generic void actOpenRecent(const QString &fileName); // generic
void closeRequest(bool forced = false) override; // generic void closeRequest(bool forced = false) override; // generic
virtual void showPrintingSelector() = 0; virtual void showPrintingSelector() = 0;
virtual void dockTopLevelChanged(bool topLevel) = 0;
signals: signals:
void openDeckEditor(const DeckLoader *deckLoader); void openDeckEditor(const DeckLoader *deckLoader);
void deckEditorClosing(TabGenericDeckEditor *tab); void deckEditorClosing(TabGenericDeckEditor *tab);

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

@ -4,7 +4,8 @@
#include <QVBoxLayout> #include <QVBoxLayout>
DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(QWidget *parent) : QDockWidget(parent) DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(QWidget *parent, TabGenericDeckEditor *_deckEditor)
: QDockWidget(parent), deckEditor(_deckEditor)
{ {
setObjectName("cardInfoDock"); setObjectName("cardInfoDock");
@ -30,7 +31,7 @@ void DeckEditorCardInfoDockWidget::createCardInfoDock()
setWidget(cardInfoDockContents); setWidget(cardInfoDockContents);
installEventFilter(this); installEventFilter(this);
// connect(this, SIGNAL(topLevelChanged(bool)), deckEditor, SLOT(dockTopLevelChanged(bool))); connect(this, &QDockWidget::topLevelChanged, deckEditor, &TabGenericDeckEditor::dockTopLevelChanged);
} }
void DeckEditorCardInfoDockWidget::retranslateUi() void DeckEditorCardInfoDockWidget::retranslateUi()

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

@ -1,6 +1,7 @@
#ifndef DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H #ifndef DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
#define DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H #define DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
#include "../../../tabs/tab_generic_deck_editor.h"
#include "../cards/card_info_frame_widget.h" #include "../cards/card_info_frame_widget.h"
#include <QDockWidget> #include <QDockWidget>
@ -9,9 +10,11 @@ class DeckEditorCardInfoDockWidget : public QDockWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DeckEditorCardInfoDockWidget(QWidget *parent); explicit DeckEditorCardInfoDockWidget(QWidget *parent, TabGenericDeckEditor *deckEditor);
void createCardInfoDock(); void createCardInfoDock();
void retranslateUi(); void retranslateUi();
TabGenericDeckEditor *deckEditor;
CardInfoFrameWidget *cardInfo; CardInfoFrameWidget *cardInfo;
}; };

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

@ -82,7 +82,7 @@ void DeckEditorFilterDockWidget::createFiltersDock()
setWidget(filterDockContents); setWidget(filterDockContents);
installEventFilter(this); installEventFilter(this);
// connect(this, SIGNAL(topLevelChanged(bool)), deckEditor, SLOT(dockTopLevelChanged(bool))); connect(this, &QDockWidget::topLevelChanged, deckEditor, &TabGenericDeckEditor::dockTopLevelChanged);
} }
void DeckEditorFilterDockWidget::filterViewCustomContextMenu(const QPoint &point) void DeckEditorFilterDockWidget::filterViewCustomContextMenu(const QPoint &point)

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

@ -33,9 +33,7 @@ void DeckEditorPrintingSelectorDockWidget::createPrintingSelectorDock()
setWidget(printingSelectorDockContents); setWidget(printingSelectorDockContents);
installEventFilter(this); installEventFilter(this);
// connect(printingSelectorDock, SIGNAL(topLevelChanged(bool)), this, SLOT(dockTopLevelChanged(bool))); connect(this, &QDockWidget::topLevelChanged, deckEditor, &TabGenericDeckEditor::dockTopLevelChanged);
// addDockWidget(Qt::RightDockWidgetArea, printingSelectorDock);
} }
void DeckEditorPrintingSelectorDockWidget::retranslateUi() void DeckEditorPrintingSelectorDockWidget::retranslateUi()