From a9cc0f8946e9bf4f4553f706c959ccdc9b3125d8 Mon Sep 17 00:00:00 2001 From: Sol Date: Mon, 15 Oct 2012 03:30:47 +0000 Subject: [PATCH] - Hooking up Auto and Reset functions in Assign Damage (I can't quite figure out how to get the alignment of the buttons to work, if some kind soul would like to add it, that'd be great) --- src/main/java/forge/gui/match/VAssignDamage.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/forge/gui/match/VAssignDamage.java b/src/main/java/forge/gui/match/VAssignDamage.java index b46433e5f9c..fe7789ba646 100644 --- a/src/main/java/forge/gui/match/VAssignDamage.java +++ b/src/main/java/forge/gui/match/VAssignDamage.java @@ -69,7 +69,11 @@ public class VAssignDamage { private Integer activeIndex = 0; private final JLabel lblTotalDamage = new FLabel.Builder().text("Available damage points: Unknown").build(); + + // Label Buttons private final FLabel lblOK = new FLabel.Builder().text("OK").hoverable(true).opaque(true).fontSize(16).build(); + private final FLabel lblReset = new FLabel.Builder().text("Reset").hoverable(true).opaque(true).fontSize(16).build(); + private final FLabel lblAuto = new FLabel.Builder().text("Auto").hoverable(true).opaque(true).fontSize(16).build(); // TODO Add Auto and Reset Buttons and hook them up to created functions @@ -244,6 +248,12 @@ public class VAssignDamage { private final Command cmdOK = new Command() { @Override public void execute() { finish(); } }; + + private final Command cmdReset = new Command() { @Override + public void execute() { resetAssignDamage(); } }; + + private final Command cmdAuto = new Command() { @Override + public void execute() { autoAssignDamage(); } }; /** Constructor. * @@ -327,13 +337,17 @@ public class VAssignDamage { } lblOK.setCommand(cmdOK); + lblReset.setCommand(cmdReset); + lblAuto.setCommand(cmdAuto); // Final UI layout pnlMain.setLayout(new MigLayout("insets 0, gap 0, wrap 2, ax center")); pnlMain.add(pnlAttacker, "w 125px!, h 160px!, gap 50px 0 0 15px"); pnlMain.add(pnlInfo, "gap 20px 0 0 15px"); pnlMain.add(scrDefenders, "w 96%!, gap 2% 0 0 0, pushy, growy, ax center, span 2"); + pnlMain.add(lblOK, "w 100px!, h 30px!, gap 0 0 5px 10px, ax center, span 2"); + // TODO Align lblAuto and lblRest on same row as OK button. Auto, Ok, Reset overlay.add(pnlMain);