X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fmain.h;h=cc33ef8ddb367e5cb820db9a3d17480f4578b271;hb=fedb841dc36ac09ef5ee217de7ff6e8e4f3f5221;hp=06fd8e9446d99a21e7066596dc804dc325cafa24;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/main.h b/synfig-studio/trunk/src/synfigapp/main.h
index 06fd8e9..cc33ef8 100644
--- a/synfig-studio/trunk/src/synfigapp/main.h
+++ b/synfig-studio/trunk/src/synfigapp/main.h
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file main.h
+/*!	\file synfigapp/main.h
 **	\brief Template Header
 **
-**	$Id: main.h,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -51,7 +51,7 @@ namespace synfig {
 };
 
 namespace synfigapp {
-	
+
 /*!	\class synfigapp::Main
 **	\brief \writeme
 **
@@ -65,21 +65,21 @@ public:
 	~Main();
 
 	const etl::reference_counter& ref_count()const { return ref_count_; }
-		
-	static const synfig::Color& get_foreground_color();
-	static const synfig::Color& get_background_color();
+
+	static const synfig::Color& get_outline_color();
+	static const synfig::Color& get_fill_color();
 	static const synfig::Gradient& get_gradient();
 	static const synfig::Distance& get_bline_width();
 	static synfig::Waypoint::Interpolation get_interpolation();
 
 
 	static void set_interpolation(synfig::Waypoint::Interpolation x);
-	static void set_bline_width(synfig::Distance x);	
-	static void set_foreground_color(synfig::Color color);
-	static void set_background_color(synfig::Color color);
+	static void set_bline_width(synfig::Distance x);
+	static void set_outline_color(synfig::Color color);
+	static void set_fill_color(synfig::Color color);
 	static void set_gradient(synfig::Gradient gradient);
 	static void set_gradient_default_colors();
-	static void color_swap();	
+	static void color_swap();
 
 	static synfig::Color::BlendMethod get_blend_method();
 	static const synfig::Real& get_opacity();
@@ -88,7 +88,7 @@ public:
 	static sigc::signal<void>& signal_blend_method_changed();
 	static sigc::signal<void>& signal_opacity_changed();
 	static sigc::signal<void>& signal_interpolation_changed();
-	
+
 	// Input Device stuff
 	static InputDevice::Handle add_input_device(const synfig::String id_, InputDevice::Type type_=InputDevice::TYPE_MOUSE);
 	static InputDevice::Handle find_input_device(const synfig::String id_);
@@ -98,10 +98,10 @@ public:
 	static void set_state(synfig::String state);
 
 	static Settings& settings();
-	
-	// Signal interfaces	
-	static sigc::signal<void>& signal_foreground_color_changed();
-	static sigc::signal<void>& signal_background_color_changed();
+
+	// Signal interfaces
+	static sigc::signal<void>& signal_outline_color_changed();
+	static sigc::signal<void>& signal_fill_color_changed();
 	static sigc::signal<void>& signal_gradient_changed();
 	static sigc::signal<void>& signal_bline_width_changed();