Merge pull request #2065 from mrkubax10/add_confirmation_message

Show confirmation message when deleting level or world

Author: Semphriss

src/supertux/menu/editor_delete_level_menu.cpp

@@ -16,6 +16,7 @@
 
 #include "supertux/menu/editor_delete_level_menu.hpp"
 #include <physfs.h>
+#include <boost/format.hpp>
 #include "supertux/levelset.hpp"
 #include "supertux/level_parser.hpp"
 #include "supertux/level.hpp"
@@ -27,6 +28,7 @@
 #include "gui/dialog.hpp"
 EditorDeleteLevelMenu::EditorDeleteLevelMenu(std::unique_ptr<Levelset>& levelset, EditorLevelSelectMenu* level_select_menu, EditorLevelsetSelectMenu* levelset_select_menu) : 
   m_level_full_paths(),
+  m_level_names(),
   m_level_select_menu(level_select_menu),
   m_levelset_select_menu(levelset_select_menu)
 {
@@ -37,7 +39,9 @@ EditorDeleteLevelMenu::EditorDeleteLevelMenu(std::unique_ptr<Levelset>& levelset
     std::string filename = levelset->get_level_filename(i);
     std::string fullpath = FileSystem::join(Editor::current()->get_world()->get_basedir(),filename);
     m_level_full_paths.push_back(fullpath);
-    add_entry(i, LevelParser::get_level_name(fullpath));
+    const std::string& level_name = LevelParser::get_level_name(fullpath);
+    m_level_names.push_back(level_name);
+    add_entry(i, level_name);
   }
   add_hl();
   add_back(_("Back"));
@@ -53,12 +57,15 @@ EditorDeleteLevelMenu::menu_action(MenuItem& item)
       Dialog::show_message(_("You cannot delete level that you are editing!"));
     else
     {
-      PHYSFS_delete(m_level_full_paths[id].c_str());
-      delete_item(id + 2);
-      m_level_full_paths.erase(m_level_full_paths.begin() + id);
-      m_level_select_menu->reload_menu();
-      if (!Editor::current()->is_level_loaded())
-        m_levelset_select_menu->reload_menu();
+      Dialog::show_confirmation(str(boost::format(_("You are about to delete level \"%s\". Are you sure?")) % m_level_names[id]), [this, id]()
+      {
+        PHYSFS_delete(m_level_full_paths[id].c_str());
+        delete_item(id + 2);
+        m_level_full_paths.erase(m_level_full_paths.begin() + id);
+        m_level_select_menu->reload_menu();
+        if (!Editor::current()->is_level_loaded())
+          m_levelset_select_menu->reload_menu();
+      });
     }
   }
 }

src/supertux/menu/editor_delete_level_menu.hpp

@@ -21,6 +21,7 @@ class EditorDeleteLevelMenu final : public Menu
 {
 private:
   std::vector<std::string> m_level_full_paths;
+  std::vector<std::string> m_level_names;
   EditorLevelSelectMenu* m_level_select_menu;
   EditorLevelsetSelectMenu* m_levelset_select_menu;
 public:

src/supertux/menu/editor_delete_levelset_menu.cpp

@@ -15,7 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "supertux/menu/editor_delete_levelset_menu.hpp"
-
+#include <boost/format.hpp>
 #include "editor/editor.hpp"
 #include "gui/dialog.hpp"
 #include "physfs/util.hpp"
@@ -25,7 +25,8 @@
 #include "util/log.hpp"
 
 EditorDeleteLevelsetMenu::EditorDeleteLevelsetMenu(EditorLevelsetSelectMenu* editor_levelset_select_menu) :
-  m_editor_levelset_select_menu(editor_levelset_select_menu)
+  m_editor_levelset_select_menu(editor_levelset_select_menu),
+  m_world_names()
 {
   refresh();
 }
@@ -57,6 +58,7 @@ EditorDeleteLevelsetMenu::refresh()
     {
       continue;
     }
+    m_world_names.push_back(title);
     add_entry(i++, title);
   }
 
@@ -69,17 +71,19 @@ void
 EditorDeleteLevelsetMenu::menu_action(MenuItem& item)
 {
   int id = item.get_id();
-
+  const auto& contrib_worlds = m_editor_levelset_select_menu->get_contrib_worlds();
   if (id >= 0)
   {
-    std::vector<std::string>& contrib_worlds = m_editor_levelset_select_menu->get_contrib_worlds();
     if (Editor::is_active() && Editor::current()->get_world() && Editor::current()->get_world()->get_basedir() == contrib_worlds[id])
       Dialog::show_message(_("You cannot delete the world that you are editing"));
     else
     {
-      physfsutil::remove_with_content(contrib_worlds[id]);
-      m_editor_levelset_select_menu->reload_menu();
-      refresh();
+      Dialog::show_confirmation(str(boost::format(_("You are about to delete world \"%s\". Are you sure?")) % m_world_names[id]), [this, id, &contrib_worlds]()
+      {
+        physfsutil::remove_with_content(contrib_worlds[id]);
+        m_editor_levelset_select_menu->reload_menu();
+        refresh();
+      });
     }
   }
 }

src/supertux/menu/editor_delete_levelset_menu.hpp

@@ -32,6 +32,7 @@ class EditorDeleteLevelsetMenu final : public Menu
 
 private:
   EditorLevelsetSelectMenu* m_editor_levelset_select_menu;
+  std::vector<std::string> m_world_names;
 
 private:
   EditorDeleteLevelsetMenu(const EditorDeleteLevelsetMenu&) = delete;