synfig-devl — Synfig Developer List

[Synfig-devl] Carlos Lopez : Do not perform action when ALT-draging first keyframe

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 12876a2268b54c0cc2f381b5066a3bbc8ca623e8
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=12876a2268b54c0cc2f381b5066a3bbc8ca623e8

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Sat Jul 25 11:18:48 2009 +0200

Do not perform action when ALT-draging first keyframe

---

 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 4c83d14..ace2b98 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -193,8 +193,12 @@ Widget_Keyframe_List::perform_move_kf(bool delta=false)
 	kf_list_->find_prev_next(selected_kf_time, prev, next);
 	// Not possible to set delta to the first keyframe
 	// perform normal movement
-	if (prev==Time::begin()) delta = false;
-
+	// 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"));

[Synfig-devl] Carlos Lopez : Use old and deprecated Tooltips class for compatibility with gtkmm 2.10

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 08caa838e9fd7826b436c88b07931fa99a116822
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=08caa838e9fd7826b436c88b07931fa99a116822

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Thu Jul 23 16:40:30 2009 +0200

Use old and deprecated Tooltips class for compatibility with gtkmm 2.10

---

 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |   11 +++++------
 .../trunk/src/gtkmm/widget_keyframe_list.h         |    5 +++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index a350aa1..4c83d14 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -282,6 +282,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 			// 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())
@@ -289,23 +290,21 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 				((t-p_t)>time_ratio 	&& (n_t-t)>time_ratio)
 				)
 				{
-					Glib::ustring ttip = _("Click and drag keyframes");
-					set_tooltip_text(ttip);
+					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());
-					Glib::ustring ttip = kf_name.c_str();
-					set_tooltip_text(ttip);
+					ttip = kf_name.c_str();
 				}
 				else
 				{
 					synfig::Keyframe kf(*kf_list_->find_next(t));
 					synfig::String kf_name(kf.get_description().c_str());
-					Glib::ustring ttip = kf_name.c_str();
-					set_tooltip_text(ttip);
+					ttip = kf_name.c_str();
 				}
+				tooltips.set_tip(*this, ttip);
 				dragging_=false;
 				queue_draw();
 				return true;
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
index 349dcd3..1e41770 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
@@ -30,6 +30,7 @@
 
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/adjustment.h>
+#include <gtkmm/tooltips.h>
 #include <synfig/keyframe.h>
 #include <sigc++/connection.h>
 #include <synfigapp/canvasinterface.h>
@@ -45,6 +46,10 @@ 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<synfigapp::CanvasInterface> canvas_interface_;
 

[Synfig-devl] Carlos Lopez : Alter the font size of the timeslider

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: acc6eb743b440a2363d21c5e060425ee45b0f9fa
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=acc6eb743b440a2363d21c5e060425ee45b0f9fa

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Wed Jul 22 22:53:43 2009 +0200

Alter the font size of the timeslider

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp       |   15 +++++++++++----
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |    2 +-
 .../trunk/src/gtkmm/widget_timeslider.cpp          |   10 ++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 6e40ea1..53a6ccc 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -966,13 +966,11 @@ CanvasView::create_time_bar()
 	//Widget_Timeslider *time_scroll = manage(new Widget_Timeslider);
 	timeslider->set_time_adjustment(&time_adjustment());
 	timeslider->set_bounds_adjustment(&time_window_adjustment());
-	//timeslider->set_size_request(-1,12);
 	//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();
-	widget_kf_list->set_size_request(-1,8);
 
 	tooltips.set_tip(*time_window_scroll,_("Moves the time window"));
 	tooltips.set_tip(*timeslider,_("Changes the current time"));
@@ -1042,12 +1040,21 @@ CanvasView::create_time_bar()
 
 	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(*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::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL);
-	timebar->attach(*widget_kf_list, 1, 3, 0, 1, Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL);
+	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, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
 	timebar->attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index 1255cd2..7a6139a 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -509,7 +509,7 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
 		vscrollbar_->set_adjustment(*tree_view->get_vadjustment());
 		hscrollbar_->set_adjustment(canvas_view->time_window_adjustment());
 		table_=new Gtk::Table(2,3);
-		table_->attach(*widget_timeslider_, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
+		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);
diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
index 1687371..ed5d63c 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
@@ -576,6 +576,16 @@ bool Widget_Timeslider::redraw(bool /*doublebuffer*/)
 
 			//gc->set_rgb_fg_color(Gdk::Color("#000000"));
 			layout->set_text(timecode);
+			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
 		{

[Synfig-devl] Carlos Lopez : If press ALT while dragging it performs a SetKeyframeDelta operation.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 47baca24f2eaa508d5f39a524fed0e910a0e45c9
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=47baca24f2eaa508d5f39a524fed0e910a0e45c9

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Wed Jul 22 20:05:34 2009 +0200

If press ALT while dragging it performs a SetKeyframeDelta operation.
Maybe someone prefer to use the right mouse button but want to reserve for
pop up menu.

---

 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |  112 ++++++++++++++------
 .../trunk/src/gtkmm/widget_keyframe_list.h         |    4 +-
 2 files changed, 81 insertions(+), 35 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index b30632e..a350aa1 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -50,7 +50,7 @@ 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 ================================================= */
@@ -58,20 +58,20 @@ using namespace studio;
 /* === M E T H O D S ======================================================= */
 
 Widget_Keyframe_List::Widget_Keyframe_List():
-	editable_(true),
-	adj_default(0,0,2,1/24,10/24),
-	adj_timescale(0),
-	fps(24),
+	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", fps)
+	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);
+	add_events(Gdk::BUTTON1_MOTION_MASK /*| Gdk::BUTTON3_MOTION_MASK*/);
 	add_events(Gdk::POINTER_MOTION_MASK);
 	set_time_adjustment(&adj_default);
 	queue_draw();
@@ -182,27 +182,63 @@ Widget_Keyframe_List::set_selected_keyframe(const synfig::Keyframe &x)
 }
 
 bool
-Widget_Keyframe_List::perform_move_kf()
+Widget_Keyframe_List::perform_move_kf(bool delta=false)
 {
 	if(!selected_)
 		return false;
 	if(dragging_kf_time == selected_kf.get_time())
-		return false;
-	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; // 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
+	if (prev==Time::begin()) delta = 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;
 }
@@ -211,7 +247,7 @@ bool
 Widget_Keyframe_List::on_event(GdkEvent *event)
 {
 	const int x(static_cast<int>(event->button.x));
-	const int y(static_cast<int>(event->button.y));
+	//const int y(static_cast<int>(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());
@@ -232,8 +268,8 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 		if(editable_)
 		{
 			// here is captured mouse motion
-			// AND left mouse button pressed
-			if (event->motion.state & GDK_BUTTON1_MASK)
+			// 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;
@@ -243,7 +279,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 				return true;
 			}
 			// here is captured mouse motion
-			// AND NOT left mouse button pressed
+			// AND NOT left or right mouse button pressed
 			else
 			{
 				synfig::Time p_t,n_t;
@@ -279,7 +315,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 	case GDK_BUTTON_PRESS:
 		changed_=false;
 		dragging_=false;
-		if(event->button.button==1)
+		if(event->button.button==1 /*|| event->button.button==3*/)
 		{
 			if(editable_)
 			{
@@ -293,38 +329,46 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 					set_selected_keyframe(selected_none);
 					selected_=false;
 					queue_draw();
-					return true;
 				}
 				else if ((t-prev_t)<(next_t-t))
 				{
 					set_selected_keyframe(*(kf_list_->find_prev(t)));
 					queue_draw();
 					selected_=true;
-					return true;
 				}
 				else
 				{
 					set_selected_keyframe(*(kf_list_->find_next(t)));
 					queue_draw();
 					selected_=true;
-					return true;
 				}
-				return false;
+				return true;
 			}
 			else
 			{
 				return false;
 			}
 		}
+
 		break;
 	case GDK_BUTTON_RELEASE:
-		if(editable_ && event->button.button==1)
+		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_)
-				stat=perform_move_kf();
+				{
+					//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;
 		}
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
index 4280a69..349dcd3 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
@@ -123,7 +123,9 @@ public:
 	void set_canvas_interface(etl::loose_handle<synfigapp::CanvasInterface>	h);
 
 	//! Performs the keyframe movement. Returns true if it was sucessful
-	bool perform_move_kf();
+	//! @return true: if success otherwise false
+	//! |delta=false: permorm normal move. true: perform delta movement
+	bool perform_move_kf(bool delta);
 
 
 

[Synfig-devl] Carlos Lopez : Forgot to commit those two files

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 723347b927dd88f5e127484d6ec33149206042ea
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=723347b927dd88f5e127484d6ec33149206042ea

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Tue Jul 21 01:43:49 2009 +0200

Forgot to commit those two files

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp     |    4 ++--
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index da2e672..6e40ea1 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1046,8 +1046,8 @@ CanvasView::create_time_bar()
 	//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, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL);
-	timebar->attach(*widget_kf_list, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL);
+	timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL);
+	timebar->attach(*widget_kf_list, 1, 3, 0, 1, Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL);
 	timebar->attach(*time_window_scroll, 1, 3, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
 	timebar->attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
 	timebar->attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index c070e8b..1255cd2 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -509,8 +509,8 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
 		vscrollbar_->set_adjustment(*tree_view->get_vadjustment());
 		hscrollbar_->set_adjustment(canvas_view->time_window_adjustment());
 		table_=new Gtk::Table(2,3);
-		table_->attach(*widget_timeslider_, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
-		table_->attach(*widget_kf_list_, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
+		table_->attach(*widget_timeslider_, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, 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);

[Synfig-devl] Carlos Lopez : Fix bug for the modification of the keyframe length.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: ccdb7642df27ee84d641dc7c8a63f5fffbce2665
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=ccdb7642df27ee84d641dc7c8a63f5fffbce2665

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Wed Jul 22 17:47:39 2009 +0200

Fix bug for the modification of the keyframe length.
Now, modify the keyframe length column, shifts the rest
of keyframes form the modified keyframe to the end of time.

---

 .../src/synfigapp/actions/keyframesetdelta.cpp     |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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);
 

[Synfig-devl] Carlos Lopez : Add tooltips to the keyframe list. Place it above the time slider and draw the background a bit clear.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 899718b0b626c4256c1713dc2c4fd932b03d291d
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=899718b0b626c4256c1713dc2c4fd932b03d291d

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Tue Jul 21 01:43:22 2009 +0200

Add tooltips to the keyframe list. Place it above the time slider and draw the background a bit clear.

---

 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |  103 +++++++++++---------
 1 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index d31810a..b30632e 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -72,8 +72,9 @@ Widget_Keyframe_List::Widget_Keyframe_List():
 	//! left button motion
 	add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
 	add_events(Gdk::BUTTON1_MOTION_MASK);
+	add_events(Gdk::POINTER_MOTION_MASK);
 	set_time_adjustment(&adj_default);
-
+	queue_draw();
 }
 
 Widget_Keyframe_List::~Widget_Keyframe_List()
@@ -96,15 +97,14 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 	//! 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!
 	}
-
-	//! draw a background
-	gc->set_rgb_fg_color(Gdk::Color("#7f7f7f"));
-	get_window()->draw_rectangle(gc, true, 0, 0, w, h);
-
 	//!Returns if there are not keyframes to draw.
 	if (kf_list_->empty()) return false;
 
@@ -221,13 +221,9 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 	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())
-	{
-	//	synfig::info("Keyframe list empty");
 		return true;
-	}
 
 	//! here the guts of the event
 	switch(event->type)
@@ -235,15 +231,49 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 	case GDK_MOTION_NOTIFY:
 		if(editable_)
 		{
-			// stick to integer frames. It can be optional in the future
-			if(fps)
+			// here is captured mouse motion
+			// AND left mouse button pressed
+			if (event->motion.state & GDK_BUTTON1_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 mouse button pressed
+			else
+			{
+				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)
+				)
+				{
+					Glib::ustring ttip = _("Click and drag keyframes");
+					set_tooltip_text(ttip);
+				}
+				else if ((t-p_t)<(n_t-t))
 				{
-					t = floor(t*fps + 0.5)/fps;
+					synfig::Keyframe kf(*kf_list_->find_prev(t));
+					synfig::String kf_name(kf.get_description().c_str());
+					Glib::ustring ttip = kf_name.c_str();
+					set_tooltip_text(ttip);
 				}
-			dragging_kf_time=t;
-			dragging_=true;
-			queue_draw();
-			return true;
+				else
+				{
+					synfig::Keyframe kf(*kf_list_->find_next(t));
+					synfig::String kf_name(kf.get_description().c_str());
+					Glib::ustring ttip = kf_name.c_str();
+					set_tooltip_text(ttip);
+				}
+				dragging_=false;
+				queue_draw();
+				return true;
+			}
 		}
 		break;
 	case GDK_BUTTON_PRESS:
@@ -251,32 +281,23 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 		dragging_=false;
 		if(event->button.button==1)
 		{
-			/*synfig::info("Looking keyframe at  %s", t.get_string().c_str());
-			synfig::info("Total amount of keyframes %i", kf_list_->size());
-			synfig::info("Time ratio %s",time_ratio.get_string().c_str());
-			synfig::info("Bottom %s",bottom.get_string().c_str());
-			synfig::info("Top %s",top.get_string().c_str());*/
 			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)
-					)
+				||
+				((t-prev_t)>time_ratio 	&& (next_t-t)>time_ratio)
+				)
 				{
 					set_selected_keyframe(selected_none);
 					selected_=false;
-					/*synfig::info("Selected keyframe set to none");
-					synfig::info("Distance to prev %s", (t-prev_t).get_string().c_str());
-					synfig::info("Distance to next %s", (next_t-t).get_string().c_str());*/
 					queue_draw();
 					return true;
 				}
 				else if ((t-prev_t)<(next_t-t))
 				{
 					set_selected_keyframe(*(kf_list_->find_prev(t)));
-					//synfig::info("Selected keyframe set to previous");
 					queue_draw();
 					selected_=true;
 					return true;
@@ -284,12 +305,10 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 				else
 				{
 					set_selected_keyframe(*(kf_list_->find_next(t)));
-					//synfig::info("Selected keyframe set to next");
 					queue_draw();
 					selected_=true;
 					return true;
 				}
-
 				return false;
 			}
 			else
@@ -301,24 +320,18 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 	case GDK_BUTTON_RELEASE:
 		if(editable_ && event->button.button==1)
 		{
-		// stick to integer frames.
-		if(fps)
-			{
-				t = floor(t*fps + 0.5)/fps;
-			}
-		bool stat=false;
-		if(dragging_)
-			stat=perform_move_kf();
-		dragging_=false;
-		//synfig::info("Dropping keyframe time at: %s", t.get_string().c_str());
-		//synfig::info("perform move result: %i", stat);
-		return stat;
+			// stick to integer frames.
+			if(fps)	t = floor(t*fps + 0.5)/fps;
+			bool stat=false;
+			if(dragging_)
+				stat=perform_move_kf();
+			dragging_=false;
+			return stat;
 		}
+		break;
 	default:
 		break;
 	}
-
-
 	return false;
 }
 

[Synfig-devl] Carlos Lopez : Small adjustments for widgets

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: ca5470619b0ee095f4c12ac67193f10632371b2a
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=ca5470619b0ee095f4c12ac67193f10632371b2a

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Sun Jul 19 12:52:48 2009 +0200

Small adjustments for widgets

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp     |    4 ++--
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 9675f03..da2e672 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1046,8 +1046,8 @@ CanvasView::create_time_bar()
 	//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, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
-	timebar->attach(*widget_kf_list, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
+	timebar->attach(*timeslider, 1, 3, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL);
+	timebar->attach(*widget_kf_list, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL);
 	timebar->attach(*time_window_scroll, 1, 3, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
 	timebar->attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
 	timebar->attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index ac36340..c070e8b 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -412,10 +412,10 @@ Dock_Timetrack::Dock_Timetrack():
 	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-8);
-	widget_kf_list_->set_size_request(-1,8);
+	widget_timeslider_->set_size_request(-1,header_height-header_height/3+1);
+	widget_kf_list_->set_size_request(-1,header_height/3+1);
 
 	hscrollbar_=new Gtk::HScrollbar();
 	vscrollbar_=new Gtk::VScrollbar();

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: b22edfe1a90f8452b20a6f71816f0618fd2a9d37
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=b22edfe1a90f8452b20a6f71816f0618fd2a9d37

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Sat Jul 18 22:00:13 2009 +0200

A little smaller, and better look. I don't like it so much though. Have to think other solution.

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp       |   22 +++++++++++++------
 synfig-studio/trunk/src/gtkmm/canvasview.h         |    4 +++
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |    4 +-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |   13 +++++------
 .../trunk/src/gtkmm/widget_timeslider.cpp          |    2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index a76b1a0..9675f03 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> instance,etl::handle<synfigap
 	statusbar				(manage(new class Gtk::Statusbar())),
 
 	timeslider				(new Widget_Timeslider),
+	widget_kf_list			(new Widget_Keyframe_List),
 
 	ui_interface_			(new CanvasViewUIInterface(this)),
 	selection_manager_		(new CanvasViewSelectionManager(this)),
@@ -965,7 +966,13 @@ CanvasView::create_time_bar()
 	//Widget_Timeslider *time_scroll = manage(new Widget_Timeslider);
 	timeslider->set_time_adjustment(&time_adjustment());
 	timeslider->set_bounds_adjustment(&time_window_adjustment());
+	//timeslider->set_size_request(-1,12);
 	//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();
+	widget_kf_list->set_size_request(-1,8);
 
 	tooltips.set_tip(*time_window_scroll,_("Moves the time window"));
 	tooltips.set_tip(*timeslider,_("Changes the current time"));
@@ -1033,16 +1040,17 @@ 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));
 
 	//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, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
+	timebar->attach(*widget_kf_list, 1, 3, 1, 2, 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 <gtkmm/scale.h>
@@ -294,6 +295,9 @@ private:
 	//! Time slider class. Same than the Time track panel
 	std::auto_ptr<Widget_Timeslider> timeslider;
 
+	//!Keyframe list slider
+	std::auto_ptr<Widget_Keyframe_List> widget_kf_list;
+
 	std::list<sigc::connection> duck_changed_connections;
 
 /*	DEBUGPOINT_CLASS(8);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index c13bb71..ac36340 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -414,8 +414,8 @@ Dock_Timetrack::Dock_Timetrack():
 	if (header_height < 3)
 		header_height = 22;
 
-	widget_timeslider_->set_size_request(-1,header_height);
-	widget_kf_list_->set_size_request(-1,header_height);
+	widget_timeslider_->set_size_request(-1,header_height-8);
+	widget_kf_list_->set_size_request(-1,8);
 
 	hscrollbar_=new Gtk::HScrollbar();
 	vscrollbar_=new Gtk::VScrollbar();
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 1e597ce..d31810a 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -83,7 +83,7 @@ Widget_Keyframe_List::~Widget_Keyframe_List()
 bool
 Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 {
-	if (kf_list_->empty()) return false;
+
 	const int h(get_height());
 	const int w(get_width());
 
@@ -98,13 +98,16 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 
 	if(!editable_)
 	{
-		return true;
+		return true; //needs fixing!
 	}
 
 	//! draw a background
-	gc->set_rgb_fg_color(Gdk::Color("#FF0000"));
+	gc->set_rgb_fg_color(Gdk::Color("#7f7f7f"));
 	get_window()->draw_rectangle(gc, true, 0, 0, w, h);
 
+	//!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);
@@ -153,11 +156,7 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 			Gtk::SHADOW_OUT, area, *this, " ", Gtk::ARROW_DOWN, 1,
 			x-h/2+1, 0, h, h );
 		}
-
-
-
 	}
-
 	return true;
 }
 
diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
index ba57435..1687371 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
@@ -576,7 +576,7 @@ 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);
+			window->draw_layout(gc,xpx+2,0,layout);
 		}else
 		{
 			window->draw_line(gc,xpx,0,xpx,heightsmall);

[Synfig-devl] Carlos Lopez : Now the widget is fully working. Need a place to be stored and better size.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: b5c3d66d7714b6a2b6a10eb968206c6a46b0f026
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=b5c3d66d7714b6a2b6a10eb968206c6a46b0f026

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Sat Jul 18 12:44:52 2009 +0200

Now the widget is fully working. Need a place to be stored and better size.

---

 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |    3 +-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |   52 ++++++++++++++++++--
 .../trunk/src/gtkmm/widget_keyframe_list.h         |    9 +++
 3 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index 7f0c253..c13bb71 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -504,8 +504,7 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
 		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_fps(canvas_view->get_canvas()->rend_desc().get_frame_rate());
-		widget_kf_list_->set_kf_list(&canvas_view->get_canvas()->keyframe_list());
+		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());
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index dba098d..9ab98ba 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -48,6 +48,7 @@ using namespace etl;
 using namespace synfig;
 using namespace studio;
 
+
 /* === M A C R O S ========================================================= */
 
 /* === G L O B A L S ======================================================= */
@@ -165,23 +166,47 @@ void
 Widget_Keyframe_List::set_kf_list(synfig::KeyframeList* x)
 {
 	kf_list_=x;
-	if(kf_list_->size())
-		set_selected_keyframe(selected_none);
+	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()
 {
-	return false;
+	if(!selected_)
+		return false;
+	if(dragging_kf_time == selected_kf.get_time())
+		return false;
+	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);
+	//synfig::info("DELTA: %s", (dragging_kf_time-selected_kf.get_time()).get_string().c_str());
+	try
+	{
+		canvas_interface_->get_instance()->perform_action(action);
+	}
+	catch(...)
+	{
+			return false;
+	}
+	queue_draw();
+	return true;
 }
 
 bool
@@ -243,6 +268,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 					)
 				{
 					set_selected_keyframe(selected_none);
+					selected_=false;
 					synfig::info("Selected keyframe set to none");
 					synfig::info("Distance to prev %s", (t-prev_t).get_string().c_str());
 					synfig::info("Distance to next %s", (next_t-t).get_string().c_str());
@@ -254,6 +280,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 					set_selected_keyframe(*(kf_list_->find_prev(t)));
 					synfig::info("Selected keyframe set to previous");
 					queue_draw();
+					selected_=true;
 					return true;
 				}
 				else
@@ -261,6 +288,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 					set_selected_keyframe(*(kf_list_->find_next(t)));
 					synfig::info("Selected keyframe set to next");
 					queue_draw();
+					selected_=true;
 					return true;
 				}
 
@@ -280,9 +308,12 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 			{
 				t = floor(t*fps + 0.5)/fps;
 			}
-		bool stat=perform_move_kf();
+		bool stat=false;
+		if(dragging_)
+			stat=perform_move_kf();
 		dragging_=false;
 		synfig::info("Dropping keyframe time at: %s", t.get_string().c_str());
+		synfig::info("perform move result: %i", stat);
 		return stat;
 		}
 	default:
@@ -320,3 +351,16 @@ Widget_Keyframe_List::set_fps(float d)
 		queue_draw();
 	}
 }
+
+void
+Widget_Keyframe_List::set_canvas_interface(etl::loose_handle<synfigapp::CanvasInterface> h)
+{
+	canvas_interface_=h;
+	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
index b42127d..4280a69 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
@@ -32,6 +32,7 @@
 #include <gtkmm/adjustment.h>
 #include <synfig/keyframe.h>
 #include <sigc++/connection.h>
+#include <synfigapp/canvasinterface.h>
 
 
 /* === M A C R O S ========================================================= */
@@ -44,6 +45,9 @@ namespace studio {
 
 class Widget_Keyframe_List : public Gtk::DrawingArea
 {
+	//! The canvas interface being watched
+	etl::loose_handle<synfigapp::CanvasInterface> canvas_interface_;
+
 	//! Time adjustment window
 	Gtk::Adjustment adj_default;
 	Gtk::Adjustment *adj_timescale;
@@ -70,6 +74,7 @@ class Widget_Keyframe_List : public Gtk::DrawingArea
 	//!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;
@@ -114,6 +119,9 @@ public:
 	//! Set the fps
 	void set_fps(float x);
 
+	//! Set the canvas interface
+	void set_canvas_interface(etl::loose_handle<synfigapp::CanvasInterface>	h);
+
 	//! Performs the keyframe movement. Returns true if it was sucessful
 	bool perform_move_kf();
 
@@ -129,6 +137,7 @@ public:
 
 }; // END of namespace studio
 
+
 /* === E N D =============================================================== */
 
 #endif

[Synfig-devl] Carlos Lopez : Make less verbose the output. Add some comments. No code change

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 6ca831840a433a896022504f8314ceec00f81950
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=6ca831840a433a896022504f8314ceec00f81950

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Sat Jul 18 14:33:44 2009 +0200

Make less verbose the output. Add some comments. No code change

---

 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |   22 ++++++++++----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 9ab98ba..1e597ce 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -196,7 +196,6 @@ Widget_Keyframe_List::perform_move_kf()
 	action->set_param("canvas",canvas_interface_->get_canvas());
 	action->set_param("canvas_interface",canvas_interface_);
 	action->set_param("keyframe",selected_kf);
-	//synfig::info("DELTA: %s", (dragging_kf_time-selected_kf.get_time()).get_string().c_str());
 	try
 	{
 		canvas_interface_->get_instance()->perform_action(action);
@@ -227,7 +226,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 	//Do not respond mouse events if the list is empty
 	if(!kf_list_->size())
 	{
-		synfig::info("Keyframe list empty");
+	//	synfig::info("Keyframe list empty");
 		return true;
 	}
 
@@ -237,7 +236,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 	case GDK_MOTION_NOTIFY:
 		if(editable_)
 		{
-			// stick to integer frames.
+			// stick to integer frames. It can be optional in the future
 			if(fps)
 				{
 					t = floor(t*fps + 0.5)/fps;
@@ -253,11 +252,11 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 		dragging_=false;
 		if(event->button.button==1)
 		{
-			synfig::info("Looking keyframe at  %s", t.get_string().c_str());
+			/*synfig::info("Looking keyframe at  %s", t.get_string().c_str());
 			synfig::info("Total amount of keyframes %i", kf_list_->size());
 			synfig::info("Time ratio %s",time_ratio.get_string().c_str());
 			synfig::info("Bottom %s",bottom.get_string().c_str());
-			synfig::info("Top %s",top.get_string().c_str());
+			synfig::info("Top %s",top.get_string().c_str());*/
 			if(editable_)
 			{
 				synfig::Time prev_t,next_t;
@@ -269,16 +268,16 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 				{
 					set_selected_keyframe(selected_none);
 					selected_=false;
-					synfig::info("Selected keyframe set to none");
+					/*synfig::info("Selected keyframe set to none");
 					synfig::info("Distance to prev %s", (t-prev_t).get_string().c_str());
-					synfig::info("Distance to next %s", (next_t-t).get_string().c_str());
+					synfig::info("Distance to next %s", (next_t-t).get_string().c_str());*/
 					queue_draw();
 					return true;
 				}
 				else if ((t-prev_t)<(next_t-t))
 				{
 					set_selected_keyframe(*(kf_list_->find_prev(t)));
-					synfig::info("Selected keyframe set to previous");
+					//synfig::info("Selected keyframe set to previous");
 					queue_draw();
 					selected_=true;
 					return true;
@@ -286,7 +285,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 				else
 				{
 					set_selected_keyframe(*(kf_list_->find_next(t)));
-					synfig::info("Selected keyframe set to next");
+					//synfig::info("Selected keyframe set to next");
 					queue_draw();
 					selected_=true;
 					return true;
@@ -312,8 +311,8 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 		if(dragging_)
 			stat=perform_move_kf();
 		dragging_=false;
-		synfig::info("Dropping keyframe time at: %s", t.get_string().c_str());
-		synfig::info("perform move result: %i", stat);
+		//synfig::info("Dropping keyframe time at: %s", t.get_string().c_str());
+		//synfig::info("perform move result: %i", stat);
 		return stat;
 		}
 	default:
@@ -356,6 +355,7 @@ void
 Widget_Keyframe_List::set_canvas_interface(etl::loose_handle<synfigapp::CanvasInterface> 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());

[Synfig-devl] Carlos Lopez : Added code to fix the shown of the keyfrmae list widget. It is not fully working at the moment.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: dd3f7a1496c6ac179f17ca1d940cc4310333891e
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=dd3f7a1496c6ac179f17ca1d940cc4310333891e

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Fri Jul 17 20:56:26 2009 +0200

Added code to fix the shown of the keyfrmae list widget. It is not fully working at the moment.

---

 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |    2 +-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |   32 +++++++++++++------
 .../trunk/src/gtkmm/widget_keyframe_list.h         |    7 ++--
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index f8a8feb..7f0c253 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -505,7 +505,7 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
 
 		widget_kf_list_->set_time_adjustment(&canvas_view->time_adjustment());
 		widget_kf_list_->set_fps(canvas_view->get_canvas()->rend_desc().get_frame_rate());
-		widget_kf_list_->set_kf_list(canvas_view->get_canvas()->keyframe_list());
+		widget_kf_list_->set_kf_list(&canvas_view->get_canvas()->keyframe_list());
 
 		vscrollbar_->set_adjustment(*tree_view->get_vadjustment());
 		hscrollbar_->set_adjustment(canvas_view->time_window_adjustment());
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index e0669c4..835f814 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -60,7 +60,8 @@ Widget_Keyframe_List::Widget_Keyframe_List():
 	editable_(true),
 	adj_default(0,0,2,1/24,10/24),
 	adj_timescale(0),
-	fps(24)
+	fps(24),
+	kf_list_(&default_kf_list_)
 {
 	set_size_request(-1,64);
 	//!This signal is called when the widget need to be redrawn
@@ -80,6 +81,7 @@ Widget_Keyframe_List::~Widget_Keyframe_List()
 bool
 Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 {
+	if (kf_list_->empty()) return false;
 	const int h(get_height());
 	const int w(get_width());
 
@@ -98,13 +100,13 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 	}
 
 	//! draw a background
-	gc->set_rgb_fg_color(Gdk::Color("#7f7f7f"));
-	get_window()->draw_rectangle(gc, false, 0, 0, w, h);
+	gc->set_rgb_fg_color(Gdk::Color("#FF0000"));
+	get_window()->draw_rectangle(gc, true, 0, 0, w, h);
 
 	//!Loop all the keyframes
 	synfig::KeyframeList::iterator iter,selected_iter;
 	bool show_selected(false);
-	for(iter=kf_list_.begin();iter!=kf_list_.end();iter++)
+	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()<bottom)
@@ -139,11 +141,11 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 
 
 void
-Widget_Keyframe_List::set_kf_list(const synfig::KeyframeList& x)
+Widget_Keyframe_List::set_kf_list(synfig::KeyframeList* x)
 {
 	kf_list_=x;
-	if(kf_list_.size())
-		set_selected_keyframe(*kf_list_.find_next(synfig::Time::zero()));
+	if(kf_list_->size())
+		set_selected_keyframe(*kf_list_->find_next(synfig::Time::zero()));
 }
 
 void
@@ -174,13 +176,21 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 	if(pos>1.0f)pos=1.0f;
 		//! The time where the event x is
 	synfig::Time t((float)(pos*(top-bottom)));
-		//! here the guts of the event
+
+	//Do not respond mouse events if the list is empty
+	if(!kf_list_->size())
+	{
+		synfig::info("Keyframe list empty");
+		return true;
+	}
+
+	//! here the guts of the event
 	switch(event->type)
 	{
 	case GDK_MOTION_NOTIFY:
 		if(editable_)
 		{
-			if(!kf_list_.size()) return true;
+
 			// stick to integer frames.
 			if(fps)
 				{
@@ -195,10 +205,12 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 		changed_=false;
 		if(event->button.button==1)
 		{
+			synfig::info("Looking keyframe at  %s", t.get_string().c_str());
+			synfig::info("Total amount of keyframes %i", kf_list_->size());
 			if(editable_)
 			{
 				synfig::KeyframeList::iterator selected;
-				selected = kf_list_.find_next(t);
+				selected = kf_list_->find_next(t);
 				set_selected_keyframe(*selected);
 				queue_draw();
 				return true;
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
index 2acef1c..8796beb 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
@@ -49,7 +49,8 @@ class Widget_Keyframe_List : public Gtk::DrawingArea
 	Gtk::Adjustment *adj_timescale;
 
 	//!The list of keyframes to be drawn on the widget and moved with mouse
-	synfig::KeyframeList kf_list_;
+	synfig::KeyframeList default_kf_list_;
+	mutable synfig::KeyframeList* kf_list_;
 
 	//! The frames per second of the canvas
 	float fps;
@@ -85,10 +86,10 @@ public:
 	~Widget_Keyframe_List();
 
 	//!Loads a new keyframe list on the widget.
-	void set_kf_list(const synfig::KeyframeList& x);
+	void set_kf_list(synfig::KeyframeList* x);
 
 	//!Member for private data.
-	const synfig::KeyframeList& get_kf_list()const { return kf_list_; }
+	synfig::KeyframeList* get_kf_list()const { return kf_list_; }
 
 	//!Member for private data
 	void set_editable(bool x=true) { editable_=x; }

[Synfig-devl] Carlos Lopez : The selection and drag operation works fine now.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 273694de7a4686f3297c5d38e85f8735e3eb5061
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=273694de7a4686f3297c5d38e85f8735e3eb5061

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Sat Jul 18 10:55:28 2009 +0200

The selection and drag operation works fine now.

---

 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |   86 ++++++++++++++++----
 .../trunk/src/gtkmm/widget_keyframe_list.h         |    4 +
 2 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 835f814..dba098d 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -61,7 +61,8 @@ Widget_Keyframe_List::Widget_Keyframe_List():
 	adj_default(0,0,2,1/24,10/24),
 	adj_timescale(0),
 	fps(24),
-	kf_list_(&default_kf_list_)
+	kf_list_(&default_kf_list_),
+	time_ratio("4f", fps)
 {
 	set_size_request(-1,64);
 	//!This signal is called when the widget need to be redrawn
@@ -117,7 +118,7 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 			const int x((int)((float)(iter->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, 0, h, h );
+			x-h/2+1, 0, h, h );
 		}
 		else
 		{
@@ -130,10 +131,30 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 	// the selected keyframe is shown on top
 	if(show_selected)
 	{
-			const int x((int)((float)(selected_iter->get_time()-bottom) * (w/(top-bottom)) ) );
+		// 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;
@@ -145,13 +166,14 @@ Widget_Keyframe_List::set_kf_list(synfig::KeyframeList* x)
 {
 	kf_list_=x;
 	if(kf_list_->size())
-		set_selected_keyframe(*kf_list_->find_next(synfig::Time::zero()));
+		set_selected_keyframe(selected_none);
 }
 
 void
 Widget_Keyframe_List::set_selected_keyframe(const synfig::Keyframe &x)
 {
 	selected_kf=x;
+	dragging_kf_time=selected_kf.get_time();
 	//signal_keyframe_selected_(selected_kf);
 	queue_draw();
 }
@@ -167,15 +189,15 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 {
 	const int x(static_cast<int>(event->button.x));
 	const int y(static_cast<int>(event->button.y));
-		//!Boundaries of the drawing area in time units.
+	//!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/(float)get_width());
+	//!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)(pos*(top-bottom)));
+	//! 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())
@@ -190,34 +212,63 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 	case GDK_MOTION_NOTIFY:
 		if(editable_)
 		{
-
 			// stick to integer frames.
 			if(fps)
 				{
 					t = floor(t*fps + 0.5)/fps;
 				}
 			dragging_kf_time=t;
+			dragging_=true;
 			queue_draw();
 			return true;
 		}
 		break;
 	case GDK_BUTTON_PRESS:
 		changed_=false;
+		dragging_=false;
 		if(event->button.button==1)
 		{
 			synfig::info("Looking keyframe at  %s", t.get_string().c_str());
 			synfig::info("Total amount of keyframes %i", kf_list_->size());
+			synfig::info("Time ratio %s",time_ratio.get_string().c_str());
+			synfig::info("Bottom %s",bottom.get_string().c_str());
+			synfig::info("Top %s",top.get_string().c_str());
 			if(editable_)
 			{
-				synfig::KeyframeList::iterator selected;
-				selected = kf_list_->find_next(t);
-				set_selected_keyframe(*selected);
-				queue_draw();
-				return true;
+				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);
+					synfig::info("Selected keyframe set to none");
+					synfig::info("Distance to prev %s", (t-prev_t).get_string().c_str());
+					synfig::info("Distance to next %s", (next_t-t).get_string().c_str());
+					queue_draw();
+					return true;
+				}
+				else if ((t-prev_t)<(next_t-t))
+				{
+					set_selected_keyframe(*(kf_list_->find_prev(t)));
+					synfig::info("Selected keyframe set to previous");
+					queue_draw();
+					return true;
+				}
+				else
+				{
+					set_selected_keyframe(*(kf_list_->find_next(t)));
+					synfig::info("Selected keyframe set to next");
+					queue_draw();
+					return true;
+				}
+
+				return false;
 			}
 			else
 			{
-				return true;
+				return false;
 			}
 		}
 		break;
@@ -230,7 +281,8 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 				t = floor(t*fps + 0.5)/fps;
 			}
 		bool stat=perform_move_kf();
-		synfig::info("Dropping keyframe at: %s", t.get_string().c_str());
+		dragging_=false;
+		synfig::info("Dropping keyframe time at: %s", t.get_string().c_str());
 		return stat;
 		}
 	default:
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
index 8796beb..b42127d 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
@@ -55,6 +55,9 @@ class Widget_Keyframe_List : public Gtk::DrawingArea
 	//! 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_;
 
@@ -66,6 +69,7 @@ class Widget_Keyframe_List : public Gtk::DrawingArea
 
 	//!Holds the selected keyframe of the keyframe list
 	synfig::Keyframe selected_kf;
+	synfig::Keyframe selected_none;
 
 	//!The time of the selected keyframe
 	synfig::Time selected_kf_time;

[Synfig-devl] Carlos Lopez : It looks ugly but it is shown. Doesn't work though

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 7b4f66dfa1f4e6172e8826d3f91588fa00edde11
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=7b4f66dfa1f4e6172e8826d3f91588fa00edde11

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Fri Jul 17 20:02:56 2009 +0200

It looks ugly but it is shown. Doesn't work though

---

 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index 956c9e1..f8a8feb 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -509,12 +509,12 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
 
 		vscrollbar_->set_adjustment(*tree_view->get_vadjustment());
 		hscrollbar_->set_adjustment(canvas_view->time_window_adjustment());
-		table_=new Gtk::Table(2,2);
+		table_=new Gtk::Table(2,3);
 		table_->attach(*widget_timeslider_, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, 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, 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_->attach(*widget_kf_list_, 0, 1, 1, 2, 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_);

[Synfig-devl] Carlos Lopez : Now builds. Does not nothing yet.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: eb5f135abc7ac06543500f32362ab56d75370be5
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=eb5f135abc7ac06543500f32362ab56d75370be5

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Fri Jul 17 19:32:51 2009 +0200

Now builds. Does not nothing yet.

---

 synfig-studio/trunk/src/gtkmm/Makefile.am          |    6 +-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |  233 +++++++++-----------
 .../trunk/src/gtkmm/widget_keyframe_list.h         |   58 ++++--
 3 files changed, 150 insertions(+), 147 deletions(-)

Diff:   http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commitdiff;h=eb5f135abc7ac06543500f32362ab56d75370be5

[Synfig-devl] Carlos Lopez : Add the code to setup an instance of the keyframe list handler.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: d9145bee28dfd34a12ff9c5d43f9fc850bd15c61
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=d9145bee28dfd34a12ff9c5d43f9fc850bd15c61

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Fri Jul 17 19:57:15 2009 +0200

Add the code to setup an instance of the keyframe list handler.

---

 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |   11 +++++++++++
 synfig-studio/trunk/src/gtkmm/dock_timetrack.h     |    5 ++++-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |   13 ++++++++++++-
 .../trunk/src/gtkmm/widget_keyframe_list.h         |    6 +++++-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index a0f7fca..956c9e1 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 <synfig/timepointcollect.h>
@@ -405,6 +406,7 @@ 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"))
@@ -413,6 +415,8 @@ Dock_Timetrack::Dock_Timetrack():
 		header_height = 22;
 
 	widget_timeslider_->set_size_request(-1,header_height);
+	widget_kf_list_->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,14 +498,20 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> 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_fps(canvas_view->get_canvas()->rend_desc().get_frame_rate());
+		widget_kf_list_->set_kf_list(canvas_view->get_canvas()->keyframe_list());
+
 		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(*widget_kf_list_, 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);
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/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index d3269de..e0669c4 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -218,7 +218,7 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 				t = floor(t*fps + 0.5)/fps;
 			}
 		bool stat=perform_move_kf();
-		synfig::info("Dropping keyframe at: %s", t.get_string());
+		synfig::info("Dropping keyframe at: %s", t.get_string().c_str());
 		return stat;
 		}
 	default:
@@ -245,3 +245,14 @@ void Widget_Keyframe_List::set_time_adjustment(Gtk::Adjustment *x)
 		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();
+	}
+}
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
index 3b83722..2acef1c 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
@@ -52,7 +52,8 @@ class Widget_Keyframe_List : public Gtk::DrawingArea
 	synfig::KeyframeList kf_list_;
 
 	//! The frames per second of the canvas
-	synfig::Time fps;
+	float fps;
+
 	//!True if it is editable. Keyframes can be moved.
 	bool editable_;
 
@@ -105,6 +106,9 @@ public:
 	//! 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);
+
 	//! Performs the keyframe movement. Returns true if it was sucessful
 	bool perform_move_kf();
 

[Synfig-devl] Carlos Lopez : Initial trial of keyframe list. It doesn't compile.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: d984a091f5a0cb0c903d4abfcf7a7afb57ec82e3
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=d984a091f5a0cb0c903d4abfcf7a7afb57ec82e3

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Thu Jul 16 16:35:13 2009 +0200

Initial trial of keyframe list. It doesn't compile.

---

 .../trunk/src/gtkmm/widget_keyframe_list.cpp       |  270 ++++++++++++++++++++
 .../trunk/src/gtkmm/widget_keyframe_list.h         |  101 ++++++++
 2 files changed, 371 insertions(+), 0 deletions(-)

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..e0f372f
--- /dev/null
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -0,0 +1,270 @@
+/* === 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 <config.h>
+#endif
+
+#include "widget_keyframe_list.h"
+#include "app.h"
+#include <gtkmm/menu.h>
+#include <synfig/exception.h>
+#include <ETL/misc>
+
+#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 ========================================================= */
+
+/* === 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():
+	editable_(false)
+{
+	set_size_request(-1,64);
+	signal_expose_event().connect(sigc::mem_fun(*this, &studio::Widget_Keyframe_List::redraw));
+	add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
+	add_events(Gdk::BUTTON1_MOTION_MASK);
+
+}
+
+Widget_Keyframe_List::~Widget_Keyframe_List()
+{
+}
+
+bool
+Widget_Gradient::redraw(GdkEventExpose */*bleh*/)
+{
+	const int h(get_height());
+	const int w(get_width());
+
+	Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
+	Gdk::Rectangle area(0,0,w,h);
+	if(!editable_)
+	{
+		return true;
+	}
+
+	gc->set_rgb_fg_color(Gdk::Color("#7f7f7f"));
+	get_window()->draw_rectangle(gc, false, 0, 0, w, h);
+
+	KeyframeList::iterator iter,selected_iter;
+	bool show_selected(false);
+	for(iter=kf_list_.begin();iter!=kf_list_.end();iter++)
+	{
+		if(*iter!=selected_kf)
+		get_style()->paint_arrow(
+			get_window(),
+			(*iter==selected_kf)?Gtk::STATE_SELECTED:Gtk::STATE_ACTIVE,
+			Gtk::SHADOW_OUT,
+			area,
+			*this,
+			" ",
+			Gtk::ARROW_DOWN,
+			1,
+			int(iter->get_time()*w)-h/2+1, /// to be fixed
+			0,
+			h,
+			h
+		);
+		else
+		{
+			selected_iter=iter;
+			show_selected=true;
+		}
+	}
+
+	// we do this so that we can be sure that
+	// the selected marker is shown on top
+	if(show_selected)
+	{
+		get_style()->paint_arrow(
+			get_window(),
+			Gtk::STATE_SELECTED,
+			Gtk::SHADOW_OUT,
+			area,
+			*this,
+			" ",
+			Gtk::ARROW_DOWN,
+			1,
+			round_to_int(selected_iter->get_time()*w)-h/2+1,
+			0,
+			h,
+			h
+		);
+	}
+
+	return true;
+}
+
+
+void
+Widget_Keyframe_List::popup_menu(Time /*t*/)
+{
+/*	Gtk::Menu* menu(manage(new Gtk::Menu()));
+	menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
+
+	menu->items().clear();
+
+	menu->items().push_back(
+		Gtk::Menu_Helpers::MenuElem(
+			_("Insert CPoint"),
+			sigc::bind(
+				sigc::mem_fun(*this,&studio::Widget_Gradient::insert_cpoint),
+				x
+			)
+		)
+	);
+
+	if(!gradient_.empty())
+	{
+		menu->items().push_back(
+			Gtk::Menu_Helpers::MenuElem(
+				_("Remove CPoint"),
+				sigc::bind(
+					sigc::mem_fun(*this,&studio::Widget_Gradient::remove_cpoint),
+					x
+				)
+			)
+		);
+	}
+
+	menu->popup(0,0);
+*/}
+
+void
+Widget_Keyframe_List::set_value(const synfig::KeyframeList& x)
+{
+	kf_list_=x;
+	if(kf_list_.size())
+		set_selected_keyframe(*kf_list_.find_next(synfig::Time::zero()));
+	queue_draw();
+}
+
+void
+Widget_Keyframe_List::set_selected_keyframe(const synfig::Keyframe &x)
+{
+	selected_kf=x;
+	signal_keyframe_selected_(selected_kf);
+	queue_draw();
+}
+
+void
+Widget_Keyframe_List::update_keyframe(const synfig::Keyframe &x)
+{
+	try
+	{
+		KeyframeList::iterator iter(keyframe_list_.find(x));
+		iter->pos=x.pos;///////7
+		iter->color=x.color;/////////
+		gradient_.sort();/////////
+		queue_draw();
+	}
+	catch(synfig::Exception::NotFound)
+	{
+		// Yotta...
+	}
+}
+
+bool
+Widget_Keyframe_List::on_event(GdkEvent *event)
+{
+	//if(editable_)
+	{
+		const int x(static_cast<int>(event->button.x));
+		const int y(static_cast<int>(event->button.y));
+
+		float pos((float)x/(float)get_width());
+		if(pos<0.0f)pos=0.0f;////////
+		if(pos>1.0f)pos=1.0f;////////
+
+		switch(event->type)
+		{
+		case GDK_MOTION_NOTIFY:
+			if(editable_ && y>get_height()-h)
+			{
+				if(!keyframe_list_.size()) return true;
+				synfig::KeyframeList::iterator iter(keyframe_list_.find(selected_kf.get_guid()));
+				iter->pos=pos;/////
+				gradient_.sort();
+
+//				signal_value_changed_();
+				changed_=true;
+				queue_draw();
+				return true;
+			}
+			break;
+		case GDK_BUTTON_PRESS:
+			changed_=false;
+			if(event->button.button==1)
+			{
+				if(editable_ && y>get_height()-CONTROL_HEIGHT)
+				{
+					set_selected_cpoint(*gradient_.proximity(pos));
+					queue_draw();
+					return true;
+				}
+				else
+				{
+					signal_clicked_();
+					return true;
+				}
+			}
+			else if(editable_ && event->button.button==3)
+			{
+				popup_menu(pos);
+				return true;
+			}
+			break;
+		case GDK_BUTTON_RELEASE:
+			if(editable_ && event->button.button==1 && y>get_height()-CONTROL_HEIGHT)
+			{
+				set_selected_cpoint(*gradient_.proximity(pos));
+				if(changed_)signal_value_changed_();
+				return true;
+			}
+		default:
+			break;
+		}
+	}
+
+	return false;
+}
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..6a7ef73
--- /dev/null
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.h
@@ -0,0 +1,101 @@
+/* === 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 <gtkmm/drawingarea.h>
+#include <synfig/keyframe.h>
+
+/* === 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
+{
+	sigc::signal<void> signal_value_changed_;
+	sigc::signal<void> signal_clicked_;
+
+	sigc::signal<void,synfig::Keyframe> signal_keyframe_selected_;
+
+	synfig::KeyframeList kf_list_;
+
+	bool editable_;
+
+	bool changed_;
+
+	synfig::Keyframe selected_kf;
+
+	void popup_menu(float x);
+
+	//void insert_cpoint(float x);
+
+	//void remove_cpoint(float x);
+
+public:
+
+	Widget_Keyframe_List();
+
+	~Widget_Keyframe_List();
+
+	sigc::signal<void>& signal_value_changed() { return signal_value_changed_; }
+	sigc::signal<void>& signal_clicked() { return signal_clicked_; }
+
+	sigc::signal<void,synfig::Keyframe>& signal_keyframe_selected() { return signal_keyframe_selected_; }
+
+	void set_value(const synfig::KeyframeList& x);
+
+	const synfig::KayframeList& get_value()const { return kf_list_; }
+
+	void set_editable(bool x=true) { editable_=x; }
+
+	bool get_editable()const { return editable_; }
+
+
+
+	void set_selected_keyframe(const synfig::Keyframe &x);
+
+	const synfig::Kayframe& get_selected_keyframe() { return selected_kf; }
+
+	void update_keyframe(const synfig::Keyframe &x);
+
+
+
+	bool redraw(GdkEventExpose*bleh=NULL);
+
+	bool on_event(GdkEvent *event);
+}; // END of class Keyframe_List
+
+}; // END of namespace studio
+
+/* === E N D =============================================================== */
+
+#endif

[Synfig-devl] Carlos Lopez : Better solution to find a valid canvas for the displayed valuenodes

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: a109a797a2a1dbae8457cb65c905e44f4847b0ad
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=a109a797a2a1dbae8457cb65c905e44f4847b0ad

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Thu Jul 16 15:13:22 2009 +0200

Better solution to find a valid canvas for the displayed valuenodes

---

 synfig-studio/trunk/src/gtkmm/widget_curves.cpp |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
index cf44f76..6077772 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
@@ -504,12 +504,19 @@ Widget_Curves::redraw(GdkEventExpose */*bleh*/)
 	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);
 
-	// This is not the best solution but I guess that if the first valuenode
-	// has canvas then show the keyframes. Maybe I can loop all them until I find
-	// a valid canvas and use it for look to the keyframes.
-	synfig::Canvas::Handle canvas(curve_list_.begin()->value_desc.get_canvas());
+	// 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;
 

[Synfig-devl] Carlos Lopez : Draw time cursor always last.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 365ed5c5144c19a00b5dd71965f821086b3ab8eb
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=365ed5c5144c19a00b5dd71965f821086b3ab8eb

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Thu Jul 16 15:29:54 2009 +0200

Draw time cursor always last.

---

 synfig-studio/trunk/src/gtkmm/widget_curves.cpp |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
index 6077772..2260dad 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
@@ -500,10 +500,6 @@ 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);
 
-	// Draw current time
-	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);
-
 	// 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;
@@ -533,6 +529,11 @@ Widget_Curves::redraw(GdkEventExpose */*bleh*/)
 			}
 		}
 	}
+
+	// Draw current time
+	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)
 	{

[Synfig-devl] Carlos Lopez : Add keyframe mark in the curves dock dialogue when it exists .

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 309ed1f5a3ab11376662015494c760d6e822bddd
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=309ed1f5a3ab11376662015494c760d6e822bddd

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Thu Jul 16 01:07:33 2009 +0200

Add keyframe mark in the curves dock dialogue when it exists.

---

 synfig-studio/trunk/src/gtkmm/widget_curves.cpp |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
index 9375880..efd2cd1 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
@@ -501,6 +501,28 @@ Widget_Curves::redraw(GdkEventExpose */*bleh*/)
 	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);
 
+	// This is not the best solution but I guess that if the first valuenode
+	// has canvas then show the keyframes. Maybe I can loop all them until I find
+	// a valid canvas and use it for look to the keyframes.
+	synfig::Canvas::Handle canvas(curve_list_.begin()->value_desc.get_canvas());
+	if(canvas)
+	{
+		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()<t_end)
+			{
+				gc->set_rgb_fg_color(Gdk::Color("#a07f7f")); // It should be user selectable
+				get_window()->draw_rectangle(gc, true, x, 0, 1, h);
+			}
+		}
+	}
 	// Draw curves for the valuenodes stored in the curve list
 	for(curve_iter=curve_list_.begin();curve_iter!=curve_list_.end();++curve_iter)
 	{

[Synfig-devl] Carlos Lopez : Prevent a crash if there are not parameters selected.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 04e736f96597bb36dbd6b8059d785269369b3321
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=04e736f96597bb36dbd6b8059d785269369b3321

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Thu Jul 16 01:22:02 2009 +0200

Prevent a crash if there are not parameters selected.

---

 synfig-studio/trunk/src/gtkmm/widget_curves.cpp |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
index efd2cd1..cf44f76 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<Gdk::GC> gc(Gdk::GC::create(get_window()));
 
 	const Real t_begin(time_adjustment_->get_lower());

[Synfig-devl] Carlos Lopez : Refresh curves widget after clear it to not show inconsistent curves.

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 44ab8432eb1a1e3c0bbcef8ac1fbe7a5cdcaedc8
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=44ab8432eb1a1e3c0bbcef8ac1fbe7a5cdcaedc8

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Thu Jul 16 00:18:58 2009 +0200

Refresh curves widget after clear it to not show inconsistent curves.

---

 synfig-studio/trunk/src/gtkmm/dock_curves.cpp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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;
 	}
 

[Synfig-devl] Carlos Lopez : Time cursor colour to be the same as time track. Document some code

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: 1b4c3fa03ceef65e4aeb2d907f450399e73b2bc7
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=1b4c3fa03ceef65e4aeb2d907f450399e73b2bc7

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Thu Jul 16 00:18:07 2009 +0200

Time cursor colour to be the same as time track. Document some code

---

 synfig-studio/trunk/src/gtkmm/widget_curves.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
index b4a5678..9375880 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
@@ -498,9 +498,10 @@ Widget_Curves::redraw(GdkEventExpose */*bleh*/)
 	get_window()->draw_rectangle(gc, false, 0, round_to_int((0-r_bottom)/dr), w, 0);
 
 	// 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;

[Synfig-devl] pxegeek : Correcting 'Toogle' spelling mistake on tooltips - Chris Norman

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: b276de9343a3cc69c8651abcc82e489302b2ece1
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=b276de9343a3cc69c8651abcc82e489302b2ece1

Author: pxegeek <pxe...@gm...>
Date:   Wed Jul 15 17:48:38 2009 -0700

Correcting 'Toogle' spelling mistake on tooltips - Chris Norman

---

 synfig-studio/trunk/src/gtkmm/iconcontroller.cpp  |   12 ++++++------
 synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

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);

[Synfig-devl] Carlos Lopez : Document code

[Konstantin D. <zel...@us...>]

Module: synfig
Branch: zelgadis_master
Commit: b03d9da72c356e9187a9d707de6fc5ea953b604a
URL:    http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=b03d9da72c356e9187a9d707de6fc5ea953b604a

Author: Carlos Lopez <carlos@pcnuevo.(none)>
Date:   Wed Jul 15 17:23:49 2009 +0200

Document code

---

 synfig-studio/trunk/src/gtkmm/widget_gradient.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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);