From 2a0d2d125bf8d0cbebdcfdd6bcd24a8bc21fedb9 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Mon, 18 Mar 2019 09:00:27 +0400 Subject: [PATCH] * UI: fixed error message window for long text (auto-size), improved wrong version message; --- .../mage/client/dialog/UserRequestDialog.java | 63 +++++++++---------- .../mage/remote/MageVersionException.java | 8 ++- .../java/mage/view/UserRequestMessage.java | 15 +++-- 3 files changed, 40 insertions(+), 46 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java b/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java index c9c9394a83..368e6b3422 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java @@ -1,22 +1,15 @@ - - /* - * ErrorDialog.java - * - * Created on Dec 23, 2009, 11:01:32 AM - */ package mage.client.dialog; -import java.awt.Dimension; -import java.awt.Font; -import javax.swing.JComponent; -import javax.swing.plaf.basic.BasicInternalFrameUI; import mage.client.MageFrame; import mage.client.util.GUISizeHelper; import mage.constants.PlayerAction; import mage.view.UserRequestMessage; +import javax.swing.*; +import javax.swing.plaf.basic.BasicInternalFrameUI; +import java.awt.*; + /** - * * @author BetaSteward_at_googlemail.com */ public class UserRequestDialog extends MageDialog { @@ -34,7 +27,7 @@ public class UserRequestDialog extends MageDialog { private void setGUISize() { Font font = GUISizeHelper.gameRequestsFont; lblText.setFont(font); - lblText.setMaximumSize(new Dimension(300 + font.getSize() * 15, 20 + font.getSize() * 5)); + lblText.setMaximumSize(new Dimension(300 + font.getSize() * 15, 200 + font.getSize() * 5)); lblText.setMinimumSize(new Dimension(300 + font.getSize() * 15, 20 + font.getSize() * 5)); lblText.setPreferredSize(new Dimension(300 + font.getSize() * 15, 20 + font.getSize() * 5)); btn1.setFont(font); @@ -58,7 +51,7 @@ public class UserRequestDialog extends MageDialog { public void showDialog(UserRequestMessage userRequestMessage) { this.userRequestMessage = userRequestMessage; - this.setTitle(userRequestMessage.getTitel()); + this.setTitle(userRequestMessage.getTitle()); String text = "

" + userRequestMessage.getMessage() + "

"; this.lblText.setText(text); if (userRequestMessage.getButton1Text() != null) { @@ -128,30 +121,30 @@ public class UserRequestDialog extends MageDialog { javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(btn3, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btn2, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btn1, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE))) - .addContainerGap()) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addContainerGap() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(layout.createSequentialGroup() + .addComponent(btn3, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(btn2, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(btn1, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE))) + .addContainerGap()) ); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(btn1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(btn2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(btn3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addGap(12, 12, 12)) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(btn1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(btn2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(btn3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(12, 12, 12)) ); pack(); diff --git a/Mage.Common/src/main/java/mage/remote/MageVersionException.java b/Mage.Common/src/main/java/mage/remote/MageVersionException.java index b5f317be3e..d67093874f 100644 --- a/Mage.Common/src/main/java/mage/remote/MageVersionException.java +++ b/Mage.Common/src/main/java/mage/remote/MageVersionException.java @@ -1,11 +1,9 @@ - package mage.remote; import mage.MageException; import mage.utils.MageVersion; /** - * * @author BetaSteward_at_googlemail.com */ public class MageVersionException extends MageException { @@ -13,7 +11,11 @@ public class MageVersionException extends MageException { private final MageVersion serverVersion; public MageVersionException(MageVersion clientVersion, MageVersion serverVersion) { - super("Wrong client version " + clientVersion + ", expecting version " + serverVersion + ". \r\n\r\nPlease download needed version from http://XMage.de or http://www.slightlymagic.net/forum/viewforum.php?f=70"); + super("Wrong client version." + + "
Your version: " + clientVersion + + "
Server version: " + serverVersion + + "
Release app download: http://xmage.de" + + "
BETA app download: http://xmage.today"); this.serverVersion = serverVersion; } diff --git a/Mage.Common/src/main/java/mage/view/UserRequestMessage.java b/Mage.Common/src/main/java/mage/view/UserRequestMessage.java index 71c582b229..51cb913d0e 100644 --- a/Mage.Common/src/main/java/mage/view/UserRequestMessage.java +++ b/Mage.Common/src/main/java/mage/view/UserRequestMessage.java @@ -1,19 +1,18 @@ - package mage.view; +import mage.constants.PlayerAction; + import java.io.Serializable; import java.util.UUID; -import mage.constants.PlayerAction; /** - * * @author LevelX2 */ public class UserRequestMessage implements Serializable { private static final long serialVersionUID = 1L; - private final String titel; + private final String title; private final String message; private UUID relatedUserId; private String relatedUserName; @@ -32,8 +31,8 @@ public class UserRequestMessage implements Serializable { private String button3Text; private PlayerAction button3Action; - public UserRequestMessage(String titel, String message) { - this.titel = titel; + public UserRequestMessage(String title, String message) { + this.title = title; this.message = message; this.button1Action = null; this.button2Action = null; @@ -68,8 +67,8 @@ public class UserRequestMessage implements Serializable { this.button3Action = buttonAction; } - public String getTitel() { - return titel; + public String getTitle() { + return title; } public static long getSerialVersionUID() {