From 3ea9c186678e2e627d3af104aeeebf722d024adb Mon Sep 17 00:00:00 2001 From: melvin Date: Fri, 27 May 2011 12:56:29 +0800 Subject: [PATCH] make default resolution 312x445 as that is the resolution of card images download from magiccards.info, option 'Show original images' will display the original resolution of the image --- src/magic/data/CardImagesProvider.java | 5 +++-- src/magic/data/GeneralConfig.java | 4 ++-- src/magic/ui/PreferencesDialog.java | 4 ++-- src/magic/ui/viewer/CardViewer.java | 5 ++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/magic/data/CardImagesProvider.java b/src/magic/data/CardImagesProvider.java index cdec3a6410..79e9d0db4b 100644 --- a/src/magic/data/CardImagesProvider.java +++ b/src/magic/data/CardImagesProvider.java @@ -9,11 +9,12 @@ import magic.model.MagicCardDefinition; public interface CardImagesProvider { public static final String IMAGE_EXTENSION=".jpg"; - public static final int CARD_WIDTH=203; - public static final int CARD_HEIGHT=289; + public static final int CARD_WIDTH=312; + public static final int CARD_HEIGHT=445; public BufferedImage getImage( final MagicCardDefinition cardDefinition, final int index, final boolean high); + } diff --git a/src/magic/data/GeneralConfig.java b/src/magic/data/GeneralConfig.java index bae46e8e4a..346f720ff2 100644 --- a/src/magic/data/GeneralConfig.java +++ b/src/magic/data/GeneralConfig.java @@ -52,7 +52,7 @@ public class GeneralConfig { private static final int DEFAULT_POPUP_DELAY=300; private static final int DEFAULT_STRENGTH_DIFFICULTY=2; private static final int DEFAULT_STRENGTH_GAMES=123; - private static final boolean DEFAULT_HIGH_QUALITY=true; + private static final boolean DEFAULT_HIGH_QUALITY=false; private static final boolean DEFAULT_SOUND=false; private int left=DEFAULT_LEFT; @@ -348,4 +348,4 @@ public class GeneralConfig { return INSTANCE; } -} \ No newline at end of file +} diff --git a/src/magic/ui/PreferencesDialog.java b/src/magic/ui/PreferencesDialog.java index 3c6bf89097..6d7a72c8d1 100644 --- a/src/magic/ui/PreferencesDialog.java +++ b/src/magic/ui/PreferencesDialog.java @@ -108,7 +108,7 @@ public class PreferencesDialog extends JDialog implements ActionListener { soundCheckBox.setFocusable(false); mainPanel.add(soundCheckBox); - highQualityCheckBox=new JCheckBox("High quality card popup images",config.isHighQuality()); + highQualityCheckBox=new JCheckBox("Show card images in original size",config.isHighQuality()); highQualityCheckBox.setBounds(25,165,350,20); highQualityCheckBox.setFocusable(false); mainPanel.add(highQualityCheckBox); @@ -162,4 +162,4 @@ public class PreferencesDialog extends JDialog implements ActionListener { dispose(); } } -} \ No newline at end of file +} diff --git a/src/magic/ui/viewer/CardViewer.java b/src/magic/ui/viewer/CardViewer.java index 0e2062c1de..d6d6cce15e 100644 --- a/src/magic/ui/viewer/CardViewer.java +++ b/src/magic/ui/viewer/CardViewer.java @@ -16,6 +16,9 @@ import magic.ui.widget.FontsAndBorders; import magic.ui.widget.TitleBar; import magic.ui.widget.TransparentImagePanel; +/** + * Class responsible for showing the card pic popup + */ public class CardViewer extends JPanel implements DelayedViewer { private static final long serialVersionUID = 1L; @@ -91,4 +94,4 @@ public class CardViewer extends JPanel implements DelayedViewer { setVisible(false); } -} \ No newline at end of file +}