From 4a68c33f4b10396ae9835a73db093b1b3c855446 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Wed, 8 Feb 2006 03:44:52 +0000
Subject: [PATCH] 2006-02-07  Jim Evins  <evins@snaught.com>

	* data/glade/object-editor.glade:
		Fixed color groups of color combos.
	* src/color.h:
		Added default shadow color.
	* src/object-editor.c: (gl_object_editor_construct_color_combo):
		Added shadow color group.


git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@583 f5e0f49d-192f-0410-a22d-a8d8700d0965
---
 glabels2/ChangeLog                      | 9 +++++++++
 glabels2/data/glade/object-editor.glade | 8 ++++----
 glabels2/src/color.h                    | 1 +
 glabels2/src/object-editor.c            | 6 ++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 35507d13..1ed85ecb 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-07  Jim Evins  <evins@snaught.com>
+
+	* data/glade/object-editor.glade:
+		Fixed color groups of color combos.
+	* src/color.h:
+		Added default shadow color.
+	* src/object-editor.c: (gl_object_editor_construct_color_combo):
+		Added shadow color group.
+
 2006-02-06  Jim Evins  <evins@snaught.com>
 
 	* src/object-editor-shadow-page.c:
diff --git a/glabels2/data/glade/object-editor.glade b/glabels2/data/glade/object-editor.glade
index 4b93983f..29393748 100644
--- a/glabels2/data/glade/object-editor.glade
+++ b/glabels2/data/glade/object-editor.glade
@@ -1067,7 +1067,7 @@
 				    <widget class="Custom" id="line_color_combo">
 				      <property name="visible">True</property>
 				      <property name="creation_function">gl_object_editor_construct_color_combo</property>
-				      <property name="int1">2</property>
+				      <property name="int1">1</property>
 				      <property name="int2">0</property>
 				      <property name="last_modification_time">Sun, 16 Nov 2003 06:52:23 GMT</property>
 				    </widget>
@@ -1282,7 +1282,7 @@
 				    <widget class="Custom" id="fill_color_combo">
 				      <property name="visible">True</property>
 				      <property name="creation_function">gl_object_editor_construct_color_combo</property>
-				      <property name="int1">2</property>
+				      <property name="int1">0</property>
 				      <property name="int2">0</property>
 				      <property name="last_modification_time">Sun, 16 Nov 2003 06:52:23 GMT</property>
 				    </widget>
@@ -1976,7 +1976,7 @@
 				    <widget class="Custom" id="bc_color_combo">
 				      <property name="visible">True</property>
 				      <property name="creation_function">gl_object_editor_construct_color_combo</property>
-				      <property name="int1">2</property>
+				      <property name="int1">1</property>
 				      <property name="int2">0</property>
 				      <property name="last_modification_time">Sun, 16 Nov 2003 06:52:23 GMT</property>
 				    </widget>
@@ -3205,7 +3205,7 @@
 				    <widget class="Custom" id="shadow_color_combo">
 				      <property name="visible">True</property>
 				      <property name="creation_function">gl_object_editor_construct_color_combo</property>
-				      <property name="int1">2</property>
+				      <property name="int1">3</property>
 				      <property name="int2">0</property>
 				      <property name="last_modification_time">Sun, 16 Nov 2003 06:52:23 GMT</property>
 				    </widget>
diff --git a/glabels2/src/color.h b/glabels2/src/color.h
index 9fa55df0..ae0b2ae7 100644
--- a/glabels2/src/color.h
+++ b/glabels2/src/color.h
@@ -40,6 +40,7 @@ typedef struct {
 #define GL_COLOR_NONE                  GL_COLOR_A(0,0,0,0)
 #define GL_COLOR_FILL_MERGE_DEFAULT    GL_COLOR_A(255,255,255,128)
 #define GL_COLOR_MERGE_DEFAULT         GL_COLOR_A(0,0,0,128)
+#define GL_COLOR_SHADOW_DEFAULT        GL_COLOR(0,0,0)
 #define GL_COLOR_SHADOW_MERGE_DEFAULT  GL_COLOR_A(0,0,0,255)
 
 #define GL_COLOR_I_RED(x)   (((x)>>24) & 0xff)
diff --git a/glabels2/src/object-editor.c b/glabels2/src/object-editor.c
index ca82cf20..f8652f2c 100644
--- a/glabels2/src/object-editor.c
+++ b/glabels2/src/object-editor.c
@@ -593,6 +593,12 @@ gl_object_editor_construct_color_combo (gchar *name,
 
 	switch (int1) {
 
+	case 3:
+		cg_name  = "shadow_color_group";
+		color    = GL_COLOR_SHADOW_DEFAULT;
+		no_color = _("Default");
+		break;
+
 	case 2:
 		cg_name  = "text_color_group";
 		color    = gl_prefs->default_text_color;
-- 
2.39.5