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

reorganize card context menus for consistency and readability

Browse source
This commit is contained in:
DawnFire42 2026-03-16 22:53:15 -04:00
parent 7409e15520
commit dc97fd2bbc
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33
2 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/settings/shortcuts_settings.h
View file

@ -562,7 +562,7 @@ private:
ShortcutGroup::Move_selected)}, ShortcutGroup::Move_selected)},
{"Player/aPlayFacedown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield, Face Down"), {"Player/aPlayFacedown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield, Face Down"),
parseSequenceString(""), parseSequenceString(""),
ShortcutGroup::Move_selected)}, ShortcutGroup::Playing_Area)},
{"Player/aMoveToTable", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield"), {"Player/aMoveToTable", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield"),
parseSequenceString(""), parseSequenceString(""),
ShortcutGroup::Move_selected)}, ShortcutGroup::Move_selected)},

75
cockatrice/src/game/player/menu/card_menu.cpp
View file

@ -146,11 +146,10 @@ void CardMenu::createTableMenu(bool canModifyCard)
{ {
// Card is on the battlefield // Card is on the battlefield
if (!canModifyCard) { if (!canModifyCard) {
addAction(aDrawArrow);
addSeparator();
addRelatedCardView(); addRelatedCardView();
addRelatedCardActions(); addRelatedCardActions();
addSeparator();
addAction(aDrawArrow);
addSeparator(); addSeparator();
addAction(aClone); addAction(aClone);
addSeparator(); addSeparator();
@ -165,10 +164,9 @@ void CardMenu::createTableMenu(bool canModifyCard)
if (card->getFaceDown()) { if (card->getFaceDown()) {
addAction(aPeek); addAction(aPeek);
} }
addSeparator();
addRelatedCardView(); addAction(aClone);
addRelatedCardActions(); addMenu(new MoveMenu(player));
addSeparator(); addSeparator();
addAction(aAttach); addAction(aAttach);
if (card->getAttachedTo()) { if (card->getAttachedTo()) {
@ -179,9 +177,6 @@ void CardMenu::createTableMenu(bool canModifyCard)
addMenu(new PtMenu(player)); addMenu(new PtMenu(player));
addAction(aSetAnnotation); addAction(aSetAnnotation);
addSeparator(); addSeparator();
addAction(aClone);
addMenu(new MoveMenu(player));
addSeparator();
addAction(aSelectAll); addAction(aSelectAll);
addAction(aSelectRow); addAction(aSelectRow);
@ -197,30 +192,35 @@ void CardMenu::createTableMenu(bool canModifyCard)
} }
addSeparator(); addSeparator();
addMenu(mCardCounters); addMenu(mCardCounters);
addRelatedCardView();
addRelatedCardActions();
} }
void CardMenu::createStackMenu(bool canModifyCard) void CardMenu::createStackMenu(bool canModifyCard)
{ {
// Card is on the stack // Card is on the stack
if (canModifyCard) { if (!canModifyCard) {
addAction(aPlay);
addSeparator();
addAction(aAttach);
addAction(aDrawArrow); addAction(aDrawArrow);
addSeparator(); addSeparator();
addAction(aClone); addRelatedCardView();
addMenu(new MoveMenu(player)); addRelatedCardActions();
addSeparator();
addAction(aSelectAll);
} else {
addAction(aDrawArrow);
addSeparator(); addSeparator();
addAction(aClone); addAction(aClone);
addSeparator(); addSeparator();
addAction(aSelectAll); addAction(aSelectAll);
return;
} }
addAction(aPlay);
addAction(aPlayFacedown);
addSeparator();
addAction(aClone);
addMenu(new MoveMenu(player));
addSeparator();
addAction(aAttach);
addAction(aDrawArrow);
addSeparator();
addAction(aSelectAll);
addRelatedCardView(); addRelatedCardView();
addRelatedCardActions(); addRelatedCardActions();
} }
@ -228,29 +228,30 @@ void CardMenu::createStackMenu(bool canModifyCard)
void CardMenu::createGraveyardOrExileMenu(bool canModifyCard) void CardMenu::createGraveyardOrExileMenu(bool canModifyCard)
{ {
// Card is in the graveyard or exile // Card is in the graveyard or exile
if (canModifyCard) { if (!canModifyCard) {
addAction(aPlay);
addAction(aPlayFacedown);
addSeparator();
addAction(aClone);
addMenu(new MoveMenu(player));
addSeparator();
addAction(aSelectAll);
addAction(aSelectColumn);
addSeparator();
addAction(aAttach);
addAction(aDrawArrow); addAction(aDrawArrow);
} else { addSeparator();
addRelatedCardView();
addRelatedCardActions();
addSeparator();
addAction(aClone); addAction(aClone);
addSeparator(); addSeparator();
addAction(aSelectAll); addAction(aSelectAll);
addAction(aSelectColumn); addAction(aSelectColumn);
addSeparator(); return;
addAction(aDrawArrow);
} }
addAction(aPlay);
addAction(aPlayFacedown);
addSeparator();
addAction(aClone);
addMenu(new MoveMenu(player));
addSeparator();
addAction(aAttach);
addAction(aDrawArrow);
addSeparator();
addAction(aSelectAll);
addAction(aSelectColumn);
addRelatedCardView(); addRelatedCardView();
addRelatedCardActions(); addRelatedCardActions();
} }