From c98b8c1a210a2f3f6846e9e77077d0a968bcb9af Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 22 Aug 2014 22:53:18 +0300 Subject: Move options for outfits input settings page into separate file. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/gui/setupinputpages.cpp | 1 + src/gui/widgets/tabs/setup_input.cpp | 1 + src/input/pages/outfits.cpp | 359 +++++++++++++++++++++++++++++++++++ src/input/pages/outfits.h | 31 +++ src/input/pages/pages.cpp | 327 ------------------------------- src/input/pages/pages.h | 1 - 8 files changed, 396 insertions(+), 328 deletions(-) create mode 100644 src/input/pages/outfits.cpp create mode 100644 src/input/pages/outfits.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d97b8949b..591925ab8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -443,6 +443,8 @@ SET(SRCS input/pages/basic.h input/pages/emotes.cpp input/pages/emotes.h + input/pages/outfits.cpp + input/pages/outfits.h input/pages/pages.cpp input/pages/pages.h input/pages/shortcuts.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 170c37227..789715cc5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -567,6 +567,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ input/pages/basic.h \ input/pages/emotes.cpp \ input/pages/emotes.h \ + input/pages/outfits.cpp \ + input/pages/outfits.h \ input/pages/pages.cpp \ input/pages/pages.h \ input/pages/shortcuts.cpp \ diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp index 2070809d2..8a2a46c11 100644 --- a/src/gui/setupinputpages.cpp +++ b/src/gui/setupinputpages.cpp @@ -29,6 +29,7 @@ #include "input/pages/basic.h" #include "input/pages/emotes.h" +#include "input/pages/outfits.h" #include "input/pages/pages.h" #include "input/pages/shortcuts.h" #include "input/pages/windows.h" diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index ab93ccb35..3da4d1471 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -29,6 +29,7 @@ #include "input/keyboardconfig.h" #include "input/pages/emotes.h" +#include "input/pages/outfits.h" #include "input/pages/pages.h" #include "input/pages/shortcuts.h" diff --git a/src/input/pages/outfits.cpp b/src/input/pages/outfits.cpp new file mode 100644 index 000000000..63bb9a67a --- /dev/null +++ b/src/input/pages/outfits.cpp @@ -0,0 +1,359 @@ +/* + * 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 setupActionDataOutfits[] = +{ + { + // TRANSLATORS: input action name + N_("Outfits keys"), + InputAction::NO_VALUE, + "" + }, + { + // TRANSLATORS: input action name + N_("Wear Outfit"), + InputAction::WEAR_OUTFIT, + "", + }, + { + // TRANSLATORS: input action name + N_("Copy Outfit"), + InputAction::COPY_OUTFIT, + "", + }, + { + // TRANSLATORS: input action name + N_("Copy equipped to Outfit"), + InputAction::COPY_EQUIPED_OUTFIT, + "", + }, + { + // TRANSLATORS: input action name + N_("Outfits shortcuts"), + InputAction::NO_VALUE, + "" + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 1), + InputAction::OUTFIT_1, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 2), + InputAction::OUTFIT_2, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 3), + InputAction::OUTFIT_3, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 4), + InputAction::OUTFIT_4, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 5), + InputAction::OUTFIT_5, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 6), + InputAction::OUTFIT_6, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 7), + InputAction::OUTFIT_7, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 8), + InputAction::OUTFIT_8, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 9), + InputAction::OUTFIT_9, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 10), + InputAction::OUTFIT_10, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 11), + InputAction::OUTFIT_11, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 12), + InputAction::OUTFIT_12, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 13), + InputAction::OUTFIT_13, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 14), + InputAction::OUTFIT_14, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 15), + InputAction::OUTFIT_15, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 16), + InputAction::OUTFIT_16, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 17), + InputAction::OUTFIT_17, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 18), + InputAction::OUTFIT_18, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 19), + InputAction::OUTFIT_19, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 20), + InputAction::OUTFIT_20, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 21), + InputAction::OUTFIT_21, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 22), + InputAction::OUTFIT_22, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 23), + InputAction::OUTFIT_23, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 24), + InputAction::OUTFIT_24, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 25), + InputAction::OUTFIT_25, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 26), + InputAction::OUTFIT_26, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 27), + InputAction::OUTFIT_27, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 28), + InputAction::OUTFIT_28, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 29), + InputAction::OUTFIT_29, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 30), + InputAction::OUTFIT_30, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 31), + InputAction::OUTFIT_31, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 32), + InputAction::OUTFIT_32, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 33), + InputAction::OUTFIT_33, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 34), + InputAction::OUTFIT_34, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 35), + InputAction::OUTFIT_35, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 36), + InputAction::OUTFIT_36, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 37), + InputAction::OUTFIT_37, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 38), + InputAction::OUTFIT_38, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 39), + InputAction::OUTFIT_39, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 40), + InputAction::OUTFIT_40, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 41), + InputAction::OUTFIT_41, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 42), + InputAction::OUTFIT_42, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 43), + InputAction::OUTFIT_43, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 44), + InputAction::OUTFIT_44, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 45), + InputAction::OUTFIT_45, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 46), + InputAction::OUTFIT_46, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 47), + InputAction::OUTFIT_47, + "", + }, + { + // TRANSLATORS: input action name + strprintf(N_("Outfit Shortcut %d"), 48), + InputAction::OUTFIT_48, + "", + }, + { + "", + InputAction::NO_VALUE, + "" + } +}; diff --git a/src/input/pages/outfits.h b/src/input/pages/outfits.h new file mode 100644 index 000000000..1824e151f --- /dev/null +++ b/src/input/pages/outfits.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_OUTFITS_H +#define INPUT_PAGES_OUTFITS_H + +#include "gui/setupactiondata.h" + +extern SetupActionData setupActionDataOutfits[]; + +#endif // INPUT_PAGES_OUTFITS_H diff --git a/src/input/pages/pages.cpp b/src/input/pages/pages.cpp index c56c40715..74cc4e17e 100644 --- a/src/input/pages/pages.cpp +++ b/src/input/pages/pages.cpp @@ -31,333 +31,6 @@ #include "debug.h" -SetupActionData setupActionDataOutfits[] = -{ - { - // TRANSLATORS: input action name - N_("Outfits keys"), - InputAction::NO_VALUE, - "" - }, - { - // TRANSLATORS: input action name - N_("Wear Outfit"), - InputAction::WEAR_OUTFIT, - "", - }, - { - // TRANSLATORS: input action name - N_("Copy Outfit"), - InputAction::COPY_OUTFIT, - "", - }, - { - // TRANSLATORS: input action name - N_("Copy equipped to Outfit"), - InputAction::COPY_EQUIPED_OUTFIT, - "", - }, - { - // TRANSLATORS: input action name - N_("Outfits shortcuts"), - InputAction::NO_VALUE, - "" - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 1), - InputAction::OUTFIT_1, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 2), - InputAction::OUTFIT_2, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 3), - InputAction::OUTFIT_3, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 4), - InputAction::OUTFIT_4, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 5), - InputAction::OUTFIT_5, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 6), - InputAction::OUTFIT_6, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 7), - InputAction::OUTFIT_7, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 8), - InputAction::OUTFIT_8, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 9), - InputAction::OUTFIT_9, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 10), - InputAction::OUTFIT_10, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 11), - InputAction::OUTFIT_11, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 12), - InputAction::OUTFIT_12, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 13), - InputAction::OUTFIT_13, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 14), - InputAction::OUTFIT_14, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 15), - InputAction::OUTFIT_15, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 16), - InputAction::OUTFIT_16, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 17), - InputAction::OUTFIT_17, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 18), - InputAction::OUTFIT_18, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 19), - InputAction::OUTFIT_19, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 20), - InputAction::OUTFIT_20, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 21), - InputAction::OUTFIT_21, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 22), - InputAction::OUTFIT_22, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 23), - InputAction::OUTFIT_23, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 24), - InputAction::OUTFIT_24, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 25), - InputAction::OUTFIT_25, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 26), - InputAction::OUTFIT_26, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 27), - InputAction::OUTFIT_27, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 28), - InputAction::OUTFIT_28, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 29), - InputAction::OUTFIT_29, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 30), - InputAction::OUTFIT_30, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 31), - InputAction::OUTFIT_31, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 32), - InputAction::OUTFIT_32, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 33), - InputAction::OUTFIT_33, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 34), - InputAction::OUTFIT_34, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 35), - InputAction::OUTFIT_35, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 36), - InputAction::OUTFIT_36, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 37), - InputAction::OUTFIT_37, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 38), - InputAction::OUTFIT_38, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 39), - InputAction::OUTFIT_39, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 40), - InputAction::OUTFIT_40, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 41), - InputAction::OUTFIT_41, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 42), - InputAction::OUTFIT_42, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 43), - InputAction::OUTFIT_43, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 44), - InputAction::OUTFIT_44, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 45), - InputAction::OUTFIT_45, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 46), - InputAction::OUTFIT_46, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 47), - InputAction::OUTFIT_47, - "", - }, - { - // TRANSLATORS: input action name - strprintf(N_("Outfit Shortcut %d"), 48), - InputAction::OUTFIT_48, - "", - }, - { - "", - InputAction::NO_VALUE, - "" - } -}; - SetupActionData setupActionDataChat[] = { { diff --git a/src/input/pages/pages.h b/src/input/pages/pages.h index f6a29b8ce..523317fd9 100644 --- a/src/input/pages/pages.h +++ b/src/input/pages/pages.h @@ -26,7 +26,6 @@ #include "gui/setupactiondata.h" -extern SetupActionData setupActionDataOutfits[]; extern SetupActionData setupActionDataChat[]; extern SetupActionData setupActionDataOther[]; extern SetupActionData setupActionDataMove[]; -- cgit v1.2.3-60-g2f50