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

Disable view card database button until card db is loaded, add a new style for disabled buttons.

Browse source 
Took 4 minutes

Took 21 seconds
This commit is contained in:
Lukas Brübach 2025-09-13 12:49:13 +02:00
parent 9ca5ee52e7
commit 8c118ecdbf
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cockatrice/src/client/ui/widgets/general/home_styled_button.cpp
View file

@ -29,6 +29,12 @@ QString HomeStyledButton::generateButtonStylesheet(const QPair<QColor, QColor> &
QColor pressed1 = base1.darker(130); // 30% darker QColor pressed1 = base1.darker(130); // 30% darker
QColor pressed2 = base2.darker(130); QColor pressed2 = base2.darker(130);
// Disabled: more gray, less saturated
QColor disabled1 = base1.toHsv();
disabled1.setHsv(disabled1.hue(), disabled1.saturation() * 0.2, disabled1.value() * 0.6);
QColor disabled2 = base2.toHsv();
disabled2.setHsv(disabled2.hue(), disabled2.saturation() * 0.2, disabled2.value() * 0.6);
return QString(R"( return QString(R"(
QPushButton { QPushButton {
font-size: 34px; font-size: 34px;
@ -47,6 +53,12 @@ QString HomeStyledButton::generateButtonStylesheet(const QPair<QColor, QColor> &
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 %6, stop:1 %7); stop:0 %6, stop:1 %7);
} }
QPushButton:disabled {
color: #aaaaaa;
border: 2px solid #888888;
background: qlineargradient(x1:0, y1:1, x2:0, y2:0,
stop:0 %8, stop:1 %9);
}
)") )")
.arg(base1.name()) // border color .arg(base1.name()) // border color
.arg(base1.name()) // normal gradient start .arg(base1.name()) // normal gradient start
@ -54,9 +66,12 @@ QString HomeStyledButton::generateButtonStylesheet(const QPair<QColor, QColor> &
.arg(hover1.name()) // hover start .arg(hover1.name()) // hover start
.arg(hover2.name()) // hover end .arg(hover2.name()) // hover end
.arg(pressed1.name()) // pressed start .arg(pressed1.name()) // pressed start
.arg(pressed2.name()); // pressed end .arg(pressed2.name()) // pressed end
.arg(disabled1.name()) // disabled start
.arg(disabled2.name()); // disabled end
} }
void HomeStyledButton::paintEvent(QPaintEvent *event) void HomeStyledButton::paintEvent(QPaintEvent *event)
{ {
QString originalText = text(); QString originalText = text();

6
cockatrice/src/client/ui/widgets/general/home_widget.cpp
View file

@ -176,6 +176,12 @@ QGroupBox *HomeWidget::createButtons()
auto visualDatabaseDisplayButton = new HomeStyledButton(tr("Browse Card Database"), gradientColors); auto visualDatabaseDisplayButton = new HomeStyledButton(tr("Browse Card Database"), gradientColors);
connect(visualDatabaseDisplayButton, &QPushButton::clicked, tabSupervisor, connect(visualDatabaseDisplayButton, &QPushButton::clicked, tabSupervisor,
&TabSupervisor::addVisualDatabaseDisplayTab); &TabSupervisor::addVisualDatabaseDisplayTab);
if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished,
visualDatabaseDisplayButton,
[visualDatabaseDisplayButton]() { visualDatabaseDisplayButton->setEnabled(true); });
visualDatabaseDisplayButton->setEnabled(false);
}
boxLayout->addWidget(visualDatabaseDisplayButton); boxLayout->addWidget(visualDatabaseDisplayButton);
auto edhrecButton = new HomeStyledButton(tr("Browse EDHRec"), gradientColors); auto edhrecButton = new HomeStyledButton(tr("Browse EDHRec"), gradientColors);
connect(edhrecButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addEdhrecMainTab); connect(edhrecButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addEdhrecMainTab);