From 6989d1403b14b5b27dbf81b2c1cf6889511adf97 Mon Sep 17 00:00:00 2001 From: dooglus Date: Fri, 28 Nov 2008 12:30:26 +0000 Subject: [PATCH] Use the name of each action's class is its internal name. This makes it easier to find all references to the action rather than always having to search for both the class name and the internal name. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2296 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/gtkmm/canvasview.cpp | 16 ++++++++-------- .../trunk/src/gtkmm/cellrenderer_timetrack.cpp | 6 +++--- synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp | 6 +++--- synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp | 2 +- synfig-studio/trunk/src/gtkmm/dock_layers.cpp | 10 +++++----- synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp | 2 +- synfig-studio/trunk/src/gtkmm/instance.cpp | 6 +++--- .../trunk/src/gtkmm/keyframeactionmanager.cpp | 14 +++++++------- synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp | 6 +++--- synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp | 8 ++++---- .../trunk/src/gtkmm/layergrouptreestore.cpp | 14 +++++++------- .../trunk/src/gtkmm/layerparamtreestore.cpp | 2 +- synfig-studio/trunk/src/gtkmm/layertree.cpp | 14 +++++++------- synfig-studio/trunk/src/gtkmm/layertreestore.cpp | 12 ++++++------ synfig-studio/trunk/src/gtkmm/state_bline.cpp | 16 ++++++++-------- synfig-studio/trunk/src/gtkmm/state_circle.cpp | 18 +++++++++--------- synfig-studio/trunk/src/gtkmm/state_draw.cpp | 14 +++++++------- synfig-studio/trunk/src/gtkmm/state_fill.cpp | 2 +- synfig-studio/trunk/src/gtkmm/state_normal.cpp | 6 +++--- synfig-studio/trunk/src/gtkmm/state_polygon.cpp | 20 ++++++++++---------- synfig-studio/trunk/src/gtkmm/state_rectangle.cpp | 16 ++++++++-------- synfig-studio/trunk/src/gtkmm/state_star.cpp | 18 +++++++++--------- synfig-studio/trunk/src/gtkmm/state_width.cpp | 2 +- .../trunk/src/synfigapp/actions/activepointadd.cpp | 2 +- .../src/synfigapp/actions/activepointremove.cpp | 2 +- .../trunk/src/synfigapp/actions/activepointset.cpp | 2 +- .../src/synfigapp/actions/activepointsetoff.cpp | 2 +- .../trunk/src/synfigapp/actions/activepointseton.cpp | 2 +- .../src/synfigapp/actions/activepointsetsmart.cpp | 2 +- .../src/synfigapp/actions/activepointsimpleadd.cpp | 2 +- .../src/synfigapp/actions/blinepointtangentmerge.cpp | 4 ++-- .../src/synfigapp/actions/blinepointtangentsplit.cpp | 4 ++-- .../trunk/src/synfigapp/actions/canvasadd.cpp | 2 +- .../src/synfigapp/actions/canvasdescriptionset.cpp | 2 +- .../trunk/src/synfigapp/actions/canvasidset.cpp | 2 +- .../trunk/src/synfigapp/actions/canvasnameset.cpp | 2 +- .../trunk/src/synfigapp/actions/canvasremove.cpp | 2 +- .../src/synfigapp/actions/canvasrenddescset.cpp | 2 +- .../trunk/src/synfigapp/actions/colorset.cpp | 4 ++-- .../trunk/src/synfigapp/actions/editmodeset.cpp | 2 +- .../trunk/src/synfigapp/actions/gradientset.cpp | 4 ++-- .../trunk/src/synfigapp/actions/groupaddlayers.cpp | 2 +- .../trunk/src/synfigapp/actions/groupremove.cpp | 2 +- .../src/synfigapp/actions/groupremovelayers.cpp | 2 +- .../trunk/src/synfigapp/actions/grouprename.cpp | 2 +- .../trunk/src/synfigapp/actions/keyframeadd.cpp | 2 +- .../src/synfigapp/actions/keyframeduplicate.cpp | 2 +- .../trunk/src/synfigapp/actions/keyframeremove.cpp | 2 +- .../trunk/src/synfigapp/actions/keyframeset.cpp | 6 +++--- .../trunk/src/synfigapp/actions/keyframesetdelta.cpp | 4 ++-- .../src/synfigapp/actions/keyframewaypointset.cpp | 2 +- .../trunk/src/synfigapp/actions/layeractivate.cpp | 2 +- .../trunk/src/synfigapp/actions/layeradd.cpp | 2 +- .../trunk/src/synfigapp/actions/layerduplicate.cpp | 8 ++++---- .../trunk/src/synfigapp/actions/layerencapsulate.cpp | 4 ++-- .../trunk/src/synfigapp/actions/layerlower.cpp | 2 +- .../trunk/src/synfigapp/actions/layermove.cpp | 2 +- .../src/synfigapp/actions/layerparamconnect.cpp | 2 +- .../src/synfigapp/actions/layerparamdisconnect.cpp | 2 +- .../trunk/src/synfigapp/actions/layerparamset.cpp | 2 +- .../trunk/src/synfigapp/actions/layerraise.cpp | 2 +- .../trunk/src/synfigapp/actions/layerremove.cpp | 2 +- .../trunk/src/synfigapp/actions/layersetdesc.cpp | 2 +- .../trunk/src/synfigapp/actions/timepointscopy.cpp | 2 +- .../trunk/src/synfigapp/actions/timepointsdelete.cpp | 2 +- .../trunk/src/synfigapp/actions/timepointsmove.cpp | 2 +- .../src/synfigapp/actions/valuedescblinelink.cpp | 2 +- .../trunk/src/synfigapp/actions/valuedescconnect.cpp | 2 +- .../trunk/src/synfigapp/actions/valuedescconvert.cpp | 2 +- .../src/synfigapp/actions/valuedescdisconnect.cpp | 2 +- .../trunk/src/synfigapp/actions/valuedescexport.cpp | 2 +- .../trunk/src/synfigapp/actions/valuedesclink.cpp | 8 ++++---- .../trunk/src/synfigapp/actions/valuedescset.cpp | 18 +++++++++--------- .../trunk/src/synfigapp/actions/valuenodeadd.cpp | 2 +- .../src/synfigapp/actions/valuenodeconstset.cpp | 2 +- .../synfigapp/actions/valuenodedynamiclistinsert.cpp | 2 +- .../actions/valuenodedynamiclistinsertsmart.cpp | 12 ++++++------ .../synfigapp/actions/valuenodedynamiclistloop.cpp | 2 +- .../synfigapp/actions/valuenodedynamiclistremove.cpp | 2 +- .../actions/valuenodedynamiclistremovesmart.cpp | 6 +++--- .../actions/valuenodedynamiclistrotateorder.cpp | 6 +++--- .../synfigapp/actions/valuenodedynamiclistunloop.cpp | 2 +- .../src/synfigapp/actions/valuenodelinkconnect.cpp | 2 +- .../synfigapp/actions/valuenodelinkdisconnect.cpp | 2 +- .../trunk/src/synfigapp/actions/valuenoderemove.cpp | 2 +- .../trunk/src/synfigapp/actions/valuenoderename.cpp | 2 +- .../trunk/src/synfigapp/actions/valuenodereplace.cpp | 2 +- .../trunk/src/synfigapp/actions/waypointadd.cpp | 2 +- .../trunk/src/synfigapp/actions/waypointconnect.cpp | 2 +- .../src/synfigapp/actions/waypointdisconnect.cpp | 2 +- .../trunk/src/synfigapp/actions/waypointremove.cpp | 2 +- .../trunk/src/synfigapp/actions/waypointset.cpp | 2 +- .../trunk/src/synfigapp/actions/waypointsetsmart.cpp | 2 +- .../src/synfigapp/actions/waypointsimpleadd.cpp | 2 +- .../trunk/src/synfigapp/canvasinterface.cpp | 20 ++++++++++---------- 96 files changed, 228 insertions(+), 228 deletions(-) diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index f12fcf0..b492958 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -2173,7 +2173,7 @@ CanvasView::build_tables() void CanvasView::on_layer_toggle(synfig::Layer::Handle layer) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerActivate")); assert(action); if(!action) @@ -3195,7 +3195,7 @@ set_waypoint_model(std::set > waypoints, Waypoint waypoint(*iter); waypoint.apply_model(model); - synfigapp::Action::Handle action(synfigapp::Action::create("waypoint_set")); + synfigapp::Action::Handle action(synfigapp::Action::create("WaypointSet")); assert(action); @@ -3371,7 +3371,7 @@ CanvasView::on_waypoint_changed() param_list.add("waypoint",waypoint_dialog.get_waypoint()); // param_list.add("time",canvas_interface()->get_time()); - get_instance()->process_action("waypoint_set_smart", param_list); + get_instance()->process_action("WaypointSetSmart", param_list); } void @@ -3384,7 +3384,7 @@ CanvasView::on_waypoint_delete() param_list.add("waypoint",waypoint_dialog.get_waypoint()); // param_list.add("time",canvas_interface()->get_time()); - get_instance()->process_action("waypoint_remove", param_list); + get_instance()->process_action("WaypointRemove", param_list); } void @@ -3408,7 +3408,7 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr& con if(!layer->set_param("text",ValueBase(selection_data))) break; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_add")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerAdd")); assert(action); if(!action) @@ -3493,7 +3493,7 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr& con void CanvasView::on_keyframe_add_pressed() { - synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_add")); + synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeAdd")); if(!action) { @@ -3521,7 +3521,7 @@ CanvasView::on_keyframe_duplicate_pressed() } keyframe=row[model.keyframe]; - synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_duplicate")); + synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeDuplicate")); if(!action) { @@ -3550,7 +3550,7 @@ CanvasView::on_keyframe_remove_pressed() } keyframe=row[model.keyframe]; - synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_remove")); + synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeRemove")); if(!action) { diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp index 00fafd9..8382465 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp @@ -824,15 +824,15 @@ CellRenderer_TimeTrack::activate_vfunc( if(mode & COPY_MASK) //copy { etl::handle::cast_static(canvas_interface()->get_instance()) - ->process_action("timepoint_copy", param_list); + ->process_action("TimepointsCopy", param_list); }else if(delmode) //DELETE { etl::handle::cast_static(canvas_interface()->get_instance()) - ->process_action("timepoint_delete", param_list); + ->process_action("TimepointsDelete", param_list); }else //MOVE { etl::handle::cast_static(canvas_interface()->get_instance()) - ->process_action("timepoint_move", param_list); + ->process_action("TimepointsMove", param_list); } //now replace all the selected with the new selected diff --git a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp index 3da655e..d69ec50 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp @@ -121,7 +121,7 @@ Dialog_Keyframe::on_ok_pressed() if(widget_waypoint_model->get_waypoint_model().is_trivial()) return; - synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_waypoint_set")); + synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeWaypointSet")); assert(action); diff --git a/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp b/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp index 30f19a9..a77c0f5 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp @@ -104,9 +104,9 @@ Dock_Keyframes::Dock_Keyframes(): Glib::ustring ui_info = "" " " - " " - " " - " " + " " + " " + " " " " " " "" diff --git a/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp b/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp index 1598a83..d8a2b89 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp @@ -82,7 +82,7 @@ Dock_LayerGroups::Dock_LayerGroups(): Glib::ustring ui_info = "" " " - " " + " " " " " " "" diff --git a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp index 74b8d5f..8fa6ede 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp @@ -149,13 +149,13 @@ Dock_Layers::Dock_Layers(): Glib::ustring ui_info = "" " " - " " - " " + " " + " " " " - " " - " " + " " + " " " " - " " + " " " " " " " " diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp index 3f93fa6..aae4b40 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp @@ -318,7 +318,7 @@ public: param_list.add("waypoint",waypoint); // param_list.add("time",canvas_interface()->get_time()); - etl::handle::cast_static(param_tree_store_->canvas_interface()->get_instance())->process_action("waypoint_set_smart", param_list); + etl::handle::cast_static(param_tree_store_->canvas_interface()->get_instance())->process_action("WaypointSetSmart", param_list); } void mimic(Gtk::TreeView *param_tree_view) diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 227d84e..fd40977 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -1174,13 +1174,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)); } @@ -1203,7 +1203,7 @@ edit_several_waypoints(etl::handle canvas_view, std::listget_action("action-keyframe_add")) + if(action_group_->get_action("action-KeyframeAdd")) { - action_group_->remove(action_group_->get_action("action-keyframe_add")); + action_group_->remove(action_group_->get_action("action-KeyframeAdd")); } action_group_->add(Gtk::Action::create( - "action-keyframe_add", + "action-KeyframeAdd", Gtk::StockID("gtk-add"), _("Add New Keyframe"),_("Add New Keyframe") ), @@ -226,9 +226,9 @@ KeyframeActionManager::refresh() try { canvas_interface_->get_canvas()->keyframe_list().find(canvas_interface_->get_time()); - action_group_->get_action("action-keyframe_add")->set_sensitive(false); - if(action_group_->get_action("action-keyframe_duplicate")) - action_group_->get_action("action-keyframe_duplicate")->set_sensitive(false); + action_group_->get_action("action-KeyframeAdd")->set_sensitive(false); + if(action_group_->get_action("action-KeyframeDuplicate")) + action_group_->get_action("action-KeyframeDuplicate")->set_sensitive(false); } catch(...) { diff --git a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp index b0d4ae2..4e84001 100644 --- a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp @@ -379,7 +379,7 @@ KeyframeTreeStore::set_value_impl(const Gtk::TreeModel::iterator& row, int colum { Keyframe keyframe((*row)[model.keyframe]); - synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_set_delta")); + synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeSetDelta")); if(!action)return; @@ -407,7 +407,7 @@ KeyframeTreeStore::set_value_impl(const Gtk::TreeModel::iterator& row, int colum keyframe.set_time(x.get()); synfig::info("KeyframeTreeStore::set_value_impl():new_time=%s",keyframe.get_time().get_string().c_str()); - synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_set")); + synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeSet")); if(!action) return; @@ -426,7 +426,7 @@ KeyframeTreeStore::set_value_impl(const Gtk::TreeModel::iterator& row, int colum synfig::Keyframe keyframe(*iter->iter); keyframe.set_description(x.get()); - synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_set")); + synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeSet")); if(!action) return; diff --git a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp index 26769ff..436271a 100644 --- a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp +++ b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp @@ -334,8 +334,8 @@ void LayerActionManager::cut() { copy(); - if(action_group_->get_action("action-layer_remove")) - action_group_->get_action("action-layer_remove")->activate(); + if(action_group_->get_action("action-LayerRemove")) + action_group_->get_action("action-LayerRemove")->activate(); } void @@ -381,7 +381,7 @@ LayerActionManager::paste() { layer=(*iter)->clone(guid); layer_selection.push_back(layer); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_add")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerAdd")); assert(action); if(!action) @@ -409,7 +409,7 @@ LayerActionManager::paste() // Action to move the layer (if necessary) if(depth>0) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_move")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerMove")); assert(action); if(!action) diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp index 06efd8c..6334c09 100644 --- a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp @@ -347,7 +347,7 @@ LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co if(new_desc==layer->get_description()) return; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_set_desc")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerSetDesc")); if(!action) return; @@ -392,7 +392,7 @@ LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co } else { - synfigapp::Action::Handle action(synfigapp::Action::create("group_rename")); + synfigapp::Action::Handle action(synfigapp::Action::create("GroupRename")); if(!action) return; @@ -420,7 +420,7 @@ LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co synfig::Layer::Handle layer((*iter)[model.layer]); if(!layer)return; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerActivate")); if(!action) return; @@ -576,7 +576,7 @@ LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons if(synfig::String(selection_data.get_data_type())=="LAYER") { - synfigapp::Action::Handle action(synfigapp::Action::create("group_add_layers")); + synfigapp::Action::Handle action(synfigapp::Action::create("GroupAddLayers")); if(!action) return false; @@ -610,7 +610,7 @@ LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons group=dest_group+GROUP_NEST_CHAR+group; - synfigapp::Action::Handle action(synfigapp::Action::create("group_rename")); + synfigapp::Action::Handle action(synfigapp::Action::create("GroupRename")); if(!action) return false; @@ -662,7 +662,7 @@ LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons if(dest_canvas==src->get_canvas() && dest_layer_depth==src->get_depth()) continue; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_move")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerMove")); action->set_param("canvas",dest_canvas); action->set_param("canvas_interface",canvas_interface()); action->set_param("layer",src); @@ -882,7 +882,7 @@ LayerGroupTreeStore::on_activity() // If we aren't rebuilding and the last action // had something to do with groups, then go // a head and present the groups dialog. - if(!rebuilding && canvas_interface()->get_instance()->get_most_recent_action() && canvas_interface()->get_instance()->get_most_recent_action()->get_name().find("group")!=String::npos) + if(!rebuilding && canvas_interface()->get_instance()->get_most_recent_action() && canvas_interface()->get_instance()->get_most_recent_action()->get_name().find("Group")!=String::npos) try { App::dock_manager->find_dockable("groups").present(); diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp index a8e4fe5..8fe850a 100644 --- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp @@ -267,7 +267,7 @@ LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co g_value_init(x.gobj(),model.active.type()); g_value_copy(value.gobj(),x.gobj()); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerActivate")); if(!action) return; diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp index 04cd1ee..f41d2f8 100644 --- a/synfig-studio/trunk/src/gtkmm/layertree.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp @@ -417,7 +417,7 @@ LayerTree::on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::H param_list.add("waypoint",waypoint); // param_list.add("time",canvas_interface()->get_time()); - etl::handle::cast_static(layer_tree_store_->canvas_interface()->get_instance())->process_action("waypoint_set_smart", param_list); + etl::handle::cast_static(layer_tree_store_->canvas_interface()->get_instance())->process_action("WaypointSetSmart", param_list); } void @@ -1006,7 +1006,7 @@ LayerTree::on_param_tree_event(GdkEvent *event) // for(iter=layer_list.begin();iter!=layer_list.end();++iter) // param_list.add("layer",Layer::Handle(*iter)); // } -// synfigapp::Action::Handle action(synfigapp::Action::create("layer_raise")); +// synfigapp::Action::Handle action(synfigapp::Action::create("LayerRaise")); // action->set_param_list(param_list); // layer_tree_store_->canvas_interface()->get_instance()->perform_action(action); // } @@ -1027,7 +1027,7 @@ LayerTree::on_param_tree_event(GdkEvent *event) // param_list.add("layer",Layer::Handle(*iter)); // } // -// synfigapp::Action::Handle action(synfigapp::Action::create("layer_lower")); +// synfigapp::Action::Handle action(synfigapp::Action::create("LayerLower")); // action->set_param_list(param_list); // layer_tree_store_->canvas_interface()->get_instance()->perform_action(action); // } @@ -1048,7 +1048,7 @@ LayerTree::on_param_tree_event(GdkEvent *event) // param_list.add("layer",Layer::Handle(*iter)); // } // -// synfigapp::Action::Handle action(synfigapp::Action::create("layer_duplicate")); +// synfigapp::Action::Handle action(synfigapp::Action::create("LayerDuplicate")); // action->set_param_list(param_list); // layer_tree_store_->canvas_interface()->get_instance()->perform_action(action); // } @@ -1069,7 +1069,7 @@ LayerTree::on_param_tree_event(GdkEvent *event) // param_list.add("layer",Layer::Handle(*iter)); // } // -// synfigapp::Action::Handle action(synfigapp::Action::create("layer_encapsulate")); +// synfigapp::Action::Handle action(synfigapp::Action::create("LayerEncapsulate")); // action->set_param_list(param_list); // layer_tree_store_->canvas_interface()->get_instance()->perform_action(action); // } @@ -1090,7 +1090,7 @@ LayerTree::on_param_tree_event(GdkEvent *event) // param_list.add("layer",Layer::Handle(*iter)); // } // -// synfigapp::Action::Handle action(synfigapp::Action::create("layer_remove")); +// synfigapp::Action::Handle action(synfigapp::Action::create("LayerRemove")); // action->set_param_list(param_list); // layer_tree_store_->canvas_interface()->get_instance()->perform_action(action); // } @@ -1171,7 +1171,7 @@ LayerTree::on_drop_drag_data_received(const Glib::RefPtr& cont if(!dest_layer || dest_layer==src) break; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_move")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerMove")); action->set_param("canvas",dest_canvas); action->set_param("canvas_interface",layer_tree_store_->canvas_interface()); action->set_param("layer",src); diff --git a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp index 3a446c9..16b7fc8 100644 --- a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp @@ -309,7 +309,7 @@ LayerTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int column, if(new_desc==layer->get_description()) return; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_set_desc")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerSetDesc")); if(!action) return; @@ -332,7 +332,7 @@ LayerTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int column, g_value_init(x.gobj(),model.active.type()); g_value_copy(value.gobj(),x.gobj()); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerActivate")); if(!action) return; @@ -518,7 +518,7 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk if(dest_canvas==src->get_canvas() && dest_layer_depth==src->get_depth()) continue; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_move")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerMove")); action->set_param("canvas",dest_canvas); action->set_param("canvas_interface",canvas_interface()); action->set_param("layer",src); @@ -537,7 +537,7 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk { synfigapp::Action::Handle action; - action=synfigapp::Action::create("layer_remove"); + action=synfigapp::Action::create("LayerRemove"); action->set_param("canvas",Canvas::Handle(src->get_canvas())); if(!action->set_param("canvas_interface",App::get_instance(src->get_canvas())->find_canvas_interface(src->get_canvas()))) action->set_param("canvas_interface",canvas_interface()); @@ -549,7 +549,7 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk return false; } - action=synfigapp::Action::create("layer_add"); + action=synfigapp::Action::create("LayerAdd"); action->set_param("canvas",dest_canvas); action->set_param("canvas_interface",canvas_interface()); action->set_param("new",src); @@ -562,7 +562,7 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk if(dest_layer_depth!=0) { - action=synfigapp::Action::create("layer_move"); + action=synfigapp::Action::create("LayerMove"); action->set_param("canvas",dest_canvas); action->set_param("canvas_interface",canvas_interface()); action->set_param("layer",src); diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp index 6cf1e54..3f3feb0 100644 --- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp @@ -631,7 +631,7 @@ StateBLine_Context::run_() get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -654,7 +654,7 @@ StateBLine_Context::run_() // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -694,7 +694,7 @@ StateBLine_Context::run_() get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -717,7 +717,7 @@ StateBLine_Context::run_() // only link the plant's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -768,7 +768,7 @@ StateBLine_Context::run_() // I don't know if it's safe to reuse the same layer_param_connect action, so I'm // using 2 separate ones. { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -791,7 +791,7 @@ StateBLine_Context::run_() // only link the region's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -836,7 +836,7 @@ StateBLine_Context::run_() } { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -859,7 +859,7 @@ StateBLine_Context::run_() // only link the outline's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); diff --git a/synfig-studio/trunk/src/gtkmm/state_circle.cpp b/synfig-studio/trunk/src/gtkmm/state_circle.cpp index 00c8d02..11833cb 100644 --- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp @@ -641,7 +641,7 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) // only link the circle's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -692,7 +692,7 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) #endif // BLEND_METHOD_IN_TOOL_OPTIONS { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -715,7 +715,7 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -766,7 +766,7 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) #endif // BLEND_METHOD_IN_TOOL_OPTIONS { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -789,7 +789,7 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) // only link the plant's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -851,7 +851,7 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) // I don't know if it's safe to reuse the same layer_param_connect action, so I'm // using 2 separate ones. { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -874,7 +874,7 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) // only link the region's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -929,7 +929,7 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) get_canvas_interface()->signal_layer_param_changed()(layer,"invert"); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -952,7 +952,7 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) // only link the outline's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index 10f050e..36e4933 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -1089,7 +1089,7 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline get_canvas_interface()-> change_value(synfigapp::ValueDesc(layer,"origin"),shift_origin_vector); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); @@ -1806,7 +1806,7 @@ StateDraw_Context::new_region(std::list bline, synfig::Real } get_canvas_interface()->signal_layer_param_changed()(layer,"color"); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); @@ -1858,7 +1858,7 @@ StateDraw_Context::extend_bline_from_begin(ValueNode_BLine::Handle value_node,st if (complete_loop) { - synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_loop")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListLoop")); assert(action); action->set_param("canvas",get_canvas()); @@ -1878,7 +1878,7 @@ StateDraw_Context::extend_bline_from_begin(ValueNode_BLine::Handle value_node,st { ValueNode_Composite::Handle composite(ValueNode_Composite::create(*iter)); - synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_insert")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListInsert")); assert(action); synfigapp::ValueDesc value_desc(value_node,0); @@ -1909,7 +1909,7 @@ StateDraw_Context::extend_bline_from_end(ValueNode_BLine::Handle value_node,std: if (complete_loop) { - synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_loop")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListLoop")); assert(action); action->set_param("canvas",get_canvas()); @@ -1929,7 +1929,7 @@ StateDraw_Context::extend_bline_from_end(ValueNode_BLine::Handle value_node,std: { ValueNode_Composite::Handle composite(ValueNode_Composite::create(*iter)); - synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_insert")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListInsert")); assert(action); synfigapp::ValueDesc value_desc(value_node,value_node->link_count()); @@ -1999,7 +1999,7 @@ StateDraw_Context::fill_last_stroke_and_unselect_other_layers() layer->set_param("color",synfigapp::Main::get_background_color()); layer->set_description(last_stroke_id + _(" Region")); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); diff --git a/synfig-studio/trunk/src/gtkmm/state_fill.cpp b/synfig-studio/trunk/src/gtkmm/state_fill.cpp index 51ab488..e337156 100644 --- a/synfig-studio/trunk/src/gtkmm/state_fill.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_fill.cpp @@ -147,7 +147,7 @@ StateFill_Context::event_workarea_layer_clicked_handler(const Smach::event& x) } - //synfigapp::Action::Handle action(synfigapp::Action::create("value_desc_set")); + //synfigapp::Action::Handle action(synfigapp::Action::create("ValueDescSet")); synfigapp::ValueDesc value_desc(event.layer,"color"); if(!get_canvas_interface()->change_value(value_desc,ValueBase(synfigapp::Main::get_foreground_color()))) diff --git a/synfig-studio/trunk/src/gtkmm/state_normal.cpp b/synfig-studio/trunk/src/gtkmm/state_normal.cpp index f428c3f..a310f45 100644 --- a/synfig-studio/trunk/src/gtkmm/state_normal.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_normal.cpp @@ -297,13 +297,13 @@ StateNormal_Context::edit_several_waypoints(std::list valu if(!value_desc.is_value_node()) { - action=synfigapp::Action::create("value_desc_connect"); + action=synfigapp::Action::create("ValueDescConnect"); action->set_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)); } @@ -329,7 +329,7 @@ StateNormal_Context::edit_several_waypoints(std::list valu if(value_node) { - synfigapp::Action::Handle action(synfigapp::Action::create("waypoint_set_smart")); + synfigapp::Action::Handle action(synfigapp::Action::create("WaypointSetSmart")); if(!action) { diff --git a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp index 52b8b12..b871846 100644 --- a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp @@ -567,7 +567,7 @@ StatePolygon_Context::run() } { - synfigapp::Action::Handle action(synfigapp::Action::create("value_desc_convert")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueDescConvert")); synfigapp::ValueDesc value_desc(layer,"vector_list"); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); @@ -585,7 +585,7 @@ StatePolygon_Context::run() // only link the polygon's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -626,7 +626,7 @@ StatePolygon_Context::run() get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -649,7 +649,7 @@ StatePolygon_Context::run() // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -690,7 +690,7 @@ StatePolygon_Context::run() get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -713,7 +713,7 @@ StatePolygon_Context::run() // only link the plant's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -765,7 +765,7 @@ StatePolygon_Context::run() // I don't know if it's safe to reuse the same layer_param_connect action, so I'm // using 2 separate ones. { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -788,7 +788,7 @@ StatePolygon_Context::run() // only link the region's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -833,7 +833,7 @@ StatePolygon_Context::run() get_canvas_interface()->signal_layer_param_changed()(layer,"invert"); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -856,7 +856,7 @@ StatePolygon_Context::run() // only link the outline's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); diff --git a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp index ce96b38..1f07764 100644 --- a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp @@ -569,7 +569,7 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -592,7 +592,7 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -633,7 +633,7 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -656,7 +656,7 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) // only link the plant's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -708,7 +708,7 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) // I don't know if it's safe to reuse the same layer_param_connect action, so I'm // using 2 separate ones. { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -731,7 +731,7 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) // only link the region's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -776,7 +776,7 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) get_canvas_interface()->signal_layer_param_changed()(layer,"invert"); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -799,7 +799,7 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2) // only link the outline's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); diff --git a/synfig-studio/trunk/src/gtkmm/state_star.cpp b/synfig-studio/trunk/src/gtkmm/state_star.cpp index 8b5c14f..6b726cb 100644 --- a/synfig-studio/trunk/src/gtkmm/state_star.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_star.cpp @@ -678,7 +678,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) // only link the star's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -724,7 +724,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -747,7 +747,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -793,7 +793,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -816,7 +816,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) // only link the plant's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -873,7 +873,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) // I don't know if it's safe to reuse the same layer_param_connect action, so I'm // using 2 separate ones. { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -896,7 +896,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) // only link the region's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -946,7 +946,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) get_canvas_interface()->signal_layer_param_changed()(layer,"invert"); { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); @@ -969,7 +969,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2) // only link the outline's origin parameter if the option is selected and we're creating more than one layer if (get_layer_link_origins_flag() && layers_to_create > 1) { - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); action->set_param("canvas",get_canvas()); diff --git a/synfig-studio/trunk/src/gtkmm/state_width.cpp b/synfig-studio/trunk/src/gtkmm/state_width.cpp index ccf3b86..1c7ef4f 100644 --- a/synfig-studio/trunk/src/gtkmm/state_width.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_width.cpp @@ -565,7 +565,7 @@ StateWidth_Context::event_mouse_handler(const Smach::event& x) if( desc.get_value_type() == ValueBase::TYPE_REAL ) { - Action::Handle action(Action::create("value_desc_set")); + Action::Handle action(Action::create("ValueDescSet")); assert(action); action->set_param("canvas",get_canvas()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp index 79e5ceb..812d094 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ActivepointAdd); -ACTION_SET_NAME(Action::ActivepointAdd,"activepoint_add"); +ACTION_SET_NAME(Action::ActivepointAdd,"ActivepointAdd"); ACTION_SET_LOCAL_NAME(Action::ActivepointAdd,N_("Add Activepoint")); ACTION_SET_TASK(Action::ActivepointAdd,"add"); ACTION_SET_CATEGORY(Action::ActivepointAdd,Action::CATEGORY_ACTIVEPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp index 527e2c9..13812d4 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ActivepointRemove); -ACTION_SET_NAME(Action::ActivepointRemove,"activepoint_remove"); +ACTION_SET_NAME(Action::ActivepointRemove,"ActivepointRemove"); ACTION_SET_LOCAL_NAME(Action::ActivepointRemove,N_("Remove Activepoint")); ACTION_SET_TASK(Action::ActivepointRemove,"remove"); ACTION_SET_CATEGORY(Action::ActivepointRemove,Action::CATEGORY_ACTIVEPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp index e04d9d0..a89cc01 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ActivepointSet); -ACTION_SET_NAME(Action::ActivepointSet,"activepoint_set"); +ACTION_SET_NAME(Action::ActivepointSet,"ActivepointSet"); ACTION_SET_LOCAL_NAME(Action::ActivepointSet,N_("Set Activepoint")); ACTION_SET_TASK(Action::ActivepointSet,"set"); ACTION_SET_CATEGORY(Action::ActivepointSet,Action::CATEGORY_ACTIVEPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp index 887417a..845b68f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp @@ -54,7 +54,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ActivepointSetOff); -ACTION_SET_NAME(Action::ActivepointSetOff,"activepoint_set_off"); +ACTION_SET_NAME(Action::ActivepointSetOff,"ActivepointSetOff"); ACTION_SET_LOCAL_NAME(Action::ActivepointSetOff,N_("Mark Activepoint as \"Off\"")); ACTION_SET_TASK(Action::ActivepointSetOff,"set_off"); ACTION_SET_CATEGORY(Action::ActivepointSetOff,Action::CATEGORY_ACTIVEPOINT|Action::CATEGORY_VALUEDESC); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp index 71a963a..f038448 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp @@ -54,7 +54,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ActivepointSetOn); -ACTION_SET_NAME(Action::ActivepointSetOn,"activepoint_set_on"); +ACTION_SET_NAME(Action::ActivepointSetOn,"ActivepointSetOn"); ACTION_SET_LOCAL_NAME(Action::ActivepointSetOn,N_("Mark Activepoint as \"On\"")); ACTION_SET_TASK(Action::ActivepointSetOn,"set_on"); ACTION_SET_CATEGORY(Action::ActivepointSetOn,Action::CATEGORY_ACTIVEPOINT|Action::CATEGORY_VALUEDESC); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp index 51de040..66d5117 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp @@ -53,7 +53,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ActivepointSetSmart); -ACTION_SET_NAME(Action::ActivepointSetSmart,"activepoint_set_smart"); +ACTION_SET_NAME(Action::ActivepointSetSmart,"ActivepointSetSmart"); ACTION_SET_LOCAL_NAME(Action::ActivepointSetSmart,N_("Set Activepoint (Smart)")); ACTION_SET_TASK(Action::ActivepointSetSmart,"set"); ACTION_SET_CATEGORY(Action::ActivepointSetSmart,Action::CATEGORY_ACTIVEPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp index 049a9bd..654d3bf 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ActivepointSimpleAdd); -ACTION_SET_NAME(Action::ActivepointSimpleAdd,"waypoint_simpleadd"); +ACTION_SET_NAME(Action::ActivepointSimpleAdd,"ActivepointSimpleAdd"); ACTION_SET_LOCAL_NAME(Action::ActivepointSimpleAdd,N_("Simply Add Waypoint")); ACTION_SET_TASK(Action::ActivepointSimpleAdd,"add"); ACTION_SET_CATEGORY(Action::ActivepointSimpleAdd,Action::CATEGORY_WAYPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp index 39d4f36..bb20fe0 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp @@ -52,7 +52,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::BLinePointTangentMerge); -ACTION_SET_NAME(Action::BLinePointTangentMerge,"bline_point_tangent_merge"); +ACTION_SET_NAME(Action::BLinePointTangentMerge,"BLinePointTangentMerge"); ACTION_SET_LOCAL_NAME(Action::BLinePointTangentMerge,N_("Merge Tangents")); ACTION_SET_TASK(Action::BLinePointTangentMerge,"merge"); ACTION_SET_CATEGORY(Action::BLinePointTangentMerge,Action::CATEGORY_VALUENODE); @@ -151,7 +151,7 @@ Action::BLinePointTangentMerge::prepare() Action::Handle action; - action=Action::create("value_desc_set"); + action=Action::create("ValueDescSet"); if(!action) throw Error(_("Couldn't find action \"value_desc_set\"")); diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp index a00f67d..427f985 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp @@ -52,7 +52,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::BLinePointTangentSplit); -ACTION_SET_NAME(Action::BLinePointTangentSplit,"bline_point_tangent_split"); +ACTION_SET_NAME(Action::BLinePointTangentSplit,"BLinePointTangentSplit"); ACTION_SET_LOCAL_NAME(Action::BLinePointTangentSplit,N_("Split Tangents")); ACTION_SET_TASK(Action::BLinePointTangentSplit,"split"); ACTION_SET_CATEGORY(Action::BLinePointTangentSplit,Action::CATEGORY_VALUENODE); @@ -151,7 +151,7 @@ Action::BLinePointTangentSplit::prepare() Action::Handle action; - action=Action::create("value_desc_set"); + action=Action::create("ValueDescSet"); if(!action) throw Error(_("Couldn't find action \"value_desc_set\"")); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp index 5d1554f..0e53e76 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::CanvasAdd); -ACTION_SET_NAME(Action::CanvasAdd,"canvas_add"); +ACTION_SET_NAME(Action::CanvasAdd,"CanvasAdd"); ACTION_SET_LOCAL_NAME(Action::CanvasAdd,N_("Add Child Canvas")); ACTION_SET_TASK(Action::CanvasAdd,"add"); ACTION_SET_CATEGORY(Action::CanvasAdd,Action::CATEGORY_CANVAS); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasdescriptionset.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasdescriptionset.cpp index 91b2a8b..845b7a1 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasdescriptionset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasdescriptionset.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::CanvasDescriptionSet); -ACTION_SET_NAME(Action::CanvasDescriptionSet,"canvas_description_set"); +ACTION_SET_NAME(Action::CanvasDescriptionSet,"CanvasDescriptionSet"); ACTION_SET_LOCAL_NAME(Action::CanvasDescriptionSet,N_("Set Canvas Description")); ACTION_SET_TASK(Action::CanvasDescriptionSet,"set"); ACTION_SET_CATEGORY(Action::CanvasDescriptionSet,Action::CATEGORY_CANVAS); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasidset.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasidset.cpp index a35cf97..4f31c97 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasidset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasidset.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::CanvasIdSet); -ACTION_SET_NAME(Action::CanvasIdSet,"canvas_id_set"); +ACTION_SET_NAME(Action::CanvasIdSet,"CanvasIdSet"); ACTION_SET_LOCAL_NAME(Action::CanvasIdSet,N_("Set Canvas Id")); ACTION_SET_TASK(Action::CanvasIdSet,"set"); ACTION_SET_CATEGORY(Action::CanvasIdSet,Action::CATEGORY_CANVAS); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasnameset.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasnameset.cpp index 8b0088c..32cc817 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasnameset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasnameset.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::CanvasNameSet); -ACTION_SET_NAME(Action::CanvasNameSet,"canvas_name_set"); +ACTION_SET_NAME(Action::CanvasNameSet,"CanvasNameSet"); ACTION_SET_LOCAL_NAME(Action::CanvasNameSet,N_("Set Canvas Name")); ACTION_SET_TASK(Action::CanvasNameSet,"set"); ACTION_SET_CATEGORY(Action::CanvasNameSet,Action::CATEGORY_CANVAS); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp index 8db1490..9f77390 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::CanvasRemove); -ACTION_SET_NAME(Action::CanvasRemove,"canvas_remove"); +ACTION_SET_NAME(Action::CanvasRemove,"CanvasRemove"); ACTION_SET_LOCAL_NAME(Action::CanvasRemove,N_("Remove Canvas")); ACTION_SET_TASK(Action::CanvasRemove,"remove"); ACTION_SET_CATEGORY(Action::CanvasRemove,Action::CATEGORY_CANVAS); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp index 498726d..84cfbf0 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::CanvasRendDescSet); -ACTION_SET_NAME(Action::CanvasRendDescSet,"canvas_rend_desc_set"); +ACTION_SET_NAME(Action::CanvasRendDescSet,"CanvasRendDescSet"); ACTION_SET_LOCAL_NAME(Action::CanvasRendDescSet,N_("Set Canvas RendDesc")); ACTION_SET_TASK(Action::CanvasRendDescSet,"set"); ACTION_SET_CATEGORY(Action::CanvasRendDescSet,Action::CATEGORY_CANVAS); diff --git a/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp b/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp index 7668997..a280858 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp @@ -51,7 +51,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ColorSet); -ACTION_SET_NAME(Action::ColorSet,"color_set"); +ACTION_SET_NAME(Action::ColorSet,"ColorSet"); ACTION_SET_LOCAL_NAME(Action::ColorSet,N_("Apply Default Color")); ACTION_SET_TASK(Action::ColorSet,"set"); ACTION_SET_CATEGORY(Action::ColorSet,Action::CATEGORY_VALUEDESC); @@ -133,7 +133,7 @@ Action::ColorSet::prepare() clear(); Action::Handle action; - action=Action::create("value_desc_set"); + action=Action::create("ValueDescSet"); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp b/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp index f473ace..e69c473 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::EditModeSet); -ACTION_SET_NAME(Action::EditModeSet,"edit_mode_set"); +ACTION_SET_NAME(Action::EditModeSet,"EditModeSet"); ACTION_SET_LOCAL_NAME(Action::EditModeSet,N_("Set Edit Mode")); ACTION_SET_TASK(Action::EditModeSet,"set"); ACTION_SET_CATEGORY(Action::EditModeSet,Action::CATEGORY_OTHER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp b/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp index d97b91a..31eed82 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp @@ -51,7 +51,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::GradientSet); -ACTION_SET_NAME(Action::GradientSet,"gradient_set"); +ACTION_SET_NAME(Action::GradientSet,"GradientSet"); ACTION_SET_LOCAL_NAME(Action::GradientSet,N_("Apply Default Gradient")); ACTION_SET_TASK(Action::GradientSet,"set"); ACTION_SET_CATEGORY(Action::GradientSet,Action::CATEGORY_VALUEDESC); @@ -133,7 +133,7 @@ Action::GradientSet::prepare() clear(); Action::Handle action; - action=Action::create("value_desc_set"); + action=Action::create("ValueDescSet"); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp index cec7de6..42d3025 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::GroupAddLayers); -ACTION_SET_NAME(Action::GroupAddLayers,"group_add_layers"); +ACTION_SET_NAME(Action::GroupAddLayers,"GroupAddLayers"); ACTION_SET_LOCAL_NAME(Action::GroupAddLayers,N_("Add Layers to Group")); ACTION_SET_TASK(Action::GroupAddLayers,"add"); ACTION_SET_CATEGORY(Action::GroupAddLayers,Action::CATEGORY_LAYER|Action::CATEGORY_GROUP); diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp index 6b4591f..dc155d6 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::GroupRemove); -ACTION_SET_NAME(Action::GroupRemove,"group_remove"); +ACTION_SET_NAME(Action::GroupRemove,"GroupRemove"); ACTION_SET_LOCAL_NAME(Action::GroupRemove,N_("Remove Group")); ACTION_SET_TASK(Action::GroupRemove,"remove"); ACTION_SET_CATEGORY(Action::GroupRemove,Action::CATEGORY_GROUP); diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp index b3583f3..dc2140c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::GroupRemoveLayers); -ACTION_SET_NAME(Action::GroupRemoveLayers,"group_remove_layers"); +ACTION_SET_NAME(Action::GroupRemoveLayers,"GroupRemoveLayers"); ACTION_SET_LOCAL_NAME(Action::GroupRemoveLayers,N_("Remove Layers from a Group")); ACTION_SET_TASK(Action::GroupRemoveLayers,"remove"); ACTION_SET_CATEGORY(Action::GroupRemoveLayers,Action::CATEGORY_LAYER|Action::CATEGORY_GROUP); diff --git a/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp b/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp index 4a10dfb..faf9cb7 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::GroupRename); -ACTION_SET_NAME(Action::GroupRename,"group_rename"); +ACTION_SET_NAME(Action::GroupRename,"GroupRename"); ACTION_SET_LOCAL_NAME(Action::GroupRename,N_("Rename Group")); ACTION_SET_TASK(Action::GroupRename,"rename"); ACTION_SET_CATEGORY(Action::GroupRename,Action::CATEGORY_GROUP); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp index a0fcae3..9e3a366 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::KeyframeAdd); -ACTION_SET_NAME(Action::KeyframeAdd,"keyframe_add"); +ACTION_SET_NAME(Action::KeyframeAdd,"KeyframeAdd"); ACTION_SET_LOCAL_NAME(Action::KeyframeAdd,N_("Add Keyframe")); ACTION_SET_TASK(Action::KeyframeAdd,"add"); ACTION_SET_CATEGORY(Action::KeyframeAdd,Action::CATEGORY_KEYFRAME); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp index 5351dcc..eb11a17 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp @@ -49,7 +49,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::KeyframeDuplicate); -ACTION_SET_NAME(Action::KeyframeDuplicate,"keyframe_duplicate"); +ACTION_SET_NAME(Action::KeyframeDuplicate,"KeyframeDuplicate"); ACTION_SET_LOCAL_NAME(Action::KeyframeDuplicate,N_("Duplicate Keyframe")); ACTION_SET_TASK(Action::KeyframeDuplicate,"duplicate"); ACTION_SET_CATEGORY(Action::KeyframeDuplicate,Action::CATEGORY_KEYFRAME); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp index 655448b..8699b52 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp @@ -49,7 +49,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::KeyframeRemove); -ACTION_SET_NAME(Action::KeyframeRemove,"keyframe_remove"); +ACTION_SET_NAME(Action::KeyframeRemove,"KeyframeRemove"); ACTION_SET_LOCAL_NAME(Action::KeyframeRemove,N_("Remove Keyframe")); ACTION_SET_TASK(Action::KeyframeRemove,"remove"); ACTION_SET_CATEGORY(Action::KeyframeRemove,Action::CATEGORY_KEYFRAME); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp index dec80fb..f18897b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp @@ -49,7 +49,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::KeyframeSet); -ACTION_SET_NAME(Action::KeyframeSet,"keyframe_set"); +ACTION_SET_NAME(Action::KeyframeSet,"KeyframeSet"); ACTION_SET_LOCAL_NAME(Action::KeyframeSet,N_("Set Keyframe")); ACTION_SET_TASK(Action::KeyframeSet,"set"); ACTION_SET_CATEGORY(Action::KeyframeSet,Action::CATEGORY_KEYFRAME|Action::CATEGORY_HIDDEN); @@ -178,7 +178,7 @@ Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,c { if(selected.back()->get_time()!=old_2_new(selected.back()->get_time())) { - Action::Handle action(Action::create("activepoint_set")); + Action::Handle action(Action::create("ActivepointSet")); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); @@ -237,7 +237,7 @@ Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,cons { if(selected.back()->get_time()!=old_2_new(selected.back()->get_time())) { - Action::Handle action(Action::create("waypoint_set")); + Action::Handle action(Action::create("WaypointSet")); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp index 0af76d4..97898c3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp @@ -49,7 +49,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::KeyframeSetDelta); -ACTION_SET_NAME(Action::KeyframeSetDelta,"keyframe_set_delta"); +ACTION_SET_NAME(Action::KeyframeSetDelta,"KeyframeSetDelta"); ACTION_SET_LOCAL_NAME(Action::KeyframeSetDelta,N_("Set Keyframe Delta")); ACTION_SET_TASK(Action::KeyframeSetDelta,"set"); ACTION_SET_CATEGORY(Action::KeyframeSetDelta,Action::CATEGORY_KEYFRAME|Action::CATEGORY_HIDDEN); @@ -153,7 +153,7 @@ Action::KeyframeSetDelta::prepare() continue; } } - Action::Handle action(Action::create("waypoint_set_smart")); + Action::Handle action(Action::create("WaypointSetSmart")); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp index 1e9e4ad..b587397 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp @@ -49,7 +49,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::KeyframeWaypointSet); -ACTION_SET_NAME(Action::KeyframeWaypointSet,"keyframe_waypoint_set"); +ACTION_SET_NAME(Action::KeyframeWaypointSet,"KeyframeWaypointSet"); ACTION_SET_LOCAL_NAME(Action::KeyframeWaypointSet,N_("Set Waypoints at Keyframe")); ACTION_SET_TASK(Action::KeyframeWaypointSet,"set"); ACTION_SET_CATEGORY(Action::KeyframeWaypointSet,Action::CATEGORY_KEYFRAME); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp index c7fbc30..d41b36c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerActivate); -ACTION_SET_NAME(Action::LayerActivate,"layer_activate"); +ACTION_SET_NAME(Action::LayerActivate,"LayerActivate"); ACTION_SET_LOCAL_NAME(Action::LayerActivate,N_("Activate Layer")); ACTION_SET_TASK(Action::LayerActivate,"activate"); ACTION_SET_CATEGORY(Action::LayerActivate,Action::CATEGORY_LAYER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp index e7ec3ab..51d12db 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerAdd); -ACTION_SET_NAME(Action::LayerAdd,"layer_add"); +ACTION_SET_NAME(Action::LayerAdd,"LayerAdd"); ACTION_SET_LOCAL_NAME(Action::LayerAdd,N_("Add Layer")); ACTION_SET_TASK(Action::LayerAdd,"add"); ACTION_SET_CATEGORY(Action::LayerAdd,Action::CATEGORY_LAYER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp index 115d631..c3e21df 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp @@ -48,7 +48,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerDuplicate); -ACTION_SET_NAME(Action::LayerDuplicate,"layer_duplicate"); +ACTION_SET_NAME(Action::LayerDuplicate,"LayerDuplicate"); ACTION_SET_LOCAL_NAME(Action::LayerDuplicate,N_("Duplicate Layer")); ACTION_SET_TASK(Action::LayerDuplicate,"duplicate"); ACTION_SET_CATEGORY(Action::LayerDuplicate,Action::CATEGORY_LAYER); @@ -143,7 +143,7 @@ Action::LayerDuplicate::prepare() Layer::Handle new_layer(layer->clone(guid)); { - Action::Handle action(Action::create("layer_move")); + Action::Handle action(Action::create("LayerMove")); action->set_param("canvas",subcanvas); action->set_param("canvas_interface",get_canvas_interface()); @@ -153,7 +153,7 @@ Action::LayerDuplicate::prepare() add_action_front(action); } { - Action::Handle action(Action::create("layer_add")); + Action::Handle action(Action::create("LayerAdd")); action->set_param("canvas",subcanvas); action->set_param("canvas_interface",get_canvas_interface()); @@ -182,7 +182,7 @@ Action::LayerDuplicate::export_dup_nodes(synfig::Layer::Handle layer, Canvas::Ha } catch (Exception::IDNotFound x) { - Action::Handle action(Action::create("value_node_add")); + Action::Handle action(Action::create("ValueNodeAdd")); action->set_param("canvas",canvas); action->set_param("canvas_interface",get_canvas_interface()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp index 898b828..42efe47 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp @@ -48,7 +48,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerEncapsulate); -ACTION_SET_NAME(Action::LayerEncapsulate,"layer_encapsulate"); +ACTION_SET_NAME(Action::LayerEncapsulate,"LayerEncapsulate"); ACTION_SET_LOCAL_NAME(Action::LayerEncapsulate,N_("Encapsulate")); ACTION_SET_TASK(Action::LayerEncapsulate,"encapsulate"); ACTION_SET_CATEGORY(Action::LayerEncapsulate,Action::CATEGORY_LAYER); @@ -163,7 +163,7 @@ Action::LayerEncapsulate::prepare() // Move the layer { - Action::Handle action(Action::create("layer_move")); + Action::Handle action(Action::create("LayerMove")); assert(action); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp index b0c5bf3..68cad97 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp @@ -47,7 +47,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerLower); -ACTION_SET_NAME(Action::LayerLower,"layer_lower"); +ACTION_SET_NAME(Action::LayerLower,"LayerLower"); ACTION_SET_LOCAL_NAME(Action::LayerLower,N_("Lower Layer")); ACTION_SET_TASK(Action::LayerLower,"lower"); ACTION_SET_CATEGORY(Action::LayerLower,Action::CATEGORY_LAYER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp index f72afa4..a42e2a8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerMove); -ACTION_SET_NAME(Action::LayerMove,"layer_move"); +ACTION_SET_NAME(Action::LayerMove,"LayerMove"); ACTION_SET_LOCAL_NAME(Action::LayerMove,N_("Move Layer")); ACTION_SET_TASK(Action::LayerMove,"move"); ACTION_SET_CATEGORY(Action::LayerMove,Action::CATEGORY_LAYER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp index fbec3d5..a358079 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::LayerParamConnect); -ACTION_SET_NAME(Action::LayerParamConnect,"layer_param_connect"); +ACTION_SET_NAME(Action::LayerParamConnect,"LayerParamConnect"); ACTION_SET_LOCAL_NAME(Action::LayerParamConnect,N_("Connect Layer Parameter")); ACTION_SET_TASK(Action::LayerParamConnect,"connect"); ACTION_SET_CATEGORY(Action::LayerParamConnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp index a25ff13..8c3dc8f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::LayerParamDisconnect); -ACTION_SET_NAME(Action::LayerParamDisconnect,"layer_param_disconnect"); +ACTION_SET_NAME(Action::LayerParamDisconnect,"LayerParamDisconnect"); ACTION_SET_LOCAL_NAME(Action::LayerParamDisconnect,N_("Disconnect Layer Parameter")); ACTION_SET_TASK(Action::LayerParamDisconnect,"disconnect"); ACTION_SET_CATEGORY(Action::LayerParamDisconnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp index f507212..74ff99a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::LayerParamSet); -ACTION_SET_NAME(Action::LayerParamSet,"layer_param_set"); +ACTION_SET_NAME(Action::LayerParamSet,"LayerParamSet"); ACTION_SET_LOCAL_NAME(Action::LayerParamSet,N_("Set Layer Parameter")); ACTION_SET_TASK(Action::LayerParamSet,"set"); ACTION_SET_CATEGORY(Action::LayerParamSet,Action::CATEGORY_LAYER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp index ef16369..208dbf8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp @@ -47,7 +47,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerRaise); -ACTION_SET_NAME(Action::LayerRaise,"layer_raise"); +ACTION_SET_NAME(Action::LayerRaise,"LayerRaise"); ACTION_SET_LOCAL_NAME(Action::LayerRaise,N_("Raise Layer")); ACTION_SET_TASK(Action::LayerRaise,"raise"); ACTION_SET_CATEGORY(Action::LayerRaise,Action::CATEGORY_LAYER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp index 0cf2a17..d10e838 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerRemove); -ACTION_SET_NAME(Action::LayerRemove,"layer_remove"); +ACTION_SET_NAME(Action::LayerRemove,"LayerRemove"); ACTION_SET_LOCAL_NAME(Action::LayerRemove,N_("Remove Layer")); ACTION_SET_TASK(Action::LayerRemove,"remove"); ACTION_SET_CATEGORY(Action::LayerRemove,Action::CATEGORY_LAYER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp index f3890cc..d62ec6f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerSetDesc); -ACTION_SET_NAME(Action::LayerSetDesc,"layer_set_desc"); +ACTION_SET_NAME(Action::LayerSetDesc,"LayerSetDesc"); ACTION_SET_LOCAL_NAME(Action::LayerSetDesc,N_("Set Layer Description")); ACTION_SET_TASK(Action::LayerSetDesc,"set_desc"); ACTION_SET_CATEGORY(Action::LayerSetDesc,Action::CATEGORY_LAYER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp b/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp index 61b554b..243a5a8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp @@ -54,7 +54,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::TimepointsCopy); -ACTION_SET_NAME(Action::TimepointsCopy,"timepoint_copy"); +ACTION_SET_NAME(Action::TimepointsCopy,"TimepointsCopy"); ACTION_SET_LOCAL_NAME(Action::TimepointsCopy,N_("Copy Time Points")); ACTION_SET_TASK(Action::TimepointsCopy,"copy"); ACTION_SET_CATEGORY(Action::TimepointsCopy,Action::CATEGORY_WAYPOINT|Action::CATEGORY_ACTIVEPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp b/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp index 5bad8f8..5beb942 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp @@ -54,7 +54,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::TimepointsDelete); -ACTION_SET_NAME(Action::TimepointsDelete,"timepoint_delete"); +ACTION_SET_NAME(Action::TimepointsDelete,"TimepointsDelete"); ACTION_SET_LOCAL_NAME(Action::TimepointsDelete,N_("Delete Time Points")); ACTION_SET_TASK(Action::TimepointsDelete,"delete"); ACTION_SET_CATEGORY(Action::TimepointsDelete,Action::CATEGORY_WAYPOINT|Action::CATEGORY_ACTIVEPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp b/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp index 01ee357..5cce2c8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp @@ -54,7 +54,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::TimepointsMove); -ACTION_SET_NAME(Action::TimepointsMove,"timepoint_move"); +ACTION_SET_NAME(Action::TimepointsMove,"TimepointsMove"); ACTION_SET_LOCAL_NAME(Action::TimepointsMove,N_("Move Time Points")); ACTION_SET_TASK(Action::TimepointsMove,"move"); ACTION_SET_CATEGORY(Action::TimepointsMove,Action::CATEGORY_WAYPOINT|Action::CATEGORY_ACTIVEPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp index 0193bf3..6f15ccb 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp @@ -55,7 +55,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueDescBLineLink); -ACTION_SET_NAME(Action::ValueDescBLineLink,"value_desc_bline_link"); +ACTION_SET_NAME(Action::ValueDescBLineLink,"ValueDescBLineLink"); ACTION_SET_LOCAL_NAME(Action::ValueDescBLineLink,N_("Link to BLine")); ACTION_SET_TASK(Action::ValueDescBLineLink,"connect"); ACTION_SET_CATEGORY(Action::ValueDescBLineLink,Action::CATEGORY_BEZIER); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp index 01955cd..cf018f3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp @@ -51,7 +51,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescConnect); -ACTION_SET_NAME(Action::ValueDescConnect,"value_desc_connect"); +ACTION_SET_NAME(Action::ValueDescConnect,"ValueDescConnect"); ACTION_SET_LOCAL_NAME(Action::ValueDescConnect,N_("Connect")); ACTION_SET_TASK(Action::ValueDescConnect,"connect"); ACTION_SET_CATEGORY(Action::ValueDescConnect,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp index 58548de..2230cf9 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp @@ -56,7 +56,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescConvert); -ACTION_SET_NAME(Action::ValueDescConvert,"value_desc_convert"); +ACTION_SET_NAME(Action::ValueDescConvert,"ValueDescConvert"); ACTION_SET_LOCAL_NAME(Action::ValueDescConvert,N_("Convert")); ACTION_SET_TASK(Action::ValueDescConvert,"convert"); ACTION_SET_CATEGORY(Action::ValueDescConvert,Action::CATEGORY_VALUEDESC); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp index ea57fd0..9d1c457 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp @@ -53,7 +53,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescDisconnect); -ACTION_SET_NAME(Action::ValueDescDisconnect,"value_desc_disconnect"); +ACTION_SET_NAME(Action::ValueDescDisconnect,"ValueDescDisconnect"); ACTION_SET_LOCAL_NAME(Action::ValueDescDisconnect,N_("Disconnect")); ACTION_SET_TASK(Action::ValueDescDisconnect,"disconnect"); ACTION_SET_CATEGORY(Action::ValueDescDisconnect,Action::CATEGORY_VALUEDESC); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp index 9fd634c..6461470 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp @@ -52,7 +52,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescExport); -ACTION_SET_NAME(Action::ValueDescExport,"value_desc_export"); +ACTION_SET_NAME(Action::ValueDescExport,"ValueDescExport"); ACTION_SET_LOCAL_NAME(Action::ValueDescExport,N_("Export")); ACTION_SET_TASK(Action::ValueDescExport,"export"); ACTION_SET_CATEGORY(Action::ValueDescExport,Action::CATEGORY_VALUEDESC); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp index 84effe4..66c736e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp @@ -48,7 +48,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueDescLink); -ACTION_SET_NAME(Action::ValueDescLink,"value_desc_link"); +ACTION_SET_NAME(Action::ValueDescLink,"ValueDescLink"); ACTION_SET_LOCAL_NAME(Action::ValueDescLink,N_("Link")); ACTION_SET_TASK(Action::ValueDescLink,"connect"); ACTION_SET_CATEGORY(Action::ValueDescLink,Action::CATEGORY_VALUEDESC); @@ -248,7 +248,7 @@ Action::ValueDescLink::prepare() link_value_node=ValueNode_Const::create(value_desc.get_value(time)); - Action::Handle action(Action::create("value_desc_connect")); + Action::Handle action(Action::create("ValueDescConnect")); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); @@ -265,7 +265,7 @@ Action::ValueDescLink::prepare() /* if(!link_value_node->is_exported()) { - Action::Handle action(Action::create("value_node_add")); + Action::Handle action(Action::create("ValueNodeAdd")); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); @@ -290,7 +290,7 @@ Action::ValueDescLink::prepare() if (value_desc.is_exported()) continue; - Action::Handle action(Action::create("value_desc_connect")); + Action::Handle action(Action::create("ValueDescConnect")); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp index a5610aa..6856150 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp @@ -55,7 +55,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescSet); -ACTION_SET_NAME(Action::ValueDescSet,"value_desc_set"); +ACTION_SET_NAME(Action::ValueDescSet,"ValueDescSet"); ACTION_SET_LOCAL_NAME(Action::ValueDescSet,N_("Set ValueDesc")); ACTION_SET_TASK(Action::ValueDescSet,"set"); ACTION_SET_CATEGORY(Action::ValueDescSet,Action::CATEGORY_VALUEDESC); @@ -174,7 +174,7 @@ Action::ValueDescSet::prepare() assert(parent_value_node); - Action::Handle action(Action::create("value_desc_set")); + Action::Handle action(Action::create("ValueDescSet")); if(!action) throw Error(_("Unable to find action value_desc_set (bug)")); @@ -199,7 +199,7 @@ Action::ValueDescSet::prepare() { ValueDesc reference_value_desc(ValueNode_Reference::Handle::cast_dynamic(value_desc.get_value_node()),0); - Action::Handle action(Action::create("value_desc_set")); + Action::Handle action(Action::create("ValueDescSet")); if(!action) throw Error(_("Unable to find action value_desc_set (bug)")); @@ -267,7 +267,7 @@ Action::ValueDescSet::prepare() { ValueDesc component_value_desc(ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()),i); - Action::Handle action(Action::create("value_desc_set")); + Action::Handle action(Action::create("ValueDescSet")); if(!action) throw Error(_("Unable to find action value_desc_set (bug)")); @@ -325,7 +325,7 @@ Action::ValueDescSet::prepare() { ValueDesc component_value_desc(ValueNode_RadialComposite::Handle::cast_dynamic(value_desc.get_value_node()),i); - Action::Handle action(Action::create("value_desc_set")); + Action::Handle action(Action::create("ValueDescSet")); if(!action) throw Error(_("Unable to find action value_desc_set (bug)")); @@ -362,7 +362,7 @@ Action::ValueDescSet::prepare() { // we are splitting tangents - Action::Handle action(Action::create("value_desc_set")); + Action::Handle action(Action::create("ValueDescSet")); if(!action) throw Error(_("Unable to find action value_desc_set (bug)")); @@ -387,7 +387,7 @@ Action::ValueDescSet::prepare() (Vector)((*parent_value_node->get_link("t2"))(time))) / 2); { - Action::Handle action(Action::create("value_desc_set")); + Action::Handle action(Action::create("ValueDescSet")); if(!action) throw Error(_("Unable to find action value_desc_set (bug)")); @@ -405,7 +405,7 @@ Action::ValueDescSet::prepare() } { - Action::Handle action(Action::create("value_desc_set")); + Action::Handle action(Action::create("ValueDescSet")); if(!action) throw Error(_("Unable to find action value_desc_set (bug)")); @@ -475,7 +475,7 @@ Action::ValueDescSet::prepare() } else { - action=Action::create("value_node_replace"); + action=Action::create("ValueNodeReplace"); action->set_param("dest",value_desc.get_value_node()); action->set_param("src",ValueNode::Handle(value_node)); } diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp index 4e4c5e1..fae23c3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeAdd); -ACTION_SET_NAME(Action::ValueNodeAdd,"value_node_add"); +ACTION_SET_NAME(Action::ValueNodeAdd,"ValueNodeAdd"); ACTION_SET_LOCAL_NAME(Action::ValueNodeAdd,N_("Add ValueNode")); ACTION_SET_TASK(Action::ValueNodeAdd,"add"); ACTION_SET_CATEGORY(Action::ValueNodeAdd,Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp index d8a455b..5a85853 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeConstSet); -ACTION_SET_NAME(Action::ValueNodeConstSet,"value_node_const_set"); +ACTION_SET_NAME(Action::ValueNodeConstSet,"ValueNodeConstSet"); ACTION_SET_LOCAL_NAME(Action::ValueNodeConstSet,N_("Set ValueNode_Const")); ACTION_SET_TASK(Action::ValueNodeConstSet,"set"); ACTION_SET_CATEGORY(Action::ValueNodeConstSet,Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp index 0613603..b4c0e20 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeDynamicListInsert); -ACTION_SET_NAME(Action::ValueNodeDynamicListInsert,"value_node_dynamic_list_insert"); +ACTION_SET_NAME(Action::ValueNodeDynamicListInsert,"ValueNodeDynamicListInsert"); ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsert,N_("Insert Item")); ACTION_SET_TASK(Action::ValueNodeDynamicListInsert,"insert"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListInsert,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE|Action::CATEGORY_HIDDEN); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp index 889aa87..bed7c6c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp @@ -47,7 +47,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeDynamicListInsertSmart); -ACTION_SET_NAME(Action::ValueNodeDynamicListInsertSmart,"value_node_dynamic_list_insert_smart"); +ACTION_SET_NAME(Action::ValueNodeDynamicListInsertSmart,"ValueNodeDynamicListInsertSmart"); ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsertSmart,N_("Insert Item (Smart)")); ACTION_SET_TASK(Action::ValueNodeDynamicListInsertSmart,"insert"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListInsertSmart,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); @@ -178,7 +178,7 @@ Action::ValueNodeDynamicListInsertSmart::prepare() ValueDesc item_value_desc(value_node,index); - Action::Handle action(Action::create("value_desc_set")); + Action::Handle action(Action::create("ValueDescSet")); if(!action) throw Error(_("Unable to find action value_desc_set (bug)")); @@ -199,7 +199,7 @@ Action::ValueNodeDynamicListInsertSmart::prepare() { // Ok, not a big deal, we just need to // add a new item - Action::Handle action(Action::create("value_node_dynamic_list_insert")); + Action::Handle action(Action::create("ValueNodeDynamicListInsert")); if(!action) throw Error(_("Unable to find action (bug)")); @@ -215,7 +215,7 @@ Action::ValueNodeDynamicListInsertSmart::prepare() add_action(action); - action=Action::create("activepoint_set_off"); + action=Action::create("ActivepointSetOff"); if(!action) throw Error(_("Unable to find action \"activepoint_set_off\"")); @@ -234,7 +234,7 @@ Action::ValueNodeDynamicListInsertSmart::prepare() } // Now we set the activepoint up and then we'll be done - Action::Handle action(Action::create("activepoint_set_on")); + Action::Handle action(Action::create("ActivepointSetOn")); if(!action) throw Error(_("Unable to find action \"activepoint_set_on\"")); @@ -253,7 +253,7 @@ Action::ValueNodeDynamicListInsertSmart::prepare() } else { - Action::Handle action(Action::create("value_node_dynamic_list_insert")); + Action::Handle action(Action::create("ValueNodeDynamicListInsert")); if(!action) throw Error(_("Unable to find action (bug)")); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp index 4f99e57..abc4628 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeDynamicListLoop); -ACTION_SET_NAME(Action::ValueNodeDynamicListLoop,"value_node_dynamic_list_loop"); +ACTION_SET_NAME(Action::ValueNodeDynamicListLoop,"ValueNodeDynamicListLoop"); ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListLoop,N_("Loop")); ACTION_SET_TASK(Action::ValueNodeDynamicListLoop,"loop"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListLoop,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp index bcc38f3..0f50d81 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeDynamicListRemove); -ACTION_SET_NAME(Action::ValueNodeDynamicListRemove,"value_node_dynamic_list_remove"); +ACTION_SET_NAME(Action::ValueNodeDynamicListRemove,"ValueNodeDynamicListRemove"); ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRemove,N_("Remove Item")); ACTION_SET_TASK(Action::ValueNodeDynamicListRemove,"remove"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRemove,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE|Action::CATEGORY_HIDDEN); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp index 6bd7a90..8615f9d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp @@ -47,7 +47,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeDynamicListRemoveSmart); -ACTION_SET_NAME(Action::ValueNodeDynamicListRemoveSmart,"value_node_dynamic_list_remove_smart"); +ACTION_SET_NAME(Action::ValueNodeDynamicListRemoveSmart,"ValueNodeDynamicListRemoveSmart"); ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRemoveSmart,N_("Remove Item (Smart)")); ACTION_SET_TASK(Action::ValueNodeDynamicListRemoveSmart,"remove"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRemoveSmart,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); @@ -153,7 +153,7 @@ Action::ValueNodeDynamicListRemoveSmart::prepare() // If we are in animate editing mode if(get_edit_mode()&MODE_ANIMATE) { - Action::Handle action(Action::create("activepoint_set_off")); + Action::Handle action(Action::create("ActivepointSetOff")); if(!action) throw Error(_("Unable to find action (bug)")); @@ -171,7 +171,7 @@ Action::ValueNodeDynamicListRemoveSmart::prepare() } else { - Action::Handle action(Action::create("value_node_dynamic_list_remove")); + Action::Handle action(Action::create("ValueNodeDynamicListRemove")); if(!action) throw Error(_("Unable to find action (bug)")); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp index 0dd78db..8e633ca 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeDynamicListRotateOrder); -ACTION_SET_NAME(Action::ValueNodeDynamicListRotateOrder,"value_node_dynamic_list_rotate_order"); +ACTION_SET_NAME(Action::ValueNodeDynamicListRotateOrder,"ValueNodeDynamicListRotateOrder"); ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRotateOrder,N_("Rotate Order")); ACTION_SET_TASK(Action::ValueNodeDynamicListRotateOrder,"rotate"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRotateOrder,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); @@ -133,7 +133,7 @@ Action::ValueNodeDynamicListRotateOrder::prepare() ValueNode::Handle child(value_desc.get_value_node()); - Action::Handle action(Action::create("value_node_dynamic_list_remove")); + Action::Handle action(Action::create("ValueNodeDynamicListRemove")); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); @@ -146,7 +146,7 @@ Action::ValueNodeDynamicListRotateOrder::prepare() add_action(action); - action=Action::create("value_node_dynamic_list_insert"); + action=Action::create("ValueNodeDynamicListInsert"); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp index 079be3a..9b1daf5 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeDynamicListUnLoop); -ACTION_SET_NAME(Action::ValueNodeDynamicListUnLoop,"value_node_dynamic_list_unloop"); +ACTION_SET_NAME(Action::ValueNodeDynamicListUnLoop,"ValueNodeDynamicListUnLoop"); ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListUnLoop,N_("Unloop")); ACTION_SET_TASK(Action::ValueNodeDynamicListUnLoop,"unloop"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListUnLoop,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp index f5f433d..3f3c34b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeLinkConnect); -ACTION_SET_NAME(Action::ValueNodeLinkConnect,"value_node_link_connect"); +ACTION_SET_NAME(Action::ValueNodeLinkConnect,"ValueNodeLinkConnect"); ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkConnect,N_("Connect ValueNode Link")); ACTION_SET_TASK(Action::ValueNodeLinkConnect,"connect"); ACTION_SET_CATEGORY(Action::ValueNodeLinkConnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp index 6e06b7d..de3c54b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeLinkDisconnect); -ACTION_SET_NAME(Action::ValueNodeLinkDisconnect,"value_node_link_disconnect"); +ACTION_SET_NAME(Action::ValueNodeLinkDisconnect,"ValueNodeLinkDisconnect"); ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkDisconnect,N_("Disconnect ValueNode Link")); ACTION_SET_TASK(Action::ValueNodeLinkDisconnect,"disconnect"); ACTION_SET_CATEGORY(Action::ValueNodeLinkDisconnect,Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp index 5487f36..e192870 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueNodeRemove); -ACTION_SET_NAME(Action::ValueNodeRemove,"value_node_remove"); +ACTION_SET_NAME(Action::ValueNodeRemove,"ValueNodeRemove"); ACTION_SET_LOCAL_NAME(Action::ValueNodeRemove,N_("Unexport")); ACTION_SET_TASK(Action::ValueNodeRemove,"remove"); ACTION_SET_CATEGORY(Action::ValueNodeRemove,Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp index e45bd19..10d25f9 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueNodeRename); -ACTION_SET_NAME(Action::ValueNodeRename,"value_node_rename"); +ACTION_SET_NAME(Action::ValueNodeRename,"ValueNodeRename"); ACTION_SET_LOCAL_NAME(Action::ValueNodeRename,N_("Rename ValueNode")); ACTION_SET_TASK(Action::ValueNodeRename,"rename"); ACTION_SET_CATEGORY(Action::ValueNodeRename,Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp index 28eb71e..2bc5e2d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeReplace); -ACTION_SET_NAME(Action::ValueNodeReplace,"value_node_replace"); +ACTION_SET_NAME(Action::ValueNodeReplace,"ValueNodeReplace"); ACTION_SET_LOCAL_NAME(Action::ValueNodeReplace,N_("Replace ValueNode")); ACTION_SET_TASK(Action::ValueNodeReplace,"replace"); ACTION_SET_CATEGORY(Action::ValueNodeReplace,Action::CATEGORY_VALUENODE|Action::CATEGORY_DRAG); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp index ef4a378..5b03edf 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp @@ -47,7 +47,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::WaypointAdd); -ACTION_SET_NAME(Action::WaypointAdd,"waypoint_add"); +ACTION_SET_NAME(Action::WaypointAdd,"WaypointAdd"); ACTION_SET_LOCAL_NAME(Action::WaypointAdd,N_("Add Waypoint")); ACTION_SET_TASK(Action::WaypointAdd,"add"); ACTION_SET_CATEGORY(Action::WaypointAdd,Action::CATEGORY_WAYPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointconnect.cpp index b45df55..f86cc1e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointconnect.cpp @@ -46,7 +46,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::WaypointConnect); -ACTION_SET_NAME(Action::WaypointConnect,"waypoint_connect"); +ACTION_SET_NAME(Action::WaypointConnect,"WaypointConnect"); ACTION_SET_LOCAL_NAME(Action::WaypointConnect,N_("Connect Waypoint")); ACTION_SET_TASK(Action::WaypointConnect,"connect"); ACTION_SET_CATEGORY(Action::WaypointConnect,Action::CATEGORY_WAYPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointdisconnect.cpp index fd0e753..cd04f10 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointdisconnect.cpp @@ -47,7 +47,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::WaypointDisconnect); -ACTION_SET_NAME(Action::WaypointDisconnect,"waypoint_disconnect"); +ACTION_SET_NAME(Action::WaypointDisconnect,"WaypointDisconnect"); ACTION_SET_LOCAL_NAME(Action::WaypointDisconnect,N_("Disconnect Waypoint")); ACTION_SET_TASK(Action::WaypointDisconnect,"disconnect"); ACTION_SET_CATEGORY(Action::WaypointDisconnect,Action::CATEGORY_WAYPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp index d79b21d..4374cdc 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::WaypointRemove); -ACTION_SET_NAME(Action::WaypointRemove,"waypoint_remove"); +ACTION_SET_NAME(Action::WaypointRemove,"WaypointRemove"); ACTION_SET_LOCAL_NAME(Action::WaypointRemove,N_("Remove Waypoint")); ACTION_SET_TASK(Action::WaypointRemove,"remove"); ACTION_SET_CATEGORY(Action::WaypointRemove,Action::CATEGORY_WAYPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp index 47afde3..f99cbb0 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::WaypointSet); -ACTION_SET_NAME(Action::WaypointSet,"waypoint_set"); +ACTION_SET_NAME(Action::WaypointSet,"WaypointSet"); ACTION_SET_LOCAL_NAME(Action::WaypointSet,N_("Set Waypoint")); ACTION_SET_TASK(Action::WaypointSet,"set"); ACTION_SET_CATEGORY(Action::WaypointSet,Action::CATEGORY_WAYPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp index 23a0ea2..eb403ac 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp @@ -55,7 +55,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::WaypointSetSmart); -ACTION_SET_NAME(Action::WaypointSetSmart,"waypoint_set_smart"); +ACTION_SET_NAME(Action::WaypointSetSmart,"WaypointSetSmart"); ACTION_SET_LOCAL_NAME(Action::WaypointSetSmart,N_("Add Waypoint")); ACTION_SET_TASK(Action::WaypointSetSmart,"set"); ACTION_SET_CATEGORY(Action::WaypointSetSmart,Action::CATEGORY_WAYPOINT|Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp index 230a82e..1fda945 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp @@ -45,7 +45,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::WaypointSimpleAdd); -ACTION_SET_NAME(Action::WaypointSimpleAdd,"waypoint_simpleadd"); +ACTION_SET_NAME(Action::WaypointSimpleAdd,"WaypointSimpleAdd"); ACTION_SET_LOCAL_NAME(Action::WaypointSimpleAdd,N_("Simply Add Waypoint")); ACTION_SET_TASK(Action::WaypointSimpleAdd,"add"); ACTION_SET_CATEGORY(Action::WaypointSimpleAdd,Action::CATEGORY_WAYPOINT); diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp index da1a802..8bac47f 100644 --- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp +++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp @@ -300,7 +300,7 @@ CanvasInterface::add_layer_to(synfig::String name, synfig::Canvas::Handle canvas // Action to move the layer (if necessary) if(depth>0) { - Action::Handle action(Action::create("layer_move")); + Action::Handle action(Action::create("LayerMove")); assert(action); if(!action) @@ -463,7 +463,7 @@ CanvasInterface::generate_param_list(const std::list &valu void CanvasInterface::set_rend_desc(const synfig::RendDesc &rend_desc) { - Action::Handle action(Action::create("canvas_rend_desc_set")); + Action::Handle action(Action::create("CanvasRendDescSet")); assert(action); if(!action) @@ -480,7 +480,7 @@ CanvasInterface::set_rend_desc(const synfig::RendDesc &rend_desc) void CanvasInterface::set_name(const synfig::String &x) { - Action::Handle action(Action::create("canvas_name_set")); + Action::Handle action(Action::create("CanvasNameSet")); assert(action); if(!action) @@ -499,7 +499,7 @@ CanvasInterface::set_name(const synfig::String &x) void CanvasInterface::set_description(const synfig::String &x) { - Action::Handle action(Action::create("canvas_description_set")); + Action::Handle action(Action::create("CanvasDescriptionSet")); assert(action); if(!action) @@ -516,7 +516,7 @@ CanvasInterface::set_description(const synfig::String &x) void CanvasInterface::set_id(const synfig::String &x) { - Action::Handle action(Action::create("canvas_id_set")); + Action::Handle action(Action::create("CanvasIdSet")); assert(action); if(!action) @@ -688,7 +688,7 @@ CanvasInterface::waypoint_duplicate(synfigapp::ValueDesc value_desc,synfig::Wayp void CanvasInterface::waypoint_duplicate(ValueNode::Handle value_node,synfig::Waypoint waypoint) { - Action::Handle action(Action::create("waypoint_set_smart")); + Action::Handle action(Action::create("WaypointSetSmart")); assert(action); if(!action) @@ -717,7 +717,7 @@ CanvasInterface::waypoint_remove(synfigapp::ValueDesc value_desc,synfig::Waypoin void CanvasInterface::waypoint_remove(ValueNode::Handle value_node,synfig::Waypoint waypoint) { - Action::Handle action(Action::create("waypoint_remove")); + Action::Handle action(Action::create("WaypointRemove")); assert(action); if(!action) @@ -741,7 +741,7 @@ CanvasInterface::auto_export(synfig::ValueNode::Handle /*value_node*/) if(value_node->is_exported()) return; - Action::Handle action(Action::create("value_node_add")); + Action::Handle action(Action::create("ValueNodeAdd")); assert(action); if(!action) @@ -768,7 +768,7 @@ CanvasInterface::auto_export(const ValueDesc& /*value_desc*/) if(value_desc.is_exported()) return; - Action::Handle action(Action::create("value_desc_export")); + Action::Handle action(Action::create("ValueDescExport")); assert(action); if(!action) @@ -815,7 +815,7 @@ CanvasInterface::change_value(synfigapp::ValueDesc value_desc,synfig::ValueBase { synfig::warning("Can't get canvas from value desc...?"); } #endif - synfigapp::Action::Handle action(synfigapp::Action::create("value_desc_set")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueDescSet")); if(!action) { return false; -- 2.7.4