]>
git.sur5r.net Git - glabels/log
Jim Evins [Mon, 5 Oct 2009 23:58:50 +0000 (19:58 -0400)]
Adding glabels.doap
Adding glabels.doap file for gnome Git repository.
Mario Blättermann [Tue, 29 Sep 2009 17:56:01 +0000 (19:56 +0200)]
Removed non-existent filenames from po/POTFILES.in
Mario Blättermann [Tue, 29 Sep 2009 17:55:20 +0000 (19:55 +0200)]
Removed non-existent filenames from po/POTFILES.in
Jim Evins [Tue, 29 Sep 2009 02:25:38 +0000 (22:25 -0400)]
Removed gtk-doc.make.
Removed the gtk-doc.make file, since it gets regenerated anyway.
Jim Evins [Mon, 28 Sep 2009 02:55:52 +0000 (22:55 -0400)]
Relocated barcode backends.
Moved 3rd party barcode backends to a new bc-backends/ subdirectory.
Jim Evins [Sun, 27 Sep 2009 02:46:39 +0000 (22:46 -0400)]
Organized master branch to be top-level directory for glabels, instead of
having a glabels2 sub-directory.
Jim Evins [Wed, 23 Sep 2009 03:41:02 +0000 (03:41 +0000)]
2009-09-22 Jim Evins <evins@snaught.com>
* po/POTFILES.in:
* src/Makefile.am:
* src/builder-util.c:
* src/builder-util.h:
* src/combo-util.c:
* src/combo-util.h:
* src/file-util.c:
* src/file-util.h:
* src/str-util.c:
* src/str-util.h:
Split "catch all" util module into separate modules for different
domains of utilities.
* src/file.c: (gl_file_open_real), (save_as_response):
* src/glabels-batch.c: (main):
* src/label.c: (gl_label_get_short_name):
* src/merge-properties-dialog.c: (gl_merge_properties_dialog_init),
(gl_merge_properties_dialog_construct):
* src/new-label-dialog.c:
* src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page),
(gl_object_editor_set_bc_style), (gl_object_editor_set_bc_color):
* src/object-editor-data-page.c:
(gl_object_editor_prepare_data_page), (gl_object_editor_set_data):
* src/object-editor-edit-page.c:
(gl_object_editor_prepare_edit_page):
* src/object-editor-fill-page.c:
(gl_object_editor_prepare_fill_page),
(gl_object_editor_set_fill_color):
* src/object-editor-image-page.c:
(gl_object_editor_prepare_image_page),
(gl_object_editor_set_image):
* src/object-editor-line-page.c:
(gl_object_editor_prepare_line_page),
(gl_object_editor_set_line_color):
* src/object-editor-lsize-page.c:
(gl_object_editor_prepare_lsize_page):
* src/object-editor-position-page.c:
(gl_object_editor_prepare_position_page):
* src/object-editor-shadow-page.c:
(gl_object_editor_prepare_shadow_page),
(gl_object_editor_set_shadow_color):
* src/object-editor-size-page.c:
(gl_object_editor_prepare_size_page):
* src/object-editor-text-page.c:
(gl_object_editor_prepare_text_page),
(gl_object_editor_set_text_color):
* src/object-editor.c: (gl_object_editor_init),
(gl_object_editor_set_key_names):
* src/prefs-dialog.c: (gl_prefs_dialog_construct),
(construct_locale_page), (construct_object_page):
* src/prefs-model.c: (gl_prefs_model_save_settings),
(gl_prefs_model_load_settings):
* src/print-op-dialog.c: (create_custom_widget_cb):
* src/template-designer.c: (construct_start_page),
(construct_name_page), (construct_pg_size_page),
(construct_shape_page), (construct_rect_size_page),
(construct_round_size_page), (construct_cd_size_page),
(construct_nlayouts_page), (construct_layout_page),
(construct_finish_page):
* src/ui-property-bar.c: (gl_ui_property_bar_construct):
* src/wdgt-media-select.c: (gl_wdgt_media_select_construct),
(gl_wdgt_media_select_set_filter_parameters),
(get_label_size_desc):
* src/window.c: (gl_window_new_from_file):
* src/xml-label-04.c: (xml04_parse_text_props):
* src/xml-label.c: (xml_parse_object_text),
(xml_parse_toplevel_span), (xml_create_object_text),
(xml_create_toplevel_span):
Reconciled all references to old utils module with new domain
specific utilities modules.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@895
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Wed, 23 Sep 2009 01:56:53 +0000 (01:56 +0000)]
2009-09-22 Jim Evins <evins@snaught.com>
* po/POTFILES.in:
Include all (src/*.[ch]) source files.
* data/builder/merge-properties-dialog.builder:
* src/merge-properties-dialog.c: (gl_merge_properties_dialog_init),
(gl_merge_properties_dialog_construct), (type_changed_cb):
- OK button now has default focus.
- Some formatting cleanup.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@894
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 21 Sep 2009 21:02:45 +0000 (21:02 +0000)]
2009-09-21 Jim Evins <evins@snaught.com>
* po/POTFILES.in:
* data/builder/Makefile.am:
* data/builder/new-label-dialog.builder:
Removed trivial builder file for new label dialog.
* data/builder/wdgt-media-select.builder:
Changed focus behavior of widgets.
* src/new-label-dialog.c: (gl_new_label_dialog_init),
(gl_new_label_dialog_construct):
- Removed use of trivial builder file -- populate explicitely.
- Moved population code to init.
- OK button now has default focus.
- Some formatting cleanup.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@893
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Mario Blättermann [Sun, 20 Sep 2009 16:11:26 +0000 (16:11 +0000)]
*po/de.po: Updated German translation
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@892
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 19 Sep 2009 20:38:30 +0000 (20:38 +0000)]
2009-09-19 Jim Evins <evins@snaught.com>
* COPYING:
Updated to GPL3 text.
* COPYING-LIBGLABELS:
Updated to LGPL3 text.
* COPYING-TEMPLATES:
New MIT/X license file for templates subdirectory.
* COPYING.README_FIRST:
Updated licensing information.
* templates/Makefile.am:
* templates/avery-iso-templates.xml:
* templates/avery-other-templates.xml:
* templates/avery-us-templates.xml:
* templates/brother-other-templates.xml:
* templates/categories.xml:
* templates/dymo-other-templates.xml:
* templates/glabels-2.2.dtd:
* templates/misc-iso-templates.xml:
* templates/misc-other-templates.xml:
* templates/misc-us-templates.xml:
* templates/paper-sizes.xml:
* templates/zweckform-iso-templates.xml:
- Added MIT/X license notice to database files.
- Moved from data subdirectory.
* configure.in:
* po/POTFILES.in:
* Makefile.am:
* data/Makefile.am:
Updated to reflect above move.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@891
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 19 Sep 2009 16:56:36 +0000 (16:56 +0000)]
2009-09-19 Jim Evins <evins@snaught.com>
* libglabels/category.c:
* libglabels/category.h:
* libglabels/db.c:
* libglabels/db.h:
* libglabels/enums.h:
* libglabels/libglabels-private.h:
* libglabels/libglabels.h:
* libglabels/paper.c:
* libglabels/paper.h:
* libglabels/str.c:
* libglabels/str.h:
* libglabels/template.c:
* libglabels/template.h:
* libglabels/xml-category.c:
* libglabels/xml-category.h:
* libglabels/xml-paper.c:
* libglabels/xml-paper.h:
* libglabels/xml-template.c:
* libglabels/xml-template.h:
* libglabels/xml.c:
* libglabels/xml.h:
- Cleaned up GTK/GLIB includes.
- Updated license notification to LGPL3+.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@890
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 19 Sep 2009 02:59:50 +0000 (02:59 +0000)]
2009-09-18 Jim Evins <evins@snaught.com>
* po/POTFILES.in:
Added missing file.
* src/mini-preview.h:
* src/mini-preview.c: (gl_mini_preview_class_init),
(gl_mini_preview_finalize), (gl_mini_preview_set_by_name),
(gl_mini_preview_highlight_range), (gl_mini_preview_set_label),
(gl_mini_preview_set_page), (gl_mini_preview_set_n_sheets),
(gl_mini_preview_set_n_copies), (gl_mini_preview_set_first),
(gl_mini_preview_set_last), (gl_mini_preview_set_collate_flag),
(gl_mini_preview_set_outline_flag),
(gl_mini_preview_set_reverse_flag),
(gl_mini_preview_set_crop_marks_flag), (button_release_event_cb),
(expose_event_cb), (redraw), (draw), (draw_labels),
(draw_rich_preview):
Added rich preview capability to mini preview.
* src/print-op-dialog.c: (create_custom_widget_cb),
(simple_sheets_radio_cb), (simple_first_spin_cb),
(simple_last_spin_cb), (preview_pressed_cb), (preview_released_cb),
(merge_spin_cb), (merge_collate_check_cb), (preview_clicked_cb),
(option_toggled_cb):
Use new rich preview capability of mini preview in print dialog.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@889
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Mario Blättermann [Fri, 18 Sep 2009 18:03:26 +0000 (18:03 +0000)]
po/POTFILES.in: Removed name of no longer existant file
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@888
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 18 Sep 2009 01:54:44 +0000 (01:54 +0000)]
2009-09-17 Jim Evins <evins@snaught.com>
* src/stock.c: (add_icons), (add_button_icon):
Use proper free function for GtkIconSource (gtk_icon_source_free() not g_free()).
Patch provided by Christian Persch <chpe@gnome.org>.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@886
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 18 Sep 2009 01:44:09 +0000 (01:44 +0000)]
2009-09-17 Jim Evins <evins@snaught.com>
* libglabels/category.h:
* libglabels/db.h:
* libglabels/paper.h:
* libglabels/template.h:
* libglabels/xml-category.h:
* libglabels/xml-paper.h:
* libglabels/xml.h:
Cleaned up GTK/GLIB includes.
* src/bc-gnubarcode.c:
* src/bc-gnubarcode.h:
* src/bc-iec16022.c:
* src/bc-iec16022.h:
* src/bc-iec18004.c:
* src/bc-iec18004.h:
* src/bc-postnet.c:
* src/bc-postnet.h:
* src/bc.c:
* src/bc.h:
* src/cairo-ellipse-path.c:
* src/cairo-ellipse-path.h:
* src/cairo-label-path.c:
* src/cairo-label-path.h:
* src/cairo-markup-path.c:
* src/cairo-markup-path.h:
* src/color-combo-button.c:
* src/color-combo-button.h:
* src/color-combo-color-menu-item.c:
* src/color-combo-color-menu-item.h:
* src/color-combo-history.c:
* src/color-combo-menu.c:
* src/color-combo-menu.h:
* src/color-combo.c:
* src/color-combo.h:
* src/color-swatch.c:
* src/color-swatch.h:
* src/color.c:
* src/color.h:
* src/critical-error-handler.c:
* src/critical-error-handler.h:
* src/debug.c:
* src/debug.h:
* src/file.c:
* src/file.h:
* src/font-combo-menu-item.c:
* src/font-combo-menu-item.h:
* src/font-combo-menu.c:
* src/font-combo-menu.h:
* src/font-combo.c:
* src/font-combo.h:
* src/font-sample.h:
* src/font-util.c:
* src/font-util.h:
* src/glabels-batch.c:
* src/glabels.c:
* src/hig.h:
* src/label-barcode.c:
* src/label-barcode.h:
* src/label-box.c:
* src/label-box.h:
* src/label-ellipse.c:
* src/label-ellipse.h:
* src/label-image.c:
* src/label-image.h:
* src/label-line.c:
* src/label-line.h:
* src/label-object.c:
* src/label-object.h:
* src/label-text.c:
* src/label-text.h:
* src/label.c:
* src/label.h:
* src/merge-evolution.c:
* src/merge-evolution.h:
* src/merge-init.c:
* src/merge-init.h:
* src/merge-properties-dialog.c:
* src/merge-properties-dialog.h:
* src/merge-text.c:
* src/merge-text.h:
* src/merge-vcard.c:
* src/merge-vcard.h:
* src/merge.c:
* src/merge.h:
* src/mini-label-preview.c:
* src/mini-label-preview.h:
* src/mini-preview-pixbuf-cache.c:
* src/mini-preview-pixbuf-cache.h:
* src/mini-preview-pixbuf.c:
* src/mini-preview-pixbuf.h:
* src/mini-preview.c:
* src/new-label-dialog.c:
* src/new-label-dialog.h:
* src/object-editor-bc-page.c:
* src/object-editor-data-page.c:
* src/object-editor-fill-page.c:
* src/object-editor-image-page.c:
* src/object-editor-line-page.c:
* src/object-editor-lsize-page.c:
* src/object-editor-position-page.c:
* src/object-editor-private.h:
* src/object-editor-shadow-page.c:
* src/object-editor-size-page.c:
* src/object-editor-text-page.c:
* src/object-editor.c:
* src/object-editor.h:
* src/pixbuf-cache.c:
* src/pixbuf-cache.h:
* src/prefs-dialog.c:
* src/prefs-dialog.h:
* src/prefs-model.c:
* src/prefs-model.h:
* src/prefs.c:
* src/prefs.h:
* src/print-op-dialog.c:
* src/print-op.c:
* src/print-op.h:
* src/print.c:
* src/print.h:
* src/recent.c:
* src/recent.h:
* src/rotate-label-button.c:
* src/rotate-label-button.h:
* src/stock.c:
* src/stock.h:
* src/template-designer.c:
* src/template-designer.h:
* src/text-node.c:
* src/text-node.h:
* src/ui-commands.c:
* src/ui-commands.h:
* src/ui-property-bar.c:
* src/ui-property-bar.h:
* src/ui-sidebar.c:
* src/ui-sidebar.h:
* src/ui-util.c:
* src/ui-util.h:
* src/ui.c:
* src/ui.h:
* src/util.c:
* src/util.h:
* src/view-barcode.c:
* src/view-barcode.h:
* src/view-box.c:
* src/view-box.h:
* src/view-ellipse.c:
* src/view-ellipse.h:
* src/view-image.c:
* src/view-image.h:
* src/view-line.c:
* src/view-line.h:
* src/view-object.c:
* src/view-object.h:
* src/view-text.c:
* src/view-text.h:
* src/view.c:
* src/view.h:
* src/warning-handler.c:
* src/warning-handler.h:
* src/wdgt-chain-button.c:
* src/wdgt-chain-button.h:
* src/wdgt-media-select.c:
* src/wdgt-media-select.h:
* src/wdgt-merge-menu.c:
* src/wdgt-merge-menu.h:
* src/window.c:
* src/window.h:
* src/xml-label-04.c:
* src/xml-label-04.h:
* src/xml-label.c:
* src/xml-label.h:
Cleaned up GTK/GLIB includes.
Updated remainder of notices to GPL3+.
Simple formatting cleanup.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@885
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Mario Blättermann [Wed, 16 Sep 2009 19:41:14 +0000 (19:41 +0000)]
de.po: Updated German translation
POTFILES.in: Removed filenames which are no longer available
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@884
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 13 Sep 2009 05:00:03 +0000 (05:00 +0000)]
2009-09-13 Jim Evins <evins@snaught.com>
Refactored print operation subsystem.
* src/print-op.c:
* src/print-op.h:
Basic GtkPrintOperation based class. Does not instantiate
custom widgets, so it can be used by glabels-batch without
the additional overhead.
* src/print-op-dialog.c:
* src/print-op-dialog.h:
New object derived from glPrintOp. This one is intended
to be used as a dialog and installs custom widgets.
glWdgtPrintCopies and glWdgtPrintMerge have been merged
into this object.
* src/wdgt-print-copies.c:
* src/wdgt-print-copies.h:
* src/wdgt-print-merge.c:
* src/wdgt-print-merge.h:
Deleted.
* src/Makefile.am:
Modified to reflect above additions and deletions.
* src/mini-preview.c: (gl_mini_preview_construct),
(gl_mini_preview_set_template), (set_transform_and_get_scale),
(button_press_event_cb), (motion_notify_event_cb), (draw):
Now scales with allocation.
* src/glabels-batch.c: (main):
* src/template-designer.c: (print_test_cb):
* src/ui-commands.c: (gl_ui_cmd_file_print):
Use above modifications.
* data/builder/print-op-dialog-custom-widget.builder:
New builder file for glPrintOpDialog custom widgets.
* data/builder/print-custom-widget.builder:
Deleted.
* data/builder/Makefile.am:
Modified to reflect above addition and deletion.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@883
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 11 Sep 2009 02:14:58 +0000 (02:14 +0000)]
2009-09-10 Jim Evins <evins@snaught.com>
* src/Makefile.am:
* src/mini-label-preview.c:
* src/mini-label-preview.h:
Created new glMiniLabelPreview widget to support glRotateLabelButton.
* src/rotate-label-button.c:
* src/rotate-label-button.h:
Renamed glWdgtRotateLabel to glRotateLabelButton.
* src/new-label-dialog.c: (gl_new_label_dialog_construct),
(template_changed_cb), (gl_new_label_dialog_get_rotate_state),
(gl_new_label_dialog_set_rotate_state):
Propogated above renaming.
* src/mini-preview.c: (gl_mini_preview_set_template), (draw),
(draw_shadow), (draw_paper), (draw_labels):
Use GtkStyle for colors instead of hardcoded ones.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@882
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Thu, 10 Sep 2009 02:42:25 +0000 (02:42 +0000)]
2009-09-09 Jim Evins <evins@snaught.com>
* configure.in:
* Makefile.am:
* src/Makefile.am:
* src/stock-pixmaps/Makefile.am:
* qrencode-3.1.0/Makefile.am
* data/desktop/glabels.desktop.in:
* docs/libglabels/libglabels-decl-list.txt:
Various build system fixes and cleanup.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@880
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Wed, 9 Sep 2009 02:16:13 +0000 (02:16 +0000)]
2009-09-08 Jim Evins <evins@snaught.com>
* src/font-util.c: (gl_font_util_validate_family):
* src/font-util.h:
Added gl_font_util_validate_family().
* src/font-combo.c: (gl_font_combo_class_init),
(gl_font_combo_new), (gl_font_combo_set_family):
Use gl_font_util_validate_family() when setting family.
* src/label-text.c: (set_font_family):
* src/prefs-dialog.c: (construct_object_page),
(update_object_page_from_prefs):
* src/ui-property-bar.c: (gl_ui_property_bar_construct),
(reset_to_default_properties):
* src/object-editor-text-page.c:
(gl_object_editor_prepare_text_page),
(gl_object_editor_set_font_family):
Removed code obsoleted by the addition of gl_font_util_validate_family().
* src/color-swatch.c: (gl_color_swatch_class_init), (style_set_cb),
(draw_swatch):
* src/font-sample.c: (gl_font_sample_class_init), (style_set_cb),
(draw_sample):
Added handler for style_set event.
* src/color-combo-button.c: (gl_color_combo_button_class_init):
* src/color-combo-color-menu-item.c:
(gl_color_combo_color_menu_item_class_init):
* src/color-combo-history.c: (gl_color_combo_history_class_init):
* src/color-combo-menu.c: (map_event_cb):
* src/color-combo.c: (gl_color_combo_class_init),
(gl_color_combo_new):
* src/font-combo-menu-item.c: (gl_font_combo_menu_item_class_init):
* src/font-combo-menu.c: (gl_font_combo_menu_class_init):
* src/wdgt-rotate-label.c: (create_pixbuf):
Various cleanups -- mostly removing unused variables.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@877
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Mario Blättermann [Tue, 8 Sep 2009 17:55:18 +0000 (17:55 +0000)]
Updated German doc translation, added screenshots
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@876
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Tue, 8 Sep 2009 03:22:09 +0000 (03:22 +0000)]
2009-09-07 Jim Evins <evins@snaught.com>
Created new glFontCombo widget family subsystem + minor refinements to glColorCombo
widget family.
* src/color-combo-button.c:
* src/color-combo-button.h:
Renamed ColorButton to ColorComboButton.
* src/color.h:
Added GL_COLOR_WHITE macro.
* src/color-combo.c: (gl_color_combo_init):
Minor cleanup.
* src/Makefile.am:
* src/font-combo.c:
* src/font-combo.h:
* src/font-combo-menu.c:
* src/font-combo-menu.h:
* src/font-combo-menu-item.c:
* src/font-combo-menu-item.h:
* src/font-sample.c:
* src/font-sample.h:
* src/font-util.c:
* src/font-util.h:
New FontCombo subsystem.
* src/util.c:
* src/util.h:
Moved font functions to font-util.[ch].
* data/builder/object-editor.builder:
* data/builder/prefs-dialog.builder:
* data/builder/property-bar.builder:
* src/label-text.c: (set_font_family):
* src/object-editor-private.h:
* src/object-editor-text-page.c:
(gl_object_editor_prepare_text_page),
(gl_object_editor_set_font_family),
(gl_object_editor_get_font_family):
* src/prefs-dialog.c: (construct_object_page),
(update_object_page_from_prefs), (update_prefs_from_object_page):
* src/ui-property-bar.c: (gl_ui_property_bar_construct),
(reset_to_default_properties), (update_text_properties),
(update_fill_color), (update_line_color), (font_family_changed_cb),
(text_color_changed_cb), (fill_color_changed_cb),
(line_color_changed_cb):
Incorporated new FontCombo subsystem.
* po/POTFILES.in:
Reconciled with above changes/additions.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@872
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 6 Sep 2009 20:49:21 +0000 (20:49 +0000)]
2009-09-06 Jim Evins <evins@snaught.com>
* src/color-button.c: (gl_color_button_finalize):
Unreference menu in finalize.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@871
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 6 Sep 2009 20:36:04 +0000 (20:36 +0000)]
Added link to glabels-commit mail list.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@870
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 6 Sep 2009 04:52:05 +0000 (04:52 +0000)]
2009-09-06 Jim Evins <evins@snaught.com>
Some major refinements to the glColorCombo family of widgets.
* src/Makefile.am:
* src/color-button.c:
* src/color-button.h:
New widget: glColorButton. This widget is a button that applies
the currently selected color with a ColorCombo type dropdown button
to change that selected color. This is basically the old
glColorCombo widget.
* src/color-combo.c: (gl_color_combo_init),
(gl_color_combo_finalize), (gl_color_combo_new),
(button_press_event_cb), (menu_color_changed_cb),
(menu_selection_done_cb):
* src/color-combo.h:
The glColorCombo widget has been modified to be a single button
that is only used to change the selected color.
* src/color-swatch.c: (gl_color_swatch_init), (expose_event_cb):
Draw on parent containers window to allow an effective
transparency.
* src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page):
* src/object-editor-fill-page.c:
(gl_object_editor_prepare_fill_page):
* src/object-editor-line-page.c:
(gl_object_editor_prepare_line_page):
* src/object-editor-shadow-page.c:
(gl_object_editor_prepare_shadow_page):
* src/object-editor-text-page.c:
(gl_object_editor_prepare_text_page):
* src/prefs-dialog.c: (construct_object_page):
Change how ColorCombos are packed so that they don't
expand to fill hbox.
* src/ui-property-bar.c: (gl_ui_property_bar_construct),
(reset_to_default_properties), (update_text_properties),
(update_fill_color), (update_line_color), (text_color_changed_cb),
(fill_color_changed_cb), (line_color_changed_cb),
(set_doc_items_sensitive), (set_text_items_sensitive),
(set_fill_items_sensitive), (set_line_color_items_sensitive):
The property bar now uses the new glColorButton instead of
glColorCombo.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@869
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Thu, 3 Sep 2009 02:47:51 +0000 (02:47 +0000)]
2009-09-02 Jim Evins <evins@snaught.com>
* src/Makefile.am:
* src/wdgt-mini-preview.c:
* src/wdgt-mini-preview.h:
* src/mini-preview.h:
* src/mini-preview.c:
- Renamed WdgtMiniPreview to MiniPreview.
- Style cleanup.
- Modified to draw to parent window to be effectively transparent.
- Updated license notification to gpl3+.
* src/template-designer.c: (construct_layout_page),
(layout_page_prepare_cb), (layout_page_changed_cb):
* src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct),
(sheets_radio_cb), (first_spin_cb), (last_spin_cb),
(preview_pressed):
* src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct),
(spin_cb), (preview_clicked), (gl_wdgt_print_merge_set_copies):
- Reconciled with rename above.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@868
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Wed, 2 Sep 2009 01:01:38 +0000 (01:01 +0000)]
2009-09-01 Jim Evins <evins@snaught.com>
* data/builder/object-editor.builder:
Fixed errant expansion of tab.
* src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new):
* src/bc-postnet.c: (gl_barcode_postnet_new):
* src/bc.c: (id_to_index), (name_to_index):
* src/label-barcode.c: (gl_label_barcode_set_props):
* src/label-text.c: (set_font_family):
* src/merge-properties-dialog.c:
(gl_merge_properties_dialog_construct):
* src/merge.c: (gl_merge_description_to_name):
* src/new-label-dialog.c:
* src/object-editor-edit-page.c:
* src/object-editor-image-page.c: (update_preview_cb):
* src/object-editor-lsize-page.c:
* src/object-editor-position-page.c:
* src/object-editor-size-page.c:
* src/object-editor.c: (gl_object_editor_new):
* src/prefs-dialog.c: (update_locale_page_from_prefs):
* src/prefs-model.c: (string_to_units):
* src/print-op.c: (create_custom_widget_cb):
* src/template-designer.c: (gl_template_designer_init),
(pg_size_page_changed_cb), (build_template):
* src/ui-commands.c: (gl_ui_cmd_help_about):
* src/xml-label.c: (xml_parse_pixdata):
Fixed various deprecations as of Gtk-2.16.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@867
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Wed, 2 Sep 2009 00:58:44 +0000 (00:58 +0000)]
Adding missing Changelog and removed files that should not have been checked in.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@866
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Tue, 1 Sep 2009 02:50:37 +0000 (02:50 +0000)]
2009-08-31 Jim Evins <evins@snaught.com>
* po/fr.po:
Updated french translation (Claude Paroz)
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@865
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Tue, 1 Sep 2009 02:25:51 +0000 (02:25 +0000)]
2009-08-31 Jim Evins <evins@snaught.com>
* data/builder/property-bar.builder:
Make sure event box does not obscure tool bar background.
* src/Makefile.am:
* src/color-swatch.c:
* src/color-swatch.h:
New color swatch widget.
* src/color-combo-color-menu-item.c:
(gl_color_combo_color_menu_item_init),
(gl_color_combo_color_menu_item_new),
(gl_color_combo_color_menu_item_set_color):
* src/color-combo.c: (gl_color_combo_init),
(gl_color_combo_finalize), (gl_color_combo_new),
(gl_color_combo_set_color), (menu_color_changed_cb):
Updated to use new color swatch widget.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@863
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Thu, 27 Aug 2009 02:51:29 +0000 (02:51 +0000)]
2009-08-26 Jim Evins <evins@snaught.com>
* po/POTFILES.in:
Explicitely mark file types. Removed unneeded file from
libbarcode.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@862
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 23 Aug 2009 15:08:34 +0000 (15:08 +0000)]
2009-08-23 Jim Evins <evins@snaught.com>
* data/builder/Makefile.am:
* data/builder/merge-properties-dialog.builder:
* data/builder/merge-properties-dialog.glade:
* data/builder/new-label-dialog.builder:
* data/builder/new-label-dialog.glade:
* data/builder/object-editor.builder:
* data/builder/object-editor.glade:
* data/builder/prefs-dialog.builder:
* data/builder/prefs-dialog.glade:
* data/builder/print-custom-widget.builder:
* data/builder/print-custom-widget.glade:
* data/builder/property-bar.builder:
* data/builder/property-bar.glade:
* data/builder/template-designer.builder:
* data/builder/template-designer.glade:
* data/builder/wdgt-media-select.builder:
* data/builder/wdgt-media-select.glade:
* po/POTFILES.in:
* src/merge-properties-dialog.c:
(gl_merge_properties_dialog_finalize),
(gl_merge_properties_dialog_construct):
* src/new-label-dialog.c: (gl_new_label_dialog_finalize),
(gl_new_label_dialog_construct):
* src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page):
* src/object-editor-data-page.c:
(gl_object_editor_prepare_data_page):
* src/object-editor-edit-page.c:
(gl_object_editor_prepare_edit_page):
* src/object-editor-fill-page.c:
(gl_object_editor_prepare_fill_page):
* src/object-editor-image-page.c:
(gl_object_editor_prepare_image_page):
* src/object-editor-line-page.c:
(gl_object_editor_prepare_line_page):
* src/object-editor-lsize-page.c:
(gl_object_editor_prepare_lsize_page):
* src/object-editor-position-page.c:
(gl_object_editor_prepare_position_page):
* src/object-editor-private.h:
* src/object-editor-shadow-page.c:
(gl_object_editor_prepare_shadow_page):
* src/object-editor-size-page.c:
(gl_object_editor_prepare_size_page):
* src/object-editor-text-page.c:
(gl_object_editor_prepare_text_page):
* src/object-editor.c: (gl_object_editor_init),
(gl_object_editor_finalize):
* src/prefs-dialog.c: (gl_prefs_dialog_init),
(gl_prefs_dialog_finalize), (gl_prefs_dialog_construct),
(construct_locale_page), (construct_object_page):
* src/print-op.c: (gl_print_op_finalize),
(gl_print_op_set_settings), (create_custom_widget_cb):
* src/template-designer.c: (gl_template_designer_init),
(gl_template_designer_finalize), (construct_start_page),
(construct_name_page), (construct_pg_size_page),
(construct_shape_page), (construct_rect_size_page),
(construct_round_size_page), (construct_cd_size_page),
(construct_nlayouts_page), (construct_layout_page),
(construct_finish_page):
* src/ui-property-bar.c: (gl_ui_property_bar_finalize),
(gl_ui_property_bar_construct):
* src/wdgt-media-select.c: (gl_wdgt_media_select_finalize),
(gl_wdgt_media_select_construct):
Builder files no longer built from glade files. Also did some
cleanup on formatting and update license notifications to GPL3+.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@861
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 14 Aug 2009 02:53:53 +0000 (02:53 +0000)]
2009-08-13 Jim Evins <evins@snaught.com>
* src/color-combo-color-menu-item.c:
(gl_color_combo_color_menu_item_init),
(gl_color_combo_color_menu_item_new),
(gl_color_combo_color_menu_item_set_color):
Explicitly request size of menu item and enlarge color swatch.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@860
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 14 Aug 2009 00:45:24 +0000 (00:45 +0000)]
Fixed typo in header.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@859
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Wed, 12 Aug 2009 18:59:13 +0000 (18:59 +0000)]
2009-08-12 Jim Evins <evins@snaught.com>
* src/label-text.c: (buffer_changed_cb), (draw_object),
(draw_shadow), (draw_text_real):
* src/label-text.h:
Moved common code from draw_object() and draw_shadow() to
draw_text_real(). Also cleaned up formatting and updated
license notification to GPL3+.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@858
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Alexandre Prokoudine [Wed, 29 Jul 2009 16:18:24 +0000 (16:18 +0000)]
Updated and fixed Russian translation
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@857
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 27 Jul 2009 02:49:57 +0000 (02:49 +0000)]
2009-07-26 Jim Evins <evins@snaught.com>
* AUTHORS:
* COPYING.README_FIRST:
* Makefile.am:
* configure.in:
* qrencode-3.1.0/*
Added 3rd party qrencode library.
* src/Makefile.am:
* src/bc-iec18004.c: (gl_barcode_iec18004_new), (render_iec18004):
* src/bc-iec18004.h:
* src/bc.c:
Added IEC18004 (QRCode) 2 dimensional barcode backend.
Patch provided by Daniel Mueller <daniel@danm.de>.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@856
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 26 Jul 2009 03:43:22 +0000 (03:43 +0000)]
2009-07-25 Jim Evins <evins@snaught.com>
* src/xml-label.c: (gl_xml_label_open):
Relax limits when parsing file. Allows large embedded image
files.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@855
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 20 Jul 2009 02:41:10 +0000 (02:41 +0000)]
Added compiling-from-source directions.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@854
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Wed, 20 May 2009 00:54:25 +0000 (00:54 +0000)]
2009-05-19 Jim Evins <evins@purple>
* configure.in:
* po/LINGUAS:
Moved translation list from configure.in to po/LINGUAS.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@852
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Wed, 20 May 2009 00:41:05 +0000 (00:41 +0000)]
2009-05-19 Jim Evins <evins@snaught.com>
* configure.in:
* po/zh_CN.po:
New Chinese translation (Careon <zzbusagain@yahoo.com.cn>).
* AUTHORS:
Added above translation to acknowledgements.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@851
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 18 May 2009 04:15:44 +0000 (04:15 +0000)]
2009-05-18 Jim Evins <evins@snaught.com>
* src/prefs-model.c: (gl_prefs_model_load_settings):
Make an educated guess at locale settings when run for the
first time.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@849
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 18 May 2009 03:40:53 +0000 (03:40 +0000)]
2009-05-17 Jim Evins <evins@snaught.com>
* help/de/de.po:
* help/glabels.omf.in:
Adding missing files from last checkin.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@846
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 18 May 2009 03:33:09 +0000 (03:33 +0000)]
2009-05-17 Jim Evins <evins@snaught.com>
* Makefile.am:
* configure.in:
* help/C/glabels-C.omf:
* help/C/glabels.xml:
* help/Makefile.am:
* po/de.po:
Updated german translation, gnome-doc-utils support and
german translation of glabels manual (Mario Blättermann).
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@845
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 2 May 2009 03:28:09 +0000 (03:28 +0000)]
2009-05-01 Jim Evins <evins@purple>
* AUTHORS:
* configure.in:
* po/ca.po:
Added catalan translation (David Planella).
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@843
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Thu, 30 Apr 2009 01:47:43 +0000 (01:47 +0000)]
2009-04-29 Jim Evins <evins@purple>
* data/templates/avery-iso-templates.xml:
* data/templates/misc-iso-templates.xml:
* data/templates/misc-us-templates.xml:
Caught up on user submitted templates.
* AUTHORS:
Acknowledgements for above templates.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@838
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Thu, 30 Apr 2009 00:47:04 +0000 (00:47 +0000)]
2009-04-29 Jim Evins <evins@purple>
* po/POTFILES.in:
* po/de.po:
Updated german translation (Mario Blättermann).
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@835
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 20 Apr 2009 01:41:13 +0000 (01:41 +0000)]
Updated links.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@832
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 12 Apr 2009 03:51:39 +0000 (03:51 +0000)]
Website updates.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@831
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Wed, 25 Mar 2009 03:43:42 +0000 (03:43 +0000)]
Added links to getdeb packages.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@830
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 23 Mar 2009 05:00:54 +0000 (05:00 +0000)]
2009-03-23 Jim Evins <evins@snaught.com>
* src/glabels-batch.c: (main):
* src/glabels.c: (main):
Tidy up help option output.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@829
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 28 Feb 2009 15:55:51 +0000 (15:55 +0000)]
2009-02-28 Jim Evins <evins@snaught.com>
reviewed by: <delete if not using a buddy>
* src/Makefile.am:
* src/base64.c:
* src/base64.h:
Deleted base64 module.
* src/xml-label.c: (xml_parse_pixdata), (xml_create_pixdata):
Use glib for base64 support.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@828
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 23 Feb 2009 03:23:01 +0000 (03:23 +0000)]
2009-02-22 Jim Evins <evins@snaught.com>
* src/merge-properties-dialog.h:
* src/new-label-dialog.h:
* src/object-editor.h:
* src/prefs-dialog.h:
* src/print-op.h:
* src/template-designer.h:
Corrected cut&paste errors.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@827
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 22 Feb 2009 01:24:14 +0000 (01:24 +0000)]
2009-02-21 JimEvins <evins@snaught.com>
* src/prefs-model.c: (gl_prefs_model_save_settings),
(gl_prefs_model_load_settings):
* src/prefs-model.h:
* src/ui-commands.c:
* src/ui-property-bar.c:
* src/ui.c: (view_ui_item_toggled_cb),
(set_app_main_toolbar_style), (set_app_drawing_toolbar_style):
Removed tooltip toggling capability, which wasn't working
anyway.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@826
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 21 Feb 2009 07:43:03 +0000 (07:43 +0000)]
2009-02-21 JimEvins <evins@snaught.com>
* README:
* configure.in:
* data/builder/object-editor.glade:
* data/builder/prefs-dialog.glade:
* data/builder/property-bar.glade:
* data/builder/template-designer.glade:
* gtk-doc.make:
* src/color-combo-color-menu-item.c:
* src/color-combo-color-menu-item.h:
* src/color-combo-menu.h:
* src/glabels-batch.c: (main):
* src/glabels.c: (main):
* src/merge-properties-dialog.h:
* src/new-label-dialog.h:
* src/object-editor-lsize-page.c:
(gl_object_editor_prepare_lsize_page), (lsize_prefs_changed_cb):
* src/object-editor.h:
* src/prefs-dialog.h:
* src/print-op.h:
* src/template-designer.h:
* src/ui-commands.c: (gl_ui_cmd_view_property_bar_tips_toggle),
(gl_ui_cmd_help_contents), (gl_ui_cmd_help_about):
* src/ui-property-bar.c:
* src/ui-property-bar.h:
* src/ui-sidebar.c: (gl_ui_sidebar_construct),
(selection_changed_cb):
* src/ui-sidebar.h:
* src/view.h:
* src/wdgt-media-select.h:
* src/wdgt-merge-menu.h:
* src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_class_init):
* src/wdgt-mini-preview.h:
* src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct):
* src/wdgt-print-copies.h:
* src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct):
* src/wdgt-print-merge.h:
* src/wdgt-rotate-label.h:
* src/window.h:
Removed final dependencies on libgnome and libgnomeui.
Removed all currently deprecated symbols as of GTK 2.14.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@825
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Wed, 11 Feb 2009 23:52:09 +0000 (23:52 +0000)]
Make sure all pages still validate.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@824
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Thu, 8 Jan 2009 04:30:15 +0000 (04:30 +0000)]
2009-01-07 Jim Evins <evins@snaught.com>
* src/critical-error-handler.c: (critical_error_handler):
* src/ui-commands.c: (gl_ui_cmd_help_contents):
* src/warning-handler.c: (warning_handler):
* src/view.c: (selection_received_cb):
Compile without warning with additional CFLAGS of
-O1 -Wall -Wformat=2.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@823
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 3 Jan 2009 03:58:33 +0000 (03:58 +0000)]
2009-01-02 Jim Evins <evins@snaught.com>
* COPYING.README_FIRST:
Fixed typo.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@821
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 28 Dec 2008 04:04:56 +0000 (04:04 +0000)]
2008-12-27 Jim Evins <evins@snaught.com>
* data/templates/avery-iso-templates.xml:
* data/templates/avery-other-templates.xml:
* data/templates/avery-us-templates.xml:
* data/templates/brother-other-templates.xml:
* data/templates/misc-iso-templates.xml:
* data/templates/misc-other-templates.xml:
* data/templates/zweckform-iso-templates.xml:
Make sure all descriptions are marked as translatable.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@819
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 28 Dec 2008 03:01:26 +0000 (03:01 +0000)]
2008-12-27 Jim Evins <evins@snaught.com>
* de.po:
Updated german translation (Mario Blättermann)
* AUTHORS:
Updated credits to reflect above translation.
* data/builder/object-editor.glade:
* data/builder/prefs-dialog.glade:
* data/builder/template-designer.glade:
Removed "translatable" attribute from whitespace strings,
which are used only to help layout.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@817
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 22 Dec 2008 16:27:06 +0000 (16:27 +0000)]
Release 2.2.4
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@815
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 22 Dec 2008 04:37:47 +0000 (04:37 +0000)]
2008-12-21 Jim Evins <evins@snaught.com>
* data/templates/avery-us-templates.xml:
* data/templates/misc-iso-templates.xml:
A couple of recent template submissions.
* AUTHORS:
Acknowledgements for above templates.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@811
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 21 Dec 2008 19:58:40 +0000 (19:58 +0000)]
2008-12-21 Jim Evins <evins@snaught.com>
* src/view.c: (motion_notify_event_cb), (button_press_event_cb):
Don't check for handles on aggregate selections.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@809
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 21 Dec 2008 04:42:57 +0000 (04:42 +0000)]
Updated development version requirements.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@807
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 20 Dec 2008 17:02:49 +0000 (17:02 +0000)]
2008-12-20 Jim Evins <evins@snaught.com>
* configure.in:
Updated prerequisite library versions required.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@806
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 19 Dec 2008 03:27:58 +0000 (03:27 +0000)]
Updated FAQ.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@805
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 19 Dec 2008 03:11:15 +0000 (03:11 +0000)]
2008-12-18 Jim Evins <evins@snaught.com>
* src/view.c: (selection_received_cb):
Fixed paste bug that caused a duplicate phantom view_object to be created for
each new label_object. This is because the view now (as of r673) the view
monitiors the label for new objects and creates view_objects automatically.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@804
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 15 Dec 2008 04:54:58 +0000 (04:54 +0000)]
2008-12-14 Jim Evins <evins@snaught.com>
* src/ui.c: (gl_ui_new):
Bug #
2395628 . Fixed i18n for application shell.
* po/POTFILES.in:
Bug #
2395628 . Reconciled POTFILES.in with current files.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@801
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 15 Dec 2008 04:16:15 +0000 (04:16 +0000)]
2008-12-14 Jim Evins <evins@snaught.com>
* configure.in:
Bug #
2316013 . Added PKG_PROG_PKG_CONFIG.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@799
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 1 Dec 2008 04:30:37 +0000 (04:30 +0000)]
Added link to another linux.com artical.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@797
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 16 Nov 2008 04:02:33 +0000 (04:02 +0000)]
2008-11-15 Jim Evins <evins@snaught.com>
* libglabels/db.c: (lgl_db_register_template):
* libglabels/xml-template.c:
(lgl_xml_template_parse_template_node):
* src/glabels-batch.c:
* src/view-text.c: (gl_view_text_create_button_press_event):
Fixed several issues such as possible use of uninitialized variables found with "-O1 -Wall".
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@796
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 10 Nov 2008 03:55:16 +0000 (03:55 +0000)]
2008-11-09 Jim Evins <evins@snaught.com>
* data/templates/misc-iso-templates.xml:
Another user submitted template.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@794
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 31 Oct 2008 21:55:33 +0000 (21:55 +0000)]
Added link to nice blog.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@792
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 31 Oct 2008 21:35:08 +0000 (21:35 +0000)]
Website changes from last release.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@791
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Tue, 28 Oct 2008 03:50:48 +0000 (03:50 +0000)]
2008-10-27 Jim Evins <evins@snaught.com>
* data/templates/avery-us-templates.xml:
* data/templates/misc-iso-templates.xml:
* data/templates/zweckform-iso-templates.xml:
Caught up on user submitted templates.
* AUTHORS:
Acknowledgements for above templates.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@790
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 24 Oct 2008 03:30:36 +0000 (03:30 +0000)]
2008-10-23 Jim Evins <evins@snaught.com>
* src/label-text.c: (set_font_family):
* src/object-editor-text-page.c:
(gl_object_editor_prepare_text_page),
(gl_object_editor_set_font_family):
* src/prefs-dialog.c: (construct_object_page),
(update_object_page_from_prefs):
* src/ui-property-bar.c: (gl_ui_property_bar_construct),
(reset_to_default_properties):
* src/util.c: (gl_util_get_font_family_list):
* src/util.h:
Bug #
1902275 and Bug #
2186214 . Cache font list so that it is not re-created
everytime the list is requested.
* src/object-editor-text-page.c:
(gl_object_editor_set_font_family):
Don't change font-family if it hasn't actually changed.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@788
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 20 Oct 2008 02:54:58 +0000 (02:54 +0000)]
2008-10-19 Jim Evins <evins@snaught.com>
* data/builder/object-editor.glade:
Some tweaking of builder/glade widgets.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@786
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 18 Oct 2008 15:02:40 +0000 (15:02 +0000)]
2008-10-18 Jim Evins <evins@snaught.com>
Migrated all use of libglade to GtkBuilder.
* data/glade/Makefile.am:
* data/glade/merge-properties-dialog.glade:
* data/glade/new-label-dialog.glade:
* data/glade/object-editor.glade:
* data/glade/prefs-dialog.glade:
* data/glade/print-custom-widget.glade:
* data/glade/property-bar.glade:
* data/glade/template-designer.glade:
* data/glade/wdgt-media-select.glade:
Removed data/glade directory.
* data/builder/Makefile.am:
* data/builder/merge-properties-dialog.glade:
* data/builder/new-label-dialog.glade:
* data/builder/object-editor.glade:
* data/builder/prefs-dialog.glade:
* data/builder/print-custom-widget.glade:
* data/builder/property-bar.glade:
* data/builder/template-designer.glade:
* data/builder/wdgt-media-select.glade:
Added data/builder directory.
* configure.in:
* data/Makefile.am:
* src/Makefile.am:
Change glade to builder.
* src/merge-properties-dialog.c:
(gl_merge_properties_dialog_finalize),
(gl_merge_properties_dialog_construct):
* src/new-label-dialog.c: (gl_new_label_dialog_finalize),
(gl_new_label_dialog_construct):
* src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page):
* src/object-editor-data-page.c:
(gl_object_editor_prepare_data_page):
* src/object-editor-edit-page.c:
(gl_object_editor_prepare_edit_page):
* src/object-editor-fill-page.c:
(gl_object_editor_prepare_fill_page):
* src/object-editor-image-page.c:
(gl_object_editor_prepare_image_page):
* src/object-editor-line-page.c:
(gl_object_editor_prepare_line_page):
* src/object-editor-lsize-page.c:
(gl_object_editor_prepare_lsize_page):
* src/object-editor-position-page.c:
(gl_object_editor_prepare_position_page):
* src/object-editor-private.h:
* src/object-editor-shadow-page.c:
(gl_object_editor_prepare_shadow_page):
* src/object-editor-size-page.c:
(gl_object_editor_prepare_size_page):
* src/object-editor-text-page.c:
(gl_object_editor_prepare_text_page):
* src/object-editor.c: (gl_object_editor_init):
* src/prefs-dialog.c: (gl_prefs_dialog_init),
(gl_prefs_dialog_construct), (construct_locale_page),
(construct_object_page):
* src/print-op.c: (gl_print_op_finalize),
(create_custom_widget_cb):
* src/template-designer.c: (gl_template_designer_class_init),
(gl_template_designer_finalize), (gl_template_designer_construct),
(construct_start_page), (construct_name_page),
(construct_pg_size_page), (construct_shape_page),
(construct_rect_size_page), (construct_round_size_page),
(construct_cd_size_page), (construct_nlayouts_page),
(construct_layout_page), (construct_finish_page):
* src/template-designer.h:
* src/ui-property-bar.c: (gl_ui_property_bar_init),
(gl_ui_property_bar_finalize), (gl_ui_property_bar_new),
(gl_ui_property_bar_construct), (reset_to_default_properties),
(gl_ui_property_bar_set_view), (gl_ui_property_bar_set_tooltips),
(update_text_properties), (update_fill_color), (update_line_color),
(update_line_width), (selection_changed_cb),
(font_family_changed_cb), (font_size_changed_cb),
(text_color_changed_cb), (fill_color_changed_cb),
(line_color_changed_cb), (line_width_changed_cb),
(font_bold_toggled_cb), (font_italic_toggled_cb),
(text_align_toggled_cb), (set_doc_items_sensitive),
(set_text_items_sensitive), (set_fill_items_sensitive),
(set_line_color_items_sensitive), (set_line_width_items_sensitive):
* src/ui-property-bar.h:
* src/util.c: (gl_util_get_builder_widgets):
* src/util.h:
* src/wdgt-media-select.c: (gl_wdgt_media_select_finalize),
(gl_wdgt_media_select_construct):
Migration of glade to builder.
* src/color.h:
New macros for color combo initialization.
* TODO:
Added idea for internal merge database.
* docs/libglabels/libglabels-undocumented.txt:
* docs/libglabels/tmpl/paper.sgml:
* gtk-doc.make:
Automagic.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@785
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 12 Oct 2008 05:40:18 +0000 (05:40 +0000)]
2008-10-12 Jim Evins <evins@snaught.com>
* src/mygal/Makefile.am:
* src/mygal/color-group.c:
* src/mygal/color-group.h:
* src/mygal/color-palette.c:
* src/mygal/color-palette.h:
* src/mygal/e-colors.c:
* src/mygal/e-colors.h:
* src/mygal/e-marshal.list:
* src/mygal/e-util.h:
* src/mygal/mygal-combo-box.c:
* src/mygal/mygal-combo-box.h:
* src/mygal/widget-color-combo.c:
* src/mygal/widget-color-combo.h:
* AUTHORS:
* configure.in:
Deleted mygal.
* src/color-combo.c:
* src/color-combo.h:
* src/color-combo-color-menu-item.c:
* src/color-combo-color-menu-item.h:
* src/color-combo-history.c:
* src/color-combo-history.h:
* src/color-combo-menu.c:
* src/color-combo-menu.h:
* src/marshal.list:
* src/util.c:
* src/util.h:
* src/Makefile.am:
Created new glColorCombo widget.
* src/object-editor-bc-page.c:
* src/object-editor-edit-page.c:
* src/object-editor-fill-page.c:
* src/object-editor-line-page.c:
* src/object-editor-shadow-page.c:
* src/object-editor-text-page.c:
* src/object-editor.c:
* src/prefs-dialog.c:
* src/ui-property-bar.c:
Replaced use of mygal color combo with new glColorCombo widget.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@784
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 30 Aug 2008 00:38:26 +0000 (00:38 +0000)]
2008-08-29 Jim Evins <evins@snaught.com>
* src/file.c: (gl_file_open), (gl_file_save_as):
Bug #
2069668 . Corrected button order in Open and "Save as"
dialogs.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@783
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 17 Aug 2008 19:10:04 +0000 (19:10 +0000)]
2008-08-17 Jim Evins <evins@snaught.com>
* data/dtd/glabels-2.2.dtd:
* data/templates/paper-sizes.xml:
* libglabels/db.c: (lgl_db_init):
* libglabels/paper.c: (lgl_paper_new), (lgl_paper_dup), (lgl_paper_free):
* libglabels/paper.h:
* libglabels/xml-paper.c: (lgl_xml_paper_parse_paper_node):
* src/print-op.c: (set_page_size):
Bug #
2049431 . Always explicitely set page size. Added pwg_size field (PWG 5101.1-2002
size specification) to the libglabels paper database to allow the page size to be
communicated to GtkPrintOp un-ambiguously.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@777
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 26 Jul 2008 02:31:09 +0000 (02:31 +0000)]
2008-07-25 Jim Evins <evins@snaught.com>
* src/object-editor-size-page.c: (size_reset_cb),
(gl_object_editor_set_max_size):
Bug #
1993550 . Set size limits based on longest side of label.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@776
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 20 Jul 2008 03:16:56 +0000 (03:16 +0000)]
2008-07-19 Jim Evins <evins@snaught.com>
* configure.in:
* src/mygal/Makefile.am:
Make sure libtool handles library dependencies for mygal
properly.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@774
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Thu, 22 May 2008 01:48:05 +0000 (01:48 +0000)]
2008-05-21 Jim Evins <evins@snaught.com>
* src/glabels-batch.c: (main):
Bug #
1968653 . Initialize prefs subsystem.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@772
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 10 May 2008 03:28:39 +0000 (03:28 +0000)]
2008-05-09 Jim Evins <evins@snaught.com>
* data/glade/object-editor.glade:
Bug #
1959135 . A couple of radio buttons somehow became
ungrouped.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@769
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Tue, 8 Apr 2008 02:04:10 +0000 (02:04 +0000)]
2008-04-07 Jim Evins <evins@snaught.com>
* src/wdgt-rotate-label.h:
* src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_init),
(gl_wdgt_rotate_label_new), (toggled_cb), (create_pixbuf),
(gl_wdgt_rotate_label_get_state), (gl_wdgt_rotate_label_set_state),
(gl_wdgt_rotate_label_set_template_name):
Modified wdgt-rotate-label to better indicate the rotation choices.
* data/glade/Makefile.am:
* data/glade/wdgt-rotate-label.glade:
Deleted wdgt-rotate-label.glade.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@768
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 5 Apr 2008 13:22:30 +0000 (13:22 +0000)]
2008-04-04 Jim Evins <evins@snaught.com>
* data/templates/brother-other-templates.xml:
Added categories to existing templates.
* data/templates/misc-other-templates.xml:
Moved dymo templates to their own file.
* data/templates/Makefile.am:
* data/templates/dymo-other-templates.xml:
Additional dymo templates provided by Harald Welte <laforge@gnumonks.org>.
* AUTHORS:
Acknowledgement for above templates.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@767
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 5 Apr 2008 01:24:56 +0000 (01:24 +0000)]
2008-04-04 Jim Evins <evins@snaught.com>
* data/templates/brother-other-templates.xml:
Added categories to existing templates.
* data/templates/misc-other-templates.xml:
Moved dymo templates to their own file.
* data/templates/Makefile.am:
* data/templates/dymo-other-templates.xml:
Additional dymo templates provided by Harald Welte <laforge@gnumonks.org>.
* AUTHORS:
Acknowledgement for above templates.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@766
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Tue, 25 Mar 2008 01:32:29 +0000 (01:32 +0000)]
2008-03-24 Jim Evins <evins@snaught.com>
* src/xml-label.c: (xml_doc_to_label):
Bug #
1872584 . Don't refuse to parse label file if namespace is
unrecognized -- it may be from a newer version of glabels.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@763
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 16 Mar 2008 03:38:18 +0000 (03:38 +0000)]
2008-03-15 Jim Evins <evins@snaught.com>
* data/templates/Makefile.am:
* data/templates/brother-other-templates.xml:
Added brother templates.
* src/cairo-markup-path.c: (gl_cairo_markup_margin_rect_path),
(gl_cairo_markup_margin_cd_path):
* src/view.c: (draw_markup_layer):
Fixed markup drawing errors when label is rotated.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@762
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Tue, 4 Mar 2008 02:56:19 +0000 (02:56 +0000)]
2008-03-03 Jim Evins <evins@snaught.com>
* configure.in:
* ko.po:
Added korean translation provided by xein@naver.com.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@760
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sat, 23 Feb 2008 02:27:44 +0000 (02:27 +0000)]
Release 2.2.2
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@756
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Fri, 22 Feb 2008 03:11:28 +0000 (03:11 +0000)]
2008-02-21 Jim Evins <evins@snaught.com>
* src/ui.c:
Fixed typo that prevented "Save" from being deactivated when
document is not modified.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@755
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Tue, 19 Feb 2008 01:41:28 +0000 (01:41 +0000)]
2008-02-18 Jim Evins <evins@snaught.com>
* src/prefs-model.c: (gl_prefs_model_save_settings),
(gl_prefs_model_load_settings):
Set default units for file output.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@752
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Mon, 18 Feb 2008 05:17:40 +0000 (05:17 +0000)]
2008-02-18 Jim Evins <evins@snaught.com>
* help/C/glabels.xml:
Fixed example template.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@750
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 17 Feb 2008 04:59:49 +0000 (04:59 +0000)]
2008-02-16 Jim Evins <evins@snaught.com>
* AUTHORS:
* data/templates/avery-iso-templates.xml:
* data/templates/avery-us-templates.xml:
* data/templates/misc-iso-templates.xml:
* data/templates/misc-us-templates.xml:
Caught up on user submitted templates.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@748
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Tue, 5 Feb 2008 02:03:08 +0000 (02:03 +0000)]
2008-02-04 Jim Evins <evins@snaught.com>
* src/view-image.c: (update_object_from_editor_cb):
Bug #
1886438 . Don't update the image size unless it is actually
triggered by a change in image source. The result of this bug
was that any attempt to edit the size spinboxes, immediately
reset the size.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@746
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 3 Feb 2008 20:49:14 +0000 (20:49 +0000)]
2008-02-03 Jim Evins <evins@snaught.com>
* src/label-image.c: (gl_label_image_class_init), (set_size):
Enforce minimum size for images.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@743
f5e0f49d -192f-0410-a22d-
a8d8700d0965
Jim Evins [Sun, 3 Feb 2008 06:38:13 +0000 (06:38 +0000)]
2008-02-03 Jim Evins <evins@snaught.com>
* src/object-editor-edit-page.c: (field_selected_cb):
* src/object-editor-lsize-page.c: (gl_object_editor_set_max_lsize):
* src/object-editor-private.h:
* src/object-editor-shadow-page.c:
(gl_object_editor_set_max_shadow_offset):
* src/object-editor-size-page.c: (gl_object_editor_set_max_size):
* src/object-editor.c: (gl_object_editor_finalize),
(gl_object_editor_new), (gl_object_notebook_construct_valist),
(label_changed_cb):
* src/object-editor.h:
* src/ui-sidebar.c: (gl_ui_sidebar_construct):
* src/view-barcode.c: (construct_properties_editor):
* src/view-box.c: (construct_properties_editor):
* src/view-ellipse.c: (construct_properties_editor):
* src/view-image.c: (construct_properties_editor):
* src/view-line.c: (construct_properties_editor):
* src/view-object.c: (gl_view_object_finalize):
* src/view-text.c: (construct_properties_editor),
Move update_editor_from_label callback from individual view objects
to the object editor, so that signals can be disconnected when
object editor is finalized.
* src/view-text.c: (gl_view_text_create_button_press_event):
Fixed bug that caused multiple view objects to be created for a
single text object. This bug would manifest itself as a crash
when deleting multi-object selections which included text objects.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@741
f5e0f49d -192f-0410-a22d-
a8d8700d0965