jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-06 13:33:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 4373ab5e89 into cba9ce2b2b

Browse source
This commit is contained in:
tooomm 2026-05-17 22:55:48 -07:00 • committed by GitHub
commit 792a8d8ee9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/game/player/menu/card_menu.cpp
View file

@ -409,7 +409,7 @@ void CardMenu::addRelatedCardActions()
relatedCardName = relatedCard.getName(); // "name" relatedCardName = relatedCard.getName(); // "name"
} }
QString text = tr("Token: "); QString text = tr("Token") + ": ";
if (cardRelation->getDoesAttach()) { if (cardRelation->getDoesAttach()) {
text += text +=
tr(cardRelation->getDoesTransform() ? "Transform into " : "Attach to ") + "\"" + relatedCardName + "\""; tr(cardRelation->getDoesTransform() ? "Transform into " : "Attach to ") + "\"" + relatedCardName + "\"";
@ -517,4 +517,4 @@ void CardMenu::setShortcutsActive()
aRemoveCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aRC" + colorWords[i])); aRemoveCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aRC" + colorWords[i]));
aSetCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aSC" + colorWords[i])); aSetCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aSC" + colorWords[i]));
} }
} }

2
cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
View file

@ -49,7 +49,7 @@ DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent
playernameEdit->setMaxLength(MAX_NAME_LENGTH); playernameEdit->setMaxLength(MAX_NAME_LENGTH);
playernameLabel->setBuddy(playernameEdit); playernameLabel->setBuddy(playernameEdit);
tokenLabel = new QLabel(tr("Token:")); tokenLabel = new QLabel(tr("Token") + ":");
tokenEdit = new QLineEdit(); tokenEdit = new QLineEdit();
tokenEdit->setMaxLength(MAX_NAME_LENGTH); tokenEdit->setMaxLength(MAX_NAME_LENGTH);
tokenLabel->setBuddy(tokenLabel); tokenLabel->setBuddy(tokenLabel);

2
cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
View file

@ -481,7 +481,7 @@ AppearanceSettingsPage::AppearanceSettingsPage()
}); });
homeTabBackgroundShuffleFrequencySpinBox.setRange(0, 3600); homeTabBackgroundShuffleFrequencySpinBox.setRange(0, 3600);
homeTabBackgroundShuffleFrequencySpinBox.setSuffix(tr(" seconds")); homeTabBackgroundShuffleFrequencySpinBox.setSuffix(QString(" ") + tr("seconds"));
homeTabBackgroundShuffleFrequencySpinBox.setValue(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency()); homeTabBackgroundShuffleFrequencySpinBox.setValue(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency());
connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload<int>(&QSpinBox::valueChanged), connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload<int>(&QSpinBox::valueChanged),
&SettingsCache::instance(), &SettingsCache::setHomeTabBackgroundShuffleFrequency); &SettingsCache::instance(), &SettingsCache::setHomeTabBackgroundShuffleFrequency);

2
cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
View file

@ -29,7 +29,7 @@ public:
[[nodiscard]] QString getTabText() const override [[nodiscard]] QString getTabText() const override
{ {
auto cardName = cardToQuery.isNull() ? QString() : cardToQuery->getName(); auto cardName = cardToQuery.isNull() ? QString() : cardToQuery->getName();
return tr("EDHRec: ") + cardName; return tr("EDHRec") + ": " + cardName;
} }
CardSizeWidget *getCardSizeSlider() const CardSizeWidget *getCardSizeSlider() const