diff --git a/res/images/deckeditor/filter_artifact_n.png b/res/images/deckeditor/filter_artifact_n.png index c8660053ca4..2523d044c0a 100755 Binary files a/res/images/deckeditor/filter_artifact_n.png and b/res/images/deckeditor/filter_artifact_n.png differ diff --git a/res/images/deckeditor/filter_artifact_y.png b/res/images/deckeditor/filter_artifact_y.png index 1a197aae378..0b551e67d93 100755 Binary files a/res/images/deckeditor/filter_artifact_y.png and b/res/images/deckeditor/filter_artifact_y.png differ diff --git a/res/images/deckeditor/filter_black_n.png b/res/images/deckeditor/filter_black_n.png index 8fab3a30974..8d01f51581b 100755 Binary files a/res/images/deckeditor/filter_black_n.png and b/res/images/deckeditor/filter_black_n.png differ diff --git a/res/images/deckeditor/filter_black_y.png b/res/images/deckeditor/filter_black_y.png index dc319c9621d..f8fa18ca86b 100755 Binary files a/res/images/deckeditor/filter_black_y.png and b/res/images/deckeditor/filter_black_y.png differ diff --git a/res/images/deckeditor/filter_blue_n.png b/res/images/deckeditor/filter_blue_n.png index d7ab5ecd3ad..7fb903c4fc1 100755 Binary files a/res/images/deckeditor/filter_blue_n.png and b/res/images/deckeditor/filter_blue_n.png differ diff --git a/res/images/deckeditor/filter_blue_y.png b/res/images/deckeditor/filter_blue_y.png index a6f110f880f..900299e677c 100755 Binary files a/res/images/deckeditor/filter_blue_y.png and b/res/images/deckeditor/filter_blue_y.png differ diff --git a/res/images/deckeditor/filter_colorless_n.png b/res/images/deckeditor/filter_colorless_n.png index 1ed19590a85..f0706e6a590 100755 Binary files a/res/images/deckeditor/filter_colorless_n.png and b/res/images/deckeditor/filter_colorless_n.png differ diff --git a/res/images/deckeditor/filter_colorless_y.png b/res/images/deckeditor/filter_colorless_y.png index 5248befb40b..71e9e9e121f 100755 Binary files a/res/images/deckeditor/filter_colorless_y.png and b/res/images/deckeditor/filter_colorless_y.png differ diff --git a/res/images/deckeditor/filter_creature_n.png b/res/images/deckeditor/filter_creature_n.png index db65f0eb8b4..d577f01ef08 100755 Binary files a/res/images/deckeditor/filter_creature_n.png and b/res/images/deckeditor/filter_creature_n.png differ diff --git a/res/images/deckeditor/filter_creature_y.png b/res/images/deckeditor/filter_creature_y.png index c4229f37182..aee035d6445 100755 Binary files a/res/images/deckeditor/filter_creature_y.png and b/res/images/deckeditor/filter_creature_y.png differ diff --git a/res/images/deckeditor/filter_enchant_n.png b/res/images/deckeditor/filter_enchant_n.png index 3db515bd57c..b23e3122a68 100755 Binary files a/res/images/deckeditor/filter_enchant_n.png and b/res/images/deckeditor/filter_enchant_n.png differ diff --git a/res/images/deckeditor/filter_enchant_y.png b/res/images/deckeditor/filter_enchant_y.png index fa91c03f807..054bfbdbb47 100755 Binary files a/res/images/deckeditor/filter_enchant_y.png and b/res/images/deckeditor/filter_enchant_y.png differ diff --git a/res/images/deckeditor/filter_green_n.png b/res/images/deckeditor/filter_green_n.png index 37835814516..e544ca3c339 100755 Binary files a/res/images/deckeditor/filter_green_n.png and b/res/images/deckeditor/filter_green_n.png differ diff --git a/res/images/deckeditor/filter_green_y.png b/res/images/deckeditor/filter_green_y.png index f45bc0f60c1..00e4a63347d 100755 Binary files a/res/images/deckeditor/filter_green_y.png and b/res/images/deckeditor/filter_green_y.png differ diff --git a/res/images/deckeditor/filter_instant_n.png b/res/images/deckeditor/filter_instant_n.png index 62d71847954..7c25dd437a5 100755 Binary files a/res/images/deckeditor/filter_instant_n.png and b/res/images/deckeditor/filter_instant_n.png differ diff --git a/res/images/deckeditor/filter_instant_y.png b/res/images/deckeditor/filter_instant_y.png index e008096a1ad..83cd0d9a9d3 100755 Binary files a/res/images/deckeditor/filter_instant_y.png and b/res/images/deckeditor/filter_instant_y.png differ diff --git a/res/images/deckeditor/filter_land_n.png b/res/images/deckeditor/filter_land_n.png index e534ad3c545..f54f4f2864d 100755 Binary files a/res/images/deckeditor/filter_land_n.png and b/res/images/deckeditor/filter_land_n.png differ diff --git a/res/images/deckeditor/filter_land_y.png b/res/images/deckeditor/filter_land_y.png index 62ad90b3a6a..8cc194c5327 100755 Binary files a/res/images/deckeditor/filter_land_y.png and b/res/images/deckeditor/filter_land_y.png differ diff --git a/res/images/deckeditor/filter_planeswalker_n.png b/res/images/deckeditor/filter_planeswalker_n.png index e630b3dd792..f7b4c8bd85b 100755 Binary files a/res/images/deckeditor/filter_planeswalker_n.png and b/res/images/deckeditor/filter_planeswalker_n.png differ diff --git a/res/images/deckeditor/filter_planeswalker_y.png b/res/images/deckeditor/filter_planeswalker_y.png index 42d68b98dc4..81d204b7756 100755 Binary files a/res/images/deckeditor/filter_planeswalker_y.png and b/res/images/deckeditor/filter_planeswalker_y.png differ diff --git a/res/images/deckeditor/filter_red_n.png b/res/images/deckeditor/filter_red_n.png index 7d209599235..a3549b2d518 100755 Binary files a/res/images/deckeditor/filter_red_n.png and b/res/images/deckeditor/filter_red_n.png differ diff --git a/res/images/deckeditor/filter_red_y.png b/res/images/deckeditor/filter_red_y.png index e7b59cff5cb..c93fbce1a14 100755 Binary files a/res/images/deckeditor/filter_red_y.png and b/res/images/deckeditor/filter_red_y.png differ diff --git a/res/images/deckeditor/filter_sorcery_n.png b/res/images/deckeditor/filter_sorcery_n.png index d7d1e6e8cfd..cbfb904f55a 100755 Binary files a/res/images/deckeditor/filter_sorcery_n.png and b/res/images/deckeditor/filter_sorcery_n.png differ diff --git a/res/images/deckeditor/filter_sorcery_y.png b/res/images/deckeditor/filter_sorcery_y.png index 53fb762fb29..e7b1cf10f76 100755 Binary files a/res/images/deckeditor/filter_sorcery_y.png and b/res/images/deckeditor/filter_sorcery_y.png differ diff --git a/res/images/deckeditor/filter_white_n.png b/res/images/deckeditor/filter_white_n.png index e972939f01f..d7c9759dd60 100755 Binary files a/res/images/deckeditor/filter_white_n.png and b/res/images/deckeditor/filter_white_n.png differ diff --git a/res/images/deckeditor/filter_white_y.png b/res/images/deckeditor/filter_white_y.png index fc25a7ee44c..cc7c48f3a2f 100755 Binary files a/res/images/deckeditor/filter_white_y.png and b/res/images/deckeditor/filter_white_y.png differ diff --git a/src/forge/Gui_DeckEditor.java b/src/forge/Gui_DeckEditor.java index 1decd95552d..1ef9aa6be74 100644 --- a/src/forge/Gui_DeckEditor.java +++ b/src/forge/Gui_DeckEditor.java @@ -545,10 +545,10 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay int land = deck.getType("Land").size(); StringBuffer show = new StringBuffer(); - show.append("Total: ").append(total).append(", Creatures: ").append(creature).append(", Land: ").append(land); + show.append("Total: ").append(total).append(", Creatures: ").append(creature).append(", Land: ").append(land); String[] color = Constant.Color.Colors; for(int i = 0; i < 5; i++) - show.append(", ").append(color[i]).append(": ").append(CardListUtil.getColor(deck, color[i]).size()); + show.append(", ").append(color[i]).append(": ").append(CardListUtil.getColor(deck, color[i]).size()); return show.toString(); }//getStats() @@ -663,7 +663,7 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay colorlessCheckBox.setOpaque(false); picture.addMouseListener(new CustomListener()); - if(!Gui_NewGame.useLAFFonts.isSelected()) statsLabel.setFont(new java.awt.Font("Dialog", 0, 14)); + if (!Gui_NewGame.useLAFFonts.isSelected()) statsLabel.setFont(new java.awt.Font("Dialog", 0, 13)); statsLabel.setText("Total: 0, Creatures: 0, Land: 0"); //Do not lower statsLabel any lower, we want this to be visible at 1024 x 768 screen size this.setTitle("Deck Editor"); @@ -672,7 +672,7 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay gridLayout1.setColumns(1); gridLayout1.setRows(0); statsLabel2.setText("Total: 0, Creatures: 0, Land: 0"); - if(!Gui_NewGame.useLAFFonts.isSelected()) statsLabel2.setFont(new java.awt.Font("Dialog", 0, 14)); + if (!Gui_NewGame.useLAFFonts.isSelected()) statsLabel2.setFont(new java.awt.Font("Dialog", 0, 13)); /* jLabel1.setText("Click on the column name (like name or color) to sort the cards"); */ pictureViewPanel.setCardPanel(picture); @@ -680,20 +680,20 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay this.getContentPane().setLayout(new MigLayout("fill")); // this.getContentPane().add(landCheckBox, "cell 0 0, egx checkbox, split 16"); - this.getContentPane().add(landCheckBox, "cell 0 0, egx checkbox, split 14"); - this.getContentPane().add(creatureCheckBox, ""); - this.getContentPane().add(sorceryCheckBox, ""); - this.getContentPane().add(instantCheckBox, ""); - this.getContentPane().add(planeswalkerCheckBox, ""); - this.getContentPane().add(artifactCheckBox, ""); - this.getContentPane().add(enchantmentCheckBox, ""); + this.getContentPane().add(landCheckBox, "cell 0 0, egx checkbox, grow, split 14"); + this.getContentPane().add(creatureCheckBox, "grow"); + this.getContentPane().add(sorceryCheckBox, "grow"); + this.getContentPane().add(instantCheckBox, "grow"); + this.getContentPane().add(planeswalkerCheckBox, "grow"); + this.getContentPane().add(artifactCheckBox, "grow"); + this.getContentPane().add(enchantmentCheckBox, "grow"); - this.getContentPane().add(whiteCheckBox, ""); - this.getContentPane().add(blueCheckBox, ""); - this.getContentPane().add(blackCheckBox, ""); - this.getContentPane().add(redCheckBox, ""); - this.getContentPane().add(greenCheckBox, ""); - this.getContentPane().add(colorlessCheckBox, ""); + this.getContentPane().add(whiteCheckBox, "grow"); + this.getContentPane().add(blueCheckBox, "grow"); + this.getContentPane().add(blackCheckBox, "grow"); + this.getContentPane().add(redCheckBox, "grow"); + this.getContentPane().add(greenCheckBox, "grow"); + this.getContentPane().add(colorlessCheckBox, "grow"); this.getContentPane().add(filterButton, "wmin 100, hmin 25, wmax 140, hmax 25, grow");