From 0eeab6d661f978e1557c63a67bfbe8c06a3fdb85 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 23 Aug 2014 00:03:48 +0300 Subject: Rename settings options file from page into gui. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/gui/setupinputpages.cpp | 2 +- src/gui/touchactiondata.cpp | 2 +- src/gui/widgets/tabs/setup_input.cpp | 2 +- src/input/pages/gui.cpp | 205 +++++++++++++++++++++++++++++++++++ src/input/pages/gui.h | 31 ++++++ src/input/pages/pages.cpp | 205 ----------------------------------- src/input/pages/pages.h | 31 ------ 9 files changed, 243 insertions(+), 243 deletions(-) create mode 100644 src/input/pages/gui.cpp create mode 100644 src/input/pages/gui.h delete mode 100644 src/input/pages/pages.cpp delete mode 100644 src/input/pages/pages.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 980691e95..b9ccf86ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -445,14 +445,14 @@ SET(SRCS input/pages/chat.h input/pages/emotes.cpp input/pages/emotes.h + input/pages/gui.cpp + input/pages/gui.h input/pages/move.cpp input/pages/move.h input/pages/other.cpp input/pages/other.h input/pages/outfits.cpp input/pages/outfits.h - input/pages/pages.cpp - input/pages/pages.h input/pages/shortcuts.cpp input/pages/shortcuts.h input/pages/windows.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 28d41afc6..1990e3c46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -569,14 +569,14 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ input/pages/chat.h \ input/pages/emotes.cpp \ input/pages/emotes.h \ + input/pages/gui.cpp \ + input/pages/gui.h \ input/pages/move.cpp \ input/pages/move.h \ input/pages/other.cpp \ input/pages/other.h \ input/pages/outfits.cpp \ input/pages/outfits.h \ - input/pages/pages.cpp \ - input/pages/pages.h \ input/pages/shortcuts.cpp \ input/pages/shortcuts.h \ input/pages/windows.cpp \ diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp index e9f3da1e9..d4674a702 100644 --- a/src/gui/setupinputpages.cpp +++ b/src/gui/setupinputpages.cpp @@ -30,10 +30,10 @@ #include "input/pages/basic.h" #include "input/pages/chat.h" #include "input/pages/emotes.h" +#include "input/pages/gui.h" #include "input/pages/move.h" #include "input/pages/other.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/touchactiondata.cpp b/src/gui/touchactiondata.cpp index e27add153..2f970eaf8 100644 --- a/src/gui/touchactiondata.cpp +++ b/src/gui/touchactiondata.cpp @@ -24,8 +24,8 @@ #include "input/pages/basic.h" #include "input/pages/chat.h" +#include "input/pages/gui.h" #include "input/pages/other.h" -#include "input/pages/pages.h" #include "input/pages/windows.h" #include "debug.h" diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index 7710b5f8c..5185ad4eb 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -29,9 +29,9 @@ #include "input/keyboardconfig.h" #include "input/pages/emotes.h" +#include "input/pages/gui.h" #include "input/pages/move.h" #include "input/pages/outfits.h" -#include "input/pages/pages.h" #include "input/pages/shortcuts.h" #include "gui/gui.h" diff --git a/src/input/pages/gui.cpp b/src/input/pages/gui.cpp new file mode 100644 index 000000000..2c9fbd698 --- /dev/null +++ b/src/input/pages/gui.cpp @@ -0,0 +1,205 @@ +/* + * 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 setupActionDataGui[] = +{ + { + // TRANSLATORS: input action name + N_("Move & selection"), + InputAction::NO_VALUE, + "", + }, + { + // TRANSLATORS: input action name + N_("Move Up"), + InputAction::GUI_UP, + "", + }, + { + // TRANSLATORS: input action name + N_("Move Down"), + InputAction::GUI_DOWN, + "", + }, + { + // TRANSLATORS: input action name + N_("Move Left"), + InputAction::GUI_LEFT, + "", + }, + { + // TRANSLATORS: input action name + N_("Move Right"), + InputAction::GUI_RIGHT, + "", + }, + { + // TRANSLATORS: input action name + N_("Move Home"), + InputAction::GUI_HOME, + "", + }, + { + // TRANSLATORS: input action name + N_("Move End"), + InputAction::GUI_END, + "", + }, + { + // TRANSLATORS: input action name + N_("Page up"), + InputAction::GUI_PAGE_UP, + "", + }, + { + // TRANSLATORS: input action name + N_("Page down"), + InputAction::GUI_PAGE_DOWN, + "", + }, + { + // TRANSLATORS: input action name + N_("Other"), + InputAction::NO_VALUE, + "", + }, + { + // TRANSLATORS: input action name + N_("Select"), + InputAction::GUI_SELECT, + "", + }, + { + // TRANSLATORS: input action name + N_("Select2"), + InputAction::GUI_SELECT2, + "", + }, + { + // TRANSLATORS: input action name + N_("Cancel"), + InputAction::GUI_CANCEL, + "", + }, + { + // TRANSLATORS: input action name + N_("Delete"), + InputAction::GUI_DELETE, + "", + }, + { + // TRANSLATORS: input action name + N_("Backspace"), + InputAction::GUI_BACKSPACE, + "", + }, + { + // TRANSLATORS: input action name + N_("Insert"), + InputAction::GUI_INSERT, + "", + }, + { + // TRANSLATORS: input action name + N_("Tab"), + InputAction::GUI_TAB, + "", + }, + { + // TRANSLATORS: input action name + N_("Mod"), + InputAction::GUI_MOD, + "", + }, + { + // TRANSLATORS: input action name + N_("Ctrl"), + InputAction::GUI_CTRL, + "", + }, + { + "B", + InputAction::GUI_B, + "", + }, + { + "C", + InputAction::GUI_C, + "", + }, + { + "D", + InputAction::GUI_D, + "", + }, + { + "E", + InputAction::GUI_E, + "", + }, + { + "F", + InputAction::GUI_F, + "", + }, + { + "H", + InputAction::GUI_H, + "", + }, + { + "K", + InputAction::GUI_K, + "", + }, + { + "U", + InputAction::GUI_U, + "", + }, + { + "V", + InputAction::GUI_V, + "", + }, + { + "W", + InputAction::GUI_W, + "", + }, + { + "", + InputAction::NO_VALUE, + "" + } +}; diff --git a/src/input/pages/gui.h b/src/input/pages/gui.h new file mode 100644 index 000000000..ed5e5c8da --- /dev/null +++ b/src/input/pages/gui.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_GUI_H +#define INPUT_PAGES_GUI_H + +#include "gui/setupactiondata.h" + +extern SetupActionData setupActionDataGui[]; + +#endif // INPUT_PAGES_GUI_H diff --git a/src/input/pages/pages.cpp b/src/input/pages/pages.cpp deleted file mode 100644 index 2c9fbd698..000000000 --- a/src/input/pages/pages.cpp +++ /dev/null @@ -1,205 +0,0 @@ -/* - * 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 setupActionDataGui[] = -{ - { - // TRANSLATORS: input action name - N_("Move & selection"), - InputAction::NO_VALUE, - "", - }, - { - // TRANSLATORS: input action name - N_("Move Up"), - InputAction::GUI_UP, - "", - }, - { - // TRANSLATORS: input action name - N_("Move Down"), - InputAction::GUI_DOWN, - "", - }, - { - // TRANSLATORS: input action name - N_("Move Left"), - InputAction::GUI_LEFT, - "", - }, - { - // TRANSLATORS: input action name - N_("Move Right"), - InputAction::GUI_RIGHT, - "", - }, - { - // TRANSLATORS: input action name - N_("Move Home"), - InputAction::GUI_HOME, - "", - }, - { - // TRANSLATORS: input action name - N_("Move End"), - InputAction::GUI_END, - "", - }, - { - // TRANSLATORS: input action name - N_("Page up"), - InputAction::GUI_PAGE_UP, - "", - }, - { - // TRANSLATORS: input action name - N_("Page down"), - InputAction::GUI_PAGE_DOWN, - "", - }, - { - // TRANSLATORS: input action name - N_("Other"), - InputAction::NO_VALUE, - "", - }, - { - // TRANSLATORS: input action name - N_("Select"), - InputAction::GUI_SELECT, - "", - }, - { - // TRANSLATORS: input action name - N_("Select2"), - InputAction::GUI_SELECT2, - "", - }, - { - // TRANSLATORS: input action name - N_("Cancel"), - InputAction::GUI_CANCEL, - "", - }, - { - // TRANSLATORS: input action name - N_("Delete"), - InputAction::GUI_DELETE, - "", - }, - { - // TRANSLATORS: input action name - N_("Backspace"), - InputAction::GUI_BACKSPACE, - "", - }, - { - // TRANSLATORS: input action name - N_("Insert"), - InputAction::GUI_INSERT, - "", - }, - { - // TRANSLATORS: input action name - N_("Tab"), - InputAction::GUI_TAB, - "", - }, - { - // TRANSLATORS: input action name - N_("Mod"), - InputAction::GUI_MOD, - "", - }, - { - // TRANSLATORS: input action name - N_("Ctrl"), - InputAction::GUI_CTRL, - "", - }, - { - "B", - InputAction::GUI_B, - "", - }, - { - "C", - InputAction::GUI_C, - "", - }, - { - "D", - InputAction::GUI_D, - "", - }, - { - "E", - InputAction::GUI_E, - "", - }, - { - "F", - InputAction::GUI_F, - "", - }, - { - "H", - InputAction::GUI_H, - "", - }, - { - "K", - InputAction::GUI_K, - "", - }, - { - "U", - InputAction::GUI_U, - "", - }, - { - "V", - InputAction::GUI_V, - "", - }, - { - "W", - InputAction::GUI_W, - "", - }, - { - "", - InputAction::NO_VALUE, - "" - } -}; diff --git a/src/input/pages/pages.h b/src/input/pages/pages.h deleted file mode 100644 index 7eb59c69f..000000000 --- a/src/input/pages/pages.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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_PAGES_H -#define INPUT_PAGES_PAGES_H - -#include "gui/setupactiondata.h" - -extern SetupActionData setupActionDataGui[]; - -#endif // INPUT_PAGES_PAGES_H -- cgit v1.2.3-70-g09d2