jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-27 08:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[Card] Rename CardSearchLanguage to SearchLanguageMode

Browse source
This commit is contained in:
Lukas Brübach 2026-09-20 23:53:43 +02:00
parent 04f77bd9f7
commit ad8ebde2a1
21 changed files with 72 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
View file

@ -68,7 +68,7 @@ void CardSearchModel::updateSearchResults(const QString &query)
// The completer suggestions match against the same languages the card
// search uses, so typing a localized name finds the card.
QString matchName = card->getName();
if (searchLanguageMode != CardSearchLanguage::English && !searchLanguage.isEmpty() && searchLanguage != "en") {
if (searchLanguageMode != SearchLanguageMode::English && !searchLanguage.isEmpty() && searchLanguage != "en") {
matchName = card->getLocalizedName(searchLanguage);
}
const QString lowerName = matchName.toLower();
@ -88,7 +88,7 @@ void CardSearchModel::updateSearchResults(const QString &query)
auto sortByDistanceThenLength = [this](const SearchResult &a, const SearchResult &b) {
QString nameA = a.card->getName();
QString nameB = b.card->getName();
if (searchLanguageMode != CardSearchLanguage::English && !searchLanguage.isEmpty() && searchLanguage != "en") {
if (searchLanguageMode != SearchLanguageMode::English && !searchLanguage.isEmpty() && searchLanguage != "en") {
nameA = a.card->getLocalizedName(searchLanguage);
nameB = b.card->getLocalizedName(searchLanguage);
}

4
libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
View file

@ -27,7 +27,7 @@ public:
void updateSearchResults(const QString &query); // Update results based on input
void setSearchLanguage(const QString &searchLang, CardSearchLanguage mode)
void setSearchLanguage(const QString &searchLang, SearchLanguageMode mode)
{
if (searchLanguage == searchLang && searchLanguageMode == mode) {
return;
@ -46,7 +46,7 @@ private:
CardDatabaseDisplayModel *sourceModel;
QList<SearchResult> searchResults;
QString searchLanguage;
CardSearchLanguage searchLanguageMode = CardSearchLanguage::English;
SearchLanguageMode searchLanguageMode = SearchLanguageMode::English;
};
#endif // CARD_SEARCH_MODEL_H

4
libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
View file

@ -191,7 +191,7 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfoPtr info) const
{
if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive) &&
searchLanguageMode != CardSearchLanguage::English && !searchLanguage.isEmpty() && searchLanguage != "en" &&
searchLanguageMode != SearchLanguageMode::English && !searchLanguage.isEmpty() && searchLanguage != "en" &&
!info->getLocalizedName(searchLanguage).contains(cardName, Qt::CaseInsensitive)) {
return false;
}
@ -245,7 +245,7 @@ void CardDatabaseDisplayModel::setStringFilter(const QString &_src)
dirty();
}
void CardDatabaseDisplayModel::setSearchLanguage(const QString &searchLang, CardSearchLanguage mode)
void CardDatabaseDisplayModel::setSearchLanguage(const QString &searchLang, SearchLanguageMode mode)
{
if (searchLanguage == searchLang && searchLanguageMode == mode) {
return;

4
libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
View file

@ -34,7 +34,7 @@ private:
int loadedRowCount;
QTimer dirtyTimer;
QString searchLanguage;
CardSearchLanguage searchLanguageMode = CardSearchLanguage::English;
SearchLanguageMode searchLanguageMode = SearchLanguageMode::English;
QString searchText;
/** The translation table that will be used for sanitizeCardName. */
@ -65,7 +65,7 @@ public:
cardNameSet = _cardNameSet;
dirty();
}
void setSearchLanguage(const QString &searchLang, CardSearchLanguage mode);
void setSearchLanguage(const QString &searchLang, SearchLanguageMode mode);
void dirty()
{