From 405347769a2f8c73aead3bc2b64fdc4d81763921 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 26 Mar 2012 02:19:41 +0300 Subject: New world removal GUI code --- src/guiConfirmMenu.cpp | 17 +++++++++++++---- src/guiMainMenu.cpp | 45 ++++++++++++++++++++++++++++++++++----------- src/guiMainMenu.h | 8 +++++--- src/main.cpp | 36 +++++++++++++++++++++++------------- 4 files changed, 75 insertions(+), 31 deletions(-) diff --git a/src/guiConfirmMenu.cpp b/src/guiConfirmMenu.cpp index 00e26ac42..8ca02aa43 100644 --- a/src/guiConfirmMenu.cpp +++ b/src/guiConfirmMenu.cpp @@ -93,12 +93,21 @@ void GUIConfirmMenu::regenerateGui(v2u32 screensize) v2s32 size = rect.getSize(); + gui::IGUISkin *skin = Environment->getSkin(); + gui::IGUIFont *font = skin->getFont(); + s32 msg_h = font->getDimension(m_message_text.c_str()).Height; + s32 msg_w = font->getDimension(m_message_text.c_str()).Width; + if(msg_h > 200) + msg_h = 200; + if(msg_w > 540) + msg_w = 540; + /* Add stuff */ { - core::rect rect(0, 0, 300, 20); - rect += v2s32(size.X/2-300/2, size.Y/2-30/2-25); + core::rect rect(0, 0, msg_w, msg_h); + rect += v2s32(size.X/2-msg_w/2, size.Y/2-30/2 - msg_h/2); Environment->addStaticText(m_message_text.c_str(), rect, false, true, this, -1); } @@ -106,13 +115,13 @@ void GUIConfirmMenu::regenerateGui(v2u32 screensize) int bw = 100; { core::rect rect(0, 0, bw, 30); - rect = rect + v2s32(size.X/2-bw/2-(bw/2+5), size.Y/2-30/2+25); + rect = rect + v2s32(size.X/2-bw/2-(bw/2+5), size.Y/2-30/2+5 + msg_h/2); Environment->addButton(rect, this, GUI_ID_YES, wgettext("Yes")); } { core::rect rect(0, 0, bw, 30); - rect = rect + v2s32(size.X/2-bw/2+(bw/2+5), size.Y/2-30/2+25); + rect = rect + v2s32(size.X/2-bw/2+(bw/2+5), size.Y/2-30/2+5 + msg_h/2); Environment->addButton(rect, this, GUI_ID_NO, wgettext("No")); } diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 647903521..ca0481e35 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -38,6 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "gettext.h" #include "utility.h" #include "tile.h" // getTexturePath +#include "filesys.h" struct CreateWorldDestMainMenu : public CreateWorldDest { @@ -53,18 +54,21 @@ struct CreateWorldDestMainMenu : public CreateWorldDest struct ConfirmDestDeleteWorld : public ConfirmDest { - ConfirmDestDeleteWorld(WorldSpec spec, GUIMainMenu *menu): + ConfirmDestDeleteWorld(WorldSpec spec, GUIMainMenu *menu, + const std::vector &paths): m_spec(spec), - m_menu(menu) + m_menu(menu), + m_paths(paths) {} void answer(bool answer) { if(answer == false) return; - m_menu->deleteWorld(m_spec); + m_menu->deleteWorld(m_paths); } WorldSpec m_spec; GUIMainMenu *m_menu; + std::vector m_paths; }; enum @@ -819,12 +823,25 @@ bool GUIMainMenu::OnEvent(const SEvent& event) )->drop(); } else { WorldSpec spec = m_data->worlds[cur.selected_world]; + // Get files and directories involved + std::vector paths; + paths.push_back(spec.path); + fs::GetRecursiveSubPaths(spec.path, paths); + // Launch confirmation dialog ConfirmDestDeleteWorld *dest = new - ConfirmDestDeleteWorld(spec, this); + ConfirmDestDeleteWorld(spec, this, paths); + std::wstring text = wgettext("Delete world"); + text += L" \""; + text += narrow_to_wide(spec.name); + text += L"\"?\n\n"; + text += wgettext("Files to be deleted"); + text += L":\n"; + for(u32 i=0; idrop(); + text.c_str()))->drop(); } return true; } @@ -889,12 +906,18 @@ void GUIMainMenu::createNewWorld(std::wstring name, std::string gameid) quitMenu(); } -void GUIMainMenu::deleteWorld(WorldSpec spec) +void GUIMainMenu::deleteWorld(const std::vector &paths) { - if(!spec.isValid()) - return; + // Delete files + bool did = fs::DeletePaths(paths); + if(!did){ + GUIMessageMenu *menu = new GUIMessageMenu(env, parent, + -1, menumgr, wgettext("Failed to delete all world files")); + menu->drop(); + } + // Quit menu to refresh it acceptInput(); - m_data->delete_world_spec = spec; + m_data->only_refresh = true; quitMenu(); } diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h index 5f9e73f62..4b73dcb9d 100644 --- a/src/guiMainMenu.h +++ b/src/guiMainMenu.h @@ -47,9 +47,9 @@ struct MainMenuData int selected_world; bool simple_singleplayer_mode; // Actions - WorldSpec delete_world_spec; std::wstring create_world_name; std::string create_world_gameid; + bool only_refresh; std::vector worlds; std::vector games; @@ -64,7 +64,9 @@ struct MainMenuData creative_mode(false), enable_damage(false), selected_world(0), - simple_singleplayer_mode(false) + simple_singleplayer_mode(false), + // Actions + only_refresh(false) {} }; @@ -88,7 +90,7 @@ public: { return m_accepted; } bool OnEvent(const SEvent& event); void createNewWorld(std::wstring name, std::string gameid); - void deleteWorld(WorldSpec spec); + void deleteWorld(const std::vector &paths); int getTab(); private: diff --git a/src/main.cpp b/src/main.cpp index 41b62b1dd..8a6504194 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1446,6 +1446,24 @@ int main(int argc, char *argv[]) if(skip_main_menu == false) { + video::IVideoDriver* driver = device->getVideoDriver(); + + infostream<<"Waiting for other menus"<run() && kill == false) + { + if(noMenuActive()) + break; + driver->beginScene(true, true, + video::SColor(255,128,128,128)); + drawMenuBackground(driver); + guienv->drawAll(); + driver->endScene(); + // On some computers framerate doesn't seem to be + // automatically limited + sleep_ms(25); + } + infostream<<"Waited for other menus"<getVideoDriver(); - infostream<<"Created main menu"<run() && kill == false) @@ -1538,19 +1554,13 @@ int main(int argc, char *argv[]) infostream<<"Selected world: "<