ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move options screns to their own folder to reduce clutter

Browse Source
This commit is contained in:
Alayan 2018-09-16 23:35:40 +02:00
parent 2cb9f1e714
commit 4d68d324a2
24 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/input_manager.cpp
View File

@ -45,7 +45,7 @@
#include "states_screens/dialogs/splitscreen_player_dialog.hpp" #include "states_screens/dialogs/splitscreen_player_dialog.hpp"
#include "states_screens/kart_selection.hpp" #include "states_screens/kart_selection.hpp"
#include "states_screens/main_menu_screen.hpp" #include "states_screens/main_menu_screen.hpp"
#include "states_screens/options_screen_device.hpp" #include "states_screens/options/options_screen_device.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "utils/debug.hpp" #include "utils/debug.hpp"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"

2
src/main.cpp
View File

@ -237,7 +237,7 @@
#include "states_screens/networking_lobby.hpp" #include "states_screens/networking_lobby.hpp"
#include "states_screens/register_screen.hpp" #include "states_screens/register_screen.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "states_screens/dialogs/init_android_dialog.hpp" #include "states_screens/dialogs/init_android_dialog.hpp"
#include "states_screens/dialogs/message_dialog.hpp" #include "states_screens/dialogs/message_dialog.hpp"
#include "tracks/arena_graph.hpp" #include "tracks/arena_graph.hpp"

2
src/online/online_player_profile.cpp
View File

@ -28,7 +28,7 @@
#include "online/profile_manager.hpp" #include "online/profile_manager.hpp"
#include "states_screens/main_menu_screen.hpp" #include "states_screens/main_menu_screen.hpp"
#include "states_screens/online_profile_friends.hpp" #include "states_screens/online_profile_friends.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "states_screens/dialogs/change_password_dialog.hpp" #include "states_screens/dialogs/change_password_dialog.hpp"
#include "states_screens/dialogs/user_info_dialog.hpp" #include "states_screens/dialogs/user_info_dialog.hpp"
#include "utils/log.hpp" #include "utils/log.hpp"

2
src/states_screens/dialogs/add_device_dialog.cpp
View File

@ -24,7 +24,7 @@
#include "input/device_manager.hpp" #include "input/device_manager.hpp"
#include "input/input_manager.hpp" #include "input/input_manager.hpp"
#include "states_screens/dialogs/message_dialog.hpp" #include "states_screens/dialogs/message_dialog.hpp"
#include "states_screens/options_screen_input.hpp" #include "states_screens/options/options_screen_input.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "utils/cpp2011.hpp" #include "utils/cpp2011.hpp"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"

2
src/states_screens/dialogs/custom_video_settings.cpp
View File

@ -20,7 +20,7 @@
#include "config/user_config.hpp" #include "config/user_config.hpp"
#include "guiengine/widgets/check_box_widget.hpp" #include "guiengine/widgets/check_box_widget.hpp"
#include "guiengine/widgets/spinner_widget.hpp" #include "guiengine/widgets/spinner_widget.hpp"
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"
#include "graphics/central_settings.hpp" #include "graphics/central_settings.hpp"
#include "graphics/irr_driver.hpp" #include "graphics/irr_driver.hpp"

2
src/states_screens/dialogs/press_a_key_dialog.cpp
View File

@ -20,7 +20,7 @@
#include "input/input.hpp" #include "input/input.hpp"
#include "input/input_manager.hpp" #include "input/input_manager.hpp"
#include "states_screens/dialogs/press_a_key_dialog.hpp" #include "states_screens/dialogs/press_a_key_dialog.hpp"
#include "states_screens/options_screen_device.hpp" #include "states_screens/options/options_screen_device.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"
using namespace GUIEngine; using namespace GUIEngine;

2
src/states_screens/dialogs/race_paused_dialog.cpp
View File

@ -35,7 +35,7 @@
#include "states_screens/main_menu_screen.hpp" #include "states_screens/main_menu_screen.hpp"
#include "states_screens/race_gui_base.hpp" #include "states_screens/race_gui_base.hpp"
#include "states_screens/race_setup_screen.hpp" #include "states_screens/race_setup_screen.hpp"
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"

4
src/states_screens/main_menu_screen.cpp
View File

@ -47,9 +47,9 @@
#include "states_screens/online_profile_achievements.hpp" #include "states_screens/online_profile_achievements.hpp"
#include "states_screens/online_profile_servers.hpp" #include "states_screens/online_profile_servers.hpp"
#include "states_screens/online_screen.hpp" #include "states_screens/online_screen.hpp"
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#if DEBUG_MENU_ITEM #if DEBUG_MENU_ITEM
#include "states_screens/feature_unlocked.hpp" #include "states_screens/feature_unlocked.hpp"
#include "states_screens/grand_prix_lose.hpp" #include "states_screens/grand_prix_lose.hpp"

2
src/states_screens/online_screen.cpp
View File

@ -41,7 +41,7 @@
#include "states_screens/online_profile_servers.hpp" #include "states_screens/online_profile_servers.hpp"
#include "states_screens/online_screen.hpp" #include "states_screens/online_screen.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "states_screens/dialogs/general_text_field_dialog.hpp" #include "states_screens/dialogs/general_text_field_dialog.hpp"
#include "states_screens/dialogs/message_dialog.hpp" #include "states_screens/dialogs/message_dialog.hpp"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"

12
src/states_screens/options_screen_audio.cpp → src/states_screens/options/options_screen_audio.cpp
View File

@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "states_screens/options_screen_audio.hpp" #include "states_screens/options/options_screen_audio.hpp"
#include "audio/music_manager.hpp" #include "audio/music_manager.hpp"
#include "audio/sfx_manager.hpp" #include "audio/sfx_manager.hpp"
@ -27,12 +27,12 @@
#include "guiengine/widgets/spinner_widget.hpp" #include "guiengine/widgets/spinner_widget.hpp"
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
#include "states_screens/options_screen_input.hpp" #include "states_screens/options/options_screen_input.hpp"
#include "states_screens/options_screen_language.hpp" #include "states_screens/options/options_screen_language.hpp"
#include "states_screens/options_screen_ui.hpp" #include "states_screens/options/options_screen_ui.hpp"
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"
#include <iostream> #include <iostream>

0
src/states_screens/options_screen_audio.hpp → src/states_screens/options/options_screen_audio.hpp
View File

14
src/states_screens/options_screen_device.cpp → src/states_screens/options/options_screen_device.cpp
View File

@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "states_screens/options_screen_device.hpp" #include "states_screens/options/options_screen_device.hpp"
#include "config/user_config.hpp" #include "config/user_config.hpp"
#include "guiengine/CGUISpriteBank.hpp" #include "guiengine/CGUISpriteBank.hpp"
@ -31,13 +31,13 @@
#include "input/gamepad_device.hpp" #include "input/gamepad_device.hpp"
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
#include "states_screens/dialogs/press_a_key_dialog.hpp" #include "states_screens/dialogs/press_a_key_dialog.hpp"
#include "states_screens/options_screen_audio.hpp" #include "states_screens/options/options_screen_audio.hpp"
#include "states_screens/options_screen_input.hpp" #include "states_screens/options/options_screen_input.hpp"
#include "states_screens/options_screen_language.hpp" #include "states_screens/options/options_screen_language.hpp"
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "states_screens/options_screen_ui.hpp" #include "states_screens/options/options_screen_ui.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"
#include <iostream> #include <iostream>

0
src/states_screens/options_screen_device.hpp → src/states_screens/options/options_screen_device.hpp
View File

14
src/states_screens/options_screen_input.cpp → src/states_screens/options/options_screen_input.cpp
View File

@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "states_screens/options_screen_input.hpp" #include "states_screens/options/options_screen_input.hpp"
#include "graphics/irr_driver.hpp" #include "graphics/irr_driver.hpp"
#include "guiengine/CGUISpriteBank.hpp" #include "guiengine/CGUISpriteBank.hpp"
@ -28,15 +28,15 @@
#include "input/gamepad_device.hpp" #include "input/gamepad_device.hpp"
#include "input/input_manager.hpp" #include "input/input_manager.hpp"
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
#include "states_screens/options_screen_device.hpp" #include "states_screens/options/options_screen_device.hpp"
#include "states_screens/options_screen_audio.hpp" #include "states_screens/options/options_screen_audio.hpp"
#include "states_screens/options_screen_language.hpp" #include "states_screens/options/options_screen_language.hpp"
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "states_screens/options_screen_ui.hpp" #include "states_screens/options/options_screen_ui.hpp"
#include "states_screens/dialogs/add_device_dialog.hpp" #include "states_screens/dialogs/add_device_dialog.hpp"
#include "states_screens/dialogs/multitouch_settings_dialog.hpp" #include "states_screens/dialogs/multitouch_settings_dialog.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"

0
src/states_screens/options_screen_input.hpp → src/states_screens/options/options_screen_input.hpp
View File

12
src/states_screens/options_screen_language.cpp → src/states_screens/options/options_screen_language.cpp
View File

@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "states_screens/options_screen_language.hpp" #include "states_screens/options/options_screen_language.hpp"
#include "addons/news_manager.hpp" #include "addons/news_manager.hpp"
#include "audio/sfx_manager.hpp" #include "audio/sfx_manager.hpp"
@ -39,12 +39,12 @@
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
#include "online/request_manager.hpp" #include "online/request_manager.hpp"
#include "states_screens/main_menu_screen.hpp" #include "states_screens/main_menu_screen.hpp"
#include "states_screens/options_screen_audio.hpp" #include "states_screens/options/options_screen_audio.hpp"
#include "states_screens/options_screen_input.hpp" #include "states_screens/options/options_screen_input.hpp"
#include "states_screens/options_screen_ui.hpp" #include "states_screens/options/options_screen_ui.hpp"
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "utils/log.hpp" #include "utils/log.hpp"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"

0
src/states_screens/options_screen_language.hpp → src/states_screens/options/options_screen_language.hpp
View File

12
src/states_screens/options_screen_ui.cpp → src/states_screens/options/options_screen_ui.cpp
View File

@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "states_screens/options_screen_ui.hpp" #include "states_screens/options/options_screen_ui.hpp"
#include "addons/news_manager.hpp" #include "addons/news_manager.hpp"
#include "audio/sfx_manager.hpp" #include "audio/sfx_manager.hpp"
@ -39,12 +39,12 @@
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
#include "online/request_manager.hpp" #include "online/request_manager.hpp"
#include "states_screens/main_menu_screen.hpp" #include "states_screens/main_menu_screen.hpp"
#include "states_screens/options_screen_audio.hpp" #include "states_screens/options/options_screen_audio.hpp"
#include "states_screens/options_screen_input.hpp" #include "states_screens/options/options_screen_input.hpp"
#include "states_screens/options_screen_language.hpp" #include "states_screens/options/options_screen_language.hpp"
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "utils/log.hpp" #include "utils/log.hpp"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"

0
src/states_screens/options_screen_ui.hpp → src/states_screens/options/options_screen_ui.hpp
View File

12
src/states_screens/options_screen_video.cpp → src/states_screens/options/options_screen_video.cpp
View File

@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "audio/sfx_manager.hpp" #include "audio/sfx_manager.hpp"
#include "audio/sfx_base.hpp" #include "audio/sfx_base.hpp"
@ -30,12 +30,12 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
#include "states_screens/dialogs/custom_video_settings.hpp" #include "states_screens/dialogs/custom_video_settings.hpp"
#include "states_screens/options_screen_audio.hpp" #include "states_screens/options/options_screen_audio.hpp"
#include "states_screens/options_screen_input.hpp" #include "states_screens/options/options_screen_input.hpp"
#include "states_screens/options_screen_language.hpp" #include "states_screens/options/options_screen_language.hpp"
#include "states_screens/options_screen_ui.hpp" #include "states_screens/options/options_screen_ui.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"

0
src/states_screens/options_screen_video.hpp → src/states_screens/options/options_screen_video.hpp
View File

12
src/states_screens/user_screen.cpp → src/states_screens/options/user_screen.cpp
View File

@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "addons/news_manager.hpp" #include "addons/news_manager.hpp"
#include "audio/sfx_manager.hpp" #include "audio/sfx_manager.hpp"
@ -33,11 +33,11 @@
#include "states_screens/dialogs/kart_color_slider_dialog.hpp" #include "states_screens/dialogs/kart_color_slider_dialog.hpp"
#include "states_screens/dialogs/recovery_dialog.hpp" #include "states_screens/dialogs/recovery_dialog.hpp"
#include "states_screens/main_menu_screen.hpp" #include "states_screens/main_menu_screen.hpp"
#include "states_screens/options_screen_audio.hpp" #include "states_screens/options/options_screen_audio.hpp"
#include "states_screens/options_screen_input.hpp" #include "states_screens/options/options_screen_input.hpp"
#include "states_screens/options_screen_language.hpp" #include "states_screens/options/options_screen_language.hpp"
#include "states_screens/options_screen_ui.hpp" #include "states_screens/options/options_screen_ui.hpp"
#include "states_screens/options_screen_video.hpp" #include "states_screens/options/options_screen_video.hpp"
#include "states_screens/register_screen.hpp" #include "states_screens/register_screen.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"

0
src/states_screens/user_screen.hpp → src/states_screens/options/user_screen.hpp
View File

2
src/states_screens/register_screen.cpp
View File

@ -31,7 +31,7 @@
#include "states_screens/dialogs/message_dialog.hpp" #include "states_screens/dialogs/message_dialog.hpp"
#include "states_screens/main_menu_screen.hpp" #include "states_screens/main_menu_screen.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "states_screens/user_screen.hpp" #include "states_screens/options/user_screen.hpp"
#include "utils/log.hpp" #include "utils/log.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"