From 5375ec7401a13e0749329bc34d912cbffbee2b6f Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sun, 16 Dec 2007 21:21:59 +0000 Subject: [PATCH] 2007-12-16 Jim Evins * configure.in: Updated version to 2.pre2. * help/C/glabels.xml: Updated documentation. * src/ui-commands.c: (gl_ui_cmd_help_about): Updated copyright string. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@710 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/ChangeLog | 9 +++ glabels2/configure.in | 2 +- glabels2/help/C/glabels.xml | 151 +++++++++++++++++++++++------------- glabels2/src/ui-commands.c | 2 +- 4 files changed, 108 insertions(+), 56 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 5c9e70ff..4cb79205 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,12 @@ +2007-12-16 Jim Evins + + * configure.in: + Updated version to 2.pre2. + * help/C/glabels.xml: + Updated documentation. + * src/ui-commands.c: (gl_ui_cmd_help_about): + Updated copyright string. + 2007-12-15 Jim Evins * data/glade/object-editor.glade: diff --git a/glabels2/configure.in b/glabels2/configure.in index 4010fe0f..cd042c30 100644 --- a/glabels2/configure.in +++ b/glabels2/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT(glabels, 2.1.5, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116) +AC_INIT(glabels, 2.pre2svn, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116) AC_CONFIG_SRCDIR(src/glabels.c) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) diff --git a/glabels2/help/C/glabels.xml b/glabels2/help/C/glabels.xml index 8ce3aca5..6d96d3e1 100644 --- a/glabels2/help/C/glabels.xml +++ b/glabels2/help/C/glabels.xml @@ -2,9 +2,9 @@ - - - + + + gLabels"> @@ -920,6 +887,14 @@ + + Shadow Tabbed Section (All except image and barcode objects) + + This section contains controls to add a shadow to an object. + + + + @@ -1018,13 +993,14 @@ The first step to performing a document merge is to prepare a source document that contains your merge data. This data could be mailing addresses or any other data that you wish to create - unique labels or cards for. Currently only a simple back-end - for text files exists -- others are planned. The currently + unique labels or cards for. Currently back-ends only exist for + text files and the evolution data server -- others are planned. The currently supported text-file format is very simple: each line is a record; fields are delimited by commas (CSV), tabs, or colons; and newlines can be embedded into fields by using the "\n" entity. This file could be created using any text editor or could be created by - another program or script. + another program or script. A common way of creating CSV files is + to export them from a spreadsheet program. A label must then be configured to "point at" this data file. To configure the merge properties of a document, choose @@ -1415,7 +1391,7 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207
- Printing name tags + Printing address labels
- Name tags preview + Address labels preview The format for these files is defined in the DTD: glabels-2.0.dtd. (This DTD also describes other + type="http">glabels-2.2.dtd. (This DTD also describes other XML formats used by glabels.) @@ -1552,10 +1528,17 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207 - name + brand - Name or part # of stationary product. - E.g. "Avery 8160" + Brand or manufacturer of stationary product. + E.g. "Avery" + + + + part + + Part number or name of stationary product. + E.g. "8160" @@ -1923,6 +1906,61 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207 + + Markup-rect Node + + A Markup-rect describes a markup rectangle. + + + + + + + + + + Property + + + Description + + + + + + x1 + + x coordinate of upper left corner of rectangle. + + + + y1 + + y coordinate of upper left corner of rectangle. + + + + w + + Width of rectangle. + + + + h + + Height of rectangle. + + + + r + Radius of rounded corners of rectangle. + + + + + + + Layout Node @@ -2026,10 +2064,15 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207 - name + brand + + The brand or manufacturer of the equivalent product. + + + + part - The name or part # of a product with the same size and - layout characteristics. + The part number or name of the equivalent product. diff --git a/glabels2/src/ui-commands.c b/glabels2/src/ui-commands.c index 1e5942ba..ddeb2dd1 100644 --- a/glabels2/src/ui-commands.c +++ b/glabels2/src/ui-commands.c @@ -1098,7 +1098,7 @@ gl_ui_cmd_help_about (GtkAction *action, NULL }; - const gchar *copy_text = "Copyright \xc2\xa9 2001-2005 Jim Evins"; + const gchar *copy_text = "Copyright \xc2\xa9 2001-2007 Jim Evins"; const gchar *about_text = _("A label and business card creation program.\n"); -- 2.39.5