X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayertree.cpp;h=4a498529fbff6ce35a8e04c3d8d7e1047be750e0;hb=6058f1f8af684257c314a78cc0a24ced57bf3168;hp=f65fbc71073d80e5e883498ddef964573a8f6660;hpb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp index f65fbc7..4a49852 100644 --- a/synfig-studio/trunk/src/gtkmm/layertree.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp @@ -6,6 +6,7 @@ ** ** \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 @@ -125,21 +126,25 @@ LayerTree::LayerTree(): 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)); @@ -167,7 +172,8 @@ LayerTree::LayerTree(): LayerTree::~LayerTree() { - synfig::info("LayerTree::~LayerTree(): Deleted"); + if (getenv("SYNFIG_DEBUG_DESTRUCTORS")) + synfig::info("LayerTree::~LayerTree(): Deleted"); } Gtk::Widget* @@ -197,7 +203,7 @@ 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(); @@ -208,27 +214,27 @@ LayerTree::create_layer_tree() } //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() ); + 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->pack_start(*cellrenderer,false); - column->add_attribute(cellrenderer->property_text(), layer_model.label); + 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); @@ -243,7 +249,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); @@ -350,7 +356,7 @@ LayerTree::create_param_tree() column->set_reorderable(); column->set_resizable(); column->set_clickable(); - column->set_sort_column_id(param_model.type); + 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")) ); @@ -359,7 +365,7 @@ LayerTree::create_param_tree() // 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); @@ -524,7 +530,7 @@ LayerTree::set_model(Glib::RefPtr 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_); } @@ -616,6 +622,7 @@ LayerTree::on_selection_changed() 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); @@ -625,6 +632,7 @@ LayerTree::on_selection_changed() 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())) @@ -707,6 +715,7 @@ LayerTree::on_layer_renamed(const Glib::ustring&path_string,const Glib::ustring& if(!row) return; row[layer_model.label]=value; + get_layer_tree_view().columns_autosize(); } void @@ -720,15 +729,17 @@ LayerTree::on_layer_toggle(const Glib::ustring& path_string) } 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 = *(get_param_tree_view().get_model()->get_iter(path)); - if(!row) - return; + //! \todo writeme - signal_waypoint_clicked()(static_cast(row[param_model.value_desc]),waypoint,button); + // synfigapp::ValueDesc value_desc; + // std::set > waypoint_set; + // signal_waypoint_clicked_layertree()(value_desc,waypoint_set,button,side); } bool @@ -955,88 +966,109 @@ LayerTree::on_param_tree_event(GdkEvent *event) 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("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 @@ -1046,24 +1078,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