Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Closed #168 : Enhance priority hot keys

Browse source
This commit is contained in:
magenoxx 2013-03-29 17:18:12 +04:00
parent a1e16942cd
commit 05191e8793
20 changed files with 475 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
View file

@ -34,18 +34,19 @@
package mage.client.chat;
import java.awt.*;
import java.awt.event.KeyEvent;
import java.util.*;
import java.util.List;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.table.AbstractTableModel;
import mage.client.MageFrame;
import mage.client.components.ColorPane;
import mage.remote.Session;
import mage.view.ChatMessage.MessageColor;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.table.AbstractTableModel;
import java.awt.*;
import java.awt.event.KeyEvent;
import java.util.*;
import java.util.List;
/**
*
* @author BetaSteward_at_googlemail.com, nantuko
@ -166,17 +167,26 @@ public class ChatPanel extends javax.swing.JPanel {
public void receiveMessage(String username, String message, String time, MessageColor color) {
if (extendedViewMode.equals(VIEW_MODE.GAME)) {
this.txtConversation.append(TIMESTAMP_COLOR, time + " ");
this.txtConversation.append(MESSAGE_COLOR, (username.isEmpty() ? "" : username + ":") + message + "\n");
Color textColor = MESSAGE_COLOR;
if (color.equals(MessageColor.ORANGE)) {
textColor = Color.ORANGE;
}
this.txtConversation.append(textColor, (username.isEmpty() ? "" : username + ":") + message + "\n");
} else {
this.txtConversation.append(TIMESTAMP_COLOR, time + " ");
Color userColor;
Color textColor = MESSAGE_COLOR;
if (parentChatRef != null) {
userColor = parentChatRef.session.getUserName().equals(username) ? MY_COLOR : OPPONENT_COLOR;
} else {
userColor = session.getUserName().equals(username) ? MY_COLOR : OPPONENT_COLOR;
if (color.equals(MessageColor.ORANGE)) {
userColor = Color.ORANGE;
textColor = userColor;
}
}
this.txtConversation.append(userColor, username + ": ");
this.txtConversation.append(MESSAGE_COLOR, message + "\n");
this.txtConversation.append(textColor, message + "\n");
}
}
@ -192,6 +202,14 @@ public class ChatPanel extends javax.swing.JPanel {
this.parentChatRef = parentChatRef;
}
public ChatPanel getParentChatRef() {
return parentChatRef;
}
public void setParentChatRef(ChatPanel parentChatRef) {
this.parentChatRef = parentChatRef;
}
public void disableInput() {
this.txtMessage.setVisible(false);
}