Move options for basic input settings page into separate file.

8 files changed, 240 insertions, 172 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f2e6667d8..76c2c9ef6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -439,6 +439,8 @@ SET(SRCS
     gui/setupactiondata.h
     gui/setupinputpages.cpp
     gui/setupinputpages.h
+    input/pages/basic.cpp
+    input/pages/basic.h
     input/pages/pages.cpp
     input/pages/pages.h
     gui/fonts/font.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 19e13af04..d06246b19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -563,6 +563,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/setupactiondata.h \
 	      gui/setupinputpages.cpp \
 	      gui/setupinputpages.h \
+	      input/pages/basic.cpp \
+	      input/pages/basic.h \
 	      input/pages/pages.cpp \
 	      input/pages/pages.h \
 	      gui/fonts/font.cpp \
diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp
index 0ae53a783..40172263a 100644
--- a/src/gui/setupinputpages.cpp
+++ b/src/gui/setupinputpages.cpp
@@ -27,6 +27,7 @@
 
 #include "utils/gettext.h"
 
+#include "input/pages/basic.h"
 #include "input/pages/pages.h"
 
 #include "debug.h"
diff --git a/src/gui/touchactiondata.cpp b/src/gui/touchactiondata.cpp
index 3d64fdf25..3a7a3f14e 100644
--- a/src/gui/touchactiondata.cpp
+++ b/src/gui/touchactiondata.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/setupactiondata.h"
 
+#include "input/pages/basic.h"
 #include "input/pages/pages.h"
 
 #include "debug.h"
diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp
new file mode 100644
index 000000000..302cd495d
--- /dev/null
+++ b/src/input/pages/basic.cpp
@@ -0,0 +1,203 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2007  Joshua Langley <joshlangley@optusnet.com.au>
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/setupactiondata.h"
+
+#include "input/inputaction.h"
+#include "input/inputactiondata.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+SetupActionData setupActionDataBasic[] =
+{
+    {
+        // TRANSLATORS: input action name
+        N_("Target and attack keys"),
+        InputAction::NO_VALUE,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Attack"),
+        InputAction::ATTACK,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Target & Attack"),
+        InputAction::TARGET_ATTACK,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Move to Target"),
+        InputAction::MOVE_TO_TARGET,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Change Move to Target type"),
+        InputAction::CHANGE_MOVE_TO_TARGET,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Move to Home location"),
+        InputAction::MOVE_TO_HOME,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Set home location"),
+        InputAction::SET_HOME,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Move to navigation point"),
+        InputAction::MOVE_TO_POINT,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Talk"),
+        InputAction::TALK,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Stop Attack / Modifier key"),
+        InputAction::STOP_ATTACK,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Untarget"),
+        InputAction::UNTARGET,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Target monster"),
+        InputAction::TARGET_MONSTER,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Target closest monster (without filters)"),
+        InputAction::TARGET_CLOSEST_MONSTER,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Target NPC"),
+        InputAction::TARGET_NPC,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Target Player"),
+        InputAction::TARGET_PLAYER,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Other Keys"),
+        InputAction::NO_VALUE,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Pickup"),
+        InputAction::PICKUP,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Change Pickup Type"),
+        InputAction::CHANGE_PICKUP_TYPE,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Sit"),
+        InputAction::SIT,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Screenshot"),
+        InputAction::SCREENSHOT,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Enable/Disable Trading"),
+        InputAction::TRADE,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Open trade window"),
+        InputAction::OPEN_TRADE,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Change Map View Mode"),
+        InputAction::PATHFIND,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Select OK"),
+        InputAction::OK,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Quit"),
+        InputAction::QUIT,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Stop or sit"),
+        InputAction::STOP_SIT,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Return to safe video mode"),
+        InputAction::SAFE_VIDEO,
+        "",
+    },
+    {
+        "",
+        InputAction::NO_VALUE,
+        ""
+    }
+};
diff --git a/src/input/pages/basic.h b/src/input/pages/basic.h
new file mode 100644
index 000000000..af6bd8b44
--- /dev/null
+++ b/src/input/pages/basic.h
@@ -0,0 +1,31 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2007  Joshua Langley <joshlangley@optusnet.com.au>
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INPUT_PAGES_BASIC_H
+#define INPUT_PAGES_BASIC_H
+
+#include "gui/setupactiondata.h"
+
+extern SetupActionData setupActionDataBasic[];
+
+#endif  // INPUT_PAGES_BASIC_H
diff --git a/src/input/pages/pages.cpp b/src/input/pages/pages.cpp
index 8894c7791..6b3f8f33a 100644
--- a/src/input/pages/pages.cpp
+++ b/src/input/pages/pages.cpp
@@ -31,177 +31,6 @@
 
 #include "debug.h"
 
-SetupActionData setupActionDataBasic[] =
-{
-    {
-        // TRANSLATORS: input action name
-        N_("Target and attack keys"),
-        InputAction::NO_VALUE,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Attack"),
-        InputAction::ATTACK,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Target & Attack"),
-        InputAction::TARGET_ATTACK,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Move to Target"),
-        InputAction::MOVE_TO_TARGET,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Change Move to Target type"),
-        InputAction::CHANGE_MOVE_TO_TARGET,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Move to Home location"),
-        InputAction::MOVE_TO_HOME,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Set home location"),
-        InputAction::SET_HOME,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Move to navigation point"),
-        InputAction::MOVE_TO_POINT,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Talk"),
-        InputAction::TALK,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Stop Attack / Modifier key"),
-        InputAction::STOP_ATTACK,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Untarget"),
-        InputAction::UNTARGET,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Target monster"),
-        InputAction::TARGET_MONSTER,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Target closest monster (without filters)"),
-        InputAction::TARGET_CLOSEST_MONSTER,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Target NPC"),
-        InputAction::TARGET_NPC,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Target Player"),
-        InputAction::TARGET_PLAYER,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Other Keys"),
-        InputAction::NO_VALUE,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Pickup"),
-        InputAction::PICKUP,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Change Pickup Type"),
-        InputAction::CHANGE_PICKUP_TYPE,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Sit"),
-        InputAction::SIT,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Screenshot"),
-        InputAction::SCREENSHOT,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Enable/Disable Trading"),
-        InputAction::TRADE,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Open trade window"),
-        InputAction::OPEN_TRADE,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Change Map View Mode"),
-        InputAction::PATHFIND,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Select OK"),
-        InputAction::OK,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Quit"),
-        InputAction::QUIT,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Stop or sit"),
-        InputAction::STOP_SIT,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Return to safe video mode"),
-        InputAction::SAFE_VIDEO,
-        "",
-    },
-    {
-        "",
-        InputAction::NO_VALUE,
-        ""
-    }
-};
-
 SetupActionData setupActionDataShortcuts[] =
 {
     {
diff --git a/src/input/pages/pages.h b/src/input/pages/pages.h
index 0d312f55c..d278795b4 100644
--- a/src/input/pages/pages.h
+++ b/src/input/pages/pages.h
@@ -26,7 +26,6 @@
 
 #include "gui/setupactiondata.h"
 
-extern SetupActionData setupActionDataBasic[];
 extern SetupActionData setupActionDataShortcuts[];
 extern SetupActionData setupActionDataWindows[];
 extern SetupActionData setupActionDataEmotes[];