Got the user login dialog running.

diff --git a/daphne/daphne b/daphne/daphne
index 26180fafb5e046f9118a90c781873349c77c8c8c..89696623a6c960182b3ef77a91f37c4edee7add6 100755 (executable)
Binary files a/daphne/daphne and b/daphne/daphne differ

diff --git a/daphne/main.cpp b/daphne/main.cpp
index 4af31594070ec3c9efd58f356057477e6a1f7985..19004195d487eb5c53691209008fc8f05bda43fa 100644 (file)
--- a/daphne/main.cpp
+++ b/daphne/main.cpp
@@ -224,8 +224,8 @@ void MyFrame::OnConnect(wxCommandEvent& unused) {
                retval = citadel->attach("uncnsrd.mt-kisco.ny.us", "citadel");
                if (retval == 0) {
                        SetStatusText("** connected **");
-                       new UserLogin(citadel, this);
                        new TestWindow(citadel, this);
+                       new UserLogin(citadel, this);
                } else {
                        wxMessageBox("Could not connect to server.", "Error");
                }

diff --git a/daphne/testwindow.cpp b/daphne/testwindow.cpp
index 2e47a447b47674b5c07ab8c2511b0f1407970f54..b8647412ffdea635883a76b1f330adb393a51c8c 100644 (file)
--- a/daphne/testwindow.cpp
+++ b/daphne/testwindow.cpp
@@ -98,7 +98,7 @@ TestWindow::TestWindow(CitClient *sock, wxMDIParentFrame *MyMDI)
                panel,
                BUTTON_CLOSE,
                "Close",
-               wxPoint(100,300),
+               wxPoint(150,300),
                wxSize(100,30),
                0L,
                wxDefaultValidator,

diff --git a/daphne/userlogin.cpp b/daphne/userlogin.cpp
index 0201208cca15ed5bcd189b9f2b94e4178d92910f..a55f3943ee0bd9ef66135eccfdf7199f344d0833 100644 (file)
--- a/daphne/userlogin.cpp
+++ b/daphne/userlogin.cpp
@@ -34,6 +34,8 @@ enum
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(     UserLogin, wxMDIChildFrame)
        EVT_BUTTON(     BUTTON_LOGIN,           UserLogin::OnButtonPressed)
+       EVT_BUTTON(     BUTTON_NEWUSER,         UserLogin::OnButtonPressed)
+       EVT_BUTTON(     BUTTON_EXIT,            UserLogin::OnButtonPressed)
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -49,20 +51,25 @@ END_EVENT_TABLE()
 UserLogin::UserLogin(CitClient *sock, wxMDIParentFrame *MyMDI)
        : wxMDIChildFrame(MyMDI,        //parent
                        -1,     //window id
-                       "Please log in",
+                       " Please log in ",
                        wxDefaultPosition,
                        wxDefaultSize,
                        wxDEFAULT_FRAME_STYLE,
                        "UserLogin"
                        ) {
 
+       citsock = sock;
+
        // set the frame icon
        /* SetIcon(wxICON(mondrian)); */
 
-       panel = new wxPanel(this);
+       wxStaticText *username_label = new wxStaticText(
+               this, -1, "User name:",
+               wxDefaultPosition, wxDefaultSize, 0, ""
+               );
 
        username = new wxTextCtrl(
-               panel,
+               this,
                -1,
                "",
                wxPoint(10,10),
@@ -72,8 +79,13 @@ UserLogin::UserLogin(CitClient *sock, wxMDIParentFrame *MyMDI)
                "sendcmd"
                );
 
+       wxStaticText *password_label = new wxStaticText(
+               this, -1, "Password:",
+               wxDefaultPosition, wxDefaultSize, 0, ""
+               );
+
        password = new wxTextCtrl(
-               panel,
+               this,
                -1,
                "",
                wxPoint(10,100),
@@ -84,10 +96,10 @@ UserLogin::UserLogin(CitClient *sock, wxMDIParentFrame *MyMDI)
                );
 
        login_button = new wxButton(
-               panel,
+               this,
                BUTTON_LOGIN,
                "Login",
-               wxPoint(10,300),
+               wxPoint(100,100),
                wxSize(100,30),
                0L,
                wxDefaultValidator,
@@ -95,10 +107,10 @@ UserLogin::UserLogin(CitClient *sock, wxMDIParentFrame *MyMDI)
                );
 
        newuser_button = new wxButton(
-               panel,
+               this,
                BUTTON_NEWUSER,
                "New user",
-               wxPoint(120,300),
+               wxPoint(200,200),
                wxSize(100,30),
                0L,
                wxDefaultValidator,
@@ -106,23 +118,100 @@ UserLogin::UserLogin(CitClient *sock, wxMDIParentFrame *MyMDI)
                );
 
        exit_button = new wxButton(
-               panel,
+               this,
                BUTTON_EXIT,
                "Exit",
-               wxPoint(230,300),
+               wxPoint(300,300),
                wxSize(100,30),
                0L,
                wxDefaultValidator,
                "exit_button"
                );
 
+       wxLayoutConstraints *c1 = new wxLayoutConstraints;
+       c1->bottom.SameAs(this, wxBottom, 10);          // 10 from the bottom
+       c1->centreX.SameAs(this, wxCentreX);            // in the middle
+       c1->height.AsIs(); c1->width.AsIs();
+       newuser_button->SetConstraints(c1);
+
+       wxLayoutConstraints *c2 = new wxLayoutConstraints;
+       c2->bottom.SameAs(newuser_button, wxBottom);
+       c2->right.LeftOf(newuser_button, 10);           // 10 from middle btn
+       c2->height.AsIs(); c2->width.AsIs();
+       login_button->SetConstraints(c2);
+
+       wxLayoutConstraints *c3 = new wxLayoutConstraints;
+       c3->bottom.SameAs(newuser_button, wxBottom);
+       c3->left.RightOf(newuser_button, 10);           // 10 from middle btn
+       c3->height.AsIs(); c3->width.AsIs();
+       exit_button->SetConstraints(c3);
+
+       wxLayoutConstraints *c4 = new wxLayoutConstraints;
+       c4->bottom.Above(newuser_button, -10);
+       c4->left.SameAs(newuser_button, wxCentreX);
+       c4->height.AsIs();
+       c4->right.SameAs(this, wxRight, 10);
+       password->SetConstraints(c4);
+
+       wxLayoutConstraints *c5 = new wxLayoutConstraints;
+       c5->bottom.Above(password, -10);
+       c5->left.SameAs(password, wxLeft);
+       c5->height.AsIs();
+       c5->width.SameAs(password, wxWidth);
+       username->SetConstraints(c5);
+
+       wxLayoutConstraints *c6 = new wxLayoutConstraints;
+       c6->right.LeftOf(password, 10);
+       c6->bottom.SameAs(password, wxBottom);
+       c6->width.AsIs(); c6->height.AsIs();
+       password_label->SetConstraints(c6);
+
+       wxLayoutConstraints *c7 = new wxLayoutConstraints;
+       c7->right.LeftOf(username, 10);
+       c7->bottom.SameAs(username, wxBottom);
+       c7->width.AsIs(); c7->height.AsIs();
+       username_label->SetConstraints(c7);
+
+       SetAutoLayout(TRUE);
        Show(TRUE);
 }
 
 
 
 void UserLogin::OnButtonPressed(wxCommandEvent& whichbutton) {
+       wxString sendbuf;
+       wxString recvbuf;
+       int r;
+
        if (whichbutton.GetId() == BUTTON_EXIT) {
                delete this;
        }
+
+       if (whichbutton.GetId() == BUTTON_LOGIN) {
+               sendbuf = "USER ";
+               sendbuf += username->GetValue();
+               r = citsock->serv_trans(sendbuf, recvbuf);
+               if (r != 3) {
+                       wxMessageDialog nouser(this,
+                               recvbuf,
+                               "Error",
+                               wxOK | wxCENTRE | wxICON_INFORMATION,
+                               wxDefaultPosition);
+                       nouser.ShowModal();
+               } else {
+                       sendbuf = "PASS ";
+                       sendbuf += password->GetValue();
+                       r = citsock->serv_trans(sendbuf, recvbuf);
+                       if (r != 3) {
+                               wxMessageDialog nopass(this,
+                                       recvbuf,
+                                       "Error",
+                                       wxOK | wxCENTRE | wxICON_INFORMATION,
+                                       wxDefaultPosition);
+                               nopass.ShowModal();
+                       } else {
+                               // FIX do login procedure here
+                       }
+               }
+       }
 }

diff --git a/daphne/userlogin.hpp b/daphne/userlogin.hpp
index 475d2192b8a83a12d92e1dfeebb64e4e3115132c..203bde0e8183f42940f42ed6d40e64c2be08e5bc 100644 (file)
--- a/daphne/userlogin.hpp
+++ b/daphne/userlogin.hpp
@@ -11,5 +11,6 @@ private:
        wxButton *newuser_button;
        wxButton *exit_button;
        void OnButtonPressed(wxCommandEvent& whichbutton);
+       CitClient *citsock;
        DECLARE_EVENT_TABLE()
 };