github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3271 from spjspj/master

Browse source 
spjspj - Remove Tokens from Card Viewer - need to reorg the tokens fi…
This commit is contained in:
spjspj 2017-04-30 11:15:54 +10:00 committed by GitHub
commit 3f125db074
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
View file

@ -146,13 +146,13 @@ public final class CollectionViewerPanel extends JPanel {
JLabel label4 = new JLabel("Show cards or tokens:"); JLabel label4 = new JLabel("Show cards or tokens:");
label3.setAlignmentX(Component.LEFT_ALIGNMENT); label3.setAlignmentX(Component.LEFT_ALIGNMENT);
label3.setForeground(Color.white); label3.setForeground(Color.white);
jPanel1.add(label4); // spjspj - put back in after reorg of tokens -- jPanel1.add(label4);
JCheckBox cardsOrTokens = new JCheckBox("Display Cards"); JCheckBox cardsOrTokens = new JCheckBox("Display Cards");
cardsOrTokens.setSelected(true); cardsOrTokens.setSelected(true);
cardsOrTokens.setToolTipText("Select to show Cards or Tokens(and emblems) for the chosen set"); cardsOrTokens.setToolTipText("Select to show Cards or Tokens(and emblems) for the chosen set");
cardsOrTokens.addActionListener(e -> mageBook.cardsOrTokens(cardsOrTokens.isSelected())); cardsOrTokens.addActionListener(e -> mageBook.cardsOrTokens(cardsOrTokens.isSelected()));
jPanel1.add(cardsOrTokens); // spjspj - put back in after reorg of tokens -- jPanel1.add(cardsOrTokens);
formats.addActionListener(e -> { formats.addActionListener(e -> {
if (mageBook != null) { if (mageBook != null) {

8
Mage.Client/src/main/resources/card-pictures-tok.txt
View file

@ -525,16 +525,12 @@
|Generate|TOK:M13|Wurm|| |Generate|TOK:M13|Wurm||
|Generate|EMBLEM:AVR|Tamiyo, the Moon Sage||Emblem Tamiyo| |Generate|EMBLEM:AVR|Tamiyo, the Moon Sage||Emblem Tamiyo|
|Generate|TOK:AVR|Angel|1| |Generate|TOK:AVR|Angel||
|Generate|TOK:AVR|Angel|2| |Generate|TOK:AVR|Demon||
|Generate|TOK:AVR|Angel|3|
|Generate|TOK:AVR|Human|1| |Generate|TOK:AVR|Human|1|
|Generate|TOK:AVR|Human|2| |Generate|TOK:AVR|Human|2|
|Generate|TOK:AVR|Spirit|1| |Generate|TOK:AVR|Spirit|1|
|Generate|TOK:AVR|Spirit|2| |Generate|TOK:AVR|Spirit|2|
|Generate|TOK:AVR|Demon|1|
|Generate|TOK:AVR|Demon|2|
|Generate|TOK:AVR|Demon|3|
|Generate|TOK:AVR|Zombie|| |Generate|TOK:AVR|Zombie||
|Generate|EMBLEM:DDI|Venser, the Sojourner||Emblem Venser| |Generate|EMBLEM:DDI|Venser, the Sojourner||Emblem Venser|