-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
/*! \file layertree.cpp
** \brief Template File
**
-** $Id: layertree.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+** $Id$
**
** \legal
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007, 2008 Chris Moore
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+** This package is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** General Public License for more details.
** \endlegal
*/
/* ========================================================================= */
#include "layerparamtreestore.h"
#include "cellrenderer_value.h"
#include "cellrenderer_timetrack.h"
-#include <sinfgapp/action.h>
-#include <sinfgapp/instance.h>
+#include <synfigapp/action.h>
+#include <synfigapp/instance.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/paned.h>
#include "app.h"
#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
/* === U S I N G =========================================================== */
using namespace std;
using namespace etl;
-using namespace sinfg;
+using namespace synfig;
using namespace studio;
/* === M A C R O S ========================================================= */
LayerTree::LayerTree():
layer_amount_adjustment_(1,0,1,0.01,0.01,0)
-{
+{
param_tree_view_=new Gtk::TreeView;
layer_tree_view_=new Gtk::TreeView;
-
+
//Gtk::HPaned* hpaned(manage(new Gtk::HPaned()));
//hpaned->show();
//attach(*hpaned, 0, 3, 0, 1, Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL, 0, 0);
//attach(*create_layer_tree(), 0, 3, 0, 1, Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL, 0, 0);
-
+
create_layer_tree();
create_param_tree();
-
+
//hpaned->pack1(*create_layer_tree(),false,false);
//hpaned->pack2(*create_param_tree(),true,false);
//hpaned->set_position(200);
hbox=manage(new Gtk::HBox());
-
+
attach(*hbox, 0, 1, 1, 2, Gtk::FILL|Gtk::SHRINK, Gtk::SHRINK, 0, 0);
attach(blend_method_widget, 2, 3, 1, 2,Gtk::SHRINK, Gtk::SHRINK, 0, 0);
layer_amount_hscale->set_digits(2);
layer_amount_hscale->set_value_pos(Gtk::POS_LEFT);
layer_amount_hscale->set_sensitive(false);
- layer_amount_hscale->set_update_policy( Gtk::UPDATE_DISCONTINUOUS);
+ layer_amount_hscale->set_update_policy( Gtk::UPDATE_DISCONTINUOUS);
attach(*layer_amount_hscale, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 1, 1);
layer_amount_adjustment_.signal_value_changed().connect(sigc::mem_fun(*this, &studio::LayerTree::on_amount_value_changed));
-
-
-
-
+
Gtk::Image *icon;
- //Gtk::IconSize iconsize(Gtk::IconSize::from_name("sinfg-small_icon"));
+ //Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon"));
Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR);
SMALL_BUTTON(button_raise,"gtk-go-up","Raise");
SMALL_BUTTON(button_lower,"gtk-go-down","Lower");
- SMALL_BUTTON(button_duplicate,"sinfg-duplicate","Duplicate");
+ 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));
-
get_layer_tree_view().set_reorderable(true);
get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
//get_param_tree_view().get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
get_layer_tree_view().show();
- param_tree_view().show();
-
+ get_param_tree_view().show();
hbox->show();
layer_amount_hscale->show();
tooltips_.enable();
disable_amount_changed_signal=false;
-
-
-
-
blend_method_widget.set_param_desc(ParamDesc(Color::BlendMethod(),"blend_method"));
blend_method_widget.set_value((int)Color::BLEND_COMPOSITE);
blend_method_widget.signal_activate().connect(sigc::mem_fun(*this, &studio::LayerTree::on_blend_method_changed));
}
-
LayerTree::~LayerTree()
{
- sinfg::info("LayerTree::~LayerTree(): Deleted");
+ if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+ synfig::info("LayerTree::~LayerTree(): Deleted");
}
Gtk::Widget*
{
const LayerTreeStore::Model model;
-
{ // --- O N / O F F ----------------------------------------------------
- int index;
- index=get_layer_tree_view().append_column_editable(_(" "),layer_model.active);
+ //int index;
+ //index=get_layer_tree_view().append_column_editable(_(" "),layer_model.active);
//Gtk::TreeView::Column* column = get_layer_tree_view().get_column(index-1);
+
+ Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_(" ")) );
+
+ // Set up the icon cell-renderer
+ Gtk::CellRendererToggle* cellrenderer = Gtk::manage( new Gtk::CellRendererToggle() );
+ cellrenderer->signal_toggled().connect(sigc::mem_fun(*this, &studio::LayerTree::on_layer_toggle));
+
+ column->pack_start(*cellrenderer,false);
+ column->add_attribute(cellrenderer->property_active(), layer_model.active);
+ get_layer_tree_view().append_column(*column);
}
+
{ // --- I C O N --------------------------------------------------------
int index;
index=get_layer_tree_view().append_column(_("Z"),layer_model.icon);
Gtk::TreeView::Column* column = get_layer_tree_view().get_column(index-1);
get_layer_tree_view().set_expander_column(*column);
-
- column->set_sort_column_id(layer_model.z_depth);
+ column->set_sort_column(layer_model.z_depth);
//column->set_reorderable();
//column->set_resizable();
//column->set_clickable();
-
+
//Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() );
//column->pack_start(*icon_cellrenderer,false);
//column->add_attribute(icon_cellrenderer->property_pixbuf(), layer_model.icon);
}
//get_layer_tree_view().append_column(_("Z"),layer_model.z_depth);
{ // --- N A M E --------------------------------------------------------
- int index;
- index=get_layer_tree_view().append_column_editable(_("Layer"),layer_model.label);
- //Gtk::TreeView::Column* column = get_layer_tree_view().get_column(index-1);
+ Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Name")) );
- //column->set_sort_column_id(layer_model.index);
+ // Set up the icon cell-renderer
+ Gtk::CellRendererText* cellrenderer = Gtk::manage( new Gtk::CellRendererText() );
+ column->pack_start(*cellrenderer,false);
+ column->add_attribute(cellrenderer->property_text(), layer_model.label);
+ cellrenderer->signal_edited().connect(sigc::mem_fun(*this, &studio::LayerTree::on_layer_renamed));
+ cellrenderer->property_editable()=true;
+
+ column->set_reorderable();
+ // column->set_resizable();
+ column->set_clickable(true);
+ column->set_sort_column(layer_model.label);
+
+ get_layer_tree_view().append_column(*column);
+
+ // int index;
+// index=get_layer_tree_view().append_column_editable(_("Layer"),layer_model.label);
+ //Gtk::TreeView::Column* column = get_layer_tree_view().get_column(index-1);
//get_layer_tree_view().set_expander_column(*column);
- //column->set_reorderable();
- //column->set_resizable();
- //column->set_clickable(false);
-
+
//Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() );
//column->pack_start(*icon_cellrenderer,false);
//column->add_attribute(icon_cellrenderer->property_pixbuf(), layer_model.icon);
column_z_depth->set_resizable();
column_z_depth->set_clickable();
- column_z_depth->set_sort_column_id(layer_model.z_depth);
+ column_z_depth->set_sort_column(layer_model.z_depth);
}
- /*
- { // --- N A M E --------------------------------------------------------
- Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Layer")) );
-
- // Set up the icon cell-renderer
- Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() );
- column->pack_start(*icon_cellrenderer,false);
- column->add_attribute(icon_cellrenderer->property_pixbuf(), layer_model.icon);
- // Set up the text attributes
- Pango::AttrList attr_list;
- {
- Pango::AttrInt pango_size(Pango::Attribute::create_attr_size(Pango::SCALE*8));
- pango_size.set_start_index(0);
- pango_size.set_end_index(64);
- attr_list.change(pango_size);
- }
-
- // Pack the label into the column
- //column->pack_start(layer_model.label,true);
- Gtk::CellRendererText* text_cellrenderer = Gtk::manage( new Gtk::CellRendererText() );
- column->pack_start(*text_cellrenderer,false);
- column->add_attribute(text_cellrenderer->property_text(), layer_model.label);
- text_cellrenderer->property_attributes()=attr_list;
-
- // Finish setting up the column
- column->set_reorderable();
- column->set_resizable();
- column->set_clickable();
- get_layer_tree_view().append_column(*column);
- get_layer_tree_view().set_expander_column(*column);
- }
- */
-
-/* {
- Gtk::Widget& widget(get_layer_tree_view());
- Pango::FontDescription font(widget.get_modifier_style()->get_font());
- font.set_size(font.get_size()*3/4);
- widget.get_modifier_style()->set_font(font);
- widget.modify_style(widget.get_modifier_style());
- }
-*/
get_layer_tree_view().set_enable_search(true);
get_layer_tree_view().set_search_column(layer_model.label);
get_layer_tree_view().set_search_equal_func(sigc::ptr_fun(&studio::LayerTreeStore::search_func));
listTargets.push_back( Gtk::TargetEntry("LAYER") );
get_layer_tree_view().drag_dest_set(listTargets);
-
// This makes things easier to read.
get_layer_tree_view().set_rules_hint();
-
+
// Make us more sensitive to several events
//get_layer_tree_view().add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK | Gdk::BUTTON2_MOTION_MASK|Gdk::POINTER_MOTION_MASK);
-
+
get_layer_tree_view().signal_event().connect(sigc::mem_fun(*this, &studio::LayerTree::on_layer_tree_event));
get_layer_tree_view().show();
-
-
Gtk::ScrolledWindow *scroll = manage(new class Gtk::ScrolledWindow());
scroll->set_flags(Gtk::CAN_FOCUS);
scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
//scroll->add(get_layer_tree_view());
scroll->set_shadow_type(Gtk::SHADOW_ETCHED_IN);
scroll->show();
-
+
return scroll;
}
pango_size.set_end_index(64);
attr_list.change(pango_size);
}
-
+
Gtk::IconSize icon_size(Gtk::ICON_SIZE_SMALL_TOOLBAR);
-
+
{ // --- N A M E --------------------------------------------------------
- Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Param")) );
+ Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Name")) );
// Set up the icon cell-renderer
Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() );
column->pack_start(*icon_cellrenderer,false);
column->add_attribute(icon_cellrenderer->property_pixbuf(), param_model.icon);
-
+
// Pack the label into the column
//column->pack_start(layer_model.label,true);
Gtk::CellRendererText* text_cellrenderer = Gtk::manage( new Gtk::CellRendererText() );
// Set up the value-node icon cell-renderer to be on the far right
Gtk::CellRendererPixbuf* valuenode_icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() );
column->pack_end(*valuenode_icon_cellrenderer,false);
- valuenode_icon_cellrenderer->property_pixbuf()=Gtk::Button().render_icon(Gtk::StockID("sinfg-value_node"),icon_size);
+ valuenode_icon_cellrenderer->property_pixbuf()=Gtk::Button().render_icon(Gtk::StockID("synfig-value_node"),icon_size);
column->add_attribute(valuenode_icon_cellrenderer->property_visible(), param_model.is_shared);
- // Finish setting up the column
+ // Finish setting up the column
column->set_reorderable();
column->set_resizable();
column->set_clickable();
-
- param_tree_view().append_column(*column);
+
+ get_param_tree_view().append_column(*column);
}
{ // --- V A L U E -----------------------------------------------------
- Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("ValueBase")) );
-
+ Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Value")) );
+
// Set up the value cell-renderer
cellrenderer_value=LayerParamTreeStore::add_cell_renderer_value(column);
cellrenderer_value->signal_edited().connect(sigc::mem_fun(*this, &studio::LayerTree::on_edited_value));
- cellrenderer_value->property_value()=sinfg::ValueBase();
+ cellrenderer_value->property_value()=synfig::ValueBase();
column->add_attribute(cellrenderer_value->property_param_desc(), param_model.param_desc);
- column->add_attribute(cellrenderer_value->property_inconsistant(),param_model.is_inconsistent);
+ column->add_attribute(cellrenderer_value->property_inconsistent(),param_model.is_inconsistent);
//cellrenderer_value->property_canvas()=canvas_interface->get_canvas(); // Is this line necessary?
cellrenderer_value->property_attributes()=attr_list;
// Finish setting up the column
- param_tree_view().append_column(*column);
+ get_param_tree_view().append_column(*column);
column->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE);
column->set_clickable();
column->set_min_width(120);
column->set_reorderable();
column->set_resizable();
}
- /*{ // --- T I M E T R A C K --------------------------------------------
+ { // --- T Y P E --------------------------------------------------------
+ Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Type")) );
+ Gtk::CellRendererText* text_cellrenderer = Gtk::manage( new Gtk::CellRendererText() );
+ column->pack_start(*text_cellrenderer,false);
+ column->add_attribute(text_cellrenderer->property_text(), param_model.type);
+ text_cellrenderer->property_attributes()=attr_list;
+ get_param_tree_view().append_column(*column);
+ column->set_reorderable();
+ column->set_resizable();
+ column->set_clickable();
+ column->set_sort_column(param_model.type);
+ }
+#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;
-
+
// Set up the value-node cell-renderer
cellrenderer_time_track=LayerParamTreeStore::add_cell_renderer_value_node(column);
cellrenderer_time_track->property_mode()=Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
- cellrenderer_time_track->signal_waypoint_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_waypoint_clicked) );
+ cellrenderer_time_track->signal_waypoint_clicked_cellrenderer().connect(sigc::mem_fun(*this, &studio::LayerTree::on_waypoint_clicked_layertree) );
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->add_attribute(cellrenderer_time_track->property_visible(), param_model.is_value_node);
- //column->pack_start(*cellrenderer_time_track);
-
// Finish setting up the column
column->set_reorderable();
column->set_resizable();
column->set_min_width(200);
- //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.
- param_tree_view().set_rules_hint();
-
+ get_param_tree_view().set_rules_hint();
+
// Make us more sensitive to several events
- param_tree_view().add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK | Gdk::BUTTON2_MOTION_MASK|Gdk::POINTER_MOTION_MASK);
-
- param_tree_view().signal_event().connect(sigc::mem_fun(*this, &studio::LayerTree::on_param_tree_event));
- param_tree_view().show();
-
+ get_param_tree_view().add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK | Gdk::BUTTON2_MOTION_MASK|Gdk::POINTER_MOTION_MASK);
+
+ get_param_tree_view().signal_event().connect(sigc::mem_fun(*this, &studio::LayerTree::on_param_tree_event));
+ get_param_tree_view().show();
+
Gtk::ScrolledWindow *scroll = manage(new class Gtk::ScrolledWindow());
scroll->set_flags(Gtk::CAN_FOCUS);
scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- //scroll->add(param_tree_view());
+ //scroll->add(get_param_tree_view());
scroll->set_shadow_type(Gtk::SHADOW_ETCHED_IN);
scroll->show();
//column_time_track->set_visible(false);
-
+
return scroll;
}
void
-LayerTree::on_waypoint_changed( sinfg::Waypoint waypoint , sinfg::ValueNode::Handle value_node)
+LayerTree::on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node)
{
- sinfgapp::Action::ParamList param_list;
+ synfigapp::Action::ParamList param_list;
param_list.add("canvas",layer_tree_store_->canvas_interface()->get_canvas());
param_list.add("canvas_interface",layer_tree_store_->canvas_interface());
param_list.add("value_node",value_node);
}
void
-LayerTree::select_layer(Layer::Handle layer)
+LayerTree::select_layer(synfig::Layer::Handle layer)
{
Gtk::TreeModel::Children::iterator iter;
if(layer_tree_store_->find_layer_row(layer,iter))
{
if(sorted_layer_tree_store_)
iter=sorted_layer_tree_store_->convert_child_iter_to_iter(iter);
-
+
Gtk::TreePath path(iter);
for(int i=path.get_depth();i;i--)
{
}
void
-LayerTree::select_all_children_layers(sinfg::Layer::Handle layer)
+LayerTree::select_all_children_layers(synfig::Layer::Handle layer)
{
Gtk::TreeModel::Children::iterator iter;
if(layer_tree_store_->find_layer_row(layer,iter))
return ret;
}
-sinfg::Layer::Handle
+synfig::Layer::Handle
LayerTree::get_selected_layer()const
{
LayerList layers(get_selected_layers());
get_layer_tree_view().get_selection()->unselect_all();
}
-
-
-
-
-
-
-
-
-
-
-
-
void
LayerTree::set_show_timetrack(bool x)
{
LayerTree::set_model(Glib::RefPtr<LayerTreeStore> layer_tree_store)
{
layer_tree_store_=layer_tree_store;
-
if(false)
{
- sorted_layer_tree_store_=Gtk::TreeModelSort::create(layer_tree_store);
-
+ sorted_layer_tree_store_=Gtk::TreeModelSort::create(layer_tree_store);
+
sorted_layer_tree_store_->set_default_sort_func(sigc::ptr_fun(&studio::LayerTreeStore::z_sorter));
-
+
//sorted_store->set_sort_func(model.time.index(),sigc::mem_fun(&studio::KeyframeTreeStore::time_sorter));
- //sorted_store->set_sort_column_id(model.time.index(), Gtk::SORT_ASCENDING);
-
+ //sorted_store->set_sort_column(model.time.index(), Gtk::SORT_ASCENDING);
+
get_layer_tree_view().set_model(sorted_layer_tree_store_);
}
else
get_layer_tree_view().set_model(layer_tree_store_);
-
+
layer_tree_store_->canvas_interface()->signal_dirty_preview().connect(sigc::mem_fun(*this,&studio::LayerTree::on_dirty_preview));
//layer_tree_store_->canvas_interface()->signal_dirty_preview().connect(sigc::mem_fun(*this,&studio::LayerTree::on_dirty_preview));
-
+
layer_tree_store_->canvas_interface()->signal_time_changed().connect(
sigc::mem_fun(
- ¶m_tree_view(),
+ &get_param_tree_view(),
&Gtk::Widget::queue_draw
)
);
if(!param_tree_store_)
{
param_tree_store_=LayerParamTreeStore::create(layer_tree_store_->canvas_interface(), this);
- param_tree_view().set_model(param_tree_store_);
+ 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);
- adjustment.signal_value_changed().connect(sigc::mem_fun(param_tree_view(),&Gtk::TreeView::queue_draw));
- adjustment.signal_changed().connect(sigc::mem_fun(param_tree_view(),&Gtk::TreeView::queue_draw));
+#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));
}
void
void
LayerTree::on_selection_changed()
{
- sinfgapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
-
+ synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
+
Gtk::TreeIter iter;
if(last_top_selected_layer && !layer_tree_store_->find_layer_row(last_top_selected_layer,iter))
{
}
}
-
{
if(!layer_list.empty())
{
last_top_selected_layer=0;
}
}
-
-
+
if(layer_list.empty())
{
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_as(Real()))
+
+ if(layer_list.size()==1 && (*layer_list.begin())->get_param("amount").is_valid()&& (*layer_list.begin())->get_param("amount").same_type_as(Real()))
{
quick_layer=*layer_list.begin();
}
else
quick_layer=0;
-
+
if(quick_layer)
{
layer_amount_hscale->set_sensitive(true);
disable_amount_changed_signal=false;
}
else
- blend_method_widget.set_sensitive(false);
+ blend_method_widget.set_sensitive(false);
}
else
{
- layer_amount_hscale->set_sensitive(false);
+ layer_amount_hscale->set_sensitive(false);
blend_method_widget.set_sensitive(false);
}
}
-
void
LayerTree::on_blend_method_changed()
{
return;
if(!quick_layer)
return;
-
+
if(quick_layer->get_param("blend_method").is_valid())
{
disable_amount_changed_signal=true;
- signal_edited_value()(sinfgapp::ValueDesc(quick_layer,"blend_method"),blend_method_widget.get_value());
+ signal_edited_value()(synfigapp::ValueDesc(quick_layer,"blend_method"),blend_method_widget.get_value());
disable_amount_changed_signal=false;
}
}
return;
if(!quick_layer)
return;
-
+
disable_amount_changed_signal=true;
- signal_edited_value()(sinfgapp::ValueDesc(quick_layer,"amount"),sinfg::ValueBase(layer_amount_adjustment_.get_value()));
+ signal_edited_value()(synfigapp::ValueDesc(quick_layer,"amount"),synfig::ValueBase(layer_amount_adjustment_.get_value()));
disable_amount_changed_signal=false;
}
-
void
-LayerTree::on_edited_value(const Glib::ustring&path_string,sinfg::ValueBase value)
+LayerTree::on_edited_value(const Glib::ustring&path_string,synfig::ValueBase value)
{
Gtk::TreePath path(path_string);
-
- const Gtk::TreeRow row = *(param_tree_view().get_model()->get_iter(path));
+
+ const Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path));
if(!row)
return;
row[param_model.value]=value;
//signal_edited_value()(row[param_model.value_desc],value);
}
-/*
void
-LayerTree::on_layer_toggle(const Glib::ustring& path_string)
+LayerTree::on_layer_renamed(const Glib::ustring&path_string,const Glib::ustring& value)
{
Gtk::TreePath path(path_string);
const Gtk::TreeRow row = *(get_layer_tree_view().get_model()->get_iter(path));
-
- signal_layer_toggle()(row[layer_model.layer]);
+ if(!row)
+ return;
+ row[layer_model.label]=value;
+ get_layer_tree_view().columns_autosize();
}
-*/
void
-LayerTree::on_waypoint_clicked(const Glib::ustring &path_string, sinfg::Waypoint waypoint,int button)
+LayerTree::on_layer_toggle(const Glib::ustring& path_string)
{
Gtk::TreePath path(path_string);
-
- const Gtk::TreeRow row = *(param_tree_view().get_model()->get_iter(path));
- if(!row)
- return;
-
- signal_waypoint_clicked()(static_cast<sinfgapp::ValueDesc>(row[param_model.value_desc]),waypoint,button);
+
+ const Gtk::TreeRow row = *(get_layer_tree_view().get_model()->get_iter(path));
+ bool active=static_cast<bool>(row[layer_model.active]);
+ 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)))
+{
+ std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
+ synfig::waypoint_collect(waypoint_set,time,node);
+
+ synfigapp::ValueDesc value_desc;
+
+ 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);
-
+
}
break;
-
+
case GDK_MOTION_NOTIFY:
{
Gtk::TreeModel::Path path;
cell_x,cell_y //int&cell_x,int&cell_y
)
) break;
-
+
if(!get_layer_tree_view().get_model()->get_iter(path))
break;
-
+
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);
return false;
}
-
bool
LayerTree::on_param_tree_event(GdkEvent *event)
{
Gtk::TreeModel::Path path;
Gtk::TreeViewColumn *column;
int cell_x, cell_y;
- if(!param_tree_view().get_path_at_pos(
+ if(!get_param_tree_view().get_path_at_pos(
int(event->button.x),int(event->button.y), // x, y
path, // TreeModel::Path&
column, //TreeViewColumn*&
cell_x,cell_y //int&cell_x,int&cell_y
)
) break;
- const Gtk::TreeRow row = *(param_tree_view().get_model()->get_iter(path));
-
-/* if(column && column->get_first_cell_renderer()==cellrenderer_time_track)
+ const Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path));
+
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ if(column && column->get_first_cell_renderer()==cellrenderer_time_track)
{
Gdk::Rectangle rect;
- param_tree_view().get_cell_area(path,*column,rect);
+ get_param_tree_view().get_cell_area(path,*column,rect);
cellrenderer_time_track->property_value_desc()=row[param_model.value_desc];
cellrenderer_time_track->property_canvas()=row[param_model.canvas];
cellrenderer_time_track->activate(event,*this,path.to_string(),rect,rect,Gtk::CellRendererState());
- param_tree_view().queue_draw_area(rect.get_x(),rect.get_y(),rect.get_width(),rect.get_height());
+ get_param_tree_view().queue_draw_area(rect.get_x(),rect.get_y(),rect.get_width(),rect.get_height());
return true;
//return signal_param_user_click()(event->button.button,row,COLUMNID_TIME_TRACK);
}
- else
-*/ {
+ else
+#endif // TIMETRACK_IN_PARAMS_PANEL
+ {
if(event->button.button==3)
{
LayerList layer_list(get_selected_layers());
if(layer_list.size()<=1)
{
- sinfgapp::ValueDesc value_desc(row[param_model.value_desc]);
- Gtk::Menu* menu(manage(new Gtk::Menu()));
+ synfigapp::ValueDesc value_desc(row[param_model.value_desc]);
+ Gtk::Menu* menu(manage(new Gtk::Menu()));
+ menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc,0.5f);
menu->popup(event->button.button,gtk_get_current_event_time());
return true;
}
- Gtk::Menu* menu(manage(new Gtk::Menu()));
- std::list<sinfgapp::ValueDesc> value_desc_list;
+ Gtk::Menu* menu(manage(new Gtk::Menu()));
+ menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
+ std::list<synfigapp::ValueDesc> value_desc_list;
ParamDesc param_desc(row[param_model.param_desc]);
for(;!layer_list.empty();layer_list.pop_back())
- value_desc_list.push_back(sinfgapp::ValueDesc(layer_list.back(),param_desc.get_name()));
+ value_desc_list.push_back(synfigapp::ValueDesc(layer_list.back(),param_desc.get_name()));
App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc_list);
menu->popup(event->button.button,gtk_get_current_event_time());
return true;
}
}
break;
-
+
case GDK_MOTION_NOTIFY:
{
Gtk::TreeModel::Path path;
Gtk::TreeViewColumn *column;
int cell_x, cell_y;
- if(!param_tree_view().get_path_at_pos(
+ if(!get_param_tree_view().get_path_at_pos(
(int)event->motion.x,(int)event->motion.y, // x, y
path, // TreeModel::Path&
column, //TreeViewColumn*&
cell_x,cell_y //int&cell_x,int&cell_y
)
) break;
-
- if(!param_tree_view().get_model()->get_iter(path))
+
+ if(!get_param_tree_view().get_model()->get_iter(path))
break;
-
- Gtk::TreeRow row = *(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())
+
+ Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path));
+
+#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;
- param_tree_view().get_cell_area(path,*column,rect);
+ get_param_tree_view().get_cell_area(path,*column,rect);
cellrenderer_time_track->property_value_desc()=row[param_model.value_desc];
cellrenderer_time_track->property_canvas()=row[param_model.canvas];
cellrenderer_time_track->activate(event,*this,path.to_string(),rect,rect,Gtk::CellRendererState());
- param_tree_view().queue_draw();
- //param_tree_view().queue_draw_area(rect.get_x(),rect.get_y(),rect.get_width(),rect.get_height());
+ get_param_tree_view().queue_draw();
+ //get_param_tree_view().queue_draw_area(rect.get_x(),rect.get_y(),rect.get_width(),rect.get_height());
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::TreeModel::Path path;
Gtk::TreeViewColumn *column;
int cell_x, cell_y;
- if(!param_tree_view().get_path_at_pos(
+ if(!get_param_tree_view().get_path_at_pos(
(int)event->button.x,(int)event->button.y, // x, y
path, // TreeModel::Path&
column, //TreeViewColumn*&
cell_x,cell_y //int&cell_x,int&cell_y
)
) break;
-
- if(!param_tree_view().get_model()->get_iter(path))
+
+ if(!get_param_tree_view().get_model()->get_iter(path))
break;
-
- Gtk::TreeRow row = *(param_tree_view().get_model()->get_iter(path));
-
-/* if(column && cellrenderer_time_track==column->get_first_cell_renderer())
+
+ Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path));
+
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ if(column && cellrenderer_time_track==column->get_first_cell_renderer())
{
Gdk::Rectangle rect;
- param_tree_view().get_cell_area(path,*column,rect);
+ get_param_tree_view().get_cell_area(path,*column,rect);
cellrenderer_time_track->property_value_desc()=row[param_model.value_desc];
cellrenderer_time_track->property_canvas()=row[param_model.canvas];
cellrenderer_time_track->activate(event,*this,path.to_string(),rect,rect,Gtk::CellRendererState());
- param_tree_view().queue_draw();
- param_tree_view().queue_draw_area(rect.get_x(),rect.get_y(),rect.get_width(),rect.get_height());
+ get_param_tree_view().queue_draw();
+ get_param_tree_view().queue_draw_area(rect.get_x(),rect.get_y(),rect.get_width(),rect.get_height());
return true;
-
+
}
-*/
+#endif // TIMETRACK_IN_PARAMS_PANEL
}
break;
default:
return false;
}
-void
-LayerTree::on_raise_pressed()
-{
- sinfgapp::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());
-
- {
- sinfgapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
- sinfgapp::SelectionManager::LayerList::iterator iter;
-
- for(iter=layer_list.begin();iter!=layer_list.end();++iter)
- param_list.add("layer",Layer::Handle(*iter));
- }
- sinfgapp::Action::Handle action(sinfgapp::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()
-{
- sinfgapp::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());
-
- {
- sinfgapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
- sinfgapp::SelectionManager::LayerList::iterator iter;
-
- for(iter=layer_list.begin();iter!=layer_list.end();++iter)
- param_list.add("layer",Layer::Handle(*iter));
- }
-
- sinfgapp::Action::Handle action(sinfgapp::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()
-{
- sinfgapp::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());
-
- {
- sinfgapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
- sinfgapp::SelectionManager::LayerList::iterator iter;
-
- for(iter=layer_list.begin();iter!=layer_list.end();++iter)
- param_list.add("layer",Layer::Handle(*iter));
- }
-
- sinfgapp::Action::Handle action(sinfgapp::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()
-{
- sinfgapp::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());
-
- {
- sinfgapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers());
- sinfgapp::SelectionManager::LayerList::iterator iter;
-
- for(iter=layer_list.begin();iter!=layer_list.end();++iter)
- param_list.add("layer",Layer::Handle(*iter));
- }
-
- sinfgapp::Action::Handle action(sinfgapp::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("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_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("layer_encapsulate"));
+// 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_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&context, Gtk::SelectionData& selection_data, guint info, guint time)
{
- sinfg::info("Dragged data of type \"%s\"",selection_data.get_data_type());
- sinfg::info("Dragged data of target \"%s\"",gdk_atom_name(selection_data->target));
- sinfg::info("Dragged selection=\"%s\"",gdk_atom_name(selection_data->selection));
-
- DEBUGPOINT();
+ synfig::info("Dragged data of type \"%s\"",selection_data.get_data_type());
+ synfig::info("Dragged data of target \"%s\"",gdk_atom_name(selection_data->target));
+ synfig::info("Dragged selection=\"%s\"",gdk_atom_name(selection_data->selection));
Gtk::TreeModel::Path path;
Gtk::TreeViewColumn *column;
int cell_x, cell_y;
if(get_selection()
Gtk::TreeRow row = *(get_selection()->get_selected());
- DEBUGPOINT();
- if(sinfg::String(gdk_atom_name(selection_data->target))=="LAYER" && (bool)row[model.is_layer])
+ if(synfig::String(gdk_atom_name(selection_data->target))=="LAYER" && (bool)row[model.is_layer])
{
- DEBUGPOINT();
Layer* layer(((Layer::Handle)row[model.layer]).get());
assert(layer);
selection_data.set(8, reinterpret_cast<const guchar*>(&layer), sizeof(layer));
return;
}
- DEBUGPOINT();
}
void
LayerTree::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, Gtk::SelectionData& selection_data, guint info, guint time)
{
- sinfg::info("Dropped data of type \"%s\"",selection_data.get_data_type());
- sinfg::info("Dropped data of target \"%s\"",gdk_atom_name(selection_data->target));
- sinfg::info("Dropped selection=\"%s\"",gdk_atom_name(selection_data->selection));
- sinfg::info("Dropped x=%d, y=%d",x,y);
+ synfig::info("Dropped data of type \"%s\"",selection_data.get_data_type());
+ synfig::info("Dropped data of target \"%s\"",gdk_atom_name(selection_data->target));
+ synfig::info("Dropped selection=\"%s\"",gdk_atom_name(selection_data->selection));
+ synfig::info("Dropped x=%d, y=%d",x,y);
bool success=false;
bool dropped_on_specific_row=false;
-
+
Gtk::TreeModel::Path path;
Gtk::TreeViewColumn *column;
int cell_x, cell_y;
}
else
dropped_on_specific_row=true;
-
+
Gtk::TreeRow row = *(get_model()->get_iter(path));
-
if ((selection_data.get_length() >= 0) && (selection_data.get_format() == 8))
{
- if(sinfg::String(selection_data.get_data_type())=="LAYER")do
+ if(synfig::String(selection_data.get_data_type())=="LAYER")do
{
Layer::Handle src(*reinterpret_cast<Layer**>(selection_data.get_data()));
assert(src);
-
+
Canvas::Handle dest_canvas;
Layer::Handle dest_layer;
-
+
if(dropped_on_specific_row)
{
dest_canvas=(Canvas::Handle)(row[model.canvas]);
}
else
dest_canvas=layer_tree_store_->canvas_interface()->get_canvas();
-
+
// In this case, we are just moving.
if(dest_canvas==src->get_canvas())
{
if(!dest_layer || dest_layer==src)
break;
-
- sinfgapp::Action::Handle action(sinfgapp::Action::create("layer_move"));
+
+ synfigapp::Action::Handle action(synfigapp::Action::create("layer_move"));
action->set_param("canvas",dest_canvas);
action->set_param("canvas_interface",layer_tree_store_->canvas_interface());
action->set_param("layer",src);
}
}while(0);
}
-
+
// Finish the drag
context->drag_finish(success, false, time);
}
{
context->drag_finish(false, false, time);
}
-
+
if(layer_tree_store_->row_drop_possible(path,selection_data))
{
if(layer_tree_store_->drag_data_received(path,selection_data))
projects / synfig.git / blobdiff