From b252dae313947ccc79fe3896c841fed8662b9d96 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Tue, 2 Aug 2011 11:45:42 +0400 Subject: [PATCH] Gray theme - similar to lite but with card images. Can be activated with -gray mage client command line parameter. --- .../src/main/java/mage/client/MageFrame.java | 16 +++++++++++++--- .../java/mage/client/plugins/impl/Plugins.java | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 1d06f912e9c..cbf2909ca3d 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -102,6 +102,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private final static Logger logger = Logger.getLogger(MageFrame.class); private final static String liteModeArg = "-lite"; + private final static String grayModeArg = "-gray"; private static Session session; private ConnectDialog connectDialog; @@ -113,6 +114,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private UUID clientId; private static MagePane activeFrame; private static boolean liteMode = false; + //TODO: make gray theme, implement theme selector in preferences dialog + private static boolean grayMode = false; private static Map chats = new HashMap(); private static Map games = new HashMap(); @@ -139,6 +142,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { return liteMode; } + public static boolean isGray() { + return grayMode; + } + @Override public MageVersion getVersion() { return version; @@ -214,7 +221,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { int width = ((JComponent) e.getSource()).getWidth(); int height = ((JComponent) e.getSource()).getHeight(); SettingsManager.getInstance().setScreenWidthAndHeight(width, height); - if (!liteMode) { + if (!liteMode && !grayMode) { backgroundPane.setSize(width, height); } JPanel arrowsPanel = ArrowBuilder.getArrowsPanelRef(); @@ -308,7 +315,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } private void setBackground() { - if (liteMode) + if (liteMode || grayMode) return; String filename = "/background.jpg"; try { @@ -328,7 +335,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } private void addMageLabel() { - if (liteMode) + if (liteMode || grayMode) return; String filename = "/label-mage.png"; try { @@ -845,6 +852,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { if (arg.startsWith(liteModeArg)) { liteMode = true; } + if (arg.startsWith(grayModeArg)) { + grayMode = true; + } } if (!liteMode) { final SplashScreen splash = SplashScreen.getSplashScreen(); diff --git a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java index 633e84a9e1d..b0e566a5d47 100644 --- a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java +++ b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java @@ -64,13 +64,13 @@ public class Plugins implements MagePlugins { @Override public void updateGamePanel(Map ui) { - if (MageFrame.isLite() || themePlugin == null) return; + if (MageFrame.isLite() || MageFrame.isGray() || themePlugin == null) return; themePlugin.applyInGame(ui); } @Override public JComponent updateTablePanel(Map ui) { - if (MageFrame.isLite() || themePlugin == null) return null; + if (MageFrame.isLite() || MageFrame.isGray() || themePlugin == null) return null; return themePlugin.updateTable(ui); }