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

Lint, tr() some strings, add Exit button.

Browse source 
Took 12 minutes

Took 7 seconds
This commit is contained in:
Lukas Brübach 2025-09-11 14:29:35 +02:00
parent 6da1e593fc
commit 494821df83
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,4 +85,3 @@ void HomeStyledButton::paintEvent(QPaintEvent *event)
painter.setBrush(Qt::white); painter.setBrush(Qt::white);
painter.drawPath(path); painter.drawPath(path);
} }

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

@ -22,7 +22,6 @@ HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
backgroundSourceCard = new CardInfoPictureArtCropWidget(this); backgroundSourceCard = new CardInfoPictureArtCropWidget(this);
backgroundSourceDeck = new DeckLoader(); backgroundSourceDeck = new DeckLoader();
qInfo() << "Loading from " << SettingsCache::instance().getDeckPath() + "background.cod";
backgroundSourceDeck->loadFromFile(SettingsCache::instance().getDeckPath() + "background.cod", backgroundSourceDeck->loadFromFile(SettingsCache::instance().getDeckPath() + "background.cod",
DeckLoader::CockatriceFormat, false); DeckLoader::CockatriceFormat, false);
@ -102,7 +101,6 @@ void HomeWidget::updateRandomCard()
do { do {
int idx = QRandomGenerator::global()->bounded(cardRefs.size()); int idx = QRandomGenerator::global()->bounded(cardRefs.size());
newCard = CardDatabaseManager::getInstance()->getCard(cardRefs.at(idx)); newCard = CardDatabaseManager::getInstance()->getCard(cardRefs.at(idx));
qInfo() << "Picked " << newCard.getName();
} while (newCard == oldCard); } while (newCard == oldCard);
} }
} else { } else {
@ -165,27 +163,32 @@ QGroupBox *HomeWidget::createButtons()
connectButton = new HomeStyledButton("Connect/Play", gradientColors); connectButton = new HomeStyledButton("Connect/Play", gradientColors);
boxLayout->addWidget(connectButton, 1); boxLayout->addWidget(connectButton, 1);
auto visualDeckEditorButton = new HomeStyledButton("Create New Deck", gradientColors); auto visualDeckEditorButton = new HomeStyledButton(tr("Create New Deck"), gradientColors);
connect(visualDeckEditorButton, &QPushButton::clicked, tabSupervisor, connect(visualDeckEditorButton, &QPushButton::clicked, tabSupervisor,
[this] { tabSupervisor->addVisualDeckEditorTab(nullptr); }); [this] { tabSupervisor->addVisualDeckEditorTab(nullptr); });
boxLayout->addWidget(visualDeckEditorButton); boxLayout->addWidget(visualDeckEditorButton);
auto visualDeckStorageButton = new HomeStyledButton("Browse Decks", gradientColors); auto visualDeckStorageButton = new HomeStyledButton(tr("Browse Decks"), gradientColors);
connect(visualDeckStorageButton, &QPushButton::clicked, tabSupervisor, connect(visualDeckStorageButton, &QPushButton::clicked, tabSupervisor,
[this] { tabSupervisor->actTabVisualDeckStorage(true); }); [this] { tabSupervisor->actTabVisualDeckStorage(true); });
boxLayout->addWidget(visualDeckStorageButton); boxLayout->addWidget(visualDeckStorageButton);
auto visualDatabaseDisplayButton = new HomeStyledButton("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);
boxLayout->addWidget(visualDatabaseDisplayButton); boxLayout->addWidget(visualDatabaseDisplayButton);
auto edhrecButton = new HomeStyledButton("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);
boxLayout->addWidget(edhrecButton); boxLayout->addWidget(edhrecButton);
auto replaybutton = new HomeStyledButton("View Replays", gradientColors); auto replaybutton = new HomeStyledButton(tr("View Replays"), gradientColors);
connect(replaybutton, &QPushButton::clicked, tabSupervisor, [this] { tabSupervisor->actTabReplays(true); }); connect(replaybutton, &QPushButton::clicked, tabSupervisor, [this] { tabSupervisor->actTabReplays(true); });
boxLayout->addWidget(replaybutton); boxLayout->addWidget(replaybutton);
if (qobject_cast<MainWindow *>(tabSupervisor->parentWidget())) {
auto exitButton = new HomeStyledButton(tr("Quit"), gradientColors);
connect(exitButton, &QPushButton::clicked, qobject_cast<MainWindow *>(tabSupervisor->parentWidget()),
&MainWindow::actExit);
boxLayout->addWidget(exitButton);
}
box->setLayout(boxLayout); box->setLayout(boxLayout);
return box; return box;
} }
@ -194,17 +197,17 @@ void HomeWidget::updateConnectButton(const ClientStatus status)
disconnect(connectButton); disconnect(connectButton);
switch (status) { switch (status) {
case StatusConnecting: case StatusConnecting:
connectButton->setText("Connecting..."); connectButton->setText(tr("Connecting..."));
connectButton->setEnabled(false); connectButton->setEnabled(false);
break; break;
case StatusDisconnected: case StatusDisconnected:
connectButton->setText("Connect"); connectButton->setText(tr("Connect"));
connectButton->setEnabled(true); connectButton->setEnabled(true);
connect(connectButton, &QPushButton::clicked, qobject_cast<MainWindow *>(tabSupervisor->parentWidget()), connect(connectButton, &QPushButton::clicked, qobject_cast<MainWindow *>(tabSupervisor->parentWidget()),
&MainWindow::actConnect); &MainWindow::actConnect);
break; break;
case StatusLoggedIn: case StatusLoggedIn:
connectButton->setText("Play"); connectButton->setText(tr("Play"));
connectButton->setEnabled(true); connectButton->setEnabled(true);
connect(connectButton, &QPushButton::clicked, tabSupervisor, connect(connectButton, &QPushButton::clicked, tabSupervisor,
&TabSupervisor::switchToFirstAvailableNetworkTab); &TabSupervisor::switchToFirstAvailableNetworkTab);

2
cockatrice/src/client/ui/window_main.h
View file

@ -60,6 +60,7 @@ public slots:
void actCheckServerUpdates(); void actCheckServerUpdates();
void actCheckClientUpdates(); void actCheckClientUpdates();
void actConnect(); void actConnect();
void actExit();
private slots: private slots:
void updateTabMenu(const QList<QMenu *> &newMenuList); void updateTabMenu(const QList<QMenu *> &newMenuList);
void statusChanged(ClientStatus _status); void statusChanged(ClientStatus _status);
@ -84,7 +85,6 @@ private slots:
void actFullScreen(bool checked); void actFullScreen(bool checked);
void actRegister(); void actRegister();
void actSettings(); void actSettings();
void actExit();
void actForgotPasswordRequest(); void actForgotPasswordRequest();
void actAbout(); void actAbout();
void actTips(); void actTips();