diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/button.cpp | 20 | ||||
-rw-r--r-- | src/gui/button.h | 3 | ||||
-rw-r--r-- | src/gui/setup.cpp | 11 | ||||
-rw-r--r-- | src/gui/setup_keyboard.cpp | 145 | ||||
-rw-r--r-- | src/gui/setup_keyboard.h | 74 |
5 files changed, 245 insertions, 8 deletions
diff --git a/src/gui/button.cpp b/src/gui/button.cpp index e607b66a..a9212e83 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -37,11 +37,26 @@ ImageRect Button::button[4]; int Button::mInstances = 0; +Button::Button(): + mIsLogged(false) +{ + init(); +} + Button::Button(const std::string& caption, const std::string &actionEventId, gcn::ActionListener *listener): gcn::Button(caption), mIsLogged(false) { + init(); + setActionEventId(actionEventId); + if (listener) { + addActionListener(listener); + } +} + +void Button::init() +{ setBorderSize(0); if (mInstances == 0) @@ -72,12 +87,7 @@ Button::Button(const std::string& caption, const std::string &actionEventId, btn[mode]->decRef(); } } - mInstances++; - setActionEventId(actionEventId); - if (listener) { - addActionListener(listener); - } } Button::~Button() diff --git a/src/gui/button.h b/src/gui/button.h index eb73e311..68831d5a 100644 --- a/src/gui/button.h +++ b/src/gui/button.h @@ -37,6 +37,7 @@ class ImageRect; */ class Button : public gcn::Button { public: + Button(); /** * Constructor, sets the caption of the button to the given string. */ @@ -60,6 +61,8 @@ class Button : public gcn::Button { { mIsLogged = enable; } private: + void init(); + static ImageRect button[4]; /**< Button state graphics */ static int mInstances; /**< Number of button instances */ bool mIsLogged; /**< Makes the button appear pressed all the time */ diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 3add3a18..b936f688 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -27,6 +27,7 @@ #include "setup_audio.h" #include "setup_joystick.h" #include "setup_video.h" +#include "setup_keyboard.h" #include "tabbedcontainer.h" #include "../utils/dtor.h" @@ -42,8 +43,8 @@ extern Window *skillDialog; Setup::Setup(): Window("Setup") { - int width = 230; - int height = 245; + int width = 260; + int height = 305; setContentSize(width, height); const char *buttonNames[] = { @@ -58,7 +59,7 @@ Setup::Setup(): } TabbedContainer *panel = new TabbedContainer(); - panel->setDimension(gcn::Rectangle(5, 5, 220, 205)); + panel->setDimension(gcn::Rectangle(5, 5, 250, 265)); panel->setOpaque(false); SetupTab *tab; @@ -75,6 +76,10 @@ Setup::Setup(): panel->addTab(tab, "Joystick"); mTabs.push_back(tab); + tab = new Setup_Keyboard(); + panel->addTab(tab, "Keyboard"); + mTabs.push_back(tab); + add(panel); setLocationRelativeTo(getParent()); diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp new file mode 100644 index 00000000..6ca149a5 --- /dev/null +++ b/src/gui/setup_keyboard.cpp @@ -0,0 +1,145 @@ +/*
+ * 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 "../log.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);
+ enableButtons(false);
+ mKeyLabel[i].setCaption(keyboard.getKeyCaption(i) + ": ?");
+ }
+ }
+}
+
+
+void Setup_Keyboard::enableButtons(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);
+ enableButtons(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 new file mode 100644 index 00000000..0430b040 --- /dev/null +++ b/src/gui/setup_keyboard.h @@ -0,0 +1,74 @@ +/*
+ * 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:
+ Setup_Keyboard();
+ ~Setup_Keyboard();
+
+ void apply();
+ void cancel();
+
+ void action(const gcn::ActionEvent &event);
+
+ /**
+ * easy way to disable/enable all the set buttons.
+ */
+ void enableButtons(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
|