Merge branch 'master' into ci/use-ninja-win-clean

.github/workflows/docker-release.yml

@@ -48,7 +48,7 @@ jobs:
 
       - name: Login to GitHub Container Registry
         if: github.ref_type == 'tag'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

cockatrice/src/client/settings/shortcuts_settings.h

@@ -513,6 +513,9 @@ private:
         {"Player/aPlay", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Play Card"),
                                      parseSequenceString(""),
                                      ShortcutGroup::Playing_Area)},
+        {"Player/aPlayFacedown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Play Card, Face Down"),
+                                             parseSequenceString(""),
+                                             ShortcutGroup::Playing_Area)},
         {"Player/aAttach", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Attach Card..."),
                                        parseSequenceString("Ctrl+Alt+A"),
                                        ShortcutGroup::Playing_Area)},
@@ -560,12 +563,6 @@ private:
         {"Player/aMoveToTopLibrary", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of Library"),
                                                  parseSequenceString(""),
                                                  ShortcutGroup::Move_selected)},
-        {"Player/aPlayFacedown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield, Face Down"),
-                                             parseSequenceString(""),
-                                             ShortcutGroup::Move_selected)},
-        {"Player/aPlay", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield"),
-                                     parseSequenceString(""),
-                                     ShortcutGroup::Move_selected)},
         {"Player/aViewHand",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::View)},
         {"Player/aViewGraveyard",

cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp

@@ -12,8 +12,7 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
 
-DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, uint _numberOfHits, bool autoPlay)
+DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUntilOptions &options) : QDialog(parent)
-    : QDialog(parent)
 {
     exprLabel = new QLabel(tr("Card name (or search expressions):"));
 
@@ -21,13 +20,13 @@ DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, u
     exprComboBox->setFocus();
     exprComboBox->setEditable(true);
     exprComboBox->setInsertPolicy(QComboBox::InsertAtTop);
-    exprComboBox->insertItems(0, exprs);
+    exprComboBox->insertItems(0, options.exprs);
     exprLabel->setBuddy(exprComboBox);
 
     numberOfHitsLabel = new QLabel(tr("Number of hits:"));
     numberOfHitsEdit = new QSpinBox(this);
     numberOfHitsEdit->setRange(1, 99);
-    numberOfHitsEdit->setValue(_numberOfHits);
+    numberOfHitsEdit->setValue(options.numberOfHits);
     numberOfHitsLabel->setBuddy(numberOfHitsEdit);
 
     auto *grid = new QGridLayout;
@@ -35,7 +34,7 @@ DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, u
     grid->addWidget(numberOfHitsEdit, 0, 1);
 
     autoPlayCheckBox = new QCheckBox(tr("Auto play hits"));
-    autoPlayCheckBox->setChecked(autoPlay);
+    autoPlayCheckBox->setChecked(options.autoPlay);
 
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgMoveTopCardsUntil::validateAndAccept);
@@ -118,6 +117,13 @@ QString DlgMoveTopCardsUntil::getExpr() const
     return exprComboBox->currentText();
 }
 
+MoveTopCardsUntilOptions DlgMoveTopCardsUntil::getOptions() const
+{
+    return {.exprs = getExprs(),
+            .numberOfHits = numberOfHitsEdit->text().toInt(),
+            .autoPlay = autoPlayCheckBox->isChecked()};
+}
+
 QStringList DlgMoveTopCardsUntil::getExprs() const
 {
     QStringList exprs;
@@ -126,13 +132,3 @@ QStringList DlgMoveTopCardsUntil::getExprs() const
     }
     return exprs;
 }
-
-uint DlgMoveTopCardsUntil::getNumberOfHits() const
-{
-    return numberOfHitsEdit->text().toUInt();
-}
-
-bool DlgMoveTopCardsUntil::isAutoPlay() const
-{
-    return autoPlayCheckBox->isChecked();
-}

cockatrice/src/game/dialogs/dlg_move_top_cards_until.h

@@ -16,6 +16,13 @@
 
 class FilterString;
 
+struct MoveTopCardsUntilOptions
+{
+    QStringList exprs = {};
+    int numberOfHits = 1;
+    bool autoPlay = false;
+};
+
 class DlgMoveTopCardsUntil : public QDialog
 {
     Q_OBJECT
@@ -29,15 +36,12 @@ class DlgMoveTopCardsUntil : public QDialog
     void validateAndAccept();
     bool validateMatchExists(const FilterString &filterString);
 
-public:
-    explicit DlgMoveTopCardsUntil(QWidget *parent = nullptr,
-                                  QStringList exprs = QStringList(),
-                                  uint numberOfHits = 1,
-                                  bool autoPlay = false);
-    [[nodiscard]] QString getExpr() const;
     [[nodiscard]] QStringList getExprs() const;
-    [[nodiscard]] uint getNumberOfHits() const;
+
-    [[nodiscard]] bool isAutoPlay() const;
+public:
+    explicit DlgMoveTopCardsUntil(QWidget *parent = nullptr, const MoveTopCardsUntilOptions &options = {});
+    [[nodiscard]] QString getExpr() const;
+    [[nodiscard]] MoveTopCardsUntilOptions getOptions() const;
 };
 
 #endif // DLG_MOVE_TOP_CARDS_UNTIL_H

cockatrice/src/game/player/player_actions.cpp

@@ -485,22 +485,19 @@ void PlayerActions::actMoveTopCardsUntil()
 {
     stopMoveTopCardsUntil();
 
-    DlgMoveTopCardsUntil dlg(player->getGame()->getTab(), movingCardsUntilExprs, movingCardsUntilNumberOfHits,
+    DlgMoveTopCardsUntil dlg(player->getGame()->getTab(), movingCardsUntilOptions);
-                             movingCardsUntilAutoPlay);
     if (!dlg.exec()) {
         return;
     }
 
     auto expr = dlg.getExpr();
-    movingCardsUntilExprs = dlg.getExprs();
+    movingCardsUntilOptions = dlg.getOptions();
-    movingCardsUntilNumberOfHits = dlg.getNumberOfHits();
-    movingCardsUntilAutoPlay = dlg.isAutoPlay();
 
     if (player->getDeckZone()->getCards().empty()) {
         stopMoveTopCardsUntil();
     } else {
         movingCardsUntilFilter = FilterString(expr);
-        movingCardsUntilCounter = movingCardsUntilNumberOfHits;
+        movingCardsUntilCounter = movingCardsUntilOptions.numberOfHits;
         movingCardsUntil = true;
         actMoveTopCardToPlay();
     }
@@ -512,7 +509,7 @@ void PlayerActions::moveOneCardUntil(CardItem *card)
 
     const bool isMatch = card && movingCardsUntilFilter.check(card->getCard().getCardPtr());
 
-    if (isMatch && movingCardsUntilAutoPlay) {
+    if (isMatch && movingCardsUntilOptions.autoPlay) {
         // Directly calling playCard will deadlock, since we are already in the middle of processing an event.
         // Use QTimer::singleShot to queue up the playCard on the event loop.
         QTimer::singleShot(0, this, [card, this] { playCard(card, false); });

cockatrice/src/game/player/player_actions.h

@@ -8,6 +8,7 @@
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
 #include "../dialogs/dlg_create_token.h"
+#include "../dialogs/dlg_move_top_cards_until.h"
 #include "event_processing_options.h"
 #include "player.h"
 
@@ -178,11 +179,9 @@ private:
 
     bool movingCardsUntil;
     QTimer *moveTopCardTimer;
-    QStringList movingCardsUntilExprs = {};
-    int movingCardsUntilNumberOfHits = 1;
-    bool movingCardsUntilAutoPlay = false;
     FilterString movingCardsUntilFilter;
     int movingCardsUntilCounter = 0;
+    MoveTopCardsUntilOptions movingCardsUntilOptions;
 
     void moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);
     void moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);

cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp

@@ -20,6 +20,7 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
     numberPlayersLabel->setBuddy(numberPlayersEdit);
 
     auto *generalGrid = new QGridLayout;
+    generalGrid->setContentsMargins(5, 5, 5, 5);
     generalGrid->addWidget(numberPlayersLabel, 0, 0);
     generalGrid->addWidget(numberPlayersEdit, 0, 1);
     generalGroupBox = new QGroupBox(tr("General"), this);
@@ -33,6 +34,7 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
     startingLifeTotalLabel->setBuddy(startingLifeTotalEdit);
 
     auto *gameSetupGrid = new QGridLayout;
+    gameSetupGrid->setContentsMargins(5, 5, 5, 5);
     gameSetupGrid->addWidget(startingLifeTotalLabel, 0, 0);
     gameSetupGrid->addWidget(startingLifeTotalEdit, 0, 1);
     gameSetupOptionsGroupBox = new QGroupBox(tr("Game setup options"), this);

docker-compose.yml

@@ -16,7 +16,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: servatrice
+    image: ghcr.io/cockatrice/servatrice:latest
     depends_on:
       - mysql
     ports:

docker-compose.yml.windows

@@ -16,7 +16,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: servatrice
+    image: ghcr.io/cockatrice/servatrice:latest
     depends_on:
       - mysql
     ports: