X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fmain.h;h=cc33ef8ddb367e5cb820db9a3d17480f4578b271;hb=3d0655b0728cc3b9d528375431f7b01a5d0b3d5b;hp=6cdab6c71a3921d656430d0fe80f7a3683b12977;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/main.h b/synfig-studio/trunk/src/synfigapp/main.h
index 6cdab6c..cc33ef8 100644
--- a/synfig-studio/trunk/src/synfigapp/main.h
+++ b/synfig-studio/trunk/src/synfigapp/main.h
@@ -1,20 +1,21 @@
 /* === 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 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., 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
 */
 /* ========================================================================= */
@@ -50,7 +51,7 @@ namespace synfig {
 };
 
 namespace synfigapp {
-	
+
 /*!	\class synfigapp::Main
 **	\brief \writeme
 **
@@ -64,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();
@@ -87,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_);
@@ -97,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();