X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_timetrack.cpp;h=f08152065672f399fc4c149458aa42aba5d10bd6;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=0d696f29fb150672322b1467cc2b2bd0c83f7d13;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp index 0d696f2..f081520 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp @@ -2,10 +2,11 @@ /*! \file dock_timetrack.cpp ** \brief Template File ** -** $Id: dock_timetrack.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 @@ -43,6 +44,9 @@ #include "workarea.h" #include "widget_timeslider.h" #include "layerparamtreestore.h" +#include "general.h" +#include + #endif /* === U S I N G =========================================================== */ @@ -61,11 +65,11 @@ class TimeTrackView : public Gtk::TreeView CellRenderer_TimeTrack *cellrenderer_time_track; Glib::RefPtr param_tree_store_; - - Gtk::TreeView *mimic_tree_view; + + Gtk::TreeView *mimic_tree_view; public: - sigc::signal signal_waypoint_clicked; + sigc::signal >,int,synfig::Waypoint::Side> signal_waypoint_clicked_timetrackview; LayerParamTreeStore::Model model; @@ -78,31 +82,31 @@ public: { int label_index(append_column_editable(_("Name"),model.label)); Gtk::TreeView::Column* label_column = get_column(label_index-1); - + { // --- T I M E T R A C K -------------------------------------------- Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Time Track")) ); - + // 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, &TimeTrackView::on_waypoint_clicked) ); + cellrenderer_time_track->signal_waypoint_clicked_cellrenderer().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_clicked_timetrackview) ); cellrenderer_time_track->signal_waypoint_changed().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_changed) ); column->add_attribute(cellrenderer_time_track->property_value_desc(), model.value_desc); column->add_attribute(cellrenderer_time_track->property_canvas(), 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); - + append_column(*column); } set_rules_hint(); - + set_expander_column(*label_column); label_column->set_visible(false); set_headers_visible(false); @@ -135,7 +139,7 @@ public: std::max( mimic_tree_view->get_vadjustment()->get_value()- mimic_tree_view->get_vadjustment()->get_step_increment(), - mimic_tree_view->get_vadjustment()->get_lower() + mimic_tree_view->get_vadjustment()->get_lower() ) ); mimic_tree_view->get_vadjustment()->value_changed(); @@ -155,7 +159,7 @@ public: ) ) break; const Gtk::TreeRow row = *(get_model()->get_iter(path)); - + if(column && column->get_first_cell_renderer()==cellrenderer_time_track) { Gdk::Rectangle rect; @@ -167,7 +171,7 @@ public: return true; //return signal_param_user_click()(event->button.button,row,COLUMNID_TIME_TRACK); } -/* else +/* else { if(event->button.button==3) { @@ -175,12 +179,14 @@ public: if(layer_list.size()<=1) { synfigapp::ValueDesc value_desc(row[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[model.param_desc]); for(;!layer_list.empty();layer_list.pop_back()) @@ -200,7 +206,7 @@ public: */ } break; - + case GDK_MOTION_NOTIFY: { Gtk::TreeModel::Path path; @@ -213,12 +219,12 @@ public: cell_x,cell_y //int&cell_x,int&cell_y ) ) break; - + if(!get_model()->get_iter(path)) break; - + Gtk::TreeRow row = *(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; @@ -258,12 +264,12 @@ public: cell_x,cell_y //int&cell_x,int&cell_y ) ) break; - + if(!get_model()->get_iter(path)) break; - + Gtk::TreeRow row = *(get_model()->get_iter(path)); - + if(column && cellrenderer_time_track==column->get_first_cell_renderer()) { Gdk::Rectangle rect; @@ -297,7 +303,7 @@ public: cellrenderer_time_track->set_canvas_interface(param_tree_store_->canvas_interface()); store->signal_changed().connect(sigc::mem_fun(*this, &TimeTrackView::queue_draw)); } - + void on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node) { @@ -307,12 +313,12 @@ public: param_list.add("value_node",value_node); param_list.add("waypoint",waypoint); // param_list.add("time",canvas_interface()->get_time()); - + etl::handle::cast_static(param_tree_store_->canvas_interface()->get_instance())->process_action("waypoint_set_smart", param_list); } void mimic(Gtk::TreeView *param_tree_view) - { + { mimic_tree_view=param_tree_view; param_tree_view->signal_row_expanded().connect( sigc::hide<0>( @@ -337,49 +343,52 @@ public: ); mimic_resync(); } - + void mimic_resync() { - + if(mimic_tree_view) { Gtk::Adjustment &adjustment(*mimic_tree_view->get_vadjustment()); set_vadjustment(adjustment); - + if(adjustment.get_page_size()>get_height()) adjustment.set_page_size(get_height()); - - cellrenderer_time_track->set_fixed_size(-1,18); + + int row_height = 0; + if(getenv("SYNFIG_TIMETRACK_ROW_HEIGHT")) + row_height = atoi(getenv("SYNFIG_TIMETRACK_ROW_HEIGHT")); + if (row_height < 3) + row_height = 18; + + cellrenderer_time_track->set_fixed_size(-1,row_height); } } - + void - on_waypoint_clicked(const Glib::ustring &path_string, synfig::Waypoint waypoint,int button) + on_waypoint_clicked_timetrackview(const etl::handle& node, + const synfig::Time& time, + const synfig::Time& time_offset __attribute__ ((unused)), + int button, + synfig::Waypoint::Side side) { -/* - Gtk::TreePath path(path_string); - - const Gtk::TreeRow row = *(get_model()->get_iter(path)); - if(!row) - return; -*/ - - ValueNode::Handle value_node(waypoint.get_parent_value_node()); - assert(value_node); + std::set > waypoint_set; + synfig::waypoint_collect(waypoint_set,time,node); + + synfigapp::ValueDesc value_desc; - Gtk::TreeRow row; - if(!param_tree_store_->find_first_value_node(value_node, row)) + if (waypoint_set.size() == 1) { - synfig::error(__FILE__":%d: Unable to find the valuenode",__LINE__); - return; + 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(row[model.value_desc]); } - - if(!row) - return; - - synfigapp::ValueDesc value_desc(static_cast(row[model.value_desc])); - signal_waypoint_clicked(value_desc,waypoint,button); + if (!waypoint_set.empty()) + signal_waypoint_clicked_timetrackview(value_desc,waypoint_set,button,side); } }; @@ -394,7 +403,14 @@ Dock_Timetrack::Dock_Timetrack(): { table_=0; widget_timeslider_= new Widget_Timeslider(); - widget_timeslider_->set_size_request(-1,22); + + int header_height = 0; + if(getenv("SYNFIG_TIMETRACK_HEADER_HEIGHT")) + header_height = atoi(getenv("SYNFIG_TIMETRACK_HEADER_HEIGHT")); + if (header_height < 3) + header_height = 22; + + widget_timeslider_->set_size_request(-1,header_height); hscrollbar_=new Gtk::HScrollbar(); vscrollbar_=new Gtk::VScrollbar(); } @@ -411,7 +427,7 @@ void Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle canvas_view) { LayerParamTreeStore::Model model; - + Glib::RefPtr tree_store( Glib::RefPtr::cast_dynamic( canvas_view->get_tree_model("params") @@ -424,9 +440,9 @@ Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle canvas_view Gtk::TreeView* param_tree_view(dynamic_cast(canvas_view->get_ext_widget("params"))); tree_view->mimic(param_tree_view); - tree_view->signal_waypoint_clicked.connect(sigc::mem_fun(*canvas_view, &studio::CanvasView::on_waypoint_clicked)); + tree_view->signal_waypoint_clicked_timetrackview.connect(sigc::mem_fun(*canvas_view, &studio::CanvasView::on_waypoint_clicked_canvasview)); + - canvas_view->time_adjustment().signal_value_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw)); canvas_view->time_adjustment().signal_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw)); @@ -440,7 +456,7 @@ Dock_Timetrack::refresh_selected_param() static_cast(get_canvas_view()->get_ext_widget(get_name())) ); Gtk::TreeModel::iterator iter(tree_view->get_selection()->get_selected()); - + if(iter) { LayerParamTreeStore::Model model; @@ -468,13 +484,13 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle canvas_v table_=0; } - + if(canvas_view) { TimeTrackView* tree_view(dynamic_cast(canvas_view->get_ext_widget(get_name()))); Gtk::TreeView* param_tree_view(dynamic_cast(canvas_view->get_ext_widget("params"))); tree_view->set_vadjustment(*param_tree_view->get_vadjustment()); - + assert(tree_view); widget_timeslider_->set_time_adjustment(&canvas_view->time_adjustment()); @@ -489,7 +505,7 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle canvas_v table_->attach(*hscrollbar_, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK); table_->attach(*vscrollbar_, 1, 2, 0, 2, Gtk::FILL|Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND); add(*table_); - + //add(*last_widget_curves_); table_->show_all(); show_all();