external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Improved the labels for the color filters in the quest mode deck editor. Still needs some more work.

Browse Source
This commit is contained in:
Chris
2011-12-10 02:46:50 +00:00
parent e5fc94b957
commit ea95665ad5
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/forge/gui/deckeditor/DeckEditorQuest.java
View File

@@ -274,9 +274,10 @@ public final class DeckEditorQuest extends DeckEditorBase {
this.getFilterBoxes().getArtifact().setBounds(315, 35, 58, 20); this.getFilterBoxes().getArtifact().setBounds(315, 35, 58, 20);
this.getFilterBoxes().getEnchantment().setBounds(369, 35, 80, 20); this.getFilterBoxes().getEnchantment().setBounds(369, 35, 80, 20);
final Font f = new Font("Tahoma", Font.PLAIN, 10); // We can now use default font as the filters have more room.
// final Font f = new Font("Tahoma", Font.PLAIN, 10);
for (final JCheckBox box : this.getFilterBoxes().getAllTypes()) { for (final JCheckBox box : this.getFilterBoxes().getAllTypes()) {
box.setFont(f); // box.setFont(f);
box.setOpaque(false); box.setOpaque(false);
box.addItemListener(this.getItemListenerUpdatesDisplay()); box.addItemListener(this.getItemListenerUpdatesDisplay());
} }
@@ -291,12 +292,12 @@ public final class DeckEditorQuest extends DeckEditorBase {
// this.getFilterBoxes().getRed().setBounds(460, 430, 40, 20); // this.getFilterBoxes().getRed().setBounds(460, 430, 40, 20);
// this.getFilterBoxes().getGreen().setBounds(500, 430, 40, 20); // this.getFilterBoxes().getGreen().setBounds(500, 430, 40, 20);
// this.getFilterBoxes().getColorless().setBounds(540, 430, 40, 20); // this.getFilterBoxes().getColorless().setBounds(540, 430, 40, 20);
this.getFilterBoxes().getWhite().setBounds(17, 10, 40, 20); this.getFilterBoxes().getWhite().setBounds(17, 10, 67, 20);
this.getFilterBoxes().getBlue().setBounds(57, 10, 40, 20); this.getFilterBoxes().getBlue().setBounds(94, 10, 60, 20);
this.getFilterBoxes().getBlack().setBounds(97, 10, 40, 20); this.getFilterBoxes().getBlack().setBounds(162, 10, 65, 20);
this.getFilterBoxes().getRed().setBounds(137, 10, 40, 20); this.getFilterBoxes().getRed().setBounds(237, 10, 55, 20);
this.getFilterBoxes().getGreen().setBounds(177, 10, 40, 20); this.getFilterBoxes().getGreen().setBounds(302, 10, 70, 20);
this.getFilterBoxes().getColorless().setBounds(217, 10, 40, 20); this.getFilterBoxes().getColorless().setBounds(380, 10, 100, 20);
for (final JCheckBox box : this.getFilterBoxes().getAllColors()) { for (final JCheckBox box : this.getFilterBoxes().getAllColors()) {
box.setOpaque(false); box.setOpaque(false);

19
src/main/java/forge/gui/deckeditor/FilterCheckBoxes.java
View File

@@ -103,12 +103,19 @@ class FilterCheckBoxes {
this.artifact = new CheckBoxWithIcon("artifact", "Artifact"); this.artifact = new CheckBoxWithIcon("artifact", "Artifact");
this.enchantment = new CheckBoxWithIcon("enchant", "Enchantment"); this.enchantment = new CheckBoxWithIcon("enchant", "Enchantment");
} else { } else {
this.white = new JCheckBox("W", true); // We moved the filters and now have room for the full name.
this.blue = new JCheckBox("U", true); // this.white = new JCheckBox("W", true);
this.black = new JCheckBox("B", true); // this.blue = new JCheckBox("U", true);
this.red = new JCheckBox("R", true); // this.black = new JCheckBox("B", true);
this.green = new JCheckBox("G", true); // this.red = new JCheckBox("R", true);
this.colorless = new JCheckBox("C", true); // this.green = new JCheckBox("G", true);
// this.colorless = new JCheckBox("C", true);
this.white = new JCheckBox("White", true);
this.blue = new JCheckBox("Blue", true);
this.black = new JCheckBox("Black", true);
this.red = new JCheckBox("Red", true);
this.green = new JCheckBox("Green", true);
this.colorless = new JCheckBox("Colorless", true);
this.land = new JCheckBox("Land", true); this.land = new JCheckBox("Land", true);
this.creature = new JCheckBox("Creature", true); this.creature = new JCheckBox("Creature", true);