Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

gui: deck editor - improved popup menu naming, added commander hint to sideboard, fixed generate/random deck dialog on cancel, removed outdated logs;

Browse source
This commit is contained in:
Oleg Agafonov 2024-03-08 00:48:01 +04:00
parent ec34380bed
commit b315b46871
6 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java
View file

@ -80,6 +80,7 @@ public class DeckArea extends javax.swing.JPanel {
deckList.setRole(DragCardGrid.Role.MAINDECK);
sideboardList.setRole(DragCardGrid.Role.SIDEBOARD);
// card actions in main
// When a selection happens in one pane, deselect the selection in the other
deckList.addDragCardGridListener(new DragCardGrid.DragCardGridListener() {
@Override
@ -121,6 +122,8 @@ public class DeckArea extends javax.swing.JPanel {
}
}
});
// card actions in sideboard
sideboardList.addDragCardGridListener(new DragCardGrid.DragCardGridListener() {
@Override
public void cardsSelected() {

2
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.form
View file

@ -191,7 +191,7 @@
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/buttons/card_panel.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Random"/>
<Property name="text" type="java.lang.String" value="Generate"/>
<Property name="iconTextGap" type="int" value="1"/>
<Property name="name" type="java.lang.String" value="btnGenDeck" noResource="true"/>
</Properties>

10
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -290,11 +290,10 @@ public class DeckEditorPanel extends javax.swing.JPanel {
private Card retrieveTemporaryCard(SimpleCardView cardView) {
Card card = temporaryCards.get(cardView.getId());
if (card == null) {
// Need to make a new card
Logger.getLogger(DeckEditorPanel.class).info("Retrieve " + cardView.getCardNumber() + " Failed");
// need to make a new card (example: on duplicate, on show hidden cards)
card = CardRepository.instance.findCard(cardView.getExpansionSetCode(), cardView.getCardNumber()).createCard();
} else {
// Only need a temporary card once
// restore temp card (example: after drag to new zone)
temporaryCards.remove(cardView.getId());
}
return card;
@ -1014,7 +1013,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
});
btnGenDeck.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/card_panel.png"))); // NOI18N
btnGenDeck.setText("Random");
btnGenDeck.setText("Generate");
btnGenDeck.setIconTextGap(1);
btnGenDeck.setName("btnGenDeck"); // NOI18N
btnGenDeck.addActionListener(new java.awt.event.ActionListener() {
@ -1470,6 +1469,9 @@ public class DeckEditorPanel extends javax.swing.JPanel {
try {
MageFrame.getDesktop().setCursor(new Cursor(Cursor.WAIT_CURSOR));
String path = DeckGenerator.generateDeck();
if (path == null) {
return;
}
deck = Deck.load(DeckImporter.importDeckFromFile(path, false), true, true);
} catch (GameException ex) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), ex.getMessage(), "Error loading generated deck", JOptionPane.ERROR_MESSAGE);