X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayertree.cpp;h=ab05c826e93e45ed393ec2dfe78cbf60dcf13ad0;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=9f84d8d6dcdb0da3c448ed5c3fd35884292e1b30;hpb=a3b6b682f6c57efe5a76456e03dd123e4b851f40;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp index 9f84d8d..ab05c82 100644 --- a/synfig-studio/trunk/src/gtkmm/layertree.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp @@ -2,10 +2,11 @@ /*! \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-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 @@ -41,6 +42,8 @@ #include "instance.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -88,23 +91,23 @@ using namespace studio; 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); @@ -112,13 +115,10 @@ LayerTree::LayerTree(): 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("synfig-small_icon")); Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR); @@ -127,7 +127,7 @@ LayerTree::LayerTree(): SMALL_BUTTON(button_lower,"gtk-go-down","Lower"); SMALL_BUTTON(button_duplicate,"synfig-duplicate","Duplicate"); 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); @@ -143,18 +143,13 @@ LayerTree::LayerTree(): button_duplicate->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(); @@ -163,10 +158,6 @@ LayerTree::LayerTree(): 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); @@ -175,10 +166,10 @@ LayerTree::LayerTree(): blend_method_widget.signal_activate().connect(sigc::mem_fun(*this, &studio::LayerTree::on_blend_method_changed)); } - LayerTree::~LayerTree() { - synfig::info("LayerTree::~LayerTree(): Deleted"); + if (getenv("SYNFIG_DEBUG_DESTRUCTORS")) + synfig::info("LayerTree::~LayerTree(): Deleted"); } Gtk::Widget* @@ -186,7 +177,6 @@ LayerTree::create_layer_tree() { const LayerTreeStore::Model model; - { // --- O N / O F F ---------------------------------------------------- //int index; //index=get_layer_tree_view().append_column_editable(_(" "),layer_model.active); @@ -196,12 +186,12 @@ LayerTree::create_layer_tree() // 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)); + 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; @@ -209,40 +199,39 @@ LayerTree::create_layer_tree() 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 -------------------------------------------------------- - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Layer")) ); + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Name")) ); // Set up the icon cell-renderer Gtk::CellRendererText* cellrenderer = Gtk::manage( new Gtk::CellRendererText() ); - cellrenderer->signal_edited().connect(sigc::mem_fun(*this, &studio::LayerTree::on_layer_renamed)); - cellrenderer->property_editable()=true; - 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); - //column->set_sort_column_id(layer_model.index); - //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); @@ -256,7 +245,7 @@ LayerTree::create_layer_tree() 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); } get_layer_tree_view().set_enable_search(true); @@ -267,25 +256,22 @@ LayerTree::create_layer_tree() 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; } @@ -299,17 +285,17 @@ LayerTree::create_param_tree() 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() ); @@ -329,75 +315,85 @@ LayerTree::create_param_tree() 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()=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 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); + } /*{ // --- 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->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); + //get_param_tree_view().append_column(*column); }*/ - - // 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; } @@ -415,14 +411,14 @@ LayerTree::on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::H } 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--) { @@ -510,18 +506,6 @@ LayerTree::clear_selected_layers() get_layer_tree_view().get_selection()->unselect_all(); } - - - - - - - - - - - - void LayerTree::set_show_timetrack(bool x) { @@ -534,38 +518,37 @@ void LayerTree::set_model(Glib::RefPtr 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()) { cellrenderer_time_track->set_canvas_interface(layer_tree_store_->canvas_interface()); @@ -577,8 +560,8 @@ 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)); + 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 @@ -606,7 +589,7 @@ void LayerTree::on_selection_changed() { 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)) { @@ -618,7 +601,6 @@ LayerTree::on_selection_changed() } } - { if(!layer_list.empty()) { @@ -630,8 +612,7 @@ LayerTree::on_selection_changed() last_top_selected_layer=0; } } - - + if(layer_list.empty()) { button_raise->set_sensitive(false); @@ -647,14 +628,14 @@ LayerTree::on_selection_changed() button_lower->set_sensitive(true); button_duplicate->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); @@ -669,16 +650,15 @@ LayerTree::on_selection_changed() 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() { @@ -686,7 +666,7 @@ LayerTree::on_blend_method_changed() return; if(!quick_layer) return; - + if(quick_layer->get_param("blend_method").is_valid()) { disable_amount_changed_signal=true; @@ -702,19 +682,18 @@ LayerTree::on_amount_value_changed() return; if(!quick_layer) return; - + disable_amount_changed_signal=true; 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,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; @@ -725,11 +704,12 @@ void 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)); if(!row) return; row[layer_model.label]=value; + get_layer_tree_view().columns_autosize(); } void @@ -739,19 +719,21 @@ LayerTree::on_layer_toggle(const Glib::ustring& path_string) const Gtk::TreeRow row = *(get_layer_tree_view().get_model()->get_iter(path)); bool active=static_cast(row[layer_model.active]); - row[layer_model.active]=!active; + row[layer_model.active]=!active; } void -LayerTree::on_waypoint_clicked(const Glib::ustring &path_string, synfig::Waypoint waypoint,int button) +LayerTree::on_waypoint_clicked_layertree(const etl::handle& 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))) { - 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(row[param_model.value_desc]),waypoint,button); + //! \todo writeme + + // synfigapp::ValueDesc value_desc; + // std::set > waypoint_set; + // signal_waypoint_clicked_layertree()(value_desc,waypoint_set,button,side); } bool @@ -772,7 +754,7 @@ 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 @@ -780,10 +762,10 @@ LayerTree::on_layer_tree_event(GdkEvent *event) 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; @@ -796,12 +778,12 @@ LayerTree::on_layer_tree_event(GdkEvent *event) 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)); - + /* if(cellrenderer_time_track==column->get_first_cell_renderer()) { @@ -831,7 +813,6 @@ LayerTree::on_layer_tree_event(GdkEvent *event) return false; } - bool LayerTree::on_param_tree_event(GdkEvent *event) { @@ -842,27 +823,27 @@ 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)); - + const Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path)); + /* 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 */ { if(event->button.button==3) { @@ -870,12 +851,14 @@ LayerTree::on_param_tree_event(GdkEvent *event) if(layer_list.size()<=1) { synfigapp::ValueDesc value_desc(row[param_model.value_desc]); - Gtk::Menu* menu(manage(new Gtk::Menu())); + 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())); + Gtk::Menu* menu(manage(new Gtk::Menu())); + menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu)); std::list value_desc_list; ParamDesc param_desc(row[param_model.param_desc]); for(;!layer_list.empty();layer_list.pop_back()) @@ -894,34 +877,34 @@ LayerTree::on_param_tree_event(GdkEvent *event) } } 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)); - + + 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()) { 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 @@ -943,30 +926,30 @@ 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; - - 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)); - + + Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path)); + /* 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; - + } */ } @@ -984,11 +967,11 @@ LayerTree::on_raise_pressed() 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)); } @@ -1004,15 +987,15 @@ LayerTree::on_lower_pressed() 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); @@ -1025,15 +1008,15 @@ LayerTree::on_duplicate_pressed() 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); @@ -1046,39 +1029,20 @@ LayerTree::on_delete_pressed() 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&context, Gtk::SelectionData& selection_data, guint info, guint time) @@ -1087,24 +1051,19 @@ LayerTree::on_drag_data_get(const Glib::RefPtr&context, Gtk::S synfig::info("Dragged data of target \"%s\"",gdk_atom_name(selection_data->target)); synfig::info("Dragged selection=\"%s\"",gdk_atom_name(selection_data->selection)); - DEBUGPOINT(); - Gtk::TreeModel::Path path; Gtk::TreeViewColumn *column; int cell_x, cell_y; if(get_selection() Gtk::TreeRow row = *(get_selection()->get_selected()); - DEBUGPOINT(); 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(&layer), sizeof(layer)); return; } - DEBUGPOINT(); } void @@ -1116,7 +1075,7 @@ LayerTree::on_drop_drag_data_received(const Glib::RefPtr& cont 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; @@ -1132,20 +1091,19 @@ LayerTree::on_drop_drag_data_received(const Glib::RefPtr& cont } 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(synfig::String(selection_data.get_data_type())=="LAYER")do { Layer::Handle src(*reinterpret_cast(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]); @@ -1154,13 +1112,13 @@ LayerTree::on_drop_drag_data_received(const Glib::RefPtr& cont } 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; - + 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()); @@ -1174,7 +1132,7 @@ LayerTree::on_drop_drag_data_received(const Glib::RefPtr& cont } }while(0); } - + // Finish the drag context->drag_finish(success, false, time); } @@ -1211,7 +1169,7 @@ LayerTree::on_drag_data_received(const Glib::RefPtr& context, { 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))