From de4b5860924bc3b9267edcce6cf2417cd30f8eb1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 22 Aug 2014 23:18:34 +0300 Subject: Move options for other input settings page into separate file. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/gui/setupinputpages.cpp | 1 + src/gui/touchactiondata.cpp | 1 + src/input/pages/other.cpp | 203 ++++++++++++++++++++++++++++++++++++++++++++ src/input/pages/other.h | 31 +++++++ src/input/pages/pages.cpp | 171 ------------------------------------- src/input/pages/pages.h | 1 - 8 files changed, 240 insertions(+), 172 deletions(-) create mode 100644 src/input/pages/other.cpp create mode 100644 src/input/pages/other.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index defe78305..639536e56 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -445,6 +445,8 @@ SET(SRCS input/pages/chat.h input/pages/emotes.cpp input/pages/emotes.h + input/pages/other.cpp + input/pages/other.h input/pages/outfits.cpp input/pages/outfits.h input/pages/pages.cpp diff --git a/src/Makefile.am b/src/Makefile.am index c9826e923..d69899751 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -569,6 +569,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ input/pages/chat.h \ input/pages/emotes.cpp \ input/pages/emotes.h \ + input/pages/other.cpp \ + input/pages/other.h \ input/pages/outfits.cpp \ input/pages/outfits.h \ input/pages/pages.cpp \ diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp index e0d1ef675..14e3cad35 100644 --- a/src/gui/setupinputpages.cpp +++ b/src/gui/setupinputpages.cpp @@ -30,6 +30,7 @@ #include "input/pages/basic.h" #include "input/pages/chat.h" #include "input/pages/emotes.h" +#include "input/pages/other.h" #include "input/pages/outfits.h" #include "input/pages/pages.h" #include "input/pages/shortcuts.h" diff --git a/src/gui/touchactiondata.cpp b/src/gui/touchactiondata.cpp index 2a4d70fe5..e27add153 100644 --- a/src/gui/touchactiondata.cpp +++ b/src/gui/touchactiondata.cpp @@ -24,6 +24,7 @@ #include "input/pages/basic.h" #include "input/pages/chat.h" +#include "input/pages/other.h" #include "input/pages/pages.h" #include "input/pages/windows.h" diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp new file mode 100644 index 000000000..65ee2af90 --- /dev/null +++ b/src/input/pages/other.cpp @@ -0,0 +1,203 @@ +/* + * The ManaPlus Client + * Copyright (C) 2007 Joshua Langley + * Copyright (C) 2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program 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. + * + * This program 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 this program. If not, see . + */ + +#include "gui/setupactiondata.h" + +#include "input/inputaction.h" +#include "input/inputactiondata.h" + +#include "utils/gettext.h" +#include "utils/stringutils.h" + +#include "debug.h" + +SetupActionData setupActionDataOther[] = +{ + { + // TRANSLATORS: input action name + N_("Ignore input 1"), + InputAction::IGNORE_INPUT_1, + "", + }, + { + // TRANSLATORS: input action name + N_("Ignore input 2"), + InputAction::IGNORE_INPUT_2, + "", + }, + { + // TRANSLATORS: input action name + N_("Direct Up"), + InputAction::DIRECT_UP, + "", + }, + { + // TRANSLATORS: input action name + N_("Direct Down"), + InputAction::DIRECT_DOWN, + "", + }, + { + // TRANSLATORS: input action name + N_("Direct Left"), + InputAction::DIRECT_LEFT, + "", + }, + { + // TRANSLATORS: input action name + N_("Direct Right"), + InputAction::DIRECT_RIGHT, + "", + }, + { + // TRANSLATORS: input action name + N_("Crazy moves"), + InputAction::CRAZY_MOVES, + "", + }, + { + // TRANSLATORS: input action name + N_("Change Crazy Move mode"), + InputAction::CHANGE_CRAZY_MOVES_TYPE, + "", + }, + { + // TRANSLATORS: input action name + N_("Quick Drop N Items from 0 slot"), + InputAction::QUICK_DROP, + "", + }, + { + // TRANSLATORS: input action name + N_("Quick Drop N Items"), + InputAction::QUICK_DROPN, + "", + }, + { + // TRANSLATORS: input action name + N_("Switch Quick Drop Counter"), + InputAction::SWITCH_QUICK_DROP, + "", + }, + { + // TRANSLATORS: input action name + N_("Quick heal target or self"), + InputAction::MAGIC_INMA1, + "", + }, + { + // TRANSLATORS: input action name + N_("Use #itenplz spell"), + InputAction::MAGIC_ITENPLZ, + "", + }, + { + // TRANSLATORS: input action name + N_("Use magic attack"), + InputAction::MAGIC_ATTACK, + "", + }, + { + // TRANSLATORS: input action name + N_("Switch magic attack"), + InputAction::SWITCH_MAGIC_ATTACK, + "", + }, + { + // TRANSLATORS: input action name + N_("Switch pvp attack"), + InputAction::SWITCH_PVP_ATTACK, + "", + }, + { + // TRANSLATORS: input action name + N_("Change move type"), + InputAction::INVERT_DIRECTION, + "", + }, + { + // TRANSLATORS: input action name + N_("Change Attack Weapon Type"), + InputAction::CHANGE_ATTACK_WEAPON_TYPE, + "", + }, + { + // TRANSLATORS: input action name + N_("Change Attack Type"), + InputAction::CHANGE_ATTACK_TYPE, + "", + }, + { + // TRANSLATORS: input action name + N_("Change Follow mode"), + InputAction::CHANGE_FOLLOW_MODE, + "", + }, + { + // TRANSLATORS: input action name + N_("Change Imitation mode"), + InputAction::CHANGE_IMITATION_MODE, + "", + }, + { + // TRANSLATORS: input action name + N_("Disable / Enable Game modifier keys"), + InputAction::DISABLE_GAME_MODIFIERS, + "", + }, + { + // TRANSLATORS: input action name + N_("On / Off audio"), + InputAction::CHANGE_AUDIO, + "", + }, + { + // TRANSLATORS: input action name + N_("Enable / Disable away mode"), + InputAction::AWAY, + "", + }, + { + // TRANSLATORS: input action name + N_("Emulate right click from keyboard"), + InputAction::RIGHT_CLICK, + "", + }, + { + // TRANSLATORS: input action name + N_("Toggle camera mode"), + InputAction::CAMERA, + "", + }, + { + // TRANSLATORS: input action name + N_("Show onscreen keyboard"), + InputAction::SHOW_KEYBOARD, + "", + }, + { + "", + InputAction::NO_VALUE, + "" + } +}; diff --git a/src/input/pages/other.h b/src/input/pages/other.h new file mode 100644 index 000000000..b79bda62d --- /dev/null +++ b/src/input/pages/other.h @@ -0,0 +1,31 @@ +/* + * The ManaPlus Client + * Copyright (C) 2007 Joshua Langley + * Copyright (C) 2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program 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. + * + * This program 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 this program. If not, see . + */ + +#ifndef INPUT_PAGES_OTHER_H +#define INPUT_PAGES_OTHER_H + +#include "gui/setupactiondata.h" + +extern SetupActionData setupActionDataOther[]; + +#endif // INPUT_PAGES_OTHER_H diff --git a/src/input/pages/pages.cpp b/src/input/pages/pages.cpp index 06adbbc7b..3ba4f9af7 100644 --- a/src/input/pages/pages.cpp +++ b/src/input/pages/pages.cpp @@ -31,177 +31,6 @@ #include "debug.h" -SetupActionData setupActionDataOther[] = -{ - { - // TRANSLATORS: input action name - N_("Ignore input 1"), - InputAction::IGNORE_INPUT_1, - "", - }, - { - // TRANSLATORS: input action name - N_("Ignore input 2"), - InputAction::IGNORE_INPUT_2, - "", - }, - { - // TRANSLATORS: input action name - N_("Direct Up"), - InputAction::DIRECT_UP, - "", - }, - { - // TRANSLATORS: input action name - N_("Direct Down"), - InputAction::DIRECT_DOWN, - "", - }, - { - // TRANSLATORS: input action name - N_("Direct Left"), - InputAction::DIRECT_LEFT, - "", - }, - { - // TRANSLATORS: input action name - N_("Direct Right"), - InputAction::DIRECT_RIGHT, - "", - }, - { - // TRANSLATORS: input action name - N_("Crazy moves"), - InputAction::CRAZY_MOVES, - "", - }, - { - // TRANSLATORS: input action name - N_("Change Crazy Move mode"), - InputAction::CHANGE_CRAZY_MOVES_TYPE, - "", - }, - { - // TRANSLATORS: input action name - N_("Quick Drop N Items from 0 slot"), - InputAction::QUICK_DROP, - "", - }, - { - // TRANSLATORS: input action name - N_("Quick Drop N Items"), - InputAction::QUICK_DROPN, - "", - }, - { - // TRANSLATORS: input action name - N_("Switch Quick Drop Counter"), - InputAction::SWITCH_QUICK_DROP, - "", - }, - { - // TRANSLATORS: input action name - N_("Quick heal target or self"), - InputAction::MAGIC_INMA1, - "", - }, - { - // TRANSLATORS: input action name - N_("Use #itenplz spell"), - InputAction::MAGIC_ITENPLZ, - "", - }, - { - // TRANSLATORS: input action name - N_("Use magic attack"), - InputAction::MAGIC_ATTACK, - "", - }, - { - // TRANSLATORS: input action name - N_("Switch magic attack"), - InputAction::SWITCH_MAGIC_ATTACK, - "", - }, - { - // TRANSLATORS: input action name - N_("Switch pvp attack"), - InputAction::SWITCH_PVP_ATTACK, - "", - }, - { - // TRANSLATORS: input action name - N_("Change move type"), - InputAction::INVERT_DIRECTION, - "", - }, - { - // TRANSLATORS: input action name - N_("Change Attack Weapon Type"), - InputAction::CHANGE_ATTACK_WEAPON_TYPE, - "", - }, - { - // TRANSLATORS: input action name - N_("Change Attack Type"), - InputAction::CHANGE_ATTACK_TYPE, - "", - }, - { - // TRANSLATORS: input action name - N_("Change Follow mode"), - InputAction::CHANGE_FOLLOW_MODE, - "", - }, - { - // TRANSLATORS: input action name - N_("Change Imitation mode"), - InputAction::CHANGE_IMITATION_MODE, - "", - }, - { - // TRANSLATORS: input action name - N_("Disable / Enable Game modifier keys"), - InputAction::DISABLE_GAME_MODIFIERS, - "", - }, - { - // TRANSLATORS: input action name - N_("On / Off audio"), - InputAction::CHANGE_AUDIO, - "", - }, - { - // TRANSLATORS: input action name - N_("Enable / Disable away mode"), - InputAction::AWAY, - "", - }, - { - // TRANSLATORS: input action name - N_("Emulate right click from keyboard"), - InputAction::RIGHT_CLICK, - "", - }, - { - // TRANSLATORS: input action name - N_("Toggle camera mode"), - InputAction::CAMERA, - "", - }, - { - // TRANSLATORS: input action name - N_("Show onscreen keyboard"), - InputAction::SHOW_KEYBOARD, - "", - }, - { - "", - InputAction::NO_VALUE, - "" - } -}; - SetupActionData setupActionDataMove[] = { { diff --git a/src/input/pages/pages.h b/src/input/pages/pages.h index cac8d10d6..65beaf4e2 100644 --- a/src/input/pages/pages.h +++ b/src/input/pages/pages.h @@ -26,7 +26,6 @@ #include "gui/setupactiondata.h" -extern SetupActionData setupActionDataOther[]; extern SetupActionData setupActionDataMove[]; extern SetupActionData setupActionDataGui[]; -- cgit v1.2.3-60-g2f50