diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java index 5823aa69251..0a106c64ee1 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java @@ -318,7 +318,6 @@ public abstract class ACEditorBase itemManager) { this.catalogManager = itemManager; - itemManager.setCaption("Catalog"); btnAdd.setCommand(new Command() { @Override diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java index 3627e69ca86..d6f5bb9a3d6 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java @@ -82,8 +82,13 @@ public final class CEditorCommander extends ACEditorBase { 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 newCreator = new Supplier() { @Override diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java index c43eee04e25..9fa34cbb5e4 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java @@ -80,8 +80,13 @@ public final class CEditorConstructed extends ACEditorBase { 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 newCreator = new Supplier() { @Override diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java index 1eddd1550d5..2aa092646d0 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java @@ -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 { 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 { * a {@link forge.CardList} object. */ private void showChoices(final ItemPoolView 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() diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java index 2a08b193444..8db90ff8e5c 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java @@ -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 { 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 { 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); } diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java index 63bf108a641..b75b9f136b9 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java @@ -96,7 +96,7 @@ public final class CEditorQuest extends ACEditorBase { */ 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 { 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 { 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()); diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java index dc2921b0cd8..ce72abbbfee 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java @@ -133,7 +133,9 @@ public final class CEditorQuestCardShop extends ACEditorBase { 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 newCreator = new Supplier() { @Override diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java index 846f632d3e2..388819576b8 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java @@ -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 { 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 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 { 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 { this.itemManager = itemManager0; itemManagerContainer.setItemManager(itemManager0); } - - //========== Accessor/mutator methods - public JPanel getPnlHeader() { return pnlHeader; } - public FLabel getLblTitle() { return lblTitle; } } diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java index 810bde66087..584b7216a8a 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java @@ -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 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 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); diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java index 3bd34819457..58800204c3b 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java @@ -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");