From 53cbbd63a01904b7ccb4a092e8e3b03d32cd2155 Mon Sep 17 00:00:00 2001 From: Dor Bivas Date: Sat, 22 Feb 2014 15:27:48 +0200 Subject: Client : Ui *Enter send before connect bag fix */clear removing all text from panel. * fix alt + c problem now its COPS_LOCK C. --- src/Client/UserInterface.java | 15 ++++++++++----- 1 file 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(); } - } -- cgit v1.2.3