aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename "stack until found" feature (#4871)

Browse source 
* Rename "stack until found" feature

* lint
This commit is contained in:
tooomm 2023-10-25 18:43:57 +02:00 committed by GitHub
parent 9943133d6d
commit 3e8adae3de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/resources/help/search.md
View file

@ -1,6 +1,7 @@
## Syntax Help ## Search Syntax Help
----- -----
The search bar recognizes a set of special commands similar to some other card databases. Here is a list with examples. Each entry can be clicked to test the query and has a small explanation. Note that all searches are case insensitive. The search bar recognizes a set of special commands similar to some other card databases.<br>
In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all searches are case insensitive.
<dl> <dl>
<dt>Name:</dt> <dt>Name:</dt>
<dd>[birds of paradise](#birds of paradise) <small>(Any card name containing the words birds, of, and paradise)</small></dd> <dd>[birds of paradise](#birds of paradise) <small>(Any card name containing the words birds, of, and paradise)</small></dd>

6
cockatrice/src/player.cpp
View file

@ -771,7 +771,7 @@ void Player::retranslateUi()
aMoveTopCardToExile->setText(tr("Move top card to e&xile")); aMoveTopCardToExile->setText(tr("Move top card to e&xile"));
aMoveTopCardsToGraveyard->setText(tr("Move top cards to &graveyard...")); aMoveTopCardsToGraveyard->setText(tr("Move top cards to &graveyard..."));
aMoveTopCardsToExile->setText(tr("Move top cards to &exile...")); aMoveTopCardsToExile->setText(tr("Move top cards to &exile..."));
aMoveTopCardsUntil->setText(tr("Take top cards &until...")); aMoveTopCardsUntil->setText(tr("Put top cards on stack &until..."));
aDrawBottomCard->setText(tr("&Draw bottom card")); aDrawBottomCard->setText(tr("&Draw bottom card"));
aDrawBottomCards->setText(tr("D&raw bottom cards...")); aDrawBottomCards->setText(tr("D&raw bottom cards..."));
@ -1313,8 +1313,8 @@ void Player::actMoveTopCardsUntil()
QString expr = previousMovingCardsUntilExpr; QString expr = previousMovingCardsUntilExpr;
for (;;) { for (;;) {
bool ok; bool ok;
expr = expr = QInputDialog::getText(game, "Put top cards on stack until", "Card name (or search expressions)", {},
QInputDialog::getText(game, "Take top cards until", "Select card (accepts search syntax)", {}, expr, &ok); expr, &ok);
if (!ok) { if (!ok) {
return; return;
} }

2
cockatrice/src/tab_deck_editor.cpp
View file

@ -376,7 +376,7 @@ void TabDeckEditor::createCentralFrame()
{ {
searchEdit = new SearchLineEdit; searchEdit = new SearchLineEdit;
searchEdit->setObjectName("searchEdit"); searchEdit->setObjectName("searchEdit");
searchEdit->setPlaceholderText(tr("Search by card name")); searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)"));
searchEdit->setClearButtonEnabled(true); searchEdit->setClearButtonEnabled(true);
searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition); auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition);