From 05f1a8815791d90617d777dd29ed153eca205451 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 21 Aug 2014 17:06:38 +0200 Subject: [PATCH] Added image for displaying counter. --- .../java/org/mage/card/arcane/CardPanel.java | 32 ++++++++++++++++-- .../mage/plugins/card/utils/ImageManager.java | 1 + .../card/utils/impl/ImageManagerImpl.java | 10 ++++++ .../src/main/resources/card/counter_green.png | Bin 0 -> 1386 bytes 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 Mage.Client/src/main/resources/card/counter_green.png diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java index 38898428ae6..7a1adcec5b8 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java @@ -32,6 +32,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.UUID; +import mage.view.CounterView; /** * Main class for drawing Mage card object. @@ -72,8 +73,9 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti public ImagePanel overlayPanel; public JPanel buttonPanel; public JPanel iconPanel; - public JPanel copyIconPanel; - + public JPanel copyIconPanel; + public JLabel counterLabel; + private GlowText titleText; private GlowText ptText; private boolean displayEnabled = true; @@ -306,6 +308,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti // this holds reference to ActionCallback forever so set it to null to prevent this.callback = null; this.data = null; + this.counterLabel = null; } private void setText(CardView card) { @@ -736,6 +739,31 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti dayNightButton.setIcon(new ImageIcon(transformIcon)); } } + + +// if (card.getCounters() != null && !card.getCounters().isEmpty()) { +// ImageIcon image = new ImageIcon(ImageManagerImpl.getInstance().getCounterImage()); +// String amount = ""; +// String name = ""; +// for (CounterView counterView:card.getCounters()) { +// amount = Integer.toString(counterView.getCount()); +// name = counterView.getName(); +// break; +// } +// if (counterLabel == null) { +// counterLabel = new JLabel(amount, image, JLabel.CENTER); +// } +// counterLabel.setToolTipText(name); +// counterLabel.setLocation(50,50); +// +// this.add(counterLabel); +// counterLabel.setVisible(true); +// } else { +// if (counterLabel != null) { +// this.remove(counterLabel); +// counterLabel = null; +// } +// } repaint(); } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java index 42b256f4c51..89161504c32 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java @@ -16,6 +16,7 @@ public interface ImageManager { Image getTriggeredAbilityImage(); Image getActivatedAbilityImage(); Image getCopyInformIconImage(); + Image getCounterImage(); Image getDlgAcceptButtonImage(); Image getDlgActiveAcceptButtonImage(); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java index d08a09f6cc7..8dbf56490d7 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java @@ -133,6 +133,15 @@ public class ImageManagerImpl implements ImageManager { return imageCopyIcon; } + @Override + public BufferedImage getCounterImage() { + if (imageCounter == null) { + Image image = getImageFromResourceTransparent("/card/counter_green.png", Color.WHITE, new Rectangle(32, 32)); + imageCounter = BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB); + } + return imageCounter; + } + @Override public Image getDlgCancelButtonImage() { if (imageDlgCancelButton == null) { @@ -256,6 +265,7 @@ public class ImageManagerImpl implements ImageManager { private static BufferedImage triggeredAbilityIcon; private static BufferedImage activatedAbilityIcon; private static BufferedImage imageCopyIcon; + private static BufferedImage imageCounter; private static BufferedImage imageDlgAcceptButton; private static BufferedImage imageDlgActiveAcceptButton; diff --git a/Mage.Client/src/main/resources/card/counter_green.png b/Mage.Client/src/main/resources/card/counter_green.png new file mode 100644 index 0000000000000000000000000000000000000000..84e32e0eb8da19344e918681ab5709e560ca54b6 GIT binary patch literal 1386 zcmV-w1(o`VP)>sfo_yhRBhjE^F=A1oU zc5&Hqk|(n>XZOr+pZ9%d=9o-{U*_sW<$(KLhw2}0S_zLfuSU*#8HCRm!##Wl-!*O5 z_1MlbHy#|DP}chYO|U|Q@8UQ3?W4?H?s(CXY@ZFT7dmma@LN0s&)U+=Wp$;Bf21i@ z?8Mo^v+&Goxa2oUk}E$OO|IkEXauPs%g<4U^suNWi! z9bBBWF(7_wP*h+zqpA z?YS2b`aMEm1f;2tT5LhSl6)t$Jajom80PBS24B~x^cm2$D zlSAABOo(7~kb5#TOENzSgur4&D`r)&VxaT7pFthhARp_P^-6n&b zxo&`%&jXPM09(1q`+=P$CisNoT;ID{+#vL6{G5aV$VK5uE(kpw3!*wuqO?xr2?YT( z5877aV|>EzxXw1Q*cqWX#QQWpW&oL#ZcK@g=nx18a)Kvj52^ztigjX>P*4aOU$d;l zPV-4mHL}vcjM*#kj1`R;%GJ`NUs1Sm=m@1-a<+QHKB-kr28QA~}(m z6bj9SY3YKN3-eiFFf7r=&B#<*RpRyzHmnCfv$Nn~u1{^E<$Ztv&Io~=&_kiQFeSq< zqlFt}$$OWFHs16FlXeJr;JOBXl0Gkz-=i9Oz zakS$A(FrB}zsK_@tYr!33pHuq0Sh^SaOeO-Spa8bHDKSs60Id7&Jx=GAOWId-gITK zB2m!0K}p39#qnHqYP%e0IqXc~$iL-Rv$_s*viU8`da*eW8~3i;_C3AzS2N>PT3O<@ zKJ%37exrWvp(;3?s|v(o6c}=?xn6BhaoRR*<7GCx%Li=F*Ql;n>Q_8(TUWjB*_ijB sop}$~SKaT}R(8KsuT}*rw)A@bA2s-N7u0Hpi2wiq07*qoM6N<$f-qN!lK=n! literal 0 HcmV?d00001