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

- The deck editor now will filter by name, type and description.

Browse Source
This commit is contained in:
jendave
2011-08-06 14:56:00 +00:00
parent 8a46742652
commit c8d602800b
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/forge/Gui_DeckEditor.java
View File

@@ -92,6 +92,9 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
private JLabel statsLabel2 = new JLabel(); private JLabel statsLabel2 = new JLabel();
private JLabel jLabel1 = new JLabel(); private JLabel jLabel1 = new JLabel();
private JLabel jLabel2 = new JLabel();
private JLabel jLabel3 = new JLabel();
/* /*
public JCheckBox whiteCheckBox = new JCheckBox("W", true); public JCheckBox whiteCheckBox = new JCheckBox("W", true);
public JCheckBox blueCheckBox = new JCheckBox("U", true); public JCheckBox blueCheckBox = new JCheckBox("U", true);
@@ -130,6 +133,9 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
private JTextField searchTextField = new JTextField(); private JTextField searchTextField = new JTextField();
/*CHOPPIC*/ /*CHOPPIC*/
private JTextField searchTextField2 = new JTextField();
private JTextField searchTextField3 = new JTextField();
private CardList top; private CardList top;
private CardList bottom; private CardList bottom;
public Card cCardHQ; public Card cCardHQ;
@@ -266,6 +272,14 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
filteredOut = filterByName(c); filteredOut = filterByName(c);
} }
if(!filteredOut) {
filteredOut = filterByCardType(c);
}
if(!filteredOut) {
filteredOut = filterByCardDescription(c);
}
if(!filteredOut) { if(!filteredOut) {
topModel.addCard(c); topModel.addCard(c);
} }
@@ -275,7 +289,7 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
} }
/*CHOPPIC*/ /*CHOPPIC*/
private boolean filterByName(Card c){ private boolean filterByName(Card c) {
boolean filterOut = false; boolean filterOut = false;
if(!(searchTextField.getText() == "")){ if(!(searchTextField.getText() == "")){
filterOut = !(c.getName().toLowerCase().contains(searchTextField.getText().toLowerCase())); filterOut = !(c.getName().toLowerCase().contains(searchTextField.getText().toLowerCase()));
@@ -284,6 +298,22 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
} }
/*CHOPPIC*/ /*CHOPPIC*/
private boolean filterByCardType(Card c) {
boolean filterOut = false;
if(!(searchTextField2.getText() == "")){
filterOut = !(c.getType().toString().toLowerCase().contains(searchTextField2.getText().toLowerCase()));
}
return filterOut;
}
private boolean filterByCardDescription(Card c) {
boolean filterOut = false;
if(!(searchTextField3.getText() == "")){
filterOut = !(c.getText().toString().toLowerCase().contains(searchTextField3.getText().toLowerCase()));
}
return filterOut;
}
private boolean filterByColor(Card c) { private boolean filterByColor(Card c) {
boolean filterOut = false; boolean filterOut = false;
@@ -674,8 +704,15 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
this.getContentPane().add(removePictureButton, "align 50% 0%, wrap"); this.getContentPane().add(removePictureButton, "align 50% 0%, wrap");
jLabel1.setText("By name: "); jLabel1.setText("By name: ");
this.getContentPane().add(jLabel1, "cell 0 1, split 2"); this.getContentPane().add(jLabel1, "cell 0 1, split 6");
this.getContentPane().add(searchTextField, "wmin 120, wrap"); this.getContentPane().add(searchTextField, "wmin 120");
jLabel2.setText("By type: ");
this.getContentPane().add(jLabel2, "");
this.getContentPane().add(searchTextField2, "wmin 120");
jLabel3.setText("By description: ");
this.getContentPane().add(jLabel3, "");
this.getContentPane().add(searchTextField3, "wmin 200, wrap");
this.getContentPane().add(statsLabel2, "cell 0 4"); this.getContentPane().add(statsLabel2, "cell 0 4");
this.getContentPane().add(pictureViewPanel, "wmin 239, hmin 323, grow, cell 1 4 1 4"); this.getContentPane().add(pictureViewPanel, "wmin 239, hmin 323, grow, cell 1 4 1 4");