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

partial rename

Browse source
This commit is contained in:
DawnFire42 2026-06-08 16:36:10 -04:00
parent 9c0180c183
commit 7ca066389f
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33
6 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -310,8 +310,8 @@ SettingsCache::SettingsCache()
closeEmptyCardView = settings->value("interface/closeEmptyCardView", true).toBool(); closeEmptyCardView = settings->value("interface/closeEmptyCardView", true).toBool();
focusCardViewSearchBar = settings->value("interface/focusCardViewSearchBar", true).toBool(); focusCardViewSearchBar = settings->value("interface/focusCardViewSearchBar", true).toBool();
showDragSelectionTally = settings->value("interface/showlassoselectiontally", true).toBool(); showDragSelectionCount = settings->value("interface/showlassoselectioncount", true).toBool();
showTotalSelectionTally = settings->value("interface/showpersistentselectiontally", true).toBool(); showTotalSelectionCount = settings->value("interface/showpersistentselectioncount", true).toBool();
showSubtypeSelectionTally = settings->value("interface/showsubtypeselectiontally", true).toBool(); showSubtypeSelectionTally = settings->value("interface/showsubtypeselectiontally", true).toBool();
showShortcuts = settings->value("menu/showshortcuts", true).toBool(); showShortcuts = settings->value("menu/showshortcuts", true).toBool();
@ -1361,16 +1361,16 @@ void SettingsCache::setRoundCardCorners(bool _roundCardCorners)
emit roundCardCornersChanged(roundCardCorners); emit roundCardCornersChanged(roundCardCorners);
} }
void SettingsCache::setShowDragSelectionTally(QT_STATE_CHANGED_T _showDragSelectionTally) void SettingsCache::setShowDragSelectionCount(QT_STATE_CHANGED_T _showDragSelectionCount)
{ {
showDragSelectionTally = static_cast<bool>(_showDragSelectionTally); showDragSelectionCount = static_cast<bool>(_showDragSelectionCount);
settings->setValue("interface/showlassoselectiontally", showDragSelectionTally); settings->setValue("interface/showlassoselectioncount", showDragSelectionCount);
} }
void SettingsCache::setShowTotalSelectionTally(QT_STATE_CHANGED_T _showTotalSelectionTally) void SettingsCache::setShowTotalSelectionCount(QT_STATE_CHANGED_T _showTotalSelectionCount)
{ {
showTotalSelectionTally = static_cast<bool>(_showTotalSelectionTally); showTotalSelectionCount = static_cast<bool>(_showTotalSelectionCount);
settings->setValue("interface/showpersistentselectiontally", showTotalSelectionTally); settings->setValue("interface/showpersistentselectioncount", showTotalSelectionCount);
} }
void SettingsCache::setShowSubtypeSelectionTally(QT_STATE_CHANGED_T _showSubtypeSelectionTally) void SettingsCache::setShowSubtypeSelectionTally(QT_STATE_CHANGED_T _showSubtypeSelectionTally)

16
cockatrice/src/client/settings/cache_settings.h
View file

@ -347,8 +347,8 @@ private:
bool isPortableBuild; bool isPortableBuild;
bool roundCardCorners; bool roundCardCorners;
bool showStatusBar; bool showStatusBar;
bool showDragSelectionTally; bool showDragSelectionCount;
bool showTotalSelectionTally; bool showTotalSelectionCount;
bool showSubtypeSelectionTally; bool showSubtypeSelectionTally;
public: public:
@ -465,13 +465,13 @@ public:
{ {
return showStatusBar; return showStatusBar;
} }
[[nodiscard]] bool getShowDragSelectionTally() const [[nodiscard]] bool getShowDragSelectionCount() const
{ {
return showDragSelectionTally; return showDragSelectionCount;
} }
[[nodiscard]] bool getShowTotalSelectionTally() const [[nodiscard]] bool getShowTotalSelectionCount() const
{ {
return showTotalSelectionTally; return showTotalSelectionCount;
} }
[[nodiscard]] bool getShowSubtypeSelectionTally() const [[nodiscard]] bool getShowSubtypeSelectionTally() const
{ {
@ -1158,8 +1158,8 @@ public slots:
void setUpdateReleaseChannelIndex(int value); void setUpdateReleaseChannelIndex(int value);
void setMaxFontSize(int _max); void setMaxFontSize(int _max);
void setRoundCardCorners(bool _roundCardCorners); void setRoundCardCorners(bool _roundCardCorners);
void setShowDragSelectionTally(QT_STATE_CHANGED_T _showDragSelectionTally); void setShowDragSelectionCount(QT_STATE_CHANGED_T _showDragSelectionCount);
void setShowTotalSelectionTally(QT_STATE_CHANGED_T _showTotalSelectionTally); void setShowTotalSelectionCount(QT_STATE_CHANGED_T _showTotalSelectionCount);
void setShowSubtypeSelectionTally(QT_STATE_CHANGED_T _showSubtypeSelectionTally); void setShowSubtypeSelectionTally(QT_STATE_CHANGED_T _showSubtypeSelectionTally);
}; };
#endif #endif

10
cockatrice/src/game_graphics/game_view.cpp
View file

@ -46,7 +46,7 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
connect(scene, &GameScene::sigStartRubberBand, this, &GameView::startRubberBand); connect(scene, &GameScene::sigStartRubberBand, this, &GameView::startRubberBand);
connect(scene, &GameScene::sigResizeRubberBand, this, &GameView::resizeRubberBand); connect(scene, &GameScene::sigResizeRubberBand, this, &GameView::resizeRubberBand);
connect(scene, &GameScene::sigStopRubberBand, this, &GameView::stopRubberBand); connect(scene, &GameScene::sigStopRubberBand, this, &GameView::stopRubberBand);
connect(scene, &QGraphicsScene::selectionChanged, this, [this]() { updateSelectionTally(); }); connect(scene, &QGraphicsScene::selectionChanged, this, [this]() { updateSelectionCount(); });
aCloseMostRecentZoneView = new QAction(this); aCloseMostRecentZoneView = new QAction(this);
@ -95,7 +95,7 @@ void GameView::resizeEvent(QResizeEvent *event)
} }
updateSceneRect(scene()->sceneRect()); updateSceneRect(scene()->sceneRect());
updateSelectionTally(event->size()); updateSelectionCount(event->size());
} }
void GameView::updateSceneRect(const QRectF &rect) void GameView::updateSceneRect(const QRectF &rect)
@ -126,7 +126,7 @@ void GameView::resizeRubberBand(const QPointF &cursorPoint, int selectedCount)
QRect rect = QRect(mapFromScene(selectionOrigin), cursor).normalized(); QRect rect = QRect(mapFromScene(selectionOrigin), cursor).normalized();
rubberBand->setGeometry(rect); rubberBand->setGeometry(rect);
if (!SettingsCache::instance().getShowDragSelectionTally()) { if (!SettingsCache::instance().getShowDragSelectionCount()) {
dragCountLabel->hide(); dragCountLabel->hide();
return; return;
} }
@ -206,7 +206,7 @@ void GameView::rebuildSubtypeLabels(const QList<SubtypeEntry> &entries)
} }
} }
void GameView::updateSelectionTally(const QSize &viewSize) void GameView::updateSelectionCount(const QSize &viewSize)
{ {
constexpr int kMarginInPixels = 10; constexpr int kMarginInPixels = 10;
constexpr int kSpacingBetweenLabels = 4; constexpr int kSpacingBetweenLabels = 4;
@ -216,7 +216,7 @@ void GameView::updateSelectionTally(const QSize &viewSize)
int count = scene()->selectedItems().count(); int count = scene()->selectedItems().count();
if (!SettingsCache::instance().getShowTotalSelectionTally() || count <= 1) { if (!SettingsCache::instance().getShowTotalSelectionCount() || count <= 1) {
totalCountLabel->hide(); totalCountLabel->hide();
} else { } else {
totalCountLabel->setText(QString::number(count)); totalCountLabel->setText(QString::number(count));

2
cockatrice/src/game_graphics/game_view.h
View file

@ -37,7 +37,7 @@ private slots:
void resizeRubberBand(const QPointF &cursorPoint, int selectedCount); void resizeRubberBand(const QPointF &cursorPoint, int selectedCount);
void stopRubberBand(); void stopRubberBand();
void refreshShortcuts(); void refreshShortcuts();
void updateSelectionTally(const QSize &viewSize = QSize()); void updateSelectionCount(const QSize &viewSize = QSize());
public slots: public slots:
void updateSceneRect(const QRectF &rect); void updateSceneRect(const QRectF &rect);

20
cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
View file

@ -60,13 +60,13 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
connect(&annotateTokensCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), connect(&annotateTokensCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
&SettingsCache::setAnnotateTokens); &SettingsCache::setAnnotateTokens);
showDragSelectionTallyCheckBox.setChecked(SettingsCache::instance().getShowDragSelectionTally()); showDragSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowDragSelectionCount());
connect(&showDragSelectionTallyCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), connect(&showDragSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
&SettingsCache::setShowDragSelectionTally); &SettingsCache::setShowDragSelectionCount);
showTotalSelectionTallyCheckBox.setChecked(SettingsCache::instance().getShowTotalSelectionTally()); showTotalSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowTotalSelectionCount());
connect(&showTotalSelectionTallyCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), connect(&showTotalSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
&SettingsCache::setShowTotalSelectionTally); &SettingsCache::setShowTotalSelectionCount);
showSubtypeSelectionTallyCheckBox.setChecked(SettingsCache::instance().getShowSubtypeSelectionTally()); showSubtypeSelectionTallyCheckBox.setChecked(SettingsCache::instance().getShowSubtypeSelectionTally());
connect(&showSubtypeSelectionTallyCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), connect(&showSubtypeSelectionTallyCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
@ -84,8 +84,8 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
generalGrid->addWidget(&closeEmptyCardViewCheckBox, 4, 0); generalGrid->addWidget(&closeEmptyCardViewCheckBox, 4, 0);
generalGrid->addWidget(&focusCardViewSearchBarCheckBox, 5, 0); generalGrid->addWidget(&focusCardViewSearchBarCheckBox, 5, 0);
generalGrid->addWidget(&annotateTokensCheckBox, 6, 0); generalGrid->addWidget(&annotateTokensCheckBox, 6, 0);
generalGrid->addWidget(&showDragSelectionTallyCheckBox, 7, 0); generalGrid->addWidget(&showDragSelectionCountCheckBox, 7, 0);
generalGrid->addWidget(&showTotalSelectionTallyCheckBox, 8, 0); generalGrid->addWidget(&showTotalSelectionCountCheckBox, 8, 0);
generalGrid->addWidget(&showSubtypeSelectionTallyCheckBox, 9, 0); generalGrid->addWidget(&showSubtypeSelectionTallyCheckBox, 9, 0);
generalGrid->addWidget(&useTearOffMenusCheckBox, 10, 0); generalGrid->addWidget(&useTearOffMenusCheckBox, 10, 0);
@ -209,8 +209,8 @@ void UserInterfaceSettingsPage::retranslateUi()
closeEmptyCardViewCheckBox.setText(tr("Close card view window when last card is removed")); closeEmptyCardViewCheckBox.setText(tr("Close card view window when last card is removed"));
focusCardViewSearchBarCheckBox.setText(tr("Auto focus search bar when card view window is opened")); focusCardViewSearchBarCheckBox.setText(tr("Auto focus search bar when card view window is opened"));
annotateTokensCheckBox.setText(tr("Annotate card text on tokens")); annotateTokensCheckBox.setText(tr("Annotate card text on tokens"));
showDragSelectionTallyCheckBox.setText(tr("Show selection tally during drag selection")); showDragSelectionCountCheckBox.setText(tr("Show selection count during drag selection"));
showTotalSelectionTallyCheckBox.setText(tr("Show total selection tally")); showTotalSelectionCountCheckBox.setText(tr("Show total selection count"));
showSubtypeSelectionTallyCheckBox.setText(tr("Show subtype breakdown in selection tally")); showSubtypeSelectionTallyCheckBox.setText(tr("Show subtype breakdown in selection tally"));
useTearOffMenusCheckBox.setText(tr("Use tear-off menus, allowing right click menus to persist on screen")); useTearOffMenusCheckBox.setText(tr("Use tear-off menus, allowing right click menus to persist on screen"));
notificationsGroupBox->setTitle(tr("Notifications settings")); notificationsGroupBox->setTitle(tr("Notifications settings"));

4
cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h
View file

@ -27,8 +27,8 @@ private:
QCheckBox closeEmptyCardViewCheckBox; QCheckBox closeEmptyCardViewCheckBox;
QCheckBox focusCardViewSearchBarCheckBox; QCheckBox focusCardViewSearchBarCheckBox;
QCheckBox annotateTokensCheckBox; QCheckBox annotateTokensCheckBox;
QCheckBox showDragSelectionTallyCheckBox; QCheckBox showDragSelectionCountCheckBox;
QCheckBox showTotalSelectionTallyCheckBox; QCheckBox showTotalSelectionCountCheckBox;
QCheckBox showSubtypeSelectionTallyCheckBox; QCheckBox showSubtypeSelectionTallyCheckBox;
QCheckBox useTearOffMenusCheckBox; QCheckBox useTearOffMenusCheckBox;
QCheckBox tapAnimationCheckBox; QCheckBox tapAnimationCheckBox;