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

Add a card size slider.

Browse source
This commit is contained in:
Lukas Brübach 2025-04-18 22:53:46 +02:00
parent 8c711ac701
commit 674b19aadf
4 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,8 +38,11 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi
} }
if (parentTab) { if (parentTab) {
cardPictureWidget->setScaleFactor(parentTab->getCardSizeSlider()->getSlider()->value());
connect(cardPictureWidget, &CardInfoPictureWidget::cardClicked, this, connect(cardPictureWidget, &CardInfoPictureWidget::cardClicked, this,
&EdhrecApiResponseCardDetailsDisplayWidget::actRequestPageNavigation); &EdhrecApiResponseCardDetailsDisplayWidget::actRequestPageNavigation);
connect(parentTab->getCardSizeSlider()->getSlider(), &QSlider::valueChanged, cardPictureWidget,
&CardInfoPictureWidget::setScaleFactor);
connect(this, &EdhrecApiResponseCardDetailsDisplayWidget::requestUrl, parentTab, connect(this, &EdhrecApiResponseCardDetailsDisplayWidget::requestUrl, parentTab,
&TabEdhRecMain::actNavigatePage); &TabEdhRecMain::actNavigatePage);
} }

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

@ -2,6 +2,7 @@
#include "../../../../../../game/cards/card_database_manager.h" #include "../../../../../../game/cards/card_database_manager.h"
#include "../../../../../ui/widgets/cards/card_info_picture_widget.h" #include "../../../../../ui/widgets/cards/card_info_picture_widget.h"
#include "../../tab_edhrec_main.h"
#include "../card_prices/edhrec_api_response_card_prices_display_widget.h" #include "../card_prices/edhrec_api_response_card_prices_display_widget.h"
EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget( EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget(
@ -16,6 +17,22 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom
commanderPicture = new CardInfoPictureWidget(this); commanderPicture = new CardInfoPictureWidget(this);
commanderPicture->setCard(CardDatabaseManager::getInstance()->getCard(commanderDetails.getName())); commanderPicture->setCard(CardDatabaseManager::getInstance()->getCard(commanderDetails.getName()));
QWidget *currentParent = parentWidget();
TabEdhRecMain *parentTab = nullptr;
while (currentParent) {
if ((parentTab = qobject_cast<TabEdhRecMain *>(currentParent))) {
break;
}
currentParent = currentParent->parentWidget();
}
if (parentTab) {
connect(parentTab->getCardSizeSlider()->getSlider(), &QSlider::valueChanged, commanderPicture,
&CardInfoPictureWidget::setScaleFactor);
commanderPicture->setScaleFactor(parentTab->getCardSizeSlider()->getSlider()->value());
}
commanderDetails.debugPrint(); commanderDetails.debugPrint();
label = new QLabel(this); label = new QLabel(this);

7
cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp
View file

@ -94,11 +94,18 @@ TabEdhRecMain::TabEdhRecMain(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor
searchPushButton = new QPushButton(navigationContainer); searchPushButton = new QPushButton(navigationContainer);
connect(searchPushButton, &QPushButton::clicked, this, [=, this]() { doSearch(); }); connect(searchPushButton, &QPushButton::clicked, this, [=, this]() { doSearch(); });
settingsButton = new SettingsButtonWidget(this);
cardSizeSlider = new CardSizeWidget(this);
settingsButton->addSettingsWidget(cardSizeSlider);
navigationLayout->addWidget(cardsPushButton); navigationLayout->addWidget(cardsPushButton);
navigationLayout->addWidget(topCommandersPushButton); navigationLayout->addWidget(topCommandersPushButton);
navigationLayout->addWidget(tagsPushButton); navigationLayout->addWidget(tagsPushButton);
navigationLayout->addWidget(searchBar); navigationLayout->addWidget(searchBar);
navigationLayout->addWidget(searchPushButton); navigationLayout->addWidget(searchPushButton);
navigationLayout->addWidget(settingsButton);
currentPageDisplay = new QWidget(container); currentPageDisplay = new QWidget(container);
currentPageLayout = new QVBoxLayout(currentPageDisplay); currentPageLayout = new QVBoxLayout(currentPageDisplay);

9
cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h
View file

@ -2,7 +2,9 @@
#define TAB_EDHREC_MAIN_H #define TAB_EDHREC_MAIN_H
#include "../../../../game/cards/card_database.h" #include "../../../../game/cards/card_database.h"
#include "../../../ui/widgets/cards/card_size_widget.h"
#include "../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../../../ui/widgets/general/layout_containers/flow_widget.h"
#include "../../../ui/widgets/quick_settings/settings_button_widget.h"
#include "../../tab.h" #include "../../tab.h"
#include "display/commander/edhrec_commander_api_response_display_widget.h" #include "display/commander/edhrec_commander_api_response_display_widget.h"
@ -25,6 +27,11 @@ public:
return tr("EDHREC: ") + cardName; return tr("EDHREC: ") + cardName;
} }
CardSizeWidget* getCardSizeSlider()
{
return cardSizeSlider;
}
QNetworkAccessManager *networkManager; QNetworkAccessManager *networkManager;
public slots: public slots:
@ -53,6 +60,8 @@ private:
QPushButton *tagsPushButton; QPushButton *tagsPushButton;
QLineEdit *searchBar; QLineEdit *searchBar;
QPushButton *searchPushButton; QPushButton *searchPushButton;
SettingsButtonWidget *settingsButton;
CardSizeWidget *cardSizeSlider;
CardInfoPtr cardToQuery; CardInfoPtr cardToQuery;
EdhrecCommanderApiResponseDisplayWidget *displayWidget; EdhrecCommanderApiResponseDisplayWidget *displayWidget;
}; };