From bfbb797e6c528e0650826e917d498c52362abbb0 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 24 Mar 2007 16:24:43 +0000
Subject: Merged 0.0 changes from revision 3177 to 3234 to trunk.

---
 src/gui/login.h | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/gui/login.h')

diff --git a/src/gui/login.h b/src/gui/login.h
index 05c0da31..d8ae7eaf 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -26,29 +26,21 @@
 
 #include <iosfwd>
 #include <guichan/actionlistener.hpp>
+#include <guichan/keylistener.hpp>
 
 #include "window.h"
 #include "../guichanfwd.h"
 
 class LoginData;
 
-/**
- * Listener used for handling wrong data.
- */
-class WrongDataNoticeListener : public gcn::ActionListener {
-    public:
-        void setTarget(gcn::TextField *textField);
-        void action(const gcn::ActionEvent &event);
-    private:
-        gcn::TextField *mTarget;
-};
-
 /**
  * The login dialog.
  *
  * \ingroup Interface
  */
-class LoginDialog : public Window, public gcn::ActionListener {
+class LoginDialog : public Window, public gcn::ActionListener,
+                    public gcn::KeyListener
+{
     public:
         /**
          * Constructor
@@ -67,7 +59,19 @@ class LoginDialog : public Window, public gcn::ActionListener {
          */
         void action(const gcn::ActionEvent &event);
 
+        /**
+         * Called when a key is pressed in one of the text fields.
+         */
+        void keyPressed(gcn::KeyEvent &keyEvent);
+
     private:
+        /**
+         * Returns whether submit can be enabled. This is true in the login
+         * state, when all necessary fields have some text.
+         */
+        bool
+        canSubmit();
+
         gcn::TextField *mUserField;
         gcn::TextField *mPassField;
         gcn::CheckBox *mKeepCheck;
@@ -75,8 +79,6 @@ class LoginDialog : public Window, public gcn::ActionListener {
         gcn::Button *mCancelButton;
         gcn::Button *mRegisterButton;
 
-        WrongDataNoticeListener *mWrongDataNoticeListener;
-
         LoginData *mLoginData;
 };
 
-- 
cgit v1.2.3-70-g09d2