0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Confirmation dialog refactoring.

Browse source
This commit is contained in:
Kristoffer Erlandsson 2004-04-25 22:29:40 +00:00
parent 5253fb2fc7
commit 7e1e93a82c
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/editor/editor.cpp
View file

@ -301,13 +301,7 @@ void map_editor::edit_new_map()
{
const std::string map = new_map_dialog(gui_);
if (map != "") {
int res = 0;
if (num_operations_since_save_ != 0) {
res = gui::show_dialog(gui_, NULL, "",
"The modification to the map will be discarded. Continue?",
gui::OK_CANCEL);
}
if (res == 0)
if (confirm_modification_disposal(gui_, "The modification to the map will be discarded. Continue?"))
throw new_map_exception(map);
}
}
@ -552,6 +546,17 @@ bool map_editor::confirm_exit_and_save() {
return true;
}
bool map_editor::confirm_modification_disposal(display& disp, const std::string message)
{
bool ret = true;
if (num_operations_since_save_ != 0) {
const int res = gui::show_dialog(gui_, NULL, "", message,
gui::OK_CANCEL);
ret = res == 0;
}
return ret;
}
bool map_editor::save_map(const std::string fn, const bool display_confirmation) {
std::string filename = fn;
if (filename == "") {
@ -758,12 +763,8 @@ void map_editor::edit_load_map()
gui::show_dialog(gui_, NULL, "", std::string("Load failed: ") + msg, gui::OK_ONLY);
}
else {
if (num_operations_since_save_ != 0) {
const int res = gui::show_dialog(gui_, NULL, "",
"The modification to the map will be discarded. Continue?",
gui::OK_CANCEL);
if (res != 0)
return;
if (! confirm_modification_disposal(gui_, "The modification to the map will be discarded. Continue?")) {
return;
}
throw new_map_exception(map);
}

4
src/editor/editor.hpp
View file

@ -165,6 +165,10 @@ private:
/// Shows dialog to create new map.
std::string new_map_dialog(display& disp);
/// Return true iff the map is not modified or user agreed to
/// dispose the modification.
bool confirm_modification_disposal(display& disp, const std::string message);
display &gui_;
gamemap &map_;
std::vector<gamemap::TERRAIN> terrains_;