X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenderer_ducks.cpp;h=ed7a74426a7f7f75ddcded906eb4fc0bc427fe9c;hb=a27deaf2322fab351ac47cbed699ec3ab8eb198d;hp=669cd12a25389a3656fce6a750cf4c59c0877f0d;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
index 669cd12..ed7a744 100644
--- a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file template.cpp
+/*!	\file renderer_ducks.cpp
 **	\brief Template File
 **
-**	$Id: renderer_ducks.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -38,6 +38,8 @@
 #include <synfig/distance.h>
 #include "app.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -81,7 +83,7 @@ struct ScreenDuck
 void
 Renderer_Ducks::render_vfunc(
 	const Glib::RefPtr<Gdk::Drawable>& drawable,
-	const Gdk::Rectangle& expose_area
+	const Gdk::Rectangle& /*expose_area*/
 )
 {
 	assert(get_work_area());
@@ -161,11 +163,11 @@ Renderer_Ducks::render_vfunc(
 		// Draw the curve
 /*		if(solid_lines)
 		{
-			gc->set_rgb_fg_color(Gdk::Color("#000000"));
+			gc->set_rgb_fg_color(DUCK_COLOR_BEZIER_1);
 			gc->set_function(Gdk::COPY);
 			gc->set_line_attributes(3,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 			drawable->draw_lines(gc, Glib::ArrayHandle<Gdk::Point>(points));
-			gc->set_rgb_fg_color(Gdk::Color("#afafaf"));
+			gc->set_rgb_fg_color(DUCK_COLOR_BEZIER_2);
 			gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 			drawable->draw_lines(gc, Glib::ArrayHandle<Gdk::Point>(points));
 		}
@@ -176,11 +178,11 @@ Renderer_Ducks::render_vfunc(
 //			gc->set_function(Gdk::INVERT);
 //			gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 //			drawable->draw_lines(gc, Glib::ArrayHandle<Gdk::Point>(points));
-			gc->set_rgb_fg_color(Gdk::Color("#000000"));
+			gc->set_rgb_fg_color(DUCK_COLOR_BEZIER_1);
 			gc->set_function(Gdk::COPY);
 			gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 			drawable->draw_lines(gc, Glib::ArrayHandle<Gdk::Point>(points));
-			gc->set_rgb_fg_color(Gdk::Color("#afafaf"));
+			gc->set_rgb_fg_color(DUCK_COLOR_BEZIER_2);
 			gc->set_line_attributes(1,Gdk::LINE_ON_OFF_DASH,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 			drawable->draw_lines(gc, Glib::ArrayHandle<Gdk::Point>(points));
 
@@ -238,7 +240,7 @@ Renderer_Ducks::render_vfunc(
 			if(value_desc.is_valid() && value_desc.is_value_node() && get_work_area()->get_selected_value_node()==value_desc.get_value_node())
 			{
 				gc->set_function(Gdk::COPY);
-				gc->set_rgb_fg_color(Gdk::Color("#FF0000"));
+				gc->set_rgb_fg_color(DUCK_COLOR_SELECTED);
 				//gc->set_line_attributes(1,Gdk::LINE_ON_OFF_DASH,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 				gc->set_line_attributes(2,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 
@@ -260,7 +262,7 @@ Renderer_Ducks::render_vfunc(
 			Point tl(min(point[0],boxpoint[0]),min(point[1],boxpoint[1]));
 
 			gc->set_function(Gdk::COPY);
-			gc->set_rgb_fg_color(Gdk::Color("#FFFFFF"));
+			gc->set_rgb_fg_color(DUCK_COLOR_BOX_1);
 			gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 			drawable->draw_rectangle(gc,false,
 				round_to_int(tl[0]),
@@ -269,7 +271,7 @@ Renderer_Ducks::render_vfunc(
 				round_to_int(abs(boxpoint[1]-point[1]))
 			);
 			gc->set_function(Gdk::COPY);
-			gc->set_rgb_fg_color(Gdk::Color("#000000"));
+			gc->set_rgb_fg_color(DUCK_COLOR_BOX_2);
 			gc->set_line_attributes(1,Gdk::LINE_ON_OFF_DASH,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 			drawable->draw_rectangle(gc,false,
 				round_to_int(tl[0]),
@@ -285,19 +287,19 @@ Renderer_Ducks::render_vfunc(
 		screen_duck.hover=hover;
 
 		if(!(*iter)->get_editable())
-			screen_duck.color=(Gdk::Color("#cfcfcf"));
+			screen_duck.color=(DUCK_COLOR_NOT_EDITABLE);
 		else if((*iter)->get_tangent())
-			screen_duck.color=((*iter)->get_scalar()<0?Gdk::Color("#ffff00"):Gdk::Color("#ff0000"));
+			screen_duck.color=((*iter)->get_scalar()<0 ? DUCK_COLOR_TANGENT_1 : DUCK_COLOR_TANGENT_2);
 		else if((*iter)->get_type()&Duck::TYPE_VERTEX)
-			screen_duck.color=Gdk::Color("#ff7f00");
+			screen_duck.color=DUCK_COLOR_VERTEX;
 		else if((*iter)->get_type()&Duck::TYPE_RADIUS)
-			screen_duck.color=Gdk::Color("#00ffff");
+			screen_duck.color=DUCK_COLOR_RADIUS;
 		else if((*iter)->get_type()&Duck::TYPE_WIDTH)
-			screen_duck.color=Gdk::Color("#ff00ff");
+			screen_duck.color=DUCK_COLOR_WIDTH;
 		else if((*iter)->get_type()&Duck::TYPE_ANGLE)
-			screen_duck.color=(Gdk::Color("#0000ff"));
+			screen_duck.color=(DUCK_COLOR_ANGLE);
 		else
-			screen_duck.color=Gdk::Color("#00ff00");
+			screen_duck.color=DUCK_COLOR_OTHER;
 
 		screen_duck_list.push_front(screen_duck);
 
@@ -424,7 +426,7 @@ Renderer_Ducks::render_vfunc(
 
 		gc->set_function(Gdk::COPY);
 		gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
-		gc->set_rgb_fg_color(Gdk::Color("#000000"));
+		gc->set_rgb_fg_color(DUCK_COLOR_OUTLINE);
 		drawable->draw_arc(
 			gc,
 			true,