Move options for chat input settings page into separate file.

8 files changed, 193 insertions, 125 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 591925ab8..defe78305 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -441,6 +441,8 @@ SET(SRCS
     gui/setupinputpages.h
     input/pages/basic.cpp
     input/pages/basic.h
+    input/pages/chat.cpp
+    input/pages/chat.h
     input/pages/emotes.cpp
     input/pages/emotes.h
     input/pages/outfits.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 789715cc5..c9826e923 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -565,6 +565,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/setupinputpages.h \
 	      input/pages/basic.cpp \
 	      input/pages/basic.h \
+	      input/pages/chat.cpp \
+	      input/pages/chat.h \
 	      input/pages/emotes.cpp \
 	      input/pages/emotes.h \
 	      input/pages/outfits.cpp \
diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp
index 8a2a46c11..e0d1ef675 100644
--- a/src/gui/setupinputpages.cpp
+++ b/src/gui/setupinputpages.cpp
@@ -28,6 +28,7 @@
 #include "utils/gettext.h"
 
 #include "input/pages/basic.h"
+#include "input/pages/chat.h"
 #include "input/pages/emotes.h"
 #include "input/pages/outfits.h"
 #include "input/pages/pages.h"
diff --git a/src/gui/touchactiondata.cpp b/src/gui/touchactiondata.cpp
index c7cc00653..2a4d70fe5 100644
--- a/src/gui/touchactiondata.cpp
+++ b/src/gui/touchactiondata.cpp
@@ -23,6 +23,7 @@
 #include "gui/setupactiondata.h"
 
 #include "input/pages/basic.h"
+#include "input/pages/chat.h"
 #include "input/pages/pages.h"
 #include "input/pages/windows.h"
 
diff --git a/src/input/pages/chat.cpp b/src/input/pages/chat.cpp
new file mode 100644
index 000000000..486f882d2
--- /dev/null
+++ b/src/input/pages/chat.cpp
@@ -0,0 +1,156 @@
+/*
+ *  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 setupActionDataChat[] =
+{
+    {
+        // TRANSLATORS: input action name
+        N_("Toggle Chat"),
+        InputAction::TOGGLE_CHAT,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Scroll Chat Up"),
+        InputAction::SCROLL_CHAT_UP,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Scroll Chat Down"),
+        InputAction::SCROLL_CHAT_DOWN,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Previous Chat Tab"),
+        InputAction::PREV_CHAT_TAB,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Next Chat Tab"),
+        InputAction::NEXT_CHAT_TAB,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Close current Chat Tab"),
+        InputAction::CLOSE_CHAT_TAB,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Previous chat line"),
+        InputAction::CHAT_PREV_HISTORY,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Next chat line"),
+        InputAction::CHAT_NEXT_HISTORY,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Chat modifier key"),
+        InputAction::CHAT_MOD,
+        "",
+    },
+    {
+        // TRANSLATORS: input action name
+        N_("Show smiles"),
+        InputAction::GUI_F1,
+        "",
+    },
+    {
+        "F2",
+        InputAction::GUI_F2,
+        "",
+    },
+    {
+        "F3",
+        InputAction::GUI_F3,
+        "",
+    },
+    {
+        "F4",
+        InputAction::GUI_F4,
+        "",
+    },
+    {
+        "F5",
+        InputAction::GUI_F5,
+        "",
+    },
+    {
+        "F6",
+        InputAction::GUI_F6,
+        "",
+    },
+    {
+        "F7",
+        InputAction::GUI_F7,
+        "",
+    },
+    {
+        "F8",
+        InputAction::GUI_F8,
+        "",
+    },
+    {
+        "F9",
+        InputAction::GUI_F9,
+        "",
+    },
+    {
+        "F10",
+        InputAction::GUI_F10,
+        "",
+    },
+    {
+        "F11",
+        InputAction::GUI_F11,
+        "",
+    },
+    {
+        "F12",
+        InputAction::GUI_F12,
+        "",
+    },
+    {
+        "",
+        InputAction::NO_VALUE,
+        ""
+    }
+};
diff --git a/src/input/pages/chat.h b/src/input/pages/chat.h
new file mode 100644
index 000000000..726bb7f75
--- /dev/null
+++ b/src/input/pages/chat.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_CHAT_H
+#define INPUT_PAGES_CHAT_H
+
+#include "gui/setupactiondata.h"
+
+extern SetupActionData setupActionDataChat[];
+
+#endif  // INPUT_PAGES_CHAT_H
diff --git a/src/input/pages/pages.cpp b/src/input/pages/pages.cpp
index 74cc4e17e..06adbbc7b 100644
--- a/src/input/pages/pages.cpp
+++ b/src/input/pages/pages.cpp
@@ -31,130 +31,6 @@
 
 #include "debug.h"
 
-SetupActionData setupActionDataChat[] =
-{
-    {
-        // TRANSLATORS: input action name
-        N_("Toggle Chat"),
-        InputAction::TOGGLE_CHAT,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Scroll Chat Up"),
-        InputAction::SCROLL_CHAT_UP,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Scroll Chat Down"),
-        InputAction::SCROLL_CHAT_DOWN,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Previous Chat Tab"),
-        InputAction::PREV_CHAT_TAB,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Next Chat Tab"),
-        InputAction::NEXT_CHAT_TAB,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Close current Chat Tab"),
-        InputAction::CLOSE_CHAT_TAB,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Previous chat line"),
-        InputAction::CHAT_PREV_HISTORY,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Next chat line"),
-        InputAction::CHAT_NEXT_HISTORY,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Chat modifier key"),
-        InputAction::CHAT_MOD,
-        "",
-    },
-    {
-        // TRANSLATORS: input action name
-        N_("Show smiles"),
-        InputAction::GUI_F1,
-        "",
-    },
-    {
-        "F2",
-        InputAction::GUI_F2,
-        "",
-    },
-    {
-        "F3",
-        InputAction::GUI_F3,
-        "",
-    },
-    {
-        "F4",
-        InputAction::GUI_F4,
-        "",
-    },
-    {
-        "F5",
-        InputAction::GUI_F5,
-        "",
-    },
-    {
-        "F6",
-        InputAction::GUI_F6,
-        "",
-    },
-    {
-        "F7",
-        InputAction::GUI_F7,
-        "",
-    },
-    {
-        "F8",
-        InputAction::GUI_F8,
-        "",
-    },
-    {
-        "F9",
-        InputAction::GUI_F9,
-        "",
-    },
-    {
-        "F10",
-        InputAction::GUI_F10,
-        "",
-    },
-    {
-        "F11",
-        InputAction::GUI_F11,
-        "",
-    },
-    {
-        "F12",
-        InputAction::GUI_F12,
-        "",
-    },
-    {
-        "",
-        InputAction::NO_VALUE,
-        ""
-    }
-};
-
 SetupActionData setupActionDataOther[] =
 {
     {
diff --git a/src/input/pages/pages.h b/src/input/pages/pages.h
index 523317fd9..cac8d10d6 100644
--- a/src/input/pages/pages.h
+++ b/src/input/pages/pages.h
@@ -26,7 +26,6 @@
 
 #include "gui/setupactiondata.h"
 
-extern SetupActionData setupActionDataChat[];
 extern SetupActionData setupActionDataOther[];
 extern SetupActionData setupActionDataMove[];
 extern SetupActionData setupActionDataGui[];