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

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 35507d13b0b41ae154c35993138cc9e7247eabaa..1ed85ecb4c509c880d6fa326eaab399efb08efe6 100644 (file)
--- 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 4b93983fb94f17cd55aa181d01d4b6ece75e5acd..2939374825d8c447ad6cca63e147cc1e33bb6477 100644 (file)
--- 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 9fa55df0e03b94334803490721f393ce6a5fac14..ae0b2ae780e48b7043f0a429938eee02f8e87f07 100644 (file)
--- 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 ca82cf204330f78a1e370f578e96890a18597696..f8652f2c7019fb8b67f7ab294da8ef3a100a5343 100644 (file)
--- 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;