Menu
▾
▴
[Rochat-svn] SF.net SVN: rochat: [29] trunk/src/net/sensiva/rochat
|
From: <le...@us...> - 2007-10-21 17:39:35
|
Revision: 29
http://rochat.svn.sourceforge.net/rochat/?rev=29&view=rev
Author: levia
Date: 2007-10-21 10:39:29 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
- Fixed menu.
Modified Paths:
--------------
trunk/src/net/sensiva/rochat/core/connection/IRCConnection.java
trunk/src/net/sensiva/rochat/ui/main/MenuBar.java
trunk/src/net/sensiva/rochat/ui/tabs/StatusTab.java
Modified: trunk/src/net/sensiva/rochat/core/connection/IRCConnection.java
===================================================================
--- trunk/src/net/sensiva/rochat/core/connection/IRCConnection.java 2007-10-21 16:11:40 UTC (rev 28)
+++ trunk/src/net/sensiva/rochat/core/connection/IRCConnection.java 2007-10-21 17:39:29 UTC (rev 29)
@@ -20,7 +20,6 @@
package net.sensiva.rochat.core.connection;
import net.sensiva.rochat.core.logging.*;
-import net.sensiva.rochat.core.message.*;
import java.util.*;
import java.net.*;
import java.io.*;
@@ -102,7 +101,6 @@
{
try
{
- //m_Socket.setSoTimeout(5000);
//Socket timeout, 0 for infinite;
m_Socket.setSoTimeout(0);
Modified: trunk/src/net/sensiva/rochat/ui/main/MenuBar.java
===================================================================
--- trunk/src/net/sensiva/rochat/ui/main/MenuBar.java 2007-10-21 16:11:40 UTC (rev 28)
+++ trunk/src/net/sensiva/rochat/ui/main/MenuBar.java 2007-10-21 17:39:29 UTC (rev 29)
@@ -45,19 +45,20 @@
menu.setToolTipText("The file menu!");
//File --> Exit
- JMenuItem menuItemConn = new JMenuItem("Connect",KeyEvent.VK_C);
- menuItemConn.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C,ActionEvent.CTRL_MASK));
- menuItemConn.setToolTipText("Quick connect to a server");
- menuItemConn.addActionListener(this);
+ JMenuItem menuItem = new JMenuItem("Connect",KeyEvent.VK_C);
+ menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C,ActionEvent.CTRL_MASK));
+ menuItem.setToolTipText("Quick connect to a server");
+ menuItem.addActionListener(this);
- menu.add(menuItemConn);
+ menu.add(menuItem);
+ menu.addSeparator();
- JMenuItem menuItemExit = new JMenuItem("Exit",KeyEvent.VK_Q);
- menuItemExit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,ActionEvent.CTRL_MASK));
- menuItemExit.setToolTipText("Quit the application");
- menuItemExit.addActionListener(this);
+ menuItem = new JMenuItem("Exit",KeyEvent.VK_Q);
+ menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,ActionEvent.CTRL_MASK));
+ menuItem.setToolTipText("Quit the application");
+ menuItem.addActionListener(this);
- menu.add(menuItemExit);
+ menu.add(menuItem);
add(menu);
@@ -66,14 +67,14 @@
menu.setMnemonic(KeyEvent.VK_H);
menu.setToolTipText("The help menu!");
-// //Help --> About
-// menuItem = new JMenuItem("About",KeyEvent.VK_A);
-// menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A,ActionEvent.CTRL_MASK));
-// menuItem.setToolTipText("Shows the about menu");
-// menuItem.addActionListener(this);
-//
-// menu.add(menuItem);
-// add(menu);
+ //Help --> About
+ menuItem = new JMenuItem("About",KeyEvent.VK_A);
+ menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A,ActionEvent.CTRL_MASK));
+ menuItem.setToolTipText("Shows the about menu");
+ menuItem.addActionListener(this);
+
+ menu.add(menuItem);
+ add(menu);
}
public void actionPerformed(ActionEvent event)
Modified: trunk/src/net/sensiva/rochat/ui/tabs/StatusTab.java
===================================================================
--- trunk/src/net/sensiva/rochat/ui/tabs/StatusTab.java 2007-10-21 16:11:40 UTC (rev 28)
+++ trunk/src/net/sensiva/rochat/ui/tabs/StatusTab.java 2007-10-21 17:39:29 UTC (rev 29)
@@ -24,16 +24,17 @@
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
+import javax.swing.text.*;
/**
* The tab that shows server status replies and all.
*/
-public class StatusTab extends JPanel implements Tab, ConnectionListener
+public class StatusTab extends JPanel implements Tab, ConnectionListener, ActionListener
{
private MainFrame m_MainFrame;
private int m_TabIndex;
private JPanel m_ContentPane;
- private JEditorPane m_MessageList;
+ private JTextPane m_MessageList;
private JTextField m_TextField;
private IRCConnection m_Connection = null;
@@ -61,26 +62,16 @@
setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
- m_MessageList = new JEditorPane();
- m_MessageList.setAutoscrolls(true);
+ m_MessageList = new JTextPane();
+ m_MessageList.setBackground(Color.WHITE);
+ m_MessageList.setEditable(false);
JScrollPane messagePane = new JScrollPane(m_MessageList);
m_TextField = new JTextField();
m_TextField.setMaximumSize(new Dimension(Integer.MAX_VALUE,20));
- m_TextField.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent event)
- {
- String e = event.getActionCommand();
-
- m_Connection.send(m_TextField.getText());
- m_TextField.setText("");
- }
- }
+ m_TextField.addActionListener(this);
- );
-
add(messagePane);
add(Box.createRigidArea(new Dimension(0,3)));
add(m_TextField);
@@ -114,13 +105,47 @@
public void serverMessageReceived(String message)
{
- m_MessageList.setText(m_MessageList.getText() + message + "\r\n");
+ //m_MessageList.setText(m_MessageList.getText() + message + "\r\n");
+ try
+ {
+ Document doc = m_MessageList.getStyledDocument();
+
+ SimpleAttributeSet set = new SimpleAttributeSet();
+ StyleConstants.setForeground(set, Color.BLACK);
+
+ m_MessageList.setCaretPosition(doc.getLength());
+ doc.insertString(doc.getLength(), m_TextField.getText() + "\n", set);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
}
public void messageReceived(String message)
{
- m_MessageList.setText(m_MessageList.getText() + message + "\r\n");
+ //m_MessageList.setText(m_MessageList.getText() + message + "\r\n");
+
+ try
+ {
+ Document doc = m_MessageList.getStyledDocument();
+
+ SimpleAttributeSet set = new SimpleAttributeSet();
+ StyleConstants.setForeground(set, Color.BLACK);
+
+ m_MessageList.setCaretPosition(doc.getLength());
+ doc.insertString(doc.getLength(), m_TextField.getText() + "\n", set);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
}
+ public void actionPerformed(ActionEvent event)
+ {
+ m_Connection.send(m_TextField.getText());
+ m_TextField.setText("");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
