Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Add F2/F6, use bindings in game

Browse source
This commit is contained in:
Campbell Suter 2016-10-14 10:41:26 +13:00
parent d7a3904569
commit e910778e54
No known key found for this signature in database
GPG key ID: 754A66CCF3F73C0F
3 changed files with 2378 additions and 2292 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5896,9 +5896,13 @@
<Component id="labelYourTurn" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="lebelSkip" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="labelPriorEnd" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="labelSkipStep" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="labelConfirm" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="keyConfirm" min="-2" max="-2" attributes="0"/>
<Component id="keySkipStep" min="-2" max="-2" attributes="0"/>
<Component id="keySkipStack" min="-2" max="-2" attributes="0"/>
<Component id="keyYourTurn" min="-2" max="-2" attributes="0"/>
<Component id="keyNextTurn" min="-2" max="-2" attributes="0"/>
@ -5915,6 +5919,11 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="labelConfirm" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="keyConfirm" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="labelCancel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="keyCancelSkip" alignment="3" min="-2" max="-2" attributes="0"/>
@ -5930,6 +5939,11 @@
<Component id="keyEndStep" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="labelSkipStep" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="keySkipStep" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="labelMainStep" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="keyMainStep" alignment="3" min="-2" max="-2" attributes="0"/>
@ -5949,7 +5963,7 @@
<Component id="labelPriorEnd" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="keyPriorEnd" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="301" max="32767" attributes="0"/>
<EmptySpace pref="263" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@ -6025,6 +6039,26 @@
<Property name="text" type="java.lang.String" value="keyBindButton1"/>
</Properties>
</Component>
<Component class="mage.client.components.KeyBindButton" name="keySkipStep">
<Properties>
<Property name="text" type="java.lang.String" value="keyBindButton1"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="labelSkipStep">
<Properties>
<Property name="text" type="java.lang.String" value="Skip Step"/>
</Properties>
</Component>
<Component class="mage.client.components.KeyBindButton" name="keyConfirm">
<Properties>
<Property name="text" type="java.lang.String" value="keyBindButton1"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="labelConfirm">
<Properties>
<Property name="text" type="java.lang.String" value="Confirm"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>

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

@ -57,6 +57,7 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JSlider;
import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.border.Border;
import javax.swing.filechooser.FileFilter;
import mage.client.MageFrame;
@ -295,9 +296,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
public static final String KEY_CONNECTION_URL_SERVER_LIST = "connectionURLServerList";
// controls
public static final String KEY_CONTROL_CONFIRM = "controlConfirm";
public static final String KEY_CONTROL_CANCEL_SKIP = "controlCancelSkip";
public static final String KEY_CONTROL_NEXT_TURN = "controlNextTurn";
public static final String KEY_CONTROL_END_STEP = "controlEndStep";
public static final String KEY_CONTROL_SKIP_STEP = "controlSkipTurn";
public static final String KEY_CONTROL_MAIN_STEP = "controlMainStep";
public static final String KEY_CONTROL_YOUR_TURN = "controlYourTurn";
public static final String KEY_CONTROL_SKIP_STACK = "controlSkipStack";
@ -564,6 +567,10 @@ public class PreferencesDialog extends javax.swing.JDialog {
keyYourTurn = new mage.client.components.KeyBindButton();
keySkipStack = new mage.client.components.KeyBindButton();
keyPriorEnd = new mage.client.components.KeyBindButton();
keySkipStep = new mage.client.components.KeyBindButton();
labelSkipStep = new javax.swing.JLabel();
keyConfirm = new mage.client.components.KeyBindButton();
labelConfirm = new javax.swing.JLabel();
saveButton = new javax.swing.JButton();
exitButton = new javax.swing.JButton();
@ -2494,6 +2501,14 @@ public class PreferencesDialog extends javax.swing.JDialog {
keyPriorEnd.setText("keyBindButton1");
keySkipStep.setText("keyBindButton1");
labelSkipStep.setText("Skip Step");
keyConfirm.setText("keyBindButton1");
labelConfirm.setText("Confirm");
org.jdesktop.layout.GroupLayout tabControlsLayout = new org.jdesktop.layout.GroupLayout(tabControls);
tabControls.setLayout(tabControlsLayout);
tabControlsLayout.setHorizontalGroup(
@ -2507,9 +2522,13 @@ public class PreferencesDialog extends javax.swing.JDialog {
.add(labelMainStep)
.add(labelYourTurn)
.add(lebelSkip)
.add(labelPriorEnd))
.add(labelPriorEnd)
.add(labelSkipStep)
.add(labelConfirm))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(keyConfirm, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(keySkipStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(keySkipStack, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(keyYourTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(keyNextTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
@ -2523,6 +2542,10 @@ public class PreferencesDialog extends javax.swing.JDialog {
tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(tabControlsLayout.createSequentialGroup()
.addContainerGap()
.add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(labelConfirm)
.add(keyConfirm, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(labelCancel)
.add(keyCancelSkip, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
@ -2535,6 +2558,10 @@ public class PreferencesDialog extends javax.swing.JDialog {
.add(labelEndStep)
.add(keyEndStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(labelSkipStep)
.add(keySkipStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(labelMainStep)
.add(keyMainStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
@ -2550,7 +2577,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
.add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(labelPriorEnd)
.add(keyPriorEnd, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addContainerGap(301, Short.MAX_VALUE))
.addContainerGap(263, Short.MAX_VALUE))
);
tabsPanel.addTab("Controls", tabControls);
@ -2744,9 +2771,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
save(prefs, dialog.txtURLServerList, KEY_CONNECTION_URL_SERVER_LIST);
// controls
save(prefs, dialog.keyConfirm, KEY_CONTROL_CONFIRM);
save(prefs, dialog.keyCancelSkip, KEY_CONTROL_CANCEL_SKIP);
save(prefs, dialog.keyNextTurn, KEY_CONTROL_NEXT_TURN);
save(prefs, dialog.keyEndStep, KEY_CONTROL_END_STEP);
save(prefs, dialog.keySkipStep, KEY_CONTROL_SKIP_STEP);
save(prefs, dialog.keyMainStep, KEY_CONTROL_MAIN_STEP);
save(prefs, dialog.keyYourTurn, KEY_CONTROL_YOUR_TURN);
save(prefs, dialog.keySkipStack, KEY_CONTROL_SKIP_STACK);
@ -3289,9 +3318,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
}
private static void loadControlSettings(Preferences prefs) {
load(prefs, dialog.keyConfirm, KEY_CONTROL_CONFIRM, KeyEvent.VK_F2);
load(prefs, dialog.keyCancelSkip, KEY_CONTROL_CANCEL_SKIP, KeyEvent.VK_F3);
load(prefs, dialog.keyNextTurn, KEY_CONTROL_NEXT_TURN, KeyEvent.VK_F4);
load(prefs, dialog.keyEndStep, KEY_CONTROL_END_STEP, KeyEvent.VK_F5);
load(prefs, dialog.keySkipStep, KEY_CONTROL_SKIP_STEP, KeyEvent.VK_F6);
load(prefs, dialog.keyMainStep, KEY_CONTROL_MAIN_STEP, KeyEvent.VK_F7);
load(prefs, dialog.keyYourTurn, KEY_CONTROL_YOUR_TURN, KeyEvent.VK_F9);
load(prefs, dialog.keySkipStack, KEY_CONTROL_SKIP_STACK, KeyEvent.VK_F10);
@ -3500,6 +3531,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
}
}
public static KeyStroke getCachedKeystroke(String key, int def) {
int code = getCachedValue(key, def);
return KeyStroke.getKeyStroke(code, 0);
}
private static void updateCache(String key, String value) {
CACHE.put(key, value);
}
@ -3711,17 +3747,20 @@ public class PreferencesDialog extends javax.swing.JDialog {
private javax.swing.JPanel jPanel32;
private javax.swing.JPanel jPanel33;
private mage.client.components.KeyBindButton keyCancelSkip;
private mage.client.components.KeyBindButton keyConfirm;
private mage.client.components.KeyBindButton keyEndStep;
private mage.client.components.KeyBindButton keyMainStep;
private mage.client.components.KeyBindButton keyNextTurn;
private mage.client.components.KeyBindButton keyPriorEnd;
private mage.client.components.KeyBindButton keySkipStack;
private mage.client.components.KeyBindButton keySkipStep;
private mage.client.components.KeyBindButton keyYourTurn;
private javax.swing.JLabel labelCancel;
private javax.swing.JLabel labelCardSizeHand;
private javax.swing.JLabel labelCardSizeMaxBattlefield;
private javax.swing.JLabel labelCardSizeMinBattlefield;
private javax.swing.JLabel labelCardSizeOtherZones;
private javax.swing.JLabel labelConfirm;
private javax.swing.JLabel labelDialogFont;
private javax.swing.JLabel labelEditorCardOffset;
private javax.swing.JLabel labelEditorCardSize;
@ -3733,6 +3772,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
private javax.swing.JLabel labelNumberOfDownloadThreads;
private javax.swing.JLabel labelPreferedImageLanguage;
private javax.swing.JLabel labelPriorEnd;
private javax.swing.JLabel labelSkipStep;
private javax.swing.JLabel labelStackWidth;
private javax.swing.JLabel labelTooltipSize;
private javax.swing.JLabel labelYourTurn;

30
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -99,6 +99,9 @@ import mage.client.dialog.PickChoiceDialog;
import mage.client.dialog.PickNumberDialog;
import mage.client.dialog.PickPileDialog;
import mage.client.dialog.PreferencesDialog;
import static mage.client.dialog.PreferencesDialog.KEY_CONTROL_NEXT_TURN;
import static mage.client.dialog.PreferencesDialog.KEY_CONTROL_PRIOR_END;
import static mage.client.dialog.PreferencesDialog.KEY_CONTROL_YOUR_TURN;
import static mage.client.dialog.PreferencesDialog.KEY_GAME_MANA_AUTOPAYMENT;
import static mage.client.dialog.PreferencesDialog.KEY_GAME_MANA_AUTOPAYMENT_ONLY_ONE;
import static mage.client.dialog.PreferencesDialog.KEY_USE_FIRST_MANA_ABILITY;
@ -1446,7 +1449,8 @@ public final class GamePanel extends javax.swing.JPanel {
int c = JComponent.WHEN_IN_FOCUSED_WINDOW;
KeyStroke ks3 = KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0);
KeyStroke ks3 = PreferencesDialog.getCachedKeystroke(
PreferencesDialog.KEY_CONTROL_CANCEL_SKIP, KeyEvent.VK_F3);
this.getInputMap(c).put(ks3, "F3_PRESS");
this.getActionMap().put("F3_PRESS", new AbstractAction() {
@Override
@ -1483,7 +1487,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
});
KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0);
KeyStroke ks = PreferencesDialog.getCachedKeystroke(
PreferencesDialog.KEY_CONTROL_NEXT_TURN, KeyEvent.VK_F4);
this.getInputMap(c).put(ks, "F4_PRESS");
this.getActionMap().put("F4_PRESS", new AbstractAction() {
@Override
@ -1506,7 +1511,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
});
ks = KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0);
ks = PreferencesDialog.getCachedKeystroke(
PreferencesDialog.KEY_CONTROL_END_STEP, KeyEvent.VK_F5);
this.getInputMap(c).put(ks, "F5_PRESS");
this.getActionMap().put("F5_PRESS", new AbstractAction() {
@Override
@ -1515,7 +1521,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
});
ks = KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0);
ks = PreferencesDialog.getCachedKeystroke(
PreferencesDialog.KEY_CONTROL_SKIP_STEP, KeyEvent.VK_F6);
this.getInputMap(c).put(ks, "F6_PRESS");
this.getActionMap().put("F6_PRESS", new AbstractAction() {
@Override
@ -1538,7 +1545,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
});
ks = KeyStroke.getKeyStroke(KeyEvent.VK_F7, 0);
ks = PreferencesDialog.getCachedKeystroke(
PreferencesDialog.KEY_CONTROL_MAIN_STEP, KeyEvent.VK_F7);
this.getInputMap(c).put(ks, "F7_PRESS");
this.getActionMap().put("F7_PRESS", new AbstractAction() {
@Override
@ -1561,7 +1569,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
});
KeyStroke ks9 = KeyStroke.getKeyStroke(KeyEvent.VK_F9, 0);
KeyStroke ks9 = PreferencesDialog.getCachedKeystroke(
PreferencesDialog.KEY_CONTROL_YOUR_TURN, KeyEvent.VK_F9);
this.getInputMap(c).put(ks9, "F9_PRESS");
this.getActionMap().put("F9_PRESS", new AbstractAction() {
@Override
@ -1584,7 +1593,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
});
KeyStroke ks11 = KeyStroke.getKeyStroke(KeyEvent.VK_F11, 0);
KeyStroke ks11 = PreferencesDialog.getCachedKeystroke(
PreferencesDialog.KEY_CONTROL_PRIOR_END, KeyEvent.VK_F11);
this.getInputMap(c).put(ks11, "F11_PRESS");
this.getActionMap().put("F11_PRESS", new AbstractAction() {
@Override
@ -1607,7 +1617,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
});
ks = KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0);
ks = PreferencesDialog.getCachedKeystroke(
PreferencesDialog.KEY_CONTROL_SKIP_STACK, KeyEvent.VK_F10);
this.getInputMap(c).put(ks, "F10_PRESS");
this.getActionMap().put("F10_PRESS", new AbstractAction() {
@Override
@ -1630,7 +1641,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
});
KeyStroke ks2 = KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0);
KeyStroke ks2 = PreferencesDialog.getCachedKeystroke(
PreferencesDialog.KEY_CONTROL_CONFIRM, KeyEvent.VK_F2);
this.getInputMap(c).put(ks2, "F2_PRESS");
this.getActionMap().put("F2_PRESS", new AbstractAction() {
@Override