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

implement thing

Browse source
This commit is contained in:
RickyRister 2024-11-29 00:12:04 -08:00
parent 2c3a15208a
commit a20820a9cd
8 changed files with 78 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

29
cockatrice/src/game/zones/view_zone.cpp
View file

@ -31,7 +31,7 @@ ZoneViewZone::ZoneViewZone(Player *_p,
QGraphicsItem *parent) QGraphicsItem *parent)
: SelectZone(_p, _origZone->getName(), false, false, true, parent, true), bRect(QRectF()), minRows(0), : SelectZone(_p, _origZone->getName(), false, false, true, parent, true), bRect(QRectF()), minRows(0),
numberCards(_numberCards), origZone(_origZone), revealZone(_revealZone), numberCards(_numberCards), origZone(_origZone), revealZone(_revealZone),
writeableRevealZone(_writeableRevealZone), sortByName(false), sortByType(false) writeableRevealZone(_writeableRevealZone), groupBy(CardList::NoSort), sortBy(CardList::NoSort)
{ {
if (!(revealZone && !writeableRevealZone)) { if (!(revealZone && !writeableRevealZone)) {
origZone->getViews().append(this); origZone->getViews().append(this);
@ -116,20 +116,25 @@ void ZoneViewZone::reorganizeCards()
// sort cards // sort cards
QList<CardList::SortOption> sortOptions; QList<CardList::SortOption> sortOptions;
if (sortByType) { if (groupBy != CardList::NoSort) {
sortOptions << CardList::SortByType; sortOptions << groupBy;
} }
if (sortByName) { if (sortBy != CardList::NoSort) {
sortOptions << CardList::SortByName; sortOptions << sortBy;
// implicitly sort by name at the end so that cards with the same name appear together
if (sortBy != CardList::SortByName) {
sortOptions << CardList::SortByName;
}
} }
cardsToDisplay.sortBy(sortOptions); cardsToDisplay.sortBy(sortOptions);
// position cards // position cards
GridSize gridSize; GridSize gridSize;
if (pileView && sortByType) { if (pileView) {
gridSize = positionCardsForDisplay(cardsToDisplay, CardList::SortByType); gridSize = positionCardsForDisplay(cardsToDisplay, groupBy);
} else { } else {
gridSize = positionCardsForDisplay(cardsToDisplay); gridSize = positionCardsForDisplay(cardsToDisplay);
} }
@ -217,17 +222,15 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca
} }
} }
void ZoneViewZone::setSortByName(int _sortByName) void ZoneViewZone::setGroupBy(CardList::SortOption _groupBy)
{ {
sortByName = _sortByName; groupBy = _groupBy;
reorganizeCards(); reorganizeCards();
} }
void ZoneViewZone::setSortByType(int _sortByType) void ZoneViewZone::setSortBy(CardList::SortOption _sortBy)
{ {
sortByType = _sortByType; sortBy = _sortBy;
if (!sortByType)
pileView = false;
reorganizeCards(); reorganizeCards();
} }

6
cockatrice/src/game/zones/view_zone.h
View file

@ -32,7 +32,7 @@ private:
void handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &dropPoint); void handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &dropPoint);
CardZone *origZone; CardZone *origZone;
bool revealZone, writeableRevealZone; bool revealZone, writeableRevealZone;
bool sortByName, sortByType; CardList::SortOption groupBy, sortBy;
bool pileView; bool pileView;
struct GridSize struct GridSize
@ -75,8 +75,8 @@ public:
} }
void setWriteableRevealZone(bool _writeableRevealZone); void setWriteableRevealZone(bool _writeableRevealZone);
public slots: public slots:
void setSortByName(int _sortByName); void setGroupBy(CardList::SortOption _groupBy);
void setSortByType(int _sortByType); void setSortBy(CardList::SortOption _sortBy);
void setPileView(int _pileView); void setPileView(int _pileView);
private slots: private slots:
void zoneDumpReceived(const Response &r); void zoneDumpReceived(const Response &r);

56
cockatrice/src/game/zones/view_zone_widget.cpp
View file

@ -46,16 +46,30 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
QGraphicsLinearLayout *hPilebox = new QGraphicsLinearLayout(Qt::Horizontal); QGraphicsLinearLayout *hPilebox = new QGraphicsLinearLayout(Qt::Horizontal);
QGraphicsLinearLayout *hFilterbox = new QGraphicsLinearLayout(Qt::Horizontal); QGraphicsLinearLayout *hFilterbox = new QGraphicsLinearLayout(Qt::Horizontal);
QGraphicsProxyWidget *sortByNameProxy = new QGraphicsProxyWidget; // groupBy options
sortByNameProxy->setWidget(&sortByNameCheckBox); groupBySelector.addItem(tr("Group by ---"), CardList::NoSort);
hFilterbox->addItem(sortByNameProxy); groupBySelector.addItem(tr("Group by Type"), CardList::SortByType);
groupBySelector.addItem(tr("Group by Mana Value"), CardList::SortByManaValue);
QGraphicsProxyWidget *sortByTypeProxy = new QGraphicsProxyWidget; QGraphicsProxyWidget *groupBySelectorProxy = new QGraphicsProxyWidget;
sortByTypeProxy->setWidget(&sortByTypeCheckBox); groupBySelectorProxy->setWidget(&groupBySelector);
hFilterbox->addItem(sortByTypeProxy); groupBySelectorProxy->setZValue(2000000008);
hFilterbox->addItem(groupBySelectorProxy);
// sortBy options
sortBySelector.addItem(tr("Sort by ---"), CardList::NoSort);
sortBySelector.addItem(tr("Sort by Name"), CardList::SortByName);
sortBySelector.addItem(tr("Sort by Type"), CardList::SortByType);
sortBySelector.addItem(tr("Sort by Mana Value"), CardList::SortByManaValue);
QGraphicsProxyWidget *sortBySelectorProxy = new QGraphicsProxyWidget;
sortBySelectorProxy->setWidget(&sortBySelector);
sortBySelectorProxy->setZValue(2000000007);
hFilterbox->addItem(sortBySelectorProxy);
vbox->addItem(hFilterbox); vbox->addItem(hFilterbox);
// line
QGraphicsProxyWidget *lineProxy = new QGraphicsProxyWidget; QGraphicsProxyWidget *lineProxy = new QGraphicsProxyWidget;
QFrame *line = new QFrame; QFrame *line = new QFrame;
line->setFrameShape(QFrame::HLine); line->setFrameShape(QFrame::HLine);
@ -63,10 +77,12 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
lineProxy->setWidget(line); lineProxy->setWidget(line);
vbox->addItem(lineProxy); vbox->addItem(lineProxy);
// pile view options
QGraphicsProxyWidget *pileViewProxy = new QGraphicsProxyWidget; QGraphicsProxyWidget *pileViewProxy = new QGraphicsProxyWidget;
pileViewProxy->setWidget(&pileViewCheckBox); pileViewProxy->setWidget(&pileViewCheckBox);
hPilebox->addItem(pileViewProxy); hPilebox->addItem(pileViewProxy);
// shuffle options
if (_origZone->getIsShufflable() && numberCards == -1) { if (_origZone->getIsShufflable() && numberCards == -1) {
shuffleCheckBox.setChecked(true); shuffleCheckBox.setChecked(true);
QGraphicsProxyWidget *shuffleProxy = new QGraphicsProxyWidget; QGraphicsProxyWidget *shuffleProxy = new QGraphicsProxyWidget;
@ -104,14 +120,12 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
// only wire up sort options after creating ZoneViewZone, since it segfaults otherwise. // only wire up sort options after creating ZoneViewZone, since it segfaults otherwise.
if (numberCards < 0) { if (numberCards < 0) {
connect(&sortByNameCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &ZoneViewWidget::processSortByName); connect(&groupBySelector, &QComboBox::currentIndexChanged, this, &ZoneViewWidget::processGroupBy);
connect(&sortByTypeCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &ZoneViewWidget::processSortByType); connect(&sortBySelector, &QComboBox::currentIndexChanged, this, &ZoneViewWidget::processSortBy);
connect(&pileViewCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &ZoneViewWidget::processSetPileView); connect(&pileViewCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &ZoneViewWidget::processSetPileView);
sortByNameCheckBox.setChecked(SettingsCache::instance().getZoneViewSortByName()); groupBySelector.setCurrentIndex(groupBySelector.findData(SettingsCache::instance().getZoneViewGroupBy()));
sortByTypeCheckBox.setChecked(SettingsCache::instance().getZoneViewSortByType()); sortBySelector.setCurrentIndex(sortBySelector.findData(SettingsCache::instance().getZoneViewSortBy()));
pileViewCheckBox.setChecked(SettingsCache::instance().getZoneViewPileView()); pileViewCheckBox.setChecked(SettingsCache::instance().getZoneViewPileView());
if (!SettingsCache::instance().getZoneViewSortByType())
pileViewCheckBox.setEnabled(false);
} }
retranslateUi(); retranslateUi();
@ -122,18 +136,18 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
zone->initializeCards(cardList); zone->initializeCards(cardList);
} }
void ZoneViewWidget::processSortByType(QT_STATE_CHANGED_T value) void ZoneViewWidget::processGroupBy(int index)
{ {
pileViewCheckBox.setEnabled(value); auto option = static_cast<CardList::SortOption>(groupBySelector.itemData(index).toInt());
SettingsCache::instance().setZoneViewSortByType(value); SettingsCache::instance().setZoneViewGroupBy(option);
zone->setPileView(pileViewCheckBox.isChecked()); zone->setGroupBy(option);
zone->setSortByType(value);
} }
void ZoneViewWidget::processSortByName(QT_STATE_CHANGED_T value) void ZoneViewWidget::processSortBy(int index)
{ {
SettingsCache::instance().setZoneViewSortByName(value); auto option = static_cast<CardList::SortOption>(sortBySelector.itemData(index).toInt());
zone->setSortByName(value); SettingsCache::instance().setZoneViewSortBy(option);
zone->setSortBy(option);
} }
void ZoneViewWidget::processSetPileView(QT_STATE_CHANGED_T value) void ZoneViewWidget::processSetPileView(QT_STATE_CHANGED_T value)
@ -145,8 +159,6 @@ void ZoneViewWidget::processSetPileView(QT_STATE_CHANGED_T value)
void ZoneViewWidget::retranslateUi() void ZoneViewWidget::retranslateUi()
{ {
setWindowTitle(zone->getTranslatedName(false, CaseNominative)); setWindowTitle(zone->getTranslatedName(false, CaseNominative));
sortByNameCheckBox.setText(tr("sort by name"));
sortByTypeCheckBox.setText(tr("sort by type"));
shuffleCheckBox.setText(tr("shuffle when closing")); shuffleCheckBox.setText(tr("shuffle when closing"));
pileViewCheckBox.setText(tr("pile view")); pileViewCheckBox.setText(tr("pile view"));
} }

10
cockatrice/src/game/zones/view_zone_widget.h
View file

@ -4,6 +4,7 @@
#include "../../utility/macros.h" #include "../../utility/macros.h"
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox>
#include <QGraphicsProxyWidget> #include <QGraphicsProxyWidget>
#include <QGraphicsWidget> #include <QGraphicsWidget>
@ -14,7 +15,6 @@ class ZoneViewZone;
class Player; class Player;
class CardDatabase; class CardDatabase;
class QScrollBar; class QScrollBar;
class QCheckBox;
class GameScene; class GameScene;
class ServerInfo_Card; class ServerInfo_Card;
class QGraphicsSceneMouseEvent; class QGraphicsSceneMouseEvent;
@ -47,8 +47,8 @@ private:
QPushButton *closeButton; QPushButton *closeButton;
QScrollBar *scrollBar; QScrollBar *scrollBar;
ScrollableGraphicsProxyWidget *scrollBarProxy; ScrollableGraphicsProxyWidget *scrollBarProxy;
QCheckBox sortByNameCheckBox; QComboBox groupBySelector;
QCheckBox sortByTypeCheckBox; QComboBox sortBySelector;
QCheckBox shuffleCheckBox; QCheckBox shuffleCheckBox;
QCheckBox pileViewCheckBox; QCheckBox pileViewCheckBox;
@ -58,8 +58,8 @@ private:
signals: signals:
void closePressed(ZoneViewWidget *zv); void closePressed(ZoneViewWidget *zv);
private slots: private slots:
void processSortByType(QT_STATE_CHANGED_T value); void processGroupBy(int value);
void processSortByName(QT_STATE_CHANGED_T value); void processSortBy(int value);
void processSetPileView(QT_STATE_CHANGED_T value); void processSetPileView(QT_STATE_CHANGED_T value);
void resizeToZoneContents(); void resizeToZoneContents();
void handleScrollBarChange(int value); void handleScrollBarChange(int value);

16
cockatrice/src/settings/cache_settings.cpp
View file

@ -252,8 +252,8 @@ SettingsCache::SettingsCache()
chatMentionColor = settings->value("chat/mentioncolor", "A6120D").toString(); chatMentionColor = settings->value("chat/mentioncolor", "A6120D").toString();
chatHighlightColor = settings->value("chat/highlightcolor", "A6120D").toString(); chatHighlightColor = settings->value("chat/highlightcolor", "A6120D").toString();
zoneViewSortByName = settings->value("zoneview/sortbyname", true).toBool(); zoneViewGroupBy = settings->value("zoneview/groupby", 2).toInt();
zoneViewSortByType = settings->value("zoneview/sortbytype", true).toBool(); zoneViewSortBy = settings->value("zoneview/sortby", 1).toInt();
zoneViewPileView = settings->value("zoneview/pileview", true).toBool(); zoneViewPileView = settings->value("zoneview/pileview", true).toBool();
soundEnabled = settings->value("sound/enabled", false).toBool(); soundEnabled = settings->value("sound/enabled", false).toBool();
@ -582,16 +582,16 @@ void SettingsCache::setChatHighlightColor(const QString &_chatHighlightColor)
settings->setValue("chat/highlightcolor", chatHighlightColor); settings->setValue("chat/highlightcolor", chatHighlightColor);
} }
void SettingsCache::setZoneViewSortByName(QT_STATE_CHANGED_T _zoneViewSortByName) void SettingsCache::setZoneViewGroupBy(int _zoneViewGroupBy)
{ {
zoneViewSortByName = static_cast<bool>(_zoneViewSortByName); zoneViewGroupBy = _zoneViewGroupBy;
settings->setValue("zoneview/sortbyname", zoneViewSortByName); settings->setValue("zoneview/groupby", zoneViewGroupBy);
} }
void SettingsCache::setZoneViewSortByType(QT_STATE_CHANGED_T _zoneViewSortByType) void SettingsCache::setZoneViewSortBy(int _zoneViewSortBy)
{ {
zoneViewSortByType = static_cast<bool>(_zoneViewSortByType); zoneViewSortBy = _zoneViewSortBy;
settings->setValue("zoneview/sortbytype", zoneViewSortByType); settings->setValue("zoneview/sortby", zoneViewSortBy);
} }
void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T _zoneViewPileView) void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T _zoneViewPileView)

15
cockatrice/src/settings/cache_settings.h
View file

@ -109,7 +109,8 @@ private:
QString chatHighlightColor; QString chatHighlightColor;
bool chatMentionForeground; bool chatMentionForeground;
bool chatHighlightForeground; bool chatHighlightForeground;
bool zoneViewSortByName, zoneViewSortByType, zoneViewPileView; int zoneViewSortBy, zoneViewGroupBy;
bool zoneViewPileView;
bool soundEnabled; bool soundEnabled;
QString soundThemeName; QString soundThemeName;
bool ignoreUnregisteredUsers; bool ignoreUnregisteredUsers;
@ -327,13 +328,13 @@ public:
{ {
return chatHighlightForeground; return chatHighlightForeground;
} }
bool getZoneViewSortByName() const int getZoneViewGroupBy() const
{ {
return zoneViewSortByName; return zoneViewGroupBy;
} }
bool getZoneViewSortByType() const int getZoneViewSortBy() const
{ {
return zoneViewSortByType; return zoneViewSortBy;
} }
/** /**
Returns if the view should be sorted into pile view. Returns if the view should be sorted into pile view.
@ -563,8 +564,8 @@ public slots:
void setChatMentionCompleter(QT_STATE_CHANGED_T _chatMentionCompleter); void setChatMentionCompleter(QT_STATE_CHANGED_T _chatMentionCompleter);
void setChatMentionForeground(QT_STATE_CHANGED_T _chatMentionForeground); void setChatMentionForeground(QT_STATE_CHANGED_T _chatMentionForeground);
void setChatHighlightForeground(QT_STATE_CHANGED_T _chatHighlightForeground); void setChatHighlightForeground(QT_STATE_CHANGED_T _chatHighlightForeground);
void setZoneViewSortByName(QT_STATE_CHANGED_T _zoneViewSortByName); void setZoneViewGroupBy(const int _zoneViewGroupBy);
void setZoneViewSortByType(QT_STATE_CHANGED_T _zoneViewSortByType); void setZoneViewSortBy(const int _zoneViewSortBy);
void setZoneViewPileView(QT_STATE_CHANGED_T _zoneViewPileView); void setZoneViewPileView(QT_STATE_CHANGED_T _zoneViewPileView);
void setSoundEnabled(QT_STATE_CHANGED_T _soundEnabled); void setSoundEnabled(QT_STATE_CHANGED_T _soundEnabled);
void setSoundThemeName(const QString &_soundThemeName); void setSoundThemeName(const QString &_soundThemeName);

4
dbconverter/src/mocks.cpp
View file

@ -184,10 +184,10 @@ void SettingsCache::setChatMentionColor(const QString & /* _chatMentionColor */)
void SettingsCache::setChatHighlightColor(const QString & /* _chatHighlightColor */) void SettingsCache::setChatHighlightColor(const QString & /* _chatHighlightColor */)
{ {
} }
void SettingsCache::setZoneViewSortByName(QT_STATE_CHANGED_T /* _zoneViewSortByName */) void SettingsCache::setZoneViewGroupBy(int /* _zoneViewSortByName */)
{ {
} }
void SettingsCache::setZoneViewSortByType(QT_STATE_CHANGED_T /* _zoneViewSortByType */) void SettingsCache::setZoneViewSortBy(int /* _zoneViewSortByType */)
{ {
} }
void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T /* _zoneViewPileView */) void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T /* _zoneViewPileView */)

4
tests/carddatabase/mocks.cpp
View file

@ -188,10 +188,10 @@ void SettingsCache::setChatMentionColor(const QString & /* _chatMentionColor */)
void SettingsCache::setChatHighlightColor(const QString & /* _chatHighlightColor */) void SettingsCache::setChatHighlightColor(const QString & /* _chatHighlightColor */)
{ {
} }
void SettingsCache::setZoneViewSortByName(QT_STATE_CHANGED_T /* _zoneViewSortByName */) void SettingsCache::setZoneViewGroupBy(int /* _zoneViewGroupBy */)
{ {
} }
void SettingsCache::setZoneViewSortByType(QT_STATE_CHANGED_T /* _zoneViewSortByType */) void SettingsCache::setZoneViewSortBy(int /* _zoneViewSortBy */)
{ {
} }
void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T /* _zoneViewPileView */) void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T /* _zoneViewPileView */)