X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayertree.cpp;h=10af2a552d1a10b39971261bbc4d7bcacf9280c5;hb=9fc17cc46bd63a7508b82c967801a09be882fe57;hp=eeb47f076e1dd3444794e39584a6f2ebfcb4c3bc;hpb=c11163f51e342cc35511ed559fd3c0ae5405f840;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp index eeb47f0..10af2a5 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)); @@ -360,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); @@ -617,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); @@ -626,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())) @@ -722,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); + //! \todo writeme - const Gtk::TreeRow row = *(get_param_tree_view().get_model()->get_iter(path)); - if(!row) - return; - - 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); } bool @@ -957,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