Move help and option files in subfolders

src/states_screens/dialogs/race_paused_dialog.cpp

@@ -41,7 +41,7 @@
 #include "network/network_string.hpp"
 #include "network/stk_host.hpp"
 #include "race/race_manager.hpp"
-#include "states_screens/help_screen_1.hpp"
+#include "states_screens/help/help_screen_1.hpp"
 #include "states_screens/main_menu_screen.hpp"
 #include "states_screens/race_gui_base.hpp"
 #include "states_screens/race_gui_multitouch.hpp"

src/states_screens/help/help_screen_1.cpp

@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "states_screens/help_screen_1.hpp"
+#include "states_screens/help/help_screen_1.hpp"
 
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
@@ -29,12 +29,12 @@
 #include "input/keyboard_device.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "race/race_manager.hpp"
-#include "states_screens/help_screen_2.hpp"
-#include "states_screens/help_screen_3.hpp"
-#include "states_screens/help_screen_4.hpp"
-#include "states_screens/help_screen_5.hpp"
-#include "states_screens/help_screen_6.hpp"
-#include "states_screens/help_screen_7.hpp"
+#include "states_screens/help/help_screen_2.hpp"
+#include "states_screens/help/help_screen_3.hpp"
+#include "states_screens/help/help_screen_4.hpp"
+#include "states_screens/help/help_screen_5.hpp"
+#include "states_screens/help/help_screen_6.hpp"
+#include "states_screens/help/help_screen_7.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;
@@ -44,7 +44,7 @@ using namespace GUIEngine;
 //         (the specialized test of this first screen is a tiny exception)
 // -----------------------------------------------------------------------------
 
-HelpScreen1::HelpScreen1() : Screen("help1.stkgui")
+HelpScreen1::HelpScreen1() : Screen("help/help1.stkgui")
 {
 }   // HelpScreen1
 

src/states_screens/help/help_screen_2.cpp

@@ -15,23 +15,23 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "states_screens/help_screen_2.hpp"
+#include "states_screens/help/help_screen_2.hpp"
 
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
-#include "states_screens/help_screen_1.hpp"
-#include "states_screens/help_screen_3.hpp"
-#include "states_screens/help_screen_4.hpp"
-#include "states_screens/help_screen_5.hpp"
-#include "states_screens/help_screen_6.hpp"
-#include "states_screens/help_screen_7.hpp"
+#include "states_screens/help/help_screen_1.hpp"
+#include "states_screens/help/help_screen_3.hpp"
+#include "states_screens/help/help_screen_4.hpp"
+#include "states_screens/help/help_screen_5.hpp"
+#include "states_screens/help/help_screen_6.hpp"
+#include "states_screens/help/help_screen_7.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
 
-HelpScreen2::HelpScreen2() : Screen("help2.stkgui")
+HelpScreen2::HelpScreen2() : Screen("help/help2.stkgui")
 {
 }   // HelpScreen2
 

src/states_screens/help/help_screen_3.cpp

@@ -15,24 +15,24 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "states_screens/help_screen_3.hpp"
+#include "states_screens/help/help_screen_3.hpp"
 
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "modes/world.hpp"
-#include "states_screens/help_screen_1.hpp"
-#include "states_screens/help_screen_2.hpp"
-#include "states_screens/help_screen_4.hpp"
-#include "states_screens/help_screen_5.hpp"
-#include "states_screens/help_screen_6.hpp"
-#include "states_screens/help_screen_7.hpp"
+#include "states_screens/help/help_screen_1.hpp"
+#include "states_screens/help/help_screen_2.hpp"
+#include "states_screens/help/help_screen_4.hpp"
+#include "states_screens/help/help_screen_5.hpp"
+#include "states_screens/help/help_screen_6.hpp"
+#include "states_screens/help/help_screen_7.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
 
-HelpScreen3::HelpScreen3() : Screen("help3.stkgui")
+HelpScreen3::HelpScreen3() : Screen("help/help3.stkgui")
 {
 }   // HelpSCreen3
 

src/states_screens/help/help_screen_4.cpp

@@ -15,24 +15,24 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "states_screens/help_screen_4.hpp"
+#include "states_screens/help/help_screen_4.hpp"
 
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "modes/world.hpp"
-#include "states_screens/help_screen_1.hpp"
-#include "states_screens/help_screen_2.hpp"
-#include "states_screens/help_screen_3.hpp"
-#include "states_screens/help_screen_5.hpp"
-#include "states_screens/help_screen_6.hpp"
-#include "states_screens/help_screen_7.hpp"
+#include "states_screens/help/help_screen_1.hpp"
+#include "states_screens/help/help_screen_2.hpp"
+#include "states_screens/help/help_screen_3.hpp"
+#include "states_screens/help/help_screen_5.hpp"
+#include "states_screens/help/help_screen_6.hpp"
+#include "states_screens/help/help_screen_7.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
 
-HelpScreen4::HelpScreen4() : Screen("help4.stkgui")
+HelpScreen4::HelpScreen4() : Screen("help/help4.stkgui")
 {
 }   // HelpScreen4
 

src/states_screens/help/help_screen_5.cpp

@@ -15,23 +15,23 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "states_screens/help_screen_5.hpp"
+#include "states_screens/help/help_screen_5.hpp"
 
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
-#include "states_screens/help_screen_1.hpp"
-#include "states_screens/help_screen_2.hpp"
-#include "states_screens/help_screen_3.hpp"
-#include "states_screens/help_screen_4.hpp"
-#include "states_screens/help_screen_6.hpp"
-#include "states_screens/help_screen_7.hpp"
+#include "states_screens/help/help_screen_1.hpp"
+#include "states_screens/help/help_screen_2.hpp"
+#include "states_screens/help/help_screen_3.hpp"
+#include "states_screens/help/help_screen_4.hpp"
+#include "states_screens/help/help_screen_6.hpp"
+#include "states_screens/help/help_screen_7.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
 
-HelpScreen5::HelpScreen5() : Screen("help5.stkgui")
+HelpScreen5::HelpScreen5() : Screen("help/help5.stkgui")
 {
 }   // HelpScreen5
 

src/states_screens/help/help_screen_6.cpp

@@ -15,23 +15,23 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "states_screens/help_screen_6.hpp"
+#include "states_screens/help/help_screen_6.hpp"
 
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
-#include "states_screens/help_screen_1.hpp"
-#include "states_screens/help_screen_2.hpp"
-#include "states_screens/help_screen_3.hpp"
-#include "states_screens/help_screen_4.hpp"
-#include "states_screens/help_screen_5.hpp"
-#include "states_screens/help_screen_7.hpp"
+#include "states_screens/help/help_screen_1.hpp"
+#include "states_screens/help/help_screen_2.hpp"
+#include "states_screens/help/help_screen_3.hpp"
+#include "states_screens/help/help_screen_4.hpp"
+#include "states_screens/help/help_screen_5.hpp"
+#include "states_screens/help/help_screen_7.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
 
-HelpScreen6::HelpScreen6() : Screen("help6.stkgui")
+HelpScreen6::HelpScreen6() : Screen("help/help6.stkgui")
 {
 }   // HelpScreen6
 

src/states_screens/help/help_screen_7.cpp

@@ -15,23 +15,23 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "states_screens/help_screen_7.hpp"
+#include "states_screens/help/help_screen_7.hpp"
 
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
-#include "states_screens/help_screen_1.hpp"
-#include "states_screens/help_screen_2.hpp"
-#include "states_screens/help_screen_3.hpp"
-#include "states_screens/help_screen_4.hpp"
-#include "states_screens/help_screen_5.hpp"
-#include "states_screens/help_screen_6.hpp"
+#include "states_screens/help/help_screen_1.hpp"
+#include "states_screens/help/help_screen_2.hpp"
+#include "states_screens/help/help_screen_3.hpp"
+#include "states_screens/help/help_screen_4.hpp"
+#include "states_screens/help/help_screen_5.hpp"
+#include "states_screens/help/help_screen_6.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
 
-HelpScreen7::HelpScreen7() : Screen("help7.stkgui")
+HelpScreen7::HelpScreen7() : Screen("help/help7.stkgui")
 {
 }   // HelpScreen7
 

src/states_screens/main_menu_screen.cpp

@@ -46,7 +46,7 @@
 #include "states_screens/credits.hpp"
 #include "states_screens/cutscene_general.hpp"
 #include "states_screens/grand_prix_editor_screen.hpp"
-#include "states_screens/help_screen_1.hpp"
+#include "states_screens/help/help_screen_1.hpp"
 #include "states_screens/high_score_selection.hpp"
 #include "states_screens/offline_kart_selection.hpp"
 #include "states_screens/online/online_profile_achievements.hpp"

src/states_screens/options/options_screen_audio.cpp

@@ -43,7 +43,7 @@ using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
 
-OptionsScreenAudio::OptionsScreenAudio() : Screen("options_audio.stkgui")
+OptionsScreenAudio::OptionsScreenAudio() : Screen("options/options_audio.stkgui")
 {
 }   // OptionsScreenAudio
 

src/states_screens/options/options_screen_device.cpp

@@ -54,7 +54,7 @@ using namespace GUIEngine;
 
 // ----------------------------------------------------------------------------
 
-OptionsScreenDevice::OptionsScreenDevice() : Screen("options_device.stkgui")
+OptionsScreenDevice::OptionsScreenDevice() : Screen("options/options_device.stkgui")
 {
     m_config = NULL;
 }   // OptionsScreenDevice

src/states_screens/options/options_screen_general.cpp

@@ -64,7 +64,7 @@ using namespace Online;
 
 // -----------------------------------------------------------------------------
 
-OptionsScreenGeneral::OptionsScreenGeneral() : Screen("options_general.stkgui")
+OptionsScreenGeneral::OptionsScreenGeneral() : Screen("options/options_general.stkgui")
 {
     m_resizable = true;
     m_inited = false;

src/states_screens/options/options_screen_input.cpp

@@ -53,7 +53,7 @@ using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
 
-OptionsScreenInput::OptionsScreenInput() : Screen("options_input.stkgui")
+OptionsScreenInput::OptionsScreenInput() : Screen("options/options_input.stkgui")
 {
 }   // OptionsScreenInput
 

src/states_screens/options/options_screen_language.cpp

@@ -61,7 +61,7 @@ using namespace Online;
 
 // -----------------------------------------------------------------------------
 
-OptionsScreenLanguage::OptionsScreenLanguage() : Screen("options_language.stkgui")
+OptionsScreenLanguage::OptionsScreenLanguage() : Screen("options/options_language.stkgui")
 {
     m_inited = false;
 }   // OptionsScreenLanguage

src/states_screens/options/options_screen_ui.cpp

@@ -69,7 +69,7 @@ using namespace Online;
 
 // -----------------------------------------------------------------------------
 
-OptionsScreenUI::OptionsScreenUI() : Screen("options_ui.stkgui")
+OptionsScreenUI::OptionsScreenUI() : Screen("options/options_ui.stkgui")
 {
     m_inited = false;
 }   // OptionsScreenVideo

src/states_screens/options/options_screen_video.cpp

@@ -201,7 +201,7 @@ void OptionsScreenVideo::setImageQuality(int quality)
 
 // --------------------------------------------------------------------------------------------
 
-OptionsScreenVideo::OptionsScreenVideo() : Screen("options_video.stkgui"),
+OptionsScreenVideo::OptionsScreenVideo() : Screen("options/options_video.stkgui"),
                                            m_prev_adv_pipline(false),
                                            m_prev_img_quality(-1)
 {