summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDor Bivas <dor1_b@walla.com>2014-02-22 15:27:48 +0200
committerDor Bivas <dor1_b@walla.com>2014-02-22 15:27:48 +0200
commit53cbbd63a01904b7ccb4a092e8e3b03d32cd2155 (patch)
tree10cf7d068049d3780cf3d049e923b8b9b501e5c0
parent19041025109025482bab79f31a55eb2bb0b3bdb7 (diff)
Client : Ui
*Enter send before connect bag fix */clear removing all text from panel. * fix alt + c problem now its COPS_LOCK C.
-rw-r--r--src/Client/UserInterface.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/Client/UserInterface.java b/src/Client/UserInterface.java
index 973e4d4..e190f7b 100644
--- a/src/Client/UserInterface.java
+++ b/src/Client/UserInterface.java
@@ -35,7 +35,7 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
private void msgSendRun ()
{
- output.append("me: " + message.getText() + "\n");
+ outputWriter("me: " + message.getText());
client.PRIVMSG(message.getText());
message.setText("");
output.setCaretPosition(output.getText().length());
@@ -49,6 +49,11 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
this.connect.setEnabled(false);
}
+ public void Clear ()
+ {
+ output.setText("");
+ }
+
/** Graphic interface recipient the client*/
public UserInterface(ChatClient client)
{
@@ -149,13 +154,13 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
}
-
+
@Override
//FIXME: Do not send user send text with enter before connect.
public void keyPressed(KeyEvent e)
{
- if (e.getKeyChar() == KeyEvent.VK_ENTER)
+ if (e.getKeyChar() == KeyEvent.VK_ENTER && counterClick != 0)
{
msgSendRun();
}
@@ -166,11 +171,11 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
System.exit(0);
}
- if ((e.getModifiers() & KeyEvent.ALT_DOWN_MASK) == 0 && e.getKeyChar() == KeyEvent.VK_C && counterClick == 0) //FIXME: ALT + SHIFT + C?...
+ if ((e.getModifiersEx() & KeyEvent.ALT_DOWN_MASK) != 0 && (e.getKeyChar() == KeyEvent.VK_C && counterClick == 0)) //FIXME: ALT + SHIFT + C?...
+
{
msgConnectRun();
}
-
}