From 614aafcf91306f2c9e1b17262dfb96524e7ada53 Mon Sep 17 00:00:00 2001 From: Nikita Kitaev Date: Sat, 5 Dec 2009 11:44:36 -0800 Subject: [PATCH] Fix layer selectability Event code now belongs in null state, not normal. --- synfig-studio/src/gtkmm/state_normal.cpp | 295 ------------------------------- synfig-studio/src/gtkmm/state_null.cpp | 295 +++++++++++++++++++++++++++++++ 2 files changed, 295 insertions(+), 295 deletions(-) diff --git a/synfig-studio/src/gtkmm/state_normal.cpp b/synfig-studio/src/gtkmm/state_normal.cpp index 2810db2..b062a3e 100644 --- a/synfig-studio/src/gtkmm/state_normal.cpp +++ b/synfig-studio/src/gtkmm/state_normal.cpp @@ -138,16 +138,7 @@ public: void set_constrain_flag(bool x) { checkbutton_constrain.set_active(x); refresh_constrain_flag(); } void refresh_constrain_flag() { if(duck_dragger_)duck_dragger_->constrain=get_constrain_flag(); } - Smach::event_result event_stop_handler(const Smach::event& x); - Smach::event_result event_refresh_handler(const Smach::event& x); - Smach::event_result event_refresh_ducks_handler(const Smach::event& x); - Smach::event_result event_undo_handler(const Smach::event& x); - Smach::event_result event_redo_handler(const Smach::event& x); - Smach::event_result event_mouse_button_down_handler(const Smach::event& x); - Smach::event_result event_multiple_ducks_clicked_handler(const Smach::event& x); Smach::event_result event_refresh_tool_options(const Smach::event& x); - Smach::event_result event_layer_click(const Smach::event& x); - void refresh_tool_options(); StateNormal_Context(CanvasView* canvas_view); @@ -172,15 +163,7 @@ public: StateNormal::StateNormal(): Smach::state("normal") { - insert(event_def(EVENT_STOP,&StateNormal_Context::event_stop_handler)); - insert(event_def(EVENT_REFRESH,&StateNormal_Context::event_refresh_handler)); - insert(event_def(EVENT_REFRESH_DUCKS,&StateNormal_Context::event_refresh_ducks_handler)); - insert(event_def(EVENT_UNDO,&StateNormal_Context::event_undo_handler)); - 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)); } StateNormal::~StateNormal() @@ -338,284 +321,6 @@ StateNormal_Context::event_refresh_tool_options(const Smach::event& /*x*/) return Smach::RESULT_ACCEPT; } -Smach::event_result -StateNormal_Context::event_stop_handler(const Smach::event& /*x*/) -{ - // synfig::info("STATE NORMAL: Received Stop Event"); - canvas_view_->stop(); - return Smach::RESULT_ACCEPT; -} - -Smach::event_result -StateNormal_Context::event_refresh_handler(const Smach::event& /*x*/) -{ - // synfig::info("STATE NORMAL: Received Refresh Event"); - canvas_view_->rebuild_tables(); - canvas_view_->work_area->queue_render_preview(); - return Smach::RESULT_ACCEPT; -} - -Smach::event_result -StateNormal_Context::event_refresh_ducks_handler(const Smach::event& /*x*/) -{ - // synfig::info("STATE NORMAL: Received Refresh Ducks"); - canvas_view_->queue_rebuild_ducks(); - return Smach::RESULT_ACCEPT; -} - -Smach::event_result -StateNormal_Context::event_undo_handler(const Smach::event& /*x*/) -{ - // synfig::info("STATE NORMAL: Received Undo Event"); - canvas_view_->get_instance()->undo(); - return Smach::RESULT_ACCEPT; -} - -Smach::event_result -StateNormal_Context::event_redo_handler(const Smach::event& /*x*/) -{ - // synfig::info("STATE NORMAL: Received Redo Event"); - canvas_view_->get_instance()->redo(); - return Smach::RESULT_ACCEPT; -} - -Smach::event_result -StateNormal_Context::event_mouse_button_down_handler(const Smach::event& x) -{ - // synfig::info("STATE NORMAL: Received mouse button down Event"); - - const EventMouse& event(*reinterpret_cast(&x)); - - switch(event.button) - { - case BUTTON_RIGHT: - canvas_view_->popup_main_menu(); - return Smach::RESULT_ACCEPT; - default: - return Smach::RESULT_OK; - } -} - -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()); - } - else - { - // synfig::info("STATE NORMAL: Received layer click Event with an empty layer."); - } - - switch(event.button) - { - case BUTTON_LEFT: - if(!(event.modifier&Gdk::CONTROL_MASK)) - canvas_view_->get_selection_manager()->clear_selected_layers(); - if(event.layer) - { - std::list layer_list(canvas_view_->get_selection_manager()->get_selected_layers()); - std::set layers(layer_list.begin(),layer_list.end()); - if(layers.count(event.layer)) - { - layers.erase(event.layer); - layer_list=std::list(layers.begin(),layers.end()); - canvas_view_->get_selection_manager()->clear_selected_layers(); - canvas_view_->get_selection_manager()->set_selected_layers(layer_list); - } - else - { - canvas_view_->get_selection_manager()->set_selected_layer(event.layer); - } - } - return Smach::RESULT_ACCEPT; - case BUTTON_RIGHT: - canvas_view_->popup_layer_menu(event.layer); - return Smach::RESULT_ACCEPT; - default: - return Smach::RESULT_OK; - } -} - -/* -void -StateNormal_Context::edit_several_waypoints(std::list value_desc_list) -{ - Gtk::Dialog dialog( - "Edit Multiple Waypoints", // Title - true, // Modal - true // use_separator - ); - - Widget_WaypointModel widget_waypoint_model; - 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(); - - if(dialog.run()==0) - return; - synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Set Waypoints")); - - std::list::iterator iter; - 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. - if(!value_desc.is_value_node() || ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node())) - { - ValueBase value; - if(value_desc.is_value_node()) - 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("ValueDescConnect"); - action->set_param("dest",value_desc); - action->set_param("src",ValueNode::Handle(value_node)); - } - else - { - action=synfigapp::Action::create("ValueNodeReplace"); - 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")); - group.cancel(); - return; - } - } - else - { - 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("WaypointSetSmart")); - - if(!action) - { - get_canvas_view()->get_ui_interface()->error(_("Unable to find WaypointSetSmart action")); - 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("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")); - group.cancel(); - return; - } - } - else - { - //get_canvas_view()->get_ui_interface()->error(_("Unable to animate a specific valuedesc")); - //group.cancel(); - //return; - } - - } -} -*/ - -Smach::event_result -StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& /*x*/) -{ - // synfig::info("STATE NORMAL: Received multiple duck click event"); - - //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( - synfigapp::ValueDesc( - ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()) - ,ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()) - ->get_link_index_from_name("point") - ) - ); - } - else - value_desc_list.push_back(value_desc); - } - - Gtk::Menu *menu=manage(new Gtk::Menu()); - menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), 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); - - canvas_view_->add_actions_to_menu(menu, param_list,synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE); - - menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Edit Waypoints"), - sigc::bind( - sigc::mem_fun( - *this, - &studio::StateNormal_Context::edit_several_waypoints - ), - value_desc_list - ) - )); - */ - menu->popup(3,gtk_get_current_event_time()); - - return Smach::RESULT_ACCEPT; -} - DuckDrag_Combo::DuckDrag_Combo(): scale(false), rotate(false), diff --git a/synfig-studio/src/gtkmm/state_null.cpp b/synfig-studio/src/gtkmm/state_null.cpp index 98ad87e..035a5d3 100644 --- a/synfig-studio/src/gtkmm/state_null.cpp +++ b/synfig-studio/src/gtkmm/state_null.cpp @@ -76,7 +76,15 @@ public: StateNull_Context(CanvasView *canvas_view); ~StateNull_Context(); + Smach::event_result event_stop_handler(const Smach::event& x); + Smach::event_result event_refresh_handler(const Smach::event& x); + Smach::event_result event_refresh_ducks_handler(const Smach::event& x); + Smach::event_result event_undo_handler(const Smach::event& x); + Smach::event_result event_redo_handler(const Smach::event& x); + Smach::event_result event_mouse_button_down_handler(const Smach::event& x); + Smach::event_result event_multiple_ducks_clicked_handler(const Smach::event& x); Smach::event_result event_refresh_tool_options(const Smach::event& x); + Smach::event_result event_layer_click(const Smach::event& x); void refresh_tool_options(); }; // END of class StateNull_Context @@ -88,7 +96,15 @@ public: StateNull::StateNull(): Smach::state("null") { + insert(event_def(EVENT_STOP,&StateNull_Context::event_stop_handler)); + insert(event_def(EVENT_REFRESH,&StateNull_Context::event_refresh_handler)); + insert(event_def(EVENT_REFRESH_DUCKS,&StateNull_Context::event_refresh_ducks_handler)); + insert(event_def(EVENT_UNDO,&StateNull_Context::event_undo_handler)); + insert(event_def(EVENT_REDO,&StateNull_Context::event_redo_handler)); + insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DOWN,&StateNull_Context::event_mouse_button_down_handler)); + insert(event_def(EVENT_WORKAREA_MULTIPLE_DUCKS_CLICKED,&StateNull_Context::event_multiple_ducks_clicked_handler)); insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateNull_Context::event_refresh_tool_options)); + insert(event_def(EVENT_WORKAREA_LAYER_CLICKED,&StateNull_Context::event_layer_click)); } StateNull::~StateNull() @@ -127,3 +143,282 @@ StateNull_Context::event_refresh_tool_options(const Smach::event& /*x*/) refresh_tool_options(); return Smach::RESULT_ACCEPT; } + +Smach::event_result +StateNull_Context::event_stop_handler(const Smach::event& /*x*/) +{ + // synfig::info("STATE NULL: Received Stop Event"); + canvas_view->stop(); + return Smach::RESULT_ACCEPT; +} + +Smach::event_result +StateNull_Context::event_refresh_handler(const Smach::event& /*x*/) +{ + // synfig::info("STATE NULL: Received Refresh Event"); + canvas_view->rebuild_tables(); + canvas_view->work_area->queue_render_preview(); + return Smach::RESULT_ACCEPT; +} + +Smach::event_result +StateNull_Context::event_refresh_ducks_handler(const Smach::event& /*x*/) +{ + // synfig::info("STATE NULL: Received Refresh Ducks"); + canvas_view->queue_rebuild_ducks(); + return Smach::RESULT_ACCEPT; +} + +Smach::event_result +StateNull_Context::event_undo_handler(const Smach::event& /*x*/) +{ + // synfig::info("STATE NULL: Received Undo Event"); + canvas_view->get_instance()->undo(); + return Smach::RESULT_ACCEPT; +} + +Smach::event_result +StateNull_Context::event_redo_handler(const Smach::event& /*x*/) +{ + // synfig::info("STATE NULL: Received Redo Event"); + canvas_view->get_instance()->redo(); + return Smach::RESULT_ACCEPT; +} + +Smach::event_result +StateNull_Context::event_mouse_button_down_handler(const Smach::event& x) +{ + // synfig::info("STATE NULL: Received mouse button down Event"); + + const EventMouse& event(*reinterpret_cast(&x)); + + switch(event.button) + { + case BUTTON_RIGHT: + canvas_view->popup_main_menu(); + return Smach::RESULT_ACCEPT; + default: + return Smach::RESULT_OK; + } +} + +Smach::event_result +StateNull_Context::event_layer_click(const Smach::event& x) +{ + const EventLayerClick& event(*reinterpret_cast(&x)); + + if(event.layer) + { + // synfig::info("STATE NULL: Received layer click Event, \"%s\"",event.layer->get_name().c_str()); + } + else + { + // synfig::info("STATE NULL: Received layer click Event with an empty layer."); + } + + switch(event.button) + { + case BUTTON_LEFT: + if(!(event.modifier&Gdk::CONTROL_MASK)) + canvas_view->get_selection_manager()->clear_selected_layers(); + if(event.layer) + { + std::list layer_list(canvas_view->get_selection_manager()->get_selected_layers()); + std::set layers(layer_list.begin(),layer_list.end()); + if(layers.count(event.layer)) + { + layers.erase(event.layer); + layer_list=std::list(layers.begin(),layers.end()); + canvas_view->get_selection_manager()->clear_selected_layers(); + canvas_view->get_selection_manager()->set_selected_layers(layer_list); + } + else + { + canvas_view->get_selection_manager()->set_selected_layer(event.layer); + } + } + return Smach::RESULT_ACCEPT; + case BUTTON_RIGHT: + canvas_view->popup_layer_menu(event.layer); + return Smach::RESULT_ACCEPT; + default: + return Smach::RESULT_OK; + } +} + +/* +void +StateNull_Context::edit_several_waypoints(std::list value_desc_list) +{ + Gtk::Dialog dialog( + "Edit Multiple Waypoints", // Title + true, // Modal + true // use_separator + ); + + Widget_WaypointModel widget_waypoint_model; + 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(); + + if(dialog.run()==0) + return; + synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Set Waypoints")); + + std::list::iterator iter; + 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. + if(!value_desc.is_value_node() || ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node())) + { + ValueBase value; + if(value_desc.is_value_node()) + 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("ValueDescConnect"); + action->set_param("dest",value_desc); + action->set_param("src",ValueNode::Handle(value_node)); + } + else + { + action=synfigapp::Action::create("ValueNodeReplace"); + 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")); + group.cancel(); + return; + } + } + else + { + 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("WaypointSetSmart")); + + if(!action) + { + get_canvas_view()->get_ui_interface()->error(_("Unable to find WaypointSetSmart action")); + 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("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")); + group.cancel(); + return; + } + } + else + { + //get_canvas_view()->get_ui_interface()->error(_("Unable to animate a specific valuedesc")); + //group.cancel(); + //return; + } + + } +} +*/ + +Smach::event_result +StateNull_Context::event_multiple_ducks_clicked_handler(const Smach::event& /*x*/) +{ + // synfig::info("STATE NULL: Received multiple duck click event"); + + //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( + synfigapp::ValueDesc( + ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()) + ,ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()) + ->get_link_index_from_name("point") + ) + ); + } + else + value_desc_list.push_back(value_desc); + } + + Gtk::Menu *menu=manage(new Gtk::Menu()); + menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), 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); + + canvas_view->add_actions_to_menu(menu, param_list,synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE); + + menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Edit Waypoints"), + sigc::bind( + sigc::mem_fun( + *this, + &studio::StateNull_Context::edit_several_waypoints + ), + value_desc_list + ) + )); + */ + menu->popup(3,gtk_get_current_event_time()); + + return Smach::RESULT_ACCEPT; +} + -- 2.7.4