From: Carlos Lopez Date: Mon, 27 Jul 2009 15:04:09 +0000 (+0200) Subject: Merge branch 'zelgadis_master' into genete_master X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=ff20bb143f86979474d409a9bdc535d2ad1281bd;hp=510db4e9760325e1cf103a936fe04e10f17d0ccb;p=synfig.git Merge branch 'zelgadis_master' into genete_master --- diff --git a/synfig-studio/trunk/src/gtkmm/Makefile.am b/synfig-studio/trunk/src/gtkmm/Makefile.am index 1be3e71..c5cc73d 100644 --- a/synfig-studio/trunk/src/gtkmm/Makefile.am +++ b/synfig-studio/trunk/src/gtkmm/Makefile.am @@ -138,7 +138,8 @@ WIDGET_HH = \ widget_value.h \ widget_vector.h \ widget_waypoint.h \ - widget_waypointmodel.h + widget_waypointmodel.h \ + widget_keyframe_list.h WIDGET_CC = \ widget_canvaschooser.cpp \ @@ -157,7 +158,8 @@ WIDGET_CC = \ widget_value.cpp \ widget_vector.cpp \ widget_waypoint.cpp \ - widget_waypointmodel.cpp + widget_waypointmodel.cpp \ + widget_keyframe_list.cpp STATE_HH = \ diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index a76b1a0..53a6ccc 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -690,6 +690,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handleset_time_adjustment(&time_adjustment()); timeslider->set_bounds_adjustment(&time_window_adjustment()); //layout_table->attach(*timeslider, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL); + //Setup the keyframe list widget + widget_kf_list->set_time_adjustment(&time_adjustment()); + widget_kf_list->set_canvas_interface(canvas_interface()); + widget_kf_list->show(); tooltips.set_tip(*time_window_scroll,_("Moves the time window")); tooltips.set_tip(*timeslider,_("Changes the current time")); @@ -1033,16 +1038,26 @@ CanvasView::create_time_bar() keyframedial->show(); keyframebutton=keyframedial->get_lock_button(); - timebar = manage(new class Gtk::Table(5, 4, false)); + timebar = Gtk::manage(new class Gtk::Table(5, 4, false)); + + //Adjust both widgets to be the same as the + int header_height = 0; + if(getenv("SYNFIG_TIMETRACK_HEADER_HEIGHT")) + header_height = atoi(getenv("SYNFIG_TIMETRACK_HEADER_HEIGHT")); + if (header_height < 3) + header_height = 24; + timeslider->set_size_request(-1,header_height-header_height/3+1); + widget_kf_list->set_size_request(-1,header_height/3+1); //Attach widgets to the timebar - timebar->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK); - timebar->attach(*framedial, 0, 1, 2, 3,Gtk::SHRINK, Gtk::SHRINK); - timebar->attach(*current_time_widget, 0, 1, 1, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); - timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK); + //timebar->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK); + timebar->attach(*current_time_widget, 0, 1, 0, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); + timebar->attach(*framedial, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK); + timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::FILL|Gtk::SHRINK, Gtk::FILL|Gtk::SHRINK); + timebar->attach(*widget_kf_list, 1, 3, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK); timebar->attach(*time_window_scroll, 1, 3, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK); - timebar->attach(*keyframedial, 3, 4, 1, 2, Gtk::SHRINK, Gtk::SHRINK); - timebar->attach(*animatebutton, 4, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK); + timebar->attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK); + timebar->attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK); //timebar->attach(*keyframebutton, 1, 2, 3, 4, Gtk::SHRINK, Gtk::SHRINK); timebar->show(); diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h index a33fb26..cddcbe2 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.h +++ b/synfig-studio/trunk/src/gtkmm/canvasview.h @@ -70,6 +70,7 @@ #include "framedial.h" #include "toggleducksdial.h" #include "resolutiondial.h" +#include "widget_keyframe_list.h" #include "duckmatic.h" #include @@ -294,6 +295,9 @@ private: //! Time slider class. Same than the Time track panel std::auto_ptr timeslider; + //!Keyframe list slider + std::auto_ptr widget_kf_list; + std::list duck_changed_connections; /* DEBUGPOINT_CLASS(8); diff --git a/synfig-studio/trunk/src/gtkmm/dialog_gradient.h b/synfig-studio/trunk/src/gtkmm/dialog_gradient.h index c681dac..f9d674c 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_gradient.h +++ b/synfig-studio/trunk/src/gtkmm/dialog_gradient.h @@ -105,7 +105,8 @@ public: Dialog_Gradient(); ~Dialog_Gradient(); - + //! Inerface to external calls to fill in the Gradient Editor Dialog + //! when a Constant ValueNode or a Animated ValueNode is double cliked. void edit(const synfigapp::ValueDesc &x, etl::handle canvas_interface, synfig::Time time=0); }; // END of Dialog_Gradient diff --git a/synfig-studio/trunk/src/gtkmm/dock_curves.cpp b/synfig-studio/trunk/src/gtkmm/dock_curves.cpp index bc1a73c..9268fc2 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_curves.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_curves.cpp @@ -93,6 +93,7 @@ _curve_selection_changed(Gtk::TreeView* param_tree_view,Widget_Curves* curves) if(!param_tree_view->get_selection()->count_selected_rows()) { curves->clear(); + curves->refresh(); return; } diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp index a0f7fca..7a6139a 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp @@ -43,6 +43,7 @@ #include "layerparamtreestore.h" #include "workarea.h" #include "widget_timeslider.h" +#include "widget_keyframe_list.h" #include "layerparamtreestore.h" #include "general.h" #include @@ -405,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(); } @@ -423,6 +427,7 @@ Dock_Timetrack::~Dock_Timetrack() delete hscrollbar_; delete vscrollbar_; delete widget_timeslider_; + delete widget_kf_list_; } void @@ -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_); diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.h b/synfig-studio/trunk/src/gtkmm/dock_timetrack.h index d103d9a..9da19fd 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.h +++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.h @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2009 Carlos López ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -40,12 +41,14 @@ namespace studio { class Widget_Timeslider; +class Widget_Keyframe_List; class Dock_Timetrack : public Dock_CanvasSpecific { Gtk::HScrollbar* hscrollbar_; Gtk::VScrollbar* vscrollbar_; Widget_Timeslider* widget_timeslider_; + Widget_Keyframe_List* widget_kf_list_; Gtk::Table* table_; protected: @@ -59,7 +62,7 @@ public: Dock_Timetrack(); ~Dock_Timetrack(); -}; // END of Dock_Keyframes +}; // END of Dock_Timetrack }; // END of namespace studio diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 8af9357..05301a7 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -195,12 +195,12 @@ IconController::IconController(const synfig::String& /*basepath*/) INIT_STOCK_ICON(seek_next_frame,"seek_next_frame."IMAGE_EXT,_("Next Frame")); INIT_STOCK_ICON(seek_end,"seek_end."IMAGE_EXT,_("Seek to End")); - INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon."IMAGE_EXT,_("Toogle position ducks")); - INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon."IMAGE_EXT,_("Toogle vertex ducks")); - INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon."IMAGE_EXT,_("Toogle tangent ducks")); - INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon."IMAGE_EXT,_("Toogle radius ducks")); - INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon."IMAGE_EXT,_("Toogle width ducks")); - INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon."IMAGE_EXT,_("Toogle angle ducks")); + INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon."IMAGE_EXT,_("Toggle position ducks")); + INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon."IMAGE_EXT,_("Toggle vertex ducks")); + INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon."IMAGE_EXT,_("Toggle tangent ducks")); + INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon."IMAGE_EXT,_("Toggle radius ducks")); + INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon."IMAGE_EXT,_("Toggle width ducks")); + INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon."IMAGE_EXT,_("Toggle angle ducks")); INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon."IMAGE_EXT,_("Toggle show grid")); INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon."IMAGE_EXT,_("Toggle snap grid")); diff --git a/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp b/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp index 3f1230a..358923a 100644 --- a/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp +++ b/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp @@ -54,12 +54,12 @@ ToggleDucksDial::ToggleDucksDial(): Gtk::Table(1, 6, false) { Gtk::IconSize iconsize = Gtk::IconSize::from_name("synfig-small_icon"); - ducks_position = create_label_button(iconsize, "synfig-toggle_duck_position", _("Toogle position ducks")); - ducks_vertex = create_label_button(iconsize, "synfig-toggle_duck_vertex", _("Toogle vertex ducks")); - ducks_tangent = create_label_button(iconsize, "synfig-toggle_duck_tangent", _("Toogle tangent ducks")); - ducks_radius = create_label_button(iconsize, "synfig-toggle_duck_radius", _("Toogle radius ducks")); - ducks_width = create_label_button(iconsize, "synfig-toggle_duck_width", _("Toogle width ducks")); - ducks_angle = create_label_button(iconsize, "synfig-toggle_duck_angle", _("Toogle angle ducks")); + ducks_position = create_label_button(iconsize, "synfig-toggle_duck_position", _("Toggle position ducks")); + ducks_vertex = create_label_button(iconsize, "synfig-toggle_duck_vertex", _("Toggle vertex ducks")); + ducks_tangent = create_label_button(iconsize, "synfig-toggle_duck_tangent", _("Toggle tangent ducks")); + ducks_radius = create_label_button(iconsize, "synfig-toggle_duck_radius", _("Toggle radius ducks")); + ducks_width = create_label_button(iconsize, "synfig-toggle_duck_width", _("Toggle width ducks")); + ducks_angle = create_label_button(iconsize, "synfig-toggle_duck_angle", _("Toggle angle ducks")); attach(*ducks_position, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); attach(*ducks_vertex, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp index b4a5678..2260dad 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp @@ -474,6 +474,9 @@ Widget_Curves::redraw(GdkEventExpose */*bleh*/) if(!time_adjustment_ || !range_adjustment_ || !h || !w) return false; + if(!curve_list_.size()) + return false; + Glib::RefPtr gc(Gdk::GC::create(get_window())); const Real t_begin(time_adjustment_->get_lower()); @@ -497,10 +500,41 @@ Widget_Curves::redraw(GdkEventExpose */*bleh*/) gc->set_rgb_fg_color(Gdk::Color("#4f4f4f")); get_window()->draw_rectangle(gc, false, 0, round_to_int((0-r_bottom)/dr), w, 0); + // This try to find a valid vanvas to show the keyframes of those + // valuenodes. If not canvas found then no keyframes marks are shown. + synfig::Canvas::Handle canvas=0; + for(curve_iter=curve_list_.begin();curve_iter!=curve_list_.end();++curve_iter) + { + canvas=curve_iter->value_desc.get_canvas(); + if(canvas) + break; + } + + if(canvas) + { + // Draw vertical lines for the keyframes marks. + const synfig::KeyframeList& keyframe_list(canvas->keyframe_list()); + synfig::KeyframeList::const_iterator iter; + + for(iter=keyframe_list.begin();iter!=keyframe_list.end();++iter) + { + if(!iter->get_time().is_valid()) + continue; + + const int x((int)((float)w/(t_end-t_begin)*(iter->get_time()-t_begin))); + if(iter->get_time()>=t_begin && iter->get_time()set_rgb_fg_color(Gdk::Color("#a07f7f")); // It should be user selectable + get_window()->draw_rectangle(gc, true, x, 0, 1, h); + } + } + } + // Draw current time - gc->set_rgb_fg_color(Gdk::Color("#00007f")); + gc->set_rgb_fg_color(Gdk::Color("#0000ff")); // It should be user selectable get_window()->draw_rectangle(gc, false, round_to_int((time_adjustment_->get_value()-t_begin)/dt), 0, 0, h); + // Draw curves for the valuenodes stored in the curve list for(curve_iter=curve_list_.begin();curve_iter!=curve_list_.end();++curve_iter) { Real t; diff --git a/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp b/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp index 596feda..c964599 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp @@ -297,7 +297,7 @@ Widget_Gradient::on_event(GdkEvent *event) { if(!gradient_.size()) return true; Gradient::iterator iter(gradient_.find(selected_cpoint)); - + //! Use SHIFT to stack two CPoints together. if(event->button.state&GDK_SHIFT_MASK) { float begin(-100000000),end(100000000); diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp new file mode 100644 index 0000000..ace2b98 --- /dev/null +++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp @@ -0,0 +1,425 @@ +/* === S Y N F I G ========================================================= */ +/*! \file widget_keyframe_list.cpp +** \brief A custom widget to manage keyframes in the timeline. +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore +** Copyright (c) 2009 Carlos López +** +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal +*/ +/* ========================================================================= */ + +/* === H E A D E R S ======================================================= */ + +#ifdef USING_PCH +# include "pch.h" +#else +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "widget_keyframe_list.h" +#include "app.h" +#include +#include +#include + +#include "general.h" + +#endif + +/* === U S I N G =========================================================== */ + +using namespace std; +using namespace etl; +using namespace synfig; +using namespace studio; + + +/* === M A C R O S ========================================================= */ +#define WIDGET_KEYFRAME_LIST_DEFAULT_FPS 24.0 +/* === G L O B A L S ======================================================= */ + +/* === P R O C E D U R E S ================================================= */ + +/* === M E T H O D S ======================================================= */ + +Widget_Keyframe_List::Widget_Keyframe_List(): + adj_default(0,0,2,1/WIDGET_KEYFRAME_LIST_DEFAULT_FPS,10/WIDGET_KEYFRAME_LIST_DEFAULT_FPS), + kf_list_(&default_kf_list_), + time_ratio("4f", WIDGET_KEYFRAME_LIST_DEFAULT_FPS) +{ + adj_timescale=0; + editable_=true; + fps=WIDGET_KEYFRAME_LIST_DEFAULT_FPS; + set_size_request(-1,64); + //!This signal is called when the widget need to be redrawn + signal_expose_event().connect(sigc::mem_fun(*this, &studio::Widget_Keyframe_List::redraw)); + //! The widget respond to mouse button press and release and to + //! left button motion + add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK); + add_events(Gdk::BUTTON1_MOTION_MASK /*| Gdk::BUTTON3_MOTION_MASK*/); + add_events(Gdk::POINTER_MOTION_MASK); + set_time_adjustment(&adj_default); + queue_draw(); +} + +Widget_Keyframe_List::~Widget_Keyframe_List() +{ +} + +bool +Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/) +{ + + const int h(get_height()); + const int w(get_width()); + + //!Boundaries of the drawing area in time units. + synfig::Time top(adj_timescale->get_upper()); + synfig::Time bottom(adj_timescale->get_lower()); + + //! The graphic context + Glib::RefPtr gc(Gdk::GC::create(get_window())); + //! A rectangle that defines the drawing area. + Gdk::Rectangle area(0,0,w,h); + + //! draw a background + gc->set_rgb_fg_color(Gdk::Color("#9d9d9d")); + get_window()->draw_rectangle(gc, true, 0, 0, w, h); + + if(!editable_) + { + return true; //needs fixing! + } + //!Returns if there are not keyframes to draw. + if (kf_list_->empty()) return false; + + //!Loop all the keyframes + synfig::KeyframeList::iterator iter,selected_iter; + bool show_selected(false); + for(iter=kf_list_->begin();iter!=kf_list_->end();iter++) + { + //!do not draw keyframes out of the widget boundaries + if (iter->get_time()>top || iter->get_time()get_time()-bottom) * (w/(top-bottom)) ) ); + get_style()->paint_arrow(get_window(), Gtk::STATE_NORMAL, + Gtk::SHADOW_OUT, area, *this, " ", Gtk::ARROW_DOWN, 1, + x-h/2+1, 0, h, h ); + } + else + { + selected_iter=iter; + show_selected=true; + } + } + + // we do this so that we can be sure that + // the selected keyframe is shown on top + if(show_selected) + { + // If not dragging just show the selected keyframe + if (!dragging_) + { + int x((int)((float)(selected_iter->get_time()-bottom) * (w/(top-bottom)) ) ); + get_style()->paint_arrow(get_window(), Gtk::STATE_SELECTED, + Gtk::SHADOW_OUT, area, *this, " ", Gtk::ARROW_DOWN, 1, + x-h/2+1, 0, h, h ); + } + // If dragging then show the selected as insensitive and the + // dragged as selected + else + { + int x((int)((float)(selected_iter->get_time()-bottom) * (w/(top-bottom)) ) ); + get_style()->paint_arrow(get_window(), Gtk::STATE_INSENSITIVE, + Gtk::SHADOW_OUT, area, *this, " ", Gtk::ARROW_DOWN, 1, + x-h/2, 0, h, h ); + x=(int)((float)(dragging_kf_time-bottom) * (w/(top-bottom)) ) ; + get_style()->paint_arrow(get_window(), Gtk::STATE_SELECTED, + Gtk::SHADOW_OUT, area, *this, " ", Gtk::ARROW_DOWN, 1, + x-h/2+1, 0, h, h ); + } + } + return true; +} + + +void +Widget_Keyframe_List::set_kf_list(synfig::KeyframeList* x) +{ + kf_list_=x; + set_selected_keyframe(selected_none); + selected_=false; + dragging_=false; +} + +void +Widget_Keyframe_List::set_selected_keyframe(const synfig::Keyframe &x) +{ + selected_kf=x; + selected_=true; + dragging_kf_time=selected_kf.get_time(); + //signal_keyframe_selected_(selected_kf); + dragging_=false; + queue_draw(); +} + +bool +Widget_Keyframe_List::perform_move_kf(bool delta=false) +{ + if(!selected_) + return false; + if(dragging_kf_time == selected_kf.get_time()) + return false; // change this checking if not sticked to integer frames + Time selected_kf_time(selected_kf.get_time()); + Time prev, next; + kf_list_->find_prev_next(selected_kf_time, prev, next); + // Not possible to set delta to the first keyframe + // perform normal movement + // As suggested by Zelgadis it is better to not perform anything. + if (prev==Time::begin() && delta==true) + { + synfig::info(_("Not possible to ALT-drag the first keyframe")); + return false; + } + if(!delta) + { + synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeSet")); + if(!action) + return false; + selected_kf.set_time(dragging_kf_time); + action->set_param("canvas",canvas_interface_->get_canvas()); + action->set_param("canvas_interface",canvas_interface_); + action->set_param("keyframe",selected_kf); + try + { + canvas_interface_->get_instance()->perform_action(action); + } + catch(...) + { + return false; + } + } + else + { + Keyframe prev_kf(*kf_list_->find_prev(selected_kf_time)); + Time prev_kf_time(prev_kf.get_time()); + if (prev_kf_time >= dragging_kf_time) //Not allowed + { + synfig::warning(_("Delta set not allowed")); + synfig::info(_("Widget_Keyframe_List::perform_move_kf(%i)::prev_kf_time=%s"), delta, prev_kf_time.get_string().c_str()); + synfig::info(_("Widget_Keyframe_List::perform_move_kf(%i)::dragging_kf_time=%s"), delta, dragging_kf_time.get_string().c_str()); + return false; + } + else + { + Time old_delta_time(selected_kf_time-prev_kf_time); + Time new_delta_time(dragging_kf_time-prev_kf_time); + Time change_delta(new_delta_time-old_delta_time); + synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeSetDelta")); + if(!action) + return false; + action->set_param("canvas",canvas_interface_->get_canvas()); + action->set_param("canvas_interface",canvas_interface_); + action->set_param("keyframe",prev_kf); + action->set_param("delta",change_delta); + canvas_interface_->get_instance()->perform_action(action); + } + } + queue_draw(); + return true; +} + +bool +Widget_Keyframe_List::on_event(GdkEvent *event) +{ + const int x(static_cast(event->button.x)); + //const int y(static_cast(event->button.y)); + //!Boundaries of the drawing area in time units. + synfig::Time top(adj_timescale->get_upper()); + synfig::Time bottom(adj_timescale->get_lower()); + //!pos is the [0,1] relative horizontal place on the widget + float pos((float)x/(get_width())); + if(pos<0.0f)pos=0.0f; + if(pos>1.0f)pos=1.0f; + //! The time where the event x is + synfig::Time t((float)(bottom+pos*(top-bottom))); + //Do not respond mouse events if the list is empty + if(!kf_list_->size()) + return true; + + //! here the guts of the event + switch(event->type) + { + case GDK_MOTION_NOTIFY: + if(editable_) + { + // here is captured mouse motion + // AND left or right mouse button pressed + if (event->motion.state & (GDK_BUTTON1_MASK /*| GDK_BUTTON3_MASK*/)) + { + // stick to integer frames. It can be optional in the future + if(fps) t = floor(t*fps + 0.5)/fps; + dragging_kf_time=t; + dragging_=true; + queue_draw(); + return true; + } + // here is captured mouse motion + // AND NOT left or right mouse button pressed + else + { + Glib::ustring ttip=""; + synfig::Time p_t,n_t; + kf_list_->find_prev_next(t, p_t, n_t); + if( (p_t==Time::begin() && n_t==Time::end()) + || + ((t-p_t)>time_ratio && (n_t-t)>time_ratio) + ) + { + ttip = _("Click and drag keyframes"); + } + else if ((t-p_t)<(n_t-t)) + { + synfig::Keyframe kf(*kf_list_->find_prev(t)); + synfig::String kf_name(kf.get_description().c_str()); + ttip = kf_name.c_str(); + } + else + { + synfig::Keyframe kf(*kf_list_->find_next(t)); + synfig::String kf_name(kf.get_description().c_str()); + ttip = kf_name.c_str(); + } + tooltips.set_tip(*this, ttip); + dragging_=false; + queue_draw(); + return true; + } + } + break; + case GDK_BUTTON_PRESS: + changed_=false; + dragging_=false; + if(event->button.button==1 /*|| event->button.button==3*/) + { + if(editable_) + { + synfig::Time prev_t,next_t; + kf_list_->find_prev_next(t, prev_t, next_t); + if( (prev_t==Time::begin() && next_t==Time::end()) + || + ((t-prev_t)>time_ratio && (next_t-t)>time_ratio) + ) + { + set_selected_keyframe(selected_none); + selected_=false; + queue_draw(); + } + else if ((t-prev_t)<(next_t-t)) + { + set_selected_keyframe(*(kf_list_->find_prev(t))); + queue_draw(); + selected_=true; + } + else + { + set_selected_keyframe(*(kf_list_->find_next(t))); + queue_draw(); + selected_=true; + } + return true; + } + else + { + return false; + } + } + + break; + case GDK_BUTTON_RELEASE: + if(editable_ && (event->button.button==1 /*|| event->button.button==3*/)) + { + // stick to integer frames. + if(fps) t = floor(t*fps + 0.5)/fps; + bool stat=false; + if(dragging_) + { + //if (event->button.button==3) + if(event->button.state & GDK_MOD1_MASK) + { + stat=perform_move_kf(true); + } + else + { + stat=perform_move_kf(false); + } + } + dragging_=false; + return stat; + } + break; + default: + break; + } + return false; +} + + +void Widget_Keyframe_List::set_time_adjustment(Gtk::Adjustment *x) +{ + //disconnect old connections + time_value_change.disconnect(); + time_other_change.disconnect(); + + //connect update function to new adjustment + adj_timescale = x; + + if(x) + { + time_value_change = x->signal_value_changed().connect(sigc::mem_fun(*this,&Widget_Keyframe_List::queue_draw)); + time_other_change = x->signal_changed().connect(sigc::mem_fun(*this,&Widget_Keyframe_List::queue_draw)); + } +} + +void +Widget_Keyframe_List::set_fps(float d) +{ + if(fps != d) + { + fps = d; + //update everything since we need to redraw already + queue_draw(); + } +} + +void +Widget_Keyframe_List::set_canvas_interface(etl::loose_handle h) +{ + canvas_interface_=h; + // Store the values used fomr the canvas interface. + if (canvas_interface_) + { + set_fps(canvas_interface_->get_canvas()->rend_desc().get_frame_rate()); + set_kf_list(&canvas_interface_->get_canvas()->keyframe_list()); + } +} + + diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h new file mode 100644 index 0000000..1e41770 --- /dev/null +++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h @@ -0,0 +1,150 @@ +/* === S Y N F I G ========================================================= */ +/*! \file widget_keyframe_list.h +** \brief A custom widget to manage keyframes in the timeline. +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2009 Carlos López +** +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal +*/ +/* ========================================================================= */ + +/* === S T A R T =========================================================== */ + +#ifndef __SYNFIG_STUDIO_WIDGET_KEYFRAME_LIST_H +#define __SYNFIG_STUDIO_WIDGET_KEYFRAME_LIST_H + +/* === H E A D E R S ======================================================= */ + +#include +#include +#include +#include +#include +#include + + +/* === M A C R O S ========================================================= */ + +/* === T Y P E D E F S ===================================================== */ + +/* === C L A S S E S & S T R U C T S ======================================= */ + +namespace studio { + +class Widget_Keyframe_List : public Gtk::DrawingArea +{ + //! Tooltips class. It is deprecated since gtkmm 2.12 + //! replace with Tooltip class or use the own tooltip widget's members + Gtk::Tooltips tooltips; + + //! The canvas interface being watched + etl::loose_handle canvas_interface_; + + //! Time adjustment window + Gtk::Adjustment adj_default; + Gtk::Adjustment *adj_timescale; + + //!The list of keyframes to be drawn on the widget and moved with mouse + synfig::KeyframeList default_kf_list_; + mutable synfig::KeyframeList* kf_list_; + + //! The frames per second of the canvas + float fps; + + //! Time radius to click a keyframe + synfig::Time time_ratio; + + //!True if it is editable. Keyframes can be moved. + bool editable_; + + //!True if a keyframe is being dragged. + bool dragging_; + + //!True if a keyframe has been moved + bool changed_; + + //!Holds the selected keyframe of the keyframe list + synfig::Keyframe selected_kf; + synfig::Keyframe selected_none; + bool selected_; + + //!The time of the selected keyframe + synfig::Time selected_kf_time; + + //!The time of the selected keyframe during draging + synfig::Time dragging_kf_time; + + //!Connectors for handling the signals of the time adjustment + sigc::connection time_value_change; + sigc::connection time_other_change; + +public: + + //!Default constructor + Widget_Keyframe_List(); + + //!Destructror + ~Widget_Keyframe_List(); + + //!Loads a new keyframe list on the widget. + void set_kf_list(synfig::KeyframeList* x); + + //!Member for private data. + synfig::KeyframeList* get_kf_list()const { return kf_list_; } + + //!Member for private data + void set_editable(bool x=true) { editable_=x; } + + //!Member for private data + bool get_editable()const { return editable_; } + + + //!Store the selected keyframe value + void set_selected_keyframe(const synfig::Keyframe &x); + + //!Returns the selected keyframe + const synfig::Keyframe& get_selected_keyframe() { return selected_kf; } + + //! Set the time adjustment and proper connects its change signals + void set_time_adjustment(Gtk::Adjustment *x); + + //! Set the fps + void set_fps(float x); + + //! Set the canvas interface + void set_canvas_interface(etl::loose_handle h); + + //! Performs the keyframe movement. Returns true if it was sucessful + //! @return true: if success otherwise false + //! |delta=false: permorm normal move. true: perform delta movement + bool perform_move_kf(bool delta); + + + +/* ======================= EVENTS HANDLERS ===========================*/ + //!Redraw event. Should draw all the keyframes + the selected + the dragged + bool redraw(GdkEventExpose*bleh=NULL); + + //!Mouse event handler. + bool on_event(GdkEvent *event); +}; // END of class Keyframe_List + +}; // END of namespace studio + + +/* === E N D =============================================================== */ + +#endif diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp index ba57435..ed5d63c 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp @@ -576,7 +576,17 @@ bool Widget_Timeslider::redraw(bool /*doublebuffer*/) //gc->set_rgb_fg_color(Gdk::Color("#000000")); layout->set_text(timecode); - window->draw_layout(gc,xpx+2,heightsmall,layout); + Pango::AttrList attr_list; + // Aproximately a font size of 8 pixels. + // Pango::SCALE = 1024 + // create_attr_size waits a number in 1000th of pixels. + // Should be user customizable in the future. Now it is fixed to 10 + Pango::AttrInt pango_size(Pango::Attribute::create_attr_size(Pango::SCALE*10)); + pango_size.set_start_index(0); + pango_size.set_end_index(64); + attr_list.change(pango_size); + layout->set_attributes(attr_list); + window->draw_layout(gc,xpx+2,0,layout); }else { window->draw_line(gc,xpx,0,xpx,heightsmall); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp index 97898c3..6cd262a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp @@ -178,7 +178,10 @@ Action::KeyframeSetDelta::perform() // Time location(keyframe.get_time()); Time location(get_canvas()->keyframe_list().find(keyframe)->get_time()); - Time delta(delta); +// This line sets delta to 0s regardless to any previous value of delta. +// I think it was here for symmetry to the undo() operation. +// It was causing that the Set delta operation was faulty. Now works! +// Time delta(delta); get_canvas()->keyframe_list().insert_time(location,delta);