New graveyard dialog

Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogContainer.java

@@ -1,6 +1,7 @@
 package mage.client.components.ext.dlg;
 
 import mage.client.components.ext.MessageDlg;
+import mage.client.components.ext.dlg.impl.ChoiceDialog;
 import mage.client.components.ext.dlg.impl.StackDialog;
 
 import javax.swing.*;
@@ -69,24 +70,24 @@ public class DialogContainer extends JPanel {
             dlg.setLocation(X_OFFSET + 10, Y_OFFSET + 10);
             dlg.updateSize(params.rect.width - 80, params.rect.height - 80);
 
-        } else if (dialogType == DialogManager.MTGDialogs.ChoiceDialog) {
+        }*/ else if (dialogType == DialogManager.MTGDialogs.ChoiceDialog) {
 
             //backgroundColor = new Color(200, 200, 172, 120);
             //backgroundColor = new Color(180, 150, 200, 120);
             //backgroundColor = new Color(0, 255, 0, 60);
 
-            //latest:
+            //backgroundColor = new Color(139, 46, 173, 20);
-            backgroundColor = new Color(139, 46, 173, 20);
+            backgroundColor = new Color(0, 0, 0, 110);
             //backgroundColor = new Color(139, 46, 173, 0);
 
             alpha = 0;
             ChoiceDialog dlg = new ChoiceDialog(params);
             add(dlg);
-            GameManager.getManager().setCurrentChoiceDlg(dlg);
+            //GameManager.getManager().setCurrentChoiceDlg(dlg);
             dlg.setLocation(X_OFFSET + 10, Y_OFFSET + 10);
             dlg.updateSize(params.rect.width - 80, params.rect.height - 80);
 
-        } else if (dialogType == DialogManager.MTGDialogs.GraveDialog) {
+        } /*else if (dialogType == DialogManager.MTGDialogs.GraveDialog) {
             backgroundColor = new Color(20, 20, 20, 120);
             alpha = 0;
             GraveDialog dlg = new GraveDialog(params);

Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogManager.java

@@ -102,6 +102,36 @@ public class DialogManager extends JComponent implements MouseListener,
         setVisible(true);
     }
 
+    public void showChoiceDialog(CardsView cards, BigCard bigCard, UUID gameId) {
+
+        int w = 720;
+        int h = 550;
+
+        int height = getHeight();
+        int width = getWidth();
+
+        int x = ((width - w) / 2);
+        int y = ((height - h) / 2);
+
+        DlgParams params = new DlgParams();
+        params.rect = new Rectangle(x, y, w, h);
+        params.bigCard = bigCard;
+        params.gameId = gameId;
+        //params.feedbackPanel = feedbackPanel;
+        params.setCards(cards);
+        dialogContainer = new DialogContainer(MTGDialogs.ChoiceDialog, params);
+        dialogContainer.setVisible(true);
+        add(dialogContainer);
+
+        this.currentDialog = MTGDialogs.DialogContainer;
+
+        setDlgBounds(new Rectangle(x, y, w, h));
+
+        dialogContainer.showDialog(true);
+
+        setVisible(true);
+    }
+
     public void setDlgBounds(Rectangle r) {
         if (currentDialog == MTGDialogs.DialogContainer) {
             dialogContainer.setBounds(r.x, r.y, r.width, r.height);

Mage.Client/src/main/java/mage/client/components/ext/dlg/IDialogPanel.java

@@ -1,6 +1,7 @@
 package mage.client.components.ext.dlg;
 
 import mage.client.components.ImageButton;
+import mage.client.util.Config;
 import org.jdesktop.swingx.JXPanel;
 
 import javax.swing.*;
@@ -12,6 +13,7 @@ import java.awt.*;
 abstract public class IDialogPanel extends JXPanel {
 
     private DlgParams params;
+    private Dimension cardDimension;
 
     public DlgParams getDlgParams() {
         return params;
@@ -67,6 +69,13 @@ abstract public class IDialogPanel extends JXPanel {
         }
     }
 
+    protected Dimension getCardDimension() {
+        if (cardDimension == null) {
+            cardDimension = new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight);
+        }
+        return cardDimension;
+    }
+
     /**
      * Default UID.
      */

Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/ChoiceDialog.java

@@ -0,0 +1,363 @@
+package mage.client.components.ext.dlg.impl;
+
+import mage.cards.MageCard;
+import mage.client.cards.BigCard;
+import mage.client.components.HoverButton;
+import mage.client.components.ext.ShadowLabel;
+import mage.client.components.ext.dlg.DialogContainer;
+import mage.client.components.ext.dlg.DialogManager;
+import mage.client.components.ext.dlg.DlgParams;
+import mage.client.components.ext.dlg.IDialogPanel;
+import mage.client.plugins.impl.Plugins;
+import mage.client.util.AudioManager;
+import mage.client.util.Command;
+import mage.client.util.SettingsManager;
+import mage.view.CardView;
+import mage.view.CardsView;
+import org.mage.plugins.card.utils.impl.ImageManagerImpl;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.UUID;
+
+/**
+ * @author mw, noxx
+ */
+public class ChoiceDialog extends IDialogPanel {
+
+    private static final long serialVersionUID = 1L;
+
+    private ShadowLabel jTitle = null;
+    private HoverButton jButtonOK = null;
+    private HoverButton jButtonPrevPage = null;
+    private HoverButton jButtonNextPage = null;
+    private HoverButton jButtonCancel = null;
+
+    private JButton jButtonSort = null;
+
+    private CardsView cards;
+
+    private int page = 1;
+    private int maxPages;
+    private int in_a_row = 4;
+    private int rows = 2;
+
+    private boolean isOptional = false;
+    private boolean isChooseAbility = false;
+    private boolean isCancelStopsPlaying = true;
+
+    private DlgParams params;
+
+    //HashMap<CardBean, MWCardImpl> map = new HashMap<CardBean, MWCardImpl>();
+
+    /**
+     * This is the default constructor
+     */
+    public ChoiceDialog(DlgParams params) {
+        super(params);
+        this.params = params;
+
+        cards = params.getCards();
+        isOptional = params.isOptional();
+        isCancelStopsPlaying = params.isCancelStopsPlaying();
+        isChooseAbility = params.isChooseAbility();
+
+        in_a_row = 5;
+        rows = 2;
+
+        /**
+         * Calculate max pages
+         */
+        maxPages = cards.size() / (in_a_row * rows);
+        if (cards.size() % (in_a_row * rows) != 0) {
+            maxPages++;
+        }
+
+        /**
+         * Init
+         */
+        initialize();
+    }
+
+    /**
+     * This method initializes this
+     *
+     * @return void
+     */
+    private void initialize() {
+        jTitle = new ShadowLabel("Choose a card (by double-click), chosen card: none", 14);
+        jTitle.setBounds(new Rectangle(5, 3, 500, 16));
+        jTitle.setFont(new Font("Dialog", Font.BOLD, 14));
+
+        this.setLayout(null);
+
+        /**
+         * Components
+         */
+        this.add(jTitle, null);
+        this.add(getJButtonOK(), null);
+        this.add(getJButtonPrevPage(), null);
+        this.add(getJButtonNextPage(), null);
+        this.add(getJButtonSort(), null);
+        this.add(getJButtonCancel(), null);
+        makeTransparent();
+
+        /**
+         * Manage cards
+         */
+        ///GameManager.getManager().resetChosenCards();
+        displayCards(params.getCards(), params.gameId, params.bigCard);
+    }
+
+    private void displayCards(CardsView cards, UUID gameId, BigCard bigCard) {
+        if (cards.size() == 0) {
+            return;
+        }
+
+        java.util.List<Component> toRemove = new ArrayList<Component>();
+        for (int i = getComponentCount() - 1; i > 0; i--) {
+            Component o = getComponent(i);
+            if (o instanceof MageCard) {
+                toRemove.add(o);
+            }
+        }
+        for (int i = 0; i < toRemove.size(); i++) {
+            remove(toRemove.get(i));
+        }
+
+        java.util.List<CardView> cardList = new ArrayList<CardView>();
+        cardList.addAll(cards.values());
+
+        int width = SettingsManager.getInstance().getCardSize().width;
+        int height = SettingsManager.getInstance().getCardSize().height;
+
+        int dx = 0;
+        int dy = 30;
+
+
+        int startIndex = (page - 1) * (in_a_row * rows);
+        int countPerPage = (in_a_row * rows);
+        int j = 0;
+
+        for (int i = startIndex; i < cards.size() && i < startIndex + countPerPage; i++) {
+            if (i > startIndex && i % in_a_row == 0) { // next row
+                j++;
+                dx = 0;
+            }
+
+            CardView card = cardList.get(i);
+            MageCard cardImg = Plugins.getInstance().getMageCard(card, bigCard, getCardDimension(), gameId, true);
+
+            cardImg.setLocation(dx, dy + j*(height + 30));
+            add(cardImg);
+
+            dx += (width + 20);
+        }
+
+        repaint();
+    }
+
+    private HoverButton getJButtonOK() {
+        if (jButtonOK == null) {
+            jButtonOK = new HoverButton("", ImageManagerImpl.getInstance().getDlgAcceptButtonImage(),
+                    ImageManagerImpl.getInstance().getDlgActiveAcceptButtonImage(),
+                    ImageManagerImpl.getInstance().getDlgAcceptButtonImage(),
+                    new Rectangle(60, 60));
+            int w = getDlgParams().rect.width - 75;
+            int h = getDlgParams().rect.height - 90;
+            jButtonOK.setBounds(new Rectangle(w / 2 - 40, h - 50, 60, 60));
+            jButtonOK.setToolTipText("Ok");
+
+            jButtonOK.setObserver(new Command() {
+                public void execute() {
+                    DialogManager.getManager().fadeOut((DialogContainer) getParent());
+                }
+            });
+        }
+        return jButtonOK;
+    }
+
+    private HoverButton getJButtonPrevPage() {
+        if (jButtonPrevPage == null) {
+            jButtonPrevPage = new HoverButton("", ImageManagerImpl.getInstance().getDlgPrevButtonImage(),
+                    ImageManagerImpl.getInstance().getDlgActivePrevButtonImage(),
+                    ImageManagerImpl.getInstance().getDlgPrevButtonImage(),
+                    new Rectangle(60, 60));
+            int w = getDlgParams().rect.width - 75;
+            int h = getDlgParams().rect.height - 90;
+            jButtonPrevPage.setBounds(new Rectangle(w / 2 - 125, h - 50, 60, 60));
+            jButtonPrevPage.setVisible(false);
+
+            jButtonPrevPage.setObserver(new Command() {
+
+                public void execute() {
+                    if (page == 1) {
+                        return;
+                    }
+
+                    AudioManager.playPrevPage();
+
+                    page--;
+                    getJButtonPrevPage().setVisible(false);
+                    getJButtonOK().setVisible(false);
+                    getJButtonNextPage().setVisible(false);
+                    revalidate();
+                    displayCards(params.getCards(), params.gameId, params.bigCard);
+                    if (page != 1) {
+                        getJButtonPrevPage().setVisible(true);
+                    }
+                    getJButtonOK().setVisible(true);
+                    getJButtonNextPage().setVisible(true);
+                }
+            });
+        }
+        return jButtonPrevPage;
+    }
+
+    /**
+     * This method initializes jButtonNextPage
+     *
+     * @return javax.swing.JButton
+     */
+    private HoverButton getJButtonNextPage() {
+        if (jButtonNextPage == null) {
+            jButtonNextPage = new HoverButton("", ImageManagerImpl.getInstance().getDlgNextButtonImage(),
+                    ImageManagerImpl.getInstance().getDlgActiveNextButtonImage(),
+                    ImageManagerImpl.getInstance().getDlgNextButtonImage(),
+                    new Rectangle(60, 60));
+            int w = getDlgParams().rect.width - 75;
+            int h = getDlgParams().rect.height - 90;
+            jButtonNextPage.setBounds(new Rectangle(w / 2 + 45, h - 50, 60, 60));
+
+            if (maxPages > 1) {
+                jButtonNextPage.setVisible(true);
+            } else {
+                jButtonNextPage.setVisible(false);
+            }
+
+            jButtonNextPage.setObserver(new Command() {
+                private static final long serialVersionUID = -3174360416099554104L;
+
+                public void execute() {
+                    if (page == maxPages) {
+                        return;
+                    }
+
+                    AudioManager.playNextPage();
+
+                    page++;
+                    getJButtonPrevPage().setVisible(false);
+                    getJButtonOK().setVisible(false);
+                    getJButtonNextPage().setVisible(false);
+                    revalidate();
+                    displayCards(params.getCards(), params.gameId, params.bigCard);
+                    getJButtonPrevPage().setVisible(true);
+                    getJButtonOK().setVisible(true);
+                    if (page != maxPages) {
+                        getJButtonNextPage().setVisible(true);
+                    }
+                }
+            });
+        }
+        return jButtonNextPage;
+    }
+
+    /**
+     * This method initializes jButtonSort
+     *
+     * @return javax.swing.JButton
+     */
+    private JButton getJButtonSort() {
+        if (jButtonSort == null) {
+            jButtonSort = new JButton();
+            int w = getDlgParams().rect.width - 75;
+            int h = getDlgParams().rect.height - 75;
+            jButtonSort.setBounds(new Rectangle(w / 2 + 150, h - 30, 78, 22));
+            jButtonSort.setText("Sort");
+            jButtonSort.setVisible(false);
+            if (maxPages == 1) {
+                jButtonSort.setVisible(false);
+            }
+
+            /*
+            jButtonSort.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    cards.sort(new Comparator<CardBean>() {
+                        public int compare(CardBean c1, CardBean c2) {
+                            return c1.toString().compareTo(c2.toString());
+                        }
+                    });
+                    GameManager.getManager().resetChosenCards();
+                    jButtonSort.setVisible(false);
+                    if (page > 1) {
+                        page = 2;
+                        displayCards();
+                    }
+                    page = 1;
+                    displayCards();
+                }
+            });
+            */
+        }
+        return jButtonSort;
+    }
+
+    /**
+     * This method initializes jButtonCancel
+     *
+     * @return javax.swing.JButton
+     */
+    private HoverButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new HoverButton("", ImageManagerImpl.getInstance().getDlgCancelButtonImage(),
+                    ImageManagerImpl.getInstance().getDlgActiveCancelButtonImage(),
+                    ImageManagerImpl.getInstance().getDlgCancelButtonImage(),
+                    new Rectangle(60, 60));
+            int w = getDlgParams().rect.width - 75;
+            int h = getDlgParams().rect.height - 90;
+            jButtonCancel.setBounds(new Rectangle(w / 2 + 150, h - 50, 60, 60));
+            jButtonCancel.setToolTipText("Cancel");
+            jButtonCancel.setVisible(isOptional);
+            if (!isCancelStopsPlaying) {
+                jButtonCancel.setToolTipText("Done (enough)");
+                jButtonCancel.setBounds(new Rectangle(w / 2 + 150, h - 50, 60, 60));
+            }
+
+            jButtonCancel.setObserver(new Command() {
+                private static final long serialVersionUID = -567322540616089486L;
+
+                public void execute() {
+                    DialogManager.getManager().fadeOut((DialogContainer) getParent());
+                    /*
+                    try {
+                        ConnectionManager.sendAddChosenCard(null);
+                    } catch (RemoteException re) {
+                        re.printStackTrace();
+                    }
+                    */
+                }
+            });
+        }
+        return jButtonCancel;
+    }
+
+    /*
+    public void turnCardBorderOff(CardBean card) {
+        for (int i = 0; i < getComponentCount(); i++) {
+            Object o = getComponent(i);
+            if (o instanceof MWCardImpl) {
+                CardBean c = ((MWCardImpl) o).getCard();
+                if (c.equals(card)) {
+                    ((MWCardImpl) o).setBordered(false);
+                    return;
+                }
+            }
+        }
+    }*/
+
+    public void changeTitle(String cardName) {
+        jTitle.setText("Choose a card (by double-click), chosen card: " + cardName);
+    }
+
+}

Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/StackDialog.java

@@ -10,7 +10,6 @@ import mage.client.components.ext.dlg.IDialogPanel;
 import mage.client.game.FeedbackPanel;
 import mage.client.plugins.impl.Plugins;
 import mage.client.util.Command;
-import mage.client.util.Config;
 import mage.client.util.SettingsManager;
 import mage.view.CardView;
 import mage.view.CardsView;
@@ -132,13 +131,6 @@ public class StackDialog extends IDialogPanel {
         }
     }
 
-    private Dimension getCardDimension() {
-        if (cardDimension == null) {
-            cardDimension = new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight);
-        }
-        return cardDimension;
-    }
-
     private HoverButton getJButtonAccept() {
         if (jButtonAccept == null) {
             jButtonAccept = new HoverButton("", ImageManagerImpl.getInstance().getDlgAcceptButtonImage(),
@@ -183,6 +175,4 @@ public class StackDialog extends IDialogPanel {
         }
         return jButtonResponse;
     }
-
-    private Dimension cardDimension;
  }

Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java

@@ -41,11 +41,12 @@ import mage.client.MageFrame;
 import mage.client.cards.BigCard;
 import mage.client.components.HoverButton;
 import mage.client.components.MageRoundPane;
+import mage.client.components.ext.dlg.DialogManager;
 import mage.client.dialog.ShowCardsDialog;
 import mage.client.plugins.adapters.MageActionCallback;
 import mage.client.plugins.impl.Plugins;
+import mage.client.util.CardsViewUtil;
 import mage.client.util.Command;
-import mage.client.util.Config;
 import mage.client.util.ImageHelper;
 import mage.client.util.gui.BufferedImageBuilder;
 import mage.components.ImagePanel;
@@ -513,7 +514,8 @@ public class PlayerPanelExt extends javax.swing.JPanel {
         if (graveyard == null) {
             graveyard = new ShowCardsDialog();
         }
-        graveyard.loadCards(player.getName() + " graveyard", player.getGraveyard(), bigCard, Config.dimensions, gameId, false);
+        //graveyard.loadCards(player.getName() + " graveyard", player.getGraveyard(), bigCard, Config.dimensions, gameId, false);
+        DialogManager.getManager().showChoiceDialog(CardsViewUtil.convertSimple(player.getGraveyard()), bigCard, gameId);
     }
 
     private void btnCheatActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCheatActionPerformed

Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java

@@ -11,4 +11,8 @@ public interface ImageManager {
     public Image getDlgActiveAcceptButtonImage();
     public Image getDlgCancelButtonImage();
     public Image getDlgActiveCancelButtonImage();
+    public Image getDlgPrevButtonImage();
+    public Image getDlgActivePrevButtonImage();
+    public Image getDlgNextButtonImage();
+    public Image getDlgActiveNextButtonImage();
 }

Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java

@@ -80,6 +80,38 @@ public class ImageManagerImpl implements ImageManager {
         return imageDlgActiveAcceptButton;
     }
 
+    @Override
+    public Image getDlgPrevButtonImage() {
+        if (imageDlgPrevButton == null) {
+            imageDlgPrevButton = getBufferedImageFromResource("/dlg/dlg.prev.png");
+        }
+        return imageDlgPrevButton;
+    }
+
+    @Override
+    public Image getDlgActivePrevButtonImage() {
+        if (imageDlgActivePrevButton == null) {
+            imageDlgActivePrevButton = getBufferedImageFromResource("/dlg/dlg.prev.hover.png");
+        }
+        return imageDlgActivePrevButton;
+    }
+
+    @Override
+    public Image getDlgNextButtonImage() {
+        if (imageDlgNextButton == null) {
+            imageDlgNextButton = getBufferedImageFromResource("/dlg/dlg.next.png");
+        }
+        return imageDlgNextButton;
+    }
+
+    @Override
+    public Image getDlgActiveNextButtonImage() {
+        if (imageDlgActiveNextButton == null) {
+            imageDlgActiveNextButton = getBufferedImageFromResource("/dlg/dlg.next.hover.png");
+        }
+        return imageDlgActiveNextButton;
+    }
+
     protected static Image getImageFromResourceTransparent(String path, Color mask, Rectangle rec) {
         BufferedImage image = null;
         Image imageCardTransparent = null;
@@ -120,4 +152,8 @@ public class ImageManagerImpl implements ImageManager {
     private static BufferedImage imageDlgActiveAcceptButton;
     private static BufferedImage imageDlgCancelButton;
     private static BufferedImage imageDlgActiveCancelButton;
+    private static BufferedImage imageDlgPrevButton;
+    private static BufferedImage imageDlgActivePrevButton;
+    private static BufferedImage imageDlgNextButton;
+    private static BufferedImage imageDlgActiveNextButton;
 }