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

editor2: new map, save map, save map as, confirm lost map changes...

Browse source 
...and minor tweaks
This commit is contained in:
Tomasz Śniatowski 2008-07-19 22:09:55 +01:00
parent c048b0595b
commit 9048879d26
5 changed files with 157 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
data/gui/default/window/editor_new_map.cfg
View file

@ -12,100 +12,120 @@
automatic_placement = "true"
vertical_placement = "center"
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
[text_box]
id = "width"
definition = "default"
label = _ "Width"
[/text_box]
[/column]
[/row]
[label]
definition = "title"
label = _ "New Map"
[/label]
[/column]
[/row]
[row]
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
[text_box]
id = "height"
definition = "default"
label = _ "Height"
[/text_box]
[/column]
horizontal_grow = "true"
[grid]
[row]
grow_factor = 1
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "default"
label = _ "Width:"
[/label]
[/column]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
[text_box]
id = "width"
definition = "default"
label = _ "Width"
[/text_box]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
grow_factor = 0
[column]
grow_factor = 1
horizontal_grow = "true"
[grid]
[row]
grow_factor = 1
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "default"
label = _ "Height:"
[/label]
[/column]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
[text_box]
id = "height"
definition = "default"
label = _ "Height"
[/text_box]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
grow_factor = 0
[column]
grow_factor = 1
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[button]
id = "ok"
definition = "default"
size_text = _ "Create new map"
label = _ "Create new map"
[/button]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[button]
id = "cancel"
definition = "default"
label = _ "Cancel"
[/button]
[/column]
[/row]
[/grid]
[/column]
[/row]
[/grid]
[/resolution]
[/window]

85
src/editor2/editor_controller.cpp
View file

@ -112,10 +112,20 @@ void editor_controller::quit_confirm(EXIT_STATUS mode)
}
}
bool editor_controller::confirm_discard()
{
if (actions_since_save_ != 0) {
return !gui::dialog(gui(), _("There are unsaved changes in the map"),
_("Do you want to discard all changes you made te the map?"), gui::YES_NO).show();
} else {
return true;
}
}
void editor_controller::load_map_dialog()
{
std::string filename_;
std::string fn = filename_.empty() ? get_dir(get_dir(get_user_data_dir() + "/editor") + "/maps") : filename_;
if (!confirm_discard()) return;
std::string fn = map_.get_filename().empty() ? get_dir(get_dir(get_user_data_dir() + "/editor") + "/maps") : filename_;
int res = dialogs::show_file_chooser_dialog(gui(), fn, _("Choose a Map to Load"));
if (res == 0) {
load_map(fn);
@ -124,9 +134,10 @@ void editor_controller::load_map_dialog()
void editor_controller::new_map_dialog()
{
if (!confirm_discard()) return;
gui2::teditor_new_map dialog;;
dialog.set_map_width(map_.w());
dialog.set_map_height(map_.h());
dialog.set_map_width(map_.total_width());
dialog.set_map_height(map_.total_height());
dialog.show(gui().video());
int res = dialog.get_retval();
@ -140,25 +151,68 @@ void editor_controller::new_map_dialog()
void editor_controller::save_map_as_dialog()
{
const std::string default_dir = get_dir(get_dir(get_user_data_dir() + "/editor") + "/maps");
std::string input_name = map_.get_filename().empty() ? default_dir : map_.get_filename();
const std::string old_input_name = input_name;
int res = 0;
int overwrite_res = 1;
do {
input_name = old_input_name;
res = dialogs::show_file_chooser_dialog(gui(), input_name, _("Save the Map As"));
if (res == 0) {
if (file_exists(input_name)) {
overwrite_res = gui::dialog(gui(), "",
_("The map already exists. Do you want to overwrite it?"),
gui::YES_NO).show();
} else {
overwrite_res = 0;
}
} else {
return; //cancel pressed
}
} while (overwrite_res != 0);
save_map_as(input_name);
}
void editor_controller::save_map()
bool editor_controller::save_map_as(const std::string& filename)
{
std::string old_filename = map_.get_filename();
map_.set_filename(filename);
if (!save_map(true)) {
map_.set_filename(old_filename);
return false;
} else {
return true;
}
}
void editor_controller::save_map_as(const std::string& filename)
bool editor_controller::save_map(bool display_confirmation)
{
std::string data = map_.write();
try {
write_file(map_.get_filename(), data);
actions_since_save_ = 0;
if (display_confirmation) {
gui::message_dialog(gui(), "", _("Map saved.")).show();
}
} catch (io_exception& e) {
utils::string_map symbols;
symbols["msg"] = e.what();
const std::string msg = vgettext("Could not save the map: $msg", symbols);
gui::message_dialog(gui(), "", msg).show();
return false;
}
return true;
}
void editor_controller::load_map(const std::string& filename)
{
std::string map_string = read_file(filename);
try {
editor_map new_map(game_config_, map_string);
new_map.set_filename(filename);
set_map(new_map);
//TODO when this fails see if it's a scenario with a mapdata= key and give
//the user an option of loading that map instead of just failing
@ -186,6 +240,7 @@ void editor_controller::set_map(const editor_map& map)
clear_stack(undo_stack_);
clear_stack(redo_stack_);
actions_since_save_ = 0;
gui().reload_map();
refresh_all();
}
@ -276,6 +331,8 @@ bool editor_controller::execute_command(hotkey::HOTKEY_COMMAND command, int inde
return true;
case HOTKEY_EDITOR_TOOL_PAINT:
case HOTKEY_EDITOR_TOOL_FILL:
// case HOTKEY_EDITOR_TOOL_SELECT:
// case HOTKEY_EDITOR_TOOL_STARTING_POSITION:
hotkey_set_mouse_action(command);
return true;
case HOTKEY_EDITOR_BRUSH_NEXT:
@ -287,6 +344,16 @@ bool editor_controller::execute_command(hotkey::HOTKEY_COMMAND command, int inde
case HOTKEY_EDITOR_MAP_NEW:
new_map_dialog();
return true;
case HOTKEY_EDITOR_MAP_SAVE:
if (map_.get_filename().empty()) {
save_map_as_dialog();
} else {
save_map();
}
return true;
case HOTKEY_EDITOR_MAP_SAVE_AS:
save_map_as_dialog();
return true;
default:
return controller_base::execute_command(command, index);
}

5
src/editor2/editor_controller.hpp
View file

@ -45,11 +45,12 @@ class editor_controller : public controller_base,
EXIT_STATUS main_loop();
void hotkey_quit();
void quit_confirm(EXIT_STATUS status);
bool confirm_discard();
void load_map_dialog();
void new_map_dialog();
void save_map_as_dialog();
void save_map();
void save_map_as(const std::string& filename);
bool save_map(bool display_confirmation = false);
bool save_map_as(const std::string& filename);
void new_map(int width, int height, t_translation::t_terrain fill);
void load_map(const std::string& filename);
void set_map(const editor_map& map);

2
src/editor2/editor_map.cpp
View file

@ -22,7 +22,7 @@
namespace editor2 {
editor_map::editor_map(const config& terrain_cfg, const std::string& data)
: gamemap(terrain_cfg, data)
: gamemap(terrain_cfg, data), filename_()
{
}

9
src/editor2/editor_map.hpp
View file

@ -73,11 +73,20 @@ public:
*/
void select_all();
const std::string& get_filename() const { return filename_; }
void set_filename(const std::string& fn) { filename_ = fn; }
protected:
/**
* The selected hexes
*/
std::set<gamemap::location> selection_;
/**
* The actual filename of this map. An empty string indicates a new map.
*/
std::string filename_;
};