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

Changed references to OldGuiNewGame preference components to reference the actual ForgePreferences class hosted in Singletons.

Browse Source
This commit is contained in:
Rob Cashwalker
2011-09-13 20:16:12 +00:00
parent 2b53737838
commit ffe281b890
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/gui/deckeditor/CardPanelHeavy.java
View File

@@ -17,11 +17,12 @@ import arcane.ui.ViewPanel;
import forge.Card;
import forge.GuiDisplayUtil;
import forge.ImagePreviewPanel;
import forge.Singletons;
import forge.card.CardPrinted;
import forge.gui.game.CardDetailPanel;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
import forge.view.swing.OldGuiNewGame;
//import forge.view.swing.OldGuiNewGame;
/**
* This panel is to be placed in the right part of a deck editor
@@ -51,7 +52,7 @@ public class CardPanelHeavy extends CardPanelBase {
changePictureButton_actionPerformed(e);
}
});
if (!OldGuiNewGame.useLAFFonts.isSelected())
if (!Singletons.getModel().getPreferences().lafFonts)
changePictureButton.setFont(new java.awt.Font("Dialog", 0, 10));
removePictureButton.setText("Remove picture...");
@@ -60,7 +61,7 @@ public class CardPanelHeavy extends CardPanelBase {
removePictureButton_actionPerformed(e);
}
});
if (!OldGuiNewGame.useLAFFonts.isSelected())
if (!Singletons.getModel().getPreferences().lafFonts)
removePictureButton.setFont(new java.awt.Font("Dialog", 0, 10));
pictureViewPanel.setCardPanel(picture);

7
src/main/java/forge/gui/deckeditor/DeckEditor.java
View File

@@ -20,13 +20,14 @@ import net.miginfocom.swing.MigLayout;
import net.slightlymagic.maxmtg.Predicate;
import forge.AllZone;
import forge.Command;
import forge.Singletons;
import forge.card.CardDb;
import forge.card.CardPool;
import forge.card.CardPoolView;
import forge.card.CardPrinted;
import forge.error.ErrorViewer;
import forge.game.GameType;
import forge.view.swing.OldGuiNewGame;
//import forge.view.swing.OldGuiNewGame;
/**
* <p>
@@ -128,7 +129,7 @@ public final class DeckEditor extends DeckEditorBase {
private void jbInit() {
if (!OldGuiNewGame.useLAFFonts.isSelected()) {
if (!Singletons.getModel().getPreferences().lafFonts) {
Font fButtons = new java.awt.Font("Dialog", 0, 13);
removeButton.setFont(fButtons);
addButton.setFont(fButtons);
@@ -153,7 +154,7 @@ public final class DeckEditor extends DeckEditorBase {
// Type filtering
Font f = new Font("Tahoma", Font.PLAIN, 10);
for (JCheckBox box : filterBoxes.allTypes) {
if (!OldGuiNewGame.useLAFFonts.isSelected()) { box.setFont(f); }
if (!Singletons.getModel().getPreferences().lafFonts) { box.setFont(f); }
box.setOpaque(false);
}

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

@@ -2,6 +2,7 @@ package forge.gui.deckeditor;
import forge.Command;
import forge.Constant;
import forge.Singletons;
import forge.card.CardPool;
import forge.card.CardPoolView;
import forge.card.CardPrinted;
@@ -11,7 +12,7 @@ import forge.game.GameType;
import forge.gui.GuiUtils;
import forge.properties.NewConstants;
import forge.quest.data.QuestData;
import forge.view.swing.OldGuiNewGame;
//import forge.view.swing.OldGuiNewGame;
import java.awt.Font;
@@ -179,7 +180,7 @@ public final class DeckEditorQuest extends DeckEditorBase implements NewConstant
removeButton.setBounds(new Rectangle(180, 403, 146, 49));
// removeButton.setIcon(upIcon);
if (!OldGuiNewGame.useLAFFonts.isSelected())
if (!Singletons.getModel().getPreferences().lafFonts)
removeButton.setFont(new java.awt.Font("Dialog", 0, 13));
removeButton.setText("Remove Card");
removeButton.addActionListener(new ActionListener() {
@@ -194,7 +195,7 @@ public final class DeckEditorQuest extends DeckEditorBase implements NewConstant
}
});
// addButton.setIcon(downIcon);
if (!OldGuiNewGame.useLAFFonts.isSelected())
if (!Singletons.getModel().getPreferences().lafFonts)
addButton.setFont(new java.awt.Font("Dialog", 0, 13));
addButton.setBounds(new Rectangle(23, 403, 146, 49));
@@ -204,7 +205,7 @@ public final class DeckEditorQuest extends DeckEditorBase implements NewConstant
analysisButton_actionPerformed(e);
}
});
if (!OldGuiNewGame.useLAFFonts.isSelected())
if (!Singletons.getModel().getPreferences().lafFonts)
analysisButton.setFont(new java.awt.Font("Dialog", 0, 13));
analysisButton.setBounds(new Rectangle(578, 426, 166, 25));
@@ -221,7 +222,7 @@ public final class DeckEditorQuest extends DeckEditorBase implements NewConstant
Font f = new Font("Tahoma", Font.PLAIN, 10);
for (JCheckBox box : filterBoxes.allTypes) {
if (!OldGuiNewGame.useLAFFonts.isSelected()) { box.setFont(f); }
if (!Singletons.getModel().getPreferences().lafFonts) { box.setFont(f); }
box.setOpaque(false);
box.addItemListener(itemListenerUpdatesDisplay);
}

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

@@ -21,6 +21,7 @@ import net.slightlymagic.maxmtg.Predicate;
import forge.Command;
import forge.ReadPriceList;
import forge.Singletons;
import forge.card.CardPoolView;
import forge.card.CardPrinted;
import forge.deck.Deck;
@@ -28,7 +29,7 @@ import forge.error.ErrorViewer;
import forge.game.GameType;
import forge.gui.GuiUtils;
import forge.quest.data.QuestData;
import forge.view.swing.OldGuiNewGame;
//import forge.view.swing.OldGuiNewGame;
/**
* <p>
@@ -193,7 +194,7 @@ public final class DeckEditorShop extends DeckEditorBase {
sellButton.setBounds(new Rectangle(180, 403, 146, 49));
// removeButton.setIcon(upIcon);
if (!OldGuiNewGame.useLAFFonts.isSelected())
if (!Singletons.getModel().getPreferences().lafFonts)
sellButton.setFont(new java.awt.Font("Dialog", 0, 13));
sellButton.setText("Sell Card");
sellButton.addActionListener(new java.awt.event.ActionListener() {
@@ -208,7 +209,7 @@ public final class DeckEditorShop extends DeckEditorBase {
}
});
if (!OldGuiNewGame.useLAFFonts.isSelected())
if (!Singletons.getModel().getPreferences().lafFonts)
buyButton.setFont(new java.awt.Font("Dialog", 0, 13));
buyButton.setBounds(new Rectangle(23, 403, 146, 49));
@@ -219,11 +220,11 @@ public final class DeckEditorShop extends DeckEditorBase {
creditsLabel.setBounds(new Rectangle(19, 365, 720, 31));
creditsLabel.setText("Total credits: " + questData.getCredits());
if (!OldGuiNewGame.useLAFFonts.isSelected())
if (!Singletons.getModel().getPreferences().lafFonts)
creditsLabel.setFont(new java.awt.Font("Dialog", 0, 14));
sellPercentageLabel.setBounds(new Rectangle(350, 403, 450, 31));
sellPercentageLabel.setText("(Sell percentage: " + multiplier + ")");
if (!OldGuiNewGame.useLAFFonts.isSelected())
if (!Singletons.getModel().getPreferences().lafFonts)
sellPercentageLabel.setFont(new java.awt.Font("Dialog", 0, 14));
jLabel1.setText("Click on the column name (like name or color) to sort the cards");
jLabel1.setBounds(new Rectangle(20, 1, 400, 19));

5
src/main/java/forge/gui/deckeditor/TableWithCards.java
View File

@@ -16,11 +16,12 @@ import javax.swing.table.TableCellRenderer;
import net.slightlymagic.maxmtg.Predicate;
import forge.Constant;
import forge.Singletons;
import forge.card.CardPool;
import forge.card.CardPoolView;
import forge.card.CardPrinted;
import forge.card.CardRules;
import forge.view.swing.OldGuiNewGame;
//import forge.view.swing.OldGuiNewGame;
/**
* TODO: Write javadoc for this type.
@@ -55,7 +56,7 @@ public final class TableWithCards {
jScrollPane.setToolTipText(tableToolTip);
jScrollPane.getViewport().add(table, null);
if (!OldGuiNewGame.useLAFFonts.isSelected()) { statsLabel.setFont(new java.awt.Font("Dialog", 0, 13)); }
if (!Singletons.getModel().getPreferences().lafFonts) { statsLabel.setFont(new java.awt.Font("Dialog", 0, 13)); }
statsLabel.setText("Total: 0, Creatures: 0, Land: 0");
// class data