X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.cpp;h=297b7f290438f840ef9ae1a642c22d0f0ba467c1;hb=9eeed0ce9066de4b2e36885d5ec7b66ac8f14aa8;hp=c0625223268b7d1a6350cdd1c5b9e50c8e99b2d0;hpb=e83079a07bd7293547be5888af71e11e6957439d;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp index c062522..297b7f2 100644 --- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp +++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -249,7 +250,10 @@ CanvasInterface::add_layer_to(synfig::String name, synfig::Canvas::Handle canvas if (iter2->get_type() != ValueBase::TYPE_BLINEPOINT) break; if (iter2 == list.end()) + { value_node=LinkableValueNode::create("bline",iter->second); + ValueNode_BLine::Handle::cast_dynamic(value_node)->set_member_canvas(canvas); + } } if (!value_node) @@ -473,30 +477,59 @@ CanvasInterface::set_rend_desc(const synfig::RendDesc &rend_desc) get_ui_interface()->error(_("Action Failed.")); } -bool +void CanvasInterface::set_name(const synfig::String &x) { - //! \todo This needs to be converted into an action - get_canvas()->set_name(x); + Action::Handle action(Action::create("canvas_name_set")); + + assert(action); + if(!action) + return; + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",etl::loose_handle(this)); + action->set_param("name",x); + + if(!get_instance()->perform_action(action)) + get_ui_interface()->error(_("Action Failed.")); + signal_id_changed_(); - return true; } -bool +void CanvasInterface::set_description(const synfig::String &x) { - //! \todo This needs to be converted into an action - get_canvas()->set_description(x); - return true; + Action::Handle action(Action::create("canvas_description_set")); + + assert(action); + if(!action) + return; + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",etl::loose_handle(this)); + action->set_param("description",x); + + if(!get_instance()->perform_action(action)) + get_ui_interface()->error(_("Action Failed.")); } -bool +void CanvasInterface::set_id(const synfig::String &x) { - //! \todo This needs to be converted into an action - get_canvas()->set_id(x); + Action::Handle action(Action::create("canvas_id_set")); + + assert(action); + if(!action) + return; + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",etl::loose_handle(this)); + action->set_param("id",x); + + if(!get_instance()->perform_action(action)) + get_ui_interface()->error(_("Action Failed.")); + signal_id_changed_(); - return true; } @@ -527,7 +560,7 @@ CanvasInterface::jump_to_prev_keyframe() } bool -CanvasInterface::import(const synfig::String &filename, bool /*copy*/) +CanvasInterface::import(const synfig::String &filename, bool resize_image) { Action::PassiveGrouper group(get_instance().get(),_("Import Image")); @@ -546,10 +579,10 @@ CanvasInterface::import(const synfig::String &filename, bool /*copy*/) // If this is a SIF file, then we need to do things slightly differently if(ext=="sif" || ext=="sifz")try { - - Canvas::Handle outside_canvas(synfig::open_canvas(filename)); + String errors, warnings; + Canvas::Handle outside_canvas(synfig::open_canvas(filename, errors, warnings)); if(!outside_canvas) - throw String(_("Unable to open this composition")); + throw String(_("Unable to open this composition")) + ":\n\n" + errors; Layer::Handle layer(add_layer_to("PasteCanvas",get_canvas())); if(!layer) @@ -563,7 +596,7 @@ CanvasInterface::import(const synfig::String &filename, bool /*copy*/) } catch(String x) { - get_ui_interface()->error(x+" -- "+filename); + get_ui_interface()->error(filename + ": " + x); return false; } catch(...) @@ -590,22 +623,34 @@ CanvasInterface::import(const synfig::String &filename, bool /*copy*/) h=layer->get_param("_height").get(int()); if(w&&h) { - Vector size=ValueBase(get_canvas()->rend_desc().get_br()-get_canvas()->rend_desc().get_tl()); - Vector x; - if(size[0]rend_desc().get_br()-get_canvas()->rend_desc().get_tl()); + + // vector from top left of canvas to bottom right + if (resize_image) { - x[0]=size[0]; - x[1]=size[0]/w*h; - if((size[0]<0) ^ (size[1]<0)) - x[1]=-x[1]; + if(abs(size[0])set_param("tl",ValueBase(-x/2))) throw int(); if(!layer->set_param("br",ValueBase(x/2))) @@ -749,19 +794,22 @@ CanvasInterface::change_value(synfigapp::ValueDesc value_desc,synfig::ValueBase return true; // If this change needs to take place elsewhere, then so be it. - if(value_desc.get_canvas() && value_desc.get_canvas()->get_root()!=get_canvas()->get_root())do + if(value_desc.get_canvas()) { - etl::handle instance; - instance=find_instance(value_desc.get_canvas()->get_root()); - - if(instance) - return instance->find_canvas_interface(value_desc.get_canvas())->change_value(value_desc,new_value); - else + if (value_desc.get_canvas()->get_root() != get_canvas()->get_root()) { - get_ui_interface()->error(_("The value you are trying to edit is in a composition\nwhich doesn't seem to be open. Open that composition and you\nshould be able to edit this value as normal.")); - return false; + etl::handle instance; + instance=find_instance(value_desc.get_canvas()->get_root()); + + if(instance) + return instance->find_canvas_interface(value_desc.get_canvas())->change_value(value_desc,new_value); + else + { + get_ui_interface()->error(_("The value you are trying to edit is in a composition\nwhich doesn't seem to be open. Open that composition and you\nshould be able to edit this value as normal.")); + return false; + } } - }while(0); + } #ifdef _DEBUG else { synfig::warning("Can't get canvas from value desc...?"); }