summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/gui/setupinputpages.cpp1
-rw-r--r--src/gui/touchactiondata.cpp1
-rw-r--r--src/input/pages/pages.cpp195
-rw-r--r--src/input/pages/pages.h1
-rw-r--r--src/input/pages/windows.cpp227
-rw-r--r--src/input/pages/windows.h31
8 files changed, 264 insertions, 196 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 706e57573..92f418523 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -445,6 +445,8 @@ SET(SRCS
input/pages/pages.h
input/pages/shortcuts.cpp
input/pages/shortcuts.h
+ input/pages/windows.cpp
+ input/pages/windows.h
gui/fonts/font.cpp
gui/fonts/font.h
gui/fonts/textchunk.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 12d157cdf..0a48acb32 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -569,6 +569,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
input/pages/pages.h \
input/pages/shortcuts.cpp \
input/pages/shortcuts.h \
+ input/pages/windows.cpp \
+ input/pages/windows.h \
gui/fonts/font.cpp \
gui/fonts/font.h \
gui/fonts/textchunk.cpp \
diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp
index 6aeca77f6..6cc66bcfd 100644
--- a/src/gui/setupinputpages.cpp
+++ b/src/gui/setupinputpages.cpp
@@ -30,6 +30,7 @@
#include "input/pages/basic.h"
#include "input/pages/pages.h"
#include "input/pages/shortcuts.h"
+#include "input/pages/windows.h"
#include "debug.h"
diff --git a/src/gui/touchactiondata.cpp b/src/gui/touchactiondata.cpp
index 3a7a3f14e..c7cc00653 100644
--- a/src/gui/touchactiondata.cpp
+++ b/src/gui/touchactiondata.cpp
@@ -24,6 +24,7 @@
#include "input/pages/basic.h"
#include "input/pages/pages.h"
+#include "input/pages/windows.h"
#include "debug.h"
diff --git a/src/input/pages/pages.cpp b/src/input/pages/pages.cpp
index 858f4d3a3..7480b52cd 100644
--- a/src/input/pages/pages.cpp
+++ b/src/input/pages/pages.cpp
@@ -31,201 +31,6 @@
#include "debug.h"
-SetupActionData setupActionDataWindows[] =
-{
- {
- // TRANSLATORS: input action name
- N_("Show Windows Menu"),
- InputAction::SHOW_WINDOWS,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Hide Windows"),
- InputAction::HIDE_WINDOWS,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("About Window"),
- InputAction::WINDOW_ABOUT,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Help Window"),
- InputAction::WINDOW_HELP,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Status Window"),
- InputAction::WINDOW_STATUS,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Inventory Window"),
- InputAction::WINDOW_INVENTORY,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Equipment Window"),
- InputAction::WINDOW_EQUIPMENT,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Skill Window"),
- InputAction::WINDOW_SKILL,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Minimap Window"),
- InputAction::WINDOW_MINIMAP,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Chat Window"),
- InputAction::WINDOW_CHAT,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Item Shortcut Window"),
- InputAction::WINDOW_SHORTCUT,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Setup Window"),
- InputAction::WINDOW_SETUP,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Debug Window"),
- InputAction::WINDOW_DEBUG,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Social Window"),
- InputAction::WINDOW_SOCIAL,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Emote Shortcut Window"),
- InputAction::WINDOW_EMOTE_SHORTCUT,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Outfits Window"),
- InputAction::WINDOW_OUTFIT,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Shop Window"),
- InputAction::WINDOW_SHOP,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Quick drop Window"),
- InputAction::WINDOW_DROP,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Kill Stats Window"),
- InputAction::WINDOW_KILLS,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Commands Window"),
- InputAction::WINDOW_SPELLS,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Bot Checker Window"),
- InputAction::WINDOW_BOT_CHECKER,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Who Is Online Window"),
- InputAction::WINDOW_ONLINE,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Did you know Window"),
- InputAction::WINDOW_DIDYOUKNOW,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Quests Window"),
- InputAction::WINDOW_QUESTS,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Updates Window"),
- InputAction::WINDOW_UPDATER,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Previous Social Tab"),
- InputAction::PREV_SOCIAL_TAB,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Next Social Tab"),
- InputAction::NEXT_SOCIAL_TAB,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Previous Shortcuts tab"),
- InputAction::PREV_SHORTCUTS_TAB,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Next Shortcuts tab"),
- InputAction::NEXT_SHORTCUTS_TAB,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Previous Commands tab"),
- InputAction::PREV_COMMANDS_TAB,
- "",
- },
- {
- // TRANSLATORS: input action name
- N_("Next Commands tab"),
- InputAction::NEXT_COMMANDS_TAB,
- "",
- },
- {
- "",
- InputAction::NO_VALUE,
- ""
- }
-};
-
SetupActionData setupActionDataEmotes[] =
{
{
diff --git a/src/input/pages/pages.h b/src/input/pages/pages.h
index 0b99fd303..6a2d99aaf 100644
--- a/src/input/pages/pages.h
+++ b/src/input/pages/pages.h
@@ -26,7 +26,6 @@
#include "gui/setupactiondata.h"
-extern SetupActionData setupActionDataWindows[];
extern SetupActionData setupActionDataEmotes[];
extern SetupActionData setupActionDataOutfits[];
extern SetupActionData setupActionDataChat[];
diff --git a/src/input/pages/windows.cpp b/src/input/pages/windows.cpp
new file mode 100644
index 000000000..e8318cbfa
--- /dev/null
+++ b/src/input/pages/windows.cpp
@@ -0,0 +1,227 @@
+/*
+ * 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 setupActionDataWindows[] =
+{
+ {
+ // TRANSLATORS: input action name
+ N_("Show Windows Menu"),
+ InputAction::SHOW_WINDOWS,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Hide Windows"),
+ InputAction::HIDE_WINDOWS,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("About Window"),
+ InputAction::WINDOW_ABOUT,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Help Window"),
+ InputAction::WINDOW_HELP,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Status Window"),
+ InputAction::WINDOW_STATUS,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Inventory Window"),
+ InputAction::WINDOW_INVENTORY,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Equipment Window"),
+ InputAction::WINDOW_EQUIPMENT,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Skill Window"),
+ InputAction::WINDOW_SKILL,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Minimap Window"),
+ InputAction::WINDOW_MINIMAP,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Chat Window"),
+ InputAction::WINDOW_CHAT,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Item Shortcut Window"),
+ InputAction::WINDOW_SHORTCUT,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Setup Window"),
+ InputAction::WINDOW_SETUP,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Debug Window"),
+ InputAction::WINDOW_DEBUG,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Social Window"),
+ InputAction::WINDOW_SOCIAL,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Emote Shortcut Window"),
+ InputAction::WINDOW_EMOTE_SHORTCUT,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Outfits Window"),
+ InputAction::WINDOW_OUTFIT,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Shop Window"),
+ InputAction::WINDOW_SHOP,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Quick drop Window"),
+ InputAction::WINDOW_DROP,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Kill Stats Window"),
+ InputAction::WINDOW_KILLS,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Commands Window"),
+ InputAction::WINDOW_SPELLS,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Bot Checker Window"),
+ InputAction::WINDOW_BOT_CHECKER,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Who Is Online Window"),
+ InputAction::WINDOW_ONLINE,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Did you know Window"),
+ InputAction::WINDOW_DIDYOUKNOW,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Quests Window"),
+ InputAction::WINDOW_QUESTS,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Updates Window"),
+ InputAction::WINDOW_UPDATER,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Previous Social Tab"),
+ InputAction::PREV_SOCIAL_TAB,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Next Social Tab"),
+ InputAction::NEXT_SOCIAL_TAB,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Previous Shortcuts tab"),
+ InputAction::PREV_SHORTCUTS_TAB,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Next Shortcuts tab"),
+ InputAction::NEXT_SHORTCUTS_TAB,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Previous Commands tab"),
+ InputAction::PREV_COMMANDS_TAB,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
+ N_("Next Commands tab"),
+ InputAction::NEXT_COMMANDS_TAB,
+ "",
+ },
+ {
+ "",
+ InputAction::NO_VALUE,
+ ""
+ }
+};
diff --git a/src/input/pages/windows.h b/src/input/pages/windows.h
new file mode 100644
index 000000000..fdac9614c
--- /dev/null
+++ b/src/input/pages/windows.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_WINDOWS_H
+#define INPUT_PAGES_WINDOWS_H
+
+#include "gui/setupactiondata.h"
+
+extern SetupActionData setupActionDataWindows[];
+
+#endif // INPUT_PAGES_WINDOWS_H