X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_defaults.h;h=705e2da5dd6fd3622076d0938ff878492440b0cd;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=6bd54b437f4a411a17db0b16d16d85d85bfab968;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_defaults.h b/synfig-studio/trunk/src/gtkmm/widget_defaults.h
index 6bd54b4..705e2da 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_defaults.h
+++ b/synfig-studio/trunk/src/gtkmm/widget_defaults.h
@@ -1,34 +1,35 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file widget_defaults.h
 **	\brief Template Header
 **
-**	$Id: widget_defaults.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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_STUDIO_WIDGET_DEFAULTS_H
-#define __SINFG_STUDIO_WIDGET_DEFAULTS_H
+#ifndef __SYNFIG_STUDIO_WIDGET_DEFAULTS_H
+#define __SYNFIG_STUDIO_WIDGET_DEFAULTS_H
 
 /* === H E A D E R S ======================================================= */
 
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/table.h>
-#include <sinfg/gradient.h>
+#include <synfig/gradient.h>
 #include "widget_gradient.h"
 #include <gtkmm/tooltips.h>
 
@@ -46,27 +47,27 @@ class Widget_Brush;
 class Widget_Color;
 class Widget_Distance;
 class Widget_Enum;
-	
+
 class Widget_Defaults : public Gtk::Table
 {
 	Widget_Brush *widget_brush;
-	Widget_Color *widget_fg_color;
-	Widget_Color *widget_bg_color;
+	Widget_Color *widget_otln_color;
+	Widget_Color *widget_fill_color;
 	Widget_Distance *widget_bline_width;
 	Widget_Gradient *widget_gradient;
 	Widget_Enum	*widget_blend_method;
 	Widget_Enum	*widget_interpolation;
 	Gtk::HScale *widget_opacity;
-	
-	void fg_color_refresh();
-	void bg_color_refresh();
+
+	void otln_color_refresh();
+	void fill_color_refresh();
 	void gradient_refresh();
 	void bline_width_refresh();
 	void interpolation_refresh();
-	
+
 	void on_bline_width_changed();
-	void on_fg_color_clicked();
-	void on_bg_color_clicked();
+	void on_otln_color_clicked();
+	void on_fill_color_clicked();
 	void on_swap_color_clicked();
 	void on_reset_color_clicked();
 	void on_gradient_clicked();
@@ -79,11 +80,11 @@ class Widget_Defaults : public Gtk::Table
 	void on_opacity_changed();
 
 	Gtk::Tooltips tooltips_;
-	
+
 public:
-	
+
 	Widget_Defaults();
-	
+
 	~Widget_Defaults();
 
 //	bool redraw(GdkEventExpose*bleh=NULL);