X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_timeslider.cpp;h=b4d11356d81d58a75a42d003c298c324f7288e27;hb=1a07b28bd8ed77176bd97068c4911cff2fee6c5f;hp=8e7e860d959f94860f04ad33e970c15c56860bc2;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
index 8e7e860..b4d1135 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
@@ -1,4 +1,4 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file widget_timeslider.cpp
 **	\brief Time Slider Widget Implementation File
 **
@@ -7,14 +7,15 @@
 **	\legal
 **	Copyright (c) 2004 Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	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.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	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
 */
 /* ========================================================================= */
@@ -40,7 +41,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 using studio::Widget_Timeslider;
 
@@ -52,7 +53,7 @@ const double zoomoutfactor = 1/zoominfactor;
 
 /* === P R O C E D U R E S ================================================= */
 
-Gdk::Color get_interp_color(sinfg::Interpolation x)
+Gdk::Color get_interp_color(synfig::Interpolation x)
 {
 	switch(x)
 	{
@@ -98,7 +99,7 @@ void
 studio::render_time_point_to_window(
 	const Glib::RefPtr<Gdk::Drawable>& window,
 	const Gdk::Rectangle& area,
-	const sinfg::TimePoint &tp,
+	const synfig::TimePoint &tp,
 	bool selected
 )
 {
@@ -406,7 +407,7 @@ bool Widget_Timeslider::redraw(bool doublebuffer)
 	Glib::RefPtr<Gdk::GC>	gc = Gdk::GC::create(window);	
 	if(!gc) return false;
 	
-	//sinfg::info("Drawing Timeslider");
+	//synfig::info("Drawing Timeslider");
 	//clear	and update to current values
 	//invalidated = false;
 	//update_times();	
@@ -431,7 +432,7 @@ bool Widget_Timeslider::redraw(bool doublebuffer)
 	
 	if(end-start < EPSILON) return true;
 	
-	//sinfg::info("Drawing Lines");
+	//synfig::info("Drawing Lines");
 	
 	//draw all the time stuff
 	double dtdp = (end - start)/get_width();
@@ -484,7 +485,7 @@ bool Widget_Timeslider::redraw(bool doublebuffer)
 			scale = *after;
 	}
 		
-	//sinfg::info("Range found: (l %.2lf,u %.2lf - m %.2lf) -> %.2lf",lowerrange,upperrange,midrange,scale);	
+	//synfig::info("Range found: (l %.2lf,u %.2lf - m %.2lf) -> %.2lf",lowerrange,upperrange,midrange,scale);	
 	
 	//search around this area to get the right one		
 	
@@ -509,10 +510,10 @@ bool Widget_Timeslider::redraw(bool doublebuffer)
 		//sdindex = (int)floor(t + 0.5); //get how far through the range it is...
 		sdindex = round_to_int(t); //get how far through the range it is...
 		
-		//sinfg::info("Extracted fr %.2lf -> %d", t, sdindex);
+		//synfig::info("Extracted fr %.2lf -> %d", t, sdindex);
 	}
 	
-	//sinfg::info("Initial values: %.4lf t, %.1lf pixels, %d i", time,pixel,sdindex);
+	//synfig::info("Initial values: %.4lf t, %.1lf pixels, %d i", time,pixel,sdindex);
 	
 	//loop to draw
 	const int heightbig = 12;
@@ -618,7 +619,7 @@ bool Widget_Timeslider::on_motion_notify_event(GdkEventMotion* event) //for drag
 				}
 			}		
 			
-			//sinfg::info("Scrolling timerange to (%.4f,%.4f)",start,end);
+			//synfig::info("Scrolling timerange to (%.4f,%.4f)",start,end);
 			
 			adj_timescale->set_lower(start);
 			adj_timescale->set_upper(end);
@@ -721,7 +722,7 @@ void Widget_Timeslider::zoom_in(bool centerontime)
 	end = focuspoint + (end-focuspoint)*zoominfactor;
 	start = focuspoint + (start-focuspoint)*zoominfactor;
 	
-	//sinfg::info("Zooming in timerange to (%.4f,%.4f)",start,end);
+	//synfig::info("Zooming in timerange to (%.4f,%.4f)",start,end);
 	if(adj_bounds)
 	{
 		if(start < adj_bounds->get_lower())
@@ -757,7 +758,7 @@ void Widget_Timeslider::zoom_out(bool centerontime)
 	end = focuspoint + (end-focuspoint)*zoomoutfactor;
 	start = focuspoint + (start-focuspoint)*zoomoutfactor;
 	
-	//sinfg::info("Zooming out timerange to (%.4f,%.4f)",start,end);
+	//synfig::info("Zooming out timerange to (%.4f,%.4f)",start,end);
 	if(adj_bounds)
 	{
 		if(start < adj_bounds->get_lower())
@@ -795,7 +796,7 @@ bool Widget_Timeslider::on_button_press_event(GdkEventButton *event) //for click
 			
 			t = floor(t*fps + 0.5)/fps;
 			
-			/*sinfg::info("Clicking time from %.3lf to %.3lf [(%.2lf,%.2lf) %.2lf / %.2lf ... %.2lf", 
+			/*synfig::info("Clicking time from %.3lf to %.3lf [(%.2lf,%.2lf) %.2lf / %.2lf ... %.2lf", 
 						current, vt, start, end, event->x, w, fps);*/
 			
 			if(t != current)