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

- Minor adjustments to the layout of the quest mode card shop.

Browse Source
This commit is contained in:
Chris
2011-12-09 19:40:04 +00:00
parent d13633bfa8
commit ed34e5b652
1 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/forge/gui/deckeditor/DeckEditorShop.java
View File

@@ -65,7 +65,8 @@ public final class DeckEditorShop extends DeckEditorBase {
private final JButton sellButton = new JButton();
private final JLabel creditsLabel = new JLabel();
private final JLabel jLabel1 = new JLabel();
// We will remove the label below as the other deck editors do not display this text.
// private final JLabel jLabel1 = new JLabel();
private final JLabel sellPercentageLabel = new JLabel();
private double multiplier;
@@ -183,7 +184,9 @@ public final class DeckEditorShop extends DeckEditorBase {
columnsBelow.add(new TableColumnInfo<InventoryItem>("Price", 36, this.fnPriceCompare, this.fnPriceSellGet));
this.getBottomTableWithCards().setup(columnsBelow, this.getCardView());
this.setSize(1024, 768);
// Window is too tall, lower height to min size used by constructed mode deck editor.
// this.setSize(1024, 768);
this.setSize(1024, 740);
GuiUtils.centerFrame(this);
this.setResizable(false);
}
@@ -221,10 +224,16 @@ public final class DeckEditorShop extends DeckEditorBase {
private void jbInit() throws Exception {
this.setLayout(null);
this.getTopTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 20, 726, 346));
this.getBottomTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 458, 726, 276));
// Need to raise the top table and increase the total height.
// this.getTopTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 20, 726, 346));
this.getTopTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 17, 726, 347));
// Need to raise the bottom table and decrease the height.
// this.getBottomTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 458, 726, 276));
this.getBottomTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 435, 726, 267));
this.sellButton.setBounds(new Rectangle(180, 403, 146, 49));
// Raise the sell card button.
// this.sellButton.setBounds(new Rectangle(180, 403, 146, 49));
this.sellButton.setBounds(new Rectangle(180, 375, 146, 49));
// removeButton.setIcon(upIcon);
this.sellButton.setFont(new java.awt.Font("Dialog", 0, 13));
this.sellButton.setText("Sell Card");
@@ -243,21 +252,32 @@ public final class DeckEditorShop extends DeckEditorBase {
});
this.buyButton.setFont(new java.awt.Font("Dialog", 0, 13));
this.buyButton.setBounds(new Rectangle(23, 403, 146, 49));
// Raise the buy card button.
// this.buyButton.setBounds(new Rectangle(23, 403, 146, 49));
this.buyButton.setBounds(new Rectangle(23, 375, 146, 49));
this.getCardView().setBounds(new Rectangle(765, 23, 239, 710));
// The card view needs to be moved up and can not be as tall as it was.
// this.getCardView().setBounds(new Rectangle(765, 23, 239, 710));
this.getCardView().setBounds(new Rectangle(765, 16, 239, 662));
// Do not lower statsLabel any lower, we want this to be visible at 1024
// x 768 screen size
this.setTitle("Card Shop");
this.creditsLabel.setBounds(new Rectangle(19, 365, 720, 31));
// Move total credits label to the right and move towards the top.
// this.creditsLabel.setBounds(new Rectangle(19, 365, 720, 31));
this.creditsLabel.setBounds(new Rectangle(350, 365, 714, 31));
this.creditsLabel.setText("Total credits: " + this.questData.getCredits());
this.creditsLabel.setFont(new java.awt.Font("Dialog", 0, 14));
this.sellPercentageLabel.setBounds(new Rectangle(350, 403, 450, 31));
// Need to raise the sell % label and move it to the right
// and we will decrease the point size to 13.
// this.sellPercentageLabel.setBounds(new Rectangle(350, 403, 450, 31));
this.sellPercentageLabel.setBounds(new Rectangle(380, 395, 450, 31));
this.sellPercentageLabel.setText("(Sell percentage: " + this.multiplier + ")");
this.sellPercentageLabel.setFont(new java.awt.Font("Dialog", 0, 14));
this.jLabel1.setText("Click on the column name (like name or color) to sort the cards");
this.jLabel1.setBounds(new Rectangle(20, 1, 400, 19));
// this.sellPercentageLabel.setFont(new java.awt.Font("Dialog", 0, 14));
this.sellPercentageLabel.setFont(new java.awt.Font("Dialog", 0, 13));
// We will remove the label below as the other deck editors do not display this text.
// this.jLabel1.setText("Click on the column name (like name or color) to sort the cards");
// this.jLabel1.setBounds(new Rectangle(20, 1, 400, 19));
this.getContentPane().add(this.getCardView(), null);
this.getContentPane().add(this.getTopTableWithCards().getTableDecorated(), null);
@@ -266,7 +286,8 @@ public final class DeckEditorShop extends DeckEditorBase {
this.getContentPane().add(this.buyButton, null);
this.getContentPane().add(this.sellButton, null);
this.getContentPane().add(this.sellPercentageLabel, null);
this.getContentPane().add(this.jLabel1, null);
// We will remove the label below as the other deck editors do not display this text.
// this.getContentPane().add(this.jLabel1, null);
}
// TODO: move to cardshop