From a54a424f84178689b311275d6037f03d9596fe8e Mon Sep 17 00:00:00 2001
From: RickyRister <42636155+RickyRister@users.noreply.github.com>
Date: Thu, 19 Dec 2024 19:39:17 -0800
Subject: [PATCH] add action to select all cards in column (#5277)

* add action to select all cards in column

* change default shortcut to Ctrl+Shift+C
---
 cockatrice/src/game/player/player.cpp        | 47 +++++++++++++++++---
 cockatrice/src/game/player/player.h          |  3 +-
 cockatrice/src/settings/shortcuts_settings.h |  3 ++
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
index f7a76e3ca..a2fe6b089 100644
--- a/cockatrice/src/game/player/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -516,6 +516,8 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
 
     aSelectAll = new QAction(this);
     connect(aSelectAll, SIGNAL(triggered()), this, SLOT(actSelectAll()));
+    aSelectColumn = new QAction(this);
+    connect(aSelectColumn, SIGNAL(triggered()), this, SLOT(actSelectColumn()));
 
     aPlay = new QAction(this);
     connect(aPlay, SIGNAL(triggered()), this, SLOT(actPlay()));
@@ -841,6 +843,7 @@ void Player::retranslateUi()
     }
 
     aSelectAll->setText(tr("&Select All"));
+    aSelectColumn->setText(tr("S&elect Column"));
 
     aPlay->setText(tr("&Play"));
     aHide->setText(tr("&Hide"));
@@ -930,6 +933,7 @@ void Player::setShortcutsActive()
     aMoveToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveToExile"));
 
     aSelectAll->setShortcuts(shortcuts.getShortcut("Player/aSelectAll"));
+    aSelectColumn->setShortcuts(shortcuts.getShortcut("Player/aSelectColumn"));
 
     QList<QKeySequence> addCCShortCuts;
     addCCShortCuts.append(shortcuts.getSingleShortcut("Player/aCCRed"));
@@ -1565,6 +1569,27 @@ void Player::actMoveBottomCardToTop()
     sendGameCommand(cmd);
 }
 
+/**
+ * Selects all cards in the given zone.
+ *
+ * @param zone The zone to select from
+ * @param filter A predicate to filter which cards are selected. Defaults to always returning true.
+ */
+static void selectCardsInZone(
+    const CardZone *zone,
+    std::function<bool(const CardItem *)> filter = [](const CardItem *) { return true; })
+{
+    if (!zone) {
+        return;
+    }
+
+    for (auto &cardItem : zone->getCards()) {
+        if (cardItem && filter(cardItem)) {
+            cardItem->setSelected(true);
+        }
+    }
+}
+
 void Player::actSelectAll()
 {
     const CardItem *card = game->getActiveCard();
@@ -1572,13 +1597,18 @@ void Player::actSelectAll()
         return;
     }
 
-    if (const auto *zone = card->getZone()) {
-        for (auto &cardItem : zone->getCards()) {
-            if (cardItem) {
-                cardItem->setSelected(true);
-            }
-        }
+    selectCardsInZone(card->getZone());
+}
+
+void Player::actSelectColumn()
+{
+    const CardItem *card = game->getActiveCard();
+    if (!card) {
+        return;
     }
+
+    auto isSameColumn = [card](const CardItem *cardItem) { return cardItem->x() == card->x(); };
+    selectCardsInZone(card->getZone(), isSameColumn);
 }
 
 void Player::actDrawBottomCard()
@@ -3656,6 +3686,7 @@ void Player::updateCardMenu(const CardItem *card)
         cardMenu->addAction(aClone);
         cardMenu->addSeparator();
         cardMenu->addAction(aSelectAll);
+        cardMenu->addAction(aSelectColumn);
         addRelatedCardView(card, cardMenu);
     } else if (writeableCard) {
         if (moveMenu->isEmpty()) {
@@ -3747,6 +3778,7 @@ void Player::updateCardMenu(const CardItem *card)
                 cardMenu->addMenu(moveMenu);
                 cardMenu->addSeparator();
                 cardMenu->addAction(aSelectAll);
+                cardMenu->addAction(aSelectColumn);
 
                 cardMenu->addSeparator();
                 cardMenu->addAction(aAttach);
@@ -3776,6 +3808,9 @@ void Player::updateCardMenu(const CardItem *card)
 
                 cardMenu->addSeparator();
                 cardMenu->addAction(aSelectAll);
+                if (card->getZone()->getIsView()) {
+                    cardMenu->addAction(aSelectColumn);
+                }
 
                 addRelatedCardView(card, cardMenu);
             }
diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h
index 62b825472..e66bd860d 100644
--- a/cockatrice/src/game/player/player.h
+++ b/cockatrice/src/game/player/player.h
@@ -186,6 +186,7 @@ public slots:
     void actMoveBottomCardToTop();
 
     void actSelectAll();
+    void actSelectColumn();
 
     void actViewLibrary();
     void actViewHand();
@@ -266,7 +267,7 @@ private:
     QAction *aPlay, *aPlayFacedown, *aHide, *aTap, *aDoesntUntap, *aAttach, *aUnattach, *aDrawArrow, *aSetPT, *aResetPT,
         *aIncP, *aDecP, *aIncT, *aDecT, *aIncPT, *aDecPT, *aFlowP, *aFlowT, *aSetAnnotation, *aFlip, *aPeek, *aClone,
         *aMoveToTopLibrary, *aMoveToBottomLibrary, *aMoveToHand, *aMoveToGraveyard, *aMoveToExile,
-        *aMoveToXfromTopOfLibrary, *aSelectAll;
+        *aMoveToXfromTopOfLibrary, *aSelectAll, *aSelectColumn;
 
     bool movingCardsUntil;
     QTimer *moveTopCardTimer;
diff --git a/cockatrice/src/settings/shortcuts_settings.h b/cockatrice/src/settings/shortcuts_settings.h
index 16311d6ce..49940ea1b 100644
--- a/cockatrice/src/settings/shortcuts_settings.h
+++ b/cockatrice/src/settings/shortcuts_settings.h
@@ -456,6 +456,9 @@ private:
         {"Player/aSelectAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Select All Cards in Zone"),
                                           parseSequenceString("Ctrl+A"),
                                           ShortcutGroup::Playing_Area)},
+        {"Player/aSelectColumn", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Select All Cards in Column"),
+                                             parseSequenceString("Ctrl+Shift+C"),
+                                             ShortcutGroup::Playing_Area)},
         {"Player/aMoveToBottomLibrary", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Bottom of Library"),
                                                     parseSequenceString("Ctrl+B"),
                                                     ShortcutGroup::Move_selected)},