diff --git a/Mage.Client/src/mage/client/game/FeedbackPanel.form b/Mage.Client/src/mage/client/game/FeedbackPanel.form index 9f1a805b92c..46a6fee5863 100644 --- a/Mage.Client/src/mage/client/game/FeedbackPanel.form +++ b/Mage.Client/src/mage/client/game/FeedbackPanel.form @@ -22,7 +22,9 @@ - + + + @@ -38,6 +40,7 @@ + @@ -92,5 +95,13 @@ + + + + + + + + diff --git a/Mage.Client/src/mage/client/game/FeedbackPanel.java b/Mage.Client/src/mage/client/game/FeedbackPanel.java index c96a18aad04..6311f41b9b6 100644 --- a/Mage.Client/src/mage/client/game/FeedbackPanel.java +++ b/Mage.Client/src/mage/client/game/FeedbackPanel.java @@ -75,7 +75,7 @@ public class FeedbackPanel extends javax.swing.JPanel { session = MageFrame.getSession(); } - public void getFeedback(FeedbackMode mode, String message, boolean modal) { + public void getFeedback(FeedbackMode mode, String message, boolean modal, boolean special) { this.lblMessage.setText(message); this.selected = false; this.mode = mode; @@ -107,6 +107,7 @@ public class FeedbackPanel extends javax.swing.JPanel { this.btnRight.setText("Done"); break; } + this.btnSpecial.setVisible(special); if (modal) startModal(); this.revalidate(); @@ -176,6 +177,7 @@ public class FeedbackPanel extends javax.swing.JPanel { btnLeft = new javax.swing.JButton(); jScrollPane1 = new javax.swing.JScrollPane(); lblMessage = new javax.swing.JTextArea(); + btnSpecial = new javax.swing.JButton(); setBackground(new java.awt.Color(204, 204, 204)); @@ -205,12 +207,21 @@ public class FeedbackPanel extends javax.swing.JPanel { lblMessage.setBorder(null); jScrollPane1.setViewportView(lblMessage); + btnSpecial.setText("Special"); + btnSpecial.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnSpecialActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap(106, Short.MAX_VALUE) + .addContainerGap() + .addComponent(btnSpecial) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 31, Short.MAX_VALUE) .addComponent(btnLeft) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btnRight)) @@ -223,7 +234,8 @@ public class FeedbackPanel extends javax.swing.JPanel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(btnRight) - .addComponent(btnLeft))) + .addComponent(btnLeft) + .addComponent(btnSpecial))) ); }// //GEN-END:initComponents @@ -242,10 +254,15 @@ public class FeedbackPanel extends javax.swing.JPanel { session.sendPlayerBoolean(gameId, true); }//GEN-LAST:event_btnLeftActionPerformed + private void btnSpecialActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSpecialActionPerformed + session.sendPlayerString(gameId, "special"); + }//GEN-LAST:event_btnSpecialActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnLeft; private javax.swing.JButton btnRight; + private javax.swing.JButton btnSpecial; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTextArea lblMessage; // End of variables declaration//GEN-END:variables diff --git a/Mage.Client/src/mage/client/game/GamePanel.form b/Mage.Client/src/mage/client/game/GamePanel.form index 04430013ba4..c2d2f7744a8 100644 --- a/Mage.Client/src/mage/client/game/GamePanel.form +++ b/Mage.Client/src/mage/client/game/GamePanel.form @@ -63,7 +63,7 @@ - + @@ -399,7 +399,7 @@ - + diff --git a/Mage.Client/src/mage/client/game/GamePanel.java b/Mage.Client/src/mage/client/game/GamePanel.java index c9020042d90..8e3287d2980 100644 --- a/Mage.Client/src/mage/client/game/GamePanel.java +++ b/Mage.Client/src/mage/client/game/GamePanel.java @@ -183,7 +183,7 @@ public class GamePanel extends javax.swing.JPanel { } public void ask(String question) { - this.feedbackPanel.getFeedback(FeedbackMode.QUESTION, question, true); + this.feedbackPanel.getFeedback(FeedbackMode.QUESTION, question, true, false); } public void inform(String information, CardsView cardView, GameView gameView) { @@ -191,7 +191,7 @@ public class GamePanel extends javax.swing.JPanel { if (cardView != null && cardView.size() > 0) { showCards(information, cardView); } - this.feedbackPanel.getFeedback(FeedbackMode.INFORM, information, false); + this.feedbackPanel.getFeedback(FeedbackMode.INFORM, information, false, gameView.getSpecial()); } public void cancel(String message, CardsView cardView, GameView gameView) { @@ -199,7 +199,7 @@ public class GamePanel extends javax.swing.JPanel { if (cardView != null && cardView.size() > 0) { showCards(message, cardView); } - this.feedbackPanel.getFeedback(FeedbackMode.CANCEL, message, false); + this.feedbackPanel.getFeedback(FeedbackMode.CANCEL, message, false, gameView.getSpecial()); } public void modalMessage(String message) { @@ -216,17 +216,17 @@ public class GamePanel extends javax.swing.JPanel { public void select(String message, GameView gameView) { updateGame(gameView); - this.feedbackPanel.getFeedback(FeedbackMode.SELECT, message, false); + this.feedbackPanel.getFeedback(FeedbackMode.SELECT, message, false, gameView.getSpecial()); } public void playMana(String message, GameView gameView) { updateGame(gameView); - this.feedbackPanel.getFeedback(FeedbackMode.CANCEL, message, false); + this.feedbackPanel.getFeedback(FeedbackMode.CANCEL, message, false, gameView.getSpecial()); } public void playXMana(String message, GameView gameView) { updateGame(gameView); - this.feedbackPanel.getFeedback(FeedbackMode.CONFIRM, message, false); + this.feedbackPanel.getFeedback(FeedbackMode.CONFIRM, message, false, gameView.getSpecial()); } public void replayMessage(String message) {