Commit 90655ff6 authored by Fabio Bas's avatar Fabio Bas
Browse files

Prefer enabled sets when loading images; fix #1235

parent 0d5e1696
...@@ -92,7 +92,7 @@ void CardSet::setIsKnown(bool _isknown) ...@@ -92,7 +92,7 @@ void CardSet::setIsKnown(bool _isknown)
settings.setValue("isknown", isknown); settings.setValue("isknown", isknown);
} }
class SetList::CompareFunctor { class SetList::KeyCompareFunctor {
public: public:
inline bool operator()(CardSet *a, CardSet *b) const inline bool operator()(CardSet *a, CardSet *b) const
{ {
...@@ -102,7 +102,39 @@ public: ...@@ -102,7 +102,39 @@ public:
void SetList::sortByKey() void SetList::sortByKey()
{ {
qSort(begin(), end(), CompareFunctor()); qSort(begin(), end(), KeyCompareFunctor());
}
class SetList::EnabledAndKeyCompareFunctor {
public:
inline bool operator()(CardSet *a, CardSet *b) const
{
if(a->getEnabled())
{
if(b->getEnabled())
{
// both enabled: sort by key
return a->getSortKey() < b->getSortKey();
} else {
// only a enabled
return true;
}
} else {
if(b->getEnabled())
{
// only b enabled
return false;
} else {
// both disabled: sort by key
return a->getSortKey() < b->getSortKey();
}
}
}
};
void SetList::sortByEnabledAndKey()
{
qSort(begin(), end(), EnabledAndKeyCompareFunctor());
} }
int SetList::getEnabledSetsNum() int SetList::getEnabledSetsNum()
...@@ -185,7 +217,7 @@ PictureToLoad::PictureToLoad(CardInfo *_card, bool _hq) ...@@ -185,7 +217,7 @@ PictureToLoad::PictureToLoad(CardInfo *_card, bool _hq)
{ {
if (card) { if (card) {
sortedSets = card->getSets(); sortedSets = card->getSets();
sortedSets.sortByKey(); sortedSets.sortByEnabledAndKey();
} }
} }
......
...@@ -54,8 +54,10 @@ public: ...@@ -54,8 +54,10 @@ public:
class SetList : public QList<CardSet *> { class SetList : public QList<CardSet *> {
private: private:
class CompareFunctor; class KeyCompareFunctor;
class EnabledAndKeyCompareFunctor;
public: public:
void sortByEnabledAndKey();
void sortByKey(); void sortByKey();
void guessSortKeys(); void guessSortKeys();
void enableAllUnknown(); void enableAllUnknown();
......
...@@ -92,7 +92,7 @@ WndSets::WndSets(QWidget *parent) ...@@ -92,7 +92,7 @@ WndSets::WndSets(QWidget *parent)
QLabel *labNotes = new QLabel; QLabel *labNotes = new QLabel;
labNotes->setText("<b>" + tr("hints:") + "</b>" + "<ul><li>" + tr("Enable the sets that you want to have available in the deck editor") + "</li><li>" + tr("Move sets around to change their order, or click on a column header to sort sets on that field") + "</li><li>" + tr("Sets order decides the source that will be used when loading images for a specific card") + "</li><li>" + tr("Disabled sets will still be used for loading images") + "</li></ul>"); labNotes->setText("<b>" + tr("hints:") + "</b>" + "<ul><li>" + tr("Enable the sets that you want to have available in the deck editor") + "</li><li>" + tr("Move sets around to change their order, or click on a column header to sort sets on that field") + "</li><li>" + tr("Sets order decides the source that will be used when loading images for a specific card") + "</li><li>" + tr("Disabled sets will be used for loading images only if all the enabled sets failed") + "</li></ul>");
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(actSave())); connect(buttonBox, SIGNAL(accepted()), this, SLOT(actSave()));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment