From 3e8adae3def1fee3b751df101edf38e83187e45b Mon Sep 17 00:00:00 2001 From: tooomm Date: Wed, 25 Oct 2023 18:43:57 +0200 Subject: [PATCH] Rename "stack until found" feature (#4871) * Rename "stack until found" feature * lint --- cockatrice/resources/help/search.md | 5 +++-- cockatrice/src/player.cpp | 6 +++--- cockatrice/src/tab_deck_editor.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cockatrice/resources/help/search.md b/cockatrice/resources/help/search.md index 6113d5cb..917f9482 100644 --- a/cockatrice/resources/help/search.md +++ b/cockatrice/resources/help/search.md @@ -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.
+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.
Name:
[birds of paradise](#birds of paradise) (Any card name containing the words birds, of, and paradise)
diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 644acebd..23bd8726 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -771,7 +771,7 @@ void Player::retranslateUi() aMoveTopCardToExile->setText(tr("Move top card to e&xile")); aMoveTopCardsToGraveyard->setText(tr("Move top cards to &graveyard...")); 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")); aDrawBottomCards->setText(tr("D&raw bottom cards...")); @@ -1313,8 +1313,8 @@ void Player::actMoveTopCardsUntil() QString expr = previousMovingCardsUntilExpr; for (;;) { bool ok; - expr = - QInputDialog::getText(game, "Take top cards until", "Select card (accepts search syntax)", {}, expr, &ok); + expr = QInputDialog::getText(game, "Put top cards on stack until", "Card name (or search expressions)", {}, + expr, &ok); if (!ok) { return; } diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp index 1755b094..5f7c66d8 100644 --- a/cockatrice/src/tab_deck_editor.cpp +++ b/cockatrice/src/tab_deck_editor.cpp @@ -376,7 +376,7 @@ void TabDeckEditor::createCentralFrame() { searchEdit = new SearchLineEdit; searchEdit->setObjectName("searchEdit"); - searchEdit->setPlaceholderText(tr("Search by card name")); + searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)")); searchEdit->setClearButtonEnabled(true); searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition);