From: Jim Evins Date: Thu, 25 Feb 2010 04:45:18 +0000 (-0500) Subject: Rename executables and key files to support parallel installation X-Git-Tag: glabels-2_3_0~77 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5f40d24d1843a5b124c9f638bf9d57e7fead5b4f;p=glabels Rename executables and key files to support parallel installation Renamed glabels and glabels-batch to glabels-3 and glabels-3-batch to support parallel installation with other versions of glabels. Also renamed and reconciled man pages and icon files. --- diff --git a/.gitignore b/.gitignore index 76b59138..d23fe328 100644 --- a/.gitignore +++ b/.gitignore @@ -47,9 +47,12 @@ glabels-*.tar.gz /src/marshal.[ch] /src/stock-pixmaps/stockpixbufs.h /src/glabels +/src/glabels-3 /src/glabels-batch +/src/glabels-3-batch + +/data/desktop/glabels*.desktop -/data/desktop/glabels.desktop /data/mime/glabels.keys /data/mime/glabels.xml diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am index 0ade4eef..2be4ed6e 100644 --- a/data/desktop/Makefile.am +++ b/data/desktop/Makefile.am @@ -2,7 +2,7 @@ @INTLTOOL_DESKTOP_RULE@ -DESKTOP_IN_FILES = glabels.desktop.in +DESKTOP_IN_FILES = $(GLABELS_BRANCH).desktop.in DESKTOP_FILES =$(DESKTOP_IN_FILES:.desktop.in=.desktop) desktopdir = $(datadir)/applications diff --git a/data/desktop/glabels-3.0.desktop.in b/data/desktop/glabels-3.0.desktop.in new file mode 100644 index 00000000..4d7d579f --- /dev/null +++ b/data/desktop/glabels-3.0.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=gLabels Label Designer 3 +_Comment=Create labels, business cards and media covers +Exec=glabels-3 %F +Icon=glabels-3.0.png +Terminal=false +Type=Application +Categories=GTK;Office; +StartupNotify=true +MimeType=application/x-glabels; diff --git a/data/desktop/glabels.desktop.in b/data/desktop/glabels.desktop.in deleted file mode 100644 index 6f0956cf..00000000 --- a/data/desktop/glabels.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=gLabels Label Designer -_Comment=Create labels, business cards and media covers -Exec=glabels %F -Icon=glabels.png -Terminal=false -Type=Application -Categories=GTK;Office; -StartupNotify=true -MimeType=application/x-glabels; diff --git a/data/man/Makefile.am b/data/man/Makefile.am index 34051904..43fc5121 100644 --- a/data/man/Makefile.am +++ b/data/man/Makefile.am @@ -1,6 +1,5 @@ ## Process this file with automake to produce Makefile.in -man_MANS = glabels.1 +man_MANS = glabels-3.1 glabels-3-batch.1 EXTRA_DIST = $(man_MANS) - diff --git a/data/man/glabels-3-batch.1 b/data/man/glabels-3-batch.1 new file mode 100644 index 00000000..d9248d52 --- /dev/null +++ b/data/man/glabels-3-batch.1 @@ -0,0 +1 @@ +.so man1/glabels-3.1 diff --git a/data/man/glabels-3.1 b/data/man/glabels-3.1 new file mode 100644 index 00000000..5b5b4341 --- /dev/null +++ b/data/man/glabels-3.1 @@ -0,0 +1,67 @@ +.TH glabels 1 "Jun 28, 2004" +.SH NAME +glabels \- Label and business card creation program for GNOME +.SH SYNOPSIS +.B glabels-3 +.RI [OPTIONS] +.RI [label-filename...] +.sp +.B glabels-3-batch +.RI [OPTIONS] +.RI [label-filename...] +.SH DESCRIPTION +.B glabels-3 +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-3 +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-3-batch +is a command line utility to print labels previously prepared with +.B glabels-3. +.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\-f\fR \fIn\fR, \fB\-\-first\fR=\fIn\fR +Set label on first sheet to start printing from 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/data/man/glabels.1 b/data/man/glabels.1 deleted file mode 100644 index 906dd2a5..00000000 --- a/data/man/glabels.1 +++ /dev/null @@ -1,67 +0,0 @@ -.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\-f\fR \fIn\fR, \fB\-\-first\fR=\fIn\fR -Set label on first sheet to start printing from 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/data/mime/glabels.keys.in b/data/mime/glabels.keys.in index 596c96c7..9eae5157 100644 --- a/data/mime/glabels.keys.in +++ b/data/mime/glabels.keys.in @@ -1,7 +1,7 @@ application/x-glabels: open=glabels %f _description=gLabels Project File - icon_filename=glabels-application-x-glabels.png + icon_filename=glabels-3.0-application-x-glabels.png default_action_type=application category=Documents short_list_application_ids_for_novice_user_level=glabels diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am index 39aefa0d..ed28b9be 100644 --- a/data/pixmaps/Makefile.am +++ b/data/pixmaps/Makefile.am @@ -14,12 +14,12 @@ glabels_pixmaps_DATA = \ glabels_app_icondir = $(datadir)/pixmaps glabels_app_icon_DATA = \ - glabels.png + $(GLABELS_BRANCH).png -glabels_mime_icondir = $(datadir)/pixmaps +glabels_mime_icondir = $(datadir)/icons/hicolor/48x48/mimetypes glabels_mime_icon_DATA = \ - glabels-application-x-glabels.png + $(GLABELS_BRANCH)-application-x-glabels.png EXTRA_DIST = $(glabels_pixmaps_DATA) \ $(glabels_app_icon_DATA) \ diff --git a/data/pixmaps/glabels-3.0-application-x-glabels.png b/data/pixmaps/glabels-3.0-application-x-glabels.png new file mode 100644 index 00000000..59c749f3 Binary files /dev/null and b/data/pixmaps/glabels-3.0-application-x-glabels.png differ diff --git a/data/pixmaps/glabels-3.0.png b/data/pixmaps/glabels-3.0.png new file mode 100644 index 00000000..afb7ecfb Binary files /dev/null and b/data/pixmaps/glabels-3.0.png differ diff --git a/data/pixmaps/glabels-application-x-glabels.png b/data/pixmaps/glabels-application-x-glabels.png deleted file mode 100644 index 59c749f3..00000000 Binary files a/data/pixmaps/glabels-application-x-glabels.png and /dev/null differ diff --git a/data/pixmaps/glabels.png b/data/pixmaps/glabels.png deleted file mode 100644 index afb7ecfb..00000000 Binary files a/data/pixmaps/glabels.png and /dev/null differ diff --git a/src/Makefile.am b/src/Makefile.am index 13147ca0..cf0b81a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS= pixmaps stock-pixmaps -bin_PROGRAMS = glabels glabels-batch +bin_PROGRAMS = glabels-3 glabels-3-batch INCLUDES = \ -I$(top_builddir)/libglabels \ @@ -13,12 +13,13 @@ INCLUDES = \ $(DISABLE_DEPRECATED_CFLAGS) \ -DGLABELS_LOCALEDIR=\""$(datadir)/locale"\" \ -DGLABELS_ICON_DIR=\""$(datadir)/pixmaps"\" \ + -DGLABELS_ICON=\""$(GLABELS_BRANCH).png"\" \ -DGLABELS_DATA_DIR=\""$(datadir)/$(GLABELS_BRANCH)"\" \ -DG_LOG_DOMAIN=\""glabels\"" -glabels_LDFLAGS = -export-dynamic +glabels_3_LDFLAGS = -export-dynamic -glabels_LDADD = \ +glabels_3_LDADD = \ $(GLABELS_LIBS) \ ../libglabels/$(LIBGLABELS_BRANCH).la \ $(LIBEBOOK_LIBS) \ @@ -26,9 +27,9 @@ glabels_LDADD = \ $(LIBQRENCODE_LIBS) \ $(LIBIEC16022_LIBS) -glabels_batch_LDFLAGS = -export-dynamic +glabels_3_batch_LDFLAGS = -export-dynamic -glabels_batch_LDADD = \ +glabels_3_batch_LDADD = \ $(GLABELS_LIBS) \ ../libglabels/$(LIBGLABELS_BRANCH).la \ $(LIBEBOOK_LIBS) \ @@ -40,7 +41,7 @@ BUILT_SOURCES = \ marshal.c \ marshal.h -glabels_SOURCES = \ +glabels_3_SOURCES = \ glabels.c \ warning-handler.c \ warning-handler.h \ @@ -228,7 +229,7 @@ glabels_SOURCES = \ $(BUILT_SOURCES) -glabels_batch_SOURCES = \ +glabels_3_batch_SOURCES = \ glabels-batch.c \ file-util.h \ file-util.c \ diff --git a/src/glabels.c b/src/glabels.c index 85f207db..ce95ba54 100644 --- a/src/glabels.c +++ b/src/glabels.c @@ -98,7 +98,7 @@ main (int argc, char **argv) gl_warning_handler_init(); /* Set default icon */ - icon_file = g_build_filename (GLABELS_ICON_DIR, "glabels.png", NULL); + icon_file = g_build_filename (GLABELS_ICON_DIR, GLABELS_ICON, NULL); if (!g_file_test (icon_file, G_FILE_TEST_EXISTS)) { g_message ("Could not find %s", icon_file); diff --git a/src/template-designer.c b/src/template-designer.c index 03528b8a..95b2162a 100644 --- a/src/template-designer.c +++ b/src/template-designer.c @@ -396,7 +396,7 @@ gl_template_designer_construct (glTemplateDesigner *dialog) gtk_window_set_title (GTK_WINDOW(dialog), _("gLabels Template Designer")); - logo_filename = g_build_filename (GLABELS_ICON_DIR, "glabels.png", NULL); + logo_filename = g_build_filename (GLABELS_ICON_DIR, GLABELS_ICON, NULL); logo = gdk_pixbuf_new_from_file (logo_filename, NULL); g_free (logo_filename);