From 967121a34bbc60e6b46c7ec470b151f668ef1fef Mon Sep 17 00:00:00 2001 From: sapier Date: Sun, 23 Jun 2013 18:30:21 +0200 Subject: Replace C++ mainmenu by formspec powered one --- src/guiMainMenu.h | 111 +++++------------------------------------------------- 1 file changed, 10 insertions(+), 101 deletions(-) (limited to 'src/guiMainMenu.h') diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h index 8697344c8..5eaca23fa 100644 --- a/src/guiMainMenu.h +++ b/src/guiMainMenu.h @@ -24,15 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "modalMenu.h" #include #include -#include "subgame.h" -#include "serverlist.h" - -class IGameCallback; - -enum { - SERVERLIST_FAVORITES, - SERVERLIST_PUBLIC, -}; enum { @@ -45,113 +36,31 @@ enum struct MainMenuData { - // These are in the native format of the gui elements - // Generic - int selected_tab; - std::string selected_game; - std::string selected_game_name; // Client options std::string servername; std::string serverdescription; - std::wstring address; - std::wstring port; - std::wstring name; - std::wstring password; - bool fancy_trees; - bool smooth_lighting; - bool clouds_3d; - bool opaque_water; - bool mip_map; - bool anisotropic_filter; - bool bilinear_filter; - bool trilinear_filter; - int enable_shaders; - bool preload_item_visuals; - bool enable_particles; - bool liquid_finite; + std::string address; + std::string port; + std::string name; + std::string password; + // Server options - bool creative_mode; - bool enable_damage; bool enable_public; int selected_world; bool simple_singleplayer_mode; - // Actions - std::wstring create_world_name; - std::string create_world_gameid; - bool only_refresh; - - int selected_serverlist; - std::vector worlds; - std::vector games; - std::vector servers; + // Actions + bool kill; + //error handling + std::string errormessage; MainMenuData(): - // Generic - selected_tab(0), - selected_game("minetest"), - selected_game_name("Minetest"), - // Client opts - fancy_trees(false), - smooth_lighting(false), - // Server opts - creative_mode(false), - enable_damage(false), enable_public(false), selected_world(0), simple_singleplayer_mode(false), - // Actions - only_refresh(false), - - selected_serverlist(SERVERLIST_FAVORITES) + errormessage("") {} }; -class GUIMainMenu : public GUIModalMenu -{ -public: - GUIMainMenu(gui::IGUIEnvironment* env, - gui::IGUIElement* parent, s32 id, - IMenuManager *menumgr, - MainMenuData *data, - IGameCallback *gamecallback); - ~GUIMainMenu(); - - void removeChildren(); - // Remove and re-add (or reposition) stuff - void regenerateGui(v2u32 screensize); - void drawMenu(); - void readInput(MainMenuData *dst); - void acceptInput(); - bool getStatus() - { return m_accepted; } - bool OnEvent(const SEvent& event); - void createNewWorld(std::wstring name, std::string gameid); - void deleteWorld(const std::vector &paths); - int getTab(); - void displayMessageMenu(std::wstring msg); - -private: - MainMenuData *m_data; - bool m_accepted; - IGameCallback *m_gamecallback; - - gui::IGUIEnvironment* env; - gui::IGUIElement* parent; - s32 id; - IMenuManager *menumgr; - - std::vector m_world_indices; - - bool m_is_regenerating; - v2s32 m_topleft_client; - v2s32 m_size_client; - v2s32 m_topleft_server; - v2s32 m_size_server; - void updateGuiServerList(); - void serverListOnSelected(); - ServerListSpec getServerListSpec(std::string address, std::string port); -}; - #endif -- cgit v1.2.3