diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2006-08-11 07:14:47 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2006-08-11 07:14:47 +0000 |
| commit | 3cf2d97e807d06375eae361476e5402f297cb89c (patch) | |
| tree | df0a3d366832a68e3dbabbbb597734440d1bb9e5 /src | |
| parent | 840fd6e003b64feaba4e4301489dd180488ffb4d (diff) | |
| download | jitsi-3cf2d97e807d06375eae361476e5402f297cb89c.zip jitsi-3cf2d97e807d06375eae361476e5402f297cb89c.tar.gz jitsi-3cf2d97e807d06375eae361476e5402f297cb89c.tar.bz2 | |
lighten messages coming from history
Diffstat (limited to 'src')
| -rwxr-xr-x | src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java | 12 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/message/ChatPanel.java | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java index e395782..6396714 100755 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java @@ -256,7 +256,7 @@ public class ChatConversationPanel extends JScrollPane implements + processTime(calendar.get(Calendar.SECOND)) + " " + contactName + " " + message + endHeaderTag; } - /*else if (messageType.equals(Constants.HISTORY_INCOMING_MESSAGE)) { + else if (messageType.equals(Constants.HISTORY_INCOMING_MESSAGE)) { chatString = "<h2>"; endHeaderTag = "</h2>"; @@ -264,9 +264,9 @@ public class ChatConversationPanel extends JScrollPane implements + processTime(calendar.get(Calendar.HOUR_OF_DAY)) + ":" + processTime(calendar.get(Calendar.MINUTE)) + ":" + processTime(calendar.get(Calendar.SECOND)) + endHeaderTag - + "<dev>" + "<PLAINTEXT>" + + "<DIV style=\"color:#A7A7A7;\">" + "<PLAINTEXT>" + processSmilies(processNewLines(processLinks(message))) - + "</PLAINTEXT>" + "</dev>"; + + "</PLAINTEXT>" + "</DIV>"; } else if (messageType.equals(Constants.HISTORY_OUTGOING_MESSAGE)) { chatString = "<h3>"; @@ -276,10 +276,10 @@ public class ChatConversationPanel extends JScrollPane implements + processTime(calendar.get(Calendar.HOUR_OF_DAY)) + ":" + processTime(calendar.get(Calendar.MINUTE)) + ":" + processTime(calendar.get(Calendar.SECOND)) + endHeaderTag - + "<dev>" + "<PLAINTEXT>" + + "<DIV style=\"color:#A7A7A7;\">" + "<PLAINTEXT>" + processSmilies(processNewLines(processLinks(message))) - + "</PLAINTEXT>" + "</dev>"; - }*/ + + "</PLAINTEXT>" + "</DIV>"; + } Element root = this.document.getDefaultRootElement(); diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatPanel.java index 261efde..1b78772 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatPanel.java @@ -184,7 +184,7 @@ public class ChatPanel extends JPanel conversationPanel.processMessage( this.chatWindow.getMainFrame() .getAccount(protocolProvider), - evt.getTimestamp(), Constants.OUTGOING_MESSAGE, + evt.getTimestamp(), Constants.HISTORY_OUTGOING_MESSAGE, evt.getSourceMessage().getContent()); } else if(o instanceof MessageReceivedEvent) { @@ -193,7 +193,7 @@ public class ChatPanel extends JPanel if(evt.getTimestamp().compareTo(lastMsgTimestamp) != 0) { conversationPanel.processMessage( evt.getSourceContact().getDisplayName(), - evt.getTimestamp(), Constants.INCOMING_MESSAGE, + evt.getTimestamp(), Constants.HISTORY_INCOMING_MESSAGE, evt.getSourceMessage().getContent()); } } |