From 7e55e35f41dbbbbb2dcf285fa5fbcc9007628457 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Fri, 18 Sep 2009 01:44:09 +0000 Subject: [PATCH] 2009-09-17 Jim Evins * 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 --- glabels2/ChangeLog | 176 +++++++++++++++++++++ glabels2/libglabels/category.h | 3 +- glabels2/libglabels/db.h | 3 +- glabels2/libglabels/paper.h | 3 +- glabels2/libglabels/template.h | 3 +- glabels2/libglabels/xml-category.h | 3 +- glabels2/libglabels/xml-paper.h | 3 +- glabels2/libglabels/xml.h | 2 +- glabels2/src/bc-gnubarcode.c | 61 +++---- glabels2/src/bc-gnubarcode.h | 30 ++-- glabels2/src/bc-iec16022.c | 41 ++--- glabels2/src/bc-iec16022.h | 30 ++-- glabels2/src/bc-iec18004.c | 39 +++-- glabels2/src/bc-iec18004.h | 30 ++-- glabels2/src/bc-postnet.c | 39 +++-- glabels2/src/bc-postnet.h | 30 ++-- glabels2/src/bc.c | 51 ++++-- glabels2/src/bc.h | 32 ++-- glabels2/src/cairo-ellipse-path.c | 33 ++-- glabels2/src/cairo-ellipse-path.h | 29 ++-- glabels2/src/cairo-label-path.c | 37 +++-- glabels2/src/cairo-label-path.h | 31 ++-- glabels2/src/cairo-markup-path.c | 41 +++-- glabels2/src/cairo-markup-path.h | 31 ++-- glabels2/src/color-combo-button.c | 10 +- glabels2/src/color-combo-button.h | 2 +- glabels2/src/color-combo-color-menu-item.c | 7 +- glabels2/src/color-combo-color-menu-item.h | 2 +- glabels2/src/color-combo-history.c | 1 - glabels2/src/color-combo-menu.c | 9 +- glabels2/src/color-combo-menu.h | 2 +- glabels2/src/color-combo.c | 8 +- glabels2/src/color-combo.h | 2 +- glabels2/src/color-swatch.c | 2 +- glabels2/src/color-swatch.h | 2 +- glabels2/src/color.c | 39 +++-- glabels2/src/color.h | 31 ++-- glabels2/src/critical-error-handler.c | 39 +++-- glabels2/src/critical-error-handler.h | 33 ++-- glabels2/src/debug.c | 36 +++-- glabels2/src/debug.h | 31 ++-- glabels2/src/file.c | 50 ++++-- glabels2/src/file.h | 31 ++-- glabels2/src/font-combo-menu-item.c | 8 +- glabels2/src/font-combo-menu-item.h | 2 +- glabels2/src/font-combo-menu.c | 7 +- glabels2/src/font-combo-menu.h | 2 +- glabels2/src/font-combo.c | 7 +- glabels2/src/font-combo.h | 2 +- glabels2/src/font-sample.h | 2 +- glabels2/src/font-util.c | 5 +- glabels2/src/font-util.h | 2 +- glabels2/src/glabels-batch.c | 5 +- glabels2/src/glabels.c | 32 ++-- glabels2/src/hig.h | 32 ++-- glabels2/src/label-barcode.c | 52 ++++-- glabels2/src/label-barcode.h | 30 ++-- glabels2/src/label-box.c | 50 ++++-- glabels2/src/label-box.h | 30 ++-- glabels2/src/label-ellipse.c | 70 ++++---- glabels2/src/label-ellipse.h | 30 ++-- glabels2/src/label-image.c | 53 ++++--- glabels2/src/label-image.h | 32 ++-- glabels2/src/label-line.c | 64 +++++--- glabels2/src/label-line.h | 30 ++-- glabels2/src/label-object.c | 99 ++++++++++-- glabels2/src/label-object.h | 30 ++-- glabels2/src/label-text.c | 4 +- glabels2/src/label-text.h | 4 +- glabels2/src/label.c | 59 +++++-- glabels2/src/label.h | 35 ++-- glabels2/src/merge-evolution.c | 50 ++++-- glabels2/src/merge-evolution.h | 32 ++-- glabels2/src/merge-init.c | 31 ++-- glabels2/src/merge-init.h | 30 ++-- glabels2/src/merge-properties-dialog.c | 10 +- glabels2/src/merge-properties-dialog.h | 33 ++-- glabels2/src/merge-text.c | 46 ++++-- glabels2/src/merge-text.h | 30 ++-- glabels2/src/merge-vcard.c | 50 ++++-- glabels2/src/merge-vcard.h | 32 ++-- glabels2/src/merge.c | 30 ++-- glabels2/src/merge.h | 30 ++-- glabels2/src/mini-label-preview.c | 4 +- glabels2/src/mini-label-preview.h | 2 +- glabels2/src/mini-preview-pixbuf-cache.c | 36 +++-- glabels2/src/mini-preview-pixbuf-cache.h | 32 ++-- glabels2/src/mini-preview-pixbuf.c | 31 ++-- glabels2/src/mini-preview-pixbuf.h | 31 ++-- glabels2/src/mini-preview.c | 1 - glabels2/src/new-label-dialog.c | 4 +- glabels2/src/new-label-dialog.h | 33 ++-- glabels2/src/object-editor-bc-page.c | 5 +- glabels2/src/object-editor-data-page.c | 4 +- glabels2/src/object-editor-fill-page.c | 3 +- glabels2/src/object-editor-image-page.c | 5 +- glabels2/src/object-editor-line-page.c | 5 +- glabels2/src/object-editor-lsize-page.c | 3 +- glabels2/src/object-editor-position-page.c | 3 +- glabels2/src/object-editor-private.h | 3 +- glabels2/src/object-editor-shadow-page.c | 5 +- glabels2/src/object-editor-size-page.c | 3 +- glabels2/src/object-editor-text-page.c | 4 +- glabels2/src/object-editor.c | 7 +- glabels2/src/object-editor.h | 33 ++-- glabels2/src/pixbuf-cache.c | 42 +++-- glabels2/src/pixbuf-cache.h | 34 ++-- glabels2/src/prefs-dialog.c | 7 +- glabels2/src/prefs-dialog.h | 33 ++-- glabels2/src/prefs-model.c | 55 ++++--- glabels2/src/prefs-model.h | 31 ++-- glabels2/src/prefs.c | 31 ++-- glabels2/src/prefs.h | 30 ++-- glabels2/src/print-op-dialog.c | 4 +- glabels2/src/print-op.c | 6 +- glabels2/src/print-op.h | 2 +- glabels2/src/print.c | 44 ++++-- glabels2/src/print.h | 32 ++-- glabels2/src/recent.c | 35 ++-- glabels2/src/recent.h | 32 ++-- glabels2/src/rotate-label-button.c | 7 +- glabels2/src/rotate-label-button.h | 2 +- glabels2/src/stock.c | 42 ++--- glabels2/src/stock.h | 31 ++-- glabels2/src/template-designer.c | 8 +- glabels2/src/template-designer.h | 32 ++-- glabels2/src/text-node.c | 42 +++-- glabels2/src/text-node.h | 33 ++-- glabels2/src/ui-commands.c | 88 ++++++++--- glabels2/src/ui-commands.h | 33 ++-- glabels2/src/ui-property-bar.c | 5 +- glabels2/src/ui-property-bar.h | 33 ++-- glabels2/src/ui-sidebar.c | 40 +++-- glabels2/src/ui-sidebar.h | 33 ++-- glabels2/src/ui-util.c | 39 +++-- glabels2/src/ui-util.h | 32 ++-- glabels2/src/ui.c | 51 ++++-- glabels2/src/ui.h | 32 ++-- glabels2/src/util.c | 49 ++++-- glabels2/src/util.h | 34 ++-- glabels2/src/view-barcode.c | 47 ++++-- glabels2/src/view-barcode.h | 29 ++-- glabels2/src/view-box.c | 46 ++++-- glabels2/src/view-box.h | 29 ++-- glabels2/src/view-ellipse.c | 46 ++++-- glabels2/src/view-ellipse.h | 29 ++-- glabels2/src/view-image.c | 45 ++++-- glabels2/src/view-image.h | 29 ++-- glabels2/src/view-line.c | 45 ++++-- glabels2/src/view-line.h | 29 ++-- glabels2/src/view-object.c | 53 +++++-- glabels2/src/view-object.h | 29 ++-- glabels2/src/view-text.c | 47 ++++-- glabels2/src/view-text.h | 29 ++-- glabels2/src/view.c | 133 +++++++++++++--- glabels2/src/view.h | 31 ++-- glabels2/src/warning-handler.c | 38 +++-- glabels2/src/warning-handler.h | 33 ++-- glabels2/src/wdgt-chain-button.c | 57 ++++--- glabels2/src/wdgt-chain-button.h | 55 ++++--- glabels2/src/wdgt-media-select.c | 13 +- glabels2/src/wdgt-media-select.h | 31 ++-- glabels2/src/wdgt-merge-menu.c | 38 +++-- glabels2/src/wdgt-merge-menu.h | 31 ++-- glabels2/src/window.c | 55 +++++-- glabels2/src/window.h | 33 ++-- glabels2/src/xml-label-04.c | 46 ++++-- glabels2/src/xml-label-04.h | 30 ++-- glabels2/src/xml-label.c | 69 ++++++-- glabels2/src/xml-label.h | 30 ++-- 170 files changed, 3183 insertions(+), 1713 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 75999dfa..9f98bed0 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,179 @@ +2009-09-17 Jim Evins + + * 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. + 2009-09-13 Jim Evins Refactored print operation subsystem. diff --git a/glabels2/libglabels/category.h b/glabels2/libglabels/category.h index 3727d47d..dccbc194 100644 --- a/glabels2/libglabels/category.h +++ b/glabels2/libglabels/category.h @@ -28,8 +28,7 @@ #ifndef __CATEGORY_H__ #define __CATEGORY_H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/glabels2/libglabels/db.h b/glabels2/libglabels/db.h index c6b6f7ef..a7b77c7f 100644 --- a/glabels2/libglabels/db.h +++ b/glabels2/libglabels/db.h @@ -28,8 +28,7 @@ #ifndef __DB_H__ #define __DB_H__ -#include -#include +#include #include "paper.h" #include "category.h" diff --git a/glabels2/libglabels/paper.h b/glabels2/libglabels/paper.h index 0fb42388..6f197cb7 100644 --- a/glabels2/libglabels/paper.h +++ b/glabels2/libglabels/paper.h @@ -26,8 +26,7 @@ #ifndef __PAPER_H__ #define __PAPER_H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/glabels2/libglabels/template.h b/glabels2/libglabels/template.h index cbcbccf2..683775dd 100644 --- a/glabels2/libglabels/template.h +++ b/glabels2/libglabels/template.h @@ -28,8 +28,7 @@ #ifndef __TEMPLATE_H__ #define __TEMPLATE_H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/glabels2/libglabels/xml-category.h b/glabels2/libglabels/xml-category.h index ef01d9fb..7cf1065c 100644 --- a/glabels2/libglabels/xml-category.h +++ b/glabels2/libglabels/xml-category.h @@ -26,8 +26,7 @@ #ifndef __XML_CATEGORY_H__ #define __XML_CATEGORY_H__ -#include -#include +#include #include #include "category.h" diff --git a/glabels2/libglabels/xml-paper.h b/glabels2/libglabels/xml-paper.h index df90bcff..a05cd2fc 100644 --- a/glabels2/libglabels/xml-paper.h +++ b/glabels2/libglabels/xml-paper.h @@ -26,8 +26,7 @@ #ifndef __XML_PAPER_H__ #define __XML_PAPER_H__ -#include -#include +#include #include #include "paper.h" diff --git a/glabels2/libglabels/xml.h b/glabels2/libglabels/xml.h index 3ef2e495..be0ec9a3 100644 --- a/glabels2/libglabels/xml.h +++ b/glabels2/libglabels/xml.h @@ -26,7 +26,7 @@ #ifndef __XML_H__ #define __XML_H__ -#include +#include #include #include "enums.h" diff --git a/glabels2/src/bc-gnubarcode.c b/glabels2/src/bc-gnubarcode.c index 8a56fd38..6ce051d0 100644 --- a/glabels2/src/bc-gnubarcode.c +++ b/glabels2/src/bc-gnubarcode.c @@ -1,53 +1,42 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc-gnubarcode.c: front-end to GNU-barcode-library module - * - * Copyright (C) 2001-2003 Jim Evins . + * bc-gnubarcode.c + * Copyright (C) 2001-2009 Jim Evins . * - * Some of this code is borrowed from the postscript renderer (ps.c) - * from the GNU barcode library: + * This file is part of gLabels. * - * Copyright (C) 1999 Alessaandro Rubini (rubini@gnu.org) - * Copyright (C) 1999 Prosa Srl. (prosa@prosa.it) - * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include #include "bc-gnubarcode.h" +#include #include #include -#include -#include -#include - -#include "barcode.h" +#include /* GNU Barcode */ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ #define SHRINK_AMOUNT 0.15 /* shrink bars to account for ink spreading */ #define FONT_SCALE 0.95 /* Shrink fonts just a hair */ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -66,7 +55,7 @@ static gboolean is_length2_valid (const gchar *digits, gint n1, gint n2); - + /*****************************************************************************/ /* Generate intermediate representation of barcode. */ /*****************************************************************************/ @@ -207,6 +196,7 @@ gl_barcode_gnubarcode_new (const gchar *id, return gbc; } + /*-------------------------------------------------------------------------- * PRIVATE. Render to glBarcode intermediate representation of barcode. * @@ -287,15 +277,7 @@ render_pass1 (struct Barcode_Item *bci, /* If too small (5 + text), reduce the scale factor and center */ i = 5 + 10 * ((bci->flags & BARCODE_NO_ASCII)==0); if (bci->height < i * scalef ) { -#if 0 - double scaleg = ((double)bci->height) / i; - int wid = bci->width * scaleg / scalef; - bci->xoff += (bci->width - wid)/2; - bci->width = wid; - scalef = scaleg; -#else bci->height = i * scalef; -#endif } gbc = g_new0 (glBarcode, 1); @@ -374,13 +356,10 @@ render_pass1 (struct Barcode_Item *bci, gbc->height = bci->height + 2.0 * bci->margin; gbc->width = bci->width + 2.0 * bci->margin; -#if 0 - g_print ("w=%f, h=%f\n", gbc->width, gbc->height); -#endif - return gbc; } + /*--------------------------------------------------------------------------*/ /* Validate specific length of string (for subtypes). */ /*--------------------------------------------------------------------------*/ @@ -405,6 +384,7 @@ is_length_valid (const gchar *digits, return (i >= n1) && (i <= n2); } + /*--------------------------------------------------------------------------*/ /* Validate specific length of string (for subtypes). */ /*--------------------------------------------------------------------------*/ @@ -429,6 +409,7 @@ is_length1_valid (const gchar *digits, return (i >= n1) && (i <= n2); } + /*--------------------------------------------------------------------------*/ /* Validate specific length of second string (for subtypes). */ /*--------------------------------------------------------------------------*/ @@ -457,3 +438,13 @@ is_length2_valid (const gchar *digits, return (i >= n1) && (i <= n2); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/bc-gnubarcode.h b/glabels2/src/bc-gnubarcode.h index 1e91d998..ac96b346 100644 --- a/glabels2/src/bc-gnubarcode.h +++ b/glabels2/src/bc-gnubarcode.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc_gnubarcode.h: front-end to GNU-barcode-library module header file + * bc-gnubarcode.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __BC_GNUBARCODE_H__ #define __BC_GNUBARCODE_H__ @@ -38,3 +35,14 @@ glBarcode *gl_barcode_gnubarcode_new (const gchar *id, G_END_DECLS #endif /* __BC_GNUBARCODE_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/bc-iec16022.c b/glabels2/src/bc-iec16022.c index 8fb87fc4..3ccdc043 100644 --- a/glabels2/src/bc-iec16022.c +++ b/glabels2/src/bc-iec16022.c @@ -1,45 +1,42 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc-iec16022.c: front-end to iec16022-library module + * bc-iec16022.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include #include "bc-iec16022.h" +#include #include #include #include -#include - -#include "iec16022ecc200.h" +#include #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ #define MIN_PIXEL_SIZE 1.0 + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -49,6 +46,7 @@ static glBarcode *render_iec16022 (const gchar *grid, gdouble w, gdouble h); + /*****************************************************************************/ /* Generate intermediate representation of barcode. */ /*****************************************************************************/ @@ -84,6 +82,7 @@ gl_barcode_iec16022_new (const gchar *id, return gbc; } + /*-------------------------------------------------------------------------- * PRIVATE. Render to glBarcode intermediate representation of barcode. *--------------------------------------------------------------------------*/ @@ -142,10 +141,16 @@ render_iec16022 (const gchar *grid, gbc->height = i_height * pixel_size; gbc->width = i_width * pixel_size; -#if 0 - g_print ("w=%f, h=%f\n", gbc->width, gbc->height); -#endif - return gbc; } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/bc-iec16022.h b/glabels2/src/bc-iec16022.h index 099387ac..64655b0b 100644 --- a/glabels2/src/bc-iec16022.h +++ b/glabels2/src/bc-iec16022.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc_iec16022.h: front-end to iec16022-library module header file + * bc-iec16022.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __BC_IEC16022_H__ #define __BC_IEC16022_H__ @@ -38,3 +35,14 @@ glBarcode *gl_barcode_iec16022_new (const gchar *id, G_END_DECLS #endif /* __BC_IEC16022_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/bc-iec18004.c b/glabels2/src/bc-iec18004.c index 319f8418..bef0fd89 100644 --- a/glabels2/src/bc-iec18004.c +++ b/glabels2/src/bc-iec18004.c @@ -1,44 +1,43 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc-qrcode.c: front-end to QRcode module + * bc-iec18004.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include #include "bc-iec18004.h" +#include #include #include #include -#include #include #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ + #define MIN_PIXEL_SIZE 1.0 + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -48,6 +47,7 @@ static glBarcode *render_iec18004 (const gchar *grid, gdouble w, gdouble h); + /*****************************************************************************/ /* Generate intermediate representation of barcode. */ /*****************************************************************************/ @@ -87,6 +87,7 @@ gl_barcode_iec18004_new (const gchar *id, return gbc; } + /*-------------------------------------------------------------------------- * PRIVATE. Render to glBarcode intermediate representation of barcode. *--------------------------------------------------------------------------*/ @@ -149,10 +150,16 @@ render_iec18004 (const gchar *grid, gbc->height = i_height * pixel_size; gbc->width = i_width * pixel_size; -#if 0 - g_print ("w=%f, h=%f\n", gbc->width, gbc->height); -#endif - return gbc; } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/bc-iec18004.h b/glabels2/src/bc-iec18004.h index 5dd53a59..2c3e7eeb 100644 --- a/glabels2/src/bc-iec18004.h +++ b/glabels2/src/bc-iec18004.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc_qrcode.h: front-end to qrcode-library module header file + * bc-iec18004.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __BC_IEC18004_H__ #define __BC_IEC18004_H__ @@ -38,3 +35,14 @@ glBarcode *gl_barcode_iec18004_new (const gchar *id, G_END_DECLS #endif /* __BC_IEC18004_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/bc-postnet.c b/glabels2/src/bc-postnet.c index e7d350f0..52c07dba 100644 --- a/glabels2/src/bc-postnet.c +++ b/glabels2/src/bc-postnet.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc_postnet.c: GLabels POSTNET barcode module + * bc-postnet.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ /* @@ -31,13 +27,12 @@ #include "bc-postnet.h" +#include #include -#include -#include -#include #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ @@ -48,6 +43,7 @@ #define POSTNET_HORIZ_MARGIN 9.00 #define POSTNET_VERT_MARGIN 3.00 + /*===========================================*/ /* Private globals */ /*===========================================*/ @@ -66,6 +62,7 @@ static gchar *symbols[] = { static gchar *frame_symbol = "1"; + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -74,7 +71,7 @@ static gchar *postnet_code (const gchar *digits); static gboolean is_length_valid (const gchar *digits, gint n); - + /****************************************************************************/ /* Generate list of lines that form the barcode for the given digits. */ /****************************************************************************/ @@ -158,6 +155,7 @@ gl_barcode_postnet_new (const gchar *id, return gbc; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Generate string of symbols, representing barcode. */ /*--------------------------------------------------------------------------*/ @@ -197,6 +195,7 @@ postnet_code (const gchar *digits) return ret; } + /*--------------------------------------------------------------------------*/ /* Validate specific length of string (for subtypes). */ /*--------------------------------------------------------------------------*/ @@ -220,3 +219,13 @@ is_length_valid (const gchar *digits, return (i == n); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/bc-postnet.h b/glabels2/src/bc-postnet.h index 6e642ab2..0945670d 100644 --- a/glabels2/src/bc-postnet.h +++ b/glabels2/src/bc-postnet.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc_postnet.h: GLabels POSTNET barcode module header file + * bc-postnet.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __BC_POSTNET_H__ #define __BC_POSTNET_H__ @@ -38,3 +35,14 @@ glBarcode *gl_barcode_postnet_new (const gchar *id, G_END_DECLS #endif /* __BC_POSTNET_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/bc.c b/glabels2/src/bc.c index 97c470e0..7c35234a 100644 --- a/glabels2/src/bc.c +++ b/glabels2/src/bc.c @@ -1,34 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc.c: GLabels barcode module + * bc.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "bc.h" +#include #include -#include -#include -#include #include "bc-postnet.h" #include "bc-gnubarcode.h" @@ -37,10 +32,12 @@ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -162,11 +159,12 @@ static const Backend backends[] = { }; + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ - + /*---------------------------------------------------------------------------*/ /* Convert id to index into above table. */ /*---------------------------------------------------------------------------*/ @@ -189,6 +187,7 @@ id_to_index (const gchar *id) return 0; } + /*---------------------------------------------------------------------------*/ /* Convert name to index into above table. */ /*---------------------------------------------------------------------------*/ @@ -209,6 +208,7 @@ name_to_index (const gchar *name) return 0; } + /*****************************************************************************/ /* Call appropriate barcode backend to create barcode in intermediate format.*/ /*****************************************************************************/ @@ -236,6 +236,7 @@ gl_barcode_new (const gchar *id, return gbc; } + /*****************************************************************************/ /* Free previously created barcode. */ /*****************************************************************************/ @@ -265,6 +266,7 @@ gl_barcode_free (glBarcode **gbc) } } + /*****************************************************************************/ /* Get a list of names for valid barcode styles. */ /*****************************************************************************/ @@ -281,6 +283,7 @@ gl_barcode_get_styles_list (void) return list; } + /*****************************************************************************/ /* Free up a previously allocated list of style names. */ /*****************************************************************************/ @@ -320,6 +323,7 @@ gl_barcode_default_digits (const gchar *id, } } + /*****************************************************************************/ /* Query text capabilities. */ /*****************************************************************************/ @@ -329,12 +333,14 @@ gl_barcode_can_text (const gchar *id) return backends[id_to_index (id)].can_text; } + gboolean gl_barcode_text_optional (const gchar *id) { return backends[id_to_index (id)].text_optional; } + /*****************************************************************************/ /* Query checksum capabilities. */ /*****************************************************************************/ @@ -344,6 +350,7 @@ gl_barcode_can_csum (const gchar *id) return backends[id_to_index (id)].can_checksum; } + gboolean gl_barcode_csum_optional (const gchar *id) { @@ -360,6 +367,7 @@ gl_barcode_can_freeform (const gchar *id) return backends[id_to_index (id)].can_freeform; } + /*****************************************************************************/ /* Query prefered number of digits of input. */ /*****************************************************************************/ @@ -369,6 +377,7 @@ gl_barcode_get_prefered_n (const gchar *id) return backends[id_to_index (id)].prefered_n; } + /*****************************************************************************/ /* Convert style to text. */ /*****************************************************************************/ @@ -378,6 +387,7 @@ gl_barcode_id_to_name (const gchar *id) return backends[id_to_index (id)].name; } + /*****************************************************************************/ /* Convert name to style. */ /*****************************************************************************/ @@ -388,3 +398,14 @@ gl_barcode_name_to_id (const gchar *name) return backends[name_to_index (name)].id; } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/bc.h b/glabels2/src/bc.h index f46d8897..1e62a6fa 100644 --- a/glabels2/src/bc.h +++ b/glabels2/src/bc.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * bc.h: GLabels barcode module header file + * bc.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __BC_H__ #define __BC_H__ -#include -#include +#include #include G_BEGIN_DECLS @@ -88,3 +84,13 @@ G_END_DECLS #endif /* __BC_H__ */ + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/cairo-ellipse-path.c b/glabels2/src/cairo-ellipse-path.c index 3a4cb888..b0fd4493 100644 --- a/glabels2/src/cairo-ellipse-path.c +++ b/glabels2/src/cairo-ellipse-path.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * cairo_ellipse_path.c: Cairo ellipse path module + * cairo-ellipse-path.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -27,30 +23,32 @@ #include "cairo-ellipse-path.h" #include -#include #include "debug.h" + /*===========================================*/ /* Private macros and constants. */ /*===========================================*/ #define ARC_FINE 2 + /*===========================================*/ /* Private types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ - /*****************************************************************************/ /* Create ellipse path */ /*****************************************************************************/ @@ -77,3 +75,12 @@ gl_cairo_ellipse_path (cairo_t *cr, } + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/cairo-ellipse-path.h b/glabels2/src/cairo-ellipse-path.h index 3c6a7568..9da409af 100644 --- a/glabels2/src/cairo-ellipse-path.h +++ b/glabels2/src/cairo-ellipse-path.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * cairo_ellipse_path.h: Cairo ellipse path module header file + * cairo-ellipse-path.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __CAIRO_ELLIPSE_PATH_H__ @@ -38,3 +34,14 @@ void gl_cairo_ellipse_path (cairo_t *cr, G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/cairo-label-path.c b/glabels2/src/cairo-label-path.c index 1bc194ac..59b8db13 100644 --- a/glabels2/src/cairo-label-path.c +++ b/glabels2/src/cairo-label-path.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * cairo_label_path.c: Cairo label path module + * cairo-label-path.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -27,18 +23,20 @@ #include "cairo-label-path.h" #include -#include #include "debug.h" + /*===========================================*/ /* Private types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -56,7 +54,7 @@ static void gl_cairo_cd_label_path (cairo_t *cr, gboolean rotate_flag, gboolean waste_flag); - + /*--------------------------------------------------------------------------*/ /* Create label path */ /*--------------------------------------------------------------------------*/ @@ -94,6 +92,7 @@ gl_cairo_label_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*--------------------------------------------------------------------------*/ /* Create rectangular label path */ /*--------------------------------------------------------------------------*/ @@ -152,6 +151,7 @@ gl_cairo_rect_label_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*--------------------------------------------------------------------------*/ /* Create round label path */ /*--------------------------------------------------------------------------*/ @@ -193,6 +193,7 @@ gl_cairo_round_label_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*--------------------------------------------------------------------------*/ /* Create cd label path */ /*--------------------------------------------------------------------------*/ @@ -261,3 +262,13 @@ gl_cairo_cd_label_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/cairo-label-path.h b/glabels2/src/cairo-label-path.h index ad0495f5..9bb3c23d 100644 --- a/glabels2/src/cairo-label-path.h +++ b/glabels2/src/cairo-label-path.h @@ -1,32 +1,28 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * cairo_label_path.h: Cairo label path module header file + * cairo-label-path.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __CAIRO_LABEL_PATH_H__ #define __CAIRO_LABEL_PATH_H__ #include -#include +#include G_BEGIN_DECLS @@ -38,3 +34,14 @@ void gl_cairo_label_path (cairo_t *cr, G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/cairo-markup-path.c b/glabels2/src/cairo-markup-path.c index 04a2a68f..7a8bab38 100644 --- a/glabels2/src/cairo-markup-path.c +++ b/glabels2/src/cairo-markup-path.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * cairo_markup_path.c: Cairo markup path module + * cairo-markup-path.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -27,18 +23,20 @@ #include "cairo-markup-path.h" #include -#include #include "debug.h" + /*===========================================*/ /* Private types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -68,7 +66,7 @@ static void gl_cairo_markup_circle_path (cairo_t * static void gl_cairo_markup_rect_path (cairo_t *cr, const lglTemplateMarkup *markup); - + /*--------------------------------------------------------------------------*/ /* Create markup path */ /*--------------------------------------------------------------------------*/ @@ -100,6 +98,7 @@ gl_cairo_markup_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw margin markup. */ /*---------------------------------------------------------------------------*/ @@ -136,6 +135,7 @@ gl_cairo_markup_margin_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw simple recangular margin. */ /*---------------------------------------------------------------------------*/ @@ -175,6 +175,7 @@ gl_cairo_markup_margin_rect_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw round margin. */ /*---------------------------------------------------------------------------*/ @@ -199,6 +200,7 @@ gl_cairo_markup_margin_round_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw CD margins. */ /*---------------------------------------------------------------------------*/ @@ -248,6 +250,7 @@ gl_cairo_markup_margin_cd_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw line markup. */ /*---------------------------------------------------------------------------*/ @@ -263,6 +266,7 @@ gl_cairo_markup_line_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw circle markup. */ /*---------------------------------------------------------------------------*/ @@ -281,6 +285,7 @@ gl_cairo_markup_circle_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw rect markup. */ /*---------------------------------------------------------------------------*/ @@ -313,3 +318,13 @@ gl_cairo_markup_rect_path (cairo_t *cr, gl_debug (DEBUG_PATH, "END"); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/cairo-markup-path.h b/glabels2/src/cairo-markup-path.h index 9dfab554..3f375b20 100644 --- a/glabels2/src/cairo-markup-path.h +++ b/glabels2/src/cairo-markup-path.h @@ -1,32 +1,28 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * cairo_markup_path.h: Cairo markup path module header file + * cairo-markup-path.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __CAIRO_MARKUP_PATH_H__ #define __CAIRO_MARKUP_PATH_H__ #include -#include +#include #include "label.h" G_BEGIN_DECLS @@ -38,3 +34,14 @@ void gl_cairo_markup_path (cairo_t *cr, G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/color-combo-button.c b/glabels2/src/color-combo-button.c index f32bbf2d..65461be2 100644 --- a/glabels2/src/color-combo-button.c +++ b/glabels2/src/color-combo-button.c @@ -22,15 +22,13 @@ #include "color-combo-button.h" -#include "color-combo-menu.h" #include -#include -#include +#include + +#include "color-combo-menu.h" #include "color-swatch.h" -#include -#include "marshal.h" #include "color.h" - +#include "marshal.h" #define IMAGE_W 24 #define IMAGE_H 24 diff --git a/glabels2/src/color-combo-button.h b/glabels2/src/color-combo-button.h index fca405e5..f5878476 100644 --- a/glabels2/src/color-combo-button.h +++ b/glabels2/src/color-combo-button.h @@ -22,7 +22,7 @@ #define __GL_COLOR_COMBO_BUTTON_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/color-combo-color-menu-item.c b/glabels2/src/color-combo-color-menu-item.c index 2ffc1cbc..bdaca24a 100644 --- a/glabels2/src/color-combo-color-menu-item.c +++ b/glabels2/src/color-combo-color-menu-item.c @@ -22,13 +22,12 @@ #include "color-combo-color-menu-item.h" -#include "marshal.h" #include -#include -#include -#include +#include + #include "color-swatch.h" #include "color.h" +#include "marshal.h" diff --git a/glabels2/src/color-combo-color-menu-item.h b/glabels2/src/color-combo-color-menu-item.h index 1fc70f27..15d59353 100644 --- a/glabels2/src/color-combo-color-menu-item.h +++ b/glabels2/src/color-combo-color-menu-item.h @@ -22,7 +22,7 @@ #define __COLOR_COMBO_COLOR_MENU_ITEM_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/color-combo-history.c b/glabels2/src/color-combo-history.c index decc99e4..31eacf49 100644 --- a/glabels2/src/color-combo-history.c +++ b/glabels2/src/color-combo-history.c @@ -20,7 +20,6 @@ #include - #include "color-combo-history.h" #include "color.h" diff --git a/glabels2/src/color-combo-menu.c b/glabels2/src/color-combo-menu.c index c96573e0..d24a233b 100644 --- a/glabels2/src/color-combo-menu.c +++ b/glabels2/src/color-combo-menu.c @@ -22,16 +22,13 @@ #include "color-combo-menu.h" -#include "marshal.h" #include -#include -#include -#include -#include -#include +#include + #include "color-combo-color-menu-item.h" #include "color-combo-history.h" #include "color.h" +#include "marshal.h" /*===========================================*/ diff --git a/glabels2/src/color-combo-menu.h b/glabels2/src/color-combo-menu.h index 78908bad..e309e0a0 100644 --- a/glabels2/src/color-combo-menu.h +++ b/glabels2/src/color-combo-menu.h @@ -21,7 +21,7 @@ #ifndef __COLOR_COMBO_MENU_H__ #define __COLOR_COMBO_MENU_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/color-combo.c b/glabels2/src/color-combo.c index 02008b2e..250292d4 100644 --- a/glabels2/src/color-combo.c +++ b/glabels2/src/color-combo.c @@ -22,13 +22,13 @@ #include "color-combo.h" -#include "color-combo-menu.h" #include -#include +#include + +#include "color-combo-menu.h" #include "color-swatch.h" -#include -#include "marshal.h" #include "color.h" +#include "marshal.h" #define IMAGE_W 24 diff --git a/glabels2/src/color-combo.h b/glabels2/src/color-combo.h index 6f1d3562..baa928d9 100644 --- a/glabels2/src/color-combo.h +++ b/glabels2/src/color-combo.h @@ -22,7 +22,7 @@ #define __GL_COLOR_COMBO_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/color-swatch.c b/glabels2/src/color-swatch.c index 8a413462..ae71f1a7 100644 --- a/glabels2/src/color-swatch.c +++ b/glabels2/src/color-swatch.c @@ -22,8 +22,8 @@ #include "color-swatch.h" -#include "marshal.h" #include "color.h" +#include "marshal.h" /*===========================================*/ diff --git a/glabels2/src/color-swatch.h b/glabels2/src/color-swatch.h index 94c09a9c..c6e05fb9 100644 --- a/glabels2/src/color-swatch.h +++ b/glabels2/src/color-swatch.h @@ -22,7 +22,7 @@ #define __COLOR_SWATCH_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/color.c b/glabels2/src/color.c index e8c039dc..2a87c9e1 100644 --- a/glabels2/src/color.c +++ b/glabels2/src/color.c @@ -1,32 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * color.c: various small utilities for dealing with canvas colors + * color.c + * Copyright (C) 2002-2009 Jim Evins . * - * Copyright (C) 2002-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "color.h" #include + /*****************************************************************************/ /* Apply given opacity to given color. */ /*****************************************************************************/ @@ -41,6 +39,7 @@ gl_color_set_opacity (guint color, return new_color; } + /*****************************************************************************/ /* Resolve actual shadow color by adjusting opacity. */ /*****************************************************************************/ @@ -57,6 +56,7 @@ gl_color_shadow (guint base_color, return color; } + /*****************************************************************************/ /* Convert gLabels color into a GdkColor */ /*****************************************************************************/ @@ -74,6 +74,7 @@ gl_color_to_gdk_color (guint color) return gdk_color; } + /*****************************************************************************/ /* Convert GdkColor into a gLabels color */ /*****************************************************************************/ @@ -89,6 +90,7 @@ gl_color_from_gdk_color (GdkColor *gdk_color) return color; } + /****************************************************************************/ /* Create a single color node with default color. */ /****************************************************************************/ @@ -106,6 +108,7 @@ gl_color_node_new_default (void) return color_node; } + /****************************************************************************/ /* Copy a single color node. */ /****************************************************************************/ @@ -132,6 +135,7 @@ gl_color_node_dup (glColorNode *src) return dst; } + /****************************************************************************/ /* Compare 2 color nodes for equality. */ /****************************************************************************/ @@ -181,6 +185,7 @@ gl_color_node_equal (glColorNode *color_node1, return (strcmp (color_node1->key, color_node2->key) == 0); } + /****************************************************************************/ /* Expand single node into representative color. */ /****************************************************************************/ @@ -228,6 +233,7 @@ gl_color_node_expand (glColorNode *color_node, } } + /****************************************************************************/ /* Free a single color node. */ /****************************************************************************/ @@ -241,3 +247,14 @@ gl_color_node_free (glColorNode **color_node) g_free (*color_node); *color_node = NULL; } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/color.h b/glabels2/src/color.h index 113f9527..48feed7e 100644 --- a/glabels2/src/color.h +++ b/glabels2/src/color.h @@ -1,32 +1,28 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * color.h: various small utilities for dealing with canvas colors + * color.h + * Copyright (C) 2002-2009 Jim Evins . * - * Copyright (C) 2002-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __COLOR_H__ #define __COLOR_H__ #include "merge.h" -#include +#include G_BEGIN_DECLS @@ -124,3 +120,14 @@ void gl_color_node_free (glColorNode **color_node); G_END_DECLS #endif /* __COLOR_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/critical-error-handler.c b/glabels2/src/critical-error-handler.c index 69a88665..0d9fed1d 100644 --- a/glabels2/src/critical-error-handler.c +++ b/glabels2/src/critical-error-handler.c @@ -1,43 +1,39 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * critical-error-handler.c: critical error handler + * critical-error-handler.h + * Copyright (C) 2005-2009 Jim Evins . * - * Copyright (C) 2005 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License + * along with gLabels. If not, see . */ #include #include "critical-error-handler.h" -#include +#include #include -#include -#include +#include #include + static void critical_error_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data); - + /***************************************************************************/ /* Initialize error handler. */ /***************************************************************************/ @@ -55,6 +51,7 @@ gl_critical_error_handler_init (void) "glabels"); } + /*-------------------------------------------------------------------------*/ /* PRIVATE. Actual error handler. */ /*-------------------------------------------------------------------------*/ @@ -81,3 +78,13 @@ critical_error_handler (const gchar *log_domain, abort (); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/critical-error-handler.h b/glabels2/src/critical-error-handler.h index 890db9b5..e356ebf2 100644 --- a/glabels2/src/critical-error-handler.h +++ b/glabels2/src/critical-error-handler.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * critical-error-handler.h: critical error handler header file + * critical-error-handler.h + * Copyright (C) 2005-2009 Jim Evins . * - * Copyright (C) 2005 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License + * along with gLabels. If not, see . */ #ifndef __CRITICAL_ERROR_HANDLER_H__ #define __CRITICAL_ERROR_HANDLER_H__ -#include +#include G_BEGIN_DECLS @@ -34,3 +30,14 @@ void gl_critical_error_handler_init (void); G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/debug.c b/glabels2/src/debug.c index c1ef8f7a..ce53820a 100644 --- a/glabels2/src/debug.c +++ b/glabels2/src/debug.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * debug.c: GLabels debug module + * debug.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ /* @@ -32,13 +28,12 @@ #include "debug.h" -#include -#include -#include -#include +#include + glDebugSection debug_flags = GLABELS_DEBUG_NONE; + /****************************************************************************/ /* Initialize debug flags, based on environmental variables. */ /****************************************************************************/ @@ -129,3 +124,14 @@ gl_debug (glDebugSection section, } } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/debug.h b/glabels2/src/debug.h index 1683c330..6dced6d4 100644 --- a/glabels2/src/debug.h +++ b/glabels2/src/debug.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * debug.h: GLabels debug module + * debug.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ /* @@ -32,7 +28,7 @@ #ifndef __DEBUG_H__ #define __DEBUG_H__ -#include +#include G_BEGIN_DECLS @@ -110,3 +106,14 @@ void gl_debug (glDebugSection section, G_END_DECLS #endif /* __DEBUG_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/file.c b/glabels2/src/file.c index 86073e75..cef0481e 100644 --- a/glabels2/src/file.c +++ b/glabels2/src/file.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * file.c: FILE menu dialog module + * file.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -27,11 +23,7 @@ #include "file.h" #include -#include -#include -#include -#include -#include +#include #include #include "xml-label.h" @@ -40,8 +32,10 @@ #include "window.h" #include "new-label-dialog.h" #include "libglabels/libglabels.h" + #include "debug.h" + /*===========================================*/ /* Private globals */ /*===========================================*/ @@ -56,6 +50,7 @@ static gboolean rotate_flag = FALSE; static gchar *open_path = NULL; static gchar *save_path = NULL; + /*===========================================*/ /* Local function prototypes. */ /*===========================================*/ @@ -74,7 +69,7 @@ static void save_as_response (GtkDialog *chooser, gint response, glLabel *label); - + /*****************************************************************************/ /* "New" menu callback. */ /*****************************************************************************/ @@ -112,6 +107,7 @@ gl_file_new (glWindow *window) gl_debug (DEBUG_FILE, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. New "ok" button callback. */ /*---------------------------------------------------------------------------*/ @@ -172,6 +168,7 @@ new_response (GtkDialog *dialog, gl_debug (DEBUG_FILE, "END"); } + /*****************************************************************************/ /* "Properties" menu callback. */ /*****************************************************************************/ @@ -215,6 +212,7 @@ gl_file_properties (glLabel *label, gl_debug (DEBUG_FILE, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Properties "ok" button callback. */ /*---------------------------------------------------------------------------*/ @@ -261,6 +259,7 @@ properties_response (GtkDialog *dialog, gl_debug (DEBUG_FILE, "END"); } + /*****************************************************************************/ /* "Open" menu callback. */ /*****************************************************************************/ @@ -308,6 +307,7 @@ gl_file_open (glWindow *window) gl_debug (DEBUG_FILE, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Open "response" callback. */ /*---------------------------------------------------------------------------*/ @@ -405,6 +405,7 @@ gl_file_open_recent (const gchar *filename, } } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Open a file. */ /*---------------------------------------------------------------------------*/ @@ -467,6 +468,7 @@ gl_file_open_real (const gchar *filename, } } + /*****************************************************************************/ /* "Save" menu callback. */ /*****************************************************************************/ @@ -535,6 +537,7 @@ gl_file_save (glLabel *label, } } + /*****************************************************************************/ /* "Save As" menu callback. */ /*****************************************************************************/ @@ -603,6 +606,7 @@ gl_file_save_as (glLabel *label, return saved_flag; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. "Save As" ok button callback. */ /*---------------------------------------------------------------------------*/ @@ -821,6 +825,7 @@ gl_file_close (glWindow *window) return close; } + /*****************************************************************************/ /* "Exit" menu callback. */ /*****************************************************************************/ @@ -842,3 +847,14 @@ gl_file_exit (void) gl_debug (DEBUG_FILE, "END"); } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/file.h b/glabels2/src/file.h index ba826075..3ac975e1 100644 --- a/glabels2/src/file.h +++ b/glabels2/src/file.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * file.h: FILE menu dialog module header file + * file.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2000 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __FILE_H__ #define __FILE_H__ -#include +#include #include "label.h" #include "window.h" @@ -63,3 +59,14 @@ void gl_file_exit (void); G_END_DECLS #endif /* __FILE_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/font-combo-menu-item.c b/glabels2/src/font-combo-menu-item.c index 5c16ffae..a1b4e497 100644 --- a/glabels2/src/font-combo-menu-item.c +++ b/glabels2/src/font-combo-menu-item.c @@ -22,13 +22,11 @@ #include "font-combo-menu-item.h" +#include +#include + #include "font-sample.h" #include "marshal.h" -#include -#include -#include -#include -#include diff --git a/glabels2/src/font-combo-menu-item.h b/glabels2/src/font-combo-menu-item.h index 010b0c16..30681616 100644 --- a/glabels2/src/font-combo-menu-item.h +++ b/glabels2/src/font-combo-menu-item.h @@ -22,7 +22,7 @@ #define __FONT_COMBO_MENU_ITEM_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/font-combo-menu.c b/glabels2/src/font-combo-menu.c index 87c1ece7..34c93979 100644 --- a/glabels2/src/font-combo-menu.c +++ b/glabels2/src/font-combo-menu.c @@ -22,13 +22,12 @@ #include "font-combo-menu.h" -#include "marshal.h" #include -#include -#include -#include +#include + #include "font-combo-menu-item.h" #include "font-util.h" +#include "marshal.h" /*===========================================*/ diff --git a/glabels2/src/font-combo-menu.h b/glabels2/src/font-combo-menu.h index df65b0d2..d40fa43a 100644 --- a/glabels2/src/font-combo-menu.h +++ b/glabels2/src/font-combo-menu.h @@ -21,7 +21,7 @@ #ifndef __FONT_COMBO_MENU_H__ #define __FONT_COMBO_MENU_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/font-combo.c b/glabels2/src/font-combo.c index f77d5ad2..ffd8877e 100644 --- a/glabels2/src/font-combo.c +++ b/glabels2/src/font-combo.c @@ -22,12 +22,11 @@ #include "font-combo.h" +#include +#include + #include "font-combo-menu.h" #include "font-util.h" -#include -#include -#include -#include #include "marshal.h" diff --git a/glabels2/src/font-combo.h b/glabels2/src/font-combo.h index e53d6e0d..a7b9de6b 100644 --- a/glabels2/src/font-combo.h +++ b/glabels2/src/font-combo.h @@ -22,7 +22,7 @@ #define __GL_FONT_COMBO_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/font-sample.h b/glabels2/src/font-sample.h index 16d0e254..7946e774 100644 --- a/glabels2/src/font-sample.h +++ b/glabels2/src/font-sample.h @@ -22,7 +22,7 @@ #define __FONT_SAMPLE_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/font-util.c b/glabels2/src/font-util.c index 1bb54b77..e4cd2e08 100644 --- a/glabels2/src/font-util.c +++ b/glabels2/src/font-util.c @@ -22,10 +22,11 @@ #include "font-util.h" +#include #include #include -#include -#include + +#include /****************************************************************************/ diff --git a/glabels2/src/font-util.h b/glabels2/src/font-util.h index 7060d117..79449efa 100644 --- a/glabels2/src/font-util.h +++ b/glabels2/src/font-util.h @@ -21,7 +21,7 @@ #ifndef __FONT_UTIL_H__ #define __FONT_UTIL_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/glabels-batch.c b/glabels2/src/glabels-batch.c index e4cb2c4d..05e91fac 100644 --- a/glabels2/src/glabels-batch.c +++ b/glabels2/src/glabels-batch.c @@ -22,13 +22,14 @@ #include +#include + +#include #include "merge-init.h" #include "xml-label.h" #include "print.h" #include "print-op.h" -#include #include "util.h" -#include #include "prefs.h" #include "debug.h" diff --git a/glabels2/src/glabels.c b/glabels2/src/glabels.c index 3bac82f7..14e300bb 100644 --- a/glabels2/src/glabels.c +++ b/glabels2/src/glabels.c @@ -1,37 +1,33 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - -/** - * (GLABELS) Label and Business Card Creation program for GNOME - * - * glabels.c: GLabels main module +/* + * glabels.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include #include +#include #include "warning-handler.h" #include "critical-error-handler.h" #include "stock.h" #include "merge-init.h" #include "recent.h" -#include #include "mini-preview-pixbuf-cache.h" #include "prefs.h" #include "debug.h" @@ -155,3 +151,13 @@ main (int argc, char **argv) return 0; } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/hig.h b/glabels2/src/hig.h index 6b4c2494..7db439a8 100644 --- a/glabels2/src/hig.h +++ b/glabels2/src/hig.h @@ -1,30 +1,28 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * hig.h: HIG inspired dialogs and layout tools + * hig.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __HIG_H__ #define __HIG_H__ +#include + G_BEGIN_DECLS #define GL_HIG_PAD1 6 @@ -33,3 +31,15 @@ G_BEGIN_DECLS G_END_DECLS #endif /* __HIG_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-barcode.c b/glabels2/src/label-barcode.c index 7c450648..c45c20c2 100644 --- a/glabels2/src/label-barcode.c +++ b/glabels2/src/label-barcode.c @@ -1,44 +1,41 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_barcode.c: GLabels label text object + * label-barcode.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ +#include + #include "label-barcode.h" +#include #include -#include -#include -#include -#include #include #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ #define FONT_SCALE (72.0/96.0) + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -52,10 +49,12 @@ struct _glLabelBarcodePrivate { guint format_digits; }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ @@ -80,12 +79,12 @@ static void draw_object (glLabelObject *object, glMergeRecord *record); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glLabelBarcode, gl_label_barcode, GL_TYPE_LABEL_OBJECT); + static void gl_label_barcode_class_init (glLabelBarcodeClass *class) { @@ -104,6 +103,7 @@ gl_label_barcode_class_init (glLabelBarcodeClass *class) object_class->finalize = gl_label_barcode_finalize; } + static void gl_label_barcode_init (glLabelBarcode *lbc) { @@ -112,6 +112,7 @@ gl_label_barcode_init (glLabelBarcode *lbc) lbc->priv->text_node = gl_text_node_new_from_text (""); } + static void gl_label_barcode_finalize (GObject *object) { @@ -127,6 +128,7 @@ gl_label_barcode_finalize (GObject *object) G_OBJECT_CLASS (gl_label_barcode_parent_class)->finalize (object); } + /*****************************************************************************/ /* NEW label "barcode" object. */ /*****************************************************************************/ @@ -142,6 +144,7 @@ gl_label_barcode_new (glLabel *label) return G_OBJECT (lbc); } + /*****************************************************************************/ /* Copy object contents. */ /*****************************************************************************/ @@ -202,6 +205,7 @@ gl_label_barcode_set_data (glLabelBarcode *lbc, gl_debug (DEBUG_LABEL, "END"); } + void gl_label_barcode_set_props (glLabelBarcode *lbc, gchar *id, @@ -243,6 +247,7 @@ gl_label_barcode_get_data (glLabelBarcode *lbc) return gl_text_node_dup (lbc->priv->text_node); } + void gl_label_barcode_get_props (glLabelBarcode *lbc, gchar **id, @@ -258,6 +263,7 @@ gl_label_barcode_get_props (glLabelBarcode *lbc, *format_digits = lbc->priv->format_digits; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Get object size method. */ /*---------------------------------------------------------------------------*/ @@ -322,6 +328,7 @@ get_size (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Set line color method. */ /*---------------------------------------------------------------------------*/ @@ -341,6 +348,7 @@ set_line_color (glLabelObject *object, } } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Get line color method. */ /*---------------------------------------------------------------------------*/ @@ -354,6 +362,7 @@ get_line_color (glLabelObject *object) return gl_color_node_dup (lbarcode->priv->color_node); } + /*****************************************************************************/ /* Draw object method. */ /*****************************************************************************/ @@ -481,3 +490,14 @@ draw_object (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-barcode.h b/glabels2/src/label-barcode.h index 4eda31da..61fde06b 100644 --- a/glabels2/src/label-barcode.h +++ b/glabels2/src/label-barcode.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_barcode.h: GLabels label barcode object + * label-barcode.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __LABEL_BARCODE_H__ @@ -76,3 +72,15 @@ void gl_label_barcode_get_props (glLabelBarcode *lbc, G_END_DECLS #endif /* __LABEL_BARCODE_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-box.c b/glabels2/src/label-box.c index a42ad75b..26797368 100644 --- a/glabels2/src/label-box.c +++ b/glabels2/src/label-box.c @@ -1,35 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_box.c: GLabels label box object + * label-box.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include "label-box.h" -#include -#include -#include +#include #include "debug.h" + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -40,10 +35,12 @@ struct _glLabelBoxPrivate { glColorNode *fill_color_node; }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ @@ -79,14 +76,12 @@ static void draw_shadow (glLabelObject *object, glMergeRecord *record); - - - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glLabelBox, gl_label_box, GL_TYPE_LABEL_OBJECT); + static void gl_label_box_class_init (glLabelBoxClass *class) { @@ -108,6 +103,7 @@ gl_label_box_class_init (glLabelBoxClass *class) object_class->finalize = gl_label_box_finalize; } + static void gl_label_box_init (glLabelBox *lbox) { @@ -116,6 +112,7 @@ gl_label_box_init (glLabelBox *lbox) lbox->priv->fill_color_node = gl_color_node_new_default (); } + static void gl_label_box_finalize (GObject *object) { @@ -130,6 +127,7 @@ gl_label_box_finalize (GObject *object) G_OBJECT_CLASS (gl_label_box_parent_class)->finalize (object); } + /*****************************************************************************/ /* NEW label "box" object. */ /*****************************************************************************/ @@ -145,6 +143,7 @@ gl_label_box_new (glLabel *label) return G_OBJECT (lbox); } + /*****************************************************************************/ /* Copy object contents. */ /*****************************************************************************/ @@ -201,6 +200,7 @@ set_fill_color (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Set line color method. */ /*---------------------------------------------------------------------------*/ @@ -219,6 +219,7 @@ set_line_color (glLabelObject *object, } } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Set line width method. */ /*---------------------------------------------------------------------------*/ @@ -250,6 +251,7 @@ get_line_width (glLabelObject *object) return lbox->priv->line_width; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Get line color method. */ /*---------------------------------------------------------------------------*/ @@ -263,6 +265,7 @@ get_line_color (glLabelObject *object) return gl_color_node_dup (lbox->priv->line_color_node); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Get line width method. */ /*---------------------------------------------------------------------------*/ @@ -276,6 +279,7 @@ get_fill_color (glLabelObject *object) return gl_color_node_dup (lbox->priv->fill_color_node); } + /*****************************************************************************/ /* Draw object method. */ /*****************************************************************************/ @@ -329,6 +333,7 @@ draw_object (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Draw shadow method. */ /*****************************************************************************/ @@ -400,3 +405,14 @@ draw_shadow (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-box.h b/glabels2/src/label-box.h index 93b05a64..fdd623f7 100644 --- a/glabels2/src/label-box.h +++ b/glabels2/src/label-box.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_box.h: GLabels label box object + * label-box.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __LABEL_BOX_H__ @@ -59,3 +55,15 @@ GObject *gl_label_box_new (glLabel *label); G_END_DECLS #endif /* __LABEL_BOX_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-ellipse.c b/glabels2/src/label-ellipse.c index fb21cbf2..d3270680 100644 --- a/glabels2/src/label-ellipse.c +++ b/glabels2/src/label-ellipse.c @@ -1,32 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_ellipse.c: GLabels label ellipse object + * label-ellipse.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include "label-ellipse.h" -#include -#include -#include +#include #include #include "cairo-ellipse-path.h" @@ -55,25 +49,25 @@ struct _glLabelEllipsePrivate { /* Private function prototypes. */ /*========================================================*/ -static void gl_label_ellipse_finalize (GObject *object); +static void gl_label_ellipse_finalize (GObject *object); -static void copy (glLabelObject *dst_object, - glLabelObject *src_object); +static void copy (glLabelObject *dst_object, + glLabelObject *src_object); -static void set_fill_color (glLabelObject *object, - glColorNode *fill_color_node); +static void set_fill_color (glLabelObject *object, + glColorNode *fill_color_node); -static void set_line_color (glLabelObject *object, - glColorNode *line_color_node); +static void set_line_color (glLabelObject *object, + glColorNode *line_color_node); -static void set_line_width (glLabelObject *object, - gdouble line_width); +static void set_line_width (glLabelObject *object, + gdouble line_width); -static glColorNode* get_fill_color (glLabelObject *object); +static glColorNode* get_fill_color (glLabelObject *object); -static glColorNode* get_line_color (glLabelObject *object); +static glColorNode* get_line_color (glLabelObject *object); -static gdouble get_line_width (glLabelObject *object); +static gdouble get_line_width (glLabelObject *object); static void draw_object (glLabelObject *object, cairo_t *cr, @@ -86,13 +80,12 @@ static void draw_shadow (glLabelObject *object, glMergeRecord *record); - - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glLabelEllipse, gl_label_ellipse, GL_TYPE_LABEL_OBJECT); + static void gl_label_ellipse_class_init (glLabelEllipseClass *class) { @@ -114,6 +107,7 @@ gl_label_ellipse_class_init (glLabelEllipseClass *class) object_class->finalize = gl_label_ellipse_finalize; } + static void gl_label_ellipse_init (glLabelEllipse *lellipse) { @@ -122,6 +116,7 @@ gl_label_ellipse_init (glLabelEllipse *lellipse) lellipse->priv->fill_color_node = gl_color_node_new_default (); } + static void gl_label_ellipse_finalize (GObject *object) { @@ -136,6 +131,7 @@ gl_label_ellipse_finalize (GObject *object) G_OBJECT_CLASS (gl_label_ellipse_parent_class)->finalize (object); } + /*****************************************************************************/ /* NEW label "ellipse" object. */ /*****************************************************************************/ @@ -151,6 +147,7 @@ gl_label_ellipse_new (glLabel *label) return G_OBJECT (lellipse); } + /*****************************************************************************/ /* Copy object contents. */ /*****************************************************************************/ @@ -204,6 +201,7 @@ set_fill_color (glLabelObject *object, } } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Set line color method. */ /*---------------------------------------------------------------------------*/ @@ -224,6 +222,7 @@ set_line_color (glLabelObject *object, } } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Set line width method. */ /*---------------------------------------------------------------------------*/ @@ -255,6 +254,7 @@ get_line_width (glLabelObject *object) return lellipse->priv->line_width; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Get line color method. */ /*---------------------------------------------------------------------------*/ @@ -268,6 +268,7 @@ get_line_color (glLabelObject *object) return gl_color_node_dup (lellipse->priv->line_color_node); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Get line width method. */ /*---------------------------------------------------------------------------*/ @@ -281,6 +282,7 @@ get_fill_color (glLabelObject *object) return gl_color_node_dup (lellipse->priv->fill_color_node); } + /*****************************************************************************/ /* Draw object method. */ /*****************************************************************************/ @@ -334,6 +336,7 @@ draw_object (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Draw shadow method. */ /*****************************************************************************/ @@ -405,3 +408,14 @@ draw_shadow (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-ellipse.h b/glabels2/src/label-ellipse.h index 439ad5f9..d1a01221 100644 --- a/glabels2/src/label-ellipse.h +++ b/glabels2/src/label-ellipse.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_ellipse.h: GLabels label ellipse object + * label-ellipse.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __LABEL_ELLIPSE_H__ @@ -59,3 +55,15 @@ GObject *gl_label_ellipse_new (glLabel *label); G_END_DECLS #endif /* __LABEL_ELLIPSE_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-image.c b/glabels2/src/label-image.c index 9d0bcaf2..d325dc69 100644 --- a/glabels2/src/label-image.c +++ b/glabels2/src/label-image.c @@ -1,33 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_image.c: GLabels label image object + * label-image.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ +#include + #include "label-image.h" -#include -#include -#include -#include +#include +#include #include "pixmaps/checkerboard.xpm" @@ -46,12 +42,14 @@ struct _glLabelImagePrivate { GdkPixbuf *pixbuf; }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ static GdkPixbuf *default_pixbuf = NULL; + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ @@ -61,22 +59,22 @@ static void gl_label_image_finalize (GObject *object); static void copy (glLabelObject *dst_object, glLabelObject *src_object); -static void set_size (glLabelObject *object, - gdouble w, - gdouble h); +static void set_size (glLabelObject *object, + gdouble w, + gdouble h); -static void draw_object (glLabelObject *object, +static void draw_object (glLabelObject *object, cairo_t *cr, gboolean screen_flag, glMergeRecord *record); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glLabelImage, gl_label_image, GL_TYPE_LABEL_OBJECT); + static void gl_label_image_class_init (glLabelImageClass *class) { @@ -93,6 +91,7 @@ gl_label_image_class_init (glLabelImageClass *class) object_class->finalize = gl_label_image_finalize; } + static void gl_label_image_init (glLabelImage *limage) { @@ -112,6 +111,7 @@ gl_label_image_init (glLabelImage *limage) limage->priv->pixbuf = default_pixbuf; } + static void gl_label_image_finalize (GObject *object) { @@ -132,6 +132,7 @@ gl_label_image_finalize (GObject *object) G_OBJECT_CLASS (gl_label_image_parent_class)->finalize (object); } + /*****************************************************************************/ /* NEW label "image" object. */ /*****************************************************************************/ @@ -147,6 +148,7 @@ gl_label_image_new (glLabel *label) return G_OBJECT (limage); } + /*****************************************************************************/ /* Copy object contents. */ /*****************************************************************************/ @@ -288,6 +290,7 @@ gl_label_image_get_filename (glLabelImage *limage) return gl_text_node_dup (limage->priv->filename); } + const GdkPixbuf * gl_label_image_get_pixbuf (glLabelImage *limage, glMergeRecord *record) @@ -319,6 +322,7 @@ gl_label_image_get_pixbuf (glLabelImage *limage, } + /*****************************************************************************/ /* Draw object method. */ /*****************************************************************************/ @@ -357,3 +361,12 @@ draw_object (glLabelObject *object, + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-image.h b/glabels2/src/label-image.h index a45f0c79..15216c37 100644 --- a/glabels2/src/label-image.h +++ b/glabels2/src/label-image.h @@ -1,34 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_image.h: GLabels label image object + * label-image.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __LABEL_IMAGE_H__ #define __LABEL_IMAGE_H__ +#include #include "label-object.h" #include "text-node.h" #include "merge.h" -#include G_BEGIN_DECLS @@ -69,3 +65,15 @@ const GdkPixbuf *gl_label_image_get_pixbuf (glLabelImage *limage, G_END_DECLS #endif /* __LABEL_IMAGE_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-line.c b/glabels2/src/label-line.c index b3eae407..70b26cc4 100644 --- a/glabels2/src/label-line.c +++ b/glabels2/src/label-line.c @@ -1,35 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_line.c: GLabels label line object + * label-line.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include "label-line.h" -#include -#include -#include +#include #include "debug.h" + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -39,28 +34,30 @@ struct _glLabelLinePrivate { glColorNode *line_color_node; }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ -static void gl_label_line_finalize (GObject *object); +static void gl_label_line_finalize (GObject *object); -static void copy (glLabelObject *dst_object, - glLabelObject *src_object); +static void copy (glLabelObject *dst_object, + glLabelObject *src_object); -static void set_line_color (glLabelObject *object, - glColorNode *line_color_node); +static void set_line_color (glLabelObject *object, + glColorNode *line_color_node); -static void set_line_width (glLabelObject *object, - gdouble line_width); +static void set_line_width (glLabelObject *object, + gdouble line_width); -static glColorNode *get_line_color (glLabelObject *object); +static glColorNode *get_line_color (glLabelObject *object); -static gdouble get_line_width (glLabelObject *object); +static gdouble get_line_width (glLabelObject *object); static void draw_object (glLabelObject *object, cairo_t *cr, @@ -73,12 +70,12 @@ static void draw_shadow (glLabelObject *object, glMergeRecord *record); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glLabelLine, gl_label_line, GL_TYPE_LABEL_OBJECT); + static void gl_label_line_class_init (glLabelLineClass *class) { @@ -98,6 +95,7 @@ gl_label_line_class_init (glLabelLineClass *class) object_class->finalize = gl_label_line_finalize; } + static void gl_label_line_init (glLabelLine *lline) { @@ -105,6 +103,7 @@ gl_label_line_init (glLabelLine *lline) lline->priv->line_color_node = gl_color_node_new_default (); } + static void gl_label_line_finalize (GObject *object) { @@ -118,6 +117,7 @@ gl_label_line_finalize (GObject *object) G_OBJECT_CLASS (gl_label_line_parent_class)->finalize (object); } + /*****************************************************************************/ /* NEW label "line" object. */ /*****************************************************************************/ @@ -133,6 +133,7 @@ gl_label_line_new (glLabel *label) return G_OBJECT (lline); } + /*****************************************************************************/ /* Copy object contents. */ /*****************************************************************************/ @@ -182,6 +183,7 @@ set_line_color (glLabelObject *object, } } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Set line width method. */ /*---------------------------------------------------------------------------*/ @@ -213,6 +215,7 @@ get_line_width (glLabelObject *object) return lline->priv->line_width; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Get line width method. */ /*---------------------------------------------------------------------------*/ @@ -226,6 +229,7 @@ get_line_color (glLabelObject *object) return gl_color_node_dup (lline->priv->line_color_node); } + /*****************************************************************************/ /* Draw object method. */ /*****************************************************************************/ @@ -268,6 +272,7 @@ draw_object (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Draw shadow method. */ /*****************************************************************************/ @@ -321,3 +326,14 @@ draw_shadow (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-line.h b/glabels2/src/label-line.h index 3b73e42e..da11a574 100644 --- a/glabels2/src/label-line.h +++ b/glabels2/src/label-line.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_line.h: GLabels label line object + * label-line.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __LABEL_LINE_H__ @@ -60,3 +56,15 @@ GObject *gl_label_line_new (glLabel *label); G_END_DECLS #endif /* __LABEL_LINE_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-object.c b/glabels2/src/label-object.c index fd79e28a..89cefc98 100644 --- a/glabels2/src/label-object.c +++ b/glabels2/src/label-object.c @@ -1,33 +1,28 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_object.c: GLabels label object base class + * label-object.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "label-object.h" -#include -#include -#include +#include #include #include "marshal.h" @@ -43,6 +38,7 @@ #define DEFAULT_SHADOW_Y_OFFSET (3.6) #define DEFAULT_SHADOW_OPACITY (0.5) + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -72,6 +68,7 @@ enum { LAST_SIGNAL }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -80,6 +77,7 @@ static guint signals[LAST_SIGNAL] = {0}; static guint instance = 0; + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ @@ -94,12 +92,12 @@ static void set_size (glLabelObject *object, gdouble h); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glLabelObject, gl_label_object, G_TYPE_OBJECT); + static void gl_label_object_class_init (glLabelObjectClass *class) { @@ -173,6 +171,7 @@ gl_label_object_class_init (glLabelObjectClass *class) gl_debug (DEBUG_LABEL, "END"); } + static void gl_label_object_init (glLabelObject *object) { @@ -193,6 +192,7 @@ gl_label_object_init (glLabelObject *object) gl_debug (DEBUG_LABEL, "END"); } + static void gl_label_object_finalize (GObject *object) { @@ -210,6 +210,7 @@ gl_label_object_finalize (GObject *object) gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* New label object. */ /*****************************************************************************/ @@ -229,6 +230,7 @@ gl_label_object_new (glLabel *label) return G_OBJECT (object); } + /*****************************************************************************/ /* Duplicate object. */ /*****************************************************************************/ @@ -282,6 +284,7 @@ gl_label_object_dup (glLabelObject *src_object, return dst_object; } + /*****************************************************************************/ /* Emit "changed" signal (for derived objects). */ /*****************************************************************************/ @@ -297,6 +300,7 @@ gl_label_object_emit_changed (glLabelObject *object) gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Set parent label of object. */ /*****************************************************************************/ @@ -328,6 +332,7 @@ gl_label_object_set_parent (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Get parent label of object. */ /*****************************************************************************/ @@ -343,6 +348,7 @@ gl_label_object_get_parent (glLabelObject *object) return object->parent; } + /*****************************************************************************/ /* Set remove object from parent. */ /*****************************************************************************/ @@ -371,6 +377,7 @@ gl_label_object_remove (glLabelObject *object) gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Set name of object. */ /*****************************************************************************/ @@ -390,6 +397,7 @@ gl_label_object_set_name (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Get name of object. */ /*****************************************************************************/ @@ -405,6 +413,7 @@ gl_label_object_get_name (glLabelObject *object) return g_strdup(object->priv->name); } + /*****************************************************************************/ /* Set position of object. */ /*****************************************************************************/ @@ -434,6 +443,7 @@ gl_label_object_set_position (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Set position of object relative to old position. */ /*****************************************************************************/ @@ -462,6 +472,7 @@ gl_label_object_set_position_relative (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Get position of object. */ /*****************************************************************************/ @@ -480,6 +491,7 @@ gl_label_object_get_position (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Default set size method. */ /*---------------------------------------------------------------------------*/ @@ -499,6 +511,7 @@ set_size (glLabelObject *object, } } + /*****************************************************************************/ /* Set size of object. */ /*****************************************************************************/ @@ -524,6 +537,7 @@ gl_label_object_set_size (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Set size of object honoring current aspect ratio. */ /*****************************************************************************/ @@ -556,6 +570,7 @@ gl_label_object_set_size_honor_aspect (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Get raw size method (don't let object content adjust size). */ /*****************************************************************************/ @@ -570,6 +585,7 @@ gl_label_object_get_raw_size (glLabelObject *object, *h = object->priv->h; } + /*****************************************************************************/ /* Get size of object. */ /*****************************************************************************/ @@ -596,6 +612,7 @@ gl_label_object_get_size (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Get extent of object. */ /*****************************************************************************/ @@ -641,6 +658,7 @@ gl_label_object_get_extent (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Can text properties be set for this object? */ /*****************************************************************************/ @@ -663,6 +681,7 @@ gl_label_object_can_text (glLabelObject *object) } + /*****************************************************************************/ /* Set font family for all text contained in object. */ /*****************************************************************************/ @@ -684,6 +703,7 @@ gl_label_object_set_font_family (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Set font size for all text contained in object. */ /****************************************************************************/ @@ -705,6 +725,7 @@ gl_label_object_set_font_size (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Set font weight for all text contained in object. */ /****************************************************************************/ @@ -726,6 +747,7 @@ gl_label_object_set_font_weight (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Set font italic flag for all text contained in object. */ /****************************************************************************/ @@ -748,6 +770,7 @@ gl_label_object_set_font_italic_flag (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Set text alignment for all text contained in object. */ /****************************************************************************/ @@ -770,6 +793,7 @@ gl_label_object_set_text_alignment (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Set text line spacing for all text contained in object. */ /****************************************************************************/ @@ -791,6 +815,7 @@ gl_label_object_set_text_line_spacing (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Set text color for all text contained in object. */ /****************************************************************************/ @@ -812,6 +837,7 @@ gl_label_object_set_text_color (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Get font family for all text contained in object. */ /*****************************************************************************/ @@ -836,6 +862,7 @@ gl_label_object_get_font_family (glLabelObject *object) return ret; } + /****************************************************************************/ /* Get font size for all text contained in object. */ /****************************************************************************/ @@ -860,6 +887,7 @@ gl_label_object_get_font_size (glLabelObject *object) return ret; } + /****************************************************************************/ /* Get font weight for all text contained in object. */ /****************************************************************************/ @@ -884,6 +912,7 @@ gl_label_object_get_font_weight (glLabelObject *object) return ret; } + /****************************************************************************/ /* Get font italic flag for all text contained in object. */ /****************************************************************************/ @@ -908,6 +937,7 @@ gl_label_object_get_font_italic_flag (glLabelObject *object) return ret; } + /****************************************************************************/ /* Get text alignment for all text contained in object. */ /****************************************************************************/ @@ -932,6 +962,7 @@ gl_label_object_get_text_alignment (glLabelObject *object) return ret; } + /****************************************************************************/ /* Get text line spacing for all text contained in object. */ /****************************************************************************/ @@ -956,6 +987,7 @@ gl_label_object_get_text_line_spacing (glLabelObject *object) return ret; } + /****************************************************************************/ /* Get text color for all text contained in object. */ /****************************************************************************/ @@ -980,6 +1012,7 @@ gl_label_object_get_text_color (glLabelObject *object) return ret; } + /*****************************************************************************/ /* Can fill properties be set for this object? */ /*****************************************************************************/ @@ -1002,6 +1035,7 @@ gl_label_object_can_fill (glLabelObject *object) } + /****************************************************************************/ /* Set fill color for object. */ /****************************************************************************/ @@ -1023,6 +1057,7 @@ gl_label_object_set_fill_color (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Get fill color for object. */ /****************************************************************************/ @@ -1047,6 +1082,7 @@ gl_label_object_get_fill_color (glLabelObject *object) return ret; } + /*****************************************************************************/ /* Can line color property be set for this object? */ /*****************************************************************************/ @@ -1069,6 +1105,7 @@ gl_label_object_can_line_color (glLabelObject *object) } + /****************************************************************************/ /* Set line color for object. */ /****************************************************************************/ @@ -1090,6 +1127,7 @@ gl_label_object_set_line_color (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Get line color for object. */ /****************************************************************************/ @@ -1114,6 +1152,7 @@ gl_label_object_get_line_color (glLabelObject *object) return ret; } + /*****************************************************************************/ /* Can line width property be set for this object? */ /*****************************************************************************/ @@ -1136,6 +1175,7 @@ gl_label_object_can_line_width (glLabelObject *object) } + /****************************************************************************/ /* Set line width for object. */ /****************************************************************************/ @@ -1157,6 +1197,7 @@ gl_label_object_set_line_width (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Get line width for object. */ /****************************************************************************/ @@ -1181,6 +1222,7 @@ gl_label_object_get_line_width (glLabelObject *object) return ret; } + /****************************************************************************/ /* Set shadow state of object. */ /****************************************************************************/ @@ -1201,6 +1243,7 @@ gl_label_object_set_shadow_state (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Get shadow state of object. */ /****************************************************************************/ @@ -1214,6 +1257,7 @@ gl_label_object_get_shadow_state (glLabelObject *object) return object->priv->shadow_state; } + /****************************************************************************/ /* Set offset of object's shadow. */ /****************************************************************************/ @@ -1237,6 +1281,7 @@ gl_label_object_set_shadow_offset (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Get offset of object's shadow. */ /****************************************************************************/ @@ -1255,6 +1300,7 @@ gl_label_object_get_shadow_offset (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Set color of object's shadow. */ /****************************************************************************/ @@ -1276,6 +1322,7 @@ gl_label_object_set_shadow_color (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Get color of object's shadow. */ /****************************************************************************/ @@ -1289,6 +1336,7 @@ gl_label_object_get_shadow_color (glLabelObject *object) return gl_color_node_dup (object->priv->shadow_color_node); } + /****************************************************************************/ /* Set opacity of object's shadow. */ /****************************************************************************/ @@ -1309,6 +1357,7 @@ gl_label_object_set_shadow_opacity (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Get opacity of object's shadow. */ /****************************************************************************/ @@ -1322,6 +1371,7 @@ gl_label_object_get_shadow_opacity (glLabelObject *object) return object->priv->shadow_opacity; } + /****************************************************************************/ /* Flip object horizontally. */ /****************************************************************************/ @@ -1342,6 +1392,7 @@ gl_label_object_flip_horiz (glLabelObject *object) gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Flip object vertically. */ /****************************************************************************/ @@ -1362,6 +1413,7 @@ gl_label_object_flip_vert (glLabelObject *object) gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Rotate object. */ /****************************************************************************/ @@ -1383,6 +1435,7 @@ gl_label_object_rotate (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Set raw affine */ /****************************************************************************/ @@ -1397,6 +1450,7 @@ gl_label_object_set_matrix (glLabelObject *object, object->priv->matrix = *matrix; } + /****************************************************************************/ /* Get raw affine */ /****************************************************************************/ @@ -1411,6 +1465,7 @@ gl_label_object_get_matrix (glLabelObject *object, *matrix = object->priv->matrix; } + /****************************************************************************/ /* Bring label object to front/top. */ /****************************************************************************/ @@ -1430,6 +1485,7 @@ gl_label_object_raise_to_top (glLabelObject *object) gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Send label object to rear/bottom. */ /****************************************************************************/ @@ -1449,6 +1505,7 @@ gl_label_object_lower_to_bottom (glLabelObject *object) gl_debug (DEBUG_LABEL, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Label's merge data changed callback. */ /*--------------------------------------------------------------------------*/ @@ -1459,6 +1516,7 @@ merge_changed_cb (glLabel *label, gl_label_object_emit_changed (object); } + /*****************************************************************************/ /* Draw object */ /*****************************************************************************/ @@ -1523,3 +1581,14 @@ gl_label_object_draw (glLabelObject *object, gl_debug (DEBUG_LABEL, "END"); } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-object.h b/glabels2/src/label-object.h index 5ee0f9ba..15cc5e9c 100644 --- a/glabels2/src/label-object.h +++ b/glabels2/src/label-object.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label_object.h: GLabels label object base class + * label-object.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __LABEL_OBJECT_H__ @@ -343,3 +339,15 @@ void gl_label_object_draw (glLabelObject *object, G_END_DECLS #endif /* __LABEL_OBJECT_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label-text.c b/glabels2/src/label-text.c index 1e38f7ea..d7497624 100644 --- a/glabels2/src/label-text.c +++ b/glabels2/src/label-text.c @@ -22,9 +22,7 @@ #include "label-text.h" -#include -#include -#include +#include #include #include #include diff --git a/glabels2/src/label-text.h b/glabels2/src/label-text.h index 59eae915..9c7ce435 100644 --- a/glabels2/src/label-text.h +++ b/glabels2/src/label-text.h @@ -1,6 +1,6 @@ /* * label-text.h - * Copyright (C) 2008 Jim Evins . + * Copyright (C) 2001-2009 Jim Evins . * * This file is part of gLabels. * @@ -21,7 +21,7 @@ #ifndef __LABEL_TEXT_H__ #define __LABEL_TEXT_H__ -#include +#include #include "text-node.h" #include "label-object.h" diff --git a/glabels2/src/label.c b/glabels2/src/label.c index c886529b..4a6d9f3c 100644 --- a/glabels2/src/label.c +++ b/glabels2/src/label.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label.c: GLabels label module + * label.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -28,16 +24,18 @@ #include -#include "marshal.h" #include "prefs.h" #include "util.h" +#include "marshal.h" #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -64,6 +62,7 @@ enum { LAST_SIGNAL }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -72,6 +71,7 @@ static guint signals[LAST_SIGNAL] = {0}; static guint untitled = 0; + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ @@ -86,12 +86,13 @@ static void object_moved_cb (glLabelObject *object, gdouble y, glLabel *label); - + /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glLabel, gl_label, G_TYPE_OBJECT); + static void gl_label_class_init (glLabelClass *class) { @@ -161,6 +162,7 @@ gl_label_class_init (glLabelClass *class) gl_debug (DEBUG_LABEL, "END"); } + static void gl_label_init (glLabel *label) { @@ -179,6 +181,7 @@ gl_label_init (glLabel *label) gl_debug (DEBUG_LABEL, "END"); } + static void gl_label_finalize (GObject *object) { @@ -208,6 +211,7 @@ gl_label_finalize (GObject *object) gl_debug (DEBUG_LABEL, "END"); } + GObject * gl_label_new (void) { @@ -257,6 +261,7 @@ gl_label_add_object (glLabel *label, gl_debug (DEBUG_LABEL, "END"); } + /*****************************************************************************/ /* Remove object from label. */ /*****************************************************************************/ @@ -291,6 +296,7 @@ gl_label_remove_object (glLabel *label, gl_debug (DEBUG_LABEL, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Object changed callback. */ /*---------------------------------------------------------------------------*/ @@ -309,6 +315,7 @@ object_changed_cb (glLabelObject *object, g_signal_emit (G_OBJECT(label), signals[CHANGED], 0); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Object moved callback. */ /*---------------------------------------------------------------------------*/ @@ -329,6 +336,7 @@ object_moved_cb (glLabelObject *object, g_signal_emit (G_OBJECT(label), signals[CHANGED], 0); } + /****************************************************************************/ /* Bring label object to front/top. */ /****************************************************************************/ @@ -350,6 +358,7 @@ gl_label_raise_object_to_top (glLabel *label, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Send label object to rear/bottom. */ /****************************************************************************/ @@ -371,6 +380,7 @@ gl_label_lower_object_to_bottom (glLabel *label, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* set template. */ /****************************************************************************/ @@ -405,6 +415,7 @@ gl_label_set_template (glLabel *label, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* set rotate flag. */ /****************************************************************************/ @@ -431,6 +442,7 @@ gl_label_set_rotate_flag (glLabel *label, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Get label size. */ /****************************************************************************/ @@ -463,6 +475,7 @@ gl_label_get_size (glLabel *label, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* set merge information structure. */ /****************************************************************************/ @@ -488,6 +501,7 @@ gl_label_set_merge (glLabel *label, gl_debug (DEBUG_LABEL, "END"); } + /****************************************************************************/ /* Get merge information structure. */ /****************************************************************************/ @@ -503,6 +517,7 @@ gl_label_get_merge (glLabel *label) return gl_merge_dup (label->priv->merge); } + /****************************************************************************/ /* return filename. */ /****************************************************************************/ @@ -514,6 +529,7 @@ gl_label_get_filename (glLabel *label) return g_strdup ( label->priv->filename ); } + /****************************************************************************/ /* return short filename. */ /****************************************************************************/ @@ -542,6 +558,7 @@ gl_label_get_short_name (glLabel *label) } } + /****************************************************************************/ /* Get pixbuf cache. */ /****************************************************************************/ @@ -551,6 +568,7 @@ gl_label_get_pixbuf_cache (glLabel *label) return label->priv->pixbuf_cache; } + /****************************************************************************/ /* Is label modified? */ /****************************************************************************/ @@ -561,6 +579,7 @@ gl_label_is_modified (glLabel *label) return label->priv->modified_flag; } + /****************************************************************************/ /* Is label untitled? */ /****************************************************************************/ @@ -571,6 +590,7 @@ gl_label_is_untitled (glLabel *label) return (label->priv->filename == NULL); } + /****************************************************************************/ /* Can undo? */ /****************************************************************************/ @@ -603,6 +623,7 @@ gl_label_set_filename (glLabel *label, g_signal_emit (G_OBJECT(label), signals[NAME_CHANGED], 0); } + /****************************************************************************/ /* Clear modified flag. */ /****************************************************************************/ @@ -672,3 +693,15 @@ gl_label_draw (glLabel *label, gl_label_object_draw (object, cr, screen_flag, record); } } + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/label.h b/glabels2/src/label.h index f6e0c23b..73f0d89e 100644 --- a/glabels2/src/label.h +++ b/glabels2/src/label.h @@ -1,35 +1,32 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label.h: GLabels label module header file + * label.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __LABEL_H__ #define __LABEL_H__ #include +#include -#include +#include #include "merge.h" #include "pixbuf-cache.h" -#include G_BEGIN_DECLS @@ -152,3 +149,15 @@ G_END_DECLS #endif /* __LABEL_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge-evolution.c b/glabels2/src/merge-evolution.c index bf99e1bb..36f7bf22 100644 --- a/glabels2/src/merge-evolution.c +++ b/glabels2/src/merge-evolution.c @@ -1,29 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge_evolution.c: evolution merge backend module - * - * Copyright (C) 2001 Jim Evins . + * merge-evolution.h + * Copyright (C) 2001-2009 Jim Evins . * and * Copyright (C) 2005 Austin Henry * and * Copyright (C) 2007 Peter Cherriman * - * This program is free software; you can redistribute it and/or modify + * This file is part of gLabels. + * + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -37,12 +33,14 @@ #include #include #include -#include + +#include #include "debug.h" #define DEFAULT_QUERY "(exists \"full_name\")" + /*===========================================*/ /* Private types */ /*===========================================*/ @@ -63,6 +61,7 @@ enum { ARG_QUERY, }; + /*===========================================*/ /* Private globals */ /*===========================================*/ @@ -94,7 +93,7 @@ static void gl_merge_evolution_copy (glMerge *dst_ /* utility function prototypes go here */ static void free_field_list (GList *fields); - + /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ @@ -133,6 +132,7 @@ gl_merge_evolution_class_init (glMergeEvolutionClass *class) gl_debug (DEBUG_MERGE, "END"); } + static void gl_merge_evolution_init (glMergeEvolution *merge_evolution) { @@ -144,6 +144,7 @@ gl_merge_evolution_init (glMergeEvolution *merge_evolution) gl_debug (DEBUG_MERGE, "END"); } + static void gl_merge_evolution_finalize (GObject *object) { @@ -162,6 +163,7 @@ gl_merge_evolution_finalize (GObject *object) gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* Set argument. */ /*--------------------------------------------------------------------------*/ @@ -192,6 +194,7 @@ gl_merge_evolution_set_property (GObject *object, } + /*--------------------------------------------------------------------------*/ /* Get argument. */ /*--------------------------------------------------------------------------*/ @@ -219,6 +222,7 @@ gl_merge_evolution_get_property (GObject *object, } + /*--------------------------------------------------------------------------*/ /* Get key list. */ /*--------------------------------------------------------------------------*/ @@ -250,6 +254,7 @@ gl_merge_evolution_get_key_list (glMerge *merge) return key_list; } + /*--------------------------------------------------------------------------*/ /* Get "primary" key. */ /*--------------------------------------------------------------------------*/ @@ -259,6 +264,7 @@ gl_merge_evolution_get_primary_key (glMerge *merge) return g_strdup (e_contact_pretty_name(E_CONTACT_FILE_AS)); } + /* Sort compare function for sorting contacts by file-as element * by Peter Cherriman (PJC) * called by GList* g_list_sort(GList *list, sort_contact_by_file_as); @@ -287,6 +293,7 @@ static gint sort_contact_by_file_as(gconstpointer *a, gconstpointer *b) return res; } + /*--------------------------------------------------------------------------*/ /* Open merge source. */ /*--------------------------------------------------------------------------*/ @@ -402,6 +409,7 @@ gl_merge_evolution_open (glMerge *merge) return; } + /*--------------------------------------------------------------------------*/ /* Close merge source. */ /*--------------------------------------------------------------------------*/ @@ -429,6 +437,7 @@ gl_merge_evolution_close (glMerge *merge) merge_evolution->priv->contacts = NULL; } + /*--------------------------------------------------------------------------*/ /* Get next record from merge source, NULL if no records left (i.e EOF) */ /*--------------------------------------------------------------------------*/ @@ -486,6 +495,7 @@ gl_merge_evolution_get_record (glMerge *merge) return record; } + /*---------------------------------------------------------------------------*/ /* Copy merge_evolution specific fields. */ /*---------------------------------------------------------------------------*/ @@ -524,6 +534,7 @@ gl_merge_evolution_copy (glMerge *dst_merge, gl_debug (DEBUG_MERGE, "END"); } + /*---------------------------------------------------------------------------*/ /* Free the list of supported fields */ /*---------------------------------------------------------------------------*/ @@ -544,3 +555,14 @@ free_field_list (GList *fields) #endif /* HAVE_LIBEBOOK */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge-evolution.h b/glabels2/src/merge-evolution.h index 26468abc..f49d1b46 100644 --- a/glabels2/src/merge-evolution.h +++ b/glabels2/src/merge-evolution.h @@ -1,28 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge_evolution.h: evolution merge backend module header file - * - * Copyright (C) 2002 Jim Evins . + * merge-evolution.h + * Copyright (C) 2001-2009 Jim Evins . * and * Copyright (C) 2005 Austin Henry * - * This program is free software; you can redistribute it and/or modify + * This file is part of gLabels. + * + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __MERGE_EVOLUTION_H__ #define __MERGE_EVOLUTION_H__ @@ -68,3 +65,14 @@ GType gl_merge_evolution_get_type (void) G_GNUC_CONST; G_END_DECLS #endif /* __MERGE_EVOLUTION_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge-init.c b/glabels2/src/merge-init.c index b62551be..9d575644 100644 --- a/glabels2/src/merge-init.c +++ b/glabels2/src/merge-init.c @@ -1,32 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge.c: document merge initialization + * merge-init.c + * Copyright (C) 2002-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include #include "merge-init.h" #include "merge-text.h" + #ifdef HAVE_LIBEBOOK #include "merge-evolution.h" #include "merge-vcard.h" @@ -92,3 +90,14 @@ gl_merge_init (void) #endif /* HAVE_LIBEBOOK */ } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge-init.h b/glabels2/src/merge-init.h index 7bd57eef..3e281bf7 100644 --- a/glabels2/src/merge-init.h +++ b/glabels2/src/merge-init.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge-init.h: document merge initialization header file + * merge-init.h + * Copyright (C) 2002-2009 Jim Evins . * - * Copyright (C) 2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __MERGE_INIT_H__ #define __MERGE_INIT_H__ @@ -33,3 +30,14 @@ void gl_merge_init (void); G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge-properties-dialog.c b/glabels2/src/merge-properties-dialog.c index de19db0d..4632d919 100644 --- a/glabels2/src/merge-properties-dialog.c +++ b/glabels2/src/merge-properties-dialog.c @@ -23,15 +23,7 @@ #include "merge-properties-dialog.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include "label.h" diff --git a/glabels2/src/merge-properties-dialog.h b/glabels2/src/merge-properties-dialog.h index dfcfb695..33be5d17 100644 --- a/glabels2/src/merge-properties-dialog.h +++ b/glabels2/src/merge-properties-dialog.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge-properties-dialog.h: document merge properties dialog module header file + * merge-properties-dialog.h + * Copyright (C) 2002-2009 Jim Evins . * - * Copyright (C) 2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __MERGE_PROPERTIES_DIALOG_H__ #define __MERGE_PROPERTIES_DIALOG_H__ -#include -#include +#include #include "label.h" G_BEGIN_DECLS @@ -69,3 +65,14 @@ GtkWidget *gl_merge_properties_dialog_new (glLabel *label, G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge-text.c b/glabels2/src/merge-text.c index 674e81d1..079eb5b9 100644 --- a/glabels2/src/merge-text.c +++ b/glabels2/src/merge-text.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge_text.c: text-file merge backend module + * merge-text.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -32,6 +28,7 @@ #define LINE_BUF_LEN 1024 + /*===========================================*/ /* Private types */ /*===========================================*/ @@ -50,6 +47,7 @@ enum { ARG_DELIM, }; + /*===========================================*/ /* Private globals */ /*===========================================*/ @@ -84,12 +82,13 @@ static GList *parse_line (FILE *fp, static gchar *parse_field (gchar *raw_field); static void free_fields (GList **fields); - + /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glMergeText, gl_merge_text, GL_TYPE_MERGE); + static void gl_merge_text_class_init (glMergeTextClass *class) { @@ -122,6 +121,7 @@ gl_merge_text_class_init (glMergeTextClass *class) gl_debug (DEBUG_MERGE, "END"); } + static void gl_merge_text_init (glMergeText *merge_text) { @@ -132,6 +132,7 @@ gl_merge_text_init (glMergeText *merge_text) gl_debug (DEBUG_MERGE, "END"); } + static void gl_merge_text_finalize (GObject *object) { @@ -148,6 +149,7 @@ gl_merge_text_finalize (GObject *object) gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* Set argument. */ /*--------------------------------------------------------------------------*/ @@ -177,6 +179,7 @@ gl_merge_text_set_property (GObject *object, } + /*--------------------------------------------------------------------------*/ /* Get argument. */ /*--------------------------------------------------------------------------*/ @@ -204,6 +207,7 @@ gl_merge_text_get_property (GObject *object, } + /*--------------------------------------------------------------------------*/ /* Get key list. */ /*--------------------------------------------------------------------------*/ @@ -246,6 +250,7 @@ gl_merge_text_get_key_list (glMerge *merge) return key_list; } + /*--------------------------------------------------------------------------*/ /* Get "primary" key. */ /*--------------------------------------------------------------------------*/ @@ -256,6 +261,7 @@ gl_merge_text_get_primary_key (glMerge *merge) return g_strdup ("1"); } + /*--------------------------------------------------------------------------*/ /* Open merge source. */ /*--------------------------------------------------------------------------*/ @@ -276,6 +282,7 @@ gl_merge_text_open (glMerge *merge) g_free (src); } + /*--------------------------------------------------------------------------*/ /* Close merge source. */ /*--------------------------------------------------------------------------*/ @@ -294,6 +301,7 @@ gl_merge_text_close (glMerge *merge) } } + /*--------------------------------------------------------------------------*/ /* Get next record from merge source, NULL if no records left (i.e EOF) */ /*--------------------------------------------------------------------------*/ @@ -342,6 +350,7 @@ gl_merge_text_get_record (glMerge *merge) return record; } + /*---------------------------------------------------------------------------*/ /* Copy merge_text specific fields. */ /*---------------------------------------------------------------------------*/ @@ -358,6 +367,7 @@ gl_merge_text_copy (glMerge *dst_merge, dst_merge_text->priv->delim = src_merge_text->priv->delim; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Parse line. */ /* */ @@ -544,6 +554,7 @@ parse_line (FILE *fp, return list; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Parse field. */ /* */ @@ -675,6 +686,7 @@ parse_field (gchar *raw_field) return field; } + /*---------------------------------------------------------------------------*/ /* Free list of fields. */ /*---------------------------------------------------------------------------*/ @@ -692,3 +704,13 @@ free_fields (GList ** list) *list = NULL; } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge-text.h b/glabels2/src/merge-text.h index 65bad54d..9a1abbb7 100644 --- a/glabels2/src/merge-text.h +++ b/glabels2/src/merge-text.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge_text.h: text-file merge backend module header file + * merge-text.h + * Copyright (C) 2002-2009 Jim Evins . * - * Copyright (C) 2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __MERGE_TEXT_H__ #define __MERGE_TEXT_H__ @@ -66,3 +63,14 @@ GType gl_merge_text_get_type (void) G_GNUC_CONST; G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge-vcard.c b/glabels2/src/merge-vcard.c index c0eb1449..69d205dd 100644 --- a/glabels2/src/merge-vcard.c +++ b/glabels2/src/merge-vcard.c @@ -1,27 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge_vcard.c: vcard merge backend module - * - * Copyright (C) 2001 Jim Evins . + * merge-vcard.c + * Copyright (C) 2001-2009 Jim Evins . * and * Copyright (C) 2005 Austin Henry * - * This program is free software; you can redistribute it and/or modify + * This file is part of gLabels. + * + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -30,14 +26,15 @@ #include "merge-vcard.h" -#include +#include #include #include #include #include "debug.h" + /*===========================================*/ /* Private types */ /*===========================================*/ @@ -54,6 +51,7 @@ enum { ARG_0, }; + /*===========================================*/ /* Private globals */ /*===========================================*/ @@ -85,12 +83,12 @@ static void gl_merge_vcard_copy (glMerge *dst_merg static char * parse_next_vcard (FILE *fp); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glMergeVCard, gl_merge_vcard, GL_TYPE_MERGE); + static void gl_merge_vcard_class_init (glMergeVCardClass *class) { @@ -116,6 +114,7 @@ gl_merge_vcard_class_init (glMergeVCardClass *class) gl_debug (DEBUG_MERGE, "END"); } + static void gl_merge_vcard_init (glMergeVCard *merge_vcard) { @@ -126,6 +125,7 @@ gl_merge_vcard_init (glMergeVCard *merge_vcard) gl_debug (DEBUG_MERGE, "END"); } + static void gl_merge_vcard_finalize (GObject *object) { @@ -142,6 +142,7 @@ gl_merge_vcard_finalize (GObject *object) gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* Set argument. */ /*--------------------------------------------------------------------------*/ @@ -162,6 +163,7 @@ gl_merge_vcard_set_property (GObject *object, } } + /*--------------------------------------------------------------------------*/ /* Get argument. */ /*--------------------------------------------------------------------------*/ @@ -183,7 +185,7 @@ gl_merge_vcard_get_property (GObject *object, } -/* TODO */ + /*--------------------------------------------------------------------------*/ /* Get key list. */ /*--------------------------------------------------------------------------*/ @@ -209,7 +211,7 @@ gl_merge_vcard_get_key_list (glMerge *merge) return key_list; } -/* TODO? */ + /*--------------------------------------------------------------------------*/ /* Get "primary" key. */ /*--------------------------------------------------------------------------*/ @@ -220,6 +222,7 @@ gl_merge_vcard_get_primary_key (glMerge *merge) return g_strdup ("full_name"); } + /*--------------------------------------------------------------------------*/ /* Open merge source. */ /*--------------------------------------------------------------------------*/ @@ -242,6 +245,7 @@ gl_merge_vcard_open (glMerge *merge) return; } + /*--------------------------------------------------------------------------*/ /* Close merge source. */ /*--------------------------------------------------------------------------*/ @@ -258,6 +262,7 @@ gl_merge_vcard_close (glMerge *merge) } } + /*--------------------------------------------------------------------------*/ /* Get next record from merge source, NULL if no records left (i.e EOF) */ /*--------------------------------------------------------------------------*/ @@ -317,6 +322,7 @@ gl_merge_vcard_get_record (glMerge *merge) return record; } + /*---------------------------------------------------------------------------*/ /* Copy merge_vcard specific fields. */ /*---------------------------------------------------------------------------*/ @@ -331,6 +337,7 @@ gl_merge_vcard_copy (glMerge *dst_merge, src_merge_vcard = GL_MERGE_VCARD (src_merge); } + /*---------------------------------------------------------------------------*/ /* PRIVATE: pull out a full VCard from the open file */ /* Arguments: */ @@ -381,3 +388,14 @@ parse_next_vcard (FILE *fp) #endif /* HAVE_LIBEBOOK */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge-vcard.h b/glabels2/src/merge-vcard.h index 7ede444f..41a64ea5 100644 --- a/glabels2/src/merge-vcard.h +++ b/glabels2/src/merge-vcard.h @@ -1,28 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge_vcard.h: vcard merge backend module header file - * - * Copyright (C) 2002 Jim Evins . + * merge-vcard.h + * Copyright (C) 2001-2009 Jim Evins . * and * Copyright (C) 2005 Austin Henry * - * This program is free software; you can redistribute it and/or modify + * This file is part of gLabels. + * + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __MERGE_VCARD_H__ #define __MERGE_VCARD_H__ @@ -68,3 +65,14 @@ G_END_DECLS #endif /* __MERGE_VCARD_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge.c b/glabels2/src/merge.c index 8963ca22..56e14813 100644 --- a/glabels2/src/merge.c +++ b/glabels2/src/merge.c @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge.c: document merge module + * merge.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "merge.h" @@ -29,7 +26,7 @@ #include #include -#include +#include #include "debug.h" @@ -791,3 +788,12 @@ gl_merge_get_record_count (glMerge *merge) } + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/merge.h b/glabels2/src/merge.h index 819ca25b..9456ca92 100644 --- a/glabels2/src/merge.h +++ b/glabels2/src/merge.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * merge.h: document merge module header file + * merge.h + * Copyright (C) 2002-2009 Jim Evins . * - * Copyright (C) 2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __MERGE_H__ #define __MERGE_H__ @@ -128,3 +125,14 @@ gint gl_merge_get_record_count (glMerge *merge); G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/mini-label-preview.c b/glabels2/src/mini-label-preview.c index a6ff906f..e58986fd 100644 --- a/glabels2/src/mini-label-preview.c +++ b/glabels2/src/mini-label-preview.c @@ -22,10 +22,10 @@ #include "mini-label-preview.h" -#include -#include "marshal.h" +#include #include "cairo-label-path.h" #include "color.h" +#include "marshal.h" /*===========================================*/ diff --git a/glabels2/src/mini-label-preview.h b/glabels2/src/mini-label-preview.h index a107edd4..9cc8ece7 100644 --- a/glabels2/src/mini-label-preview.h +++ b/glabels2/src/mini-label-preview.h @@ -22,7 +22,7 @@ #define __MINI_LABEL_PREVIEW_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/mini-preview-pixbuf-cache.c b/glabels2/src/mini-preview-pixbuf-cache.c index c7d3afa3..82077ad5 100644 --- a/glabels2/src/mini-preview-pixbuf-cache.c +++ b/glabels2/src/mini-preview-pixbuf-cache.c @@ -1,35 +1,31 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * mini-preview-pixbuf-cache.c: GLabels mini-preview pixbuf cache module + * mini-preview-pixbuf-cache.c + * Copyright (C) 2007-2009 Jim Evins . * - * Copyright (C) 2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "mini-preview-pixbuf-cache.h" -#include "mini-preview-pixbuf.h" -#include "libglabels/db.h" +#include -#include -#include +#include "libglabels/libglabels.h" +#include "mini-preview-pixbuf.h" #include "debug.h" @@ -147,3 +143,13 @@ gl_mini_preview_pixbuf_cache_get_pixbuf (gchar *name) return g_object_ref (pixbuf); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/mini-preview-pixbuf-cache.h b/glabels2/src/mini-preview-pixbuf-cache.h index 092d5692..218eaddc 100644 --- a/glabels2/src/mini-preview-pixbuf-cache.h +++ b/glabels2/src/mini-preview-pixbuf-cache.h @@ -1,31 +1,28 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * mini-preview-pixbuf-cache.h: GLabels mini-preview pixbuf cache module + * mini-preview-pixbuf-cache.h + * Copyright (C) 2007-2009 Jim Evins . * - * Copyright (C) 2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __MINI_PREVIEW_PIXBUF_CACHE_H__ #define __MINI_PREVIEW_PIXBUF_CACHE_H__ -#include #include +#include G_BEGIN_DECLS @@ -40,3 +37,14 @@ GdkPixbuf *gl_mini_preview_pixbuf_cache_get_pixbuf (gchar *name); G_END_DECLS #endif /*__MINI_PREVIEW_PIXBUF_CACHE_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/mini-preview-pixbuf.c b/glabels2/src/mini-preview-pixbuf.c index a4642525..0651263f 100644 --- a/glabels2/src/mini-preview-pixbuf.c +++ b/glabels2/src/mini-preview-pixbuf.c @@ -1,35 +1,32 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * mini-preview-pixbuf.c: mini preview pixbuf module + * mini-preview-pixbuf.c + * Copyright (C) 2006-2009 Jim Evins . * - * Copyright (C) 2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include #include "mini-preview-pixbuf.h" -#include "cairo-label-path.h" #include #include +#include "cairo-label-path.h" + #include "debug.h" /*===========================================*/ @@ -223,3 +220,13 @@ draw_label_outline (cairo_t *cr, gl_debug (DEBUG_MINI_PREVIEW, "END"); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/mini-preview-pixbuf.h b/glabels2/src/mini-preview-pixbuf.h index ddad146b..825938e5 100644 --- a/glabels2/src/mini-preview-pixbuf.h +++ b/glabels2/src/mini-preview-pixbuf.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * mini-preview-pixbuf.h: mini-preview pixbuf module header file + * mini-preview-pixbuf.h + * Copyright (C) 2006-2009 Jim Evins . * - * Copyright (C) 2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __MINI_PREVIEW_PIXBUF_H__ @@ -27,7 +23,7 @@ #include -#include +#include G_BEGIN_DECLS @@ -38,3 +34,14 @@ GdkPixbuf *gl_mini_preview_pixbuf_new (lglTemplate *template, G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/mini-preview.c b/glabels2/src/mini-preview.c index 9034ed7b..8acdf316 100644 --- a/glabels2/src/mini-preview.c +++ b/glabels2/src/mini-preview.c @@ -369,7 +369,6 @@ set_transform_and_get_scale (glMiniPreview *this, { lglTemplate *template = this->priv->template; gdouble w, h; - gdouble w1, h1; gdouble scale; gdouble offset_x, offset_y; diff --git a/glabels2/src/new-label-dialog.c b/glabels2/src/new-label-dialog.c index f892d04b..afaa5a18 100644 --- a/glabels2/src/new-label-dialog.c +++ b/glabels2/src/new-label-dialog.c @@ -23,9 +23,7 @@ #include "new-label-dialog.h" #include -#include -#include -#include +#include #include "hig.h" #include "wdgt-media-select.h" diff --git a/glabels2/src/new-label-dialog.h b/glabels2/src/new-label-dialog.h index d20ca2bb..2029a9fc 100644 --- a/glabels2/src/new-label-dialog.h +++ b/glabels2/src/new-label-dialog.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * new-label-dialog.h: New label dialog module header file + * new-label-dialog.h + * Copyright (C) 2006-2009 Jim Evins . * - * Copyright (C) 2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __NEW_LABEL_DIALOG_H__ #define __NEW_LABEL_DIALOG_H__ -#include -#include +#include G_BEGIN_DECLS @@ -87,3 +83,14 @@ void gl_new_label_dialog_set_rotate_state (glNewLabelDialog *dialog, G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/object-editor-bc-page.c b/glabels2/src/object-editor-bc-page.c index eb01b113..017cc0b5 100644 --- a/glabels2/src/object-editor-bc-page.c +++ b/glabels2/src/object-editor-bc-page.c @@ -23,10 +23,7 @@ #include "object-editor.h" #include -#include -#include -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor-data-page.c b/glabels2/src/object-editor-data-page.c index 311f5622..0d6b1e3a 100644 --- a/glabels2/src/object-editor-data-page.c +++ b/glabels2/src/object-editor-data-page.c @@ -23,9 +23,7 @@ #include "object-editor.h" #include -#include -#include -#include +#include #include #include diff --git a/glabels2/src/object-editor-fill-page.c b/glabels2/src/object-editor-fill-page.c index 9a7caf96..5c9e3817 100644 --- a/glabels2/src/object-editor-fill-page.c +++ b/glabels2/src/object-editor-fill-page.c @@ -23,8 +23,7 @@ #include "object-editor.h" #include -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor-image-page.c b/glabels2/src/object-editor-image-page.c index cfa4e741..10a525c2 100644 --- a/glabels2/src/object-editor-image-page.c +++ b/glabels2/src/object-editor-image-page.c @@ -23,10 +23,7 @@ #include "object-editor.h" #include -#include -#include -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor-line-page.c b/glabels2/src/object-editor-line-page.c index dbbd545c..48f3d3a4 100644 --- a/glabels2/src/object-editor-line-page.c +++ b/glabels2/src/object-editor-line-page.c @@ -23,10 +23,7 @@ #include "object-editor.h" #include -#include -#include -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor-lsize-page.c b/glabels2/src/object-editor-lsize-page.c index 8c1771a3..9be84131 100644 --- a/glabels2/src/object-editor-lsize-page.c +++ b/glabels2/src/object-editor-lsize-page.c @@ -23,8 +23,7 @@ #include "object-editor.h" #include -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor-position-page.c b/glabels2/src/object-editor-position-page.c index 216f017e..e80e23ce 100644 --- a/glabels2/src/object-editor-position-page.c +++ b/glabels2/src/object-editor-position-page.c @@ -23,8 +23,7 @@ #include "object-editor.h" #include -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor-private.h b/glabels2/src/object-editor-private.h index 9a5e650e..68580759 100644 --- a/glabels2/src/object-editor-private.h +++ b/glabels2/src/object-editor-private.h @@ -21,8 +21,7 @@ #ifndef __OBJECT_EDITOR_PRIVATE_H__ #define __OBJECT_EDITOR_PRIVATE_H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/object-editor-shadow-page.c b/glabels2/src/object-editor-shadow-page.c index 86a3bc06..79409132 100644 --- a/glabels2/src/object-editor-shadow-page.c +++ b/glabels2/src/object-editor-shadow-page.c @@ -23,10 +23,7 @@ #include "object-editor.h" #include -#include -#include -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor-size-page.c b/glabels2/src/object-editor-size-page.c index 97710556..f652cbfd 100644 --- a/glabels2/src/object-editor-size-page.c +++ b/glabels2/src/object-editor-size-page.c @@ -23,8 +23,7 @@ #include "object-editor.h" #include -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor-text-page.c b/glabels2/src/object-editor-text-page.c index 61606681..d53d9b71 100644 --- a/glabels2/src/object-editor-text-page.c +++ b/glabels2/src/object-editor-text-page.c @@ -23,9 +23,7 @@ #include "object-editor.h" #include -#include -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor.c b/glabels2/src/object-editor.c index 54f6797a..49b5e42f 100644 --- a/glabels2/src/object-editor.c +++ b/glabels2/src/object-editor.c @@ -23,12 +23,7 @@ #include "object-editor.h" #include -#include -#include -#include -#include -#include - +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor.h b/glabels2/src/object-editor.h index 4ff34992..71d63a31 100644 --- a/glabels2/src/object-editor.h +++ b/glabels2/src/object-editor.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * object-editor.h: object properties editor module header file + * object-editor.h + * Copyright (C) 2003-2009 Jim Evins . * - * Copyright (C) 2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __OBJECT_EDITOR_H__ #define __OBJECT_EDITOR_H__ -#include -#include +#include #include "text-node.h" #include "label.h" @@ -305,3 +301,14 @@ gdouble gl_object_editor_get_shadow_opacity (glObjectEditor *editor); G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/pixbuf-cache.c b/glabels2/src/pixbuf-cache.c index df676047..77b2fc59 100644 --- a/glabels2/src/pixbuf-cache.c +++ b/glabels2/src/pixbuf-cache.c @@ -1,32 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * pixbuf-cache.c: GLabels pixbuf cache module + * pixbuf-cache.c + * Copyright (C) 2003-2009 Jim Evins . * - * Copyright (C) 2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "pixbuf-cache.h" #include "debug.h" + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -37,10 +35,12 @@ typedef struct { GdkPixbuf *pixbuf; } CacheRecord; + /*========================================================*/ /* Private globals. */ /*========================================================*/ + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ @@ -51,7 +51,7 @@ static void add_name_to_list (gpointer key, gpointer val, gpointer user_data); - + /*---------------------------------------------------------------------------*/ /* PRIVATE. Destroy cache record. */ /*---------------------------------------------------------------------------*/ @@ -67,6 +67,7 @@ record_destroy (gpointer val) g_free (record); } + /*****************************************************************************/ /* Create a new hash table to keep track of cached pixbufs. */ /*****************************************************************************/ @@ -87,6 +88,7 @@ gl_pixbuf_cache_new (void) return pixbuf_cache; } + /*****************************************************************************/ /* Free up previously allocated hash table and its contents. */ /*****************************************************************************/ @@ -100,6 +102,7 @@ gl_pixbuf_cache_free (GHashTable *pixbuf_cache) gl_debug (DEBUG_PIXBUF_CACHE, "END"); } + /*****************************************************************************/ /* Add pixbuf to cache explicitly (not a reference). */ /*****************************************************************************/ @@ -129,6 +132,7 @@ gl_pixbuf_cache_add_pixbuf (GHashTable *pixbuf_cache, gl_debug (DEBUG_PIXBUF_CACHE, "END"); } + /*****************************************************************************/ /* Get pixbuf. If not in cache, read it and add to cache. */ /*****************************************************************************/ @@ -166,6 +170,7 @@ gl_pixbuf_cache_get_pixbuf (GHashTable *pixbuf_cache, return pixbuf; } + /*****************************************************************************/ /* Remove pixbuf, but only if no references left. */ /*****************************************************************************/ @@ -194,6 +199,7 @@ gl_pixbuf_cache_remove_pixbuf (GHashTable *pixbuf_cache, gl_debug (DEBUG_PIXBUF_CACHE, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Add a name to a GList while iterating over cache. */ /*---------------------------------------------------------------------------*/ @@ -214,6 +220,7 @@ add_name_to_list (gpointer key, gl_debug (DEBUG_PIXBUF_CACHE, "END"); } + /*****************************************************************************/ /* Return a list of names for all pixbufs in the cache. */ /*****************************************************************************/ @@ -231,6 +238,7 @@ gl_pixbuf_cache_get_name_list (GHashTable *pixbuf_cache) return name_list; } + /*****************************************************************************/ /* Free up a list of pixbuf names. */ /*****************************************************************************/ @@ -252,3 +260,13 @@ gl_pixbuf_cache_free_name_list (GList *name_list) } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/pixbuf-cache.h b/glabels2/src/pixbuf-cache.h index 5fe8a80c..333e5c82 100644 --- a/glabels2/src/pixbuf-cache.h +++ b/glabels2/src/pixbuf-cache.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * pixbuf-cache.h: GLabels pixbuf cache module + * pixbuf-cache.h + * Copyright (C) 2003-2009 Jim Evins . * - * Copyright (C) 2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __PIXBUF_CACHE_H__ #define __PIXBUF_CACHE_H__ -#include -#include +#include #include G_BEGIN_DECLS @@ -51,3 +47,15 @@ void gl_pixbuf_cache_free_name_list (GList *name_list); G_END_DECLS #endif /*__PIXBUF_CACHE_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/prefs-dialog.c b/glabels2/src/prefs-dialog.c index 3c76bc1d..97c0546b 100644 --- a/glabels2/src/prefs-dialog.c +++ b/glabels2/src/prefs-dialog.c @@ -23,12 +23,7 @@ #include "prefs-dialog.h" #include -#include -#include -#include -#include -#include -#include +#include #include "prefs.h" #include "hig.h" diff --git a/glabels2/src/prefs-dialog.h b/glabels2/src/prefs-dialog.h index fe4ab181..86b11042 100644 --- a/glabels2/src/prefs-dialog.h +++ b/glabels2/src/prefs-dialog.h @@ -1,32 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * prefs-dialog.h: Preferences dialog module header file + * prefs-dialog.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __PREFS_DIALOG_H__ #define __PREFS_DIALOG_H__ -#include -#include +#include G_BEGIN_DECLS @@ -68,3 +63,15 @@ GtkWidget *gl_prefs_dialog_new (GtkWindow *parent); G_END_DECLS #endif /* __PREFS_DIALOG_H__ */ + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/prefs-model.c b/glabels2/src/prefs-model.c index 72a043b6..a2748247 100644 --- a/glabels2/src/prefs-model.c +++ b/glabels2/src/prefs-model.c @@ -1,42 +1,39 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * prefs-model.c: Application preferences model module + * prefs-model.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "prefs-model.h" -#include -#include -#include +#include +#include #include -#include +#include #include "marshal.h" #include "util.h" #include "color.h" #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ @@ -95,6 +92,7 @@ #define DEFAULT_FILL_COLOR GL_COLOR_A (0, 255, 0, 255) + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -105,13 +103,13 @@ enum { }; - /*========================================================*/ /* Private globals. */ /*========================================================*/ static guint signals[LAST_SIGNAL] = {0}; + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ @@ -143,12 +141,12 @@ static lglUnitsType string_to_units (const gchar *string) static const gchar *units_to_string (lglUnitsType units); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glPrefsModel, gl_prefs_model, G_TYPE_OBJECT); + static void gl_prefs_model_class_init (glPrefsModelClass *class) { @@ -173,6 +171,7 @@ gl_prefs_model_class_init (glPrefsModelClass *class) gl_debug (DEBUG_PREFS, "END"); } + static void gl_prefs_model_init (glPrefsModel *prefs_model) { @@ -195,6 +194,7 @@ gl_prefs_model_init (glPrefsModel *prefs_model) gl_debug (DEBUG_PREFS, "END"); } + static void gl_prefs_model_finalize (GObject *object) { @@ -213,6 +213,7 @@ gl_prefs_model_finalize (GObject *object) gl_debug (DEBUG_PREFS, "END"); } + /*****************************************************************************/ /* New prefs_model object. */ /*****************************************************************************/ @@ -231,7 +232,6 @@ gl_prefs_model_new (void) } - /*****************************************************************************/ /* Save all settings. */ /*****************************************************************************/ @@ -367,6 +367,7 @@ gl_prefs_model_save_settings (glPrefsModel *prefs_model) gl_debug (DEBUG_PREFS, "END"); } + /*****************************************************************************/ /* Load all settings. */ /*****************************************************************************/ @@ -556,6 +557,7 @@ gl_prefs_model_load_settings (glPrefsModel *prefs_model) gl_debug (DEBUG_PREFS, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Key changed callback. */ /*---------------------------------------------------------------------------*/ @@ -570,6 +572,7 @@ notify_cb (GConfClient *client, gl_prefs_model_load_settings (prefs_model); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Utilities to get values with defaults. */ /*---------------------------------------------------------------------------*/ @@ -593,6 +596,7 @@ get_string (GConfClient *client, } } + static gboolean get_bool (GConfClient *client, const gchar *key, @@ -622,6 +626,7 @@ get_bool (GConfClient *client, } } + static gint get_int (GConfClient *client, const gchar *key, @@ -651,6 +656,7 @@ get_int (GConfClient *client, } } + static gdouble get_float (GConfClient *client, const gchar *key, @@ -679,6 +685,7 @@ get_float (GConfClient *client, } } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Utilities to deal with units. */ /*---------------------------------------------------------------------------*/ @@ -700,6 +707,7 @@ string_to_units (const gchar *string) return units; } + static const gchar *units_to_string (lglUnitsType units) { @@ -720,3 +728,14 @@ gchar *units_to_string (lglUnitsType units) } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/prefs-model.h b/glabels2/src/prefs-model.h index 23937fd9..bb5ca180 100644 --- a/glabels2/src/prefs-model.h +++ b/glabels2/src/prefs-model.h @@ -1,33 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * prefs-model.h: Application preferences model module header file + * prefs-model.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __PREFS_MODEL_H__ #define __PREFS_MODEL_H__ #include #include #include -#include +#include G_BEGIN_DECLS @@ -119,3 +116,13 @@ G_END_DECLS #endif /* __PREFS_MODEL_H__ */ + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/prefs.c b/glabels2/src/prefs.c index 32011b79..85922bf5 100644 --- a/glabels2/src/prefs.c +++ b/glabels2/src/prefs.c @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * prefs.c: Application preferences module + * prefs.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "prefs.h" @@ -212,3 +209,15 @@ gl_prefs_add_recent_template (const gchar *name) */ gl_prefs_model_save_settings (gl_prefs); } + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/prefs.h b/glabels2/src/prefs.h index 98474f5c..5787debb 100644 --- a/glabels2/src/prefs.h +++ b/glabels2/src/prefs.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * prefs.h: Application preferences module header file + * prefs.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __PREFS_H__ #define __PREFS_H__ @@ -54,3 +51,14 @@ G_END_DECLS #endif /* __PREFS_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/print-op-dialog.c b/glabels2/src/print-op-dialog.c index 46a25c2c..812682c2 100644 --- a/glabels2/src/print-op-dialog.c +++ b/glabels2/src/print-op-dialog.c @@ -23,12 +23,10 @@ #include "print-op-dialog.h" #include -#include +#include #include #include #include -#include -#include #include "mini-preview.h" #include "label.h" diff --git a/glabels2/src/print-op.c b/glabels2/src/print-op.c index d13d1a5e..2c78f488 100644 --- a/glabels2/src/print-op.c +++ b/glabels2/src/print-op.c @@ -23,12 +23,12 @@ #include "print-op.h" #include +#include #include #include #include -#include -#include +#include #include "print.h" #include "label.h" @@ -312,7 +312,7 @@ gl_print_op_set_crop_marks_flag (glPrintOp *op, gchar * gl_print_op_get_filename (glPrintOp *op) { - gchar *filename; + gchar *filename = NULL; g_object_get (G_OBJECT (op), "export_filename", filename, diff --git a/glabels2/src/print-op.h b/glabels2/src/print-op.h index 0ee7a725..c01af4ce 100644 --- a/glabels2/src/print-op.h +++ b/glabels2/src/print-op.h @@ -21,7 +21,7 @@ #ifndef __PRINT_OP_H__ #define __PRINT_OP_H__ -#include +#include #include "label.h" G_BEGIN_DECLS diff --git a/glabels2/src/print.c b/glabels2/src/print.c index a33e3ad1..2006e0ee 100644 --- a/glabels2/src/print.c +++ b/glabels2/src/print.c @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * print.c: Print module + * print.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "print.h" @@ -30,12 +27,13 @@ #include #include +#include #include "label.h" -#include #include "cairo-label-path.h" #include "debug.h" + /*===========================================*/ /* Private macros and constants. */ /*===========================================*/ @@ -47,6 +45,7 @@ #define TICK_OFFSET 2.25 #define TICK_LENGTH 18.0 + /*=========================================================================*/ /* Private types. */ /*=========================================================================*/ @@ -91,7 +90,6 @@ static void clip_to_outline (PrintInfo *pi, glLabel *label); - /*****************************************************************************/ /* Print simple sheet (no merge data) command. */ /*****************************************************************************/ @@ -137,6 +135,7 @@ gl_print_simple_sheet (glLabel *label, gl_debug (DEBUG_PRINT, "END"); } + /*****************************************************************************/ /* Print collated merge sheet command */ /*****************************************************************************/ @@ -228,6 +227,7 @@ gl_print_collated_merge_sheet (glLabel *label, gl_debug (DEBUG_PRINT, "END"); } + /*****************************************************************************/ /* Print uncollated merge sheet command */ /*****************************************************************************/ @@ -321,6 +321,7 @@ gl_print_uncollated_merge_sheet (glLabel *label, gl_debug (DEBUG_PRINT, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. new print info structure */ /*---------------------------------------------------------------------------*/ @@ -355,6 +356,7 @@ print_info_new (cairo_t *cr, return pi; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. free print info structure */ /*---------------------------------------------------------------------------*/ @@ -370,6 +372,7 @@ print_info_free (PrintInfo **pi) gl_debug (DEBUG_PRINT, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Print crop tick marks. */ /*---------------------------------------------------------------------------*/ @@ -478,6 +481,7 @@ print_crop_marks (PrintInfo *pi) gl_debug (DEBUG_PRINT, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Print i'th label. */ /*---------------------------------------------------------------------------*/ @@ -533,6 +537,7 @@ print_label (PrintInfo *pi, gl_debug (DEBUG_PRINT, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw outline. */ /*---------------------------------------------------------------------------*/ @@ -556,6 +561,7 @@ draw_outline (PrintInfo *pi, gl_debug (DEBUG_PRINT, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Clip to outline. */ /*---------------------------------------------------------------------------*/ @@ -573,3 +579,15 @@ clip_to_outline (PrintInfo *pi, gl_debug (DEBUG_PRINT, "END"); } + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/print.h b/glabels2/src/print.h index b4f46a1f..5d79c7ba 100644 --- a/glabels2/src/print.h +++ b/glabels2/src/print.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * print.h: Print module header file + * print.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __PRINT_H__ #define __PRINT_H__ @@ -68,3 +65,16 @@ void gl_print_uncollated_merge_sheet (glLabel *label, G_END_DECLS #endif + + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/recent.c b/glabels2/src/recent.c index f713fcb4..38244ab1 100644 --- a/glabels2/src/recent.c +++ b/glabels2/src/recent.c @@ -1,35 +1,32 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * recent.c: gLabels recent files module + * recent.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include #include "recent.h" +#include #include -#include #include "prefs.h" + #include "debug.h" #define GLABELS_MIME_TYPE "application/x-glabels" @@ -37,7 +34,6 @@ static GtkRecentManager *model; - /*****************************************************************************/ /* Initialize recent files model. */ /*****************************************************************************/ @@ -77,6 +73,7 @@ gl_recent_get_utf8_filename (GtkRecentInfo *item) gl_debug (DEBUG_RECENT, "END"); } + /*****************************************************************************/ /* Add file by UTF8 filename to recent model. */ /*****************************************************************************/ @@ -153,3 +150,15 @@ gl_recent_create_menu (void) gl_debug (DEBUG_RECENT, "END"); return recent_menu; } + + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/recent.h b/glabels2/src/recent.h index 9a1b36c4..f3a19d2a 100644 --- a/glabels2/src/recent.h +++ b/glabels2/src/recent.h @@ -1,32 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * recent.h: gLabels recent files module header file + * recent.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __RECENT_H__ #define __RECENT_H__ -#include -#include +#include G_BEGIN_DECLS @@ -43,3 +38,14 @@ G_END_DECLS #endif /*__RECENT_H__*/ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/rotate-label-button.c b/glabels2/src/rotate-label-button.c index 29955c55..65a880f1 100644 --- a/glabels2/src/rotate-label-button.c +++ b/glabels2/src/rotate-label-button.c @@ -23,12 +23,11 @@ #include "rotate-label-button.h" #include -#include -#include -#include +#include #include + +#include #include "mini-label-preview.h" -#include #include "hig.h" #include "marshal.h" diff --git a/glabels2/src/rotate-label-button.h b/glabels2/src/rotate-label-button.h index 0dda489e..049d80e8 100644 --- a/glabels2/src/rotate-label-button.h +++ b/glabels2/src/rotate-label-button.h @@ -21,7 +21,7 @@ #ifndef __ROTATE_LABEL_BUTTON_H__ #define __ROTATE_LABEL_BUTTON_H__ -#include +#include G_BEGIN_DECLS diff --git a/glabels2/src/stock.c b/glabels2/src/stock.c index 72f1c25c..311be4b5 100644 --- a/glabels2/src/stock.c +++ b/glabels2/src/stock.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * stock.h: Stock image module header file + * stock.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -27,9 +23,8 @@ #include "stock.h" #include -#include -#include -#include +#include +#include #include "stock-pixmaps/stockpixbufs.h" @@ -38,14 +33,17 @@ /* Private macros and constants. */ /*========================================================*/ + /*========================================================*/ /* Private types. */ /*========================================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -59,7 +57,7 @@ static void add_button_icon (GtkIconFactory *factory, const gchar *stock_id, const guchar *inline_24); - + /****************************************************************************/ /* Initialize our stock icons. */ /****************************************************************************/ @@ -144,6 +142,7 @@ gl_stock_init (void) g_object_unref (G_OBJECT(factory)); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Unpack and associate given icons with stock_id. */ /*--------------------------------------------------------------------------*/ @@ -185,6 +184,7 @@ add_icons (GtkIconFactory *factory, gtk_icon_set_unref (icon_set); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Unpack and associate given button icon with stock_id. */ /*--------------------------------------------------------------------------*/ @@ -215,7 +215,11 @@ add_button_icon (GtkIconFactory *factory, - - - - +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/stock.h b/glabels2/src/stock.h index 14fb907a..54eb8c8a 100644 --- a/glabels2/src/stock.h +++ b/glabels2/src/stock.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * stock.h: Stock image module header file + * stock.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __STOCK_H__ #define __STOCK_H__ -#include +#include G_BEGIN_DECLS @@ -66,3 +62,14 @@ void gl_stock_init (void); G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/template-designer.c b/glabels2/src/template-designer.c index 2d34a11c..5f5ced8b 100644 --- a/glabels2/src/template-designer.c +++ b/glabels2/src/template-designer.c @@ -23,16 +23,12 @@ #include "template-designer.h" #include -#include -#include -#include -#include -#include +#include #include #include +#include #include "prefs.h" -#include #include "mini-preview.h" #include "mini-preview-pixbuf-cache.h" #include "print-op-dialog.h" diff --git a/glabels2/src/template-designer.h b/glabels2/src/template-designer.h index da3aad73..a86034c1 100644 --- a/glabels2/src/template-designer.h +++ b/glabels2/src/template-designer.h @@ -1,32 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * template-designer.h: Template designer module header file + * template-designer.h + * Copyright (C) 2003-2009 Jim Evins . * - * Copyright (C) 2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __TEMPLATE_DESIGNER_H__ #define __TEMPLATE_DESIGNER_H__ -#include -#include +#include G_BEGIN_DECLS @@ -69,3 +64,14 @@ GtkWidget *gl_template_designer_new (GtkWindow *parent); G_END_DECLS #endif /* __TEMPLATE_DESIGNER_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/text-node.c b/glabels2/src/text-node.c index 7a77fbd6..dc03ca29 100644 --- a/glabels2/src/text-node.c +++ b/glabels2/src/text-node.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * text_node.c: text node module + * text-node.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -32,6 +28,7 @@ #include "debug.h" + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -42,7 +39,7 @@ static glTextNode *extract_text_node (gchar *text, static gboolean is_empty_field (glTextNode *text_node, glMergeRecord *record); - + /****************************************************************************/ /* Expand single node into representative string. */ /****************************************************************************/ @@ -68,6 +65,7 @@ gl_text_node_expand (glTextNode *text_node, } } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Is node a field that evaluates empty? */ /*--------------------------------------------------------------------------*/ @@ -89,6 +87,7 @@ is_empty_field (glTextNode *text_node, return ret; } + /****************************************************************************/ /* Create a single text node from given text. */ /****************************************************************************/ @@ -100,6 +99,7 @@ gl_text_node_new_from_text (gchar *text) return extract_text_node (text, &n); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Create a single text node from given text. n = characters used */ /*--------------------------------------------------------------------------*/ @@ -140,6 +140,7 @@ extract_text_node (gchar *text, return text_node; } + /****************************************************************************/ /* Copy a single text node. */ /****************************************************************************/ @@ -158,6 +159,7 @@ gl_text_node_dup (glTextNode *src) return dst; } + /****************************************************************************/ /* Free a single text node. */ /****************************************************************************/ @@ -172,6 +174,7 @@ gl_text_node_free (glTextNode **text_node) *text_node = NULL; } + /****************************************************************************/ /* Compare 2 text nodes for equality. */ /****************************************************************************/ @@ -206,6 +209,7 @@ gl_text_node_equal (glTextNode *text_node1, return (strcmp (text_node1->data, text_node2->data) == 0); } + /****************************************************************************/ /* Expand text lines into single string. */ /****************************************************************************/ @@ -252,6 +256,7 @@ gl_text_node_lines_expand (GList *lines, return text; } + /****************************************************************************/ /* Parse a string back into text lines. */ /****************************************************************************/ @@ -282,6 +287,7 @@ gl_text_node_lines_new_from_text (gchar *text) return lines; } + /****************************************************************************/ /* Copy a list of text lines. */ /****************************************************************************/ @@ -306,6 +312,7 @@ gl_text_node_lines_dup (GList *src_lines) return dst_lines; } + /****************************************************************************/ /* Free a list of text lines. */ /****************************************************************************/ @@ -331,6 +338,7 @@ gl_text_node_lines_free (GList **lines) *lines = NULL; } + /****************************************************************************/ /* For debugging: descend and print lines list. */ /****************************************************************************/ @@ -354,3 +362,13 @@ gl_text_node_lines_print (GList * lines ) } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/text-node.h b/glabels2/src/text-node.h index 4a9bd228..68189b6c 100644 --- a/glabels2/src/text-node.h +++ b/glabels2/src/text-node.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * text_node.h: text node module header file + * text-node.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __TEXT_NODE_H__ #define __TEXT_NODE_H__ -#include -#include +#include #include "merge.h" G_BEGIN_DECLS @@ -56,3 +52,14 @@ void gl_text_node_lines_print (GList *lines); G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/ui-commands.c b/glabels2/src/ui-commands.c index 80f5f794..a8e2bbd3 100644 --- a/glabels2/src/ui-commands.c +++ b/glabels2/src/ui-commands.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * ui-commands.c: GLabels UI commands module - * + * ui-commands.c * Copyright (C) 2001-2009 Jim Evins . * - * This program is free software; you can redistribute it and/or modify + * This file is part of gLabels. + * + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -39,7 +35,6 @@ #include "debug.h" - /****************************************************************************/ /** File/New command. */ /****************************************************************************/ @@ -57,6 +52,7 @@ gl_ui_cmd_file_new (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** File/Properties command. */ /****************************************************************************/ @@ -74,6 +70,7 @@ gl_ui_cmd_file_properties (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** File/Template-Designer command. */ /****************************************************************************/ @@ -95,6 +92,7 @@ gl_ui_cmd_file_template_designer (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** File/Open command. */ /****************************************************************************/ @@ -112,6 +110,7 @@ gl_ui_cmd_file_open (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** File/Open-Recent command. */ /****************************************************************************/ @@ -141,6 +140,7 @@ gl_ui_cmd_file_open_recent (GtkRecentChooser *chooser, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** File/Save command. */ /****************************************************************************/ @@ -158,6 +158,7 @@ gl_ui_cmd_file_save (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** File/Save-as command. */ /****************************************************************************/ @@ -175,6 +176,7 @@ gl_ui_cmd_file_save_as (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** File/Print command. */ /****************************************************************************/ @@ -211,6 +213,7 @@ gl_ui_cmd_file_print (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** File/Close command. */ /****************************************************************************/ @@ -228,6 +231,7 @@ gl_ui_cmd_file_close (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** File/Quit command. */ /****************************************************************************/ @@ -263,6 +267,7 @@ gl_ui_cmd_edit_cut (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** Edit/Copy command. */ /****************************************************************************/ @@ -280,6 +285,7 @@ gl_ui_cmd_edit_copy (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** Edit/Paste command. */ /****************************************************************************/ @@ -333,6 +339,7 @@ gl_ui_cmd_edit_select_all (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** Edit/Unselect-all command. */ /****************************************************************************/ @@ -350,6 +357,7 @@ gl_ui_cmd_edit_unselect_all (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** Edit/Preferences command. */ /****************************************************************************/ @@ -384,6 +392,7 @@ gl_ui_cmd_edit_preferences (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** View/Property-bar-toggle command. */ /*****************************************************************************/ @@ -443,6 +452,7 @@ gl_ui_cmd_view_grid_toggle (GtkToggleAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** View/Markup-toggle command. */ /*****************************************************************************/ @@ -474,6 +484,7 @@ gl_ui_cmd_view_markup_toggle (GtkToggleAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** View/Zoom-in command. */ /*****************************************************************************/ @@ -494,6 +505,7 @@ gl_ui_cmd_view_zoomin (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** View/Zoom-out command. */ /*****************************************************************************/ @@ -514,6 +526,7 @@ gl_ui_cmd_view_zoomout (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** View/Zoom-1:1 command. */ /*****************************************************************************/ @@ -534,6 +547,7 @@ gl_ui_cmd_view_zoom1to1 (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** View/Zoom-to-fit command. */ /*****************************************************************************/ @@ -554,6 +568,7 @@ gl_ui_cmd_view_zoom_to_fit (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Arrow-mode command. */ /*****************************************************************************/ @@ -573,6 +588,7 @@ gl_ui_cmd_objects_arrow_mode (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Create-text object command. */ /*****************************************************************************/ @@ -594,6 +610,7 @@ gl_ui_cmd_objects_create_text (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Create-box object command. */ /*****************************************************************************/ @@ -615,6 +632,7 @@ gl_ui_cmd_objects_create_box (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Create-line object command. */ /*****************************************************************************/ @@ -636,6 +654,7 @@ gl_ui_cmd_objects_create_line (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Create-ellipse object command. */ /*****************************************************************************/ @@ -657,6 +676,7 @@ gl_ui_cmd_objects_create_ellipse (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Create-image object command. */ /*****************************************************************************/ @@ -678,6 +698,7 @@ gl_ui_cmd_objects_create_image (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Create-barcode object command. */ /*****************************************************************************/ @@ -699,6 +720,7 @@ gl_ui_cmd_objects_create_barcode (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Raise command. */ /*****************************************************************************/ @@ -719,6 +741,7 @@ gl_ui_cmd_objects_raise (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Lower command. */ /*****************************************************************************/ @@ -739,6 +762,7 @@ gl_ui_cmd_objects_lower (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Rotate-left-90-degrees command. */ /*****************************************************************************/ @@ -759,6 +783,7 @@ gl_ui_cmd_objects_rotate_left (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Rotate-right-90-degrees command. */ /*****************************************************************************/ @@ -779,6 +804,7 @@ gl_ui_cmd_objects_rotate_right (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Flip-horizontally command. */ /*****************************************************************************/ @@ -799,6 +825,7 @@ gl_ui_cmd_objects_flip_horiz (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Flip-vertically command. */ /*****************************************************************************/ @@ -819,6 +846,7 @@ gl_ui_cmd_objects_flip_vert (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Align-left command. */ /*****************************************************************************/ @@ -839,6 +867,7 @@ gl_ui_cmd_objects_align_left (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Align-right command. */ /*****************************************************************************/ @@ -859,6 +888,7 @@ gl_ui_cmd_objects_align_right (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Align-horizontal-center command. */ /*****************************************************************************/ @@ -879,6 +909,7 @@ gl_ui_cmd_objects_align_hcenter (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Align-top command. */ /*****************************************************************************/ @@ -899,6 +930,7 @@ gl_ui_cmd_objects_align_top (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Align-bottom command. */ /*****************************************************************************/ @@ -919,6 +951,7 @@ gl_ui_cmd_objects_align_bottom (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Align-vertical center command. */ /*****************************************************************************/ @@ -939,6 +972,7 @@ gl_ui_cmd_objects_align_vcenter (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Center-horizontally command. */ /*****************************************************************************/ @@ -959,6 +993,7 @@ gl_ui_cmd_objects_center_horiz (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Center-vertically command. */ /*****************************************************************************/ @@ -979,6 +1014,7 @@ gl_ui_cmd_objects_center_vert (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /*****************************************************************************/ /** Objects/Edit- merge-properties command. */ /*****************************************************************************/ @@ -1016,6 +1052,7 @@ gl_ui_cmd_objects_merge_properties (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + /****************************************************************************/ /** Help/Contents command. */ /****************************************************************************/ @@ -1086,14 +1123,15 @@ gl_ui_cmd_help_about (GtkAction *action, const gchar *translator_credits = _("translator-credits"); const gchar *license = _( - "Glabels is free software; you can redistribute it and/or modify it\n" - "under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation; either version 2 of the License, or\n" - "(at your option) any later version.\n" "\n" - "This program is distributed in the hope that it will be useful, but\n" - "WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n" - "the GNU General Public License for more details.\n"); + "gLabels is free software: you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" + "the Free Software Foundation, either version 3 of the License, or\n" + "(at your option) any later version.\n" + "\n" + "gLabels is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + "GNU General Public License for more details.\n"); gl_debug (DEBUG_COMMANDS, "START"); @@ -1145,3 +1183,13 @@ gl_ui_cmd_help_about (GtkAction *action, gl_debug (DEBUG_COMMANDS, "END"); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/ui-commands.h b/glabels2/src/ui-commands.h index fc8a3db9..42cfc89b 100644 --- a/glabels2/src/ui-commands.h +++ b/glabels2/src/ui-commands.h @@ -1,33 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * ui-commands.h: GLabels UI commands module header file + * ui-commands.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2005 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __COMMANDS_H__ #define __COMMANDS_H__ -#include -#include -#include +#include #include "window.h" G_BEGIN_DECLS @@ -201,3 +195,14 @@ void gl_ui_cmd_help_about (GtkAction *action, G_END_DECLS #endif /* __COMMANDS_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/ui-property-bar.c b/glabels2/src/ui-property-bar.c index d2bb94c4..cc15b352 100644 --- a/glabels2/src/ui-property-bar.c +++ b/glabels2/src/ui-property-bar.c @@ -23,10 +23,7 @@ #include "ui-property-bar.h" #include -#include -#include -#include -#include +#include #include #include "util.h" diff --git a/glabels2/src/ui-property-bar.h b/glabels2/src/ui-property-bar.h index 37985ef7..92568277 100644 --- a/glabels2/src/ui-property-bar.h +++ b/glabels2/src/ui-property-bar.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - -/** - * (GLABELS) Label and Business Card Creation program for GNOME - * - * ui-property-bar.h: Property toolbar header file +/* + * ui-property-bar.h + * Copyright (C) 2003-2009 Jim Evins . * - * Copyright (C) 2003-2008 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __UI_PROPERTY_BAR_H__ #define __UI_PROPERTY_BAR_H__ -#include +#include #include "view.h" @@ -68,3 +64,14 @@ void gl_ui_property_bar_set_view (glUIPropertyBar *this, G_END_DECLS #endif /* __UI_PROPERTY_BAR_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/ui-sidebar.c b/glabels2/src/ui-sidebar.c index 0475616a..1a821cef 100644 --- a/glabels2/src/ui-sidebar.c +++ b/glabels2/src/ui-sidebar.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - -/** - * (GLABELS) Label and Business Card Creation program for GNOME - * - * ui-sidebar.c: Object property sidebar +/* + * ui-sidebar.c + * Copyright (C) 2003-2009 Jim Evins . * - * Copyright (C) 2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -34,12 +30,14 @@ #include "debug.h" + /*===========================================================================*/ /* Private macros and constants. */ /*===========================================================================*/ #define DEFAULT_SIDEBAR_WIDTH 340 + /*===========================================================================*/ /* Private data types */ /*===========================================================================*/ @@ -69,12 +67,12 @@ static void selection_changed_cb (glView *view, glUISidebar *sidebar); - /****************************************************************************/ /* Boilerplate Object stuff. */ /****************************************************************************/ G_DEFINE_TYPE (glUISidebar, gl_ui_sidebar, GTK_TYPE_VBOX); + static void gl_ui_sidebar_class_init (glUISidebarClass *class) { @@ -89,6 +87,7 @@ gl_ui_sidebar_class_init (glUISidebarClass *class) gl_debug (DEBUG_UI, "END"); } + static void gl_ui_sidebar_init (glUISidebar *sidebar) { @@ -99,6 +98,7 @@ gl_ui_sidebar_init (glUISidebar *sidebar) gl_debug (DEBUG_UI, "END"); } + static void gl_ui_sidebar_finalize (GObject *object) { @@ -119,6 +119,7 @@ gl_ui_sidebar_finalize (GObject *object) gl_debug (DEBUG_UI, "END"); } + /****************************************************************************/ /* Create a NEW sidebar. */ /****************************************************************************/ @@ -140,6 +141,7 @@ gl_ui_sidebar_new (void) return GTK_WIDGET(sidebar); } + /******************************************************************************/ /* Initialize property toolbar. */ /******************************************************************************/ @@ -163,6 +165,7 @@ gl_ui_sidebar_construct (glUISidebar *sidebar) gl_debug (DEBUG_UI, "END"); } + /****************************************************************************/ /* Set view associated with sidebar. */ /****************************************************************************/ @@ -184,6 +187,7 @@ gl_ui_sidebar_set_view (glUISidebar *sidebar, gl_debug (DEBUG_UI, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. View "selection state changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -215,3 +219,13 @@ selection_changed_cb (glView *view, gl_debug (DEBUG_UI, "END"); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/ui-sidebar.h b/glabels2/src/ui-sidebar.h index 870c69f8..7139525e 100644 --- a/glabels2/src/ui-sidebar.h +++ b/glabels2/src/ui-sidebar.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - -/** - * (GLABELS) Label and Business Card Creation program for GNOME - * - * ui-sidebar.h: Object property sidebar header file +/* + * ui-sidebar.h + * Copyright (C) 2003-2009 Jim Evins . * - * Copyright (C) 2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __UI_SIDEBAR_H__ #define __UI_SIDEBAR_H__ -#include +#include #include "view.h" @@ -67,3 +63,14 @@ void gl_ui_sidebar_set_view (glUISidebar *sidebar, G_END_DECLS #endif /* __UI_SIDEBAR_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/ui-util.c b/glabels2/src/ui-util.c index 3a0539df..7494dca9 100644 --- a/glabels2/src/ui-util.c +++ b/glabels2/src/ui-util.c @@ -1,53 +1,52 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * ui-util.c: GLabels ui utilities module + * ui-util.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "ui-util.h" -#include -#include +#include #include "debug.h" + /*==========================================================================*/ /* Private macros and constants. */ /*==========================================================================*/ + /*==========================================================================*/ /* Private types. */ /*==========================================================================*/ + /*==========================================================================*/ /* Private globals */ /*==========================================================================*/ + /*==========================================================================*/ /* Local function prototypes */ /*==========================================================================*/ - /*****************************************************************************/ /** Set sensitivity of verb. */ /*****************************************************************************/ @@ -73,6 +72,7 @@ gl_ui_util_set_verb_sensitive (GtkUIManager *ui, gl_debug (DEBUG_UI, "END"); } + /*****************************************************************************/ /** Set sensitivity of a list of verbs. */ /*****************************************************************************/ @@ -100,6 +100,7 @@ gl_ui_util_set_verb_list_sensitive (GtkUIManager *ui, gl_debug (DEBUG_UI, "END"); } + /*****************************************************************************/ /** Set state of a verb. */ /*****************************************************************************/ @@ -124,3 +125,13 @@ gl_ui_util_set_verb_state (GtkUIManager *ui, gl_debug (DEBUG_UI, "END"); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/ui-util.h b/glabels2/src/ui-util.h index ffa2653e..fd9ef042 100644 --- a/glabels2/src/ui-util.h +++ b/glabels2/src/ui-util.h @@ -1,30 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * ui-util.h: GLabels UI utilities module header file + * ui-util.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2003 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __GL_UI_UTIL_H__ #define __GL_UI_UTIL_H__ -#include +#include G_BEGIN_DECLS @@ -43,3 +40,14 @@ void gl_ui_util_set_verb_state (GtkUIManager *ui, G_END_DECLS #endif /* __GL_UI_UTIL_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/ui.c b/glabels2/src/ui.c index 12dc963a..62b67d4e 100644 --- a/glabels2/src/ui.c +++ b/glabels2/src/ui.c @@ -1,37 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * ui.c: GLabels ui module + * ui.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "ui.h" #include #include -#include -#include -#include -#include -#include +#include #include #include "ui-util.h" @@ -44,10 +37,12 @@ #include "debug.h" + /*==========================================================================*/ /* Private macros and constants. */ /*==========================================================================*/ + /*==========================================================================*/ /* Private types. */ /*==========================================================================*/ @@ -781,6 +776,7 @@ gl_ui_new (glWindow *window) return ui; } + /*****************************************************************************/ /** Unref wrapper. */ /*****************************************************************************/ @@ -794,6 +790,7 @@ gl_ui_unref (GtkUIManager *ui) gl_debug (DEBUG_UI, "END"); } + /*****************************************************************************/ /** Update all verbs of given UI component. */ /*****************************************************************************/ @@ -836,6 +833,7 @@ gl_ui_update_all (GtkUIManager *ui, gl_debug (DEBUG_UI, "END"); } + /*****************************************************************************/ /** Update all verbs of given UI component to "no document" state. */ /*****************************************************************************/ @@ -849,6 +847,7 @@ gl_ui_update_nodoc (GtkUIManager *ui) gl_debug (DEBUG_UI, "END"); } + /*****************************************************************************/ /** Update label modified verbs of given UI component. */ /*****************************************************************************/ @@ -865,6 +864,7 @@ gl_ui_update_modified_verbs (GtkUIManager *ui, gl_debug (DEBUG_UI, "END"); } + /*****************************************************************************/ /** Update verbs associated with selection state of given UI component. */ /*****************************************************************************/ @@ -887,6 +887,7 @@ gl_ui_update_selection_verbs (GtkUIManager *ui, gl_debug (DEBUG_UI, "END"); } + /*****************************************************************************/ /** Update verbs associated with zoom level of given UI component. */ /*****************************************************************************/ @@ -904,6 +905,7 @@ gl_ui_update_zoom_verbs (GtkUIManager *ui, gl_debug (DEBUG_UI, "END"); } + /*****************************************************************************/ /** Update undo/redo verbs of given UI component. */ /*****************************************************************************/ @@ -922,6 +924,7 @@ gl_ui_update_undo_redo_verbs (GtkUIManager *ui, gl_debug (DEBUG_UI, "END"); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. View menu item toggled callback. */ /*---------------------------------------------------------------------------*/ @@ -958,6 +961,7 @@ view_ui_item_toggled_cb (GtkToggleAction *action, gl_debug (DEBUG_UI, ""); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. Set main toolbar style. */ /*---------------------------------------------------------------------------*/ @@ -1015,6 +1019,7 @@ set_app_drawing_toolbar_style (GtkUIManager *ui) gl_debug (DEBUG_UI, "END"); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. Set visibility of grid and markup. */ /*---------------------------------------------------------------------------*/ @@ -1034,6 +1039,7 @@ set_view_style (GtkUIManager *ui) gl_debug (DEBUG_UI, "END"); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. Connect proxy callback. */ /*---------------------------------------------------------------------------*/ @@ -1052,6 +1058,7 @@ connect_proxy_cb (GtkUIManager *ui, } } + /*---------------------------------------------------------------------------*/ /** PRIVATE. Disconnect proxy callback. */ /*---------------------------------------------------------------------------*/ @@ -1070,6 +1077,7 @@ disconnect_proxy_cb (GtkUIManager *ui, } } + /*---------------------------------------------------------------------------*/ /** PRIVATE. Menu item select callback. */ /*---------------------------------------------------------------------------*/ @@ -1095,6 +1103,7 @@ menu_item_select_cb (GtkMenuItem *proxy, } } + /*---------------------------------------------------------------------------*/ /** PRIVATE. Menu item deselect callback. */ /*---------------------------------------------------------------------------*/ @@ -1109,3 +1118,13 @@ menu_item_deselect_cb (GtkMenuItem *proxy, window->menu_tips_context_id); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/ui.h b/glabels2/src/ui.h index 19135d53..fb681cc5 100644 --- a/glabels2/src/ui.h +++ b/glabels2/src/ui.h @@ -1,30 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * ui.h: GLabels UI module header file + * ui.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __GL_UI_H__ #define __GL_UI_H__ -#include +#include #include "window.h" #include "view.h" @@ -55,3 +52,14 @@ void gl_ui_update_undo_redo_verbs (GtkUIManager *ui, G_END_DECLS #endif /* __GL_UI_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/util.c b/glabels2/src/util.c index f2f7dcfa..4441f1c0 100644 --- a/glabels2/src/util.c +++ b/glabels2/src/util.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * util.c: various small utility functions + * util.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -29,14 +25,13 @@ #include #include #include -#include -#include -#include -#include +#include + +#include #define FRAC_EPSILON 0.00005 - + /****************************************************************************/ /* Append ".glabels" extension to filename if needed. */ /****************************************************************************/ @@ -60,6 +55,7 @@ gl_util_add_extension (const gchar *orig_filename) return new_filename; } + /****************************************************************************/ /* Remove ".glabels" extension from filename if needed. */ /****************************************************************************/ @@ -80,6 +76,7 @@ gl_util_remove_extension (const gchar *orig_filename) return new_filename; } + /****************************************************************************/ /* Make sure we have an absolute path to filename. */ /****************************************************************************/ @@ -99,6 +96,7 @@ gl_util_make_absolute (const gchar *filename) return absolute_filename; } + /****************************************************************************/ /* Create fractional representation of number, if possible. */ /****************************************************************************/ @@ -133,6 +131,7 @@ gl_util_fraction (gdouble x) } } + /****************************************************************************/ /* Utilities to deal with PangoAlignment types. */ /****************************************************************************/ @@ -151,6 +150,7 @@ gl_util_align_to_string (PangoAlignment align) } } + PangoAlignment gl_util_string_to_align (const gchar *string) { @@ -167,6 +167,7 @@ gl_util_string_to_align (const gchar *string) } + /****************************************************************************/ /* Utilities to deal with PangoWeight types */ /****************************************************************************/ @@ -183,6 +184,7 @@ gl_util_weight_to_string (PangoWeight weight) } } + PangoWeight gl_util_string_to_weight (const gchar *string) { @@ -197,6 +199,7 @@ gl_util_string_to_weight (const gchar *string) } + /****************************************************************************/ /* Convienience function to set strings in a text combo_box from a GList */ /****************************************************************************/ @@ -219,6 +222,7 @@ gl_util_combo_box_set_strings (GtkComboBox *combo, } } + /*---------------------------------------------------------------------------*/ /* PRIVATE. gl_util_combo_box_set_active_text support. */ /*---------------------------------------------------------------------------*/ @@ -250,6 +254,7 @@ search_text_func (GtkTreeModel *model, return FALSE; } + /****************************************************************************/ /* Convienience function to set active text in a text combo_box from text */ /****************************************************************************/ @@ -283,6 +288,7 @@ gl_util_combo_box_set_active_text (GtkComboBox *combo, } + /****************************************************************************/ /* Convienience function to add a simple text model to an existing */ /* combo_box. This is needed since combo_boxes created with glade do not */ @@ -306,7 +312,6 @@ gl_util_combo_box_add_text_model (GtkComboBox *combo) } - /****************************************************************************/ /* Get widgets from GtkBuilder "en masse." */ /****************************************************************************/ @@ -337,3 +342,13 @@ void gl_util_get_builder_widgets (GtkBuilder *builder, va_end (args); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/util.h b/glabels2/src/util.h index d4458d18..e3c4a15f 100644 --- a/glabels2/src/util.h +++ b/glabels2/src/util.h @@ -1,34 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * util.h: various small utility functions + * util.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2008 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __UTIL_H__ #define __UTIL_H__ -#include -#include +#include +#include #include -#include G_BEGIN_DECLS @@ -60,3 +55,14 @@ void gl_util_get_builder_widgets (GtkBuilder *builder, G_END_DECLS #endif /* __UTIL_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-barcode.c b/glabels2/src/view-barcode.c index 522d334c..84b9cfa4 100644 --- a/glabels2/src/view-barcode.c +++ b/glabels2/src/view-barcode.c @@ -1,32 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_barcode.c: GLabels label barcode object view + * view-barcode.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "view-barcode.h" #include -#include +#include #include "color.h" #include "object-editor.h" @@ -37,10 +34,12 @@ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -48,6 +47,7 @@ struct _glViewBarcodePrivate { }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -78,8 +78,6 @@ static gboolean object_at (glViewObject *view_obje gdouble y); - - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ @@ -104,6 +102,7 @@ gl_view_barcode_class_init (glViewBarcodeClass *class) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_barcode_init (glViewBarcode *view_barcode) { @@ -114,6 +113,7 @@ gl_view_barcode_init (glViewBarcode *view_barcode) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_barcode_finalize (GObject *object) { @@ -130,6 +130,7 @@ gl_view_barcode_finalize (GObject *object) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* NEW barcode object view. */ /*****************************************************************************/ @@ -156,6 +157,7 @@ gl_view_barcode_new (glLabelBarcode *object, return GL_VIEW_OBJECT (view_barcode); } + /*****************************************************************************/ /* Create a properties dialog for a barcode object. */ /*****************************************************************************/ @@ -196,6 +198,7 @@ construct_properties_editor (glViewObject *view_object) return editor; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. editor "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -248,6 +251,7 @@ update_object_from_editor_cb (glObjectEditor *editor, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -286,6 +290,7 @@ update_editor_from_object_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "moved" callback. */ /*---------------------------------------------------------------------------*/ @@ -305,6 +310,7 @@ update_editor_from_move_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Is object at (x,y)? */ /*****************************************************************************/ @@ -362,6 +368,7 @@ gl_view_barcode_get_create_cursor (void) return cursor; } + /*****************************************************************************/ /* Object creation handler: button press event. */ /*****************************************************************************/ @@ -393,6 +400,7 @@ gl_view_barcode_create_button_press_event (glView *view, view->create_y0 = y; } + /*****************************************************************************/ /* Object creation handler: motion event. */ /*****************************************************************************/ @@ -404,6 +412,7 @@ gl_view_barcode_create_motion_event (glView *view, gl_label_object_set_position (GL_LABEL_OBJECT(view->create_object), x, y); } + /*****************************************************************************/ /* Object creation handler: button relesase event. */ /*****************************************************************************/ @@ -422,3 +431,13 @@ gl_view_barcode_create_button_release_event (glView *view, gl_color_node_free (&line_color_node); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-barcode.h b/glabels2/src/view-barcode.h index 1587f195..a2b52d08 100644 --- a/glabels2/src/view-barcode.h +++ b/glabels2/src/view-barcode.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_barcode.h: GLabels label barcode object view + * view-barcode.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __VIEW_BARCODE_H__ @@ -79,3 +75,14 @@ void gl_view_barcode_create_button_release_event (glView *view, G_END_DECLS #endif /* __VIEW_BARCODE_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-box.c b/glabels2/src/view-box.c index 42f39803..bcb76931 100644 --- a/glabels2/src/view-box.c +++ b/glabels2/src/view-box.c @@ -1,32 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_box.c: GLabels label box object view + * view-box.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "view-box.h" #include -#include +#include #include "color.h" #include "object-editor.h" @@ -37,6 +34,7 @@ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ @@ -49,6 +47,7 @@ struct _glViewBoxPrivate { }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -79,8 +78,6 @@ static gboolean object_at (glViewObject *view_obje gdouble y); - - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ @@ -105,6 +102,7 @@ gl_view_box_class_init (glViewBoxClass *class) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_box_init (glViewBox *view_box) { @@ -115,6 +113,7 @@ gl_view_box_init (glViewBox *view_box) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_box_finalize (GObject *object) { @@ -131,6 +130,7 @@ gl_view_box_finalize (GObject *object) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* NEW box object view. */ /*****************************************************************************/ @@ -157,6 +157,7 @@ gl_view_box_new (glLabelBox *object, return GL_VIEW_OBJECT (view_box); } + /*****************************************************************************/ /* Create a properties dialog for a box object. */ /*****************************************************************************/ @@ -198,6 +199,7 @@ construct_properties_editor (glViewObject *view_object) return editor; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. editor "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -264,6 +266,7 @@ update_object_from_editor_cb (glObjectEditor *editor, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -314,6 +317,7 @@ update_editor_from_object_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "moved" callback. */ /*---------------------------------------------------------------------------*/ @@ -333,6 +337,7 @@ update_editor_from_move_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Is object at (x,y)? */ /*****************************************************************************/ @@ -398,6 +403,7 @@ gl_view_box_get_create_cursor (void) return cursor; } + /*****************************************************************************/ /* Object creation handler: button press event. */ /*****************************************************************************/ @@ -435,6 +441,7 @@ gl_view_box_create_button_press_event (glView *view, view->create_y0 = y; } + /*****************************************************************************/ /* Object creation handler: motion event. */ /*****************************************************************************/ @@ -452,6 +459,7 @@ gl_view_box_create_motion_event (glView *view, gl_label_object_set_size (GL_LABEL_OBJECT(view->create_object), w, h); } + /*****************************************************************************/ /* Object creation handler: button relesase event. */ /*****************************************************************************/ @@ -484,3 +492,13 @@ gl_view_box_create_button_release_event (glView *view, gl_color_node_free (&line_color_node); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-box.h b/glabels2/src/view-box.h index f2ebb058..930ae1ec 100644 --- a/glabels2/src/view-box.h +++ b/glabels2/src/view-box.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_box.h: GLabels label box object view + * view-box.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __VIEW_BOX_H__ @@ -79,3 +75,14 @@ void gl_view_box_create_button_release_event (glView *view, G_END_DECLS #endif /* __VIEW_BOX_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-ellipse.c b/glabels2/src/view-ellipse.c index 85474704..a5069b23 100644 --- a/glabels2/src/view-ellipse.c +++ b/glabels2/src/view-ellipse.c @@ -1,32 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_ellipse.c: GLabels label ellipse object view + * view-ellipse.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "view-ellipse.h" #include -#include +#include #include #include "cairo-ellipse-path.h" @@ -39,10 +36,12 @@ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -50,6 +49,7 @@ struct _glViewEllipsePrivate { }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -80,7 +80,6 @@ static gboolean object_at (glViewObject *view_obje gdouble y); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ @@ -105,6 +104,7 @@ gl_view_ellipse_class_init (glViewEllipseClass *class) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_ellipse_init (glViewEllipse *view_ellipse) { @@ -115,6 +115,7 @@ gl_view_ellipse_init (glViewEllipse *view_ellipse) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_ellipse_finalize (GObject *object) { @@ -131,6 +132,7 @@ gl_view_ellipse_finalize (GObject *object) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* NEW ellipse object view. */ /*****************************************************************************/ @@ -157,6 +159,7 @@ gl_view_ellipse_new (glLabelEllipse *object, return GL_VIEW_OBJECT (view_ellipse); } + /*****************************************************************************/ /* Create a properties dialog for a ellipse object. */ /*****************************************************************************/ @@ -198,6 +201,7 @@ construct_properties_editor (glViewObject *view_object) return editor; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. editor "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -264,6 +268,7 @@ update_object_from_editor_cb (glObjectEditor *editor, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -314,6 +319,7 @@ update_editor_from_object_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "moved" callback. */ /*---------------------------------------------------------------------------*/ @@ -333,6 +339,7 @@ update_editor_from_move_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Is object at (x,y)? */ /*****************************************************************************/ @@ -398,6 +405,7 @@ gl_view_ellipse_get_create_cursor (void) return cursor; } + /*****************************************************************************/ /* Object creation handler: button press event. */ /*****************************************************************************/ @@ -435,6 +443,7 @@ gl_view_ellipse_create_button_press_event (glView *view, view->create_y0 = y; } + /*****************************************************************************/ /* Object creation handler: motion event. */ /*****************************************************************************/ @@ -452,6 +461,7 @@ gl_view_ellipse_create_motion_event (glView *view, gl_label_object_set_size (GL_LABEL_OBJECT(view->create_object), w, h); } + /*****************************************************************************/ /* Object creation handler: button relesase event. */ /*****************************************************************************/ @@ -484,3 +494,13 @@ gl_view_ellipse_create_button_release_event (glView *view, gl_color_node_free (&line_color_node); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-ellipse.h b/glabels2/src/view-ellipse.h index b6d6aae2..a73c8990 100644 --- a/glabels2/src/view-ellipse.h +++ b/glabels2/src/view-ellipse.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_ellipse.h: GLabels label ellipse object view + * view-ellipse.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __VIEW_ELLIPSE_H__ @@ -79,3 +75,14 @@ void gl_view_ellipse_create_button_release_event (glView *view, G_END_DECLS #endif /* __VIEW_ELLIPSE_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-image.c b/glabels2/src/view-image.c index 7612284d..5b76460c 100644 --- a/glabels2/src/view-image.c +++ b/glabels2/src/view-image.c @@ -1,32 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_image.c: GLabels label image object view + * view-image.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "view-image.h" #include -#include +#include #include "color.h" #include "object-editor.h" @@ -37,6 +34,7 @@ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ @@ -49,6 +47,7 @@ struct _glViewImagePrivate { }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -79,7 +78,6 @@ static gboolean object_at (glViewObject *view_obje gdouble y); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ @@ -104,6 +102,7 @@ gl_view_image_class_init (glViewImageClass *class) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_image_init (glViewImage *view_image) { @@ -114,6 +113,7 @@ gl_view_image_init (glViewImage *view_image) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_image_finalize (GObject *object) { @@ -130,6 +130,7 @@ gl_view_image_finalize (GObject *object) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* NEW image object view. */ /*****************************************************************************/ @@ -156,6 +157,7 @@ gl_view_image_new (glLabelImage *object, return GL_VIEW_OBJECT (view_image); } + /*****************************************************************************/ /* Create a properties dialog for a image object. */ /*****************************************************************************/ @@ -195,6 +197,7 @@ construct_properties_editor (glViewObject *view_object) return editor; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. editor "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -251,6 +254,7 @@ update_object_from_editor_cb (glObjectEditor *editor, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -283,6 +287,7 @@ update_editor_from_object_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "moved" callback. */ /*---------------------------------------------------------------------------*/ @@ -302,6 +307,7 @@ update_editor_from_move_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Is object at (x,y)? */ /*****************************************************************************/ @@ -359,6 +365,7 @@ gl_view_image_get_create_cursor (void) return cursor; } + /*****************************************************************************/ /* Object creation handler: button press event. */ /*****************************************************************************/ @@ -380,6 +387,7 @@ gl_view_image_create_button_press_event (glView *view, view->create_y0 = y; } + /*****************************************************************************/ /* Object creation handler: motion event. */ /*****************************************************************************/ @@ -397,6 +405,7 @@ gl_view_image_create_motion_event (glView *view, gl_label_object_set_size (GL_LABEL_OBJECT(view->create_object), w, h); } + /*****************************************************************************/ /* Object creation handler: button relesase event. */ /*****************************************************************************/ @@ -418,3 +427,13 @@ gl_view_image_create_button_release_event (glView *view, gl_label_object_set_size (GL_LABEL_OBJECT(view->create_object), w, h); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-image.h b/glabels2/src/view-image.h index 7bb3ce10..49b8773c 100644 --- a/glabels2/src/view-image.h +++ b/glabels2/src/view-image.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_image.h: GLabels label image object view + * view-image.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __VIEW_IMAGE_H__ @@ -79,3 +75,14 @@ void gl_view_image_create_button_release_event (glView *view, G_END_DECLS #endif /* __VIEW_IMAGE_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-line.c b/glabels2/src/view-line.c index 12f29a41..3cb62f12 100644 --- a/glabels2/src/view-line.c +++ b/glabels2/src/view-line.c @@ -1,32 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_line.c: GLabels label line object view + * view-line.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "view-line.h" #include -#include +#include #include "color.h" #include "object-editor.h" @@ -37,6 +34,7 @@ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ @@ -49,6 +47,7 @@ struct _glViewLinePrivate { }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -79,7 +78,6 @@ static gboolean object_at (glViewObject *view_obje gdouble y); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ @@ -104,6 +102,7 @@ gl_view_line_class_init (glViewLineClass *class) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_line_init (glViewLine *view_line) { @@ -114,6 +113,7 @@ gl_view_line_init (glViewLine *view_line) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_line_finalize (GObject *object) { @@ -130,6 +130,7 @@ gl_view_line_finalize (GObject *object) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* NEW line object view. */ /*****************************************************************************/ @@ -156,6 +157,7 @@ gl_view_line_new (glLabelLine *object, return GL_VIEW_OBJECT (view_line); } + /*****************************************************************************/ /* Create a properties dialog for a line object. */ /*****************************************************************************/ @@ -196,6 +198,7 @@ construct_properties_editor (glViewObject *view_object) return editor; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. editor "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -257,6 +260,7 @@ update_object_from_editor_cb (glObjectEditor *editor, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -302,6 +306,7 @@ update_editor_from_object_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "moved" callback. */ /*---------------------------------------------------------------------------*/ @@ -321,6 +326,7 @@ update_editor_from_move_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Is object at (x,y)? */ /*****************************************************************************/ @@ -382,6 +388,7 @@ gl_view_line_get_create_cursor (void) return cursor; } + /*****************************************************************************/ /* Object creation handler: button press event. */ /*****************************************************************************/ @@ -413,6 +420,7 @@ gl_view_line_create_button_press_event (glView *view, view->create_y0 = y; } + /*****************************************************************************/ /* Object creation handler: motion event. */ /*****************************************************************************/ @@ -428,6 +436,7 @@ gl_view_line_create_motion_event (glView *view, gl_label_object_set_size (GL_LABEL_OBJECT(view->create_object), w, h); } + /*****************************************************************************/ /* Object creation handler: button relesase event. */ /*****************************************************************************/ @@ -453,3 +462,13 @@ gl_view_line_create_button_release_event (glView *view, gl_color_node_free (&line_color_node); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-line.h b/glabels2/src/view-line.h index a938a115..9fc54ab2 100644 --- a/glabels2/src/view-line.h +++ b/glabels2/src/view-line.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_line.h: GLabels label line object view + * view-line.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __VIEW_LINE_H__ @@ -79,3 +75,14 @@ void gl_view_line_create_button_release_event (glView *view, G_END_DECLS #endif /* __VIEW_LINE_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-object.c b/glabels2/src/view-object.c index 394735a3..e50de60f 100644 --- a/glabels2/src/view-object.c +++ b/glabels2/src/view-object.c @@ -1,34 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_object.c: GLabels label object base class + * view-object.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ - #include "view-object.h" #include #include "debug.h" + /*========================================================*/ /* Private constants and macros. */ /*========================================================*/ @@ -39,6 +35,7 @@ #define HANDLE_OUTLINE_WIDTH_PIXELS 1.0 #define HANDLE_PIXELS 7 + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -53,6 +50,7 @@ struct _glViewObjectPrivate { GtkWidget *property_editor; }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -74,15 +72,12 @@ static void object_bottom_cb (glViewObject *view_object, glLabelObject *object); - - - - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glViewObject, gl_view_object, G_TYPE_OBJECT); + static void gl_view_object_class_init (glViewObjectClass *class) { @@ -97,6 +92,7 @@ gl_view_object_class_init (glViewObjectClass *class) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_object_init (glViewObject *view_object) { @@ -107,6 +103,7 @@ gl_view_object_init (glViewObject *view_object) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_object_finalize (GObject *object) { @@ -134,6 +131,7 @@ gl_view_object_finalize (GObject *object) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* NEW object view. */ /*****************************************************************************/ @@ -151,6 +149,7 @@ gl_view_object_new (void) return G_OBJECT (view_object); } + /*****************************************************************************/ /* Set parent view to which this object view belongs. */ /*****************************************************************************/ @@ -175,6 +174,7 @@ gl_view_object_set_view (glViewObject *view_object, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Set Label object to follow. */ /*****************************************************************************/ @@ -201,6 +201,7 @@ gl_view_object_set_object (glViewObject *view_object, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Handle object "removed" signal. */ /*---------------------------------------------------------------------------*/ @@ -221,6 +222,7 @@ object_removed_cb (glViewObject *view_object, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Handle object "top" signal. */ /*---------------------------------------------------------------------------*/ @@ -243,6 +245,7 @@ object_top_cb (glViewObject *view_object, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Handle object "removed" signal. */ /*---------------------------------------------------------------------------*/ @@ -265,6 +268,7 @@ object_bottom_cb (glViewObject *view_object, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Return parent view associated with this view. */ /*****************************************************************************/ @@ -280,6 +284,7 @@ gl_view_object_get_view (glViewObject *view_object) return view_object->priv->view; } + /*****************************************************************************/ /* Return label object that we are following. */ /*****************************************************************************/ @@ -295,6 +300,7 @@ gl_view_object_get_object (glViewObject *view_object) return view_object->priv->object; } + /*****************************************************************************/ /* Get property editor. */ /*****************************************************************************/ @@ -340,6 +346,7 @@ gl_view_object_select (glViewObject *view_object) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Is object at (x,y)? */ /*****************************************************************************/ @@ -401,6 +408,7 @@ create_handle_path (cairo_t *cr, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Draw object handles */ /*****************************************************************************/ @@ -493,6 +501,7 @@ gl_view_object_draw_handles (glViewObject *view_object, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Is there an object handle at (x,y). */ /*****************************************************************************/ @@ -584,6 +593,7 @@ gl_view_object_handle_at (glViewObject *view_object, return handle; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Resize object. */ /*---------------------------------------------------------------------------*/ @@ -763,3 +773,14 @@ gl_view_object_resize_event (glViewObject *view_object, cairo_device_to_user (cr, &x0, &y0); gl_label_object_set_position (object, x0, y0); } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-object.h b/glabels2/src/view-object.h index 2ae9f84f..cb2a894b 100644 --- a/glabels2/src/view-object.h +++ b/glabels2/src/view-object.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_object.h: GLabels canvas item wrapper widget + * view-object.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __VIEW_OBJECT_H__ @@ -135,3 +131,14 @@ void gl_view_object_resize_event (glViewObject *v G_END_DECLS #endif /* __VIEW_OBJECT_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-text.c b/glabels2/src/view-text.c index ca930129..e45c7dc1 100644 --- a/glabels2/src/view-text.c +++ b/glabels2/src/view-text.c @@ -1,32 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_text.c: GLabels label text object view + * view-text.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #include #include "view-text.h" #include -#include +#include #include "color.h" #include "object-editor.h" @@ -37,10 +34,12 @@ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ + /*========================================================*/ /* Private types. */ /*========================================================*/ @@ -48,6 +47,7 @@ struct _glViewTextPrivate { }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -81,8 +81,6 @@ static gboolean object_at (glViewObject *view_obje gdouble y); - - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ @@ -107,6 +105,7 @@ gl_view_text_class_init (glViewTextClass *class) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_text_init (glViewText *view_text) { @@ -117,6 +116,7 @@ gl_view_text_init (glViewText *view_text) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_text_finalize (GObject *object) { @@ -133,6 +133,7 @@ gl_view_text_finalize (GObject *object) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* NEW text object view. */ /*****************************************************************************/ @@ -159,6 +160,7 @@ gl_view_text_new (glLabelText *object, return GL_VIEW_OBJECT (view_text); } + /*****************************************************************************/ /* Create a properties dialog for a text object. */ /*****************************************************************************/ @@ -206,6 +208,7 @@ construct_properties_editor (glViewObject *view_object) return editor; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. editor "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -282,6 +285,7 @@ update_object_from_editor_cb (glObjectEditor *editor, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. editor "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -314,6 +318,7 @@ update_object_from_editor_size_cb (glObjectEditor *editor, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -379,6 +384,7 @@ update_editor_from_object_cb (glLabelObject *object, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label object "moved" callback. */ /*---------------------------------------------------------------------------*/ @@ -456,6 +462,7 @@ gl_view_text_get_create_cursor (void) return cursor; } + /*****************************************************************************/ /* Object creation handler: button press event. */ /*****************************************************************************/ @@ -500,6 +507,7 @@ gl_view_text_create_button_press_event (glView *view, view->create_y0 = y; } + /*****************************************************************************/ /* Object creation handler: motion event. */ /*****************************************************************************/ @@ -511,6 +519,7 @@ gl_view_text_create_motion_event (glView *view, gl_label_object_set_position (GL_LABEL_OBJECT(view->create_object), x, y); } + /*****************************************************************************/ /* Object creation handler: button relesase event. */ /*****************************************************************************/ @@ -528,3 +537,13 @@ gl_view_text_create_button_release_event (glView *view, gl_color_node_free (&color_node); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view-text.h b/glabels2/src/view-text.h index bb28c90b..150ffb82 100644 --- a/glabels2/src/view-text.h +++ b/glabels2/src/view-text.h @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view_text.h: GLabels label text object view + * view-text.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __VIEW_TEXT_H__ @@ -79,3 +75,14 @@ void gl_view_text_create_button_release_event (glView *view, G_END_DECLS #endif /* __VIEW_TEXT_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view.c b/glabels2/src/view.c index f7ad1850..06e9d310 100644 --- a/glabels2/src/view.c +++ b/glabels2/src/view.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view.c: GLabels View module + * view.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -27,10 +23,7 @@ #include "view.h" #include -#include -#include -#include -#include +#include #include #include #include @@ -52,6 +45,7 @@ #include "debug.h" + /*==========================================================================*/ /* Private macros and constants. */ /*==========================================================================*/ @@ -74,6 +68,7 @@ #define POINTS_PER_MM 2.83464566929 + /*==========================================================================*/ /* Private types. */ /*==========================================================================*/ @@ -217,12 +212,13 @@ static gboolean button_release_event_cb (glView *view, static gboolean key_press_event_cb (glView *view, GdkEventKey *event); - + /****************************************************************************/ /* Boilerplate Object stuff. */ /****************************************************************************/ G_DEFINE_TYPE (glView, gl_view, GTK_TYPE_VBOX); + static void gl_view_class_init (glViewClass *class) { @@ -297,6 +293,7 @@ gl_view_class_init (glViewClass *class) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_init (glView *view) { @@ -404,6 +401,7 @@ gl_view_init (glView *view) gl_debug (DEBUG_VIEW, "END"); } + static void gl_view_finalize (GObject *object) { @@ -423,6 +421,7 @@ gl_view_finalize (GObject *object) gl_debug (DEBUG_VIEW, "END"); } + /****************************************************************************/ /* NEW view object. */ /****************************************************************************/ @@ -444,6 +443,7 @@ gl_view_new (glLabel *label) return GTK_WIDGET (view); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Construct composite widget. */ /*---------------------------------------------------------------------------*/ @@ -492,6 +492,7 @@ gl_view_construct (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIAVTE. Calculate 1:1 scale for screen. */ /*---------------------------------------------------------------------------*/ @@ -543,6 +544,7 @@ get_home_scale (glView *view) return scale; } + /*---------------------------------------------------------------------------*/ /* Schedule canvas update. */ /*---------------------------------------------------------------------------*/ @@ -571,6 +573,7 @@ gl_view_update (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* Schedule canvas region update. */ /*---------------------------------------------------------------------------*/ @@ -607,6 +610,7 @@ gl_view_update_region (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Expose handler. */ /*---------------------------------------------------------------------------*/ @@ -637,6 +641,7 @@ expose_cb (glView *view, return FALSE; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Realize handler. */ /*---------------------------------------------------------------------------*/ @@ -650,6 +655,7 @@ realize_cb (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Size allocation changed callback. */ /*---------------------------------------------------------------------------*/ @@ -677,7 +683,6 @@ size_allocate_cb (glView *view, } - /*---------------------------------------------------------------------------*/ /* PRIVATE. Screen changed callback. */ /*---------------------------------------------------------------------------*/ @@ -699,6 +704,7 @@ screen_changed_cb (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Handle label changed event. */ /*---------------------------------------------------------------------------*/ @@ -767,6 +773,7 @@ label_object_added_cb (glView *view, gl_view_select_object (view, view_object); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Create, draw and order layers. */ /*---------------------------------------------------------------------------*/ @@ -816,6 +823,7 @@ draw_layers (glView *view, } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw background */ /*---------------------------------------------------------------------------*/ @@ -833,6 +841,7 @@ draw_bg_layer (glView *view, cairo_fill (cr); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw grid lines. */ /*---------------------------------------------------------------------------*/ @@ -894,6 +903,7 @@ draw_grid_layer (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw markup layer. */ /*---------------------------------------------------------------------------*/ @@ -942,6 +952,7 @@ draw_markup_layer (glView *view, } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw objects layer. */ /*---------------------------------------------------------------------------*/ @@ -952,6 +963,7 @@ draw_objects_layer (glView *view, gl_label_draw (view->label, cr, TRUE, NULL); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw foreground */ /*---------------------------------------------------------------------------*/ @@ -969,6 +981,7 @@ draw_fg_layer (glView *view, cairo_stroke (cr); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Create highlight layer. */ /*---------------------------------------------------------------------------*/ @@ -995,6 +1008,7 @@ draw_highlight_layer (glView *view, cairo_restore (cr); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Draw select region layer. */ /*---------------------------------------------------------------------------*/ @@ -1031,6 +1045,7 @@ draw_select_region_layer (glView *view, } } + /*****************************************************************************/ /* Show grid. */ /*****************************************************************************/ @@ -1043,6 +1058,7 @@ gl_view_show_grid (glView *view) gl_view_update (view); } + /*****************************************************************************/ /* Hide grid. */ /*****************************************************************************/ @@ -1055,6 +1071,7 @@ gl_view_hide_grid (glView *view) gl_view_update (view); } + /*****************************************************************************/ /* Set grid spacing. */ /*****************************************************************************/ @@ -1068,6 +1085,7 @@ gl_view_set_grid_spacing (glView *view, gl_view_update (view); } + /*****************************************************************************/ /* Show markup. */ /*****************************************************************************/ @@ -1080,6 +1098,7 @@ gl_view_show_markup (glView *view) gl_view_update (view); } + /*****************************************************************************/ /* Hide markup. */ /*****************************************************************************/ @@ -1092,6 +1111,7 @@ gl_view_hide_markup (glView *view) gl_view_update (view); } + /*****************************************************************************/ /* Set arrow mode. */ /*****************************************************************************/ @@ -1114,6 +1134,7 @@ gl_view_arrow_mode (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Set create text object mode. */ /*****************************************************************************/ @@ -1162,6 +1183,7 @@ gl_view_object_create_mode (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Select given object (adding to current selection). */ /*****************************************************************************/ @@ -1180,6 +1202,7 @@ gl_view_select_object (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Unselect given object (removing from current selection). */ /*****************************************************************************/ @@ -1198,6 +1221,7 @@ gl_view_unselect_object (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Select all items. */ /*****************************************************************************/ @@ -1226,6 +1250,7 @@ gl_view_select_all (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Remove all selections */ /*****************************************************************************/ @@ -1249,6 +1274,7 @@ gl_view_unselect_all (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Select all objects within given rectangular region (adding to selection). */ /*****************************************************************************/ @@ -1297,6 +1323,7 @@ gl_view_select_region (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Select an object. */ /*---------------------------------------------------------------------------*/ @@ -1320,6 +1347,7 @@ select_object_real (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Un-select object. */ /*---------------------------------------------------------------------------*/ @@ -1340,6 +1368,7 @@ unselect_object_real (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Return object at (x,y). */ /*---------------------------------------------------------------------------*/ @@ -1369,6 +1398,7 @@ view_view_object_at (glView *view, return NULL; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Return object handle at (x,y). */ /*---------------------------------------------------------------------------*/ @@ -1399,6 +1429,7 @@ view_handle_at (glView *view, return NULL; } + /*****************************************************************************/ /* Is the object in our current selection? */ /*****************************************************************************/ @@ -1417,6 +1448,7 @@ gl_view_is_object_selected (glView *view, return TRUE; } + /*****************************************************************************/ /* Is our current selection empty? */ /*****************************************************************************/ @@ -1434,6 +1466,7 @@ gl_view_is_selection_empty (glView *view) } } + /*****************************************************************************/ /* Is our current selection atomic? I.e. only one item selected. */ /*****************************************************************************/ @@ -1451,6 +1484,7 @@ gl_view_is_selection_atomic (glView *view) return FALSE; } + /*****************************************************************************/ /* Delete selected objects. (Bypass clipboard) */ /*****************************************************************************/ @@ -1483,6 +1517,7 @@ gl_view_delete_selection (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Get object property editor of first selected object. */ /*****************************************************************************/ @@ -1508,6 +1543,7 @@ gl_view_get_editor (glView *view) return editor; } + /*****************************************************************************/ /* Raise selected items to top. */ /*****************************************************************************/ @@ -1531,6 +1567,7 @@ gl_view_raise_selection (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Lower selected items to bottom. */ /*****************************************************************************/ @@ -1554,6 +1591,7 @@ gl_view_lower_selection (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Rotate selected objects by given angle. */ /*****************************************************************************/ @@ -1578,6 +1616,7 @@ gl_view_rotate_selection (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Rotate selected objects 90 degrees left. */ /*****************************************************************************/ @@ -1601,6 +1640,7 @@ gl_view_rotate_selection_left (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Rotate selected objects 90 degrees right. */ /*****************************************************************************/ @@ -1624,6 +1664,7 @@ gl_view_rotate_selection_right (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Flip selected objects horizontally. */ /*****************************************************************************/ @@ -1647,6 +1688,7 @@ gl_view_flip_selection_horiz (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Flip selected objects vertically. */ /*****************************************************************************/ @@ -1670,6 +1712,7 @@ gl_view_flip_selection_vert (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Align selected objects to left most edge. */ /*****************************************************************************/ @@ -1763,6 +1806,7 @@ gl_view_align_selection_right (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Align selected objects to horizontal center of objects. */ /*****************************************************************************/ @@ -1831,6 +1875,7 @@ gl_view_align_selection_hcenter (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Align selected objects to top most edge. */ /*****************************************************************************/ @@ -1877,6 +1922,7 @@ gl_view_align_selection_top (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Align selected objects to bottom most edge. */ /*****************************************************************************/ @@ -1923,6 +1969,7 @@ gl_view_align_selection_bottom (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Align selected objects to viertical center of objects. */ /*****************************************************************************/ @@ -1992,6 +2039,7 @@ gl_view_align_selection_vcenter (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Center selected objects to in center of label. */ /*****************************************************************************/ @@ -2096,6 +2144,7 @@ gl_view_move_selection (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Can text properties be set for selection? */ /*****************************************************************************/ @@ -2123,6 +2172,7 @@ gl_view_can_selection_text (glView *view) return FALSE; } + /*****************************************************************************/ /* Set font family for all text contained in selected objects. */ /*****************************************************************************/ @@ -2147,6 +2197,7 @@ gl_view_set_selection_font_family (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Set font size for all text contained in selected objects. */ /*****************************************************************************/ @@ -2171,6 +2222,7 @@ gl_view_set_selection_font_size (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Set font weight for all text contained in selected objects. */ /*****************************************************************************/ @@ -2195,6 +2247,7 @@ gl_view_set_selection_font_weight (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Set font italic flag for all text contained in selected objects. */ /*****************************************************************************/ @@ -2219,6 +2272,7 @@ gl_view_set_selection_font_italic_flag (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Set text alignment for all text contained in selected objects. */ /*****************************************************************************/ @@ -2243,6 +2297,7 @@ gl_view_set_selection_text_alignment (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Set text line spacing for all text contained in selected objects. */ /*****************************************************************************/ @@ -2266,6 +2321,8 @@ gl_view_set_selection_text_line_spacing (glView *view, gl_debug (DEBUG_VIEW, "END"); } + + /*****************************************************************************/ /* Set text color for all text contained in selected objects. */ /*****************************************************************************/ @@ -2290,6 +2347,7 @@ gl_view_set_selection_text_color (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Can fill properties be set for selection? */ /*****************************************************************************/ @@ -2315,6 +2373,7 @@ gl_view_can_selection_fill (glView *view) return FALSE; } + /*****************************************************************************/ /* Set fill color for all selected objects. */ /*****************************************************************************/ @@ -2339,6 +2398,7 @@ gl_view_set_selection_fill_color (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Can line color properties be set for selection? */ /*****************************************************************************/ @@ -2364,6 +2424,7 @@ gl_view_can_selection_line_color (glView *view) return FALSE; } + /*****************************************************************************/ /* Set line color for all selected objects. */ /*****************************************************************************/ @@ -2388,6 +2449,7 @@ gl_view_set_selection_line_color (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Can line width properties be set for selection? */ /*****************************************************************************/ @@ -2413,6 +2475,7 @@ gl_view_can_selection_line_width (glView *view) return FALSE; } + /*****************************************************************************/ /* Set line width for all selected objects. */ /*****************************************************************************/ @@ -2437,6 +2500,7 @@ gl_view_set_selection_line_width (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* "Cut" selected items and place in clipboard selections. */ /*****************************************************************************/ @@ -2453,6 +2517,7 @@ gl_view_cut (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* "Copy" selected items to clipboard selections. */ /*****************************************************************************/ @@ -2494,6 +2559,7 @@ gl_view_copy (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* "Paste" from private clipboard selection. */ /*****************************************************************************/ @@ -2511,6 +2577,7 @@ gl_view_paste (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Zoom in one "notch" */ /*****************************************************************************/ @@ -2543,6 +2610,7 @@ gl_view_zoom_in (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Zoom out one "notch" */ /*****************************************************************************/ @@ -2578,6 +2646,7 @@ gl_view_zoom_out (glView *view) gl_debug (DEBUG_VIEW, "END"); } + /*****************************************************************************/ /* Set zoom to best fit. */ /*****************************************************************************/ @@ -2618,6 +2687,7 @@ gl_view_zoom_to_fit (glView *view) set_zoom_real (view, scale/view->home_scale, TRUE); } + /*****************************************************************************/ /* Set current zoom factor to explicit value. */ /*****************************************************************************/ @@ -2632,6 +2702,7 @@ gl_view_set_zoom (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Set canvas scale. */ /*---------------------------------------------------------------------------*/ @@ -2680,6 +2751,7 @@ gl_view_get_zoom (glView *view) return view->zoom; } + /*****************************************************************************/ /* Is this the maximum zoom level. */ /*****************************************************************************/ @@ -2693,6 +2765,7 @@ gl_view_is_zoom_max (glView *view) return view->zoom >= zooms[0]; } + /*****************************************************************************/ /* Is this the minimum zoom level. */ /*****************************************************************************/ @@ -2706,6 +2779,7 @@ gl_view_is_zoom_min (glView *view) return view->zoom <= zooms[N_ZOOMS-1]; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Handle "selection-clear" signal. */ /*---------------------------------------------------------------------------*/ @@ -2725,6 +2799,7 @@ selection_clear_cb (GtkWidget *widget, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Handle "selection-get" signal. */ /*---------------------------------------------------------------------------*/ @@ -2755,6 +2830,7 @@ selection_get_cb (GtkWidget *widget, gl_debug (DEBUG_VIEW, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Handle "selection-received" signal. (Result of Paste) */ /*---------------------------------------------------------------------------*/ @@ -2796,6 +2872,7 @@ selection_received_cb (GtkWidget *widget, gl_debug (DEBUG_VIEW, "END"); } + /****************************************************************************/ /* Set default font family. */ /****************************************************************************/ @@ -2899,6 +2976,7 @@ gl_view_set_default_text_alignment (glView *view, gl_debug (DEBUG_VIEW, "END"); } + /****************************************************************************/ /* Set default text line spacing. */ /****************************************************************************/ @@ -2967,7 +3045,6 @@ gl_view_set_default_fill_color (glView *view, } - /****************************************************************************/ /* Get default font family. */ /****************************************************************************/ @@ -3063,6 +3140,7 @@ gl_view_get_default_text_alignment (glView *view) return view->default_text_alignment; } + /****************************************************************************/ /* Get default text line spacing. */ /****************************************************************************/ @@ -3079,7 +3157,6 @@ gl_view_get_default_text_line_spacing (glView *view) } - /****************************************************************************/ /* Get default line width. */ /****************************************************************************/ @@ -3127,6 +3204,7 @@ gl_view_get_default_fill_color (glView *view) return view->default_fill_color; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Focus in event handler. */ /*---------------------------------------------------------------------------*/ @@ -3139,6 +3217,7 @@ focus_in_event_cb (glView *view, return FALSE; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Focus out event handler. */ /*---------------------------------------------------------------------------*/ @@ -3151,6 +3230,7 @@ focus_out_event_cb (glView *view, return FALSE; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Enter notify event handler. */ /*---------------------------------------------------------------------------*/ @@ -3163,6 +3243,7 @@ enter_notify_event_cb (glView *view, return FALSE; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Leave notify event handler. */ /*---------------------------------------------------------------------------*/ @@ -3176,6 +3257,7 @@ leave_notify_event_cb (glView *view, return FALSE; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Motion notify event handler. */ /*---------------------------------------------------------------------------*/ @@ -3328,6 +3410,7 @@ motion_notify_event_cb (glView *view, return return_value; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Button press event handler. */ /*---------------------------------------------------------------------------*/ @@ -3477,6 +3560,7 @@ button_press_event_cb (glView *view, return return_value; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Button release event handler. */ /*---------------------------------------------------------------------------*/ @@ -3592,6 +3676,7 @@ button_release_event_cb (glView *view, return return_value; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Key press event handler. */ /*---------------------------------------------------------------------------*/ @@ -3640,3 +3725,13 @@ key_press_event_cb (glView *view, return TRUE; /* We handled this or we were dragging. */ } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/view.h b/glabels2/src/view.h index 4bf4141e..54d4b4f1 100644 --- a/glabels2/src/view.h +++ b/glabels2/src/view.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * view.h: GLabels View module header file + * view.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2007 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __VIEW_H__ #define __VIEW_H__ -#include +#include #include "label-object.h" @@ -359,3 +355,14 @@ guint gl_view_get_default_fill_color (glView *view); G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/warning-handler.c b/glabels2/src/warning-handler.c index 84e32441..8f5f1b7a 100644 --- a/glabels2/src/warning-handler.c +++ b/glabels2/src/warning-handler.c @@ -1,35 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * warning-handler.c: non-critical error handler + * warning-handler.c + * Copyright (C) 2005-2009 Jim Evins . * - * Copyright (C) 2005 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License + * along with gLabels. If not, see . */ #include #include "warning-handler.h" -#include +#include #include -#include -#include +#include #include static void warning_handler (const gchar *log_domain, @@ -37,7 +32,7 @@ static void warning_handler (const gchar *log_domain, const gchar *message, gpointer user_data); - + /***************************************************************************/ /* Initialize error handler. */ /***************************************************************************/ @@ -55,6 +50,7 @@ gl_warning_handler_init (void) "glabels"); } + /*-------------------------------------------------------------------------*/ /* PRIVATE. Actual error handler. */ /*-------------------------------------------------------------------------*/ @@ -79,3 +75,13 @@ warning_handler (const gchar *log_domain, gtk_widget_destroy (GTK_WIDGET (dialog)); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/warning-handler.h b/glabels2/src/warning-handler.h index 911cc16a..e7f51d0f 100644 --- a/glabels2/src/warning-handler.h +++ b/glabels2/src/warning-handler.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * warning-handler.h: non-critical error handler header file + * warning-handler.h + * Copyright (C) 2005-2009 Jim Evins . * - * Copyright (C) 2005 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License + * along with gLabels. If not, see . */ #ifndef __WARNING_HANDLER_H__ #define __WARNING_HANDLER_H__ -#include +#include G_BEGIN_DECLS @@ -34,3 +30,14 @@ void gl_warning_handler_init (void); G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/wdgt-chain-button.c b/glabels2/src/wdgt-chain-button.c index 7491311f..e6cfdfe3 100644 --- a/glabels2/src/wdgt-chain-button.c +++ b/glabels2/src/wdgt-chain-button.c @@ -1,37 +1,35 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - -/* wdgt-chain-button.c - * Modified version of gimpchainbutton.c for gLabels: +/* + * wdgt-chain-button.c + * Modified version of gimpchainbutton.h for gLabels: + * + * LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * - * LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * gimpchainbutton.h + * Copyright (C) 1999-2000 Sven Neumann * - * gimpchainbutton.c - * Copyright (C) 1999-2000 Sven Neumann + * Modified or gLabels by Jim Evins * - * Modified or gLabels by Jim Evins * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * This file is part of gLabels. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * gLabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * gLabels is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gLabels. If not, see . */ #include "wdgt-chain-button.h" -#include -#include -#include +#include #include "stock.h" @@ -322,3 +320,14 @@ gl_wdgt_chain_button_draw_lines (GtkWidget *widget, return TRUE; } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/wdgt-chain-button.h b/glabels2/src/wdgt-chain-button.h index 382af2a4..3af93a00 100644 --- a/glabels2/src/wdgt-chain-button.h +++ b/glabels2/src/wdgt-chain-button.h @@ -1,30 +1,30 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - -/* wdgt-chain-button.h - * Modified version of gimpchainbutton.h for gLabels: +/* + * wdgt-chain-button.h + * Modified version of gimpchainbutton.h for gLabels: + * + * LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * - * LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * gimpchainbutton.h + * Copyright (C) 1999-2000 Sven Neumann * - * gimpchainbutton.h - * Copyright (C) 1999-2000 Sven Neumann + * Modified or gLabels by Jim Evins * - * Modified or gLabels by Jim Evins * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * This file is part of gLabels. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * gLabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * gLabels is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gLabels. If not, see . */ /* @@ -38,7 +38,7 @@ #ifndef __WDGT_CHAIN_BUTTON_H__ #define __WDGT_CHAIN_BUTTON_H__ -#include +#include G_BEGIN_DECLS @@ -96,3 +96,14 @@ gboolean gl_wdgt_chain_button_get_active (glWdgtChainButton *button); G_END_DECLS #endif /* __WDGT_CHAIN_BUTTON_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/wdgt-media-select.c b/glabels2/src/wdgt-media-select.c index 4213a9b9..89102605 100644 --- a/glabels2/src/wdgt-media-select.c +++ b/glabels2/src/wdgt-media-select.c @@ -23,26 +23,19 @@ #include "wdgt-media-select.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include +#include #include "mini-preview-pixbuf-cache.h" #include "prefs.h" #include "util.h" #include "color.h" #include "marshal.h" -#include #include "debug.h" + /*===========================================*/ /* Private types */ /*===========================================*/ diff --git a/glabels2/src/wdgt-media-select.h b/glabels2/src/wdgt-media-select.h index 9a548133..f2c30073 100644 --- a/glabels2/src/wdgt-media-select.h +++ b/glabels2/src/wdgt-media-select.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * wdgt_media_select.h: media selection widget module header file + * wdgt-media-select.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __WDGT_MEDIA_SELECT_H__ #define __WDGT_MEDIA_SELECT_H__ -#include +#include G_BEGIN_DECLS @@ -76,3 +72,14 @@ void gl_wdgt_media_select_set_filter_parameters (glWdgtMediaSelect *media_ G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/wdgt-merge-menu.c b/glabels2/src/wdgt-merge-menu.c index bb864c39..9f0d132e 100644 --- a/glabels2/src/wdgt-merge-menu.c +++ b/glabels2/src/wdgt-merge-menu.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * wdgt_merge_menu.c: merge menu widget module + * wdgt-merge-menu.c + * Copyright (C) 2008-2009 Jim Evins . * - * Copyright (C) 2008 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -27,12 +23,13 @@ #include "wdgt-merge-menu.h" #include -#include +#include #include "marshal.h" #include "debug.h" + /*===========================================*/ /* Private types */ /*===========================================*/ @@ -50,12 +47,14 @@ enum { typedef void (*glWdgtMergeMenuSignal) (GObject * object, gpointer data); + /*===========================================*/ /* Private globals */ /*===========================================*/ static gint signals[LAST_SIGNAL] = { 0 }; + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -63,7 +62,6 @@ static gint signals[LAST_SIGNAL] = { 0 }; static void gl_wdgt_merge_menu_finalize (GObject *object); - /****************************************************************************/ /* Boilerplate Object stuff. */ /****************************************************************************/ @@ -93,6 +91,7 @@ gl_wdgt_merge_menu_class_init (glWdgtMergeMenuClass *class) gl_debug (DEBUG_MERGE_MENU, "END"); } + static void gl_wdgt_merge_menu_init (glWdgtMergeMenu *merge_menu) { @@ -103,6 +102,7 @@ gl_wdgt_merge_menu_init (glWdgtMergeMenu *merge_menu) gl_debug (DEBUG_MERGE_MENU, "END"); } + static void gl_wdgt_merge_menu_finalize (GObject *object) { @@ -130,6 +130,7 @@ gl_wdgt_merge_menu_finalize (GObject *object) gl_debug (DEBUG_MERGE_MENU, "END"); } + GtkWidget * gl_wdgt_merge_menu_new (void) { @@ -164,6 +165,7 @@ activate_cb (GtkMenuItem *menu_item, gl_debug (DEBUG_MERGE_MENU, "END"); } + /****************************************************************************/ /* set field names. */ /****************************************************************************/ @@ -207,3 +209,13 @@ gl_wdgt_merge_menu_set_fields (glWdgtMergeMenu *merge_menu, gl_debug (DEBUG_MERGE_MENU, "END"); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/wdgt-merge-menu.h b/glabels2/src/wdgt-merge-menu.h index 60d4ac50..2c406dcd 100644 --- a/glabels2/src/wdgt-merge-menu.h +++ b/glabels2/src/wdgt-merge-menu.h @@ -1,31 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * wdgt_merge_menu.h: Merge menu widget module header file + * wdgt-merge-menu.h + * Copyright (C) 2008-2009 Jim Evins . * - * Copyright (C) 2008 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __WDGT_MERGE_MENU_H__ #define __WDGT_MERGE_MENU_H__ -#include +#include G_BEGIN_DECLS @@ -73,3 +69,14 @@ void gl_wdgt_merge_menu_set_fields (glWdgtMergeMenu *merge_menu, G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/window.c b/glabels2/src/window.c index 33e3b7e7..a44c2fe4 100644 --- a/glabels2/src/window.c +++ b/glabels2/src/window.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * window.c: a gLabels app window + * window.c + * Copyright (C) 2002-2009 Jim Evins . * - * Copyright (C) 2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -27,11 +23,7 @@ #include "window.h" #include -#include -#include -#include -#include -#include +#include #include "ui.h" #include "ui-commands.h" @@ -42,6 +34,7 @@ #include "debug.h" + /*===========================================================================*/ /* Private macros and constants. */ /*===========================================================================*/ @@ -52,6 +45,7 @@ #define CURSOR_INFO_WIDTH 150 #define ZOOM_INFO_WIDTH 50 + /*===========================================================================*/ /* Private globals */ /*===========================================================================*/ @@ -99,7 +93,7 @@ static void name_changed_cb (glLabel *label, static void modified_changed_cb (glLabel *label, glWindow *window); - + /****************************************************************************/ /* Boilerplate Object stuff. */ /****************************************************************************/ @@ -123,6 +117,7 @@ gl_window_class_init (glWindowClass *class) gl_debug (DEBUG_WINDOW, "END"); } + static void gl_window_init (glWindow *window) { @@ -206,6 +201,7 @@ gl_window_init (glWindow *window) gl_debug (DEBUG_WINDOW, "END"); } + static void gl_window_finalize (GObject *object) { @@ -219,6 +215,7 @@ gl_window_finalize (GObject *object) gl_debug (DEBUG_WINDOW, "END"); } + static void gl_window_destroy (GtkObject *gtk_object) { @@ -267,6 +264,7 @@ gl_window_new (void) return GTK_WIDGET(window); } + /****************************************************************************/ /** Create a glabels window from a label. */ /****************************************************************************/ @@ -286,6 +284,7 @@ gl_window_new_from_label (glLabel *label) return GTK_WIDGET(window); } + /****************************************************************************/ /** Create a glabels window from a glabels file. */ /****************************************************************************/ @@ -312,6 +311,7 @@ gl_window_new_from_file (const gchar *filename) return GTK_WIDGET(window); } + /****************************************************************************/ /** Is window empty? */ /****************************************************************************/ @@ -324,6 +324,7 @@ gl_window_is_empty (glWindow *window) return ( window->view == NULL ); } + /****************************************************************************/ /** Create view from label and place in window. */ /****************************************************************************/ @@ -400,6 +401,7 @@ gl_window_set_label (glWindow *window, gl_debug (DEBUG_WINDOW, "END"); } + /****************************************************************************/ /** Return list of glabels windows. */ /****************************************************************************/ @@ -410,6 +412,7 @@ gl_window_get_window_list (void) return window_list; } + /*---------------------------------------------------------------------------*/ /** PRIVATE. Set window title based on name and state of label. */ /*---------------------------------------------------------------------------*/ @@ -442,6 +445,7 @@ set_window_title (glWindow *window, gl_debug (DEBUG_WINDOW, "END"); } + /*-------------------------------------------------------------------------*/ /** PRIVATE. Window "delete-event" callback. */ /*-------------------------------------------------------------------------*/ @@ -461,6 +465,7 @@ window_delete_event_cb (glWindow *window, return TRUE; } + /*---------------------------------------------------------------------------*/ /** PRIVATE. View "selection state changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -478,6 +483,7 @@ selection_changed_cb (glView *view, gl_debug (DEBUG_WINDOW, "END"); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. View "context menu activate" callback. */ /*---------------------------------------------------------------------------*/ @@ -507,6 +513,7 @@ context_menu_activate_cb (glView *view, gl_debug (DEBUG_WINDOW, "END"); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. View "zoom state changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -531,6 +538,7 @@ zoom_changed_cb (glView *view, gl_debug (DEBUG_WINDOW, "END"); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. View "pointer moved" callback. */ /*---------------------------------------------------------------------------*/ @@ -561,6 +569,7 @@ pointer_moved_cb (glView *view, gl_debug (DEBUG_WINDOW, "END"); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. View "pointer exit" callback. */ /*---------------------------------------------------------------------------*/ @@ -578,6 +587,7 @@ pointer_exit_cb (glView *view, gl_debug (DEBUG_WINDOW, "END"); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. Label "name changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -595,6 +605,7 @@ name_changed_cb (glLabel *label, gl_debug (DEBUG_WINDOW, "END"); } + /*---------------------------------------------------------------------------*/ /** PRIVATE. Label "modified state changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -614,3 +625,13 @@ modified_changed_cb (glLabel *label, gl_debug (DEBUG_WINDOW, "END"); } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/window.h b/glabels2/src/window.h index 19be8257..999bd4ca 100644 --- a/glabels2/src/window.h +++ b/glabels2/src/window.h @@ -1,33 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * window.h: a gLabels app window + * window.h + * Copyright (C) 2002-2009 Jim Evins . * - * Copyright (C) 2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #ifndef __WINDOW_H__ #define __WINDOW_H__ -#include -#include -#include +#include #include "view.h" #include "label.h" @@ -99,3 +93,14 @@ const GList *gl_window_get_window_list (void); G_END_DECLS #endif /* __WINDOW_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/xml-label-04.c b/glabels2/src/xml-label-04.c index 89a94b6b..03e9f922 100644 --- a/glabels2/src/xml-label-04.c +++ b/glabels2/src/xml-label-04.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * xml-label-04.c: GLabels xml label compat module + * xml-label-04.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -28,18 +24,18 @@ #include +#include #include "label-text.h" #include "label-box.h" #include "label-line.h" #include "label-ellipse.h" #include "label-image.h" #include "label-barcode.h" -#include -#include - #include "util.h" + #include "debug.h" + static gboolean xml04_parse_media_description (xmlNodePtr node, glLabel *label); static void xml04_parse_object (xmlNodePtr node, @@ -59,7 +55,7 @@ static void xml04_parse_barcode_props (xmlNodePtr node, static void xml04_parse_merge_properties (xmlNodePtr node, glLabel *label); - + /****************************************************************************/ /* PRIVATE. Parse xml doc structure and create label. */ /****************************************************************************/ @@ -134,6 +130,7 @@ glLabel *gl_xml_label_04_parse (xmlNodePtr root, return label; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse Media Description node. */ /*--------------------------------------------------------------------------*/ @@ -169,6 +166,7 @@ xml04_parse_media_description (xmlNodePtr node, return ret; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Object Node */ /*--------------------------------------------------------------------------*/ @@ -188,6 +186,7 @@ xml04_parse_object (xmlNodePtr object_node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Label->Text Node Properties */ /*--------------------------------------------------------------------------*/ @@ -305,6 +304,7 @@ xml04_parse_text_props (xmlNodePtr object_node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Label->Box Node Properties */ /*--------------------------------------------------------------------------*/ @@ -339,6 +339,7 @@ xml04_parse_box_props (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Label->Line Node Properties */ /*--------------------------------------------------------------------------*/ @@ -368,6 +369,7 @@ xml04_parse_line_props (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Label->Ellipse Node Properties */ /*--------------------------------------------------------------------------*/ @@ -402,6 +404,7 @@ xml04_parse_ellipse_props (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Label->Image Node Properties */ /*--------------------------------------------------------------------------*/ @@ -427,6 +430,7 @@ xml04_parse_image_props (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Label->Barcode Node Properties */ /*--------------------------------------------------------------------------*/ @@ -476,6 +480,7 @@ xml04_parse_barcode_props (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML merge properties tag. */ /*--------------------------------------------------------------------------*/ @@ -502,3 +507,14 @@ xml04_parse_merge_properties (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/xml-label-04.h b/glabels2/src/xml-label-04.h index be11bafd..81114815 100644 --- a/glabels2/src/xml-label-04.h +++ b/glabels2/src/xml-label-04.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * xml-label-04.h: GLabels xml label compat module header file + * xml-label-04.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __XML_LABEL_04_H__ #define __XML_LABEL_04_H__ @@ -38,3 +35,14 @@ G_END_DECLS #endif /* __XML_LABEL_04_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/xml-label.c b/glabels2/src/xml-label.c index 01c3b454..d1d53423 100644 --- a/glabels2/src/xml-label.c +++ b/glabels2/src/xml-label.c @@ -1,25 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * label.c: GLabels xml label module + * xml-label.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ #include @@ -27,12 +23,13 @@ #include "xml-label.h" #include -#include +#include #include #include #include #include +#include #include "label.h" #include "label-object.h" #include "label-text.h" @@ -42,13 +39,11 @@ #include "label-image.h" #include "label-barcode.h" #include "xml-label-04.h" -#include -#include -#include #include "util.h" #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ @@ -56,14 +51,17 @@ #define COMPAT04_NAME_SPACE "http://snaught.com/glabels/0.4/" #define COMPAT20_NAME_SPACE "http://snaught.com/glabels/2.0/" + /*========================================================*/ /* Private types. */ /*========================================================*/ + /*========================================================*/ /* Private globals. */ /*========================================================*/ + /*========================================================*/ /* Private function prototypes. */ /*========================================================*/ @@ -209,6 +207,7 @@ gl_xml_label_open (const gchar *utf8_filename, return label; } + /****************************************************************************/ /* Read label from xml buffer. */ /****************************************************************************/ @@ -241,6 +240,7 @@ gl_xml_label_open_buffer (const gchar *buffer, return label; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse xml doc structure and create label. */ /*--------------------------------------------------------------------------*/ @@ -300,6 +300,7 @@ xml_doc_to_label (xmlDocPtr doc, return label; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse xml root node and create label. */ /*--------------------------------------------------------------------------*/ @@ -367,6 +368,7 @@ xml_parse_label (xmlNodePtr root, return label; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse Objects node. */ /*--------------------------------------------------------------------------*/ @@ -407,6 +409,7 @@ xml_parse_objects (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Objects->Object-text Node */ /*--------------------------------------------------------------------------*/ @@ -468,6 +471,7 @@ xml_parse_object_text (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Objects->Object-box Node */ /*--------------------------------------------------------------------------*/ @@ -534,6 +538,7 @@ xml_parse_object_box (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Objects->Object-ellipse Node */ /*--------------------------------------------------------------------------*/ @@ -600,6 +605,7 @@ xml_parse_object_ellipse (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Objects->Object-line Node */ /*--------------------------------------------------------------------------*/ @@ -652,6 +658,7 @@ xml_parse_object_line (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Objects->Object-image Node */ /*--------------------------------------------------------------------------*/ @@ -711,6 +718,7 @@ xml_parse_object_image (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML Objects->Object-barcode Node */ /*--------------------------------------------------------------------------*/ @@ -793,6 +801,7 @@ xml_parse_object_barcode (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML merge fields tag. */ /*--------------------------------------------------------------------------*/ @@ -820,6 +829,7 @@ xml_parse_merge_fields (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML data tag. */ /*--------------------------------------------------------------------------*/ @@ -846,6 +856,7 @@ xml_parse_data (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse XML pixbuf data tag. */ /*--------------------------------------------------------------------------*/ @@ -886,6 +897,7 @@ xml_parse_pixdata (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse top-level Span tag. */ /*--------------------------------------------------------------------------*/ @@ -995,6 +1007,7 @@ xml_parse_toplevel_span (xmlNodePtr node, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse affine attributes. */ /*--------------------------------------------------------------------------*/ @@ -1017,6 +1030,7 @@ xml_parse_affine_attrs (xmlNodePtr node, gl_label_object_set_matrix (object, &matrix); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Parse shadow attributes. */ /*--------------------------------------------------------------------------*/ @@ -1056,6 +1070,7 @@ xml_parse_shadow_attrs (xmlNodePtr node, } } + /****************************************************************************/ /* Save label to xml label file. */ /****************************************************************************/ @@ -1096,6 +1111,7 @@ gl_xml_label_save (glLabel *label, gl_debug (DEBUG_XML, "END"); } + /****************************************************************************/ /* Save label to xml buffer. */ /****************************************************************************/ @@ -1121,6 +1137,7 @@ gl_xml_label_save_buffer (glLabel *label, return (gchar *)buffer; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Convert label to xml doc structure. */ /*--------------------------------------------------------------------------*/ @@ -1161,6 +1178,7 @@ xml_label_to_doc (glLabel *label, return doc; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Objects Node */ /*--------------------------------------------------------------------------*/ @@ -1204,6 +1222,7 @@ xml_create_objects (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Objects->Object-text Node */ /*--------------------------------------------------------------------------*/ @@ -1252,6 +1271,7 @@ xml_create_object_text (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Objects->Object-box Node */ /*--------------------------------------------------------------------------*/ @@ -1317,6 +1337,7 @@ xml_create_object_box (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Objects->Object-ellipse Node */ /*--------------------------------------------------------------------------*/ @@ -1383,6 +1404,7 @@ xml_create_object_ellipse (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Objects->Object-line Node */ /*--------------------------------------------------------------------------*/ @@ -1436,6 +1458,7 @@ xml_create_object_line (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Objects->Object-image Node */ /*--------------------------------------------------------------------------*/ @@ -1481,6 +1504,7 @@ xml_create_object_image (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Objects->Object-barcode Node */ /*--------------------------------------------------------------------------*/ @@ -1553,6 +1577,7 @@ xml_create_object_barcode (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Label Merge Fields Node */ /*--------------------------------------------------------------------------*/ @@ -1584,6 +1609,7 @@ xml_create_merge_fields (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Label Data Node */ /*--------------------------------------------------------------------------*/ @@ -1613,6 +1639,7 @@ xml_create_data (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add XML Label Data Pixbuf Node */ /*--------------------------------------------------------------------------*/ @@ -1657,6 +1684,7 @@ xml_create_pixdata (xmlNodePtr root, gl_debug (DEBUG_XML, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Create top-level Span node. */ /*--------------------------------------------------------------------------*/ @@ -1733,6 +1761,7 @@ xml_create_toplevel_span (xmlNodePtr root, } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Create affine attributes. */ /*--------------------------------------------------------------------------*/ @@ -1752,6 +1781,7 @@ xml_create_affine_attrs (xmlNodePtr node, lgl_xml_set_prop_double (node, "a5", matrix.y0); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Create shadow attributes. */ /*--------------------------------------------------------------------------*/ @@ -1792,3 +1822,12 @@ xml_create_shadow_attrs (xmlNodePtr node, } + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/src/xml-label.h b/glabels2/src/xml-label.h index 5c5f0c37..21730c51 100644 --- a/glabels2/src/xml-label.h +++ b/glabels2/src/xml-label.h @@ -1,26 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * xml-label.h: GLabels xml label module header file + * xml-label.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2002 Jim Evins . + * This file is part of gLabels. * - * This program is free software; you can redistribute it and/or modify + * gLabels is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * gLabels is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with gLabels. If not, see . */ + #ifndef __XML_LABEL_H__ #define __XML_LABEL_H__ @@ -53,3 +50,14 @@ G_END_DECLS #endif /* __XML_LABEL_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ -- 2.39.5