From d5bb17226e6be5389ee457e26bdc41f735a6329f Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Wed, 14 Dec 2011 04:46:52 +0000 Subject: [PATCH] Final stages of development for Quest submenu. --- res/pics/icons/PetIcon.png | Bin 1469 -> 8782 bytes res/pics/icons/PlantIcon.png | Bin 12227 -> 13834 bytes src/main/java/forge/control/ControlAllUI.java | 47 +++++++++++++----- .../java/forge/control/home/ControlQuest.java | 10 ++++ src/main/java/forge/view/home/ViewQuest.java | 21 ++++++-- 5 files changed, 61 insertions(+), 17 deletions(-) diff --git a/res/pics/icons/PetIcon.png b/res/pics/icons/PetIcon.png index 21b9dc15597f15220ab05f9786ce87ded29c4905..38ed9632ddf135d0a53b600f02cb9682f11f6778 100644 GIT binary patch literal 8782 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 M$f!!!NScTJ5B=t~{{R30 literal 1469 zcmV;u1w#6XP)ZVg+kc{ zgqE9?h5%wK$(q#Iry6ghzL@x+4^2!otxeU$)+U-Z^-@dK2V3KdiM~i;36=(tLgmud zmitmD7okvaxou%#S(d%bWoO3!%q|p`vfGXi{gXd?cFsBTf9L=H%NdO<%kVfw3y)cJ zn@wmmn$_{yvXfSm$@HnwXe=2YAFurUi|;;MySD7i2?l@OOioTd?DhKMoX)xTPJjJ< z>)JJ&d0MmSL>R!g-<&#SwOUWSuy-G@Y!KR78)0~OxZdq{AJA&GBI>*O`S~AYXJ@Ar zJ^dVT91DL`U*K&v+ec^0&i@z-fHLtQ4I6)_y{$=J5x?IrkB*MY4#&T8SLao(r~3xy zU7nTK3eWR0f|D=&_OpEK==+Ca*@+qhnVFf#b8>Q&u_P{oRufRhEGt7np_O@N_w$S? zJ~g~r0yeM!I*L>N6%`dhUS8h0PmUdaQFRbnES9H`cO3B`$uvlk3{RvbC`KqPtAJV& zF(@b}Vp$d#T7YD8CZwmQQwBraY1IHQ4kQu_vP6MSX8@Wu0&)&!vl&EDT(?$|gf(Lc zG~k1Tgalw1dber-$fsWcqNN_ZnWFD|K;-W~N02PbDZjyBkZjhd0uTtWzQ~iV7yYVn zS(et#pkc)m6h*Nl22}zG_|Xf|NDA}MMbIIEAP6fov8pL>xm=S3fFuROsT9e3Pzk)X z?hkoHTm^x@OR51l9FB3!eSBf)gyNb&3#BF>o|89tfGEibpU*$39>Bf1n;wq`c+QW; zFwG<};-m;5xY5JJ14Ie<`T2!G)c`6gE;UV0PrG=Y!;J83m?sph&=bi&2||n^aLzAW zR}BCgi)(Cb%;xiX;bGb~S>y4zU~=*fIOpuJxaeN4uCD)ERW}Ta8}r%gm>Gd(&m6?Z zCt@+u1I_5esm6nVLCUf|91F0#yoeqMxt^TOZnyW5cl;j!a%yUd8OtdKlN$}VHh6+m z$`z$3E$HIY^JmdSJzkhV8%XX^)tEIcJu%N_hE!kx;n{ZxG zfG`XNsi~IjVH-hJ0Pr;XO(p}nH=vx1yx8O6;P;EQ?dN~^=`*KuArM~r%iC|gvG>T4 zLtk#oNYoO0dc6+Y`S$G6(tUX~H4Xo$$^vx%s}vh4MHK)Hz&M(wDXmtc01!nPIy$;PK`uq zua3@6TOG#*l|6`o+^R^?*rtX8?aYj0LY6g3y0ETK#LDZ5i7ESE4OcG_&^jHhfWJFtcd81)fq|jg zIp-n}mkte&wBw`shxpi;$NFFH^#&y3y~)X`fvT!nuc|swSKrk7Y)Ns;&b%FaTnmeB z%H2D*hzNXeaPZFU0L$;P*>08NGcIZe+w8*x#gv0rDQ+CCm*xp$?TV3 z-~ZBAI4+K6C+4RaN&)It)ZQ2Y7%91=mXZ2EQdHHaSy;&3duOz(^(I30rN*-Jp8x{@ Xpbkq-lGf9}00000NkvXXu0mjf!Th-r diff --git a/res/pics/icons/PlantIcon.png b/res/pics/icons/PlantIcon.png index e2e243848fde39ede342f946009c3493b77cb007..dae1d86ba1b6f0f23ac032704ed9423377739af7 100644 GIT binary patch literal 13834 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 M07*qoM6N<$f}ATsbpQYW literal 12227 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 IlCuc;AF*IPLjV8( diff --git a/src/main/java/forge/control/ControlAllUI.java b/src/main/java/forge/control/ControlAllUI.java index ad7b233cd36..b323082eab7 100644 --- a/src/main/java/forge/control/ControlAllUI.java +++ b/src/main/java/forge/control/ControlAllUI.java @@ -24,8 +24,8 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import javax.swing.JLayeredPane; +import javax.swing.WindowConstants; -import forge.AllZone; import forge.quest.gui.bazaar.QuestBazaarPanel; import forge.view.GuiTopLevel; import forge.view.editor.EditorTopLevel; @@ -46,7 +46,7 @@ public class ControlAllUI { private HomeTopLevel home = null; private ViewTopLevel match = null; private EditorTopLevel editor = null; - private WindowAdapter waConcede; + private WindowAdapter waDefault, waConcede, waLeaveBazaar; private QuestBazaarPanel bazaar; /** */ @@ -73,13 +73,38 @@ public class ControlAllUI { this.display = (JLayeredPane) this.view.getContentPane(); + // "Close" button override during match this.waConcede = new WindowAdapter() { @Override - public void windowClosing(final WindowEvent evt) { - ViewTopLevel t = ((GuiTopLevel) AllZone.getDisplay()).getController().getMatchController().getView(); - t.getDockController().concede(); + public void windowClosing(final WindowEvent e) { + view.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + getMatchView().getDockController().concede(); } }; + + // "Close" button override while inside bazaar (will probably be used later for other things) + this.waLeaveBazaar = new WindowAdapter() { + @Override + public void windowClosing(final WindowEvent e) { + view.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + changeState(0); + } + }; + + // Default action on window close + this.waDefault = new WindowAdapter() { + public void windowClosing(WindowEvent e) { + view.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + } + }; + + // Handles resizing in null layouts of layers in JLayeredPane. + view.addComponentListener(new ComponentAdapter() { + @Override + public void componentResized(final ComponentEvent e) { + sizeChildren(); + } + }); } /** @@ -98,15 +123,10 @@ public class ControlAllUI { this.display.removeAll(); this.view.removeWindowListener(waConcede); + this.view.removeWindowListener(waLeaveBazaar); + this.view.addWindowListener(waDefault); this.view.addOverlay(); - view.addComponentListener(new ComponentAdapter() { - @Override - public void componentResized(final ComponentEvent e) { - sizeChildren(); - } - }); - // Fire up new state switch (i) { case 0: // Home screen @@ -131,6 +151,7 @@ public class ControlAllUI { this.bazaar = new QuestBazaarPanel(null); this.display.add(bazaar, JLayeredPane.DEFAULT_LAYER); sizeChildren(); + view.addWindowListener(waLeaveBazaar); break; default: @@ -171,7 +192,7 @@ public class ControlAllUI { } /** Sizes children of JLayeredPane to fully fit their layers. */ - private void sizeChildren() { + private void sizeChildren() { System.out.println("asdf55"); Component[] children; children = ControlAllUI.this.display.getComponentsInLayer(JLayeredPane.DEFAULT_LAYER); diff --git a/src/main/java/forge/control/home/ControlQuest.java b/src/main/java/forge/control/home/ControlQuest.java index ba7c37e34b6..b8757000b50 100644 --- a/src/main/java/forge/control/home/ControlQuest.java +++ b/src/main/java/forge/control/home/ControlQuest.java @@ -91,6 +91,14 @@ public class ControlQuest { g.setVisible(true); } + private void updateCredits() { + view.getLblCredits().setText(Long.toString(view.getQuestData().getCredits())); + } + + private void updateLife() { + view.getLblLife().setText(Long.toString(view.getQuestData().getLife())); + } + /** */ public void showCardShop() { final Command exit = new Command() { @@ -100,6 +108,8 @@ public class ControlQuest { public void execute() { // saves all deck data AllZone.getQuestData().saveData(); + updateCredits(); + updateLife(); } }; diff --git a/src/main/java/forge/view/home/ViewQuest.java b/src/main/java/forge/view/home/ViewQuest.java index f534bfdcf00..497719cfc29 100644 --- a/src/main/java/forge/view/home/ViewQuest.java +++ b/src/main/java/forge/view/home/ViewQuest.java @@ -56,7 +56,7 @@ public class ViewQuest extends JScrollPane { private JRadioButton radEasy, radMedium, radHard, radExpert, radFantasy, radClassic; private JCheckBox cbStandardStart, cbPlant, cbZep; private JComboBox cbxPet; - private JLabel lblPlant, lblPet, lblZep; + private JLabel lblPlant, lblPet, lblZep, lblLife, lblCredits; private boolean previousQuestExists = false; /** @@ -69,6 +69,7 @@ public class ViewQuest extends JScrollPane { super(VERTICAL_SCROLLBAR_ALWAYS, HORIZONTAL_SCROLLBAR_AS_NEEDED); this.setOpaque(false); this.setBorder(null); + this.getVerticalScrollBar().setUnitIncrement(16); parentView = v0; skin = AllZone.getSkin(); @@ -192,14 +193,14 @@ public class ViewQuest extends JScrollPane { optionsContainer.setLayout(new MigLayout("insets 0, gap 0")); optionsContainer.setBorder(new MatteBorder(0, 0, 1, 0, skin.getColor("borders"))); - JLabel lblCredits = new JLabel("Credits: " + Long.toString(questData.getCredits())); + lblCredits = new JLabel("Credits: " + Long.toString(questData.getCredits())); lblCredits.setIcon(GuiUtils.getResizedIcon(new ImageIcon("res/pics/icons/CoinStack.png"), 26, 26)); lblCredits.setForeground(skin.getColor("text")); lblCredits.setIconTextGap(5); lblCredits.setHorizontalAlignment(SwingConstants.CENTER); lblCredits.setFont(skin.getFont1().deriveFont(Font.BOLD, 14)); - JLabel lblLife = new JLabel("Life: " + Long.toString(questData.getLife())); + lblLife = new JLabel("Life: " + Long.toString(questData.getLife())); lblLife.setIcon(GuiUtils.getResizedIcon(new ImageIcon("res/pics/icons/Life.png"), 26, 26)); lblLife.setForeground(skin.getColor("text")); lblLife.setIconTextGap(5); @@ -260,8 +261,10 @@ public class ViewQuest extends JScrollPane { cbxPet = new JComboBox(); cbxPet.setFont(skin.getFont1().deriveFont(Font.PLAIN, 14)); - cbPlant = new OptionsCheckBox("Summon Wall"); + cbPlant = new OptionsCheckBox("Summon Plant"); + cbPlant.setFont(skin.getFont1().deriveFont(Font.PLAIN, 14)); cbZep = new OptionsCheckBox("Launch Zeppelin"); + cbZep.setFont(skin.getFont1().deriveFont(Font.PLAIN, 14)); lblPet = new JLabel(GuiUtils.getResizedIcon( new ImageIcon("res/pics/icons/PetIcon.png"), 30, 30)); @@ -637,4 +640,14 @@ public class ViewQuest extends JScrollPane { public boolean hasPreviousQuest() { return previousQuestExists; } + + /** @return JLabel */ + public JLabel getLblLife() { + return lblLife; + } + + /** @return JLabel */ + public JLabel getLblCredits() { + return lblCredits; + } }