From: Jim Evins Date: Fri, 2 Jul 2004 23:58:08 +0000 (+0000) Subject: 2004-07-02 Jim Evins X-Git-Tag: glabels-2_3_0~469 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6ebd01b8a785ff3e49fafa0e0f94369ac9f95ca1;p=glabels 2004-07-02 Jim Evins * data/glabels.1: Created man page. Based on page submitted by Matthew J. Lockner, however it has been severely edited. * data/avery-other-templates.xml * data/misc-other-templates.xml: Started new files for predefined templates with non-standard sheet sizes. These have been initially populated with the Avery 06141 and OfficeMax #86112, both provided by Matthew J. Lockner. * data/Makefile.am: Install above manpage and template files. * glabels.spec.in: Make sure we install man pages. * src/glabels-batch.c: Changed short form of help option to '-?' to be consistent with glabels. * AUTHORS: Added acknowledgement for above labels. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@428 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS index 753a82c6..687d3067 100644 --- a/glabels2/AUTHORS +++ b/glabels2/AUTHORS @@ -137,5 +137,6 @@ particular products (I apologize if I have missed anybody): Fred Bacon JBadger Frank Altpeter + Matthew J. Lockner And many others for their many helpful suggestions and bug reports -- thanks. diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 96b7d392..1f2bb4c3 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,27 @@ +2004-07-02 Jim Evins + + * data/glabels.1: + Created man page. Based on page submitted by Matthew J. Lockner, however + it has been severely edited. + + * data/avery-other-templates.xml + * data/misc-other-templates.xml: + Started new files for predefined templates with non-standard sheet sizes. + These have been initially populated with the Avery 06141 and + OfficeMax #86112, both provided by Matthew J. Lockner. + + * data/Makefile.am: + Install above manpage and template files. + + * glabels.spec.in: + Make sure we install man pages. + + * src/glabels-batch.c: + Changed short form of help option to '-?' to be consistent with glabels. + + * AUTHORS: + Added acknowledgement for above labels. + 2004-07-02 Jim Evins * src/glabels.c: (main), (save_session_cb): diff --git a/glabels2/data/Makefile.am b/glabels2/data/Makefile.am index dc948c7e..4d37867b 100644 --- a/glabels2/data/Makefile.am +++ b/glabels2/data/Makefile.am @@ -19,21 +19,26 @@ mime_DATA = $(KEYS_FILES) glabels.mime appdir = $(datadir)/application-registry app_DATA = glabels.applications +man_MANS = glabels.1 + runtime_files = \ glabels-2.0.dtd \ paper-sizes.xml \ avery-us-templates.xml \ avery-iso-templates.xml \ + avery-other-templates.xml \ zweckform-iso-templates.xml \ misc-us-templates.xml \ - misc-iso-templates.xml + misc-iso-templates.xml \ + misc-other-templates.xml EXTRA_DIST = \ $(DESKTOP_IN_FILES) \ $(KEYS_IN_FILES) \ $(mime_DATA) \ $(app_DATA) \ - $(runtime_files) + $(runtime_files) \ + $(man_MANS) configdir=$(datadir)/glabels install-data-local: diff --git a/glabels2/data/avery-other-templates.xml b/glabels2/data/avery-other-templates.xml new file mode 100644 index 00000000..1640790d --- /dev/null +++ b/glabels2/data/avery-other-templates.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/glabels2/data/glabels.1 b/glabels2/data/glabels.1 new file mode 100644 index 00000000..1597e1f4 --- /dev/null +++ b/glabels2/data/glabels.1 @@ -0,0 +1,64 @@ +.TH glabels 1 "Jun 28, 2004" +.SH NAME +glabels \- Label and business card creation program for GNOME +.SH SYNOPSIS +.B glabels +.RI [OPTIONS] +.RI [label-filename...] +.sp +.B glabels-batch +.RI [OPTIONS] +.RI [label-filename...] +.SH DESCRIPTION +.B glabels +is a lightweight program for creating labels and business cards for +the GNOME desktop environment. It is designed to work with various +laser/ink-jet peel-off label and business card sheets that you'll find at most +office supply stores. +.B glabels +is pre-configured with templates for many of these products. +It also provides an interactive template designer for creating new +templates according to user specifications. +.PP +For full documentation see the \fBgLabels\fR online help. + +.PP +.B glabels-batch +is a command line utility to print labels previously prepared with +.B glabels. +.SH OPTIONS +.TP +\fB\-?\fR, \fB\-\-help\fR +Display a summary of available command-line options. +.TP +\fB\-\-usage\fR +Display a short usage summary. +.TP +\fB\-v\fR, \fB\-\-version\fR +Print program version information. +.PP +.B Options specific to glabels-batch +.TP +\fB\-o\fR \fIfilename\fR, \fB\-\-output\fR=\fIfilename\fR +Set output filename to \fIfilename\fR. (default="output.ps") +.TP +\fB\-s\fR \fIn\fR, \fB\-\-sheets\fR=\fIn\fR +Set number of sheets to \fIn\fR. (default=1) +.TP +\fB\-c\fR \fIn\fR, \fB\-\-copies\fR=\fIn\fR +Set number of copies to \fIn\fR. (default=1) +.TP +\fB\-l\fR, \fB\-\-outline\fR +Print outlines around labels. This is useful for testing printer alignment +or printing proof sheets. +.TP +\fB\-r\fR, \fB\-\-reverse\fR +Print mirror image of labels. This is useful for clear labels intended to be +seen from the back through glass. + +.SH FILES +The $HOME/.glabels directory contains all user-defined templates. +.SH SEE ALSO +The gLabels homepage at . +.SH AUTHOR +Jim Evins diff --git a/glabels2/data/misc-other-templates.xml b/glabels2/data/misc-other-templates.xml new file mode 100644 index 00000000..6f2e2ffe --- /dev/null +++ b/glabels2/data/misc-other-templates.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/glabels2/glabels.spec.in b/glabels2/glabels.spec.in index d993c352..9da2b884 100644 --- a/glabels2/glabels.spec.in +++ b/glabels2/glabels.spec.in @@ -65,7 +65,7 @@ scrollkeeper-update %{_datadir}/applications/*.desktop %{_datadir}/application-registry/* %{_datadir}/mime-info/* - +%{_datadir}/man/* %changelog * Sat Feb 21 2004 Jim Evins diff --git a/glabels2/src/glabels-batch.c b/glabels2/src/glabels-batch.c index dc8d831d..381ca9b5 100644 --- a/glabels2/src/glabels-batch.c +++ b/glabels2/src/glabels-batch.c @@ -44,7 +44,7 @@ static gboolean outline_flag = FALSE; static gboolean reverse_flag = FALSE; static struct poptOption options[] = { - {"help", 'h', POPT_ARG_NONE, &help_flag, 1, + {"help", '?', POPT_ARG_NONE, &help_flag, 1, N_("print this message"), NULL}, {"version", 'v', POPT_ARG_NONE, &version_flag, 0, N_("print the version of glabels-batch being used"), NULL},