external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

*Commented out Change/Remove picture buttons from the CardPanel, hopefully fixes the Quest Deck Editor.

Browse Source
This commit is contained in:
Hellfish
2011-10-25 20:06:59 +00:00
parent cddfb559a1
commit cf15e2aa17
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/forge/gui/deckeditor/CardPanelHeavy.java
View File

@@ -15,7 +15,6 @@ import arcane.ui.CardPanel;
import arcane.ui.ViewPanel; import arcane.ui.ViewPanel;
import forge.Card; import forge.Card;
import forge.CardUtil;
import forge.GuiDisplayUtil; import forge.GuiDisplayUtil;
import forge.ImagePreviewPanel; import forge.ImagePreviewPanel;
import forge.Singletons; import forge.Singletons;
@@ -35,9 +34,13 @@ public class CardPanelHeavy extends CardPanelBase {
private static final long serialVersionUID = -7134546689397508597L; private static final long serialVersionUID = -7134546689397508597L;
private JButton changeStateButton = new JButton(); private JButton changeStateButton = new JButton();
/*
* Removed Oct 25 2011 - Hellfish
private JButton changePictureButton = new JButton(); private JButton changePictureButton = new JButton();
private JButton removePictureButton = new JButton(); private JButton removePictureButton = new JButton();
*/
// Controls to show card details // Controls to show card details
protected CardDetailPanel detail = new CardDetailPanel(null); protected CardDetailPanel detail = new CardDetailPanel(null);
protected CardPanel picture = new CardPanel(null); protected CardPanel picture = new CardPanel(null);
@@ -58,6 +61,8 @@ public class CardPanelHeavy extends CardPanelBase {
if (!Singletons.getModel().getPreferences().lafFonts) if (!Singletons.getModel().getPreferences().lafFonts)
changeStateButton.setFont(new java.awt.Font("Dialog", 0, 10)); changeStateButton.setFont(new java.awt.Font("Dialog", 0, 10));
/*
* Removed Oct 25 2011 - Hellfish
changePictureButton.setText("Change picture..."); changePictureButton.setText("Change picture...");
changePictureButton.addActionListener(new java.awt.event.ActionListener() { changePictureButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@@ -75,14 +80,19 @@ public class CardPanelHeavy extends CardPanelBase {
}); });
if (!Singletons.getModel().getPreferences().lafFonts) if (!Singletons.getModel().getPreferences().lafFonts)
removePictureButton.setFont(new java.awt.Font("Dialog", 0, 10)); removePictureButton.setFont(new java.awt.Font("Dialog", 0, 10));
*/
pictureViewPanel.setCardPanel(picture); pictureViewPanel.setCardPanel(picture);
this.setLayout(new MigLayout("fill, ins 0")); this.setLayout(new MigLayout("fill, ins 0"));
this.add(detail, "w 239, h 323, grow, flowy, wrap"); this.add(detail, "w 239, h 323, grow, flowy, wrap");
/*
* Removed Oct 25 2011 - Hellfish
this.add(changeStateButton, "align 50% 0%, split 3, flowx"); this.add(changeStateButton, "align 50% 0%, split 3, flowx");
this.add(changePictureButton, "align 50% 0%"); this.add(changePictureButton, "align 50% 0%");
this.add(removePictureButton, "align 50% 0%, wrap"); this.add(removePictureButton, "align 50% 0%, wrap");
*/
this.add(changeStateButton, "align 50% 0%, flowx, wrap");
this.add(pictureViewPanel, "wmin 239, hmin 323, grow"); this.add(pictureViewPanel, "wmin 239, hmin 323, grow");
} }
@@ -131,7 +141,7 @@ public class CardPanelHeavy extends CardPanelBase {
/** /**
* <p> * <p>
* changePictureButton_actionPerformed. * changePictureButton_actionPerformed. Removed Oct 25 2011 - Hellfish
* </p> * </p>
* *
* @param e * @param e
@@ -196,7 +206,11 @@ public class CardPanelHeavy extends CardPanelBase {
}; };
/**
*
* <p>removePictureButton_actionPerformed</p>. Removed Oct 25 2011 - Hellfish
* @param e
*/
void removePictureButton_actionPerformed(ActionEvent e) { void removePictureButton_actionPerformed(ActionEvent e) {
if (cCardHQ != null) { if (cCardHQ != null) {
String options[] = { "Yes", "No" }; String options[] = { "Yes", "No" };