X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fmain.h;h=cc33ef8ddb367e5cb820db9a3d17480f4578b271;hb=af939bbc5a7e4330cac04f9b3f59583b95ca4eff;hp=bb90a976205738fa01ed9a686f1879cf81f0c525;hpb=c6af6e1c3816eb3b15c573089b32e6ae65cd2f49;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/main.h b/synfig-studio/trunk/src/synfigapp/main.h
index bb90a97..cc33ef8 100644
--- a/synfig-studio/trunk/src/synfigapp/main.h
+++ b/synfig-studio/trunk/src/synfigapp/main.h
@@ -2,7 +2,7 @@
 /*!	\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
@@ -66,8 +66,8 @@ public:
 
 	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();
@@ -75,8 +75,8 @@ public:
 
 	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_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();
@@ -100,8 +100,8 @@ public:
 	static Settings& settings();
 
 	// Signal interfaces
-	static sigc::signal<void>& signal_foreground_color_changed();
-	static sigc::signal<void>& signal_background_color_changed();
+	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();