Fixed initialization order and added setup_keyboard.* and keyboardconfig.* to

the list of source files. Also set some missing Subversion properties.

2 files changed, 224 insertions, 222 deletions

diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 4cb39494..6a89ce8f 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -1,141 +1,142 @@
-/*

- *  The Mana World

- *  Copyright 2007 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

- *

- */

-

-#include "setup_keyboard.h"

-

-#include <guichan/widgets/label.hpp>

-

-#include "button.h"

-#include "ok_dialog.h"

-

-#include "../configuration.h"

-#include "../keyboardconfig.h"

-

-#include "../utils/tostring.h"

-

-#include <SDL_keyboard.h>

-

-Setup_Keyboard::Setup_Keyboard()

-{

-    setOpaque(false);

-

-    keyboard.setSetupKeyboard(this);

-

-    mKeyLabel = new gcn::Label[keyboard.KEY_TOTAL];

-    mKeyButton = new Button[keyboard.KEY_TOTAL];

-

-    for (int i=0; i < keyboard.KEY_TOTAL; i++)

-    {

-        refreshAssignedKey(i);

-        mKeyLabel[i].setPosition(10, 10+(i*20));

-        add(&mKeyLabel[i]);

-

-        mKeyButton[i].setCaption("Set");

-        mKeyButton[i].adjustSize();

-        mKeyButton[i].addActionListener(this);

-        mKeyButton[i].setActionEventId("sk"+toString(i));

-        mKeyButton[i].setPosition(150,5+(i*20));

-        add(&mKeyButton[i]);

-    }

-    mMakeDefaultButton = new Button("Default", "makeDefault", this);

-    mMakeDefaultButton->setPosition(200, 5);

-    mMakeDefaultButton->addActionListener(this);

-    add(mMakeDefaultButton);

-}

-

-Setup_Keyboard::~Setup_Keyboard()

-{

-    delete [] mKeyLabel;

-    delete [] mKeyButton;

-    delete mMakeDefaultButton;

-}

-

-void Setup_Keyboard::apply()

-{

-    if (keyboard.hasConflicts())

-    {

-        new OkDialog("Key Conflict(s) Detected.",

-            "One or more key conflicts has been detected. "

-            "Resolve them immediately, "

-            "or gameplay might result in unpredictable behaviour");

-    }

-    keyboard.setEnabled(true);

-    keyboard.store();

-}

-

-void Setup_Keyboard::cancel()

-{

-    keyboard.retrieve();

-    keyboard.setEnabled(true);

-    refreshKeys();

-}

-

-void Setup_Keyboard::action(const gcn::ActionEvent &event)

-{

-    if (event.getId() == "makeDefault")

-    {

-        keyboard.makeDefault();

-        refreshKeys();

-        return;

-    }

-    for (int i=0; i < keyboard.KEY_TOTAL; i++)

-    {

-        if (event.getId() == "sk"+toString(i))

-        {

-            keyboard.setEnabled(false);

-            keyboard.setNewKeyIndex(i);

-            enableSetButtons(false);

-            mKeyLabel[i].setCaption(keyboard.getKeyCaption(i) + ": ?");

-        }

-    }

-}

-

-void Setup_Keyboard::enableSetButtons(bool bValue)

-{

-    for (int i=0; i < keyboard.KEY_TOTAL; i++)

-    {

-        mKeyButton[i].setEnabled(bValue);

-    }

-}

-

-void Setup_Keyboard::refreshAssignedKey(const int index)

-{

-    char *temp = SDL_GetKeyName(

-        (SDLKey) keyboard.getKeyValue(index));

-    mKeyLabel[index].setCaption(

-        keyboard.getKeyCaption(index) + ": " + toString(temp));

-    mKeyLabel[index].adjustSize();

-}

-

-void Setup_Keyboard::newKeyCallback(const int index)

-{

-    refreshAssignedKey(index);

-    enableSetButtons(true);

-}

-

-void Setup_Keyboard::refreshKeys()

-{

-    for(int i=0; i < keyboard.KEY_TOTAL; i++)

-    {

-        refreshAssignedKey(i);

-    }

-}

+/*
+ *  The Mana World
+ *  Copyright 2007 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$
+ */
+
+#include "setup_keyboard.h"
+
+#include <guichan/widgets/label.hpp>
+
+#include "button.h"
+#include "ok_dialog.h"
+
+#include "../configuration.h"
+#include "../keyboardconfig.h"
+
+#include "../utils/tostring.h"
+
+#include <SDL_keyboard.h>
+
+Setup_Keyboard::Setup_Keyboard()
+{
+    setOpaque(false);
+
+    keyboard.setSetupKeyboard(this);
+
+    mKeyLabel = new gcn::Label[keyboard.KEY_TOTAL];
+    mKeyButton = new Button[keyboard.KEY_TOTAL];
+
+    for (int i = 0; i < keyboard.KEY_TOTAL; i++)
+    {
+        refreshAssignedKey(i);
+        mKeyLabel[i].setPosition(10, 10+(i*20));
+        add(&mKeyLabel[i]);
+
+        mKeyButton[i].setCaption("Set");
+        mKeyButton[i].adjustSize();
+        mKeyButton[i].addActionListener(this);
+        mKeyButton[i].setActionEventId("sk"+toString(i));
+        mKeyButton[i].setPosition(150,5+(i*20));
+        add(&mKeyButton[i]);
+    }
+    mMakeDefaultButton = new Button("Default", "makeDefault", this);
+    mMakeDefaultButton->setPosition(200, 5);
+    mMakeDefaultButton->addActionListener(this);
+    add(mMakeDefaultButton);
+}
+
+Setup_Keyboard::~Setup_Keyboard()
+{
+    delete [] mKeyLabel;
+    delete [] mKeyButton;
+    delete mMakeDefaultButton;
+}
+
+void Setup_Keyboard::apply()
+{
+    if (keyboard.hasConflicts())
+    {
+        new OkDialog("Key Conflict(s) Detected.",
+            "One or more key conflicts has been detected. "
+            "Resolve them immediately, "
+            "or gameplay might result in unpredictable behaviour");
+    }
+    keyboard.setEnabled(true);
+    keyboard.store();
+}
+
+void Setup_Keyboard::cancel()
+{
+    keyboard.retrieve();
+    keyboard.setEnabled(true);
+    refreshKeys();
+}
+
+void Setup_Keyboard::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "makeDefault")
+    {
+        keyboard.makeDefault();
+        refreshKeys();
+        return;
+    }
+    for (int i = 0; i < keyboard.KEY_TOTAL; i++)
+    {
+        if (event.getId() == "sk"+toString(i))
+        {
+            keyboard.setEnabled(false);
+            keyboard.setNewKeyIndex(i);
+            enableSetButtons(false);
+            mKeyLabel[i].setCaption(keyboard.getKeyCaption(i) + ": ?");
+        }
+    }
+}
+
+void Setup_Keyboard::enableSetButtons(bool bValue)
+{
+    for (int i = 0; i < keyboard.KEY_TOTAL; i++)
+    {
+        mKeyButton[i].setEnabled(bValue);
+    }
+}
+
+void Setup_Keyboard::refreshAssignedKey(const int index)
+{
+    char *temp = SDL_GetKeyName(
+        (SDLKey) keyboard.getKeyValue(index));
+    mKeyLabel[index].setCaption(
+        keyboard.getKeyCaption(index) + ": " + toString(temp));
+    mKeyLabel[index].adjustSize();
+}
+
+void Setup_Keyboard::newKeyCallback(const int index)
+{
+    refreshAssignedKey(index);
+    enableSetButtons(true);
+}
+
+void Setup_Keyboard::refreshKeys()
+{
+    for (int i = 0; i < keyboard.KEY_TOTAL; i++)
+    {
+        refreshAssignedKey(i);
+    }
+}
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 115a2b9a..4701487b 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -1,81 +1,82 @@
-/*

- *  The Mana World

- *  Copyright 2007 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

- *

- */

-

-#ifndef _TMW_GUI_SETUP_KEYBOARD_H

-#define _TMW_GUI_SETUP_KEYBOARD_H

-

-#include "setuptab.h"

-#include "button.h"

-#include "../guichanfwd.h"

-

-#include <guichan/actionlistener.hpp>

-

-

-#include <string>

-

-class Setup_Keyboard : public SetupTab, public gcn::ActionListener

-{

-    public:

-        /**

-         * Constructor

-         */

-        Setup_Keyboard();

-

-        /**

-         * Destructor

-         */

-        ~Setup_Keyboard();

-

-        void apply();

-        void cancel();

-

-        void action(const gcn::ActionEvent &event);

-

-        /**

-         * Easy way to disable/enable all the set buttons.

-         */

-        void enableSetButtons(bool bValue);

-

-        /**

-         * Get an update on the assigned key.

-         */

-        void refreshAssignedKey(const int index);

-

-        /**

-         * The callback function when a new key has been pressed.

-         */

-        void newKeyCallback(const int index);

-

-        /**

-         * Shorthand method to update all the keys.

-         */

-        void refreshKeys();

-

-    private:

-        gcn::Label *mKeyLabel;

-

-        Button *mKeyButton;

-

-        gcn::Button *mMakeDefaultButton;

-};

-

-#endif

+/*
+ *  The Mana World
+ *  Copyright 2007 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$
+ */
+
+#ifndef _TMW_GUI_SETUP_KEYBOARD_H
+#define _TMW_GUI_SETUP_KEYBOARD_H
+
+#include "setuptab.h"
+#include "button.h"
+#include "../guichanfwd.h"
+
+#include <guichan/actionlistener.hpp>
+
+
+#include <string>
+
+class Setup_Keyboard : public SetupTab, public gcn::ActionListener
+{
+    public:
+        /**
+         * Constructor
+         */
+        Setup_Keyboard();
+
+        /**
+         * Destructor
+         */
+        ~Setup_Keyboard();
+
+        void apply();
+        void cancel();
+
+        void action(const gcn::ActionEvent &event);
+
+        /**
+         * Easy way to disable/enable all the set buttons.
+         */
+        void enableSetButtons(bool bValue);
+
+        /**
+         * Get an update on the assigned key.
+         */
+        void refreshAssignedKey(const int index);
+
+        /**
+         * The callback function when a new key has been pressed.
+         */
+        void newKeyCallback(const int index);
+
+        /**
+         * Shorthand method to update all the keys.
+         */
+        void refreshKeys();
+
+    private:
+        gcn::Label *mKeyLabel;
+
+        Button *mKeyButton;
+
+        gcn::Button *mMakeDefaultButton;
+};
+
+#endif