diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml
index 8585014cf74..88a1ae4ff31 100644
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@@ -6,7 +6,7 @@
org.magemage-root
- 1.4.8
+ 1.4.9org.mage
diff --git a/Mage.Client/release/sample-decks/Commander/Commander 2015/Wade into Battle (RW).dck b/Mage.Client/release/sample-decks/Commander/Commander 2015/Wade into Battle (RW).dck
index 461da3856cb..429e8fc4193 100644
--- a/Mage.Client/release/sample-decks/Commander/Commander 2015/Wade into Battle (RW).dck
+++ b/Mage.Client/release/sample-decks/Commander/Commander 2015/Wade into Battle (RW).dck
@@ -51,7 +51,7 @@
1 [C15:268] Sol Ring
1 [C15:147] Curse of the Nightly Hunt
1 [C15:148] Desolation Giant
-1 [C15:303] Secluded Steppe
+1 [C15:304] Secluded Steppe
1 [C15:308] Smoldering Crater
1 [C15:65] Crib Swap
1 [C15:171] Warstorm Surge
diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index fda273a0013..d10fb45b480 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -574,7 +574,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
if (DownloadPictures.checkForNewCards(missingCards)) {
LOGGER.info("Card images checking time: " + ((System.currentTimeMillis() - beforeCall) / 1000 + " seconds"));
UserRequestMessage message = new UserRequestMessage("New images available", "Card images are missing (" + missingCards.size() + "). Do you want to download the images?"
- + "
You can deactivate the image download check on apllication start in the preferences.");
+ + "
You can deactivate the image download check on application start in the preferences.");
message.setButton1("No", null);
message.setButton2("Yes", PlayerAction.CLIENT_DOWNLOAD_CARD_IMAGES);
showUserRequestDialog(message);
@@ -1135,8 +1135,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
public void showUserRequestDialog(final UserRequestMessage userRequestMessage) {
final UserRequestDialog userRequestDialog = new UserRequestDialog();
userRequestDialog.setLocation(100, 100);
- desktopPane.add(userRequestDialog, JLayeredPane.MODAL_LAYER);
-// ui.addComponent(MageComponents.DESKTOP_PANE, userRequestDialog);
+ desktopPane.add(userRequestDialog, JLayeredPane.POPUP_LAYER);
if (SwingUtilities.isEventDispatchThread()) {
userRequestDialog.showDialog(userRequestMessage);
} else {
@@ -1371,38 +1370,21 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}
@Override
- public void showMessage(final String message
- ) {
- if (SwingUtilities.isEventDispatchThread()) {
- JOptionPane.showMessageDialog(desktopPane, message);
- } else {
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- JOptionPane.showMessageDialog(desktopPane, message);
- }
- });
- }
+ public void showMessage(String message) {
+ final UserRequestMessage requestMessage = new UserRequestMessage("Message", message);
+ requestMessage.setButton1("OK", null);
+ MageFrame.getInstance().showUserRequestDialog(requestMessage);
}
@Override
- public void showError(final String message
- ) {
- if (SwingUtilities.isEventDispatchThread()) {
- JOptionPane.showMessageDialog(desktopPane, message, "Error", JOptionPane.ERROR_MESSAGE);
- } else {
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- JOptionPane.showMessageDialog(desktopPane, message, "Error", JOptionPane.ERROR_MESSAGE);
- }
- });
- }
+ public void showError(final String message) {
+ final UserRequestMessage requestMessage = new UserRequestMessage("Error", message);
+ requestMessage.setButton1("OK", null);
+ MageFrame.getInstance().showUserRequestDialog(requestMessage);
}
@Override
- public void processCallback(ClientCallback callback
- ) {
+ public void processCallback(ClientCallback callback) {
callbackClient.processCallback(callback);
}
diff --git a/Mage.Client/src/main/java/mage/client/cards/CardArea.java b/Mage.Client/src/main/java/mage/client/cards/CardArea.java
index 783724d1a4e..206328c8319 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardArea.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardArea.java
@@ -39,11 +39,10 @@ import javax.swing.JLayeredPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
-import mage.cards.CardDimensions;
import mage.cards.MageCard;
import mage.client.plugins.impl.Plugins;
-import mage.client.util.Config;
import mage.client.util.Event;
+import mage.client.util.GUISizeHelper;
import mage.client.util.Listener;
import mage.view.AbilityView;
import mage.view.CardView;
@@ -59,6 +58,8 @@ public class CardArea extends JPanel implements MouseListener {
private final javax.swing.JLayeredPane cardArea;
private final javax.swing.JScrollPane scrollPane;
private int yTextOffset;
+ private Dimension cardDimension;
+ private int verticalCardOffset;
/**
* Create the panel.
@@ -68,7 +69,7 @@ public class CardArea extends JPanel implements MouseListener {
scrollPane = new JScrollPane();
add(scrollPane, BorderLayout.CENTER);
-
+ setGUISize();
cardArea = new JLayeredPane();
scrollPane.setViewportView(cardArea);
yTextOffset = 10;
@@ -84,7 +85,25 @@ public class CardArea extends JPanel implements MouseListener {
}
}
- public void loadCards(CardsView showCards, BigCard bigCard, CardDimensions dimension, UUID gameId) {
+ public void changeGUISize() {
+ setGUISize();
+ for (Component component : cardArea.getComponents()) {
+ if (component instanceof CardPanel) {
+ ((CardPanel) component).setBounds(0, 0, cardDimension.width, cardDimension.height);
+ }
+ }
+ }
+
+ private void setGUISize() {
+ setCardDimension(GUISizeHelper.otherZonesCardDimension, GUISizeHelper.otherZonesCardVerticalOffset);
+ }
+
+ public void setCardDimension(Dimension dimension, int verticalCardOffset) {
+ this.cardDimension = dimension;
+ this.verticalCardOffset = verticalCardOffset;
+ }
+
+ public void loadCards(CardsView showCards, BigCard bigCard, UUID gameId) {
this.reloaded = true;
cardArea.removeAll();
if (showCards != null && showCards.size() < 10) {
@@ -92,7 +111,7 @@ public class CardArea extends JPanel implements MouseListener {
loadCardsFew(showCards, bigCard, gameId);
} else {
yTextOffset = 0;
- loadCardsMany(showCards, bigCard, gameId, dimension);
+ loadCardsMany(showCards, bigCard, gameId);
}
cardArea.revalidate();
@@ -100,11 +119,11 @@ public class CardArea extends JPanel implements MouseListener {
this.repaint();
}
- public void loadCardsNarrow(CardsView showCards, BigCard bigCard, CardDimensions dimension, UUID gameId) {
+ public void loadCardsNarrow(CardsView showCards, BigCard bigCard, UUID gameId) {
this.reloaded = true;
cardArea.removeAll();
yTextOffset = 0;
- loadCardsMany(showCards, bigCard, gameId, dimension);
+ loadCardsMany(showCards, bigCard, gameId);
cardArea.revalidate();
this.revalidate();
@@ -112,16 +131,15 @@ public class CardArea extends JPanel implements MouseListener {
}
private void loadCardsFew(CardsView showCards, BigCard bigCard, UUID gameId) {
- Rectangle rectangle = new Rectangle(Config.dimensions.frameWidth, Config.dimensions.frameHeight);
- Dimension dimension = new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight);
+ Rectangle rectangle = new Rectangle(cardDimension.width, cardDimension.height);
for (CardView card : showCards.values()) {
- addCard(card, bigCard, gameId, rectangle, dimension, Config.dimensions);
- rectangle.translate(Config.dimensions.frameWidth, 0);
+ addCard(card, bigCard, gameId, rectangle);
+ rectangle.translate(cardDimension.width, 0);
}
- cardArea.setPreferredSize(new Dimension(Config.dimensions.frameWidth * showCards.size(), Config.dimensions.frameHeight));
+ cardArea.setPreferredSize(new Dimension(cardDimension.width * showCards.size(), cardDimension.height));
}
- private void addCard(CardView card, BigCard bigCard, UUID gameId, Rectangle rectangle, Dimension dimension, CardDimensions cardDimensions) {
+ private void addCard(CardView card, BigCard bigCard, UUID gameId, Rectangle rectangle) {
if (card instanceof AbilityView) {
CardView tmp = ((AbilityView) card).getSourceCard();
tmp.overrideRules(card.getRules());
@@ -130,37 +148,37 @@ public class CardArea extends JPanel implements MouseListener {
tmp.setAbility(card); // cross-reference, required for ability picker
card = tmp;
}
- MageCard cardPanel = Plugins.getInstance().getMageCard(card, bigCard, dimension, gameId, true);
+ MageCard cardPanel = Plugins.getInstance().getMageCard(card, bigCard, cardDimension, gameId, true);
cardPanel.setBounds(rectangle);
cardPanel.addMouseListener(this);
cardArea.add(cardPanel);
cardArea.moveToFront(cardPanel);
cardPanel.update(card);
- cardPanel.setCardBounds(rectangle.x, rectangle.y, cardDimensions.frameWidth, cardDimensions.frameHeight);
+ cardPanel.setCardBounds(rectangle.x, rectangle.y, cardDimension.width, cardDimension.height);
cardPanel.setTextOffset(yTextOffset);
cardPanel.showCardTitle();
}
- private void loadCardsMany(CardsView showCards, BigCard bigCard, UUID gameId, CardDimensions cardDimensions) {
+ private void loadCardsMany(CardsView showCards, BigCard bigCard, UUID gameId) {
+ int rowsOfCards = 20;
int columns = 1;
if (showCards != null && showCards.size() > 0) {
- Rectangle rectangle = new Rectangle(cardDimensions.frameWidth, cardDimensions.frameHeight);
- Dimension dimension = new Dimension(cardDimensions.frameWidth, cardDimensions.frameHeight);
+ Rectangle rectangle = new Rectangle(cardDimension.width, cardDimension.height);
int count = 0;
for (CardView card : showCards.values()) {
- addCard(card, bigCard, gameId, rectangle, dimension, cardDimensions);
- if (count >= 20) {
- rectangle.translate(cardDimensions.frameWidth, -400);
+ addCard(card, bigCard, gameId, rectangle);
+ if (count >= rowsOfCards) {
+ rectangle.translate(cardDimension.width, -(rowsOfCards * verticalCardOffset));
columns++;
count = 0;
} else {
- rectangle.translate(0, 20);
+ rectangle.translate(0, verticalCardOffset);
count++;
}
}
}
- cardArea.setPreferredSize(new Dimension(cardDimensions.frameWidth * columns, cardDimensions.frameHeight + 400));
+ cardArea.setPreferredSize(new Dimension(cardDimension.width * columns, cardDimension.height + (rowsOfCards * verticalCardOffset)));
}
public boolean isReloaded() {
diff --git a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
index 9940628f998..11656e6f166 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
@@ -26,7 +26,7 @@
* or implied, of BetaSteward_at_googlemail.com.
*/
-/*
+ /*
* CardGrid.java
*
* Created on 30-Mar-2010, 9:25:40 PM
@@ -50,8 +50,8 @@ import java.util.UUID;
import mage.cards.MageCard;
import mage.client.deckeditor.SortSetting;
import mage.client.plugins.impl.Plugins;
-import mage.client.util.Config;
import mage.client.util.Event;
+import mage.client.util.GUISizeHelper;
import mage.client.util.Listener;
import mage.utils.CardUtil;
import mage.view.CardView;
@@ -126,7 +126,7 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
private void addCard(CardView card, BigCard bigCard, UUID gameId, boolean drawImage) {
if (cardDimension == null) {
- cardDimension = new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight);
+ cardDimension = GUISizeHelper.editorCardDimension;
}
MageCard cardImg = Plugins.getInstance().getMageCard(card, bigCard, cardDimension, gameId, drawImage);
cards.put(card.getId(), cardImg);
@@ -139,11 +139,12 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
@Override
public void drawCards(SortSetting sortSetting) {
int maxWidth = this.getParent().getWidth();
- int numColumns = maxWidth / Config.dimensions.frameWidth;
+ int cardVerticalOffset = GUISizeHelper.editorCardOffsetSize;
+ int numColumns = maxWidth / cardDimension.width;
int curColumn = 0;
int curRow = 0;
if (cards.size() > 0) {
- Rectangle rectangle = new Rectangle(Config.dimensions.frameWidth, Config.dimensions.frameHeight);
+ Rectangle rectangle = new Rectangle(cardDimension.width, cardDimension.height);
List sortedCards = new ArrayList<>(cards.values());
switch (sortSetting.getSortBy()) {
case NAME:
@@ -202,16 +203,16 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
}
break;
}
- rectangle.setLocation(curColumn * Config.dimensions.frameWidth, curRow * 20);
+ rectangle.setLocation(curColumn * cardDimension.width, curRow * cardVerticalOffset);
cardImg.setBounds(rectangle);
- cardImg.setCardBounds(rectangle.x, rectangle.y, Config.dimensions.frameWidth, Config.dimensions.frameHeight);
+ cardImg.setCardBounds(rectangle.x, rectangle.y, cardDimension.width, cardDimension.height);
moveToFront(cardImg);
curRow++;
lastCard = cardImg;
} else {
- rectangle.setLocation(curColumn * Config.dimensions.frameWidth, curRow * 20);
+ rectangle.setLocation(curColumn * cardDimension.width, curRow * cardVerticalOffset);
cardImg.setBounds(rectangle);
- cardImg.setCardBounds(rectangle.x, rectangle.y, Config.dimensions.frameWidth, Config.dimensions.frameHeight);
+ cardImg.setCardBounds(rectangle.x, rectangle.y, cardDimension.width, cardDimension.height);
moveToFront(cardImg);
curColumn++;
if (curColumn == numColumns) {
diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.form b/Mage.Client/src/main/java/mage/client/cards/CardsList.form
index 744db3a1d5b..38dc29ef031 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.form
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.form
@@ -15,7 +15,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
index e3b374ca494..c2c2b8fa79a 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
@@ -70,7 +70,6 @@ import mage.client.util.CardViewColorIdentityComparator;
import mage.client.util.CardViewCostComparator;
import mage.client.util.CardViewNameComparator;
import mage.client.util.CardViewRarityComparator;
-import mage.client.util.Config;
import mage.client.util.Event;
import mage.client.util.GUISizeHelper;
import mage.client.util.Listener;
@@ -89,6 +88,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
protected CardEventSource cardEventSource = new CardEventSource();
private Dimension cardDimension;
+ private int rowHeight;
private CardsView cards;
private Map mageCards = new LinkedHashMap<>();
protected BigCard bigCard;
@@ -144,6 +144,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
public void changeGUISize() {
setGUISize();
+ redrawCards();
}
private void setGUISize() {
@@ -151,7 +152,8 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
mainTable.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
mainTable.setFont(GUISizeHelper.tableFont);
mainTable.setRowHeight(GUISizeHelper.getTableRowHeight());
-
+ cardDimension = GUISizeHelper.editorCardDimension;
+ rowHeight = GUISizeHelper.editorCardOffsetSize;
}
private void makeTransparent() {
@@ -301,7 +303,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
@Override
public void drawCards(SortSetting sortSetting) {
int maxWidth = this.getParent().getWidth();
- int numColumns = maxWidth / Config.dimensions.frameWidth;
+ int numColumns = maxWidth / cardDimension.width;
int curColumn = 0;
int curRow = 0;
int maxRow = 0;
@@ -325,7 +327,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
}
if (cards != null && cards.size() > 0) {
- Rectangle rectangle = new Rectangle(Config.dimensions.frameWidth, Config.dimensions.frameHeight);
+ Rectangle rectangle = new Rectangle(cardDimension.width, cardDimension.height);
List sortedCards = new ArrayList<>(cards.values());
switch (sortSetting.getSortBy()) {
case NAME:
@@ -361,13 +363,13 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
curRow = 0;
}
}
- rectangle.setLocation(curColumn * Config.dimensions.frameWidth, curRow * 20);
+ rectangle.setLocation(curColumn * cardDimension.width, curRow * rowHeight);
setCardBounds(mageCards.get(card.getId()), rectangle);
curRow++;
lastCard = card;
} else {
- rectangle.setLocation(curColumn * Config.dimensions.frameWidth, curRow * 20);
+ rectangle.setLocation(curColumn * cardDimension.width, curRow * rowHeight);
setCardBounds(mageCards.get(card.getId()), rectangle);
curColumn++;
if (curColumn == numColumns) {
@@ -381,7 +383,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
maxRow = Math.max(maxRow, curRow);
maxColumn = Math.max(maxColumn, curColumn);
updateCounts();
- cardArea.setPreferredSize(new Dimension((maxColumn + 1) * Config.dimensions.frameWidth, Config.dimensions.frameHeight + maxRow * 20));
+ cardArea.setPreferredSize(new Dimension((maxColumn + 1) * cardDimension.width, cardDimension.height + maxRow * rowHeight));
cardArea.revalidate();
this.revalidate();
this.repaint();
@@ -422,9 +424,6 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
}
private MageCard addCard(CardView card, BigCard bigCard, UUID gameId) {
- if (cardDimension == null) {
- cardDimension = new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight);
- }
MageCard cardImg = Plugins.getInstance().getMageCard(card, bigCard, cardDimension, gameId, true);
cardArea.add(cardImg);
cardImg.update(card);
@@ -434,7 +433,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
private void setCardBounds(MageCard card, Rectangle rectangle) {
card.setBounds(rectangle);
- card.setCardBounds(rectangle.x, rectangle.y, Config.dimensions.frameWidth, Config.dimensions.frameHeight);
+ card.setCardBounds(rectangle.x, rectangle.y, cardDimension.width, cardDimension.height);
cardArea.moveToFront(card);
}
@@ -486,7 +485,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
lblInstantCount = new javax.swing.JLabel();
lblEnchantmentCount = new javax.swing.JLabel();
chkPiles = new javax.swing.JCheckBox();
- cbSortBy = new javax.swing.JComboBox();
+ cbSortBy = new javax.swing.JComboBox();
jToggleListView = new javax.swing.JToggleButton();
jToggleCardView = new javax.swing.JToggleButton();
panelCardArea = new javax.swing.JScrollPane();
@@ -495,7 +494,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
setMinimumSize(new java.awt.Dimension(30, 30));
setPreferredSize((!Beans.isDesignTime())?
- (new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight))
+ (GUISizeHelper.editorCardDimension)
:(new Dimension(600, 600)));
setRequestFocusEnabled(false);
@@ -717,7 +716,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.ButtonGroup bgView;
private javax.swing.JLayeredPane cardArea;
- private javax.swing.JComboBox cbSortBy;
+ private javax.swing.JComboBox cbSortBy;
private javax.swing.JCheckBox chkPiles;
private javax.swing.JToggleButton jToggleCardView;
private javax.swing.JToggleButton jToggleListView;
diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java
index 57e1d3d27cc..19b876afb88 100644
--- a/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java
+++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java
@@ -231,7 +231,7 @@ public class ChatPanelBasic extends javax.swing.JPanel {
if (username != null && !username.isEmpty()) {
text.append(getColoredText(userColor, username + userSeparator));
}
- text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.PAY)));
+ text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.CHAT)));
this.txtConversation.append(text.toString());
}
diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanelSeparated.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanelSeparated.java
index e95edd6e980..df3bf369374 100644
--- a/Mage.Client/src/main/java/mage/client/chat/ChatPanelSeparated.java
+++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanelSeparated.java
@@ -95,7 +95,7 @@ public class ChatPanelSeparated extends ChatPanelBasic {
if (username != null && !username.isEmpty()) {
text.append(getColoredText(userColor, username + userSeparator));
}
- text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.PAY)));
+ text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.CHAT)));
this.systemMessagesPane.append(text.toString());
}
diff --git a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java
index 159e437a0f5..d45a6cb4bf3 100644
--- a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java
+++ b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java
@@ -3,6 +3,7 @@ package mage.client.components;
import java.awt.Color;
import javax.swing.JEditorPane;
import javax.swing.SwingUtilities;
+import mage.client.util.GUISizeHelper;
import org.mage.card.arcane.ManaSymbols;
import org.mage.card.arcane.UI;
@@ -35,7 +36,7 @@ public class MageTextArea extends JEditorPane {
final StringBuilder buffer = new StringBuilder(512);
// Dialog is a java logical font family, so it should work on all systems
buffer.append("
");
// Don't know what it does (easy italc?) but it bugs with multiple #HTML color codes (LevelX2)
@@ -43,7 +44,7 @@ public class MageTextArea extends JEditorPane {
//text = text.replaceAll("\\s*//\\s*", "");
text = text.replace("\r\n", "");
- final String basicText = ManaSymbols.replaceSymbolsWithHTML(text, ManaSymbols.Type.PAY);
+ final String basicText = ManaSymbols.replaceSymbolsWithHTML(text, ManaSymbols.Type.DIALOG);
if (text.length() > 0) {
buffer.append(basicText);
}
@@ -57,10 +58,9 @@ public class MageTextArea extends JEditorPane {
MageTextArea.super.setText(promptText);
// in case the text don't fit in the panel a tooltip with the text is added
if (panelWidth > 0 && MageTextArea.this.getPreferredSize().getWidth() > panelWidth) {
-// String tooltip = promptText
-// .replace("color: #FFFFFF'>", "color: #111111'>
")
-// .replace("", "
");
- String tooltip = "
" + basicText + "
";
+ String tooltip = "
" + basicText + "
";
MageTextArea.super.setToolTipText(tooltip);
} else {
MageTextArea.super.setToolTipText(null);
diff --git a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java
index 96724c38d09..efed293521b 100644
--- a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java
+++ b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java
@@ -1,5 +1,10 @@
package mage.client.components.ability;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
+import java.util.List;
+import javax.swing.*;
import mage.client.util.ImageHelper;
import mage.client.util.SettingsManager;
import mage.client.util.gui.GuiDisplayUtil;
@@ -12,12 +17,6 @@ import org.jdesktop.swingx.JXPanel;
import org.mage.card.arcane.ManaSymbols;
import org.mage.card.arcane.UI;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import java.util.List;
-
/**
* Dialog for choosing abilities.
*
@@ -48,8 +47,8 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
private static final String IMAGE_RIGHT_PATH = "/game/right.png";
private static final String IMAGE_RIGHT_HOVERED_PATH = "/game/right_hovered.png";
- private static Color SELECTED_COLOR = new Color(64,147,208);
- private static Color BORDER_COLOR = new Color(0,0,0,50);
+ private static Color SELECTED_COLOR = new Color(64, 147, 208);
+ private static Color BORDER_COLOR = new Color(0, 0, 0, 50);
private boolean selected = false;
@@ -59,7 +58,7 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
jScrollPane2.setOpaque(false);
jScrollPane2.getViewport().setOpaque(false);
- UIManager.put( "ScrollBar.width", 17);
+ UIManager.put("ScrollBar.width", 17);
jScrollPane2.getHorizontalScrollBar().setUI(new MageScrollbarUI());
jScrollPane2.getVerticalScrollBar().setUI(new MageScrollbarUI());
}
@@ -67,13 +66,13 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
public AbilityPicker(List