From 1fd401c400027d08f75b0a1105a47ba3b416e193 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sun, 11 Jul 2004 05:18:36 +0000 Subject: [PATCH] 2004-07-11 Jim Evins * data/glabels-2.0.dtd: * libglabels/template.c: (gl_template_rect_label_type_new), (gl_template_round_label_type_new), (gl_template_cd_label_type_new), (gl_template_label_type_dup), (template_full_page): * libglabels/template.h: * libglabels/xml-template.c: (xml_parse_label_rectangle_node), (xml_create_label_node): * pixmaps/ex-rect-size.png: * src/print.c: (clip_to_outline), (clip_punchouts): * src/template-designer.c: (construct_rect_size_page), (rect_size_page_prepare_cb), (layout_page_prepare_cb), (build_template): * src/template-designer.glade: * src/xml-label-191.c: (xml191_parse_label): Modifications to allow separate horizontal (x_waste) and vertical (y_waste) properties for rectangular labels. Templates remain backwards compatible, but this breaks the libglabels API (I don't know of anyone outside of glabels using libglabels at this time -- what can I say, the program is is still "unstable"). This addresses the suggestion in Feature Request #976313. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@431 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/ChangeLog | 24 ++++++++ glabels2/data/glabels-2.0.dtd | 2 + glabels2/libglabels/template.c | 18 +++--- glabels2/libglabels/template.h | 26 ++++---- glabels2/libglabels/xml-template.c | 31 +++++++--- glabels2/pixmaps/ex-rect-size.png | Bin 5314 -> 4972 bytes glabels2/src/print.c | 19 +++--- glabels2/src/template-designer.c | 84 +++++++++++++++---------- glabels2/src/template-designer.glade | 89 ++++++++++++++++++++++++--- glabels2/src/xml-label-191.c | 2 +- 10 files changed, 217 insertions(+), 78 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 04e6cc06..70e98169 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,27 @@ +2004-07-11 Jim Evins + + * data/glabels-2.0.dtd: + * libglabels/template.c: (gl_template_rect_label_type_new), + (gl_template_round_label_type_new), + (gl_template_cd_label_type_new), (gl_template_label_type_dup), + (template_full_page): + * libglabels/template.h: + * libglabels/xml-template.c: (xml_parse_label_rectangle_node), + (xml_create_label_node): + * pixmaps/ex-rect-size.png: + * src/print.c: (clip_to_outline), (clip_punchouts): + * src/template-designer.c: (construct_rect_size_page), + (rect_size_page_prepare_cb), (layout_page_prepare_cb), + (build_template): + * src/template-designer.glade: + * src/xml-label-191.c: (xml191_parse_label): + Modifications to allow separate horizontal (x_waste) and vertical (y_waste) + properties for rectangular labels. Templates remain backwards compatible, + but this breaks the libglabels API (I don't know of anyone outside of + glabels using libglabels at this time -- what can I say, the program is + is still "unstable"). This addresses the suggestion in Feature Request + #976313. + 2004-07-05 Jim Evins * src/print.c: (print_crop_marks), (draw_outline): Changed crop marks and label outlines to black, instead of 25% gray. diff --git a/glabels2/data/glabels-2.0.dtd b/glabels2/data/glabels-2.0.dtd index af088b40..dcd0b35d 100644 --- a/glabels2/data/glabels-2.0.dtd +++ b/glabels2/data/glabels-2.0.dtd @@ -107,6 +107,8 @@ height %LENGTH_TYPE; #REQUIRED round %LENGTH_TYPE; "0 pt" waste %LENGTH_TYPE; #IMPLIED + x_waste %LENGTH_TYPE; #IMPLIED + y_waste %LENGTH_TYPE; #IMPLIED > diff --git a/glabels2/libglabels/template.c b/glabels2/libglabels/template.c index 21cbfced..92c59832 100644 --- a/glabels2/libglabels/template.c +++ b/glabels2/libglabels/template.c @@ -406,19 +406,21 @@ gl_template_rect_label_type_new (const gchar *id, gdouble w, gdouble h, gdouble r, - gdouble waste) + gdouble x_waste, + gdouble y_waste) { glTemplateLabelType *label_type; label_type = g_new0 (glTemplateLabelType, 1); label_type->id = g_strdup (id); - label_type->waste = waste; label_type->shape = GL_TEMPLATE_SHAPE_RECT; label_type->size.rect.w = w; label_type->size.rect.h = h; label_type->size.rect.r = r; + label_type->size.rect.x_waste = x_waste; + label_type->size.rect.y_waste = y_waste; return label_type; } @@ -436,10 +438,10 @@ gl_template_round_label_type_new (const gchar *id, label_type = g_new0 (glTemplateLabelType, 1); label_type->id = g_strdup (id); - label_type->waste = waste; label_type->shape = GL_TEMPLATE_SHAPE_ROUND; label_type->size.round.r = r; + label_type->size.round.waste = waste; return label_type; } @@ -460,13 +462,13 @@ gl_template_cd_label_type_new (const gchar *id, label_type = g_new0 (glTemplateLabelType, 1); label_type->id = g_strdup (id); - label_type->waste = waste; label_type->shape = GL_TEMPLATE_SHAPE_CD; label_type->size.cd.r1 = r1; label_type->size.cd.r2 = r2; label_type->size.cd.w = w; label_type->size.cd.h = h; + label_type->size.cd.waste = waste; return label_type; } @@ -686,14 +688,15 @@ gl_template_label_type_dup (const glTemplateLabelType *orig_label_type) orig_label_type->size.rect.w, orig_label_type->size.rect.h, orig_label_type->size.rect.r, - orig_label_type->waste); + orig_label_type->size.rect.x_waste, + orig_label_type->size.rect.y_waste); break; case GL_TEMPLATE_SHAPE_ROUND: label_type = gl_template_round_label_type_new (orig_label_type->id, orig_label_type->size.round.r, - orig_label_type->waste); + orig_label_type->size.round.waste); break; case GL_TEMPLATE_SHAPE_CD: @@ -703,7 +706,7 @@ gl_template_label_type_dup (const glTemplateLabelType *orig_label_type) orig_label_type->size.cd.r2, orig_label_type->size.cd.w, orig_label_type->size.cd.h, - orig_label_type->waste); + orig_label_type->size.cd.waste); break; default: @@ -855,6 +858,7 @@ template_full_page (const gchar *page_size) paper->width, paper->height, 0.0, + 0.0, 0.0); gl_template_add_label_type (template, label_type); diff --git a/glabels2/libglabels/template.h b/glabels2/libglabels/template.h index 38f4c557..ff8f927b 100644 --- a/glabels2/libglabels/template.h +++ b/glabels2/libglabels/template.h @@ -78,27 +78,30 @@ struct _glTemplateLabelType{ GList *layouts; /* List of glTemplateLayouts */ GList *markups; /* List of glTemplateMarkups */ - gdouble waste; /* Amount of overprint allowed. */ - glTemplateLabelShape shape; union { struct { - gdouble w; /* Width */ - gdouble h; /* Height */ - gdouble r; /* Corner radius */ + gdouble w; /* Width */ + gdouble h; /* Height */ + gdouble r; /* Corner radius */ + gdouble x_waste; /* Amount of horiz overprint allowed. */ + gdouble y_waste; /* Amount of vert overprint allowed. */ } rect; struct { - gdouble r; /* Radius */ + gdouble r; /* Radius */ + gdouble waste; /* Amount of overprint allowed. */ + } round; struct { - gdouble r1; /* Outer radius */ - gdouble r2; /* Inner radius (hole) */ - gdouble w; /* Clip width, business card CDs */ - gdouble h; /* Clip height, business card CDs */ + gdouble r1; /* Outer radius */ + gdouble r2; /* Inner radius (hole) */ + gdouble w; /* Clip width, business card CDs */ + gdouble h; /* Clip height, business card CDs */ + gdouble waste; /* Amount of overprint allowed. */ } cd; } size; @@ -229,7 +232,8 @@ glTemplateLabelType *gl_template_rect_label_type_new (const gchar *id, gdouble w, gdouble h, gdouble r, - gdouble waste); + gdouble x_waste, + gdouble y_waste); glTemplateLabelType *gl_template_round_label_type_new (const gchar *id, gdouble r, diff --git a/glabels2/libglabels/xml-template.c b/glabels2/libglabels/xml-template.c index 1532aed0..f3fd21b5 100644 --- a/glabels2/libglabels/xml-template.c +++ b/glabels2/libglabels/xml-template.c @@ -241,18 +241,28 @@ xml_parse_label_rectangle_node (xmlNodePtr label_node, glTemplate *template) { gchar *id; - gdouble waste; + gchar *tmp; + gdouble x_waste, y_waste; gdouble w, h, r; glTemplateLabelType *label_type; xmlNodePtr node; - id = xmlGetProp (label_node, "id"); - waste = gl_xml_get_prop_length (label_node, "waste", 0); - w = gl_xml_get_prop_length (label_node, "width", 0); - h = gl_xml_get_prop_length (label_node, "height", 0); - r = gl_xml_get_prop_length (label_node, "round", 0); + id = xmlGetProp (label_node, "id"); + + if (tmp = xmlGetProp (label_node, "waste")) { + /* Handle single "waste" property. */ + x_waste = y_waste = gl_xml_get_prop_length (label_node, "waste", 0); + g_free (tmp); + } else { + x_waste = gl_xml_get_prop_length (label_node, "x_waste", 0); + y_waste = gl_xml_get_prop_length (label_node, "y_waste", 0); + } + + w = gl_xml_get_prop_length (label_node, "width", 0); + h = gl_xml_get_prop_length (label_node, "height", 0); + r = gl_xml_get_prop_length (label_node, "round", 0); - label_type = gl_template_rect_label_type_new (id, w, h, r, waste); + label_type = gl_template_rect_label_type_new (id, w, h, r, x_waste, y_waste); gl_template_add_label_type (template, label_type); for (node = label_node->xmlChildrenNode; node != NULL; @@ -606,14 +616,15 @@ xml_create_label_node (const glTemplateLabelType *label_type, gl_xml_set_prop_length (node, "width", label_type->size.rect.w); gl_xml_set_prop_length (node, "height", label_type->size.rect.h); gl_xml_set_prop_length (node, "round", label_type->size.rect.r); - gl_xml_set_prop_length (node, "waste", label_type->waste); + gl_xml_set_prop_length (node, "x_waste", label_type->size.rect.x_waste); + gl_xml_set_prop_length (node, "y_waste", label_type->size.rect.y_waste); break; case GL_TEMPLATE_SHAPE_ROUND: node = xmlNewChild(root, ns, "Label-round", NULL); xmlSetProp (node, "id", label_type->id); gl_xml_set_prop_length (node, "radius", label_type->size.round.r); - gl_xml_set_prop_length (node, "waste", label_type->waste); + gl_xml_set_prop_length (node, "waste", label_type->size.round.waste); break; case GL_TEMPLATE_SHAPE_CD: @@ -627,7 +638,7 @@ xml_create_label_node (const glTemplateLabelType *label_type, if (label_type->size.cd.h != 0.0) { gl_xml_set_prop_length (node, "height", label_type->size.cd.h); } - gl_xml_set_prop_length (node, "waste", label_type->waste); + gl_xml_set_prop_length (node, "waste", label_type->size.cd.waste); break; default: diff --git a/glabels2/pixmaps/ex-rect-size.png b/glabels2/pixmaps/ex-rect-size.png index a6d7af9270110314bbfa6c6d1bd043203f234826..2710472f1e1776090d6d03e7c62a7572ae3db054 100644 GIT binary patch literal 4972 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 P=VAat3kk2eZ6Ez#4FiW5 literal 5314 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 GjQkG@Pc1b7 diff --git a/glabels2/src/print.c b/glabels2/src/print.c index a6bcf5ea..73bf4034 100644 --- a/glabels2/src/print.c +++ b/glabels2/src/print.c @@ -1178,7 +1178,7 @@ clip_to_outline (PrintInfo *pi, const glTemplateLabelType *label_type; gdouble w, h, r; gdouble r1; - gdouble waste; + gdouble waste, x_waste, y_waste; gl_debug (DEBUG_PRINT, "START"); @@ -1189,28 +1189,31 @@ clip_to_outline (PrintInfo *pi, case GL_TEMPLATE_SHAPE_RECT: gl_label_get_size (label, &w, &h); r = label_type->size.rect.r; - waste = label_type->waste; + x_waste = label_type->size.rect.x_waste; + y_waste = label_type->size.rect.y_waste; if (r == 0.0) { /* simple rectangle */ create_rectangle_path (pi->pc, - -waste, -waste, w+2*waste, h+2*waste); + -x_waste, -y_waste, + w+2*x_waste, h+2*y_waste); } else { /* rectangle with rounded corners */ - create_rounded_rectangle_path (pi->pc, -waste, -waste, - w+2*waste, h+2*waste, r); + create_rounded_rectangle_path (pi->pc, + -x_waste, -y_waste, + w+2*x_waste, h+2*y_waste, r); } gnome_print_clip (pi->pc); break; case GL_TEMPLATE_SHAPE_ROUND: r1 = label_type->size.round.r; - waste = label_type->waste; + waste = label_type->size.round.waste; create_ellipse_path (pi->pc, r1, r1, r1+waste, r1+waste); gnome_print_clip (pi->pc); break; case GL_TEMPLATE_SHAPE_CD: - waste = label_type->waste; + waste = label_type->size.cd.waste; if ((label_type->size.cd.h == 0) && (label_type->size.cd.w == 0)) { /* CD style, round label w/ concentric round hole */ r1 = label_type->size.cd.r1; @@ -1262,7 +1265,7 @@ clip_punchouts (PrintInfo *pi, case GL_TEMPLATE_SHAPE_CD: gl_label_get_size (label, &w, &h); - waste = label_type->waste; + waste = label_type->size.cd.waste; r2 = label_type->size.cd.r2; create_ellipse_path (pi->pc, w/2, h/2, r2-waste, r2-waste); gnome_print_setrgbcolor (pi->pc, 1.0, 1.0, 1.0); diff --git a/glabels2/src/template-designer.c b/glabels2/src/template-designer.c index 66c28f7e..d24be891 100644 --- a/glabels2/src/template-designer.c +++ b/glabels2/src/template-designer.c @@ -130,12 +130,14 @@ struct _glTemplateDesignerPrivate GtkWidget *rect_w_spin; GtkWidget *rect_h_spin; GtkWidget *rect_r_spin; - GtkWidget *rect_waste_spin; + GtkWidget *rect_x_waste_spin; + GtkWidget *rect_y_waste_spin; GtkWidget *rect_margin_spin; GtkWidget *rect_w_units_label; GtkWidget *rect_h_units_label; GtkWidget *rect_r_units_label; - GtkWidget *rect_waste_units_label; + GtkWidget *rect_x_waste_units_label; + GtkWidget *rect_y_waste_units_label; GtkWidget *rect_margin_units_label; /* Label size (round) page controls */ @@ -595,8 +597,10 @@ construct_rect_size_page (glTemplateDesigner *dlg, glade_xml_get_widget (dlg->priv->gui, "rect_h_spin"); dlg->priv->rect_r_spin = glade_xml_get_widget (dlg->priv->gui, "rect_r_spin"); - dlg->priv->rect_waste_spin = - glade_xml_get_widget (dlg->priv->gui, "rect_waste_spin"); + dlg->priv->rect_x_waste_spin = + glade_xml_get_widget (dlg->priv->gui, "rect_x_waste_spin"); + dlg->priv->rect_y_waste_spin = + glade_xml_get_widget (dlg->priv->gui, "rect_y_waste_spin"); dlg->priv->rect_margin_spin = glade_xml_get_widget (dlg->priv->gui, "rect_margin_spin"); dlg->priv->rect_w_units_label = @@ -605,8 +609,10 @@ construct_rect_size_page (glTemplateDesigner *dlg, glade_xml_get_widget (dlg->priv->gui, "rect_h_units_label"); dlg->priv->rect_r_units_label = glade_xml_get_widget (dlg->priv->gui, "rect_r_units_label"); - dlg->priv->rect_waste_units_label = - glade_xml_get_widget (dlg->priv->gui, "rect_waste_units_label"); + dlg->priv->rect_x_waste_units_label = + glade_xml_get_widget (dlg->priv->gui, "rect_x_waste_units_label"); + dlg->priv->rect_y_waste_units_label = + glade_xml_get_widget (dlg->priv->gui, "rect_y_waste_units_label"); dlg->priv->rect_margin_units_label = glade_xml_get_widget (dlg->priv->gui, "rect_margin_units_label"); @@ -633,11 +639,17 @@ construct_rect_size_page (glTemplateDesigner *dlg, dlg->priv->climb_rate, 10.0*dlg->priv->climb_rate); gtk_label_set_text (GTK_LABEL(dlg->priv->rect_r_units_label), dlg->priv->units_string); - gtk_spin_button_set_digits (GTK_SPIN_BUTTON(dlg->priv->rect_waste_spin), + gtk_spin_button_set_digits (GTK_SPIN_BUTTON(dlg->priv->rect_x_waste_spin), dlg->priv->digits); - gtk_spin_button_set_increments (GTK_SPIN_BUTTON(dlg->priv->rect_waste_spin), + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(dlg->priv->rect_x_waste_spin), dlg->priv->climb_rate, 10.0*dlg->priv->climb_rate); - gtk_label_set_text (GTK_LABEL(dlg->priv->rect_waste_units_label), + gtk_label_set_text (GTK_LABEL(dlg->priv->rect_x_waste_units_label), + dlg->priv->units_string); + gtk_spin_button_set_digits (GTK_SPIN_BUTTON(dlg->priv->rect_y_waste_spin), + dlg->priv->digits); + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(dlg->priv->rect_y_waste_spin), + dlg->priv->climb_rate, 10.0*dlg->priv->climb_rate); + gtk_label_set_text (GTK_LABEL(dlg->priv->rect_y_waste_units_label), dlg->priv->units_string); gtk_spin_button_set_digits (GTK_SPIN_BUTTON(dlg->priv->rect_margin_spin), dlg->priv->digits); @@ -653,7 +665,9 @@ construct_rect_size_page (glTemplateDesigner *dlg, DEFAULT_RECT_H * dlg->priv->units_per_point); gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_r_spin), DEFAULT_RECT_R * dlg->priv->units_per_point); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_waste_spin), + gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_x_waste_spin), + DEFAULT_RECT_WASTE * dlg->priv->units_per_point); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_y_waste_spin), DEFAULT_RECT_WASTE * dlg->priv->units_per_point); gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_margin_spin), DEFAULT_MARGIN * dlg->priv->units_per_point); @@ -1151,7 +1165,7 @@ static void rect_size_page_prepare_cb (glTemplateDesigner *dlg) { gdouble max_w, max_h; - gdouble w, h, r, waste, margin; + gdouble w, h, r, x_waste, y_waste, margin; /* Limit label size based on already chosen page size. */ max_w = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->pg_w_spin)); @@ -1160,7 +1174,8 @@ rect_size_page_prepare_cb (glTemplateDesigner *dlg) w = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_w_spin)); h = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_h_spin)); r = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_r_spin)); - waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_waste_spin)); + x_waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_x_waste_spin)); + y_waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_y_waste_spin)); margin = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_margin_spin)); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->rect_w_spin), @@ -1169,7 +1184,9 @@ rect_size_page_prepare_cb (glTemplateDesigner *dlg) dlg->priv->climb_rate, max_h); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->rect_r_spin), 0.0, MIN(max_w, max_h)/2.0); - gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->rect_waste_spin), + gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->rect_x_waste_spin), + 0.0, MIN(max_w, max_h)/4.0); + gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->rect_y_waste_spin), 0.0, MIN(max_w, max_h)/4.0); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->rect_margin_spin), 0.0, MIN(max_w, max_h)/4.0); @@ -1177,7 +1194,8 @@ rect_size_page_prepare_cb (glTemplateDesigner *dlg) gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_w_spin), w); gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_h_spin), h); gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_r_spin), r); - gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_waste_spin), waste); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_x_waste_spin), x_waste); + gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_y_waste_spin), y_waste); gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->rect_margin_spin), margin); } @@ -1261,7 +1279,7 @@ static void layout_page_prepare_cb (glTemplateDesigner *dlg) { gdouble page_w, page_h; - gdouble w, h, waste; + gdouble w, h, x_waste, y_waste; gint max_nx, max_ny; gint nlayouts; gdouble nx_1, ny_1, x0_1, y0_1, dx_1, dy_1; @@ -1310,20 +1328,23 @@ layout_page_prepare_cb (glTemplateDesigner *dlg) if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dlg->priv->shape_rect_radio))) { w = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_w_spin)); h = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_h_spin)); - waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_waste_spin)); + x_waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_x_waste_spin)); + y_waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_y_waste_spin)); } if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dlg->priv->shape_round_radio))) { w = 2*gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->round_r_spin)); h = w; - waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->round_waste_spin)); + x_waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->round_waste_spin)); + y_waste = x_waste; } if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dlg->priv->shape_cd_radio))) { w = 2*gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->cd_radius_spin)); h = w; - waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->cd_waste_spin)); + x_waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->cd_waste_spin)); + y_waste = x_waste; } - max_nx = MAX (floor (page_w/(w + 2*waste) + DELTA), 1.0); - max_ny = MAX (floor (page_h/(h + 2*waste) + DELTA), 1.0); + max_nx = MAX (floor (page_w/(w + 2*x_waste) + DELTA), 1.0); + max_ny = MAX (floor (page_h/(h + 2*y_waste) + DELTA), 1.0); nx_1 = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->layout1_nx_spin)); ny_1 = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->layout1_ny_spin)); @@ -1343,25 +1364,25 @@ layout_page_prepare_cb (glTemplateDesigner *dlg) gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout1_ny_spin), 1, max_ny); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout1_x0_spin), - waste, page_w - w - waste); + x_waste, page_w - w - x_waste); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout1_y0_spin), - waste, page_h - h - waste); + y_waste, page_h - h - y_waste); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout1_dx_spin), - w + 2*waste, page_w - w - 2*waste); + w + 2*x_waste, page_w - w - 2*x_waste); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout1_dy_spin), - h + 2*waste, page_h - h - 2*waste); + h + 2*y_waste, page_h - h - 2*y_waste); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout2_nx_spin), 1, max_nx); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout2_ny_spin), 1, max_ny); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout2_x0_spin), - waste, page_w - w - waste); + x_waste, page_w - w - x_waste); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout2_y0_spin), - waste, page_h - h - waste); + y_waste, page_h - h - y_waste); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout2_dx_spin), - w + 2*waste, page_w - w - 2*waste); + w + 2*x_waste, page_w - w - 2*x_waste); gtk_spin_button_set_range (GTK_SPIN_BUTTON (dlg->priv->layout2_dy_spin), - h + 2*waste, page_h - h - 2*waste); + h + 2*y_waste, page_h - h - 2*y_waste); gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->layout1_nx_spin), nx_1); gtk_spin_button_set_value (GTK_SPIN_BUTTON(dlg->priv->layout1_ny_spin), ny_1); @@ -1508,7 +1529,7 @@ build_template (glTemplateDesigner *dlg) glPaper *paper; glTemplateLabelShape shape; glTemplateLabelType *label_type; - gdouble w, h, r, radius, hole, waste, margin; + gdouble w, h, r, radius, hole, waste, x_waste, y_waste, margin; gint nlayouts; gdouble nx_1, ny_1, x0_1, y0_1, dx_1, dy_1; gdouble nx_2, ny_2, x0_2, y0_2, dx_2, dy_2; @@ -1538,7 +1559,8 @@ build_template (glTemplateDesigner *dlg) w = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_w_spin)); h = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_h_spin)); r = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_r_spin)); - waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_waste_spin)); + x_waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_x_waste_spin)); + y_waste = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_y_waste_spin)); margin = gtk_spin_button_get_value (GTK_SPIN_BUTTON(dlg->priv->rect_margin_spin)); } @@ -1581,7 +1603,7 @@ build_template (glTemplateDesigner *dlg) label_type = gl_template_rect_label_type_new ("0", w/upp, h/upp, r/upp, - waste/upp); + x_waste/upp, y_waste/upp); break; case GL_TEMPLATE_SHAPE_ROUND: label_type = diff --git a/glabels2/src/template-designer.glade b/glabels2/src/template-designer.glade index f5396b2f..2f8a53d6 100644 --- a/glabels2/src/template-designer.glade +++ b/glabels2/src/template-designer.glade @@ -800,7 +800,7 @@ This dialog will assist you in the creation of a custom gLabels template. True - 5 + 6 3 False 12 @@ -881,7 +881,7 @@ This dialog will assist you in the creation of a custom gLabels template. True - 4. Waste (overprint allowed): + 4. Horiz. waste (overprint allowed): False False GTK_JUSTIFY_LEFT @@ -975,7 +975,7 @@ This dialog will assist you in the creation of a custom gLabels template. - + True inches False @@ -1062,7 +1062,7 @@ This dialog will assist you in the creation of a custom gLabels template. - + True True 0.01 @@ -1085,7 +1085,7 @@ This dialog will assist you in the creation of a custom gLabels template. True - 5. Margin + 6. Margin False False GTK_JUSTIFY_LEFT @@ -1099,13 +1099,34 @@ This dialog will assist you in the creation of a custom gLabels template. 0 1 - 4 - 5 + 5 + 6 fill + + + True + True + 0.01 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 1 10 10 + + + 1 + 2 + 5 + 6 + + + + True @@ -1123,15 +1144,15 @@ This dialog will assist you in the creation of a custom gLabels template. 2 3 - 4 - 5 + 5 + 6 fill - + True True 0.01 @@ -1150,6 +1171,54 @@ This dialog will assist you in the creation of a custom gLabels template. + + + + True + inches + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 4 + 5 + fill + + + + + + + True + 5. Vert. waste (overprint allowed): + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + fill + + + 0 diff --git a/glabels2/src/xml-label-191.c b/glabels2/src/xml-label-191.c index 24ecab00..bd922ecb 100644 --- a/glabels2/src/xml-label-191.c +++ b/glabels2/src/xml-label-191.c @@ -760,7 +760,7 @@ xml191_parse_label (xmlNodePtr label_node, h = gl_xml_get_prop_length (label_node, "height", 0); r = gl_xml_get_prop_length (label_node, "round", 0); label_type = - gl_template_rect_label_type_new ("0", w, h, r, 0.0); + gl_template_rect_label_type_new ("0", w, h, r, 0.0, 0.0); break; case GL_TEMPLATE_SHAPE_ROUND: -- 2.39.5