From 8e3fad97a5df4bfc706b0246794b00428bd207e0 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Tue, 24 Jul 2007 13:54:06 +0000 Subject: Fixed initialization order and added setup_keyboard.* and keyboardconfig.* to the list of source files. Also set some missing Subversion properties. --- src/gui/setup_keyboard.cpp | 283 +++++++++++++++++++++++---------------------- 1 file changed, 142 insertions(+), 141 deletions(-) (limited to 'src/gui/setup_keyboard.cpp') 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 - -#include "button.h" -#include "ok_dialog.h" - -#include "../configuration.h" -#include "../keyboardconfig.h" - -#include "../utils/tostring.h" - -#include - -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 + +#include "button.h" +#include "ok_dialog.h" + +#include "../configuration.h" +#include "../keyboardconfig.h" + +#include "../utils/tostring.h" + +#include + +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); + } +} -- cgit v1.2.3-70-g09d2