X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=9a247cb6bca121390d688f2c661920e80a96566c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=2d4ecdb918f2a185c136cb14b9f869e5f615efb7;hpb=9fc17cc46bd63a7508b82c967801a09be882fe57;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 2d4ecdb..9a247cb 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -7,6 +7,7 @@ ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** Copyright (c) 2007, 2008 Chris Moore +** Copyright (c) 2008 Carlos López ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -53,6 +54,7 @@ #include "widget_waypointmodel.h" #include #include "iconcontroller.h" +#include "workarea.h" #include #include #include @@ -199,7 +201,7 @@ studio::Instance::save_as(const synfig::String &file_name) 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); + App::add_recent_file(etl::handle(this)); return true; } return false; @@ -214,10 +216,8 @@ studio::Instance::open() Instance::Status studio::Instance::save() { - // 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 we don't have a real filename yet then we need to ask where to save it + if (!has_real_filename()) { if (dialog_save_as()) return STATUS_OK; @@ -226,12 +226,24 @@ studio::Instance::save() } if (synfigapp::Instance::save()) + { + App::add_recent_file(etl::handle(this)); return STATUS_OK; - - App::dialog_error_blocking("Save - Error","Unable to save to '" + get_file_name() + "'"); + } + string msg(strprintf(_("Unable to save to '%s'"), get_file_name().c_str())); + App::dialog_error_blocking(_("Save - Error"), msg.c_str()); return STATUS_ERROR; } +// 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 don't have a real filename yet +bool +studio::Instance::has_real_filename() +{ + return get_file_name().find(App::custom_filename_prefix.c_str()) != 0; +} + bool studio::Instance::dialog_save_as() { @@ -249,12 +261,11 @@ studio::Instance::dialog_save_as() Layer::Handle parent_layer(dynamic_cast(node)); if(parent_layer && parent_layer->get_canvas()->get_root()!=get_canvas()) { - App::dialog_error_blocking("SaveAs - Error", - "There is currently a bug when using \"SaveAs\"\n" + string msg(strprintf(_("There is currently a bug when using \"SaveAs\"\n" "on a composition that is being referenced by other\n" "files that are currently open. Close these\n" - "other files first before trying to use \"SaveAs\"." - ); + "other files first before trying to use \"SaveAs\"."))); + App::dialog_error_blocking(_("SaveAs - Error"), msg.c_str()); return false; } @@ -264,7 +275,7 @@ studio::Instance::dialog_save_as() } } - if (get_file_name().find(DEFAULT_FILENAME_PREFIX) != 0) + if (has_real_filename()) filename = absolute_path(filename); // show the canvas' name if it has one, else its ID @@ -304,17 +315,16 @@ studio::Instance::dialog_save_as() if (stat_return == -1 && errno != ENOENT) { perror(filename.c_str()); - App::dialog_error_blocking("SaveAs - Error","Unable to check whether '" + filename + "' exists."); + string msg(strprintf(_("Unable to check whether '%s' exists."), filename.c_str())); + App::dialog_error_blocking(_("SaveAs - Error"),msg.c_str()); continue; } // if the file exists and the user doesn't want to overwrite it, keep prompting for a filename + string msg(strprintf(_("A file named '%s' already exists.\n\n" + "Do you want to replace it with the file you are saving?"), filename.c_str())); 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?")) + !App::dialog_yes_no(_("File exists"),msg.c_str())) continue; } @@ -323,8 +333,8 @@ studio::Instance::dialog_save_as() synfig::set_file_version(ReleaseVersion(RELEASE_VERSION_END-1)); return true; } - - App::dialog_error_blocking("SaveAs - Error","Unable to save to '" + filename + "'"); + string msg(strprintf(_("Unable to save to '%s'"), filename.c_str())); + App::dialog_error_blocking(_("SaveAs - Error"),msg.c_str()); } return false; @@ -936,6 +946,9 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis void Instance::process_action(synfig::String name, synfigapp::Action::ParamList param_list) { + //// debug actions + // synfig::info("%s:%d process_action: '%s'", __FILE__, __LINE__, name.c_str()); + assert(synfigapp::Action::book().count(name)); synfigapp::Action::BookEntry entry(synfigapp::Action::book().find(name)->second); @@ -969,7 +982,7 @@ Instance::process_action(synfig::String name, synfigapp::Action::ParamList param case synfigapp::Action::Param::TYPE_STRING: { String str; - if(!studio::App::dialog_entry(entry.local_name, iter->get_local_name()+":"+iter->get_desc(),str)) + if(!studio::App::dialog_entry(entry.local_name, iter->get_local_name()+": "+iter->get_desc(),str)) return; action->set_param(iter->get_name(),str); break; @@ -992,7 +1005,7 @@ Instance::process_action(synfig::String name, synfigapp::Action::ParamList param } void -Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfigapp::ValueDesc value_desc, float location) +Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfigapp::ValueDesc value_desc, float location, bool bezier) { Gtk::Menu& parammenu(*menu); @@ -1005,6 +1018,7 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga param_list=canvas_interface->generate_param_list(value_desc); param_list.add("origin",location); +#ifdef BLINEPOINT_MENU_IS_VERTEX_MENU if(value_desc.get_value_type()==ValueBase::TYPE_BLINEPOINT && value_desc.is_value_node() && ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node())) { param_list2=canvas_interface->generate_param_list( @@ -1015,6 +1029,7 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga ); param_list2.add("origin",location); } +#endif // BLINEPOINT_MENU_IS_VERTEX_MENU // Populate the convert menu by looping through // the ValueNode book and find the ones that are @@ -1055,10 +1070,24 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga parammenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::CONVERT,*convert_menu)); } + synfigapp::Action::Category categories = synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE; + if (bezier) + { + categories = categories|synfigapp::Action::CATEGORY_BEZIER; + + const DuckList selected_ducks(find_canvas_view(canvas)->get_work_area()->get_selected_ducks()); + for(DuckList::const_iterator iter=selected_ducks.begin();iter!=selected_ducks.end();++iter) + { + synfigapp::ValueDesc value_desc((*iter)->get_value_desc()); + if(value_desc.is_valid()) + param_list.add("selected_value_desc",value_desc); + } + } + if(param_list2.empty()) - add_actions_to_menu(¶mmenu, param_list,synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE); + add_actions_to_menu(¶mmenu, param_list,categories); else - add_actions_to_menu(¶mmenu, param_list2,param_list,synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE); + add_actions_to_menu(¶mmenu, param_list2,param_list,categories); if(value_desc.get_value_type()==ValueBase::TYPE_BLINEPOINT && value_desc.is_value_node() && ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node())) { @@ -1147,13 +1176,13 @@ edit_several_waypoints(etl::handle canvas_view, std::listset_param("dest",value_desc); action->set_param("src",ValueNode::Handle(value_node)); } else { - action=synfigapp::Action::create("value_node_replace"); + action=synfigapp::Action::create("ValueNodeReplace"); action->set_param("dest",value_desc.get_value_node()); action->set_param("src",ValueNode::Handle(value_node)); } @@ -1176,11 +1205,11 @@ edit_several_waypoints(etl::handle canvas_view, std::listget_ui_interface()->error(_("Unable to find waypoint_set_smart action")); + canvas_view->get_ui_interface()->error(_("Unable to find WaypointSetSmart action")); group.cancel(); return; }