From eb0183b79d2ced99402071e4100c54600e9fe0a8 Mon Sep 17 00:00:00 2001 From: Plopman Date: Thu, 28 Nov 2013 22:54:40 +0100 Subject: [PATCH] [Client]Improve load cards for graveyard --- Mage.Client/src/main/java/mage/client/game/GamePanel.java | 8 ++++++++ .../src/main/java/mage/client/game/PlayerPanelExt.java | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index aa2d19ae1fd..4284c082cda 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -1252,6 +1252,14 @@ public final class GamePanel extends javax.swing.JPanel { return session; } + public Map getLoadedCards() { + return loadedCards; + } + + public void setLoadedCards(Map loadedCards) { + this.loadedCards = loadedCards; + } + public FeedbackPanel getFeedbackPanel() { return feedbackPanel; } diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java index acb0dc885f1..6f33be7cec4 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java @@ -361,6 +361,8 @@ public class PlayerPanelExt extends javax.swing.JPanel { poison = new ImagePanel(resizedPoison, ImagePanel.ACTUAL); poison.setToolTipText("Poison"); poison.setOpaque(false); + + // Library r = new Rectangle(19, 19); libraryLabel.setToolTipText("Library"); Image imageLibrary = ImageHelper.getImageFromResources("/info/library.png"); @@ -404,6 +406,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { zonesPanel.setSize(100, 20); zonesPanel.setLayout(null); + // image = ImageHelper.getImageFromResources("/info/command_zone.png"); r = new Rectangle(21, 21); resized = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB), r); @@ -675,7 +678,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { graveyard = new ShowCardsDialog(); }*/ //graveyard.loadCards(player.getName() + " graveyard", player.getGraveyard(), bigCard, Config.dimensions, gameId, false); - DialogManager.getManager(gameId).showGraveyardDialog(CardsViewUtil.convertSimple(player.getGraveyard()), bigCard, gameId); + DialogManager.getManager(gameId).showGraveyardDialog(CardsViewUtil.convertSimple(player.getGraveyard(), MageFrame.getGame(gameId).getLoadedCards()), bigCard, gameId); } private void btnCommandZoneActionPerformed(java.awt.event.ActionEvent evt) {