X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_normal.cpp;h=baacc72e4e8509646f019f5e13c574f59f3bb084;hb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;hp=0072e55f95e28d757234f8042efe272d958c1ade;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_normal.cpp b/synfig-studio/trunk/src/gtkmm/state_normal.cpp index 0072e55..baacc72 100644 --- a/synfig-studio/trunk/src/gtkmm/state_normal.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_normal.cpp @@ -57,16 +57,16 @@ using namespace studio; class studio::StateNormal_Context : public sigc::trackable { CanvasView *canvas_view; - + CanvasView* get_canvas_view() { return canvas_view; } Canvas::Handle get_canvas() { return canvas_view->get_canvas(); } WorkArea* get_work_area() { return canvas_view->get_work_area(); } etl::handle get_canvas_interface() { return canvas_view->canvas_interface(); } - + public: StateNormal_Context(CanvasView *canvas_view); ~StateNormal_Context(); - + Smach::event_result event_stop_handler(const Smach::event& x); Smach::event_result event_refresh_handler(const Smach::event& x); @@ -108,9 +108,9 @@ StateNormal::StateNormal(): insert(event_def(EVENT_REDO,&StateNormal_Context::event_redo_handler)); insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DOWN,&StateNormal_Context::event_mouse_button_down_handler)); insert(event_def(EVENT_WORKAREA_MULTIPLE_DUCKS_CLICKED,&StateNormal_Context::event_multiple_ducks_clicked_handler)); - insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateNormal_Context::event_refresh_tool_options)); - insert(event_def(EVENT_WORKAREA_LAYER_CLICKED,&StateNormal_Context::event_layer_click)); -} + insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateNormal_Context::event_refresh_tool_options)); + insert(event_def(EVENT_WORKAREA_LAYER_CLICKED,&StateNormal_Context::event_layer_click)); +} StateNormal::~StateNormal() { @@ -203,7 +203,7 @@ Smach::event_result StateNormal_Context::event_layer_click(const Smach::event& x) { const EventLayerClick& event(*reinterpret_cast(&x)); - + if(event.layer) { synfig::info("STATE NORMAL: Received layer click Event, \"%s\"",event.layer->get_name().c_str()); @@ -212,7 +212,7 @@ StateNormal_Context::event_layer_click(const Smach::event& x) { synfig::info("STATE NORMAL: Received layer click Event with an empty layer."); } - + switch(event.button) { case BUTTON_LEFT: @@ -257,12 +257,12 @@ StateNormal_Context::edit_several_waypoints(std::list valu widget_waypoint_model.show(); dialog.get_vbox()->pack_start(widget_waypoint_model); - - + + dialog.add_button(Gtk::StockID("gtk-apply"),1); dialog.add_button(Gtk::StockID("gtk-cancel"),0); dialog.show(); - + DEBUGPOINT(); if(dialog.run()==0) return; @@ -273,12 +273,12 @@ StateNormal_Context::edit_several_waypoints(std::list valu for(iter=value_desc_list.begin();iter!=value_desc_list.end();++iter) { synfigapp::ValueDesc value_desc(*iter); - + if(!value_desc.is_valid()) continue; ValueNode_Animated::Handle value_node; - + // If this value isn't a ValueNode_Animated, but // it is somewhat constant, then go ahead and convert // it to a ValueNode_Animated. @@ -289,11 +289,11 @@ StateNormal_Context::edit_several_waypoints(std::list valu value=ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node())->get_value(); else value=value_desc.get_value(); - + value_node=ValueNode_Animated::create(value,get_canvas()->get_time()); - + synfigapp::Action::Handle action; - + if(!value_desc.is_value_node()) { action=synfigapp::Action::create("value_desc_connect"); @@ -306,11 +306,11 @@ StateNormal_Context::edit_several_waypoints(std::list valu action->set_param("dest",value_desc.get_value_node()); action->set_param("src",ValueNode::Handle(value_node)); } - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); - - + + if(!get_canvas_interface()->get_instance()->perform_action(action)) { get_canvas_view()->get_ui_interface()->error(_("Unable to convert to animated waypoint")); @@ -323,11 +323,11 @@ StateNormal_Context::edit_several_waypoints(std::list valu if(value_desc.is_value_node()) value_node=ValueNode_Animated::Handle::cast_dynamic(value_desc.get_value_node()); } - - + + if(value_node) { - + synfigapp::Action::Handle action(synfigapp::Action::create("waypoint_set_smart")); if(!action) @@ -336,14 +336,14 @@ StateNormal_Context::edit_several_waypoints(std::list valu group.cancel(); return; } - - action->set_param("canvas",get_canvas()); - action->set_param("canvas_interface",get_canvas_interface()); - action->set_param("value_node",ValueNode::Handle(value_node)); - action->set_param("time",get_canvas()->get_time()); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("value_node",ValueNode::Handle(value_node)); + action->set_param("time",get_canvas()->get_time()); action->set_param("model",widget_waypoint_model.get_waypoint_model()); - + if(!get_canvas_interface()->get_instance()->perform_action(action)) { get_canvas_view()->get_ui_interface()->error(_("Unable to set a specific waypoint")); @@ -357,7 +357,7 @@ StateNormal_Context::edit_several_waypoints(std::list valu //group.cancel(); //return; } - + } } */ @@ -370,17 +370,17 @@ StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& x) //const EventMouse& event(*reinterpret_cast(&x)); std::list value_desc_list; - + // Create a list of value_descs associated with selection const DuckList selected_ducks(get_work_area()->get_selected_ducks()); DuckList::const_iterator iter; for(iter=selected_ducks.begin();iter!=selected_ducks.end();++iter) { synfigapp::ValueDesc value_desc((*iter)->get_value_desc()); - + if(!value_desc.is_valid()) continue; - + if(value_desc.get_value_type()==ValueBase::TYPE_BLINEPOINT && value_desc.is_value_node() && ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node())) { value_desc_list.push_back( @@ -395,9 +395,9 @@ StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& x) } Gtk::Menu *menu=manage(new Gtk::Menu()); - + canvas_view->get_instance()->make_param_menu(menu,canvas_view->get_canvas(),value_desc_list); - + /* synfigapp::Action::ParamList param_list; param_list=get_canvas_interface()->generate_param_list(value_desc_list);