Added a first version of the server dialog with an unskinned dropdown. Upgraded also the connection window a bit to handle Cancelling more gracefully.

4 files changed, 408 insertions, 5 deletions

diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index a29008c3..1e0034fb 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -35,18 +35,25 @@
 namespace {
     struct ConnectionActionListener : public gcn::ActionListener
     {
+        ConnectionActionListener(unsigned char previousState):
+            mPreviousState(previousState) {};
+
         void action(const std::string &eventId, gcn::Widget *widget) {
-            state = STATE_EXIT;
+            state = mPreviousState;
         }
-    } listener;
+
+        unsigned char mPreviousState;
+    };
 }
 
-ConnectionDialog::ConnectionDialog():
+ConnectionDialog::ConnectionDialog(unsigned char previousState):
     Window("Info"), mProgress(0)
 {
     setContentSize(200, 100);
 
-    Button *cancelButton = new Button("Cancel", "cancelButton", &listener);
+    ConnectionActionListener *connectionListener = new ConnectionActionListener(previousState);
+
+    Button *cancelButton = new Button("Cancel", "cancelButton", connectionListener);
     mProgressBar = new ProgressBar(0.0, 200 - 10, 20, 128, 128, 128);
     gcn::Label *label = new gcn::Label("Connecting...");
 
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 7a072d2e..4b3187f6 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -41,7 +41,7 @@ class ConnectionDialog : public Window
          *
          * @see Window::Window
          */
-        ConnectionDialog();
+        ConnectionDialog(unsigned char previousState);
 
         void logic();
 
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
new file mode 100644
index 00000000..50464bcf
--- /dev/null
+++ b/src/gui/serverdialog.cpp
@@ -0,0 +1,251 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: login.cpp 2550 2006-08-20 00:56:23Z b_lindeijer $
+ */
+
+#include "serverdialog.h"
+
+#include <string>
+#include <iostream>
+#include "../utils/tostring.h"
+
+#include <guichan/widgets/label.hpp>
+
+#include "../main.h"
+#include "../logindata.h"
+
+#include "log.h"
+#include "configuration.h"
+
+#include "button.h"
+#include "ok_dialog.h"
+#include "textfield.h"
+
+// TODO : Replace the dropdown by our own skinned one.
+#include <guichan/widgets/dropdown.hpp>
+#include "listbox.h"
+#include "scrollarea.h"
+
+const short MAX_SERVERLIST = 5;
+
+void
+DropDownListener::action(const std::string &eventId, gcn::Widget *widget)
+{
+    if (eventId == "ok")
+    {
+        // Reset the text fields and give back the server dialog.
+        mServerNameField->setText("");
+        mServerNameField->setCaretPosition(0);
+        mServerPortField->setText("");
+        mServerPortField->setCaretPosition(0);
+
+        mServerNameField->requestFocus();
+    }
+    else if (eventId == "changeSelection")
+    {
+        // Change the textField Values according to new selection
+        if (currentSelectedIndex != mServersListBox->getSelected())
+        {
+            Server myServer;
+            myServer = mServersListModel->getServer(mServersListBox->getSelected());
+            mServerNameField->setText(myServer.serverName);
+            mServerPortField->setText(toString(myServer.port));
+            currentSelectedIndex = mServersListBox->getSelected();
+        }
+    }
+}
+
+int ServersListModel::getNumberOfElements()
+{
+    return servers.size();
+}
+
+std::string ServersListModel::getElementAt(int elementIndex)
+{
+    std::string myServer = "";
+    myServer = servers.at(elementIndex).serverName;
+    myServer += ":";
+    myServer += toString(servers.at(elementIndex).port);
+    return myServer;
+}
+
+void ServersListModel::addFirstElement(Server server)
+{
+    // Equivalent to push_front
+    std::vector<Server>::iterator MyIterator = servers.begin();
+    servers.insert(MyIterator, 1, server);
+}
+
+void ServersListModel::addElement(Server server)
+{
+    servers.push_back(server);
+}
+
+ServerDialog::ServerDialog(LoginData *loginData):
+    Window("Choose your Mana World Server"), mLoginData(loginData)
+{
+    gcn::Label *serverLabel = new gcn::Label("Server:");
+    gcn::Label *portLabel = new gcn::Label("Port:");
+    mServerNameField = new TextField(mLoginData->hostname);
+    mPortField = new TextField(toString(mLoginData->port));
+
+    // Add the most used servers from config
+    mMostUsedServersListModel = new ServersListModel();
+    Server currentServer;
+    std::string currentConfig = "";
+    for (int i=0; i<=MAX_SERVERLIST; i++)
+    {
+        currentServer.serverName = "";
+        currentServer.port = 0;
+
+        currentConfig = "MostUsedServerName" + toString(i);
+        currentServer.serverName = config.getValue(currentConfig, "");
+
+        currentConfig = "MostUsedServerPort" + toString(i);
+        currentServer.port = (short)atoi(config.getValue(currentConfig, "").c_str());
+        if (!currentServer.serverName.empty() || currentServer.port != 0)
+        {
+            mMostUsedServersListModel->addElement(currentServer);
+        }
+    }
+
+    mMostUsedServersListBox = new ListBox(mMostUsedServersListModel);
+    mMostUsedServersScrollArea = new ScrollArea();
+    mMostUsedServersDropDown = new gcn::DropDown(mMostUsedServersListModel,
+        mMostUsedServersScrollArea, mMostUsedServersListBox);
+
+    mDropDownListener = new DropDownListener(mServerNameField, mPortField,
+                                mMostUsedServersListModel, mMostUsedServersListBox);
+
+    mOkButton = new Button("OK", "ok", this);
+    mCancelButton = new Button("Cancel", "cancel", this);
+
+    setContentSize(200, 100);
+
+    serverLabel->setPosition(10, 5);
+    portLabel->setPosition(10, 14 + serverLabel->getHeight());
+
+    mServerNameField->setPosition(60, 5);
+    mPortField->setPosition(60, 14 + serverLabel->getHeight());
+    mServerNameField->setWidth(130);
+    mPortField->setWidth(130);
+
+    mMostUsedServersDropDown->setPosition(10, 10 +
+        portLabel->getY() + portLabel->getHeight());
+    mMostUsedServersDropDown->setWidth(180);
+
+    mCancelButton->setPosition(
+            200 - mCancelButton->getWidth() - 5,
+            100 - mCancelButton->getHeight() - 5);
+    mOkButton->setPosition(
+            mCancelButton->getX() - mOkButton->getWidth() - 5,
+            100 - mOkButton->getHeight() - 5);
+
+    mServerNameField->setEventId("ok");
+    mPortField->setEventId("ok");
+    mMostUsedServersDropDown->setEventId("changeSelection");
+
+    mServerNameField->addActionListener(this);
+    mPortField->addActionListener(this);
+    mMostUsedServersDropDown->addActionListener(mDropDownListener);
+
+    add(serverLabel);
+    add(portLabel);
+    add(mServerNameField);
+    add(mPortField);
+    add(mMostUsedServersDropDown);
+    add(mOkButton);
+    add(mCancelButton);
+
+    setLocationRelativeTo(getParent());
+
+    if (mServerNameField->getText().empty()) {
+        mServerNameField->requestFocus();
+    } else {
+        if (mPortField->getText().empty()) {
+            mPortField->requestFocus();
+        } else {
+            mOkButton->requestFocus();
+        }
+    }
+}
+
+ServerDialog::~ServerDialog()
+{
+    delete mDropDownListener;
+}
+
+void
+ServerDialog::action(const std::string &eventId, gcn::Widget *widget)
+{
+    if (eventId == "ok")
+    {
+        // Check login
+        if (mServerNameField->getText().empty() || mPortField->getText().empty())
+        {
+            OkDialog *dlg = new OkDialog("Error", "Enter the chosen server.");
+            dlg->addActionListener(mDropDownListener);
+        }
+        else
+        {
+            mLoginData->hostname = mServerNameField->getText();
+            mLoginData->port = (short) atoi(mPortField->getText().c_str());
+            mOkButton->setEnabled(false);
+            mCancelButton->setEnabled(false);
+
+            // First, look if the entry is a new one.
+            Server currentServer;
+            bool newEntry = true;
+            for (int i = 0; i < mMostUsedServersListModel->getNumberOfElements(); i++)
+            {
+                currentServer = mMostUsedServersListModel->getServer(i);
+                if (currentServer.serverName == mLoginData->hostname &&
+                    currentServer.port == mLoginData->port)
+                    newEntry = false;
+            }
+            // Then, add it to config if it's really new
+            currentServer.serverName = mLoginData->hostname;
+            currentServer.port = mLoginData->port;
+            if (newEntry)
+                mMostUsedServersListModel->addFirstElement(currentServer);
+            // Write the entry in config
+            std::string currentConfig = "";
+            for (int i = 0; i < mMostUsedServersListModel->getNumberOfElements(); i++)
+            {
+                currentServer = mMostUsedServersListModel->getServer(i);
+
+                currentConfig = "MostUsedServerName" + toString(i);
+                config.setValue(currentConfig, currentServer.serverName);
+
+                currentConfig = "MostUsedServerPort" + toString(i);
+                config.setValue(currentConfig, toString(currentServer.port));
+            }
+            logger->log("Trying to connect to account server...");
+                Network::connect(Network::ACCOUNT,
+                                  mLoginData->hostname, mLoginData->port);
+                state = STATE_CONNECT_ACCOUNT;
+        }
+    }
+    else if (eventId == "cancel")
+    {
+        state = STATE_EXIT;
+    }
+}
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
new file mode 100644
index 00000000..a638e877
--- /dev/null
+++ b/src/gui/serverdialog.h
@@ -0,0 +1,145 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: login.h 2486 2006-07-30 14:33:28Z b_lindeijer $
+ */
+
+#ifndef _TMW_SERVERDIALOG_H
+#define _TMW_SERVERDIALOG_H
+
+#include <iosfwd>
+#include <guichan/actionlistener.hpp>
+
+#include "window.h"
+#include "../guichanfwd.h"
+
+#include "login.h"
+#include "net/network.h"
+
+class LoginData;
+
+/**
+ * A server structure to keep pairs of servers and ports.
+ */
+struct Server {
+    Server():
+        serverName(""),
+        port(0) {};
+
+    std::string serverName;
+    short port;
+};
+
+/**
+ * Server and Port List Model
+ */
+class ServersListModel : public gcn::ListModel {
+    public:
+        /**
+         * Used to get number of line in the list
+         */
+        int getNumberOfElements();
+        /**
+         * Used to get an element from the list
+         */
+        std::string getElementAt(int elementIndex);
+        /**
+         * Used to get the corresponding Server struct
+         */
+        Server getServer(int elementIndex) { return servers[elementIndex]; };
+        /**
+         * Add an Element at the end of the server list
+         */
+        void addElement(Server server);
+        /**
+         * Add an Element at the beginning of the server list
+         */
+        void addFirstElement(Server server);
+    private:
+        std::vector<Server> servers;
+};
+
+/**
+ * Listener used for handling the DropDown in the server Dialog.
+ */
+class DropDownListener : public gcn::ActionListener {
+    public:
+        DropDownListener(gcn::TextField *serverNameField,
+                         gcn::TextField *serverPortField,
+                         ServersListModel *serversListModel,
+                         gcn::ListBox *serversListBox):
+            currentSelectedIndex(0),
+            mServerNameField(serverNameField),
+            mServerPortField(serverPortField),
+            mServersListModel(serversListModel),
+            mServersListBox(serversListBox) {};
+        void action(const std::string& eventId,
+                    gcn::Widget* widget);
+    private:
+        short currentSelectedIndex;
+        gcn::TextField *mServerNameField;
+        gcn::TextField *mServerPortField;
+        ServersListModel *mServersListModel;
+        gcn::ListBox *mServersListBox;
+};
+
+
+/**
+ * The server choice dialog.
+ *
+ * \ingroup Interface
+ */
+class ServerDialog : public Window, public gcn::ActionListener {
+    public:
+        /**
+         * Constructor
+         *
+         * @see Window::Window
+         */
+        ServerDialog(LoginData *loginData);
+
+        /**
+         * Destructor
+         */
+        ~ServerDialog();
+
+        /**
+         * Called when receiving actions from the widgets.
+         */
+        void action(const std::string& eventId, gcn::Widget* widget);
+
+    private:
+        gcn::TextField *mServerNameField;
+        gcn::TextField *mPortField;
+        gcn::Button *mOkButton;
+        gcn::Button *mCancelButton;
+
+        // TODO : child the Dropdown List to skin it.
+        gcn::DropDown *mMostUsedServersDropDown;
+        gcn::ListBox *mMostUsedServersListBox;
+        gcn::ScrollArea *mMostUsedServersScrollArea;
+        ServersListModel *mMostUsedServersListModel;
+
+        DropDownListener *mDropDownListener;
+
+        LoginData *mLoginData;
+};
+
+#endif