X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=0c0f7ac28d1df8fde5b7898fce99f8b0fadcb001;hb=d07cf2aeaf95ac90d7eca16ab39a4c4bda9743e6;hp=378c7c20b9a9986abbaea10ceaeddc76fb2216b6;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 378c7c2..0c0f7ac 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -50,6 +50,8 @@ #include "widget_waypointmodel.h" #include #include "iconcontroler.h" +#include +#include #endif @@ -183,45 +185,43 @@ Instance::set_redo_status(bool x) } bool -studio::Instance::save_as(const synfig::String &file_name)const -{ - if(synfigapp::Instance::save_as(file_name)) - { - App::add_recent_file(file_name); - return true; - } - return false; -} - -bool studio::Instance::save_as(const synfig::String &file_name) { if(synfigapp::Instance::save_as(file_name)) { + // after changing the filename, update the render settings with the new filename + list >::iterator iter; + for(iter=canvas_view_list().begin();iter!=canvas_view_list().end();iter++) + (*iter)->render_settings.set_entry_filename(); App::add_recent_file(file_name); return true; } return false; } -bool +Instance::Status studio::Instance::save() { - if(basename(get_file_name()).find("untitled")==0) - { - dialog_save_as(); - return true; - } + // the filename will be set to "Synfig Animation 1" or some such when first created + // and will be changed to an absolute path once it has been saved + // so if it still begins with "Synfig Animation " then we need to ask where to save it + if(get_file_name().find(DEFAULT_FILENAME_PREFIX)==0) + if (dialog_save_as()) + return STATUS_OK; + else + return STATUS_CANCEL; - return synfigapp::Instance::save(); + if (synfigapp::Instance::save()) + return STATUS_OK; + App::dialog_error_blocking("Save - Error","Unable to save to '" + get_file_name() + "'"); + return STATUS_ERROR; } -void +bool studio::Instance::dialog_save_as() { - string filename="*.sif"; - + string filename=basename(get_file_name()); Canvas::Handle canvas(get_canvas()); { @@ -242,7 +242,7 @@ studio::Instance::dialog_save_as() "other files first before trying to use \"SaveAs\"." ); - return; + return false; } if(parent_layer) break; @@ -250,15 +250,22 @@ studio::Instance::dialog_save_as() } } - while(App::dialog_saveas_file("SaveAs", filename)) + // show the canvas' name if it has one, else its ID + while(App::dialog_save_file(_("Choose a Filename to Save As") + + String(" (") + + (canvas->get_name().empty() + ? canvas->get_id() + : canvas->get_name()) + + ") ...", filename)) { // If the filename still has wildcards, then we should // continue looking for the file we want if(find(filename.begin(),filename.end(),'*')!=filename.end()) continue; - if(find(filename.begin(),filename.end(),'.')==filename.end()) - filename+=".sif"; + std::string base = basename(filename); + if(find(base.begin(),base.end(),'.')==base.end()) + filename+=".sifz"; try { @@ -274,11 +281,36 @@ studio::Instance::dialog_save_as() continue; } + { + struct stat s; + int stat_return = stat(filename.c_str(), &s); + + // if stat() fails with something other than 'file doesn't exist', there's been a real + // error of some kind. let's give up now and ask for a new path. + if (stat_return == -1 && errno != ENOENT) + { + perror(filename.c_str()); + App::dialog_error_blocking("SaveAs - Error","Unable to check whether '" + filename + "' exists."); + continue; + } + + // if the file exists and the user doesn't want to overwrite it, keep prompting for a filename + if ((stat_return == 0) && + !App::dialog_yes_no("File exists", + "A file named '" + + filename + + "' already exists.\n\n" + "Do you want to replace it with the file you are saving?")) + continue; + } + if(save_as(filename)) - break; + return true; - App::dialog_error_blocking("SaveAs - Error","Unable to save file"); + App::dialog_error_blocking("SaveAs - Error","Unable to save to '" + filename + "'"); } + + return false; } void @@ -602,7 +634,7 @@ bool Instance::safe_revert() { if(synfigapp::Instance::get_action_count()) - if(!App::dialog_yes_no(_("Revert to saved"), _("You will loose any changes you have made since your last save.\nAre you sure?"))) + if(!App::dialog_yes_no(_("Revert to saved"), _("You will lose any changes you have made since your last save.\nAre you sure?"))) return false; revert(); return true; @@ -611,18 +643,33 @@ Instance::safe_revert() bool Instance::safe_close() { - handle uim; - uim=find_canvas_view(get_canvas())->get_ui_interface(); + handle canvas_view = find_canvas_view(get_canvas()); + handle uim=canvas_view->get_ui_interface(); - if(get_action_count()) + // if the animation is currently playing, closing the window will cause a crash, + // so don't allow it + if (canvas_view->is_playing()) { - string str=strprintf(_("Would you like to save your changes to %s?"),basename(get_file_name()).c_str() ); - int answer=uim->yes_no_cancel(get_canvas()->get_name(),str,synfigapp::UIInterface::RESPONSE_YES); - if(answer==synfigapp::UIInterface::RESPONSE_YES) - save(); - if(answer==synfigapp::UIInterface::RESPONSE_CANCEL) - return false; + canvas_view->present(); + App::dialog_error_blocking("Close Error", "The animation is currently playing so the window cannot be closed."); + return false; } + if(get_action_count()) + do + { + string str=strprintf(_("Would you like to save your changes to %s?"),basename(get_file_name()).c_str() ); + int answer=uim->yes_no_cancel(get_canvas()->get_name(),str,synfigapp::UIInterface::RESPONSE_YES); + if(answer==synfigapp::UIInterface::RESPONSE_YES) + { + enum Status status = save(); + if (status == STATUS_OK) break; + else if (status == STATUS_CANCEL) return false; + } + if(answer==synfigapp::UIInterface::RESPONSE_NO) + break; + if(answer==synfigapp::UIInterface::RESPONSE_CANCEL) + return false; + } while (true); if(is_modified()) {