Jim Evins [Mon, 9 Aug 2004 14:47:16 +0000 (14:47 +0000)]
2004-08-09 Jim Evins <evins@snaught.com>
These are hopefully the final preparations for 2.0.0.
* data/mime/Makefile.am:
Include glabels.xml in EXTRA_DIST.
* configure.in:
- Updated comment style.
- Added LIBGLABELS_VERSION_INFO macro, updated Current.
- Added package and version info to configuration printout
- Update version to 2.0.0
* libglabels/Makefile.am:
Use the new LIBGLABELS_VERSION_INFO macro.
Jim Evins [Sun, 8 Aug 2004 16:39:42 +0000 (16:39 +0000)]
2004-08-08 Jim Evins <evins@snaught.com>
* glabels.spec.in:
- Updated URL
- More specific of what to install in /usr/bin and /usr/lib
- Remove built mime registration files from staging directory
Jim Evins [Sun, 8 Aug 2004 05:51:41 +0000 (05:51 +0000)]
2004-08-08 Jim Evins <evins@snaught.com>
Reorganization of runtime data files. Also added registration of mimetype with
new freedesktop.org mime database if available.
* data/*
Moved files to appropriate subdirectories, creating local Makefile.am
in each subdirectory.
- Moved paper-sizes.xml and *-templates.xml to templates subdirectory.
These are now installed at $datadir/glabels/templates.
- Moved glabels.1 to man subdirectory.
- Moved glabels-2.0.dtd to dtd subdirectory.
- Moved glabels.desktop.in to desktop subdirectory.
- Moved glabels.keys.in and glabels.mime to mime subdirectory.
* data/pixmaps/*
Moved "./pixmaps" to "./data/pixmaps"
* data/ui/*
Moved src/glabels-ui.xml to data/ui directory. Created Makefile.am.
* data/glade/*
Moved libglade files from src to data/glade. Created Makefile.am.
* Makefile.am:
Removed pixmaps from SUBDIRS.
* configure.in:
- Removed pixmaps from makefiles.
- Added makefiles for new subdirs of data.
- Added tests for freedesktop.org mime database.
* glabels.spec.in:
- Added tests for freedesktop.org mime database for post install and
post un-install actions.
* libglabels/Makefile.am:
Moved system template files to $(datadir)/glabels/templates.
* libglabels/libglabels-private.h:
Moved system template files to $(datadir)/glabels/templates.
* po/POTFILES.in:
- Accounted for movement of ui and libglade files.
- Added missing .in files.
- Reorganized by directory.
* src/Makefile.am:
Accounted for movement of ui and libglade files.
* data/mime/glabels.xml.in:
New file for registering with freedesktop.org mime database.
Jim Evins [Sat, 7 Aug 2004 21:04:55 +0000 (21:04 +0000)]
2004-08-07 Jim Evins <evins@snaught.com>
* Makefile.am:
* configure.in:
* help/*
Renamed "./doc" directory to "./help" which contains user documentation,
to be more consistent with other GNOME applications.
Jim Evins [Sat, 7 Aug 2004 20:56:36 +0000 (20:56 +0000)]
2004-08-07 Jim Evins <evins@snaught.com>
* Makefile.am:
* configure.in:
* help/*
Renamed "./doc" directory to "./help" which contains user documentation,
to be more consistent with other GNOME applications.
Jim Evins [Sun, 18 Jul 2004 14:28:13 +0000 (14:28 +0000)]
2004-07-18 Jim Evins <evins@snaught.com>
* data/glabels-2.0.dtd:
* src/bc.c: (gl_barcode_default_digits), (gl_barcode_can_freeform),
(gl_barcode_get_prefered_n):
* src/bc.h:
* src/label-barcode.c: (copy), (gl_label_barcode_set_props),
(gl_label_barcode_get_props), (get_size):
* src/label-barcode.h:
* src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page),
(style_changed_cb), (gl_object_editor_set_bc_style),
(gl_object_editor_get_bc_style):
* src/object-editor-data-page.c: (data_radio_toggled_cb),
(gl_object_editor_set_data), (gl_object_editor_get_data):
* src/object-editor-private.h:
* src/object-editor.c: (gl_object_editor_set_key_names):
* src/object-editor.glade:
* src/object-editor.h:
* src/print.c: (draw_barcode_object):
* src/view-barcode.c: (update_object_from_editor_cb),
(update_editor_from_object_cb),
(gl_view_barcode_create_event_handler), (draw_barcode):
* src/xml-label-04.c: (xml04_parse_barcode_props):
* src/xml-label-191.c: (xml191_parse_barcode_props):
* src/xml-label.c: (xml_parse_object_barcode),
(xml_create_object_barcode):
Added "format" attribute to barcode objects. This attribute is used
to properly format freeform barcodes barcodes prior to merge data is
applied, so that barcodes can be accurately layed out. This addresses
remaining issues of feature request #824787. Also added an example of
the format in the object editor.
Jim Evins [Mon, 12 Jul 2004 01:09:00 +0000 (01:09 +0000)]
2004-07-11 Jim Evins <evins@snaught.com>
* data/glabels-2.0.dtd:
* src/label-text.c: (gl_label_text_instance_init), (copy),
(gl_label_text_set_auto_shrink), (gl_label_text_get_auto_shrink):
* src/label-text.h:
* src/object-editor-private.h:
* src/object-editor-text-page.c:
(gl_object_editor_prepare_text_page),
(gl_object_editor_set_text_auto_shrink),
(gl_object_editor_get_text_auto_shrink):
* src/object-editor.c: (gl_object_editor_set_key_names):
* src/object-editor.glade:
* src/object-editor.h:
* src/print.c: (draw_text_object):
* src/view-text.c: (update_object_from_editor_cb),
(update_editor_from_object_cb):
* src/xml-label.c: (xml_parse_object_text),
(xml_create_object_text):
Added option to allow document merge to auto shrink text size to fit
within the text box. The code in print.c that actually shrinks the
text is loosely based on a patch submitted by Mark Harrison
<mark.harrison@velocitynet.com.au>. This addresses feature request
#661421.
Jim Evins [Sun, 11 Jul 2004 05:18:36 +0000 (05:18 +0000)]
2004-07-11 Jim Evins <evins@snaught.com>
* 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.
Jim Evins [Tue, 6 Jul 2004 02:26:53 +0000 (02:26 +0000)]
2004-07-05 Jim Evins <evins@snaught.com>
* src/print.c: (print_crop_marks), (draw_outline):
Changed crop marks and label outlines to black, instead of 25% gray.
This addresses debian Bug #257460.
Jim Evins [Mon, 5 Jul 2004 19:43:23 +0000 (19:43 +0000)]
2004-07-05 Jim Evins <evins@snaught.com>
* src/object-editor-fill-page.c: (gl_object_editor_set_fill_color):
* src/object-editor-line-page.c: (gl_object_editor_set_line_color):
Preserve "is_default" of fill and line color_combos when creating from
existing objects.
Jim Evins [Fri, 2 Jul 2004 23:58:08 +0000 (23:58 +0000)]
2004-07-02 Jim Evins <evins@snaught.com>
* 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.
Jim Evins [Fri, 2 Jul 2004 18:48:42 +0000 (18:48 +0000)]
2004-07-02 Jim Evins <evins@snaught.com>
* src/glabels.c: (main), (save_session_cb):
- Now include libbonoboui.h, recent.h, and file.h to provide missing
prototypes.
- save_session_cb() now returns gboolean.
- Minor formatting changes.
* src/window.h:
* src/window.c:
- Now include file.h to provide missing prototype.
- gl_window_get_type() now returns GType, not guint. I believe this may
ultimately be cause of the segfault reported in Bug #982287, since
GType is actually a gulong, which may not be compatible on other
architectures (64bit) -- I cannot personally test this at this time.
I was sloppy in several other xxx_get_type() functions which also
returned guint -- see next group of files:
* src/window.c: (gl_window_get_type):
* src/canvas-hacktext.c: (gl_canvas_hacktext_get_type):
* src/canvas-hacktext.h:
* src/hig.c: (gl_hig_alert_get_type), (gl_hig_dialog_get_type),
(gl_hig_category_get_type), (gl_hig_vbox_get_type),
(gl_hig_hbox_get_type):
* src/hig.h:
* src/label-barcode.c: (gl_label_barcode_get_type):
* src/label-barcode.h:
* src/label-box.c: (gl_label_box_get_type):
* src/label-box.h:
* src/label-ellipse.c: (gl_label_ellipse_get_type):
* src/label-ellipse.h:
* src/label-image.c: (gl_label_image_get_type):
* src/label-image.h:
* src/label-line.c: (gl_label_line_get_type):
* src/label-line.h:
* src/label-object.c: (gl_label_object_get_type):
* src/label-object.h:
* src/label-text.c: (gl_label_text_get_type):
* src/label-text.h:
* src/label.c: (gl_label_get_type):
* src/label.h:
* src/merge-properties-dialog.c:
(gl_merge_properties_dialog_get_type):
* src/merge-properties-dialog.h:
* src/merge-text.c: (gl_merge_text_get_type):
* src/merge-text.h:
* src/merge.c: (gl_merge_get_type):
* src/merge.h:
* src/object-editor.c: (gl_object_editor_get_type):
* src/prefs-dialog.c: (gl_prefs_dialog_get_type):
* src/prefs-dialog.h:
* src/prefs-model.c: (gl_prefs_model_get_type):
* src/prefs-model.h:
* src/print-dialog.c: (gl_print_dialog_get_type):
* src/print-dialog.h:
* src/template-designer.c: (gl_template_designer_get_type):
* src/template-designer.h:
* src/ui-property-bar.c: (gl_ui_property_bar_get_type):
* src/ui-property-bar.h:
* src/ui-sidebar.c: (gl_ui_sidebar_get_type):
* src/ui-sidebar.h:
* src/view-barcode.c: (gl_view_barcode_get_type):
* src/view-barcode.h:
* src/view-box.c: (gl_view_box_get_type):
* src/view-box.h:
* src/view-ellipse.c: (gl_view_ellipse_get_type):
* src/view-ellipse.h:
* src/view-highlight.c: (gl_view_highlight_get_type):
* src/view-highlight.h:
* src/view-image.c: (gl_view_image_get_type):
* src/view-image.h:
* src/view-line.c: (gl_view_line_get_type):
* src/view-line.h:
* src/view-object.c: (gl_view_object_get_type):
* src/view-object.h:
* src/view-text.c: (gl_view_text_get_type):
* src/view-text.h:
* src/view.c: (gl_view_get_type):
* src/view.h:
* src/wdgt-chain-button.c: (gl_wdgt_chain_button_get_type):
* src/wdgt-image-select.c: (gl_wdgt_image_select_get_type):
* src/wdgt-image-select.h:
* src/wdgt-media-select.c: (gl_wdgt_media_select_get_type):
* src/wdgt-media-select.h:
* src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_get_type):
* src/wdgt-mini-preview.h:
* src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type):
* src/wdgt-print-copies.h:
* src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type):
* src/wdgt-print-merge.h:
* src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_get_type):
* src/wdgt-rotate-label.h:
- Made sure all xxx_get_type functions returned GType, not guint. This
was the case in hig.[ch], window.[ch], ui-property-bar.[ch],
ui-sidebar.[ch], view.[ch], wdgt-image-select.[ch],
wdgt-media-select.[ch], wdgt-mini-preview.[ch], wdgt-print-copies.[ch],
wdt-print-merge.[ch], and wdgt-rotate-label.[ch]. See separate
window.[ch] details above for more info.
- Reconciled various coding style differences in all xxx_get_type()
functions:
* All prototypes include G_GNUC_CONST.
* All prototypes specify the return value as GType, not GtkType
or guint.
* Info structures are all declared as "static const."
* Generalized the names of type and info variables.
* Miscelaneous formatting.
Jim Evins [Sat, 12 Jun 2004 00:21:06 +0000 (00:21 +0000)]
2004-06-08 Jim Evins <evins@snaught.com>
* src/label.c:
* src/label.h:
* src/xml-label.c:
* AUTHORS:
Don't touch compression of original file -- still defaults to 9 for
new files. Original patch provided by Javier Donaire Segarra
(#912252 in patch tracker).
Jim Evins [Tue, 8 Jun 2004 02:41:32 +0000 (02:41 +0000)]
Don't touch compression of original file -- still defaults to 9 for new files. Original patch provided by Javier Donaire Segarra (#912252 in patch tracker).
Jim Evins [Thu, 6 May 2004 03:35:18 +0000 (03:35 +0000)]
2004-05-05 Jim Evins <evins@snaught.com>
* data/glabels-2.0.dtd:
Broke DTD previously when adding new barcode types that contain
a
plus sign (+). Simply changed the BC_STYLE_TYPE entity to "CDATA"
to avoid the problem.
* data/avery-iso-templates.xml:
* data/zweckform-iso-templates.xml:
* AUTHORS:
Added templates for Avery 7165, Zweckform 3688, 4732, and 6021.
Templates
provided by Frank Altpeter.
* libglabels/xml-template.c: (xml_create_label_node):
Reordered markup and layout sub-nodes so that resulting templates will
validate against DTD.
Jim Evins [Sun, 14 Mar 2004 02:58:14 +0000 (02:58 +0000)]
2004-03-13 Jim Evins <evins@snaught.com>
* src/object-editor-size-page.c: (gl_object_editor_prepare_size_page):
Changed spin callback signals from "value-changed" back to "changed."
This was accidentally introduced in a previous revision, and can cause
size changes just by selecting the size tab.
Jim Evins [Sun, 7 Mar 2004 04:56:30 +0000 (04:56 +0000)]
2004-03-06 Jim Evins <evins@snaught.com>
* src/view.c: (draw_grid_layer):
For round labels (round and cd) adjust grid so that it lines up with
center of label. Also, no longer draw box around label in the grid layer,
it is hidden by he fg layer anyway. Feature suggested by
nemolivier@free.fr. Although the grid is aligned with the center of the
label, the coordinate system is still relative to the upper left corner
of the rectangle containing the label.
Jim Evins [Thu, 26 Feb 2004 03:56:43 +0000 (03:56 +0000)]
2004-02-25 Jim Evins <evins@snaught.com>
* configure.in:
Changed version to 2.0pre1cvs
* libglabels/xml-template.c: (gl_xml_template_parse_templates_doc):
Removed extra xmlFreeDoc() calls upon error. Also print the doc->URL
instead of doc->name fields when errors encountered.
Jim Evins [Sat, 21 Feb 2004 01:56:32 +0000 (01:56 +0000)]
2004-02-20 Jim Evins <evins@snaught.com>
* src/glabels-batch.c: (main):
Changed key for setting output filename to GNOME_PRINT_KEY_OUTPUT_FILENAME
as suggested by Javier Donaire Segarra. This addresses bug #901063.
Jim Evins [Tue, 17 Feb 2004 04:16:29 +0000 (04:16 +0000)]
2004-02-16 Jim Evins <evins@snaught.com>
* configure.in:
If gtk+ >= 2.3.2 then define HAVE_FILE_CHOOSER.
* src/Makefile.am:
Added HAVE_FILE_CHOOSER to INCLUDES.
* src/file.c: (gl_file_open), (open_response), (gl_file_open_real),
(gl_file_save_as), (save_as_response):
Ported to use GtkFileChooserDialog if HAVE_FILE_CHOOSER is defined.
Jim Evins [Mon, 16 Feb 2004 22:03:47 +0000 (22:03 +0000)]
2004-02-16 Jim Evins <evins@snaught.com>
* src/xml-label-04.c: (xml04_parse_image_props):
* src/xml-label-191.c: (xml191_parse_image_props):
* src/xml-label.c: (xml_parse_object_image):
Delay setting image size until after image has been applied to new
object.
Jim Evins [Mon, 16 Feb 2004 02:53:37 +0000 (02:53 +0000)]
2004-02-15 Jim Evins <evins@snaught.com>
* src/label-barcode.c: (gl_label_barcode_set_data),
(gl_label_barcode_set_props):
Don't emit "changed" signal, if no change actually made for these
methods. Reduces number of unnecessary redraws of barcodes.
* src/label-object.h:
* src/label-object.c: (gl_label_object_set_position),
(gl_label_object_set_position_relative), (set_size),
(gl_label_object_set_size),
(gl_label_object_set_size_honor_aspect):
Don't emit "changed" signal, if no change actually made for these
methods.
Jim Evins [Sun, 15 Feb 2004 16:28:39 +0000 (16:28 +0000)]
2004-02-15 Jim Evins <evins@snaught.com>
* data/glabels-2.0.dtd:
Added specific subtypes for various barcode types.
* src/bc.h:
* src/bc.c: (id_to_index), (name_to_index), (gl_barcode_new),
(gl_barcode_get_styles_list), (gl_barcode_default_digits),
(gl_barcode_can_text), (gl_barcode_text_optional),
(gl_barcode_can_csum), (gl_barcode_csum_optional),
(gl_barcode_id_to_name), (gl_barcode_name_to_id):
Changed API to use a string id, rather than a fixed enumeration. Id and
name are separate strings. Added entries to backend table for specific
subtypes for various barcode types.
* src/bc-postnet.h:
* src/bc-postnet.c: (gl_barcode_postnet_new), (postnet_code),
(is_length_valid):
Modified to conform to above API. Now more stringent with data length
for various subtypes.
* src/bc-gnubarcode.h:
* src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new),
(is_length_valid), (is_length1_valid), (is_length2_valid):
Modified to conform to above API. Now more stringent with data length
for various subtypes.
* src/label-barcode.h:
* src/label-barcode.c: (copy), (gl_label_barcode_set_props),
(gl_label_barcode_get_props), (get_size):
Modified to use above API for storing barcode type.
* src/object-editor.h:
* src/object-editor-bc-page.c: (style_changed_cb),
(gl_object_editor_set_bc_style), (gl_object_editor_get_bc_style):
Modified to use above API for storing barcode type.
* src/object-editor.glade:
Made barcode style combo's text entry non-editable.
* src/print.c: (draw_barcode_object):
Modified to use above API for barcode type.
* src/view-barcode.c: (update_object_from_editor_cb),
(update_editor_from_object_cb),
(gl_view_barcode_create_event_handler), (draw_barcode):
Modified to use above API for barcode type.
* src/xml-label-04.c: (xml04_parse_barcode_props):
* src/xml-label-191.c: (xml191_parse_barcode_props):
* src/xml-label.c: (xml_parse_object_barcode),
(xml_create_object_barcode):
Modified to use above API for barcode type.
Jim Evins [Sat, 7 Feb 2004 05:29:48 +0000 (05:29 +0000)]
2004-02-07 Jim Evins <evins@snaught.com>
* src/stock-pixmaps/Makefile.am:
* src/stock-pixmaps/stock_hchain_24.png:
* src/stock-pixmaps/stock_hchain_broken_24.png:
* src/stock-pixmaps/stock_vchain_24.png:
* src/stock-pixmaps/stock_vchain_broken_24.png:
Added chain pixmaps borrowed from the gimp's default theme.
* src/stock.h:
* src/stock.c: (gl_stock_init), (add_button_icon):
Added above pixmaps to stock icon sets. Created add_button_icon() to
add these pixmaps sized as GTK_ICON_SIZE_BUTTON.
* src/wdgt-chain-button.h
* src/wdgt-chain-button.c
* src/Makefile.am:
* po/POTFILES.in:
Added this Modified version of gimpchainbutton widget, borrowed from
the gimp.
* AUTHORS:
Added acknowledgements of the above borrowing from the gimp.
* src/object-editor-size-page.c: (aspect_toggle_cb), (w_spin_cb),
(h_spin_cb):
* src/object-editor.c: (gl_object_editor_construct_chain_button):
* src/object-editor.glade:
Replaced the keep aspect ratio check box with the above chain-button
widget.
* src/text-node.c: (gl_text_node_equal):
* src/text-node.h:
Added function gl_text_node_equal() to compare text_nodes.
* src/label-image.c: (gl_label_image_set_filename):
Replaced incomplete text_node comparison code with invocation of
gl_text_node_equal. This fixed the problem of not being able to
resize an image using the object_editor if the aspect ratio is not
locked.
Jim Evins [Thu, 5 Feb 2004 02:56:48 +0000 (02:56 +0000)]
2004-02-04 Jim Evins <evins@snaught.com>
* src/object-editor-image-page.c:
(gl_object_editor_prepare_image_page):
Track "changed" signal of pixmap entry's GtkEntry rather than its
"activate" signal -- this catches all changes to the entry rather than
just changes resulting from a browse, so one can easily pull previous
entries from the history. (This change is marked below on 2004-02-03,
but somehow never got checked in.)
* src/view-highlight.c: (sl_resize_event_handler),
(sr_resize_event_handler), (st_resize_event_handler),
(sb_resize_event_handler):
Side resize handles will now confirm the actual resize that the object
accepted before adjusting position parameters. Previously some interesting
things happened when resizing a barcode to its minimum size.
Jim Evins [Wed, 4 Feb 2004 02:11:18 +0000 (02:11 +0000)]
2004-02-03 Jim Evins <evins@snaught.com>
* src/object-editor-image-page.c:
(gl_object_editor_prepare_image_page):
Track "changed" signal of pixmap entry's GtkEntry rather than its
"activate" signal -- this catches all changes to the entry rather than
just changes resulting from a browse, so one can easily pull previous
entries from the history.
* src/view-highlight.c: (tl_resize_event_handler),
(tr_resize_event_handler), (bl_resize_event_handler),
(br_resize_event_handler):
Allow control key to be dropped while dragging a corner resize handle
without losing the aspect ratio lock.
Jim Evins [Tue, 3 Feb 2004 04:31:17 +0000 (04:31 +0000)]
2004-02-02 Jim Evins <evins@snaught.com>
* src/label-image.c: (gl_label_image_set_filename):
When setting a new filename adjust size such that the aspect ratio of
the image is preserved using the current size as a bounding box.
* src/view-image.c: (update_object_from_editor_cb):
When updating object from editor, feed back possible size changes to
editor as a result of a possible change in image.
* src/object-editor-size-page.c: (size_reset_cb):
Fixed typo when blocking spin handlers. If the base size is larger than
the max size, treat max size as a bounding box while keeping aspect
ratio.
Jim Evins [Tue, 3 Feb 2004 02:11:36 +0000 (02:11 +0000)]
2004-02-02 Jim Evins <evins@snaught.com>
* src/label-object.h:
* src/label-object.c: (gl_label_object_set_size),
(gl_label_object_set_size_honor_aspect):
Added gl_label_object_set_size_honor_aspect() which will maintain the
current aspect ratio by modifying the supplied w or h apropriately.
* src/view-highlight.c: (tl_resize_event_handler),
(tr_resize_event_handler), (bl_resize_event_handler),
(br_resize_event_handler):
Corner handles will now maintain the current aspect ratio if the
control key is pressed while resizing. This addresses feature
request #816603.
Jim Evins [Wed, 7 Jan 2004 05:10:22 +0000 (05:10 +0000)]
2004-01-06 Jim Evins <evins@snaught.com>
Split-out template.[ch], paper.[ch], xml-template.[ch], xml-paper.[ch], and
xml.[ch] into a separate library called libglabels, to facilitate third
party use of glabels template files. This was suggested by Wayne Schuller.
Once split-out, some modifications to the structures and functions to
make a cleaner more useful API, hopefully. Rather extensive changes have
propogated to other modules.
* src/paper.h:
* src/paper.c:
* src/template.h:
* src/template.c:
* src/xml-paper.h:
* src/xml-paper.c:
* src/xml-template.h:
* src/xml-template.c:
* src/xml.h:
* src/xml.c:
These files have been moved to libglabels/. API cleanup performed.
* libglabels/libglabels.h:
* libglabels/libglabels-private.h:
* libglabels/Makefile.am:
These files have been added to finish out libglabels.
* Makefile.am:
* configure.in:
* glabels.spec.in:
* po/POTFILES.in:
* src/Makefile.am:
Modified to reflect new sets of files in src/ and libglabels/.
* COPYING.LIBGLABELS:
* COPYING-DOCS:
Added copy of the LGPL for libglabels, and a copy the GFDL for
documentation.
Jim Evins [Sun, 4 Jan 2004 04:18:02 +0000 (04:18 +0000)]
2004-01-03 Jim Evins <evins@snaught.com>
* AUTHORS:
Added acknowledgement of contributions by Wayne Schuller.
* src/commands.c: (gl_cmd_file_print):
Create extra reference to print dialog, so that it can be properly re-used.
* src/mygal/mygal-combo-box.h:
* src/mygal/mygal-combo-box.c:
(mygal_combo_box_popup_hide_unconditional),
(mygal_combo_box_popup_display), (mygal_combo_box_set_display),
(gtk_combo_set_tearoff_state), (mygal_combo_box_construct),
(mygal_combo_box_set_arrow_relief), (mygal_combo_box_set_title),
(mygal_combo_box_set_tearable):
Changed all occurances of GTK_IS_COMBO_BOX to MYGAL_IS_COMBO_BOX, to
complete the rename of this widget to prevent namespace collisions
with Gtk+-2.3.
* src/prefs-dialog.glade:
Fixed alignment of Fill/Color widgets.
Jim Evins [Sat, 3 Jan 2004 20:50:54 +0000 (20:50 +0000)]
2004-01-03 Jim Evins <evins@snaught.com>
* pixmaps/ex-rect-size.png:
* pixmaps/ex-round-size.png:
* pixmaps/ex-cd-size.png:
* pixmaps/Makefile.am:
Added ex-rect-size.png, ex-round-size.png, and ex-cd-size.png image
files to be used as illustrations/examples in the template-designer.
* src/template-designer.c: (construct_rect_size_page),
(construct_round_size_page), (construct_cd_size_page),
(construct_nlayouts_page), (rect_size_page_prepare_cb),
(round_size_page_prepare_cb), (cd_size_page_prepare_cb),
(layout_page_prepare_cb), (build_template):
* src/template-designer.glade:
Added illustrations for rectangle, round, and cd label size pages.
Added margin spinboxes to these pages, and now add a margin markup
to the constructed template. Added realistic default values for
some of the size spinboxes. Cleaned up the code for setting spinbox
ranges on the layouts page.
* src/view-text.c: (construct_properties_editor),
(update_object_from_editor_cb),
(update_object_from_editor_size_cb):
Track size changes from object editor separately from other
properties. This is so the default size (0,0) of a text
object is not modified unintentionally.
Jim Evins [Tue, 30 Dec 2003 05:41:48 +0000 (05:41 +0000)]
2003-12-30 Jim Evins <evins@snaught.com>
* src/template-designer.c:
* src/template-designer.h:
* src/template-designer.glade:
New template designer assistant.
* po/POTFILES.in:
* src/Makefile.am:
Added entries for src/template-designer.* files.
* pixmaps/ex-1layout.png
* pixmaps/ex-2layouts.png
* pixmaps/Makefile.am:
Added the new image files ex-*.png used as illustrations in the
template designer assistant.
* src/print-dialog.h:
* src/print-dialog.c: (gl_print_dialog_finalize),
(gl_print_dialog_new), (gl_print_dialog_construct),
(gl_print_dialog_force_outline_flag):
Changed first argument of gl_print_dialog_new() from glView to glLabel,
to support printing from the template designer assistant which does not
have a full-fledged view. Nothing else from the view object was being
used by the dialog anyway.
Added the gl_print_dialog_force_outline_flag() method, for better
integration with the template designer assistant.
* src/commands.h:
* src/commands.c: (gl_cmd_file_template_designer),
(gl_cmd_file_print):
Modified print command to provide label instead of view to dialog.
Added the gl_cmd_file_template_designer() command to invoke the
template designer assistant.
* src/ui.c:
* src/glabels-ui.xml:
Added support for template designer assistant.
* src/wdgt-mini-preview.h:
* src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_set_template),
(gl_wdgt_mini_preview_set_bg_color):
Preview is now centered in canvas. Added
gl_wdgt_mini_preview_set_bg_color() to allow the template designer
assistant to match the background color with its own.
* src/print.c: (clip_to_outline):
Fixed really stupid bug when adding waste to clip region of rectangular
labels/cards. Each side of the clip region needs to be extended by
twice the waste margin, as well as negatively offset by the waste
margin.
Jim Evins [Sun, 28 Dec 2003 20:20:23 +0000 (20:20 +0000)]
2003-12-28 Jim Evins <evins@snaught.com>
* src/prefs-dialog.c: (update_object_page_from_prefs):
Block intermediary function align_toggle_cb() instead of
update_prefs_from_object_page() for the three alignment
widgets.
Jim Evins [Sun, 28 Dec 2003 00:29:36 +0000 (00:29 +0000)]
2003-12-27 Jim Evins <evins@snaught.com>
* configure.in:
Updated to work with latest gnome-common package from CVS.
Removed recursive configuration of barcode-0.98.
* acconfig.h:
* macros/*:
Removed.
* Makefile.am:
Added barcode-0.98/ as a SUBDIR, and removed dist-hook.
* barcode-0.98/Makefile.in:
* barcode-0.98/configure.in:
* barcode-0.98/Makefile.am:
* barcode-0.98/README.glabels:
Modified to ignore the barcode package's build system, and build
as a part of glabels.
Renamed Makefile.in to Makefile.in.dist.
Renamed configure.in to configure.in.dist.
Added barcode-0.98/Makefile.am and barcode-0.98/README.glabels.
* src/Makefile.am:
* src/mygal/Makefile.am:
* src/recent-files/Makefile.am:
In order to build against the GNOME 2.5 platform,
all use of *_DISABLE_DEPRECATED compile-time flags has been removed.
* src/mygal/Makefile.am:
* src/mygal/mygal-combo-box.c:
* src/mygal/mygal-combo-box.h:
* src/mygal/widget-color-combo.c:
* src/mygal/widget-color-combo.h:
* po/POTFILES.in:
In order to build against the GNOME 2.5 platform,
Renamed gtk_combo_box widget to mygal_combo_box, to prevent namespace
collisions with the real gtk_combo_box widget, now a part of gtk.
Jim Evins [Sun, 28 Dec 2003 00:19:55 +0000 (00:19 +0000)]
2003-12-27 Jim Evins <evins@snaught.com>
* configure.in:
Updated to work with latest gnome-common package from CVS.
Removed recursive configuration of barcode-0.98.
* acconfig.h:
* macros/*:
Removed.
* Makefile.am:
Added barcode-0.98/ as a SUBDIR, and removed dist-hook.
* barcode-0.98/Makefile.in:
* barcode-0.98/configure.in:
* barcode-0.98/Makefile.am:
* barcode-0.98/README.glabels:
Modified to ignore the barcode package's build system, and build
as a part of glabels.
Renamed Makefile.in to Makefile.in.dist.
Renamed configure.in to configure.in.dist.
Added barcode-0.98/Makefile.am and barcode-0.98/README.glabels.
* src/Makefile.am:
* src/mygal/Makefile.am:
* src/recent-files/Makefile.am:
In order to build against the GNOME 2.5 platform,
all use of *_DISABLE_DEPRECATED compile-time flags has been removed.
* src/mygal/Makefile.am:
* src/mygal/mygal-combo-box.c:
* src/mygal/mygal-combo-box.h:
* src/mygal/widget-color-combo.c:
* src/mygal/widget-color-combo.h:
* po/POTFILES.in:
In order to build against the GNOME 2.5 platform,
Renamed gtk_combo_box widget to mygal_combo_box, to prevent namespace
collisions with the real gtk_combo_box widget, now a part of gtk.
Jim Evins [Sun, 28 Dec 2003 00:13:29 +0000 (00:13 +0000)]
2003-12-27 Jim Evins <evins@snaught.com>
* configure.in:
Updated to work with latest gnome-common package from CVS.
Removed recursive configuration of barcode-0.98.
* acconfig.h:
* macros/*:
Removed.
* Makefile.am:
Added barcode-0.98/ as a SUBDIR, and removed dist-hook.
* barcode-0.98/Makefile.in:
* barcode-0.98/configure.in:
* barcode-0.98/Makefile.am:
* barcode-0.98/README.glabels:
Modified to ignore the barcode package's build system, and build
as a part of glabels.
Renamed Makefile.in to Makefile.in.dist.
Renamed configure.in to configure.in.dist.
Added barcode-0.98/Makefile.am and barcode-0.98/README.glabels.
* src/Makefile.am:
* src/mygal/Makefile.am:
* src/recent-files/Makefile.am:
In order to build against the GNOME 2.5 platform,
all use of *_DISABLE_DEPRECATED compile-time flags has been removed.
* src/mygal/Makefile.am:
* src/mygal/mygal-combo-box.c:
* src/mygal/mygal-combo-box.h:
* src/mygal/widget-color-combo.c:
* src/mygal/widget-color-combo.h:
* po/POTFILES.in:
In order to build against the GNOME 2.5 platform,
Renamed gtk_combo_box widget to mygal_combo_box, to prevent namespace
collisions with the real gtk_combo_box widget, now a part of gtk.
Jim Evins [Sat, 27 Dec 2003 04:33:08 +0000 (04:33 +0000)]
2003-12-26 Jim Evins <evins@snaught.com>
* src/paper.c:
* src/template.c:
* src/util.c:
* src/util.h:
Moved local versions of get_home_data_dir() in paper.c and
template.c to util package. Cleaned up formatting in
util.[ch].
* src/template.c:
In gl_template_register() save a copy of the template in
~/.glabels if the template is not known. Still need to
handle duplicate filename case and duplicate name but
different template case.
* src/xml-label.c:
* src/xml.h:
Moved local definition of NAME_SPACE macro from xml-label.c
to xml.h.
* src/xml-template.c:
* src/xml-template.h:
Added function gl_xml_template_write_template_to_file(), used
in gl_template_register().
Jim Evins [Fri, 26 Dec 2003 06:56:12 +0000 (06:56 +0000)]
When looking up templates by name and name isn't found, return
first template instead of NULL (suggested by Wayne Schuller <k_wayne@linuxpower.org>). In addition, added code to register templates (make known, if not already known) when they are encountered when reading a label.
Jim Evins [Fri, 19 Dec 2003 05:21:02 +0000 (05:21 +0000)]
Created 2 methods for setting label for mini-preview widget. The first is "by name" and the second is by template. This second method allows us to use a label's local template, even if its name is not an exact match with an existing template's -- can occur if templates are renamed between versions or if a label uses someone else's custom template.
Jim Evins [Wed, 17 Dec 2003 00:30:21 +0000 (00:30 +0000)]
Modifications to track properties of selected objects. This addresses Bug #839801. Patch provided by Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>.
Jim Evins [Fri, 12 Dec 2003 03:22:14 +0000 (03:22 +0000)]
Removed some artifacts in copy() method. In particular a g_free() on an unitialized automatic variable was removed, which caused a copy/paste of a text object to segfault (See bug #857773).
Jim Evins [Sat, 6 Dec 2003 14:49:16 +0000 (14:49 +0000)]
- Changed gl_prefs from a simple structure to a full-fledged object (prefs_model).
- Moved prefs_init after paper_init so that page size proof reading code in prefs_model_load_settings works properly.
Jim Evins [Sat, 29 Nov 2003 03:34:01 +0000 (03:34 +0000)]
Delay doing a gtk_widget_show on notebook until it is known if any pages are visible or not. Doing the show on a notebook with all hidden pages causes a crash on Fedora Core 1/Gnome 2.4.
Jim Evins [Thu, 27 Nov 2003 06:27:43 +0000 (06:27 +0000)]
Created generic "get" methods for text, fill and line properties for all label objects. This will make it easier to track changes in a general view such as the property toolbar.
Jim Evins [Wed, 26 Nov 2003 01:12:23 +0000 (01:12 +0000)]
Modified zoom code:
- Now keeps track of zoom levels, rather than screen scale
- Calculates home scale from screen DPI
- View size changes are tracked, and if selected zoom_to_fit is maintained.
- New windows default to zoom_to_fit.
- Tracks changes in screen, so that new home scale can be updated
Jim Evins [Mon, 24 Nov 2003 03:44:28 +0000 (03:44 +0000)]
Changed object property dialogs to a single object property editor sidebar.
Added zoom to fit command.
Converted object property editor and preferences dialog to use libglade and removed un-needed widgets.
Jim Evins [Sat, 15 Nov 2003 13:50:29 +0000 (13:50 +0000)]
Added "break" in draw_markup_layer between line and circle cases of switch. This fixes Bug #842705. This is also the 2nd time I have fixed this bug -- I must of neglected to check it in.
projects / glabels / log