diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java index 5d0ba6c197a..631dd406f14 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java @@ -286,12 +286,12 @@ public class PlayerPanelExt extends javax.swing.JPanel { lifeLabel.setFont(font); changedFontLife = false; } - setTextForLabel("life", lifeLabel, life, playerLife, true); + setTextForLabel("life", lifeLabel, life, playerLife, false, PreferencesDialog.getCurrentTheme().getTextColor()); setTextForLabel("poison", poisonLabel, poison, counterOfName(player, "poison"), false); setTextForLabel("energy", energyLabel, energy, counterOfName(player, "energy"), false); setTextForLabel("experience", experienceLabel, experience, counterOfName(player, "experience"), false); setTextForLabel("rad", radLabel, rad, counterOfName(player, "rad"), false); - setTextForLabel("hand zone", handLabel, hand, player.getHandCount(), true); + setTextForLabel("hand zone", handLabel, hand, player.getHandCount(), false, PreferencesDialog.getCurrentTheme().getTextColor()); int libraryCards = player.getLibraryCount(); if (libraryCards > 99) { Font font = libraryLabel.getFont(); @@ -304,7 +304,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { libraryLabel.setFont(font); changedFontLibrary = false; } - setTextForLabel("library zone", libraryLabel, library, libraryCards, true); + setTextForLabel("library zone", libraryLabel, library, libraryCards, false, PreferencesDialog.getCurrentTheme().getTextColor()); int graveCards = player.getGraveyard().size(); if (graveCards > 99) { @@ -321,7 +321,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { changedFontGrave = false; } - Color graveColor = isCardsPlayable(player.getGraveyard().values(), game, possibleTargets) ? activeValueColor : Color.BLACK; + Color graveColor = isCardsPlayable(player.getGraveyard().values(), game, possibleTargets) ? activeValueColor : PreferencesDialog.getCurrentTheme().getTextColor(); setTextForLabel("graveyard zone", graveLabel, grave, graveCards, false, graveColor); graveLabel.setToolTipText("Card Types: " + qtyCardTypes(player.getGraveyard())); @@ -339,7 +339,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { setTextForLabel("command zone", commandLabel, commandZone, player.getCommandObjectList().size(), false, commandColor); int exileCards = player.getExile().size(); - Color excileColor = isCardsPlayable(player.getExile().values(), game, possibleTargets) ? activeValueColor : Color.BLACK; + Color exileColor = isCardsPlayable(player.getExile().values(), game, possibleTargets) ? activeValueColor : PreferencesDialog.getCurrentTheme().getTextColor(); if (exileCards > 99) { if (!changedFontExile) { Font font = exileLabel.getFont(); @@ -353,7 +353,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { exileLabel.setFont(font); changedFontExile = false; } - setTextForLabel("exile zone", exileLabel, exileZone, exileCards, false, excileColor); + setTextForLabel("exile zone", exileLabel, exileZone, exileCards, false, exileColor); if (!MageFrame.isLite()) { int id = player.getUserData().getAvatarId(); diff --git a/Mage.Client/src/main/java/mage/client/themes/ThemeType.java b/Mage.Client/src/main/java/mage/client/themes/ThemeType.java index 61543274c93..b26c4102542 100644 --- a/Mage.Client/src/main/java/mage/client/themes/ThemeType.java +++ b/Mage.Client/src/main/java/mage/client/themes/ThemeType.java @@ -34,7 +34,8 @@ public enum ThemeType { // card icons new Color(169, 176, 190), Color.black, - new Color(51, 98, 140) + new Color(51, 98, 140), + Color.black ), GREY("Grey", "grey-theme/", @@ -57,6 +58,7 @@ public enum ThemeType { // card icons new Color(158, 158, 158), Color.black, + Color.black, Color.black ), SUNSET_VAPORWAVE("Vaporwave Sunset", @@ -80,7 +82,8 @@ public enum ThemeType { // card icons new Color(246, 136, 158), Color.black, - new Color(106, 0, 255) + new Color(106, 0, 255), + Color.black ), COFFEE("Coffee", "coffee-theme/", @@ -103,7 +106,8 @@ public enum ThemeType { // card icons new Color(219, 193, 172), Color.black, - new Color(97, 27, 0) + new Color(97, 27, 0), + Color.black ), ISLAND("Island", "island-theme/", @@ -121,12 +125,36 @@ public enum ThemeType { new Color(0, 78, 97), // nimbusBase new Color(172, 195, 219), // mageToolbar new Color(172, 195, 219), // playerPanel_inactiveBackgroundColor - new Color(204, 236, 201), // playerPanel_inactiveBackgroundColor + new Color(204, 236, 201), // playerPanel_activeBackgroundColor new Color(50, 68, 99, 255), // playerPanel_deadBackgroundColor // card icons new Color(172, 197, 219), Color.black, - new Color(0, 78, 97) + new Color(0, 78, 97), + Color.black + ), + CARBON_FIBER("Carbon Fiber", + "carbon_fiber-theme/", + true, + true, + true, + true, + true, + true, + true, + new Color(43, 45, 49), // buttons, scrollar background, disabled inputs + new Color(49, 51, 56), // window background + new Color(58, 56, 64), // inputs, table rows + new Color(58, 56, 64), // tooltips + new Color(25, 25, 25), // title bars, scrollbar foreground + new Color(43, 45, 49), // mageToolbar + new Color(43, 45, 49), // playerPanel_inactiveBackgroundColor + new Color(64, 61, 56), // playerPanel_activeBackgroundColor + new Color(50, 68, 99, 255), // playerPanel_deadBackgroundColor + new Color(172, 197, 219), + Color.BLACK, + new Color(0, 78, 97), + new Color(220, 220, 220) ); private final String name; @@ -151,6 +179,9 @@ public enum ThemeType { private final Color cardIconsFillColor; private final Color cardIconsStrokeColor; private final Color cardIconsTextColor; + private final Color textColor; + + //private final Color nimbusSelection; ThemeType(String name, String path, @@ -172,7 +203,8 @@ public enum ThemeType { Color playerPanel_deadBackgroundColor, Color cardIconsFillColor, Color cardIconsStrokeColor, - Color cardIconsTextColor + Color cardIconsTextColor, + Color textColor ) { this.name = name; this.path = path; @@ -195,6 +227,7 @@ public enum ThemeType { this.cardIconsFillColor = cardIconsFillColor; this.cardIconsStrokeColor = cardIconsStrokeColor; this.cardIconsTextColor = cardIconsTextColor; + this.textColor = textColor; } @Override @@ -243,6 +276,10 @@ public enum ThemeType { return mageToolbar; } + public Color getTextColor() { + return textColor; + } + public Color getPlayerPanel_inactiveBackgroundColor() { return playerPanel_inactiveBackgroundColor; } @@ -353,4 +390,4 @@ public enum ThemeType { // reload card icons and other rendering things from cache - it can depend on current theme GUISizeHelper.refreshGUIAndCards(true); } -} \ No newline at end of file +} diff --git a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java index af8f20de7be..94a1ffb5567 100644 --- a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java +++ b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java @@ -494,6 +494,8 @@ public final class GuiDisplayUtil { UIManager.put("info", PreferencesDialog.getCurrentTheme().getInfo()); // tooltips UIManager.put("nimbusBase", PreferencesDialog.getCurrentTheme().getNimbusBase()); // title bars, scrollbar foreground + UIManager.put("text", PreferencesDialog.getCurrentTheme().getTextColor()); // Default text color + //UIManager.put("nimbusDisabledText", Color.green); // TODO: improve disabled color //UIManager.put("Table.rowHeight", GUISizeHelper.tableRowHeight); diff --git a/Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java b/Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java index 31d62d24962..4b8e67dabd2 100644 --- a/Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java +++ b/Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java @@ -1,4 +1,5 @@ package mage.client.util.stats; +import mage.client.dialog.PreferencesDialog; import java.awt.*; import java.util.List; @@ -75,7 +76,7 @@ public class UpdateMemUsageTask extends SwingWorker { + "Application memory limit almost reached. Errors and freezes are very possible."; }else{ - jLabelToDisplayInfo.setForeground(Color.black); + jLabelToDisplayInfo.setForeground(PreferencesDialog.getCurrentTheme().getTextColor()); } this.jLabelToDisplayInfo.setToolTipText("Memory usage statistics" + warning + optimizeHint); diff --git a/Mage.Client/src/main/resources/background/carbon_fiber-theme/background.png b/Mage.Client/src/main/resources/background/carbon_fiber-theme/background.png new file mode 100644 index 00000000000..e4fc51dd4d6 Binary files /dev/null and b/Mage.Client/src/main/resources/background/carbon_fiber-theme/background.png differ diff --git a/Mage.Client/src/main/resources/background/carbon_fiber-theme/battle-background.png b/Mage.Client/src/main/resources/background/carbon_fiber-theme/battle-background.png new file mode 100644 index 00000000000..1fde91b84ef Binary files /dev/null and b/Mage.Client/src/main/resources/background/carbon_fiber-theme/battle-background.png differ diff --git a/Mage.Client/src/main/resources/background/carbon_fiber-theme/login-background.png b/Mage.Client/src/main/resources/background/carbon_fiber-theme/login-background.png new file mode 100644 index 00000000000..31207623930 Binary files /dev/null and b/Mage.Client/src/main/resources/background/carbon_fiber-theme/login-background.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/cancel_skip.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/cancel_skip.png new file mode 100644 index 00000000000..362e1f45eb6 Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/cancel_skip.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/concede.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/concede.png new file mode 100644 index 00000000000..fb03a9dcf0a Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/concede.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_all.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_all.png new file mode 100644 index 00000000000..830530a7c4d Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_all.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_stack.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_stack.png new file mode 100644 index 00000000000..fe35c37a08d Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_stack.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_to_end.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_to_end.png new file mode 100644 index 00000000000..9ee0591f322 Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_to_end.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_to_main.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_to_main.png new file mode 100644 index 00000000000..d31317662d8 Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_to_main.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_to_previous_end.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_to_previous_end.png new file mode 100644 index 00000000000..5895f0aff5e Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_to_previous_end.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_turn.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_turn.png new file mode 100644 index 00000000000..c6ec67b5736 Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/skip_turn.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/stop_watching.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/stop_watching.png new file mode 100644 index 00000000000..9436fed078a Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/stop_watching.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/switch_hands.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/switch_hands.png new file mode 100644 index 00000000000..e8130a7e21b Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/switch_hands.png differ diff --git a/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/toggle_macro.png b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/toggle_macro.png new file mode 100644 index 00000000000..6c9a4fb3917 Binary files /dev/null and b/Mage.Client/src/main/resources/buttons/carbon_fiber-theme/toggle_macro.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_cleanup.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_cleanup.png new file mode 100644 index 00000000000..28244ace8a6 Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_cleanup.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_attack.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_attack.png new file mode 100644 index 00000000000..60ebe6e4e97 Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_attack.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_block.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_block.png new file mode 100644 index 00000000000..2ea8f806918 Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_block.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_damage.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_damage.png new file mode 100644 index 00000000000..b89f598b9f9 Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_damage.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_end.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_end.png new file mode 100644 index 00000000000..1fe47822ca1 Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_end.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_start.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_start.png new file mode 100644 index 00000000000..4758384cde2 Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_combat_start.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_draw.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_draw.png new file mode 100644 index 00000000000..2e1a65126af Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_draw.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_main1.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_main1.png new file mode 100644 index 00000000000..e0d219b965e Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_main1.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_main2.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_main2.png new file mode 100644 index 00000000000..7ca7bfb804f Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_main2.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_next_turn.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_next_turn.png new file mode 100644 index 00000000000..69e60293040 Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_next_turn.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_untap.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_untap.png new file mode 100644 index 00000000000..9763580177b Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_untap.png differ diff --git a/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_upkeep.png b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_upkeep.png new file mode 100644 index 00000000000..9bd4be91237 Binary files /dev/null and b/Mage.Client/src/main/resources/phases/carbon_fiber-theme/phase_upkeep.png differ diff --git a/Mage.Client/src/main/resources/winloss/carbon_fiber-theme/game_lost.jpg b/Mage.Client/src/main/resources/winloss/carbon_fiber-theme/game_lost.jpg new file mode 100644 index 00000000000..aa4444b39d4 Binary files /dev/null and b/Mage.Client/src/main/resources/winloss/carbon_fiber-theme/game_lost.jpg differ diff --git a/Mage.Client/src/main/resources/winloss/carbon_fiber-theme/game_won.jpg b/Mage.Client/src/main/resources/winloss/carbon_fiber-theme/game_won.jpg new file mode 100644 index 00000000000..aa4444b39d4 Binary files /dev/null and b/Mage.Client/src/main/resources/winloss/carbon_fiber-theme/game_won.jpg differ