External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 19:41:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Issue#5: 'Show tooltips' doesn't affect cards in all zones

Browse source
This commit is contained in:
magenoxx 2012-04-30 19:26:26 +04:00
parent b88e7d7a4e
commit ef2a36c329
2 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
View file

@ -64,7 +64,7 @@ import static mage.client.util.PhaseManager.*;
public class PreferencesDialog extends javax.swing.JDialog { public class PreferencesDialog extends javax.swing.JDialog {
public static final String KEY_HAND_USE_BIG_CARDS = "handUseBigCards"; public static final String KEY_HAND_USE_BIG_CARDS = "handUseBigCards";
public static final String KEY_HAND_SHOW_TOOLTIPS = "handShowTooltips"; public static final String KEY_SHOW_TOOLTIPS_ANY_ZONE = "showTooltipsInAnyZone";
public static final String KEY_PERMANENTS_IN_ONE_PILE = "nonLandPermanentsInOnePile"; public static final String KEY_PERMANENTS_IN_ONE_PILE = "nonLandPermanentsInOnePile";
public static final String KEY_CARD_IMAGES_USE_DEFAULT = "cardImagesUseDefault"; public static final String KEY_CARD_IMAGES_USE_DEFAULT = "cardImagesUseDefault";
public static final String KEY_CARD_IMAGES_PATH = "cardImagesPath"; public static final String KEY_CARD_IMAGES_PATH = "cardImagesPath";
@ -134,7 +134,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
jTabbedPane1 = new javax.swing.JTabbedPane(); jTabbedPane1 = new javax.swing.JTabbedPane();
jPanel1 = new javax.swing.JPanel(); jPanel1 = new javax.swing.JPanel();
jPanel3 = new javax.swing.JPanel(); jPanel3 = new javax.swing.JPanel();
showToolTipsInHand = new javax.swing.JCheckBox(); showToolTipsInAnyZone = new javax.swing.JCheckBox();
displayBigCardsInHand = new javax.swing.JCheckBox(); displayBigCardsInHand = new javax.swing.JCheckBox();
jPanel7 = new javax.swing.JPanel(); jPanel7 = new javax.swing.JPanel();
nonLandPermanentsInOnePile = new javax.swing.JCheckBox(); nonLandPermanentsInOnePile = new javax.swing.JCheckBox();
@ -209,9 +209,9 @@ public class PreferencesDialog extends javax.swing.JDialog {
jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Hand")); jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Hand"));
showToolTipsInHand.setSelected(true); showToolTipsInAnyZone.setSelected(true);
showToolTipsInHand.setText("Show tooltips"); showToolTipsInAnyZone.setText("Show tooltips");
showToolTipsInHand.addActionListener(new java.awt.event.ActionListener() { showToolTipsInAnyZone.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
showToolTipsInHandActionPerformed(evt); showToolTipsInHandActionPerformed(evt);
} }
@ -231,14 +231,14 @@ public class PreferencesDialog extends javax.swing.JDialog {
.addGroup(jPanel3Layout.createSequentialGroup() .addGroup(jPanel3Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(showToolTipsInHand) .addComponent(showToolTipsInAnyZone)
.addComponent(displayBigCardsInHand)) .addComponent(displayBigCardsInHand))
.addContainerGap(161, Short.MAX_VALUE)) .addContainerGap(161, Short.MAX_VALUE))
); );
jPanel3Layout.setVerticalGroup( jPanel3Layout.setVerticalGroup(
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createSequentialGroup() .addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(showToolTipsInHand) .addComponent(showToolTipsInAnyZone)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(displayBigCardsInHand) .addComponent(displayBigCardsInHand)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
@ -938,7 +938,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
save(prefs, dialog.checkBoxMain2Others, MAIN_2_OTHERS); save(prefs, dialog.checkBoxMain2Others, MAIN_2_OTHERS);
save(prefs, dialog.checkBoxEndTurnOthers, END_OF_TURN_OTHERS); save(prefs, dialog.checkBoxEndTurnOthers, END_OF_TURN_OTHERS);
save(prefs, dialog.displayBigCardsInHand, KEY_HAND_USE_BIG_CARDS, "true", "false", UPDATE_CACHE_POLICY); save(prefs, dialog.displayBigCardsInHand, KEY_HAND_USE_BIG_CARDS, "true", "false", UPDATE_CACHE_POLICY);
save(prefs, dialog.showToolTipsInHand, KEY_HAND_SHOW_TOOLTIPS, "true", "false", UPDATE_CACHE_POLICY); save(prefs, dialog.showToolTipsInAnyZone, KEY_SHOW_TOOLTIPS_ANY_ZONE, "true", "false", UPDATE_CACHE_POLICY);
save(prefs, dialog.nonLandPermanentsInOnePile, KEY_PERMANENTS_IN_ONE_PILE, "true", "false", UPDATE_CACHE_POLICY); save(prefs, dialog.nonLandPermanentsInOnePile, KEY_PERMANENTS_IN_ONE_PILE, "true", "false", UPDATE_CACHE_POLICY);
// connection // connection
@ -1103,7 +1103,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
load(prefs, dialog.checkBoxMain2Others, MAIN_2_OTHERS); load(prefs, dialog.checkBoxMain2Others, MAIN_2_OTHERS);
load(prefs, dialog.checkBoxEndTurnOthers, END_OF_TURN_OTHERS); load(prefs, dialog.checkBoxEndTurnOthers, END_OF_TURN_OTHERS);
load(prefs, dialog.displayBigCardsInHand, KEY_HAND_USE_BIG_CARDS, "true"); load(prefs, dialog.displayBigCardsInHand, KEY_HAND_USE_BIG_CARDS, "true");
load(prefs, dialog.showToolTipsInHand, KEY_HAND_SHOW_TOOLTIPS, "true"); load(prefs, dialog.showToolTipsInAnyZone, KEY_SHOW_TOOLTIPS_ANY_ZONE, "true");
load(prefs, dialog.nonLandPermanentsInOnePile, KEY_PERMANENTS_IN_ONE_PILE, "true"); load(prefs, dialog.nonLandPermanentsInOnePile, KEY_PERMANENTS_IN_ONE_PILE, "true");
} }
@ -1374,7 +1374,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
private javax.swing.JPanel pnlProxySettings; private javax.swing.JPanel pnlProxySettings;
private javax.swing.JCheckBox rememberPswd; private javax.swing.JCheckBox rememberPswd;
private javax.swing.JButton saveButton; private javax.swing.JButton saveButton;
private javax.swing.JCheckBox showToolTipsInHand; private javax.swing.JCheckBox showToolTipsInAnyZone;
private javax.swing.JPasswordField txtPasswordField; private javax.swing.JPasswordField txtPasswordField;
private javax.swing.JTextField txtProxyPort; private javax.swing.JTextField txtProxyPort;
private javax.swing.JTextField txtProxyServer; private javax.swing.JTextField txtProxyServer;

26
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
View file

@ -1,13 +1,5 @@
package mage.client.plugins.adapters; package mage.client.plugins.adapters;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.util.List;
import java.util.UUID;
import javax.swing.*;
import mage.Constants; import mage.Constants;
import mage.cards.MageCard; import mage.cards.MageCard;
import mage.cards.MagePermanent; import mage.cards.MagePermanent;
@ -19,17 +11,23 @@ import mage.client.components.MageComponents;
import mage.client.dialog.PreferencesDialog; import mage.client.dialog.PreferencesDialog;
import mage.client.game.PlayAreaPanel; import mage.client.game.PlayAreaPanel;
import mage.client.plugins.impl.Plugins; import mage.client.plugins.impl.Plugins;
import mage.remote.Session;
import mage.client.util.DefaultActionCallback; import mage.client.util.DefaultActionCallback;
import mage.client.util.ImageHelper; import mage.client.util.ImageHelper;
import mage.client.util.gui.ArrowBuilder; import mage.client.util.gui.ArrowBuilder;
import mage.client.util.gui.GuiDisplayUtil; import mage.client.util.gui.GuiDisplayUtil;
import mage.components.CardInfoPane; import mage.components.CardInfoPane;
import mage.remote.Session;
import mage.utils.ThreadUtils; import mage.utils.ThreadUtils;
import mage.view.CardView; import mage.view.CardView;
import org.jdesktop.swingx.JXPanel; import org.jdesktop.swingx.JXPanel;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.util.List;
import java.util.UUID;
public class MageActionCallback implements ActionCallback { public class MageActionCallback implements ActionCallback {
private Popup popup; private Popup popup;
@ -126,14 +124,14 @@ public class MageActionCallback implements ActionCallback {
} }
if (data.component instanceof MageCard) { if (data.component instanceof MageCard) {
String zone = ((MageCard)(data.component)).getZone(); //String zone = ((MageCard)(data.component)).getZone();
if (zone != null && zone.equals(Constants.Zone.HAND.toString())) { //if (zone != null && zone.equals(Constants.Zone.HAND.toString())) {
// for performance getting cached value // for performance getting cached value
String showTooltips = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_HAND_SHOW_TOOLTIPS, "false"); String showTooltips = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_SHOW_TOOLTIPS_ANY_ZONE, "false");
if (showTooltips.equals("false")) { if (showTooltips.equals("false")) {
return; return;
} }
} //}
} }
if (cardInfoPane == null) { if (cardInfoPane == null) {