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

Address some comments, clean some weak warnings.

Browse source
This commit is contained in:
Lukas Brübach 2025-03-06 09:59:17 +01:00
parent 488be525ed
commit 604ca395cc
6 changed files with 23 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cockatrice/src/client/tabs/tab_supervisor.cpp
View file

@ -210,9 +210,6 @@ void TabSupervisor::retranslateUi()
QListIterator<AbstractTabDeckEditor *> deckEditorIterator(deckEditorTabs); QListIterator<AbstractTabDeckEditor *> deckEditorIterator(deckEditorTabs);
while (deckEditorIterator.hasNext()) while (deckEditorIterator.hasNext())
tabs.append(deckEditorIterator.next()); tabs.append(deckEditorIterator.next());
QListIterator<AbstractTabDeckEditor *> visualDeckEditorIterator(visualDeckEditorTabs);
while (visualDeckEditorIterator.hasNext())
tabs.append(visualDeckEditorIterator.next());
QMapIterator<QString, TabMessage *> messageIterator(messageTabs); QMapIterator<QString, TabMessage *> messageIterator(messageTabs);
while (messageIterator.hasNext()) while (messageIterator.hasNext())
tabs.append(messageIterator.next().value()); tabs.append(messageIterator.next().value());
@ -820,10 +817,10 @@ TabDeckEditorVisual *TabSupervisor::addVisualDeckEditorTab(const DeckLoader *dec
auto *tab = new TabDeckEditorVisual(this); auto *tab = new TabDeckEditorVisual(this);
if (deckToOpen) if (deckToOpen)
tab->setDeck(new DeckLoader(*deckToOpen)); tab->setDeck(new DeckLoader(*deckToOpen));
connect(tab, &AbstractTabDeckEditor::deckEditorClosing, this, &TabSupervisor::visualDeckEditorClosed); connect(tab, &AbstractTabDeckEditor::deckEditorClosing, this, &TabSupervisor::deckEditorClosed);
connect(tab, &AbstractTabDeckEditor::openDeckEditor, this, &TabSupervisor::addVisualDeckEditorTab); connect(tab, &AbstractTabDeckEditor::openDeckEditor, this, &TabSupervisor::addVisualDeckEditorTab);
myAddTab(tab); myAddTab(tab);
visualDeckEditorTabs.append(tab); deckEditorTabs.append(tab);
setCurrentWidget(tab); setCurrentWidget(tab);
return tab; return tab;
} }
@ -849,15 +846,6 @@ void TabSupervisor::deckEditorClosed(AbstractTabDeckEditor *tab)
removeTab(indexOf(tab)); removeTab(indexOf(tab));
} }
void TabSupervisor::visualDeckEditorClosed(AbstractTabDeckEditor *tab)
{
if (tab == currentWidget())
emit setMenu();
visualDeckEditorTabs.removeOne(tab);
removeTab(indexOf(tab));
}
void TabSupervisor::tabUserEvent(bool globalEvent) void TabSupervisor::tabUserEvent(bool globalEvent)
{ {
Tab *tab = static_cast<Tab *>(sender()); Tab *tab = static_cast<Tab *>(sender());

2
cockatrice/src/client/tabs/tab_supervisor.h
View file

@ -91,7 +91,6 @@ private:
QList<TabGame *> replayTabs; QList<TabGame *> replayTabs;
QMap<QString, TabMessage *> messageTabs; QMap<QString, TabMessage *> messageTabs;
QList<AbstractTabDeckEditor *> deckEditorTabs; QList<AbstractTabDeckEditor *> deckEditorTabs;
QList<AbstractTabDeckEditor *> visualDeckEditorTabs;
bool isLocalGame; bool isLocalGame;
QAction *aTabDeckEditor, *aTabVisualDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabAccount, *aTabDeckStorage, QAction *aTabDeckEditor, *aTabVisualDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabAccount, *aTabDeckStorage,
@ -188,7 +187,6 @@ private slots:
void processUserJoined(const ServerInfo_User &userInfo); void processUserJoined(const ServerInfo_User &userInfo);
void talkLeft(TabMessage *tab); void talkLeft(TabMessage *tab);
void deckEditorClosed(AbstractTabDeckEditor *tab); void deckEditorClosed(AbstractTabDeckEditor *tab);
void visualDeckEditorClosed(AbstractTabDeckEditor *tab);
void tabUserEvent(bool globalEvent); void tabUserEvent(bool globalEvent);
void updateTabText(Tab *tab, const QString &newTabText); void updateTabText(Tab *tab, const QString &newTabText);
void processRoomEvent(const RoomEvent &event); void processRoomEvent(const RoomEvent &event);

2
cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp
View file

@ -68,7 +68,7 @@ void ManaBaseWidget::updateDisplay()
manaColors.insert("C", QColor(150, 150, 150)); manaColors.insert("C", QColor(150, 150, 150));
for (auto manaColor : manaBaseMap.keys()) { for (auto manaColor : manaBaseMap.keys()) {
QColor barColor = manaColors.contains(manaColor) ? manaColors[manaColor] : Qt::gray; QColor barColor = manaColors.value(manaColor, Qt::gray);
BarWidget *barWidget = new BarWidget(QString(manaColor), manaBaseMap[manaColor], highestEntry, barColor, this); BarWidget *barWidget = new BarWidget(QString(manaColor), manaBaseMap[manaColor], highestEntry, barColor, this);
barLayout->addWidget(barWidget); barLayout->addWidget(barWidget);
} }

2
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
View file

@ -40,7 +40,7 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::saveFilter()
if (filename.isEmpty()) if (filename.isEmpty())
return; return;
QString filePath = saveDirectory + "/" + filename + ".json"; QString filePath = saveDirectory + QDir::separator() + filename + ".json";
// Serialize the filter model to JSON // Serialize the filter model to JSON
QJsonArray filtersArray; QJsonArray filtersArray;

27
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp
View file

@ -19,6 +19,7 @@
#include <QHeaderView> #include <QHeaderView>
#include <QScrollBar> #include <QScrollBar>
#include <qpropertyanimation.h> #include <qpropertyanimation.h>
#include <utility>
VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
AbstractTabDeckEditor *_deckEditor, AbstractTabDeckEditor *_deckEditor,
@ -136,15 +137,15 @@ void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWit
emit cardClickedDatabaseDisplay(event, instance); emit cardClickedDatabaseDisplay(event, instance);
} }
void VisualDatabaseDisplayWidget::onHover(CardInfoPtr hoveredCard) void VisualDatabaseDisplayWidget::onHover(const CardInfoPtr &hoveredCard)
{ {
emit cardHoveredDatabaseDisplay(hoveredCard); emit cardHoveredDatabaseDisplay(hoveredCard);
} }
void VisualDatabaseDisplayWidget::addCard(CardInfoPtr cardToAdd) void VisualDatabaseDisplayWidget::addCard(const CardInfoPtr &cardToAdd)
{ {
cards->append(cardToAdd); cards->append(cardToAdd);
CardInfoPictureWithTextOverlayWidget *display = new CardInfoPictureWithTextOverlayWidget(flowWidget, false); auto *display = new CardInfoPictureWithTextOverlayWidget(flowWidget, false);
display->setScaleFactor(cardSizeWidget->getSlider()->value()); display->setScaleFactor(cardSizeWidget->getSlider()->value());
display->setCard(cardToAdd); display->setCard(cardToAdd);
flowWidget->addWidget(display); flowWidget->addWidget(display);
@ -174,8 +175,7 @@ void VisualDatabaseDisplayWidget::populateCards()
QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn); QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn);
QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole); QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole);
qCDebug(VisualDatabaseDisplayLog) << name.toString(); qCDebug(VisualDatabaseDisplayLog) << name.toString();
CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString()); if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString())) {
if (info) {
addCard(info); addCard(info);
} else { } else {
qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!"; qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!";
@ -184,7 +184,7 @@ void VisualDatabaseDisplayWidget::populateCards()
currentPage++; currentPage++;
} }
void VisualDatabaseDisplayWidget::updateSearch(const QString &search) void VisualDatabaseDisplayWidget::updateSearch(const QString &search) const
{ {
databaseDisplayModel->setStringFilter(search); databaseDisplayModel->setStringFilter(search);
QModelIndexList sel = databaseView->selectionModel()->selectedRows(); QModelIndexList sel = databaseView->selectionModel()->selectedRows();
@ -199,8 +199,7 @@ void VisualDatabaseDisplayWidget::searchModelChanged()
flowWidget->clearLayout(); // Clear existing cards flowWidget->clearLayout(); // Clear existing cards
cards->clear(); // Clear the card list cards->clear(); // Clear the card list
// Reset scrollbar position to the top after loading new cards // Reset scrollbar position to the top after loading new cards
QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar(); if (QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar()) {
if (scrollBar) {
scrollBar->setValue(0); // Reset scrollbar to top scrollBar->setValue(0); // Reset scrollbar to top
} }
@ -225,8 +224,7 @@ void VisualDatabaseDisplayWidget::loadNextPage()
for (int row = start; row < end; ++row) { for (int row = start; row < end; ++row) {
QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn); QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn);
QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole); QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole);
CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString()); if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString())) {
if (info) {
addCard(info); addCard(info);
} else { } else {
qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!"; qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!";
@ -250,18 +248,19 @@ void VisualDatabaseDisplayWidget::loadCurrentPage()
} }
} }
void VisualDatabaseDisplayWidget::modelDirty() void VisualDatabaseDisplayWidget::modelDirty() const
{ {
debounceTimer->start(debounceTime); debounceTimer->start(debounceTime);
} }
void VisualDatabaseDisplayWidget::sortCardList(const QStringList properties, Qt::SortOrder order = Qt::AscendingOrder) void VisualDatabaseDisplayWidget::sortCardList(const QStringList &properties,
Qt::SortOrder order = Qt::AscendingOrder) const
{ {
CardInfoComparator comparator(properties, order); CardInfoComparator comparator(properties, order);
std::sort(cards->begin(), cards->end(), comparator); std::ranges::sort(*cards, comparator);
} }
void VisualDatabaseDisplayWidget::databaseDataChanged(QModelIndex topLeft, QModelIndex bottomRight) void VisualDatabaseDisplayWidget::databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
{ {
(void)topLeft; (void)topLeft;
(void)bottomRight; (void)bottomRight;

12
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h
View file

@ -43,7 +43,7 @@ public:
void populateCards(); void populateCards();
void loadNextPage(); void loadNextPage();
void loadCurrentPage(); void loadCurrentPage();
void sortCardList(QStringList properties, Qt::SortOrder order); void sortCardList(const QStringList &properties, Qt::SortOrder order) const;
void setDeckList(const DeckList &new_deck_list_model); void setDeckList(const DeckList &new_deck_list_model);
QWidget *searchContainer; QWidget *searchContainer;
@ -61,12 +61,12 @@ signals:
protected slots: protected slots:
void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
void onHover(CardInfoPtr hoveredCard); void onHover(const CardInfoPtr &hoveredCard);
void addCard(CardInfoPtr cardToAdd); void addCard(const CardInfoPtr &cardToAdd);
void databaseDataChanged(QModelIndex topLeft, QModelIndex bottomRight); void databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
void wheelEvent(QWheelEvent *event) override; void wheelEvent(QWheelEvent *event) override;
void modelDirty(); void modelDirty() const;
void updateSearch(const QString &search); void updateSearch(const QString &search) const;
private: private:
SettingsButtonWidget *quickFilterWidget; SettingsButtonWidget *quickFilterWidget;