**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007, 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
#include "instance.h"
#include <gtkmm/treemodelsort.h>
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+# include <synfig/timepointcollect.h>
+#endif // TIMETRACK_IN_PARAMS_PANEL
+
#include "general.h"
#endif
SMALL_BUTTON(button_raise,"gtk-go-up","Raise");
SMALL_BUTTON(button_lower,"gtk-go-down","Lower");
SMALL_BUTTON(button_duplicate,"synfig-duplicate","Duplicate");
+ SMALL_BUTTON(button_encapsulate,"synfig-encapsulate","Encapsulate");
SMALL_BUTTON(button_delete,"gtk-delete","Delete");
hbox->pack_start(*button_raise,Gtk::PACK_SHRINK);
hbox->pack_start(*button_lower,Gtk::PACK_SHRINK);
hbox->pack_start(*button_duplicate,Gtk::PACK_SHRINK);
+ hbox->pack_start(*button_encapsulate,Gtk::PACK_SHRINK);
hbox->pack_start(*button_delete,Gtk::PACK_SHRINK);
- button_raise->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_raise_pressed));
- button_lower->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_lower_pressed));
- button_duplicate->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_duplicate_pressed));
- button_delete->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_delete_pressed));
+ // button_raise->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_raise_pressed));
+ // button_lower->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_lower_pressed));
+ // button_duplicate->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_duplicate_pressed));
+ // button_encapsulate->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_encapsulate_pressed));
+ // button_delete->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_delete_pressed));
button_raise->set_sensitive(false);
button_lower->set_sensitive(false);
button_duplicate->set_sensitive(false);
+ button_encapsulate->set_sensitive(false);
button_delete->set_sensitive(false);
get_selection()->signal_changed().connect(sigc::mem_fun(*this, &studio::LayerTree::on_selection_changed));
column->set_clickable();
column->set_sort_column(param_model.type);
}
- /*{ // --- T I M E T R A C K --------------------------------------------
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ { // --- T I M E T R A C K --------------------------------------------
Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Time Track")) );
column_time_track=column;
cellrenderer_time_track->signal_waypoint_changed().connect(sigc::mem_fun(*this, &studio::LayerTree::on_waypoint_changed) );
column->add_attribute(cellrenderer_time_track->property_value_desc(), param_model.value_desc);
column->add_attribute(cellrenderer_time_track->property_canvas(), param_model.canvas);
- //column->add_attribute(cellrenderer_time_track->property_visible(), model.is_value_node);
-
- //column->pack_start(*cellrenderer_time_track);
+ column->add_attribute(cellrenderer_time_track->property_visible(), param_model.is_value_node);
// Finish setting up the column
column->set_reorderable();
column->set_resizable();
column->set_min_width(200);
- //get_param_tree_view().append_column(*column);
- }*/
+
+ if (!getenv("SYNFIG_DISABLE_PARAMS_PANEL_TIMETRACK"))
+ get_param_tree_view().append_column(*column);
+ }
+#endif // TIMETRACK_IN_PARAMS_PANEL
// This makes things easier to read.
get_param_tree_view().set_rules_hint();
param_list.add("waypoint",waypoint);
// param_list.add("time",canvas_interface()->get_time());
- etl::handle<studio::Instance>::cast_static(layer_tree_store_->canvas_interface()->get_instance())->process_action("waypoint_set_smart", param_list);
+ etl::handle<studio::Instance>::cast_static(layer_tree_store_->canvas_interface()->get_instance())->process_action("WaypointSetSmart", param_list);
}
void
get_param_tree_view().set_model(param_tree_store_);
}
-/* if(cellrenderer_time_track && layer_tree_store_ && layer_tree_store_->canvas_interface())
- {
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ if(cellrenderer_time_track && layer_tree_store_ && layer_tree_store_->canvas_interface())
cellrenderer_time_track->set_canvas_interface(layer_tree_store_->canvas_interface());
- }
-*/
+#endif // TIMETRACK_IN_PARAMS_PANEL
}
void
LayerTree::set_time_adjustment(Gtk::Adjustment &adjustment)
{
- //cellrenderer_time_track->set_adjustment(adjustment);
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ cellrenderer_time_track->set_adjustment(adjustment);
+#endif // TIMETRACK_IN_PARAMS_PANEL
adjustment.signal_value_changed().connect(sigc::mem_fun(get_param_tree_view(),&Gtk::TreeView::queue_draw));
adjustment.signal_changed().connect(sigc::mem_fun(get_param_tree_view(),&Gtk::TreeView::queue_draw));
}
button_raise->set_sensitive(false);
button_lower->set_sensitive(false);
button_duplicate->set_sensitive(false);
+ button_encapsulate->set_sensitive(false);
button_delete->set_sensitive(false);
layer_amount_hscale->set_sensitive(false);
blend_method_widget.set_sensitive(false);
button_raise->set_sensitive(true);
button_lower->set_sensitive(true);
button_duplicate->set_sensitive(true);
+ button_encapsulate->set_sensitive(true);
button_delete->set_sensitive(true);
if(layer_list.size()==1 && (*layer_list.begin())->get_param("amount").is_valid()&& (*layer_list.begin())->get_param("amount").same_type_as(Real()))
row[layer_model.active]=!active;
}
+#ifdef TIMETRACK_IN_PARAMS_PANEL
void
LayerTree::on_waypoint_clicked_layertree(const etl::handle<synfig::Node>& node __attribute__ ((unused)),
const synfig::Time& time __attribute__ ((unused)),
const synfig::Time& time_offset __attribute__ ((unused)),
- int button __attribute__ ((unused)),
- synfig::Waypoint::Side side __attribute__ ((unused)))
+ int button __attribute__ ((unused)))
{
- //! \todo writeme
+ std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
+ synfig::waypoint_collect(waypoint_set,time,node);
+
+ synfigapp::ValueDesc value_desc;
- // synfigapp::ValueDesc value_desc;
- // std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
- // signal_waypoint_clicked_layertree()(value_desc,waypoint_set,button,side);
+ if (waypoint_set.size() == 1)
+ {
+ ValueNode::Handle value_node(waypoint_set.begin()->get_parent_value_node());
+ assert(value_node);
+
+ Gtk::TreeRow row;
+ if (param_tree_store_->find_first_value_node(value_node, row) && row)
+ value_desc = static_cast<synfigapp::ValueDesc>(row[param_tree_store_->model.value_desc]);
+ }
+
+ if (!waypoint_set.empty())
+ signal_waypoint_clicked_layertree()(value_desc,waypoint_set,button);
}
+#endif // TIMETRACK_IN_PARAMS_PANEL
bool
LayerTree::on_layer_tree_event(GdkEvent *event)
) break;
const Gtk::TreeRow row = *(get_layer_tree_view().get_model()->get_iter(path));
- //if(column->get_first_cell_renderer()==cellrenderer_time_track)
- // return signal_layer_user_click()(event->button.button,row,COLUMNID_TIME_TRACK);
- //else
- if(column->get_first_cell_renderer()==cellrenderer_value)
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ if(column->get_first_cell_renderer()==cellrenderer_time_track)
+ return signal_layer_user_click()(event->button.button,row,COLUMNID_TIME_TRACK);
+ else
+#endif // TIMETRACK_IN_PARAMS_PANEL
+ if(column->get_first_cell_renderer()==cellrenderer_value)
return signal_layer_user_click()(event->button.button,row,COLUMNID_VALUE);
else
return signal_layer_user_click()(event->button.button,row,COLUMNID_NAME);
Gtk::TreeRow row = *(get_layer_tree_view().get_model()->get_iter(path));
- /*
+#ifdef TIMETRACK_IN_PARAMS_PANEL
if(cellrenderer_time_track==column->get_first_cell_renderer())
- {
// Movement on TimeLine
return true;
- }
else
- */
+#endif // TIMETRACK_IN_PARAMS_PANEL
if(last_tooltip_path.get_depth()<=0 || path!=last_tooltip_path)
{
tooltips_.unset_tip(*this);
) break;
const Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path));
-/* if(column && column->get_first_cell_renderer()==cellrenderer_time_track)
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ if(column && column->get_first_cell_renderer()==cellrenderer_time_track)
{
Gdk::Rectangle rect;
get_param_tree_view().get_cell_area(path,*column,rect);
//return signal_param_user_click()(event->button.button,row,COLUMNID_TIME_TRACK);
}
else
-*/ {
+#endif // TIMETRACK_IN_PARAMS_PANEL
+ {
if(event->button.button==3)
{
LayerList layer_list(get_selected_layers());
Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path));
-/* if((event->motion.state&GDK_BUTTON1_MASK ||event->motion.state&GDK_BUTTON3_MASK) && column && cellrenderer_time_track==column->get_first_cell_renderer())
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ if((event->motion.state&GDK_BUTTON1_MASK ||event->motion.state&GDK_BUTTON3_MASK) && column && cellrenderer_time_track==column->get_first_cell_renderer())
{
Gdk::Rectangle rect;
get_param_tree_view().get_cell_area(path,*column,rect);
return true;
}
else
-*/ if(last_tooltip_path.get_depth()<=0 || path!=last_tooltip_path)
+#endif // TIMETRACK_IN_PARAMS_PANEL
+ if(last_tooltip_path.get_depth()<=0 || path!=last_tooltip_path)
{
tooltips_.unset_tip(*this);
Glib::ustring tooltips_string(row[layer_model.tooltip]);
Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path));
-/* if(column && cellrenderer_time_track==column->get_first_cell_renderer())
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ if(column && cellrenderer_time_track==column->get_first_cell_renderer())
{
Gdk::Rectangle rect;
get_param_tree_view().get_cell_area(path,*column,rect);
return true;
}
-*/
+#endif // TIMETRACK_IN_PARAMS_PANEL
}
break;
default:
return false;
}
-void
-LayerTree::on_raise_pressed()
-{
- synfigapp::Action::ParamList param_list;
- param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
- param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
- param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
-
- {
- synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
- synfigapp::SelectionManager::LayerList::iterator iter;
-
- 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"));
- action->set_param_list(param_list);
- layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
-}
-
-void
-LayerTree::on_lower_pressed()
-{
- synfigapp::Action::ParamList param_list;
- param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
- param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
- param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
-
- {
- synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
- synfigapp::SelectionManager::LayerList::iterator iter;
-
- 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_lower"));
- action->set_param_list(param_list);
- layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
-}
-
-void
-LayerTree::on_duplicate_pressed()
-{
- synfigapp::Action::ParamList param_list;
- param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
- param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
- param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
-
- {
- synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
- synfigapp::SelectionManager::LayerList::iterator iter;
-
- 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_duplicate"));
- action->set_param_list(param_list);
- layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
-}
-
-void
-LayerTree::on_delete_pressed()
-{
- synfigapp::Action::ParamList param_list;
- param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
- param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
- param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
-
- {
- synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
- synfigapp::SelectionManager::LayerList::iterator iter;
-
- 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_remove"));
- action->set_param_list(param_list);
- layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
-}
+// void
+// LayerTree::on_raise_pressed()
+// {
+// synfigapp::Action::ParamList param_list;
+// param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// {
+// synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// param_list.add("layer",Layer::Handle(*iter));
+// }
+// synfigapp::Action::Handle action(synfigapp::Action::create("LayerRaise"));
+// action->set_param_list(param_list);
+// layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
+
+// void
+// LayerTree::on_lower_pressed()
+// {
+// synfigapp::Action::ParamList param_list;
+// param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// {
+// synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// param_list.add("layer",Layer::Handle(*iter));
+// }
+//
+// synfigapp::Action::Handle action(synfigapp::Action::create("LayerLower"));
+// action->set_param_list(param_list);
+// layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
+
+// void
+// LayerTree::on_duplicate_pressed()
+// {
+// synfigapp::Action::ParamList param_list;
+// param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// {
+// synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// param_list.add("layer",Layer::Handle(*iter));
+// }
+//
+// synfigapp::Action::Handle action(synfigapp::Action::create("LayerDuplicate"));
+// action->set_param_list(param_list);
+// layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
+
+// void
+// LayerTree::on_encapsulate_pressed()
+// {
+// synfigapp::Action::ParamList param_list;
+// param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// {
+// synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// param_list.add("layer",Layer::Handle(*iter));
+// }
+//
+// synfigapp::Action::Handle action(synfigapp::Action::create("LayerEncapsulate"));
+// action->set_param_list(param_list);
+// layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
+
+// void
+// LayerTree::on_delete_pressed()
+// {
+// synfigapp::Action::ParamList param_list;
+// param_list.add("time",layer_tree_store_->canvas_interface()->get_time());
+// param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
+// param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
+//
+// {
+// synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+// synfigapp::SelectionManager::LayerList::iterator iter;
+//
+// for(iter=layer_list.begin();iter!=layer_list.end();++iter)
+// param_list.add("layer",Layer::Handle(*iter));
+// }
+//
+// synfigapp::Action::Handle action(synfigapp::Action::create("LayerRemove"));
+// action->set_param_list(param_list);
+// layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
+// }
/*
void
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);
projects / synfig.git / blobdiff