projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There's some special-case code to make exporting a blinepoint actually export its...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
instance.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/instance.cpp
b/synfig-studio/trunk/src/gtkmm/instance.cpp
index
b3b0087
..
9a247cb
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/instance.cpp
@@
-7,6
+7,7
@@
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2007, 2008 Chris Moore
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2007, 2008 Chris Moore
+** Copyright (c) 2008 Carlos López
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-945,6
+946,9
@@
Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
void
Instance::process_action(synfig::String name, synfigapp::Action::ParamList param_list)
{
void
Instance::process_action(synfig::String name, synfigapp::Action::ParamList param_list)
{
+ //// debug actions
+ // synfig::info("%s:%d process_action: '%s'", __FILE__, __LINE__, name.c_str());
+
assert(synfigapp::Action::book().count(name));
synfigapp::Action::BookEntry entry(synfigapp::Action::book().find(name)->second);
assert(synfigapp::Action::book().count(name));
synfigapp::Action::BookEntry entry(synfigapp::Action::book().find(name)->second);
@@
-978,7
+982,7
@@
Instance::process_action(synfig::String name, synfigapp::Action::ParamList param
case synfigapp::Action::Param::TYPE_STRING:
{
String str;
case synfigapp::Action::Param::TYPE_STRING:
{
String str;
- if(!studio::App::dialog_entry(entry.local_name, iter->get_local_name()+":"+iter->get_desc(),str))
+ if(!studio::App::dialog_entry(entry.local_name, iter->get_local_name()+":
"+iter->get_desc(),str))
return;
action->set_param(iter->get_name(),str);
break;
return;
action->set_param(iter->get_name(),str);
break;
@@
-1014,6
+1018,7
@@
Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga
param_list=canvas_interface->generate_param_list(value_desc);
param_list.add("origin",location);
param_list=canvas_interface->generate_param_list(value_desc);
param_list.add("origin",location);
+#ifdef BLINEPOINT_MENU_IS_VERTEX_MENU
if(value_desc.get_value_type()==ValueBase::TYPE_BLINEPOINT && value_desc.is_value_node() && ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()))
{
param_list2=canvas_interface->generate_param_list(
if(value_desc.get_value_type()==ValueBase::TYPE_BLINEPOINT && value_desc.is_value_node() && ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()))
{
param_list2=canvas_interface->generate_param_list(
@@
-1024,6
+1029,7
@@
Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga
);
param_list2.add("origin",location);
}
);
param_list2.add("origin",location);
}
+#endif // BLINEPOINT_MENU_IS_VERTEX_MENU
// Populate the convert menu by looping through
// the ValueNode book and find the ones that are
// Populate the convert menu by looping through
// the ValueNode book and find the ones that are
@@
-1170,13
+1176,13
@@
edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
if(!value_desc.is_value_node())
{
if(!value_desc.is_value_node())
{
- action=synfigapp::Action::create("
value_desc_c
onnect");
+ action=synfigapp::Action::create("
ValueDescC
onnect");
action->set_param("dest",value_desc);
action->set_param("src",ValueNode::Handle(value_node));
}
else
{
action->set_param("dest",value_desc);
action->set_param("src",ValueNode::Handle(value_node));
}
else
{
- action=synfigapp::Action::create("
value_node_r
eplace");
+ action=synfigapp::Action::create("
ValueNodeR
eplace");
action->set_param("dest",value_desc.get_value_node());
action->set_param("src",ValueNode::Handle(value_node));
}
action->set_param("dest",value_desc.get_value_node());
action->set_param("src",ValueNode::Handle(value_node));
}
@@
-1199,11
+1205,11
@@
edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
if(value_node)
{
if(value_node)
{
- synfigapp::Action::Handle action(synfigapp::Action::create("
waypoint_set_s
mart"));
+ synfigapp::Action::Handle action(synfigapp::Action::create("
WaypointSetS
mart"));
if(!action)
{
if(!action)
{
- canvas_view->get_ui_interface()->error(_("Unable to find
waypoint_set_s
mart action"));
+ canvas_view->get_ui_interface()->error(_("Unable to find
WaypointSetS
mart action"));
group.cancel();
return;
}
group.cancel();
return;
}