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

Improve captions on Deck Editors

Browse Source
This commit is contained in:
drdev
2014-01-07 03:29:46 +00:00
parent 6b06a6f274
commit 0a9617b0c4
11 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java
View File

@@ -318,7 +318,6 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
@SuppressWarnings("serial")
public void setCatalogManager(final ItemManager<TItem> itemManager) {
this.catalogManager = itemManager;
itemManager.setCaption("Catalog");
btnAdd.setCommand(new Command() {
@Override

9
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java
View File

@@ -82,8 +82,13 @@ public final class CEditorCommander extends ACEditorBase<PaperCard, Deck> {
boolean wantUnique = SItemManagerIO.getPref(EditorPreference.display_unique_only);
this.setCatalogManager(new CardManager(wantUnique));
this.setDeckManager(new CardManager(wantUnique));
CardManager catalogManager = new CardManager(wantUnique);
CardManager deckManager = new CardManager(wantUnique);
catalogManager.setCaption("Catalog");
this.setCatalogManager(catalogManager);
this.setDeckManager(deckManager);
final Supplier<Deck> newCreator = new Supplier<Deck>() {
@Override

9
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java
View File

@@ -80,8 +80,13 @@ public final class CEditorConstructed extends ACEditorBase<PaperCard, Deck> {
boolean wantUnique = SItemManagerIO.getPref(EditorPreference.display_unique_only);
this.setCatalogManager(new CardManager(wantUnique));
this.setDeckManager(new CardManager(wantUnique));
CardManager catalogManager = new CardManager(wantUnique);
CardManager deckManager = new CardManager(wantUnique);
catalogManager.setCaption("Catalog");
this.setCatalogManager(catalogManager);
this.setDeckManager(deckManager);
final Supplier<Deck> newCreator = new Supplier<Deck>() {
@Override

9
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java
View File

@@ -28,7 +28,6 @@ import forge.deck.DeckGroup;
import forge.deck.DeckSection;
import forge.gui.deckeditor.CDeckEditorUI;
import forge.gui.deckeditor.views.VAllDecks;
import forge.gui.deckeditor.views.VCardCatalog;
import forge.gui.deckeditor.views.VCurrentDeck;
import forge.gui.deckeditor.views.VDeckgen;
import forge.gui.framework.DragCell;
@@ -68,6 +67,8 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
final CardManager catalogManager = new CardManager(false);
final CardManager deckManager = new CardManager(false);
deckManager.setCaption("Draft Picks");
catalogManager.setAlwaysNonUnique(true);
deckManager.setAlwaysNonUnique(true);
@@ -134,9 +135,9 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
* a {@link forge.CardList} object.
*/
private void showChoices(final ItemPoolView<PaperCard> list) {
VCardCatalog.SINGLETON_INSTANCE.getPnlHeader().setVisible(true);
VCardCatalog.SINGLETON_INSTANCE.getLblTitle().setText("Select a card from pack number "
+ (((BoosterDraft) boosterDraft).getCurrentBoosterIndex() + 1) + ".");
int packNumber = ((BoosterDraft) boosterDraft).getCurrentBoosterIndex() + 1;
this.getCatalogManager().setCaption("Pack " + packNumber + " - Cards");
this.getCatalogManager().setPool(list);
this.getCatalogManager().getTable().setSelectedIndex(0);
} // showChoices()

6
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java
View File

@@ -26,7 +26,6 @@ import forge.deck.DeckGroup;
import forge.deck.DeckSection;
import forge.gui.deckeditor.SEditorIO;
import forge.gui.deckeditor.views.VAllDecks;
import forge.gui.deckeditor.views.VCardCatalog;
import forge.gui.deckeditor.views.VCurrentDeck;
import forge.gui.deckeditor.views.VDeckgen;
import forge.gui.framework.DragCell;
@@ -66,6 +65,8 @@ public final class CEditorLimited extends ACEditorBase<PaperCard, DeckGroup> {
final CardManager catalogManager = new CardManager(false);
final CardManager deckManager = new CardManager(false);
catalogManager.setCaption("Sideboard");
catalogManager.setAlwaysNonUnique(true);
deckManager.setAlwaysNonUnique(true);
@@ -170,9 +171,6 @@ public final class CEditorLimited extends ACEditorBase<PaperCard, DeckGroup> {
VCurrentDeck.SINGLETON_INSTANCE.getBtnOpen().setVisible(false);
VCurrentDeck.SINGLETON_INSTANCE.getTxfTitle().setEnabled(false);
VCardCatalog.SINGLETON_INSTANCE.getPnlHeader().setVisible(true);
VCardCatalog.SINGLETON_INSTANCE.getLblTitle().setText("Deck Editor: Limited Mode");
deckGenParent = removeTab(VDeckgen.SINGLETON_INSTANCE);
allDecksParent = removeTab(VAllDecks.SINGLETON_INSTANCE);
}

8
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java
View File

@@ -96,7 +96,7 @@ public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
*/
public CEditorQuest(final QuestController questData0) {
super(FScreen.DECK_EDITOR_QUEST);
allSections.add(DeckSection.Main);
allSections.add(DeckSection.Sideboard);
@@ -105,6 +105,8 @@ public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
final CardManager catalogManager = new CardManager(false);
final CardManager deckManager = new CardManager(false);
catalogManager.setCaption("Quest Inventory");
catalogManager.setAlwaysNonUnique(true);
deckManager.setAlwaysNonUnique(true);
@@ -277,9 +279,9 @@ public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
public void run() {
cycleEditorMode();
} });
deckGenParent = removeTab(VDeckgen.SINGLETON_INSTANCE);
allDecksParent = removeTab(VAllDecks.SINGLETON_INSTANCE);
allDecksParent = removeTab(VAllDecks.SINGLETON_INSTANCE);
if (this.controller.getModel() == null) {
this.getDeckController().setModel(new Deck());

4
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java
View File

@@ -133,7 +133,9 @@ public final class CEditorQuestCardShop extends ACEditorBase<InventoryItem, Deck
final SpellShopManager catalogManager = new SpellShopManager(false);
final SpellShopManager deckManager = new SpellShopManager(false);
deckManager.setCaption("Inventory");
catalogManager.setCaption("Spell Shop");
deckManager.setCaption("Quest Inventory");
catalogManager.setAlwaysNonUnique(true);
deckManager.setAlwaysNonUnique(true);

9
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java
View File

@@ -69,8 +69,13 @@ public final class CEditorVariant extends ACEditorBase<PaperCard, Deck> {
this.cardPoolCondition = poolCondition;
this.setCatalogManager(new CardManager(true));
this.setDeckManager(new CardManager(true));
CardManager catalogManager = new CardManager(true);
CardManager deckManager = new CardManager(true);
catalogManager.setCaption("Catalog");
this.setCatalogManager(catalogManager);
this.setDeckManager(deckManager);
final Supplier<Deck> newCreator = new Supplier<Deck>() {
@Override

12
forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java
View File

@@ -8,7 +8,6 @@ import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
import forge.gui.framework.IVDoc;
import forge.gui.toolbox.FLabel;
import forge.gui.toolbox.itemmanager.ItemManager;
import forge.gui.toolbox.itemmanager.ItemManagerContainer;
import forge.item.InventoryItem;
@@ -29,18 +28,12 @@ public enum VCardCatalog implements IVDoc<CCardCatalog> {
private DragCell parentCell;
private final DragTab tab = new DragTab("Card Catalog");
// panel where special instructions appear
private final JPanel pnlHeader = new JPanel(new MigLayout("insets 0, gap 0, center"));
private final FLabel lblTitle = new FLabel.Builder().fontSize(14).build();
private final ItemManagerContainer itemManagerContainer = new ItemManagerContainer();
private ItemManager<? extends InventoryItem> itemManager;
//========== Constructor
/** */
private VCardCatalog() {
pnlHeader.setOpaque(false);
pnlHeader.add(lblTitle, "center, gap 0 0 10 5");
}
//========== Overridden from IVDoc
@@ -74,7 +67,6 @@ public enum VCardCatalog implements IVDoc<CCardCatalog> {
public void populate() {
JPanel parentBody = parentCell.getBody();
parentBody.setLayout(new MigLayout("insets 5, gap 0, wrap, hidemode 3"));
parentBody.add(pnlHeader, "pushx, growx");
parentBody.add(itemManagerContainer, "push, grow");
}
@@ -87,8 +79,4 @@ public enum VCardCatalog implements IVDoc<CCardCatalog> {
this.itemManager = itemManager0;
itemManagerContainer.setItemManager(itemManager0);
}
//========== Accessor/mutator methods
public JPanel getPnlHeader() { return pnlHeader; }
public FLabel getLblTitle() { return lblTitle; }
}

16
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
View File

@@ -17,6 +17,7 @@
*/
package forge.gui.toolbox.itemmanager;
import java.awt.Component;
import java.awt.Toolkit;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
@@ -281,8 +282,19 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
public void doLayout() {
int buttonPanelHeight = 32;
LayoutHelper helper = new LayoutHelper(this);
boolean showButtonPanel = false;
if (this.pnlButtons.isVisible()) {
for (Component comp : this.pnlButtons.getComponents()) {
if (comp.isVisible()) {
showButtonPanel = true;
break;
}
}
}
if (this.hideFilters) {
if (this.pnlButtons.getComponentCount() > 0) {
if (showButtonPanel) {
helper.offset(0, -4);
helper.fillLine(this.pnlButtons, buttonPanelHeight);
}
@@ -302,7 +314,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
helper.include(this.txtFilterLogic, this.txtFilterLogic.getAutoSizeWidth(), FTextField.HEIGHT);
helper.fillLine(this.mainSearchFilter.getWidget(), ItemFilter.PANEL_HEIGHT);
helper.newLine(-3);
helper.fillLine(this.pnlButtons, this.pnlButtons.getComponentCount() > 0 ? buttonPanelHeight : 1); //just show border if no buttons
helper.fillLine(this.pnlButtons, showButtonPanel ? buttonPanelHeight : 1); //just show border if no buttons
}
helper.include(this.btnFilters, 61, FTextField.HEIGHT);
helper.include(this.lblCaption, this.lblCaption.getAutoSizeWidth(), FTextField.HEIGHT);

3
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java
View File

@@ -89,9 +89,6 @@ public final class SItemManagerUtil {
VCurrentDeck.SINGLETON_INSTANCE.getTxfTitle().setEnabled(true);
VCardCatalog.SINGLETON_INSTANCE.getPnlHeader().setVisible(false);
VCardCatalog.SINGLETON_INSTANCE.getLblTitle().setText("");
VCurrentDeck.SINGLETON_INSTANCE.getPnlHeader().setVisible(true);
VCardCatalog.SINGLETON_INSTANCE.getTabLabel().setText("Card Catalog");