jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-20 09:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move to sorting widget

Browse source
This commit is contained in:
ZeldaZach 2024-12-25 22:46:39 -05:00
parent bcc47d5a3d
commit 4bbd588767
No known key found for this signature in database
3 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
View file

@ -171,18 +171,7 @@ void PrintingSelector::getAllSetsForCurrentCard()
} else { } else {
setsToUse = filteredSets; setsToUse = filteredSets;
} }
setsToUse = sortToolBar->prependSelectedPrintings(setsToUse, selectedCard->getName());
const auto &cardProviderId =
SettingsCache::instance().cardOverrides().getCardPreferenceOverride(selectedCard->getName());
if (!cardProviderId.isEmpty()) {
for (int i = 0; i < setsToUse.size(); ++i) {
const auto &card = setsToUse[i];
if (card.getProperty("uuid") == cardProviderId) {
setsToUse.move(i, 0);
break;
}
}
}
// Defer widget creation // Defer widget creation
currentIndex = 0; currentIndex = 0;

20
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
View file

@ -74,7 +74,7 @@ void PrintingSelectorCardSortingWidget::updateSortSetting()
* @param cardInfoPerSets The list of card sets to be sorted. * @param cardInfoPerSets The list of card sets to be sorted.
* @return A sorted list of card sets. * @return A sorted list of card sets.
*/ */
QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::sortSets(CardInfoPerSetMap cardInfoPerSets) QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::sortSets(const CardInfoPerSetMap &cardInfoPerSets)
{ {
QList<CardSetPtr> sortedSets; QList<CardSetPtr> sortedSets;
@ -148,6 +148,24 @@ QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::filterSets(const QList<
return filteredSets; return filteredSets;
} }
QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::prependSelectedPrintings(const QList<CardInfoPerSet> &sets,
const QString &cardName)
{
auto setsToUse = sets;
const auto &cardProviderId = SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
if (!cardProviderId.isEmpty()) {
for (int i = 0; i < setsToUse.size(); ++i) {
const auto &card = setsToUse[i];
if (card.getProperty("uuid") == cardProviderId) {
setsToUse.move(i, 0);
break;
}
}
}
return setsToUse;
}
/** /**
* @brief Prepend card printings that are contained in the deck to the list of card sets. * @brief Prepend card printings that are contained in the deck to the list of card sets.
* *

7
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h
View file

@ -12,9 +12,10 @@ class PrintingSelectorCardSortingWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit PrintingSelectorCardSortingWidget(PrintingSelector *parent); explicit PrintingSelectorCardSortingWidget(PrintingSelector *parent);
QList<CardInfoPerSet> sortSets(CardInfoPerSetMap cardInfoPerSets); QList<CardInfoPerSet> sortSets(const CardInfoPerSetMap &cardInfoPerSets);
static QList<CardInfoPerSet> filterSets(const QList<CardInfoPerSet> &sets, const QString &searchText); QList<CardInfoPerSet> filterSets(const QList<CardInfoPerSet> &sets, const QString &searchText);
static QList<CardInfoPerSet> prependPrintingsInDeck(const QList<CardInfoPerSet> &sets, QList<CardInfoPerSet> prependSelectedPrintings(const QList<CardInfoPerSet> &sets, const QString &cardName);
QList<CardInfoPerSet> prependPrintingsInDeck(const QList<CardInfoPerSet> &sets,
const CardInfoPtr &selectedCard, const CardInfoPtr &selectedCard,
DeckListModel *deckModel); DeckListModel *deckModel);