X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_timetrack.cpp;h=7a6139ac95f4634f7c6f8bb9460d5250c20dd91c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=d2f06510758e832fd1c38522ed2ffd79c0b9e80c;hpb=560dfdcfea7dbf8d80e599d1d204c253f56a505d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp index d2f0651..7a6139a 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp @@ -6,7 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** Copyright (c) 2007 Chris Moore +** 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,7 +43,11 @@ #include "layerparamtreestore.h" #include "workarea.h" #include "widget_timeslider.h" +#include "widget_keyframe_list.h" #include "layerparamtreestore.h" +#include "general.h" +#include + #endif /* === U S I N G =========================================================== */ @@ -66,7 +70,7 @@ class TimeTrackView : public Gtk::TreeView Gtk::TreeView *mimic_tree_view; public: - sigc::signal signal_waypoint_clicked; + sigc::signal >,int> signal_waypoint_clicked_timetrackview; LayerParamTreeStore::Model model; @@ -86,7 +90,7 @@ public: // 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); @@ -99,7 +103,6 @@ public: column->set_resizable(); column->set_min_width(200); - append_column(*column); } set_rules_hint(); @@ -222,7 +225,9 @@ public: 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()) + 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; get_cell_area(path,*column,rect); @@ -304,6 +309,9 @@ public: void on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node) { + // is this code used? + assert(0); + synfigapp::Action::ParamList param_list; param_list.add("canvas",param_tree_store_->canvas_interface()->get_canvas()); param_list.add("canvas_interface",param_tree_store_->canvas_interface()); @@ -311,7 +319,7 @@ public: 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); + etl::handle::cast_static(param_tree_store_->canvas_interface()->get_instance())->process_action("WaypointSetSmart", param_list); } void mimic(Gtk::TreeView *param_tree_view) @@ -343,7 +351,6 @@ public: void mimic_resync() { - if(mimic_tree_view) { Gtk::Adjustment &adjustment(*mimic_tree_view->get_vadjustment()); @@ -357,38 +364,34 @@ public: 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) { -/* - Gtk::TreePath path(path_string); - - const Gtk::TreeRow row = *(get_model()->get_iter(path)); - if(!row) - return; -*/ + std::set > waypoint_set; + synfig::waypoint_collect(waypoint_set,time,node); - ValueNode::Handle value_node(waypoint.get_parent_value_node()); - assert(value_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); - if(!row) - return; - - synfigapp::ValueDesc value_desc(static_cast(row[model.value_desc])); + Gtk::TreeRow row; + if (param_tree_store_->find_first_value_node(value_node, row) && row) + 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); } }; @@ -403,14 +406,17 @@ Dock_Timetrack::Dock_Timetrack(): { table_=0; widget_timeslider_= new Widget_Timeslider(); + widget_kf_list_= new Widget_Keyframe_List(); 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; + header_height = 24; + + widget_timeslider_->set_size_request(-1,header_height-header_height/3+1); + widget_kf_list_->set_size_request(-1,header_height/3+1); - widget_timeslider_->set_size_request(-1,header_height); hscrollbar_=new Gtk::HScrollbar(); vscrollbar_=new Gtk::VScrollbar(); } @@ -421,6 +427,7 @@ Dock_Timetrack::~Dock_Timetrack() delete hscrollbar_; delete vscrollbar_; delete widget_timeslider_; + delete widget_kf_list_; } void @@ -440,8 +447,7 @@ 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)); @@ -484,7 +490,6 @@ 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()))); @@ -493,17 +498,22 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle canvas_v assert(tree_view); + widget_timeslider_->set_time_adjustment(&canvas_view->time_adjustment()); widget_timeslider_->set_bounds_adjustment(&canvas_view->time_window_adjustment()); widget_timeslider_->set_global_fps(canvas_view->get_canvas()->rend_desc().get_frame_rate()); + widget_kf_list_->set_time_adjustment(&canvas_view->time_adjustment()); + widget_kf_list_->set_canvas_interface(canvas_view->canvas_interface()); + vscrollbar_->set_adjustment(*tree_view->get_vadjustment()); hscrollbar_->set_adjustment(canvas_view->time_window_adjustment()); - table_=new Gtk::Table(2,2); - table_->attach(*widget_timeslider_, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK); - table_->attach(*tree_view, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - 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); + table_=new Gtk::Table(2,3); + table_->attach(*widget_timeslider_, 0, 1, 1, 2, Gtk::FILL|Gtk::SHRINK, Gtk::FILL|Gtk::SHRINK); + table_->attach(*widget_kf_list_, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK); + table_->attach(*tree_view, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + table_->attach(*hscrollbar_, 0, 1, 3, 4, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK); + table_->attach(*vscrollbar_, 1, 2, 0, 3, Gtk::FILL|Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND); add(*table_); //add(*last_widget_curves_);