/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
@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
--- /dev/null
+[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;
+++ /dev/null
-[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;
## 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)
-
--- /dev/null
+.so man1/glabels-3.1
--- /dev/null
+.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 <http://glabels.org/>.
+.SH AUTHOR
+Jim Evins <evins@snaught.com>
+++ /dev/null
-.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 <http://glabels.org/>.
-.SH AUTHOR
-Jim Evins <evins@snaught.com>
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
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) \
SUBDIRS= pixmaps stock-pixmaps
-bin_PROGRAMS = glabels glabels-batch
+bin_PROGRAMS = glabels-3 glabels-3-batch
INCLUDES = \
-I$(top_builddir)/libglabels \
$(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) \
$(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) \
marshal.c \
marshal.h
-glabels_SOURCES = \
+glabels_3_SOURCES = \
glabels.c \
warning-handler.c \
warning-handler.h \
$(BUILT_SOURCES)
-glabels_batch_SOURCES = \
+glabels_3_batch_SOURCES = \
glabels-batch.c \
file-util.h \
file-util.c \
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);
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);