From cbfdf9f8ce58c238a8eb5535c617599ad5570d1f Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sun, 23 Aug 2009 15:08:34 +0000 Subject: [PATCH] 2009-08-23 Jim Evins * data/builder/Makefile.am: * data/builder/merge-properties-dialog.builder: * data/builder/merge-properties-dialog.glade: * data/builder/new-label-dialog.builder: * data/builder/new-label-dialog.glade: * data/builder/object-editor.builder: * data/builder/object-editor.glade: * data/builder/prefs-dialog.builder: * data/builder/prefs-dialog.glade: * data/builder/print-custom-widget.builder: * data/builder/print-custom-widget.glade: * data/builder/property-bar.builder: * data/builder/property-bar.glade: * data/builder/template-designer.builder: * data/builder/template-designer.glade: * data/builder/wdgt-media-select.builder: * data/builder/wdgt-media-select.glade: * po/POTFILES.in: * src/merge-properties-dialog.c: (gl_merge_properties_dialog_finalize), (gl_merge_properties_dialog_construct): * src/new-label-dialog.c: (gl_new_label_dialog_finalize), (gl_new_label_dialog_construct): * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page): * src/object-editor-data-page.c: (gl_object_editor_prepare_data_page): * src/object-editor-edit-page.c: (gl_object_editor_prepare_edit_page): * src/object-editor-fill-page.c: (gl_object_editor_prepare_fill_page): * src/object-editor-image-page.c: (gl_object_editor_prepare_image_page): * src/object-editor-line-page.c: (gl_object_editor_prepare_line_page): * src/object-editor-lsize-page.c: (gl_object_editor_prepare_lsize_page): * src/object-editor-position-page.c: (gl_object_editor_prepare_position_page): * src/object-editor-private.h: * src/object-editor-shadow-page.c: (gl_object_editor_prepare_shadow_page): * src/object-editor-size-page.c: (gl_object_editor_prepare_size_page): * src/object-editor-text-page.c: (gl_object_editor_prepare_text_page): * src/object-editor.c: (gl_object_editor_init), (gl_object_editor_finalize): * src/prefs-dialog.c: (gl_prefs_dialog_init), (gl_prefs_dialog_finalize), (gl_prefs_dialog_construct), (construct_locale_page), (construct_object_page): * src/print-op.c: (gl_print_op_finalize), (gl_print_op_set_settings), (create_custom_widget_cb): * src/template-designer.c: (gl_template_designer_init), (gl_template_designer_finalize), (construct_start_page), (construct_name_page), (construct_pg_size_page), (construct_shape_page), (construct_rect_size_page), (construct_round_size_page), (construct_cd_size_page), (construct_nlayouts_page), (construct_layout_page), (construct_finish_page): * src/ui-property-bar.c: (gl_ui_property_bar_finalize), (gl_ui_property_bar_construct): * src/wdgt-media-select.c: (gl_wdgt_media_select_finalize), (gl_wdgt_media_select_construct): Builder files no longer built from glade files. Also did some cleanup on formatting and update license notifications to GPL3+. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@861 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/ChangeLog | 68 + glabels2/data/builder/Makefile.am | 80 +- .../builder/merge-properties-dialog.builder | 242 ++ .../builder/merge-properties-dialog.glade | 375 -- .../data/builder/new-label-dialog.builder | 78 + glabels2/data/builder/new-label-dialog.glade | 158 - glabels2/data/builder/object-editor.builder | 2245 +++++++++++ glabels2/data/builder/object-editor.glade | 3376 ---------------- glabels2/data/builder/prefs-dialog.builder | 786 ++++ glabels2/data/builder/prefs-dialog.glade | 1276 ------ .../data/builder/print-custom-widget.builder | 161 + .../data/builder/print-custom-widget.glade | 287 -- glabels2/data/builder/property-bar.builder | 236 ++ glabels2/data/builder/property-bar.glade | 355 -- .../data/builder/template-designer.builder | 2152 ++++++++++ glabels2/data/builder/template-designer.glade | 3447 ----------------- .../data/builder/wdgt-media-select.builder | 202 + glabels2/data/builder/wdgt-media-select.glade | 352 -- glabels2/po/POTFILES.in | 16 +- glabels2/src/merge-properties-dialog.c | 68 +- glabels2/src/new-label-dialog.c | 72 +- glabels2/src/object-editor-bc-page.c | 42 +- glabels2/src/object-editor-data-page.c | 40 +- glabels2/src/object-editor-edit-page.c | 38 +- glabels2/src/object-editor-fill-page.c | 41 +- glabels2/src/object-editor-image-page.c | 43 +- glabels2/src/object-editor-line-page.c | 43 +- glabels2/src/object-editor-lsize-page.c | 39 +- glabels2/src/object-editor-position-page.c | 39 +- glabels2/src/object-editor-private.h | 32 +- glabels2/src/object-editor-shadow-page.c | 45 +- glabels2/src/object-editor-size-page.c | 44 +- glabels2/src/object-editor-text-page.c | 65 +- glabels2/src/object-editor.c | 67 +- glabels2/src/prefs-dialog.c | 69 +- glabels2/src/print-op.c | 73 +- glabels2/src/template-designer.c | 321 +- glabels2/src/ui-property-bar.c | 62 +- glabels2/src/wdgt-media-select.c | 70 +- 39 files changed, 6962 insertions(+), 10243 deletions(-) create mode 100644 glabels2/data/builder/merge-properties-dialog.builder delete mode 100644 glabels2/data/builder/merge-properties-dialog.glade create mode 100644 glabels2/data/builder/new-label-dialog.builder delete mode 100644 glabels2/data/builder/new-label-dialog.glade create mode 100644 glabels2/data/builder/object-editor.builder delete mode 100644 glabels2/data/builder/object-editor.glade create mode 100644 glabels2/data/builder/prefs-dialog.builder delete mode 100644 glabels2/data/builder/prefs-dialog.glade create mode 100644 glabels2/data/builder/print-custom-widget.builder delete mode 100644 glabels2/data/builder/print-custom-widget.glade create mode 100644 glabels2/data/builder/property-bar.builder delete mode 100644 glabels2/data/builder/property-bar.glade create mode 100644 glabels2/data/builder/template-designer.builder delete mode 100644 glabels2/data/builder/template-designer.glade create mode 100644 glabels2/data/builder/wdgt-media-select.builder delete mode 100644 glabels2/data/builder/wdgt-media-select.glade diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 3e89fa1f..669f24c4 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,71 @@ +2009-08-23 Jim Evins + + * data/builder/Makefile.am: + * data/builder/merge-properties-dialog.builder: + * data/builder/merge-properties-dialog.glade: + * data/builder/new-label-dialog.builder: + * data/builder/new-label-dialog.glade: + * data/builder/object-editor.builder: + * data/builder/object-editor.glade: + * data/builder/prefs-dialog.builder: + * data/builder/prefs-dialog.glade: + * data/builder/print-custom-widget.builder: + * data/builder/print-custom-widget.glade: + * data/builder/property-bar.builder: + * data/builder/property-bar.glade: + * data/builder/template-designer.builder: + * data/builder/template-designer.glade: + * data/builder/wdgt-media-select.builder: + * data/builder/wdgt-media-select.glade: + * po/POTFILES.in: + * src/merge-properties-dialog.c: + (gl_merge_properties_dialog_finalize), + (gl_merge_properties_dialog_construct): + * src/new-label-dialog.c: (gl_new_label_dialog_finalize), + (gl_new_label_dialog_construct): + * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page): + * src/object-editor-data-page.c: + (gl_object_editor_prepare_data_page): + * src/object-editor-edit-page.c: + (gl_object_editor_prepare_edit_page): + * src/object-editor-fill-page.c: + (gl_object_editor_prepare_fill_page): + * src/object-editor-image-page.c: + (gl_object_editor_prepare_image_page): + * src/object-editor-line-page.c: + (gl_object_editor_prepare_line_page): + * src/object-editor-lsize-page.c: + (gl_object_editor_prepare_lsize_page): + * src/object-editor-position-page.c: + (gl_object_editor_prepare_position_page): + * src/object-editor-private.h: + * src/object-editor-shadow-page.c: + (gl_object_editor_prepare_shadow_page): + * src/object-editor-size-page.c: + (gl_object_editor_prepare_size_page): + * src/object-editor-text-page.c: + (gl_object_editor_prepare_text_page): + * src/object-editor.c: (gl_object_editor_init), + (gl_object_editor_finalize): + * src/prefs-dialog.c: (gl_prefs_dialog_init), + (gl_prefs_dialog_finalize), (gl_prefs_dialog_construct), + (construct_locale_page), (construct_object_page): + * src/print-op.c: (gl_print_op_finalize), + (gl_print_op_set_settings), (create_custom_widget_cb): + * src/template-designer.c: (gl_template_designer_init), + (gl_template_designer_finalize), (construct_start_page), + (construct_name_page), (construct_pg_size_page), + (construct_shape_page), (construct_rect_size_page), + (construct_round_size_page), (construct_cd_size_page), + (construct_nlayouts_page), (construct_layout_page), + (construct_finish_page): + * src/ui-property-bar.c: (gl_ui_property_bar_finalize), + (gl_ui_property_bar_construct): + * src/wdgt-media-select.c: (gl_wdgt_media_select_finalize), + (gl_wdgt_media_select_construct): + Builder files no longer built from glade files. Also did some + cleanup on formatting and update license notifications to GPL3+. + 2009-08-13 Jim Evins * src/color-combo-color-menu-item.c: diff --git a/glabels2/data/builder/Makefile.am b/glabels2/data/builder/Makefile.am index 011b77e4..9fb6fc93 100644 --- a/glabels2/data/builder/Makefile.am +++ b/glabels2/data/builder/Makefile.am @@ -3,77 +3,13 @@ builderdir = $(datadir)/glabels/builder/ builder_DATA = \ - property-bar.builder \ - print-custom-widget.builder \ - wdgt-media-select.builder \ - merge-properties-dialog.builder \ - new-label-dialog.builder \ - template-designer-start-page.builder \ - template-designer-name-page.builder \ - template-designer-pg-size-page.builder \ - template-designer-shape-page.builder \ - template-designer-rect-size-page.builder \ - template-designer-round-size-page.builder \ - template-designer-cd-size-page.builder \ - template-designer-nlayouts-page.builder \ - template-designer-layout-page.builder \ - template-designer-finish-page.builder \ - prefs-dialog.builder \ + property-bar.builder \ + print-custom-widget.builder \ + wdgt-media-select.builder \ + merge-properties-dialog.builder \ + new-label-dialog.builder \ + template-designer.builder \ + prefs-dialog.builder \ object-editor.builder - -EXTRA_DIST = \ - object-editor.glade \ - prefs-dialog.glade \ - template-designer.glade \ - merge-properties-dialog.glade \ - property-bar.glade \ - print-custom-widget.glade \ - wdgt-media-select.glade \ - new-label-dialog.glade - -CLEANFILES = $(builder_DATA) - - -property-bar.builder: property-bar.glade - $(GTK_BUILDER_CONVERT) --root property_toolbar $< $@ - -print-custom-widget.builder: print-custom-widget.glade - $(GTK_BUILDER_CONVERT) --root print_custom_widget_vbox $< $@ - -wdgt-media-select.builder: wdgt-media-select.glade - $(GTK_BUILDER_CONVERT) --root wdgt_media_select_hbox $< $@ - -merge-properties-dialog.builder: merge-properties-dialog.glade - $(GTK_BUILDER_CONVERT) --root merge_properties_vbox $< $@ - -new-label-dialog.builder: new-label-dialog.glade - $(GTK_BUILDER_CONVERT) --root new_label_dialog_vbox $< $@ - -prefs-dialog.builder: prefs-dialog.glade - $(GTK_BUILDER_CONVERT) --root prefs_notebook $< $@ - -object-editor.builder: object-editor.glade - $(GTK_BUILDER_CONVERT) --root editor_vbox $< $@ - -template-designer-start-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root start_page $< $@ -template-designer-name-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root name_page $< $@ -template-designer-pg-size-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root pg_size_page $< $@ -template-designer-shape-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root shape_page $< $@ -template-designer-rect-size-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root rect_size_page $< $@ -template-designer-round-size-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root round_size_page $< $@ -template-designer-cd-size-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root cd_size_page $< $@ -template-designer-nlayouts-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root nlayouts_page $< $@ -template-designer-layout-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root layout_page $< $@ -template-designer-finish-page.builder: template-designer.glade - $(GTK_BUILDER_CONVERT) --root finish_page $< $@ - +EXTRA_DIST = $(builder_DATA) diff --git a/glabels2/data/builder/merge-properties-dialog.builder b/glabels2/data/builder/merge-properties-dialog.builder new file mode 100644 index 00000000..40338989 --- /dev/null +++ b/glabels2/data/builder/merge-properties-dialog.builder @@ -0,0 +1,242 @@ + + + + + + True + dialog1 + dialog + + + True + + + True + 6 + + + True + 0 + none + + + True + 12 + + + True + 12 + 2 + 2 + 6 + 6 + + + True + 0 + Format: + + + GTK_FILL + + + + + + True + + + 1 + 2 + GTK_FILL + + + + + True + + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + Location: + + + 1 + 2 + GTK_FILL + + + + + + + + + + True + <b>Source</b> + True + + + + + False + 0 + + + + + True + 0 + none + + + True + 12 + + + True + 6 + + + 500 + 350 + True + True + 6 + automatic + automatic + in + + + True + True + + + + + 0 + + + + + True + 6 + 12 + + + Select all + True + True + False + True + + + False + False + 0 + + + + + Unselect all + True + True + False + True + + + False + False + 1 + + + + + False + 1 + + + + + + + + + True + <b>Record selection/preview</b> + True + + + + + 1 + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + okbutton1 + + + diff --git a/glabels2/data/builder/merge-properties-dialog.glade b/glabels2/data/builder/merge-properties-dialog.glade deleted file mode 100644 index b62dcedf..00000000 --- a/glabels2/data/builder/merge-properties-dialog.glade +++ /dev/null @@ -1,375 +0,0 @@ - - - - - - - True - dialog1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 6 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - 12 - True - 2 - 2 - False - 6 - 6 - - - - True - Format: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - True - False - 0 - - - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - Location: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - - - - - True - <b>Source</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - 6 - 500 - 350 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - 6 - True - False - 12 - - - - True - True - Select all - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - True - True - Unselect all - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - 0 - False - True - - - - - - - - - - True - <b>Record selection/preview</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - diff --git a/glabels2/data/builder/new-label-dialog.builder b/glabels2/data/builder/new-label-dialog.builder new file mode 100644 index 00000000..e46715a8 --- /dev/null +++ b/glabels2/data/builder/new-label-dialog.builder @@ -0,0 +1,78 @@ + + + + + + True + window1 + + + True + 12 + 12 + + + True + 0 + none + + + True + 12 + + + True + + + + + + + + + + True + <b>Media type</b> + True + + + + + 0 + + + + + True + 0 + none + + + True + 12 + + + True + + + + + + + + + + True + <b>Label orientation</b> + True + + + + + 1 + + + + + + diff --git a/glabels2/data/builder/new-label-dialog.glade b/glabels2/data/builder/new-label-dialog.glade deleted file mode 100644 index b282a365..00000000 --- a/glabels2/data/builder/new-label-dialog.glade +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 12 - True - False - 12 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - - - - - - - - - True - <b>Media type</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - - - - - - - - - True - <b>Label orientation</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - - diff --git a/glabels2/data/builder/object-editor.builder b/glabels2/data/builder/object-editor.builder new file mode 100644 index 00000000..73b26594 --- /dev/null +++ b/glabels2/data/builder/object-editor.builder @@ -0,0 +1,2245 @@ + + + + + + True + 6 + dialog1 + dialog + + + True + + + True + 6 + 12 + + + True + 12 + + + True + + + False + 0 + + + + + True + <span weight="bold" size="larger">Xxx object properties</span> + True + + + False + False + 1 + + + + + False + False + 0 + + + + + True + True + True + + + True + 12 + 6 + + + True + + + True + True + + + 232 + True + True + + + + + 0 + + + + + 0 + + + + + True + 12 + + + Insert merge field + True + True + False + True + + + False + 0 + + + + + False + False + 1 + + + + + False + + + + + True + Text + + + False + + + + + True + 12 + 12 + + + True + 12 + + + True + 0 + Family: + + + False + False + 0 + + + + + True + + + 1 + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + Size: + + + False + False + 0 + + + + + True + 12 + + + True + True + adjustment1 + 0.0099999997764800008 + True + + + False + False + 0 + + + + + 1 + + + + + False + False + 1 + + + + + True + 12 + + + True + 0 + Style: + + + False + False + 0 + + + + + True + 12 + + + True + True + False + + + True + gtk-bold + 4 + + + + + False + False + 0 + + + + + True + True + False + + + True + gtk-italic + 4 + + + + + False + False + 1 + + + + + 1 + + + + + False + False + 2 + + + + + True + 12 + + + True + 0 + 0.14000000059604645 + Color: + + + False + False + 0 + + + + + True + 6 + + + True + 6 + + + True + True + False + True + False + True + + + False + False + 0 + + + + + True + 12 + + + + + + 1 + + + + + 0 + + + + + True + 6 + + + Key: + True + True + False + True + False + True + text_color_radio + + + False + False + 0 + + + + + True + 12 + + + True + + + 0 + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + False + 3 + + + + + True + 12 + + + True + 0 + Alignment: + + + False + False + 0 + + + + + True + 12 + + + True + True + False + + + True + gtk-justify-left + 4 + + + + + False + False + 0 + + + + + True + True + False + + + True + gtk-justify-center + 4 + + + + + False + False + 1 + + + + + True + True + False + + + True + gtk-justify-right + 4 + + + + + False + False + 2 + + + + + 1 + + + + + False + False + 4 + + + + + True + 12 + + + True + 0 + Line Spacing: + + + False + False + 0 + + + + + True + 12 + + + True + True + adjustment2 + 0.0099999997764800008 + 2 + + + False + False + 0 + + + + + 1 + + + + + False + False + 5 + + + + + Allow merge to automatically shrink text + True + True + False + True + True + + + False + False + 6 + + + + + 1 + False + + + + + True + Style + + + 1 + False + + + + + True + 12 + 12 + + + True + 12 + + + True + 0 + Width: + + + False + False + 0 + + + + + True + 12 + + + True + True + adjustment3 + 0.0099999997764800008 + 2 + True + + + False + False + 0 + + + + + True + points + + + False + False + 1 + + + + + 1 + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + 0.14000000059604645 + Color: + + + False + False + 0 + + + + + True + 6 + + + True + 6 + + + True + False + False + True + False + True + + + False + False + 0 + + + + + True + 12 + + + + + + 1 + + + + + 0 + + + + + True + 6 + + + Key: + True + False + False + True + False + True + line_color_radio + + + False + False + 0 + + + + + True + 12 + + + True + + + 0 + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + False + 1 + + + + + 2 + + + + + True + Line + + + 2 + False + + + + + True + 12 + + + True + 12 + + + True + 0 + 0.14000000059604645 + Color: + + + False + False + 0 + + + + + True + 6 + + + True + 6 + + + True + False + False + True + False + True + True + + + False + False + 0 + + + + + True + 12 + + + + + + 1 + + + + + 0 + + + + + True + 6 + + + Key: + True + False + False + True + False + True + fill_color_radio + + + False + False + 0 + + + + + True + 12 + + + True + + + 0 + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + False + 0 + + + + + 3 + + + + + True + Fill + + + 3 + False + + + + + True + 12 + 12 + + + True + 12 + + + File: + True + True + False + True + False + True + + + False + False + 0 + + + + + True + True + + + 1 + + + + + False + False + 0 + + + + + True + 12 + + + Key: + True + False + True + False + True + False + True + img_file_radio + + + False + False + 0 + + + + + True + + + 1 + + + + + False + False + 1 + + + + + 4 + + + + + True + Image + + + 4 + False + + + + + True + 12 + 12 + + + True + 12 + + + Literal: + True + True + False + True + True + + + False + False + 0 + + + + + True + True + + + 1 + + + + + False + False + 0 + + + + + True + 12 + + + Key: + True + True + False + True + True + data_literal_radio + + + False + False + 0 + + + + + True + + + 1 + + + + + False + False + 1 + + + + + True + 12 + + + True + + + + False + False + 0 + + + + + True + 2 + 2 + 6 + 6 + + + True + 0 + format: + + + GTK_FILL + + + + + + True + 0 + 00000000000 00000 + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + digits: + + + 1 + 2 + GTK_FILL + + + + + + True + + + True + True + adjustment13 + 1 + True + + + False + False + 0 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + 1 + + + + + False + False + 2 + + + + + 5 + + + + + True + Data + + + 5 + False + + + + + True + 12 + 12 + + + True + 12 + + + True + 0 + Style: + + + False + False + 0 + + + + + True + + + 1 + + + + + False + False + 0 + + + + + Text + True + True + False + True + True + + + False + False + 1 + + + + + Checksum + True + True + False + True + True + + + False + False + 2 + + + + + True + 12 + + + True + 0 + 0.14000000059604645 + Color: + + + False + False + 0 + + + + + True + 6 + + + True + 6 + + + True + True + False + True + False + True + + + False + False + 0 + + + + + True + 12 + + + + + + 1 + + + + + 0 + + + + + True + 6 + + + Key: + True + True + False + True + False + True + bc_color_radio + + + False + False + 0 + + + + + True + 12 + + + True + + + 0 + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + False + 3 + + + + + 6 + True + + + + + True + Style + + + 6 + False + + + + + True + 12 + 12 + + + True + 3 + 3 + 12 + 12 + + + True + 0 + Width: + + + GTK_FILL + + + + + + True + 0 + Height: + + + 1 + 2 + GTK_FILL + + + + + + True + 12 + + + True + True + adjustment5 + 0.0099999997764800008 + 2 + True + True + + + False + 0 + + + + + True + inches + + + False + False + 1 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 12 + + + Reset image size + True + True + False + True + + + False + False + 0 + + + + + 2 + 2 + 3 + GTK_FILL + + + + + + True + 12 + + + True + True + adjustment4 + 0.0099999997764800008 + 2 + True + True + + + False + 0 + + + + + True + inches + + + False + False + 1 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + + + + + + 2 + 3 + 2 + GTK_FILL + + + + + + + + + 0 + + + + + 7 + + + + + True + Size + + + 7 + False + + + + + True + 12 + 12 + + + True + 2 + 2 + 12 + 12 + + + True + 0 + Length: + + + GTK_FILL + + + + + + True + 0 + Angle: + + + 1 + 2 + GTK_FILL + + + + + + True + 12 + + + True + True + adjustment6 + 0.0099999997764800008 + 2 + True + True + + + False + 0 + + + + + True + inches + + + False + False + 1 + + + + + 1 + 2 + GTK_FILL + + + + + True + 12 + + + True + True + adjustment7 + 0.0099999997764800008 + 1 + True + True + + + False + 0 + + + + + True + degrees + + + False + False + 1 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + 0 + + + + + 8 + + + + + True + Size + + + 8 + False + + + + + True + 12 + 12 + + + True + 2 + 3 + 12 + 12 + + + 50 + True + 0 + X: + + + GTK_FILL + + + + + + True + 0 + Y: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + True + adjustment8 + 0.0099999997764800008 + 2 + True + True + + + 1 + 2 + + + + + + + True + True + adjustment9 + 0.0099999997764800008 + 2 + True + True + + + 1 + 2 + 1 + 2 + + + + + + + 0 + + + + + 9 + + + + + True + Position + + + 9 + False + + + + + True + 12 + 12 + + + Enable shadow + True + True + False + True + True + + + False + False + 0 + + + + + True + 12 + + + True + 12 + + + True + 0 + X Offset: + + + False + False + 0 + + + + + True + 12 + + + True + True + adjustment10 + 0.0099999997764800008 + 2 + True + True + + + False + 0 + + + + + True + inches + + + False + False + 1 + + + + + 1 + + + + + 0 + + + + + True + 12 + + + True + 0 + Y Offset: + + + False + False + 0 + + + + + True + 12 + + + True + True + adjustment11 + 0.0099999997764800008 + 2 + True + True + + + False + 0 + + + + + True + inches + + + False + False + 1 + + + + + 1 + + + + + 1 + + + + + True + 12 + + + True + 0 + 0.14000000059604645 + Color: + + + False + False + 0 + + + + + True + 6 + + + True + 6 + + + True + True + False + True + False + True + + + False + False + 0 + + + + + True + 12 + + + + + + False + False + 1 + + + + + 0 + + + + + True + 6 + + + Key: + True + True + False + True + False + True + shadow_color_radio + + + False + False + 0 + + + + + True + 12 + + + True + + + 0 + + + + + 1 + + + + + 1 + + + + + 1 + + + + + 2 + + + + + True + 12 + + + True + 0 + Opacity: + + + False + False + 0 + + + + + True + 12 + + + True + True + adjustment12 + 1 + + + False + 0 + + + + + True + % + + + False + False + 1 + + + + + 1 + + + + + 3 + + + + + False + False + 1 + + + + + 10 + + + + + True + Shadow + + + 10 + False + + + + + True + + + + + + 11 + + + + + True + label48 + + + 11 + False + + + + + 1 + + + + + 2 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + False + end + 0 + + + + + + closebutton1 + + + + 1 + 1 + 100 + 1 + 10 + + + 1 + 5 + 0.01 + 0.10000000000000001 + + + 1 + 0.25 + 4 + 0.25 + 1 + + + 1 + 100 + 0.01 + 0.10000000000000001 + + + 1 + 100 + 0.01 + 0.10000000000000001 + + + 1 + 100 + 0.01 + 0.10000000000000001 + + + -180 + 180 + 0.10000000000000001 + 5 + + + 100 + 0.01 + 1 + + + 100 + 0.01 + 1 + + + 100 + 0.01 + 1 + + + 100 + 0.01 + 1 + + + 1 + 100 + 1 + 10 + + + 1 + 1 + 100 + 1 + 10 + + diff --git a/glabels2/data/builder/object-editor.glade b/glabels2/data/builder/object-editor.glade deleted file mode 100644 index ddf4fd68..00000000 --- a/glabels2/data/builder/object-editor.glade +++ /dev/null @@ -1,3376 +0,0 @@ - - - - - - - - 6 - True - dialog1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 12 - - - - True - False - 12 - - - - True - 0.5 - 0.5 - 0 - 0 - - - 0 - False - True - - - - - - True - <span weight="bold" size="larger">Xxx object properties</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - - True - True - True - True - GTK_POS_TOP - True - False - - - - 12 - True - False - 6 - - - - True - False - 0 - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - 232 - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - True - Insert merge field - True - GTK_RELIEF_NORMAL - True - - - 0 - True - False - - - - - 0 - False - False - - - - - False - False - - - - - - True - Text - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - False - 12 - - - - True - Family: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Size: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Style: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-bold - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-italic - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - 6 - - - - True - True - - True - GTK_RELIEF_NORMAL - False - False - False - True - - - 0 - False - False - - - - - - True - False - 12 - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - Key: - True - GTK_RELIEF_NORMAL - False - False - False - True - text_color_radio - - - 0 - False - False - - - - - - True - False - 12 - - - - True - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Alignment: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-justify-left - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-justify-center - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-justify-right - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Line Spacing: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 2 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 5 0.00999999977648 0.10000000149 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - Allow merge to automatically shrink text - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - False - False - - - - - - True - Style - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - False - 12 - - - - True - Width: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - False - False - 1 0.25 4 0.25 1 0 - - - 0 - False - False - - - - - - True - points - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - 6 - - - - True - - True - GTK_RELIEF_NORMAL - False - False - False - True - - - 0 - False - False - - - - - - True - False - 12 - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - Key: - True - GTK_RELIEF_NORMAL - False - False - False - True - line_color_radio - - - 0 - False - False - - - - - - True - False - 12 - - - - True - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - Line - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 0 - - - - True - False - 12 - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - 6 - - - - True - - True - GTK_RELIEF_NORMAL - False - True - False - True - - - 0 - False - False - - - - - - True - False - 12 - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - Key: - True - GTK_RELIEF_NORMAL - False - False - False - True - fill_color_radio - - - 0 - False - False - - - - - - True - False - 12 - - - - True - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - Fill - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - False - 12 - - - - True - True - File: - True - GTK_RELIEF_NORMAL - False - False - False - True - - - 0 - False - False - - - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - True - False - -1 - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - False - True - Key: - True - GTK_RELIEF_NORMAL - False - False - False - True - img_file_radio - - - 0 - False - False - - - - - - True - False - True - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - Image - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - False - 12 - - - - True - True - Literal: - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - True - Key: - True - GTK_RELIEF_NORMAL - True - False - False - True - data_literal_radio - - - 0 - False - False - - - - - - True - False - True - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 2 - 2 - False - 6 - 6 - - - - True - format: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - 00000000000 00000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - digits: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - 0 - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 0 - - - 0 - False - False - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - Data - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - False - 12 - - - - True - Style: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - Text - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Checksum - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - 6 - - - - True - True - - True - GTK_RELIEF_NORMAL - False - False - False - True - - - 0 - False - False - - - - - - True - False - 12 - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - Key: - True - GTK_RELIEF_NORMAL - False - False - False - True - bc_color_radio - - - 0 - False - False - - - - - - True - False - 12 - - - - True - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - True - True - - - - - - True - Style - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - 3 - 3 - False - 12 - 12 - - - - True - Width: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Height: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - True - False - 1 0 100 0.00999999977648 10 0 - - - 0 - False - True - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - False - 12 - - - - True - True - Reset image size - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - 0 - 2 - 2 - 3 - fill - - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - True - False - 1 0 100 0.00999999977648 10 0 - - - 0 - False - True - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 0 - 1 - fill - fill - - - - - - True - False - 0 - - - - - - - 2 - 3 - 0 - 2 - fill - - - - - - 0 - True - True - - - - - False - True - - - - - - True - Size - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - 2 - 2 - False - 12 - 12 - - - - True - Length: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Angle: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - True - False - 1 0 100 0.00999999977648 10 0 - - - 0 - False - True - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 0 - 1 - fill - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 1 - True - GTK_UPDATE_ALWAYS - True - False - 0 -180 180 0.10000000149 5 0 - - - 0 - False - True - - - - - - True - degrees - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - 0 - True - True - - - - - False - True - - - - - - True - Size - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - 2 - 3 - False - 12 - 12 - - - - 50 - True - X: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Y: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - True - False - 0 0 100 0.00999999977648 10 0 - - - 1 - 2 - 0 - 1 - - - - - - - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - True - False - 0 0 100 0.00999999977648 10 0 - - - 1 - 2 - 1 - 2 - - - - - - - 0 - True - True - - - - - False - True - - - - - - True - Position - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - True - Enable shadow - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 12 - - - - True - False - 12 - - - - True - X Offset: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - True - False - 0 0 100 0.00999999977648 10 0 - - - 0 - False - True - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - Y Offset: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - True - False - 0 0 100 0.00999999977648 10 0 - - - 0 - False - True - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - 6 - - - - True - True - - True - GTK_RELIEF_NORMAL - False - False - False - True - - - 0 - False - False - - - - - - True - False - 12 - - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - Key: - True - GTK_RELIEF_NORMAL - False - False - False - True - shadow_color_radio - - - 0 - False - False - - - - - - True - False - 12 - - - - True - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - Opacity: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 0 - - - 0 - False - True - - - - - - True - % - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - Shadow - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - False - 0 - - - - - - - False - True - - - - - - True - label48 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - diff --git a/glabels2/data/builder/prefs-dialog.builder b/glabels2/data/builder/prefs-dialog.builder new file mode 100644 index 00000000..81d39bc0 --- /dev/null +++ b/glabels2/data/builder/prefs-dialog.builder @@ -0,0 +1,786 @@ + + + + + + True + gLabels Preferences + dialog + + + True + + + True + True + + + True + 12 + 12 + + + True + 0 + Select locale specific behavior. + + + False + False + 0 + + + + + True + 0 + none + + + True + + + True + + + + False + False + 0 + + + + + True + 6 + 6 + + + Points + True + True + False + True + True + + + False + False + 0 + + + + + Inches + True + True + False + True + True + units_points_radio + + + False + False + 1 + + + + + Millimeters + True + True + False + True + True + units_points_radio + + + False + False + 2 + + + + + 1 + + + + + + + True + 0 + <span weight="bold">Units</span> + True + + + + + False + False + 1 + + + + + True + 0 + none + + + True + + + True + + + + False + False + 0 + + + + + True + 6 + 6 + + + US Letter + True + True + False + True + True + + + False + False + 0 + + + + + ISO A4 + True + True + False + True + True + page_size_us_letter_radio + + + False + False + 1 + + + + + 1 + + + + + + + True + 0 + <span weight="bold">Default page size</span> + True + + + + + False + False + 2 + + + + + + + True + Locale + + + False + + + + + True + 12 + 12 + + + True + 0 + Select default properties for new objects. + + + False + False + 0 + + + + + True + 0 + none + + + True + + + True + + + + False + False + 0 + + + + + True + 4 + 2 + 12 + 12 + + + True + 0 + Font: + + + GTK_FILL + + + + + + True + 0 + Color: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Alignment: + + + 2 + 3 + GTK_FILL + + + + + + 90 + True + 0 + Line Spacing: + + + 3 + 4 + GTK_FILL + + + + + + True + 12 + + + True + + + 0 + + + + + True + True + adjustment1 + 1 + True + + + False + False + 1 + + + + + True + True + False + + + True + gtk-bold + 4 + + + + + False + False + 2 + + + + + True + True + False + + + True + gtk-italic + 4 + + + + + False + False + 3 + + + + + 1 + 2 + GTK_FILL + + + + + True + 12 + + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 12 + + + True + True + False + + + True + gtk-justify-left + 4 + + + + + False + False + 0 + + + + + True + True + False + + + True + gtk-justify-center + 4 + + + + + False + False + 1 + + + + + True + True + False + + + True + gtk-justify-right + 4 + + + + + False + False + 2 + + + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + 40 + + + True + True + adjustment2 + 0.0099999997764800008 + 2 + + + False + False + 0 + + + + + 1 + 2 + 3 + 4 + GTK_FILL + GTK_FILL + + + + + 1 + + + + + + + True + <span weight="bold">Text</span> + True + + + + + False + False + 1 + + + + + True + 0 + none + + + True + + + True + + + + False + False + 0 + + + + + True + 2 + 2 + 12 + 12 + + + 90 + True + 0 + Width: + + + GTK_FILL + + + + + + True + 0 + Color: + + + 1 + 2 + GTK_FILL + + + + + + True + 12 + + + True + True + adjustment3 + 0.0099999997764800008 + 2 + True + + + False + False + 0 + + + + + True + points + + + False + False + 1 + + + + + 1 + 2 + GTK_FILL + + + + + True + 12 + + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + 1 + + + + + + + True + <span weight="bold">Line</span> + True + + + + + False + False + 2 + + + + + True + 0 + none + + + True + + + True + + + + False + False + 0 + + + + + True + 2 + 12 + 12 + + + 90 + True + 0 + Color: + + + GTK_FILL + + + + + + True + 12 + + + + + + 1 + 2 + GTK_FILL + + + + + 1 + + + + + + + True + <span weight="bold">Fill</span> + True + + + + + False + False + 3 + + + + + 1 + + + + + True + Object defaults + + + 1 + False + + + + + 2 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + False + end + 0 + + + + + + closebutton1 + + + + 1 + 1 + 100 + 1 + 10 + + + 1 + 5 + 0.01 + 0.10000000000000001 + + + 1 + 0.25 + 4 + 0.25 + 1 + + diff --git a/glabels2/data/builder/prefs-dialog.glade b/glabels2/data/builder/prefs-dialog.glade deleted file mode 100644 index 872b2cd1..00000000 --- a/glabels2/data/builder/prefs-dialog.glade +++ /dev/null @@ -1,1276 +0,0 @@ - - - - - - - True - gLabels Preferences - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 12 - - - - True - Select locale specific behavior. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 6 - True - False - 6 - - - - True - True - Points - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Inches - True - GTK_RELIEF_NORMAL - True - False - False - True - units_points_radio - - - 0 - False - False - - - - - - True - True - Millimeters - True - GTK_RELIEF_NORMAL - True - False - False - True - units_points_radio - - - 0 - False - False - - - - - 0 - True - True - - - - - - - - True - <span weight="bold">Units</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 6 - True - False - 6 - - - - True - True - US Letter - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - ISO A4 - True - GTK_RELIEF_NORMAL - True - False - False - True - page_size_us_letter_radio - - - 0 - False - False - - - - - 0 - True - True - - - - - - - - True - <span weight="bold">Default page size</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - False - True - - - - - - True - Locale - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - Select default properties for new objects. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 4 - 2 - False - 12 - 12 - - - - True - Font: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Alignment: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - 90 - True - Line Spacing: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - False - 12 - - - - True - False - True - - - 0 - True - True - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 0 - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-bold - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-italic - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 1 - 2 - 0 - 1 - fill - - - - - - True - False - 12 - - - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - False - 12 - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-justify-left - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-justify-center - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-justify-right - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 1 - 2 - 2 - 3 - fill - fill - - - - - - True - False - 40 - - - - True - True - 0.00999999977648 - 2 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 5 0.00999999977648 0.10000000149 0 - - - 0 - False - False - - - - - 1 - 2 - 3 - 4 - fill - fill - - - - - 0 - True - True - - - - - - - - True - <span weight="bold">Text</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 2 - 2 - False - 12 - 12 - - - - 90 - True - Width: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - False - False - 1 0.25 4 0.25 1 0 - - - 0 - False - False - - - - - - True - points - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 0 - 1 - fill - - - - - - True - False - 12 - - - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - 0 - True - True - - - - - - - - True - <span weight="bold">Line</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 1 - 2 - False - 12 - 12 - - - - 90 - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - False - 12 - - - - - - - 1 - 2 - 0 - 1 - fill - - - - - 0 - True - True - - - - - - - - True - <span weight="bold">Fill</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - False - True - - - - - - True - Object defaults - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - - diff --git a/glabels2/data/builder/print-custom-widget.builder b/glabels2/data/builder/print-custom-widget.builder new file mode 100644 index 00000000..1c01824b --- /dev/null +++ b/glabels2/data/builder/print-custom-widget.builder @@ -0,0 +1,161 @@ + + + + + + True + window1 + + + True + 12 + 12 + + + True + + + True + 0 + none + + + True + 12 + + + True + + + + + + + + + + True + <b>Print control (Simple)</b> + True + + + + + 0 + + + + + True + 0 + none + + + True + 12 + + + True + + + + + + + + + + True + <b>Print control (Merge)</b> + True + + + + + 1 + + + + + False + False + 0 + + + + + True + 0 + none + + + True + 12 + + + True + + + print outlines (to test printer alignment) + True + True + False + True + True + + + False + False + 0 + + + + + print in reverse (i.e. a mirror image) + True + True + False + True + True + + + False + False + 1 + + + + + print crop marks + True + True + False + True + True + + + False + False + 2 + + + + + + + + + True + <b>Options</b> + True + + + + + 1 + + + + + + diff --git a/glabels2/data/builder/print-custom-widget.glade b/glabels2/data/builder/print-custom-widget.glade deleted file mode 100644 index f5063abc..00000000 --- a/glabels2/data/builder/print-custom-widget.glade +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 12 - True - False - 12 - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - - - - - - - - - True - <b>Print control (Simple)</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - - - - - - - - - True - <b>Print control (Merge)</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - True - True - print outlines (to test printer alignment) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - print in reverse (i.e. a mirror image) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - print crop marks - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - - - - True - <b>Options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - - diff --git a/glabels2/data/builder/property-bar.builder b/glabels2/data/builder/property-bar.builder new file mode 100644 index 00000000..74a2f8f3 --- /dev/null +++ b/glabels2/data/builder/property-bar.builder @@ -0,0 +1,236 @@ + + + + + + True + window1 + + + True + icons + False + + + True + + + True + + + True + Font family + False + + + + + + + False + + + + + True + + + True + 6 + + + True + True + Font size + adjustment1 + 1 + + + + + + + False + + + + + True + + + False + + + + + True + Bold + True + gtk-bold + + + False + True + + + + + True + Italic + True + gtk-italic + + + False + True + + + + + True + + + False + + + + + True + Left align + True + gtk-justify-left + + + False + True + + + + + True + Center align + True + gtk-justify-center + text_align_left_radio + + + False + True + + + + + True + Right align + True + gtk-justify-right + text_align_left_radio + + + False + True + + + + + True + + + False + + + + + True + + + True + Text color + + + + + + + + False + + + + + True + + + True + Fill color + + + + + + + + False + + + + + True + + + True + Line color + + + + + + + + False + + + + + True + + + False + + + + + True + + + True + True + Line width + adjustment2 + 1 + 2 + + + + + False + + + + + + + 1 + 1 + 250 + 1 + 10 + + + 1 + 0.25 + 4 + 0.25 + 1 + + diff --git a/glabels2/data/builder/property-bar.glade b/glabels2/data/builder/property-bar.glade deleted file mode 100644 index 53956cec..00000000 --- a/glabels2/data/builder/property-bar.glade +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_ICONS - True - False - - - - True - True - True - False - - - - True - Font family - True - False - - - - True - False - False - - - - - - - False - False - - - - - - True - True - True - False - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 6 - 0 - - - - True - Font size - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 250 1 10 0 - - - - - - - False - False - - - - - - True - True - True - True - - - False - False - - - - - - True - Bold - - True - gtk-bold - True - True - False - False - - - False - True - - - - - - True - Italic - - True - gtk-italic - True - True - False - False - - - False - True - - - - - - True - True - True - True - - - False - False - - - - - - True - Left align - - True - gtk-justify-left - True - True - False - False - - - False - True - - - - - - True - Center align - - True - gtk-justify-center - True - True - False - False - text_align_left_radio - - - False - True - - - - - - True - Right align - - True - gtk-justify-right - True - True - False - False - text_align_left_radio - - - False - True - - - - - - True - True - True - True - - - False - False - - - - - - True - True - True - False - - - - True - Text Color - True - False - - - - - - - - - False - False - - - - - - True - True - True - False - - - - True - Fill color - True - False - - - - - - - - - False - False - - - - - - True - True - True - False - - - - True - Line color - True - False - - - - - - - - - False - False - - - - - - True - True - True - True - - - False - False - - - - - - True - True - True - False - - - - True - Line width - True - 1 - 2 - False - GTK_UPDATE_ALWAYS - False - False - 1 0.25 4 0.25 1 0 - - - - - False - False - - - - - - - diff --git a/glabels2/data/builder/template-designer.builder b/glabels2/data/builder/template-designer.builder new file mode 100644 index 00000000..d61f0ec6 --- /dev/null +++ b/glabels2/data/builder/template-designer.builder @@ -0,0 +1,2152 @@ + + + + + + True + window1 + + + True + True + 6 + + + True + Welcome to the gLabels Template Designer. + +This dialog will assist you in the creation of a custom gLabels template. + + + + + True + start_page + + + False + + + + + True + 18 + 24 + + + True + 0 + Please enter the following identifying information about the template stationery. + + + False + False + 0 + + + + + True + 6 + 2 + 12 + 12 + + + True + 0 + Brand/Manufacturer: + + + GTK_FILL + + + + + + True + 0 + Part #: + + + 1 + 2 + GTK_FILL + + + + + + True + 12 + + + True + True + + + False + False + 0 + + + + + True + 0 + (e.g., 8163A) + + + False + False + 1 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 12 + + + True + True + + + False + False + 0 + + + + + True + 0 + (e.g., Avery, Acme, ...) + + + False + False + 1 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + 0 + Description: + + + 4 + 5 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + 0 + (e.g., "Mailing Labels," "Business Cards," ...) + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + + True + 6 + + + True + + + False + False + 0 + + + + + True + 0 + True + + + False + 1 + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + + + + + + + + + + + + + 1 + + + + + 1 + + + + + True + name_page + + + 1 + False + + + + + True + 18 + 24 + + + True + 0 + Please select the page size of the template stationery. + + + False + False + 0 + + + + + True + 3 + 2 + 12 + 12 + + + True + 0 + Page size: + + + GTK_FILL + + + + + + True + 0 + Width: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Height: + + + 2 + 3 + GTK_FILL + + + + + + True + + + True + + + False + False + 0 + + + + + + + + 1 + 2 + GTK_FILL + + + + + True + 12 + + + True + True + adjustment1 + 0.0099999997764800008 + + + False + False + 0 + + + + + True + 0 + inches + + + False + False + 1 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 12 + + + True + True + adjustment2 + 0.0099999997764800008 + + + False + False + 0 + + + + + True + 0 + inches + + + False + False + 1 + + + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + False + False + 1 + + + + + 2 + + + + + True + pg_size_page + + + 2 + False + + + + + True + 18 + 24 + + + True + 0 + Please select the basic shape of the labels or cards. + + + False + False + 0 + + + + + True + 6 + + + Rectangular or square (can have rounded corners) + True + True + False + True + True + + + False + False + 0 + + + + + Round + True + True + False + True + True + shape_rect_radio + + + False + False + 1 + + + + + CD/DVD (including credit card CDs) + True + True + False + True + True + shape_rect_radio + + + False + False + 2 + + + + + 1 + + + + + 3 + + + + + True + shape_page + + + 3 + False + + + + + True + 18 + 24 + + + True + 0 + Please enter the following size parameters of a single label or card in your template. + + + False + False + 0 + + + + + True + 12 + + + True + 6 + 3 + 12 + 12 + + + True + 0 + 1. Width: + + + GTK_FILL + + + + + + True + 0 + 2. Height: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + 3. Round (radius of corner): + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 4. Horiz. waste (overprint allowed): + + + 3 + 4 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 3 + 4 + GTK_FILL + + + + + + True + True + adjustment3 + 0.0099999997764800008 + + + 1 + 2 + + + + + + True + True + adjustment4 + 0.0099999997764800008 + + + 1 + 2 + 1 + 2 + + + + + + True + True + adjustment5 + 0.0099999997764800008 + + + 1 + 2 + 2 + 3 + + + + + + True + True + adjustment6 + 0.0099999997764800008 + + + 1 + 2 + 3 + 4 + + + + + + True + 0 + 6. Margin + + + 5 + 6 + GTK_FILL + + + + + + True + True + adjustment8 + 0.0099999997764800008 + + + 1 + 2 + 5 + 6 + + + + + + True + 0 + inches + + + 2 + 3 + 5 + 6 + GTK_FILL + + + + + + True + True + adjustment7 + 0.0099999997764800008 + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + inches + + + 2 + 3 + 4 + 5 + GTK_FILL + + + + + + True + 0 + 5. Vert. waste (overprint allowed): + + + 4 + 5 + GTK_FILL + + + + + + False + False + 0 + + + + + True + 1 + 0 + + + 1 + + + + + False + False + 1 + + + + + 4 + + + + + True + rect_size_page + + + 4 + False + + + + + True + 18 + 24 + + + True + 0 + Please enter the following size parameters of a single label in your template. + + + False + False + 0 + + + + + True + 12 + + + True + 3 + 3 + 12 + 12 + + + True + 0 + 1. Radius: + + + GTK_FILL + + + + + + True + 0 + 2. Waste (overprint allowed): + + + 1 + 2 + GTK_FILL + + + + + + True + True + adjustment9 + 0.0099999997764800008 + + + 1 + 2 + + + + + + True + True + adjustment10 + 0.0099999997764800008 + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + inches + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + 0 + 3. Margin + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + True + adjustment11 + 0.0099999997764800008 + + + 1 + 2 + 2 + 3 + + + + + + False + False + 0 + + + + + True + 1 + 0 + + + 1 + + + + + False + False + 1 + + + + + 5 + + + + + True + round_size_page + + + 5 + False + + + + + True + 18 + 24 + + + True + 0 + Please enter the following size parameters of a single label in your template. + + + False + False + 0 + + + + + True + 12 + + + True + 6 + 3 + 12 + 12 + + + True + 0 + 1. Outer radius: + + + GTK_FILL + + + + + + True + 0 + 2. Inner radius: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + 3. Clipping width: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 4. Clipping height: + + + 3 + 4 + GTK_FILL + + + + + + True + 0 + 5. Waste (overprint allowed): + + + 4 + 5 + GTK_FILL + + + + + + True + True + adjustment12 + 0.0099999997764800008 + + + 1 + 2 + + + + + + True + True + adjustment13 + 0.0099999997764800008 + + + 1 + 2 + 1 + 2 + + + + + + True + True + adjustment14 + 0.0099999997764800008 + + + 1 + 2 + 2 + 3 + + + + + + True + True + adjustment15 + 0.0099999997764800008 + + + 1 + 2 + 3 + 4 + + + + + + True + True + adjustment16 + 0.0099999997764800008 + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + inches + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 3 + 4 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 4 + 5 + GTK_FILL + + + + + + True + 0 + 6. Margin + + + 5 + 6 + GTK_FILL + + + + + + True + 0 + inches + + + 2 + 3 + 5 + 6 + GTK_FILL + + + + + + True + True + adjustment17 + 0.0099999997764800008 + + + 1 + 2 + 5 + 6 + + + + + + False + False + 0 + + + + + True + 1 + 0 + + + 1 + + + + + False + False + 1 + + + + + 6 + + + + + True + cd_size_page + + + 6 + False + + + + + True + 18 + 24 + + + True + 0 + How many layouts will your template contain? + +A layout is a set of labels or cards that can be arranged in a simple grid. +Most templates only need one layout, as in the first example. +The second example illustrates when two layouts are needed. + + + False + False + 0 + + + + + True + 12 + + + True + + + True + + + 0 + + + + + True + Templates needing only +one layout. + center + + + False + False + 1 + + + + + 0 + + + + + True + + + True + + + 0 + + + + + True + Templates needing +two layouts. + center + + + False + False + 1 + + + + + 1 + + + + + False + False + 1 + + + + + True + 12 + + + True + 0 + Number of layouts: + + + False + False + 0 + + + + + True + True + 1 + adjustment18 + 1 + True + + + False + False + 1 + + + + + False + False + 2 + + + + + 7 + + + + + True + nlayouts_page + + + 7 + False + + + + + True + 18 + 12 + + + True + 0 + Please enter the following layout information. + + + False + False + 0 + + + + + True + 18 + + + True + 7 + 4 + 12 + 6 + + + True + 0 + Layout #1 + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Layout #2 + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + Number across (nx): + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Number down (ny): + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + Distance from left edge (x0): + + + 3 + 4 + GTK_FILL + + + + + + True + 0 + Distance from top edge (y0): + + + 4 + 5 + GTK_FILL + + + + + + True + 0 + Horizontal pitch (dx): + + + 5 + 6 + GTK_FILL + + + + + + True + 0 + Vertical pitch (dy): + + + 6 + 7 + GTK_FILL + + + + + + True + 0 + inches + + + 3 + 4 + 3 + 4 + GTK_FILL + + + + + + True + 0 + inches + + + 3 + 4 + 4 + 5 + GTK_FILL + + + + + + True + 0 + inches + + + 3 + 4 + 5 + 6 + GTK_FILL + + + + + + True + 0 + inches + + + 3 + 4 + 6 + 7 + GTK_FILL + + + + + + True + True + adjustment19 + 0.0099999997764800008 + + + 1 + 2 + 1 + 2 + + + + + + True + True + adjustment21 + 0.0099999997764800008 + + + 1 + 2 + 2 + 3 + + + + + + True + True + adjustment20 + 0.0099999997764800008 + + + 2 + 3 + 1 + 2 + + + + + + True + True + adjustment22 + 0.0099999997764800008 + + + 2 + 3 + 2 + 3 + + + + + + True + True + adjustment23 + 0.0099999997764800008 + + + 1 + 2 + 3 + 4 + + + + + + True + True + adjustment24 + 0.0099999997764800008 + + + 2 + 3 + 3 + 4 + + + + + + True + True + adjustment25 + 0.0099999997764800008 + + + 1 + 2 + 4 + 5 + + + + + + True + True + adjustment26 + 0.0099999997764800008 + + + 2 + 3 + 4 + 5 + + + + + + True + True + adjustment27 + 0.0099999997764800008 + + + 1 + 2 + 5 + 6 + + + + + + True + True + adjustment28 + 0.0099999997764800008 + + + 2 + 3 + 5 + 6 + + + + + + True + True + adjustment29 + 0.0099999997764800008 + + + 1 + 2 + 6 + 7 + + + + + + True + True + adjustment30 + 0.0099999997764800008 + + + 2 + 3 + 6 + 7 + + + + + + + + + + + + + + + + + + False + False + 0 + + + + + True + + + True + + + + 0 + + + + + True + 6 + + + True + + + + + + 0 + + + + + Print test sheet + True + True + False + 6 + True + + + False + False + 1 + + + + + False + False + 1 + + + + + 1 + + + + + False + False + 1 + + + + + 8 + + + + + True + layout_page + + + 8 + False + + + + + True + Congratulations! + +You have completed the gLabels Template Designer. +If you wish to accept and save your design, click "Apply." + +Otherwise, you may click "Cancel" to abandon your design +or "Back" to continue editing this design. + + + 9 + + + + + True + finish_page + + + 9 + False + + + + + + + 1 + 100 + 1 + 10 + + + 1 + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 1 + 1 + 2 + 1 + 1 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + diff --git a/glabels2/data/builder/template-designer.glade b/glabels2/data/builder/template-designer.glade deleted file mode 100644 index 1e85f373..00000000 --- a/glabels2/data/builder/template-designer.glade +++ /dev/null @@ -1,3447 +0,0 @@ - - - - - - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 6 - True - True - True - True - GTK_POS_TOP - False - False - - - - True - Welcome to the gLabels Template Designer. - -This dialog will assist you in the creation of a custom gLabels template. - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - False - True - - - - - - True - start_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 18 - True - False - 24 - - - - True - Please enter the following identifying information about the template stationery. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 6 - 2 - False - 12 - 12 - - - - True - Brand/Manufacturer: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Part #: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - 12 - - - - True - True - True - True - 0 - - True - * - False - - - 0 - False - False - - - - - - True - (e.g., 8163A) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - False - 12 - - - - True - True - True - True - 0 - - True - * - False - - - 0 - False - False - - - - - - True - (e.g., Avery, Acme, ...) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 0 - 1 - fill - fill - - - - - - True - Description: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 4 - 5 - - - - - - - True - (e.g., "Mailing Labels," "Business Cards," ...) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 5 - 6 - fill - - - - - - - True - False - 6 - - - - True - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - True - True - - - - - False - True - - - - - - True - name_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 18 - True - False - 24 - - - - True - Please select the page size of the template stationery. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 3 - 2 - False - 12 - 12 - - - - True - Page size: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Width: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Height: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - False - 0 - - - - True - False - True - - - 0 - False - False - - - - - - - - - 1 - 2 - 0 - 1 - fill - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 0 - - - 0 - False - False - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 0 - - - 0 - False - False - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 2 - 3 - fill - fill - - - - - 0 - False - False - - - - - False - True - - - - - - True - pg_size_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 18 - True - False - 24 - - - - True - Please select the basic shape of the labels or cards. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Rectangular or square (can have rounded corners) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Round - True - GTK_RELIEF_NORMAL - True - False - False - True - shape_rect_radio - - - 0 - False - False - - - - - - True - True - CD/DVD (including credit card CDs) - True - GTK_RELIEF_NORMAL - True - False - False - True - shape_rect_radio - - - 0 - False - False - - - - - 0 - True - True - - - - - False - True - - - - - - True - shape_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 18 - True - False - 24 - - - - True - Please enter the following size parameters of a single label or card in your template. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 6 - 3 - False - 12 - 12 - - - - True - 1. Width: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - 2. Height: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - 3. Round (radius of corner): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - 4. Horiz. waste (overprint allowed): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 3 - 4 - fill - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 0 - 1 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 2 - 3 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 3 - 4 - - - - - - - True - 6. Margin - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 5 - 6 - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 5 - 6 - fill - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 4 - 5 - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 4 - 5 - fill - - - - - - - True - 5. Vert. waste (overprint allowed): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - 0 - False - False - - - - - - True - 1 - 0 - 0 - 0 - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - rect_size_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 18 - True - False - 24 - - - - True - Please enter the following size parameters of a single label in your template. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 3 - 3 - False - 12 - 12 - - - - True - 1. Radius: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - 2. Waste (overprint allowed): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 0 - 1 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - 3. Margin - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 2 - 3 - - - - - - 0 - False - False - - - - - - True - 1 - 0 - 0 - 0 - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - round_size_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 18 - True - False - 24 - - - - True - Please enter the following size parameters of a single label in your template. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 6 - 3 - False - 12 - 12 - - - - True - 1. Outer radius: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - 2. Inner radius: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - 3. Clipping width: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - 4. Clipping height: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - 5. Waste (overprint allowed): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 0 - 1 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 2 - 3 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 3 - 4 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 4 - 5 - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 3 - 4 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 4 - 5 - fill - - - - - - - True - 6. Margin - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 5 - 6 - fill - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 5 - 6 - - - - - - 0 - False - False - - - - - - True - 1 - 0 - 0 - 0 - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - cd_size_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 18 - True - False - 24 - - - - True - How many layouts will your template contain? - -A layout is a set of labels or cards that can be arranged in a simple grid. -Most templates only need one layout, as in the first example. -The second example illustrates when two layouts are needed. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - False - 0 - - - - True - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Templates needing only -one layout. - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Templates needing -two layouts. - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Number of layouts: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - 0.10000000149 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 2 1 1 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - False - True - - - - - - True - nlayouts_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 18 - True - False - 12 - - - - True - Please enter the following layout information. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 18 - - - - True - 7 - 4 - False - 6 - 12 - - - - True - Layout #1 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - Layout #2 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Number across (nx): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Number down (ny): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Distance from left edge (x0): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - Distance from top edge (y0): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - Horizontal pitch (dx): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - Vertical pitch (dy): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 6 - 7 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 3 - 4 - 3 - 4 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 3 - 4 - 4 - 5 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 3 - 4 - 5 - 6 - fill - - - - - - - True - inches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 3 - 4 - 6 - 7 - fill - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 0 - - - 1 - 2 - 2 - 3 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 0 - - - 2 - 3 - 1 - 2 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 0 - - - 2 - 3 - 2 - 3 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 3 - 4 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 2 - 3 - 3 - 4 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 4 - 5 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 2 - 3 - 4 - 5 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 5 - 6 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 2 - 3 - 5 - 6 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 1 - 2 - 6 - 7 - - - - - - - True - True - 0.00999999977648 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 0 - - - 2 - 3 - 6 - 7 - - - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - False - 6 - - - - True - False - 0 - - - - - - - 0 - True - True - - - - - - 6 - True - True - Print test sheet - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - layout_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - Congratulations! - -You have completed the gLabels Template Designer. -If you wish to accept and save your design, click "Apply." - -Otherwise, you may click "Cancel" to abandon your design -or "Back" to continue editing this design. - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - False - True - - - - - - True - finish_page - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - - diff --git a/glabels2/data/builder/wdgt-media-select.builder b/glabels2/data/builder/wdgt-media-select.builder new file mode 100644 index 00000000..1a41a4e2 --- /dev/null +++ b/glabels2/data/builder/wdgt-media-select.builder @@ -0,0 +1,202 @@ + + + + + + True + window1 + + + True + + + True + True + 12 + + + True + + + 480 + 320 + True + True + 12 + automatic + automatic + in + + + True + True + False + + + + + 0 + + + + + + + True + Recent templates + + + False + + + + + True + + + True + 12 + 12 + + + True + 6 + + + True + Brand: + + + False + False + 0 + + + + + True + + + False + 1 + + + + + False + False + 0 + + + + + True + 6 + + + True + Page size: + + + False + False + 0 + + + + + True + + + False + 1 + + + + + False + 1 + + + + + True + 6 + + + True + Category: + + + False + False + 0 + + + + + True + + + False + 1 + + + + + False + 2 + + + + + False + 0 + + + + + 480 + 320 + True + True + 12 + automatic + automatic + in + + + True + True + False + + + + + 1 + + + + + 1 + + + + + True + Search all templates + + + 1 + False + + + + + 0 + + + + + + diff --git a/glabels2/data/builder/wdgt-media-select.glade b/glabels2/data/builder/wdgt-media-select.glade deleted file mode 100644 index b4dc6c7c..00000000 --- a/glabels2/data/builder/wdgt-media-select.glade +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - 12 - True - True - True - True - GTK_POS_TOP - False - False - - - - True - False - 0 - - - - 12 - 480 - 320 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 0 - True - True - - - - - False - True - - - - - - True - Recent templates - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - False - 0 - - - - 12 - True - False - 12 - - - - True - False - 6 - - - - True - Brand: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - - - 0 - False - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - Page size: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - - - 0 - False - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - Category: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - - - 0 - False - True - - - - - 0 - False - True - - - - - 0 - False - True - - - - - - 12 - 480 - 320 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 0 - True - True - - - - - False - True - - - - - - True - Search all templates - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - - diff --git a/glabels2/po/POTFILES.in b/glabels2/po/POTFILES.in index 44f0676c..d2e30f64 100644 --- a/glabels2/po/POTFILES.in +++ b/glabels2/po/POTFILES.in @@ -151,14 +151,14 @@ libglabels/xml-paper.h libglabels/xml-template.c libglabels/xml-template.h -data/builder/merge-properties-dialog.glade -data/builder/new-label-dialog.glade -data/builder/object-editor.glade -data/builder/prefs-dialog.glade -data/builder/print-custom-widget.glade -data/builder/property-bar.glade -data/builder/template-designer.glade -data/builder/wdgt-media-select.glade +data/builder/merge-properties-dialog.builder +data/builder/new-label-dialog.builder +data/builder/object-editor.builder +data/builder/prefs-dialog.builder +data/builder/print-custom-widget.builder +data/builder/property-bar.builder +data/builder/template-designer.builder +data/builder/wdgt-media-select.builder data/templates/paper-sizes.xml data/templates/categories.xml diff --git a/glabels2/src/merge-properties-dialog.c b/glabels2/src/merge-properties-dialog.c index 1bbd901d..27c25dc9 100644 --- a/glabels2/src/merge-properties-dialog.c +++ b/glabels2/src/merge-properties-dialog.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-properties-dialog.c: document merge properties dialog module + * merge-properties-dialog.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 #include "merge-properties-dialog.h" @@ -44,6 +41,7 @@ #include "debug.h" + /*===========================================*/ /* Private data types */ /*===========================================*/ @@ -53,7 +51,7 @@ struct _glMergePropertiesDialogPrivate { glLabel *label; glMerge *merge; - GtkBuilder *gui; + GtkBuilder *builder; GtkWidget *type_combo; GtkWidget *location_vbox; @@ -82,6 +80,7 @@ enum { N_COLUMNS }; + /*===========================================*/ /* Private globals */ /*===========================================*/ @@ -119,12 +118,13 @@ static void select_all_button_clicked_cb (GtkWidget static void unselect_all_button_clicked_cb (GtkWidget *widget, glMergePropertiesDialog *dialog); - + /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glMergePropertiesDialog, gl_merge_properties_dialog, GTK_TYPE_DIALOG); + static void gl_merge_properties_dialog_class_init (glMergePropertiesDialogClass *class) { @@ -137,6 +137,7 @@ gl_merge_properties_dialog_class_init (glMergePropertiesDialogClass *class) object_class->finalize = gl_merge_properties_dialog_finalize; } + static void gl_merge_properties_dialog_init (glMergePropertiesDialog *dialog) { @@ -161,6 +162,7 @@ gl_merge_properties_dialog_init (glMergePropertiesDialog *dialog) gl_debug (DEBUG_MERGE, "END"); } + static void gl_merge_properties_dialog_finalize (GObject *object) { @@ -175,8 +177,8 @@ gl_merge_properties_dialog_finalize (GObject *object) if (dialog->priv->merge != NULL) { g_object_unref (G_OBJECT (dialog->priv->merge)); } - if (dialog->priv->gui != NULL) { - g_object_unref (G_OBJECT (dialog->priv->gui)); + if (dialog->priv->builder != NULL) { + g_object_unref (G_OBJECT (dialog->priv->builder)); } g_free (dialog->priv); @@ -184,6 +186,7 @@ gl_merge_properties_dialog_finalize (GObject *object) gl_debug (DEBUG_MERGE, "END"); } + /*****************************************************************************/ /* NEW merge properties dialog. */ /*****************************************************************************/ @@ -205,6 +208,7 @@ gl_merge_properties_dialog_new (glLabel *label, return dialog; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Create merge widgets. */ /*--------------------------------------------------------------------------*/ @@ -213,7 +217,8 @@ gl_merge_properties_dialog_construct (glMergePropertiesDialog *dialog, glLabel *label, GtkWindow *window) { - GtkBuilder *gui; + GtkBuilder *builder; + static gchar *object_ids[] = { "merge_properties_vbox", NULL }; GError *error = NULL; gchar *description; glMergeSrcType src_type; @@ -235,17 +240,18 @@ gl_merge_properties_dialog_construct (glMergePropertiesDialog *dialog, gtk_window_set_destroy_with_parent (GTK_WINDOW(dialog), TRUE); } - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "merge-properties-dialog.builder", - &error); + builder = gtk_builder_new (); + gtk_builder_add_objects_from_file (builder, + GLABELS_BUILDER_DIR "merge-properties-dialog.builder", + object_ids, + &error); if (error) { g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); g_error_free (error); return; } - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (builder, "merge_properties_vbox", &vbox, "type_combo", &dialog->priv->type_combo, "location_vbox", &dialog->priv->location_vbox, @@ -255,7 +261,7 @@ gl_merge_properties_dialog_construct (glMergePropertiesDialog *dialog, NULL); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); - dialog->priv->gui = gui; + dialog->priv->builder = builder; gl_util_combo_box_add_text_model (GTK_COMBO_BOX (dialog->priv->type_combo)); @@ -368,6 +374,7 @@ gl_merge_properties_dialog_construct (glMergePropertiesDialog *dialog, gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. type "changed" callback. */ /*--------------------------------------------------------------------------*/ @@ -438,6 +445,7 @@ type_changed_cb (GtkWidget *widget, gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. source "changed" callback. */ /*--------------------------------------------------------------------------*/ @@ -469,6 +477,7 @@ src_changed_cb (GtkWidget *widget, gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. response callback. */ /*--------------------------------------------------------------------------*/ @@ -499,6 +508,7 @@ response_cb (glMergePropertiesDialog *dialog, gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Load tree store from merge data. */ /*--------------------------------------------------------------------------*/ @@ -553,6 +563,7 @@ load_tree (GtkTreeStore *store, gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Record select toggled. */ /*--------------------------------------------------------------------------*/ @@ -590,6 +601,7 @@ record_select_toggled_cb (GtkCellRendererToggle *cell, gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. "Select All" button callback. */ /*--------------------------------------------------------------------------*/ @@ -628,6 +640,7 @@ select_all_button_clicked_cb (GtkWidget *widget, gl_debug (DEBUG_MERGE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. "Unselect All" button callback. */ /*--------------------------------------------------------------------------*/ @@ -665,3 +678,14 @@ unselect_all_button_clicked_cb (GtkWidget *widget, gl_debug (DEBUG_MERGE, "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/new-label-dialog.c b/glabels2/src/new-label-dialog.c index 4b887956..1cf6096f 100644 --- a/glabels2/src/new-label-dialog.c +++ b/glabels2/src/new-label-dialog.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 - * - * new-label-dialog.c: New label dialog module + * new-label-dialog.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 "new-label-dialog.h" @@ -36,13 +33,14 @@ #include "debug.h" + /*===========================================*/ /* Private data types */ /*===========================================*/ struct _glNewLabelDialogPrivate { - GtkBuilder *gui; + GtkBuilder *builder; GtkWidget *media_select; GtkWidget *rotate_label; @@ -54,6 +52,7 @@ struct _glNewLabelDialogPrivate { /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -67,12 +66,12 @@ static void template_changed_cb (glWdgtMediaSelect *se gpointer data); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glNewLabelDialog, gl_new_label_dialog, GTK_TYPE_DIALOG); + static void gl_new_label_dialog_class_init (glNewLabelDialogClass *class) { @@ -85,6 +84,7 @@ gl_new_label_dialog_class_init (glNewLabelDialogClass *class) object_class->finalize = gl_new_label_dialog_finalize; } + static void gl_new_label_dialog_init (glNewLabelDialog *dialog) { @@ -107,6 +107,7 @@ gl_new_label_dialog_init (glNewLabelDialog *dialog) gl_debug (DEBUG_FILE, "END"); } + static void gl_new_label_dialog_finalize (GObject *object) { @@ -118,9 +119,9 @@ gl_new_label_dialog_finalize (GObject *object) g_return_if_fail (GL_IS_NEW_LABEL_DIALOG (dialog)); g_return_if_fail (dialog->priv != NULL); - if (dialog->priv->gui) + if (dialog->priv->builder) { - g_object_unref (dialog->priv->gui); + g_object_unref (dialog->priv->builder); } g_free (dialog->priv); @@ -130,6 +131,7 @@ gl_new_label_dialog_finalize (GObject *object) } + /*****************************************************************************/ /* NEW object properties dialog. */ /*****************************************************************************/ @@ -147,6 +149,7 @@ gl_new_label_dialog_new (GtkWindow *win) return dialog; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct dialog. */ /*--------------------------------------------------------------------------*/ @@ -154,33 +157,35 @@ static void gl_new_label_dialog_construct (glNewLabelDialog *dialog, GtkWindow *win) { - GtkBuilder *gui; - GError *error = NULL; - GtkWidget *vbox, *media_select_vbox, *rotate_label_vbox; - gchar *name; + GtkBuilder *builder; + static gchar *object_ids[] = { "new_label_dialog_vbox", NULL }; + GError *error = NULL; + GtkWidget *vbox, *media_select_vbox, *rotate_label_vbox; + gchar *name; gl_debug (DEBUG_FILE, "START"); gtk_window_set_transient_for (GTK_WINDOW (dialog), win); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "new-label-dialog.builder", - &error); + builder = gtk_builder_new (); + gtk_builder_add_objects_from_file (builder, + GLABELS_BUILDER_DIR "new-label-dialog.builder", + object_ids, + &error); if (error) { g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); g_error_free (error); return; } - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (builder, "new_label_dialog_vbox", &vbox, "media_select_vbox", &media_select_vbox, "rotate_label_vbox", &rotate_label_vbox, NULL); gtk_box_pack_start (GTK_BOX( GTK_DIALOG (dialog)->vbox), vbox, FALSE, FALSE, 0); - dialog->priv->gui = gui; + dialog->priv->builder = builder; dialog->priv->media_select = gl_wdgt_media_select_new (); gtk_box_pack_start (GTK_BOX (media_select_vbox), @@ -201,6 +206,7 @@ gl_new_label_dialog_construct (glNewLabelDialog *dialog, gl_debug (DEBUG_FILE, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. New template changed callback. */ /*---------------------------------------------------------------------------*/ @@ -227,6 +233,7 @@ template_changed_cb (glWdgtMediaSelect *select, gl_debug (DEBUG_FILE, "END"); } + /*****************************************************************************/ /* Get template name. */ /*****************************************************************************/ @@ -240,6 +247,7 @@ gl_new_label_dialog_get_template_name (glNewLabelDialog *dialog) return name; } + /*****************************************************************************/ /* Set template name. */ /*****************************************************************************/ @@ -250,6 +258,7 @@ gl_new_label_dialog_set_template_name (glNewLabelDialog *dialog, gl_wdgt_media_select_set_name (GL_WDGT_MEDIA_SELECT (dialog->priv->media_select), name); } + /*****************************************************************************/ /* Get current filter parameters. */ /*****************************************************************************/ @@ -263,6 +272,7 @@ gl_new_label_dialog_get_filter_parameters (glNewLabelDialog *dialog, page_size_id, category_id); } + /*****************************************************************************/ /* Set current filter parameters. */ /*****************************************************************************/ @@ -276,6 +286,7 @@ gl_new_label_dialog_set_filter_parameters (glNewLabelDialog *dialog, page_size_id, category_id); } + /*****************************************************************************/ /* Get rotate state. */ /*****************************************************************************/ @@ -286,6 +297,7 @@ gl_new_label_dialog_get_rotate_state (glNewLabelDialog *dialog) GL_WDGT_ROTATE_LABEL (dialog->priv->rotate_label)); } + /*****************************************************************************/ /* Set rotate state. */ /*****************************************************************************/ @@ -297,3 +309,13 @@ gl_new_label_dialog_set_rotate_state (glNewLabelDialog *dialog, GL_WDGT_ROTATE_LABEL (dialog->priv->rotate_label), state); } + + +/* + * 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 be603ecd..9b13bb1c 100644 --- a/glabels2/src/object-editor-bc-page.c +++ b/glabels2/src/object-editor-bc-page.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 - * - * object-editor.c: object properties editor module + * object-editor-bc-page.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 "object-editor.h" @@ -41,18 +38,22 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -72,7 +73,7 @@ gl_object_editor_prepare_bc_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "bc_page_vbox", &editor->priv->bc_page_vbox, "bc_style_combo", &editor->priv->bc_style_combo, "bc_text_check", &editor->priv->bc_text_check, @@ -150,6 +151,7 @@ gl_object_editor_prepare_bc_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Callback for when style has changed. */ /*--------------------------------------------------------------------------*/ @@ -213,6 +215,7 @@ style_changed_cb (glObjectEditor *editor) g_free (ex_string); } + /*****************************************************************************/ /* Set barcode style. */ /*****************************************************************************/ @@ -278,6 +281,7 @@ gl_object_editor_set_bc_style (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query barcode style. */ /*****************************************************************************/ @@ -311,6 +315,7 @@ gl_object_editor_get_bc_style (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set bc color. */ /*****************************************************************************/ @@ -356,6 +361,7 @@ gl_object_editor_set_bc_color (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query bc color. */ /*****************************************************************************/ @@ -393,6 +399,7 @@ gl_object_editor_get_bc_color (glObjectEditor *editor) return color_node; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. barcode color radio callback. */ /*--------------------------------------------------------------------------*/ @@ -417,3 +424,14 @@ bc_radio_toggled_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "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/object-editor-data-page.c b/glabels2/src/object-editor-data-page.c index 3959ea7b..311f5622 100644 --- a/glabels2/src/object-editor-data-page.c +++ b/glabels2/src/object-editor-data-page.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 - * - * object-editor.c: object properties editor module + * object-editor-data-page.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 "object-editor.h" @@ -39,18 +36,22 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -58,7 +59,6 @@ static void data_radio_toggled_cb (glObjectEditor *editor); - /*--------------------------------------------------------------------------*/ /* PRIVATE. Prepare data page. */ /*--------------------------------------------------------------------------*/ @@ -68,7 +68,7 @@ gl_object_editor_prepare_data_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "data_page_vbox", &editor->priv->data_page_vbox, "data_literal_radio", &editor->priv->data_literal_radio, "data_key_radio", &editor->priv->data_key_radio, @@ -102,6 +102,7 @@ gl_object_editor_prepare_data_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. data radio callback. */ /*--------------------------------------------------------------------------*/ @@ -136,6 +137,7 @@ data_radio_toggled_cb (glObjectEditor *editor) gl_debug (DEBUG_WDGT, "END"); } + /*****************************************************************************/ /* Set data. */ /*****************************************************************************/ @@ -197,6 +199,7 @@ gl_object_editor_set_data (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query data. */ /*****************************************************************************/ @@ -227,3 +230,14 @@ gl_object_editor_get_data (glObjectEditor *editor) return text_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/object-editor-edit-page.c b/glabels2/src/object-editor-edit-page.c index e5f4568e..631ec109 100644 --- a/glabels2/src/object-editor-edit-page.c +++ b/glabels2/src/object-editor-edit-page.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 - * - * object-editor.c: object properties editor module + * object-editor-edit-page.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 "object-editor.h" @@ -39,18 +36,22 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -69,7 +70,7 @@ gl_object_editor_prepare_edit_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "edit_page_vbox", &editor->priv->edit_page_vbox, "edit_text_view", &editor->priv->edit_text_view, "edit_insert_field_button", &editor->priv->edit_insert_field_button, @@ -93,6 +94,7 @@ gl_object_editor_prepare_edit_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Menu item activated callback. */ /*--------------------------------------------------------------------------*/ @@ -115,6 +117,7 @@ field_selected_cb (glObjectEditor *editor, gchar *field) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Insert button callback. */ /*--------------------------------------------------------------------------*/ @@ -130,6 +133,7 @@ insert_button_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set text buffer as model for text view/editor. */ /*****************************************************************************/ @@ -144,3 +148,13 @@ gl_object_editor_set_text_buffer (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "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/object-editor-fill-page.c b/glabels2/src/object-editor-fill-page.c index 6270c9d3..f13e19be 100644 --- a/glabels2/src/object-editor-fill-page.c +++ b/glabels2/src/object-editor-fill-page.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 - * - * object-editor.c: object properties editor module + * object-editor-fill-page.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 "object-editor.h" @@ -39,25 +36,29 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ static void fill_radio_toggled_cb (glObjectEditor *editor); - + /*--------------------------------------------------------------------------*/ /* PRIVATE. Prepare fill page. */ /*--------------------------------------------------------------------------*/ @@ -67,7 +68,7 @@ gl_object_editor_prepare_fill_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "fill_page_vbox", &editor->priv->fill_page_vbox, "fill_color_hbox", &editor->priv->fill_color_hbox, "fill_key_combo", &editor->priv->fill_key_combo, @@ -114,6 +115,7 @@ gl_object_editor_prepare_fill_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set fill color. */ /*****************************************************************************/ @@ -160,6 +162,7 @@ gl_object_editor_set_fill_color (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query fill color. */ /*****************************************************************************/ @@ -194,6 +197,7 @@ gl_object_editor_get_fill_color (glObjectEditor *editor) return color_node; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. fill radio callback. */ /*--------------------------------------------------------------------------*/ @@ -218,3 +222,14 @@ fill_radio_toggled_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "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/object-editor-image-page.c b/glabels2/src/object-editor-image-page.c index 1c756072..9f4bccb4 100644 --- a/glabels2/src/object-editor-image-page.c +++ b/glabels2/src/object-editor-image-page.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 - * - * object-editor.c: object properties editor module + * object-editor-image-page.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 "object-editor.h" @@ -39,18 +36,22 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -63,7 +64,7 @@ static void add_image_filters_to_chooser (GtkFileChooser *file_chooser); static void img_selection_changed_cb (glObjectEditor *editor); - + /*--------------------------------------------------------------------------*/ /* PRIVATE. Prepare image page. */ /*--------------------------------------------------------------------------*/ @@ -76,7 +77,7 @@ gl_object_editor_prepare_image_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "img_page_vbox", &editor->priv->img_page_vbox, "img_file_radio", &editor->priv->img_file_radio, "img_key_radio", &editor->priv->img_key_radio, @@ -118,6 +119,7 @@ gl_object_editor_prepare_image_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. image radio callback. */ /*--------------------------------------------------------------------------*/ @@ -142,6 +144,7 @@ img_radio_toggled_cb (glObjectEditor *editor) gl_debug (DEBUG_WDGT, "END"); } + /*****************************************************************************/ /* Set image. */ /*****************************************************************************/ @@ -186,6 +189,7 @@ gl_object_editor_set_image (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query image. */ /*****************************************************************************/ @@ -216,6 +220,7 @@ gl_object_editor_get_image (glObjectEditor *editor) return text_node; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Update preview image. */ /*--------------------------------------------------------------------------*/ @@ -246,6 +251,7 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data) } } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Add filters to file chooser. */ /* Based on eog's eog_file_selection_add_filter(). */ @@ -322,6 +328,7 @@ add_image_filters_to_chooser (GtkFileChooser *chooser) g_slist_free (filters); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Selection changed callback. */ /*--------------------------------------------------------------------------*/ @@ -345,3 +352,13 @@ img_selection_changed_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "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/object-editor-line-page.c b/glabels2/src/object-editor-line-page.c index 5b48bde3..f870d38c 100644 --- a/glabels2/src/object-editor-line-page.c +++ b/glabels2/src/object-editor-line-page.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 - * - * object-editor.c: object properties editor module + * object-editor-line-page.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 "object-editor.h" @@ -41,24 +38,28 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ static void line_radio_toggled_cb (glObjectEditor *editor); - + /*--------------------------------------------------------------------------*/ /* PRIVATE. Prepare line page. */ /*--------------------------------------------------------------------------*/ @@ -68,7 +69,7 @@ gl_object_editor_prepare_line_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "line_page_vbox", &editor->priv->line_page_vbox, "line_width_spin", &editor->priv->line_width_spin, "line_color_hbox", &editor->priv->line_color_hbox, @@ -123,6 +124,7 @@ gl_object_editor_prepare_line_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set line width. */ /*****************************************************************************/ @@ -143,6 +145,7 @@ gl_object_editor_set_line_width (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query line width. */ /*****************************************************************************/ @@ -160,6 +163,7 @@ gl_object_editor_get_line_width (glObjectEditor *editor) return w; } + /*****************************************************************************/ /* Set line color. */ /*****************************************************************************/ @@ -207,6 +211,7 @@ gl_object_editor_set_line_color (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query line color. */ /*****************************************************************************/ @@ -241,6 +246,7 @@ gl_object_editor_get_line_color (glObjectEditor *editor) return color_node; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. line color radio callback. */ /*--------------------------------------------------------------------------*/ @@ -265,3 +271,14 @@ line_radio_toggled_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "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/object-editor-lsize-page.c b/glabels2/src/object-editor-lsize-page.c index cbc18f74..7266ada4 100644 --- a/glabels2/src/object-editor-lsize-page.c +++ b/glabels2/src/object-editor-lsize-page.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 - * - * object-editor.c: object properties editor module + * object-editor-lsize-page.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 "object-editor.h" @@ -36,6 +33,7 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ @@ -50,16 +48,17 @@ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ - /*--------------------------------------------------------------------------*/ /* PRIVATE. Prepare line size page. */ /*--------------------------------------------------------------------------*/ @@ -73,7 +72,7 @@ gl_object_editor_prepare_lsize_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "lsize_page_vbox", &editor->priv->lsize_page_vbox, "lsize_r_spin", &editor->priv->lsize_r_spin, "lsize_theta_spin", &editor->priv->lsize_theta_spin, @@ -108,6 +107,7 @@ gl_object_editor_prepare_lsize_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set line size. */ /*****************************************************************************/ @@ -145,6 +145,7 @@ gl_object_editor_set_lsize (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set maximum line size. */ /*****************************************************************************/ @@ -185,6 +186,7 @@ gl_object_editor_set_max_lsize (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query line size. */ /*****************************************************************************/ @@ -214,6 +216,7 @@ gl_object_editor_get_lsize (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* PRIVATE. Prefs changed callback. Update units related items. */ /*****************************************************************************/ @@ -255,3 +258,13 @@ lsize_prefs_changed_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "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/object-editor-position-page.c b/glabels2/src/object-editor-position-page.c index 511c894b..46bfffeb 100644 --- a/glabels2/src/object-editor-position-page.c +++ b/glabels2/src/object-editor-position-page.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 - * - * object-editor.c: object properties editor module + * object-editor-position-page.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 "object-editor.h" @@ -36,18 +33,22 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -66,7 +67,7 @@ gl_object_editor_prepare_position_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "pos_page_vbox", &editor->priv->pos_page_vbox, "pos_x_spin", &editor->priv->pos_x_spin, "pos_y_spin", &editor->priv->pos_y_spin, @@ -106,6 +107,7 @@ gl_object_editor_prepare_position_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set position. */ /*****************************************************************************/ @@ -137,6 +139,7 @@ gl_object_editor_set_position (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set maximum position. */ /*****************************************************************************/ @@ -176,6 +179,7 @@ gl_object_editor_set_max_position (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query position. */ /*****************************************************************************/ @@ -201,6 +205,7 @@ gl_object_editor_get_position (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* PRIVATE. Prefs changed callback. Update units related items. */ /*****************************************************************************/ @@ -248,3 +253,13 @@ position_prefs_changed_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "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/object-editor-private.h b/glabels2/src/object-editor-private.h index 31fc5edf..66bffe9a 100644 --- a/glabels2/src/object-editor-private.h +++ b/glabels2/src/object-editor-private.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 - * - * object-editor-private.h: object properties editor module private header file + * object-editor-private.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_PRIVATE_H__ #define __OBJECT_EDITOR_PRIVATE_H__ @@ -31,7 +28,7 @@ G_BEGIN_DECLS struct _glObjectEditorPrivate { - GtkBuilder *gui; + GtkBuilder *builder; GtkWidget *editor_vbox; glLabel *label; @@ -207,3 +204,14 @@ void shadow_prefs_changed_cb (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/object-editor-shadow-page.c b/glabels2/src/object-editor-shadow-page.c index 454c2bc7..6abcbd7a 100644 --- a/glabels2/src/object-editor-shadow-page.c +++ b/glabels2/src/object-editor-shadow-page.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 - * - * object-editor.c: object properties editor module + * object-editor-shadow-page.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 "object-editor.h" @@ -41,18 +38,22 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -74,7 +75,7 @@ gl_object_editor_prepare_shadow_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "shadow_page_vbox", &editor->priv->shadow_page_vbox, "shadow_enable_check", &editor->priv->shadow_enable_check, "shadow_controls_table", &editor->priv->shadow_controls_table, @@ -154,6 +155,7 @@ gl_object_editor_prepare_shadow_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set shadow parameters. */ /*****************************************************************************/ @@ -174,6 +176,7 @@ gl_object_editor_set_shadow_state (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + void gl_object_editor_set_shadow_offset (glObjectEditor *editor, gdouble x, @@ -202,6 +205,7 @@ gl_object_editor_set_shadow_offset (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + void gl_object_editor_set_shadow_color (glObjectEditor *editor, gboolean merge_flag, @@ -245,6 +249,7 @@ gl_object_editor_set_shadow_color (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + void gl_object_editor_set_shadow_opacity (glObjectEditor *editor, gdouble alpha) @@ -306,6 +311,7 @@ gl_object_editor_set_max_shadow_offset (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query shadow parameters. */ /*****************************************************************************/ @@ -323,6 +329,7 @@ gl_object_editor_get_shadow_state (glObjectEditor *editor) return state; } + void gl_object_editor_get_shadow_offset (glObjectEditor *editor, gdouble *x, @@ -345,6 +352,7 @@ gl_object_editor_get_shadow_offset (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + glColorNode* gl_object_editor_get_shadow_color (glObjectEditor *editor) { @@ -376,6 +384,7 @@ gl_object_editor_get_shadow_color (glObjectEditor *editor) return color_node; } + gdouble gl_object_editor_get_shadow_opacity (glObjectEditor *editor) { @@ -438,6 +447,7 @@ shadow_prefs_changed_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. shadow enable check callback. */ /*--------------------------------------------------------------------------*/ @@ -485,3 +495,14 @@ shadow_color_radio_toggled_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "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/object-editor-size-page.c b/glabels2/src/object-editor-size-page.c index 5e3ab9d3..58dcbf2c 100644 --- a/glabels2/src/object-editor-size-page.c +++ b/glabels2/src/object-editor-size-page.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 - * - * object-editor.c: object properties editor module + * object-editor-size-page.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 "object-editor.h" @@ -37,18 +34,22 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -73,7 +74,7 @@ gl_object_editor_prepare_size_page (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "size_page_vbox", &editor->priv->size_page_vbox, "size_w_spin", &editor->priv->size_w_spin, "size_h_spin", &editor->priv->size_h_spin, @@ -137,6 +138,7 @@ gl_object_editor_prepare_size_page (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Maintain aspect ratio checkbox callback. */ /*--------------------------------------------------------------------------*/ @@ -164,6 +166,7 @@ aspect_toggle_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. W spin button changed callback. */ /*--------------------------------------------------------------------------*/ @@ -198,6 +201,7 @@ w_spin_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. H spin button changed callback. */ /*--------------------------------------------------------------------------*/ @@ -232,6 +236,7 @@ h_spin_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Reset image size callback. */ /*--------------------------------------------------------------------------*/ @@ -286,6 +291,7 @@ size_reset_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set size. */ /*****************************************************************************/ @@ -320,6 +326,7 @@ gl_object_editor_set_size (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set maximum size. */ /*****************************************************************************/ @@ -366,6 +373,7 @@ gl_object_editor_set_max_size (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set base or natural size of image. */ /*****************************************************************************/ @@ -381,6 +389,7 @@ gl_object_editor_set_base_size (glObjectEditor *editor, editor->priv->h_base = h_base; } + /*****************************************************************************/ /* Query size. */ /*****************************************************************************/ @@ -407,6 +416,7 @@ gl_object_editor_get_size (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* PRIVATE. Prefs changed callback. Update units related items. */ /*****************************************************************************/ @@ -454,3 +464,13 @@ size_prefs_changed_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "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/object-editor-text-page.c b/glabels2/src/object-editor-text-page.c index 57b37dae..b4bb69fc 100644 --- a/glabels2/src/object-editor-text-page.c +++ b/glabels2/src/object-editor-text-page.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 - * - * object-editor.c: object properties editor module + * object-editor-text-page.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 "object-editor.h" @@ -40,18 +37,22 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -72,7 +73,7 @@ gl_object_editor_prepare_text_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "START"); /* Extract widgets from XML tree. */ - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "text_page_vbox", &editor->priv->text_page_vbox, "text_family_combo", &editor->priv->text_family_combo, "text_size_spin", &editor->priv->text_size_spin, @@ -172,6 +173,7 @@ gl_object_editor_prepare_text_page (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Alignment togglebutton callback. */ /*--------------------------------------------------------------------------*/ @@ -214,6 +216,7 @@ align_toggle_cb (GtkToggleButton *toggle, } + /*****************************************************************************/ /* Set font family. */ /*****************************************************************************/ @@ -256,6 +259,7 @@ gl_object_editor_set_font_family (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query font family. */ /*****************************************************************************/ @@ -273,6 +277,7 @@ gl_object_editor_get_font_family (glObjectEditor *editor) return font_family; } + /*****************************************************************************/ /* Set font size. */ /*****************************************************************************/ @@ -292,6 +297,7 @@ gl_object_editor_set_font_size (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query font size. */ /*****************************************************************************/ @@ -310,6 +316,7 @@ gl_object_editor_get_font_size (glObjectEditor *editor) return font_size; } + /*****************************************************************************/ /* Set font weight. */ /*****************************************************************************/ @@ -329,6 +336,7 @@ gl_object_editor_set_font_weight (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query font weight. */ /*****************************************************************************/ @@ -351,6 +359,7 @@ gl_object_editor_get_font_weight (glObjectEditor *editor) return font_weight; } + /*****************************************************************************/ /* Set font italic flag. */ /*****************************************************************************/ @@ -370,6 +379,7 @@ gl_object_editor_set_font_italic_flag (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query font italic flag. */ /*****************************************************************************/ @@ -389,6 +399,7 @@ gl_object_editor_get_font_italic_flag (glObjectEditor *editor) return italic_flag; } + /*****************************************************************************/ /* Set text alignment. */ /*****************************************************************************/ @@ -412,6 +423,7 @@ gl_object_editor_set_text_alignment (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query text alignment. */ /*****************************************************************************/ @@ -442,6 +454,7 @@ gl_object_editor_get_text_alignment (glObjectEditor *editor) return align; } + /*****************************************************************************/ /* Set text color. */ /*****************************************************************************/ @@ -491,6 +504,7 @@ gl_object_editor_set_text_color (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query text color. */ /*****************************************************************************/ @@ -510,17 +524,17 @@ gl_object_editor_get_text_color (glObjectEditor *editor) color_node->color = gl_prefs->default_text_color; color_node->key = gtk_combo_box_get_active_text (GTK_COMBO_BOX (editor->priv->text_color_key_combo)); - } else { + } else { color_node->field_flag = FALSE; color_node->key = NULL; color = gl_color_combo_get_color (GL_COLOR_COMBO(editor->priv->text_color_combo), &is_default); - if (is_default) { - color_node->color = gl_prefs->default_text_color; - } else { - color_node->color = color; - } + if (is_default) { + color_node->color = gl_prefs->default_text_color; + } else { + color_node->color = color; + } } gl_debug (DEBUG_EDITOR, "END"); @@ -548,6 +562,7 @@ gl_object_editor_set_text_line_spacing (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query text line spacing. */ /*****************************************************************************/ @@ -566,6 +581,7 @@ gl_object_editor_get_text_line_spacing (glObjectEditor *editor) return text_line_spacing; } + /*****************************************************************************/ /* Set auto shrink checkbox. */ /*****************************************************************************/ @@ -585,6 +601,7 @@ gl_object_editor_set_text_auto_shrink (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Query auto shrink checkbox. */ /*****************************************************************************/ @@ -602,6 +619,7 @@ gboolean gl_object_editor_get_text_auto_shrink (glObjectEditor *editor) return auto_shrink; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. color radio callback. */ /*--------------------------------------------------------------------------*/ @@ -626,3 +644,14 @@ text_radio_toggled_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "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/object-editor.c b/glabels2/src/object-editor.c index f237e642..808e72c1 100644 --- a/glabels2/src/object-editor.c +++ b/glabels2/src/object-editor.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 - * - * object-editor.c: object properties editor module +/* + * object-editor.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 "object-editor.h" @@ -46,22 +43,26 @@ #include "debug.h" + /*===========================================*/ /* Private macros */ /*===========================================*/ + /*===========================================*/ /* Private data types */ /*===========================================*/ typedef void (*ChangedSignal) (GObject * object, gpointer data); + /*===========================================*/ /* Private globals */ /*===========================================*/ gint gl_object_editor_signals[LAST_SIGNAL] = { 0 }; + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -78,12 +79,12 @@ static void prefs_changed_cb (glObjectEditor *editor); static void label_changed_cb (glLabel *label, glObjectEditor *editor); - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glObjectEditor, gl_object_editor, GTK_TYPE_VBOX); + static void gl_object_editor_class_init (glObjectEditorClass *class) { @@ -116,27 +117,36 @@ gl_object_editor_class_init (glObjectEditorClass *class) gl_debug (DEBUG_EDITOR, "END"); } + static void gl_object_editor_init (glObjectEditor *editor) { - GError *error = NULL; + static gchar *object_ids[] = { "editor_vbox", + "adjustment1", "adjustment2", "adjustment3", + "adjustment4", "adjustment5", "adjustment6", + "adjustment7", "adjustment8", "adjustment9", + "adjustment10", "adjustment11", "adjustment12", + "adjustment13", + NULL }; + GError *error = NULL; gl_debug (DEBUG_EDITOR, "START"); editor->priv = g_new0 (glObjectEditorPrivate, 1); - editor->priv->gui = gtk_builder_new (); + editor->priv->builder = gtk_builder_new (); - gtk_builder_add_from_file (editor->priv->gui, - GLABELS_BUILDER_DIR "object-editor.builder", - &error); + gtk_builder_add_objects_from_file (editor->priv->builder, + GLABELS_BUILDER_DIR "object-editor.builder", + object_ids, + &error); if (error) { g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); g_error_free (error); return; } - gl_util_get_builder_widgets (editor->priv->gui, + gl_util_get_builder_widgets (editor->priv->builder, "editor_vbox", &editor->priv->editor_vbox, "title_image", &editor->priv->title_image, "title_label", &editor->priv->title_label, @@ -156,6 +166,7 @@ gl_object_editor_init (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + static void gl_object_editor_finalize (GObject *object) { @@ -172,7 +183,7 @@ gl_object_editor_finalize (GObject *object) g_signal_handlers_disconnect_by_func (G_OBJECT(editor->priv->label), label_changed_cb, editor); - g_object_unref (editor->priv->gui); + g_object_unref (editor->priv->builder); g_free (editor->priv); G_OBJECT_CLASS (gl_object_editor_parent_class)->finalize (object); @@ -180,6 +191,7 @@ gl_object_editor_finalize (GObject *object) gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* NEW object editor. */ /*****************************************************************************/ @@ -225,6 +237,7 @@ gl_object_editor_new (gchar *image, return GTK_WIDGET(editor); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct notebook. */ /*--------------------------------------------------------------------------*/ @@ -335,6 +348,7 @@ gl_object_notebook_construct_valist (glObjectEditor *editor, gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Widget changed callback. Emit our "changed" signal. */ /*--------------------------------------------------------------------------*/ @@ -351,6 +365,7 @@ gl_object_editor_changed_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Widget size changed callback. Emit our "size-changed" signal. */ /*--------------------------------------------------------------------------*/ @@ -367,6 +382,7 @@ gl_object_editor_size_changed_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*****************************************************************************/ /* Set possible key names from merge object. */ /*****************************************************************************/ @@ -588,6 +604,7 @@ prefs_changed_cb (glObjectEditor *editor) gl_debug (DEBUG_EDITOR, "END"); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. label "changed" callback. */ /*---------------------------------------------------------------------------*/ @@ -616,3 +633,13 @@ label_changed_cb (glLabel *label, gl_debug (DEBUG_EDITOR, "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/prefs-dialog.c b/glabels2/src/prefs-dialog.c index e5f79d3d..4b685467 100644 --- a/glabels2/src/prefs-dialog.c +++ b/glabels2/src/prefs-dialog.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-dialog.c: Preferences dialog module + * prefs-dialog.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 "prefs-dialog.h" @@ -40,6 +37,7 @@ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ @@ -47,13 +45,14 @@ #define US_LETTER_ID "US-Letter" #define A4_ID "A4" + /*========================================================*/ /* Private types. */ /*========================================================*/ struct _glPrefsDialogPrivate { - GtkBuilder *gui; + GtkBuilder *builder; /* Units properties */ GtkWidget *units_points_radio; @@ -89,6 +88,7 @@ struct _glPrefsDialogPrivate gboolean stop_signals; }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -117,12 +117,13 @@ static void update_object_page_from_prefs (glPrefsDialog *dialog); static void update_prefs_from_locale_page (glPrefsDialog *dialog); static void update_prefs_from_object_page (glPrefsDialog *dialog); - + /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glPrefsDialog, gl_prefs_dialog, GTK_TYPE_DIALOG); + static void gl_prefs_dialog_class_init (glPrefsDialogClass *class) { @@ -135,19 +136,24 @@ gl_prefs_dialog_class_init (glPrefsDialogClass *class) object_class->finalize = gl_prefs_dialog_finalize; } + static void gl_prefs_dialog_init (glPrefsDialog *dialog) { + static gchar *object_ids[] = { "prefs_notebook", + "adjustment1", "adjustment2", "adjustment3", + NULL }; GError *error = NULL; gl_debug (DEBUG_PREFS, "START"); dialog->priv = g_new0 (glPrefsDialogPrivate, 1); - dialog->priv->gui = gtk_builder_new (); - gtk_builder_add_from_file (dialog->priv->gui, - GLABELS_BUILDER_DIR "prefs-dialog.builder", - &error); + dialog->priv->builder = gtk_builder_new (); + gtk_builder_add_objects_from_file (dialog->priv->builder, + GLABELS_BUILDER_DIR "prefs-dialog.builder", + object_ids, + &error); if (error) { g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); g_error_free (error); @@ -170,6 +176,7 @@ gl_prefs_dialog_init (glPrefsDialog *dialog) gl_debug (DEBUG_PREFS, "END"); } + static void gl_prefs_dialog_finalize (GObject *object) { @@ -181,9 +188,9 @@ gl_prefs_dialog_finalize (GObject *object) g_return_if_fail (GL_IS_PREFS_DIALOG (dialog)); g_return_if_fail (dialog->priv != NULL); - if (dialog->priv->gui) + if (dialog->priv->builder) { - g_object_unref (G_OBJECT (dialog->priv->gui)); + g_object_unref (G_OBJECT (dialog->priv->builder)); } g_free (dialog->priv); @@ -192,6 +199,7 @@ gl_prefs_dialog_finalize (GObject *object) gl_debug (DEBUG_PREFS, "END"); } + /*****************************************************************************/ /* NEW preferences dialog. */ /*****************************************************************************/ @@ -216,6 +224,7 @@ gl_prefs_dialog_new (GtkWindow *parent) return dialog; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Construct composite widget. */ /*---------------------------------------------------------------------------*/ @@ -227,7 +236,7 @@ gl_prefs_dialog_construct (glPrefsDialog *dialog) g_return_if_fail (GL_IS_PREFS_DIALOG (dialog)); g_return_if_fail (dialog->priv != NULL); - gl_util_get_builder_widgets (dialog->priv->gui, + gl_util_get_builder_widgets (dialog->priv->builder, "prefs_notebook", ¬ebook, NULL); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook, FALSE, FALSE, 0); @@ -241,6 +250,7 @@ gl_prefs_dialog_construct (glPrefsDialog *dialog) gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); } + /*---------------------------------------------------------------------------*/ /* PRIVATE. "Response" callback. */ /*---------------------------------------------------------------------------*/ @@ -268,6 +278,7 @@ response_cb (glPrefsDialog *dialog, gl_debug (DEBUG_VIEW, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Build Locale Properties Notebook Tab */ /*--------------------------------------------------------------------------*/ @@ -275,7 +286,7 @@ static void construct_locale_page (glPrefsDialog *dialog) { - gl_util_get_builder_widgets (dialog->priv->gui, + gl_util_get_builder_widgets (dialog->priv->builder, "units_points_radio", &dialog->priv->units_points_radio, "units_inches_radio", &dialog->priv->units_inches_radio, "units_mm_radio", &dialog->priv->units_mm_radio, @@ -300,6 +311,7 @@ construct_locale_page (glPrefsDialog *dialog) "toggled", G_CALLBACK(update_prefs_from_locale_page), G_OBJECT(dialog)); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Build Default Object Properties Notebook Tab */ /*--------------------------------------------------------------------------*/ @@ -308,7 +320,7 @@ construct_object_page (glPrefsDialog *dialog) { GList *family_names; - gl_util_get_builder_widgets (dialog->priv->gui, + gl_util_get_builder_widgets (dialog->priv->builder, "text_family_combo", &dialog->priv->text_family_combo, "text_size_spin", &dialog->priv->text_size_spin, "text_bold_toggle", &dialog->priv->text_bold_toggle, @@ -494,6 +506,7 @@ update_locale_page_from_prefs (glPrefsDialog *dialog) dialog->priv->stop_signals = FALSE; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Update object page widgets from current prefs. */ /*--------------------------------------------------------------------------*/ @@ -565,6 +578,7 @@ update_object_page_from_prefs (glPrefsDialog *dialog) dialog->priv->stop_signals = FALSE; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Update prefs from current state of locale page widgets. */ /*--------------------------------------------------------------------------*/ @@ -605,6 +619,7 @@ update_prefs_from_locale_page (glPrefsDialog *dialog) gl_prefs_model_save_settings (gl_prefs); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Update prefs from current state of object page widgets. */ /*--------------------------------------------------------------------------*/ @@ -690,4 +705,12 @@ update_prefs_from_object_page (glPrefsDialog *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/print-op.c b/glabels2/src/print-op.c index 8414d872..3e98490c 100644 --- a/glabels2/src/print-op.c +++ b/glabels2/src/print-op.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-op.c: Print operation module + * print-op.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-op.h" @@ -41,6 +38,7 @@ #include "debug.h" + /*===========================================*/ /* Private data types */ /*===========================================*/ @@ -49,7 +47,7 @@ struct _glPrintOpPrivate { glLabel *label; - GtkBuilder *gui; + GtkBuilder *builder; GtkWidget *simple_frame; GtkWidget *copies_vbox; @@ -103,6 +101,7 @@ struct _glPrintOpSettings /* Private globals */ /*===========================================*/ + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -143,13 +142,12 @@ static void draw_page_cb (GtkPrintOperation *operation, gpointer user_data); - - /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glPrintOp, gl_print_op, GTK_TYPE_PRINT_OPERATION); + static void gl_print_op_class_init (glPrintOpClass *class) { @@ -162,6 +160,7 @@ gl_print_op_class_init (glPrintOpClass *class) object_class->finalize = gl_print_op_finalize; } + static void gl_print_op_init (glPrintOp *op) { @@ -175,10 +174,11 @@ gl_print_op_init (glPrintOp *op) } + static void gl_print_op_finalize (GObject *object) { - glPrintOp* op = GL_PRINT_OP (object); + glPrintOp *op = GL_PRINT_OP (object); gl_debug (DEBUG_PRINT, ""); @@ -189,8 +189,8 @@ gl_print_op_finalize (GObject *object) if (op->priv->label) { g_object_unref (G_OBJECT(op->priv->label)); } - if (op->priv->gui) { - g_object_unref (G_OBJECT(op->priv->gui)); + if (op->priv->builder) { + g_object_unref (G_OBJECT(op->priv->builder)); } g_free (op->priv->filename); g_free (op->priv); @@ -200,6 +200,7 @@ gl_print_op_finalize (GObject *object) g_free (op->priv); } + /*****************************************************************************/ /* NEW print op. */ /*****************************************************************************/ @@ -217,6 +218,7 @@ gl_print_op_new (glLabel *label) return op; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct op. */ /*--------------------------------------------------------------------------*/ @@ -254,6 +256,7 @@ gl_print_op_construct (glPrintOp *op, G_CALLBACK (draw_page_cb), label); } + /*****************************************************************************/ /* NEW batch print operation. */ /*****************************************************************************/ @@ -286,6 +289,7 @@ gl_print_op_new_batch (glLabel *label, return op; } + /*****************************************************************************/ /* Get print operation settings. */ /*****************************************************************************/ @@ -315,6 +319,7 @@ gl_print_op_get_settings (glPrintOp *print_op) return settings; } + /*****************************************************************************/ /* Set print operation settings. */ /*****************************************************************************/ @@ -339,7 +344,8 @@ gl_print_op_set_settings (glPrintOp *print_op, print_op->priv->n_copies = settings->n_copies; } - } +} + /*****************************************************************************/ /* Free print operation settings structure. */ @@ -359,6 +365,7 @@ gl_print_op_free_settings(glPrintOpSettings *settings) } } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct op. */ /*--------------------------------------------------------------------------*/ @@ -421,6 +428,7 @@ gl_print_op_construct_batch (glPrintOp *op, G_CALLBACK (draw_page_cb), label); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Set page size. */ /*--------------------------------------------------------------------------*/ @@ -474,6 +482,7 @@ set_page_size (glPrintOp *op, gl_debug (DEBUG_PRINT, "end"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. "Create custom widget" callback */ /*--------------------------------------------------------------------------*/ @@ -481,24 +490,26 @@ static GObject * create_custom_widget_cb (GtkPrintOperation *operation, gpointer user_data) { - GtkBuilder *gui; + GtkBuilder *builder; + static gchar *object_ids[] = { "print_custom_widget_vbox", NULL }; GError *error = NULL; glPrintOp *op = GL_PRINT_OP (operation); glLabel *label = GL_LABEL (user_data); GtkWidget *vbox; glMerge *merge = NULL; - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "print-custom-widget.builder", - &error); + builder = gtk_builder_new (); + gtk_builder_add_objects_from_file (builder, + GLABELS_BUILDER_DIR "print-custom-widget.builder", + object_ids, + &error); if (error) { g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); g_error_free (error); return; } - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (builder, "print_custom_widget_vbox", &vbox, "simple_frame", &op->priv->simple_frame, "copies_vbox", &op->priv->copies_vbox, @@ -520,7 +531,7 @@ create_custom_widget_cb (GtkPrintOperation *operation, op->priv->prmerge, FALSE, FALSE, 0); - op->priv->gui = gui; + op->priv->builder = builder; /* ---- Activate either simple or merge print control widgets. ---- */ @@ -571,6 +582,7 @@ create_custom_widget_cb (GtkPrintOperation *operation, return G_OBJECT (vbox); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. "Custom widget apply" callback */ /*--------------------------------------------------------------------------*/ @@ -618,6 +630,7 @@ custom_widget_apply_cb (GtkPrintOperation *operation, } + /*--------------------------------------------------------------------------*/ /* PRIVATE. "Begin print" callback */ /*--------------------------------------------------------------------------*/ @@ -632,6 +645,7 @@ begin_print_cb (GtkPrintOperation *operation, } + /*--------------------------------------------------------------------------*/ /* PRIVATE. "Draw page" callback. */ /*--------------------------------------------------------------------------*/ @@ -698,3 +712,12 @@ gl_print_op_force_outline_flag (glPrintOp *op) } + +/* + * 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 a580db3c..5c6b3bbb 100644 --- a/glabels2/src/template-designer.c +++ b/glabels2/src/template-designer.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 - * - * template-designer.c: Template designer module + * template-designer.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 "template-designer.h" @@ -43,6 +40,7 @@ #include "debug.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ @@ -71,23 +69,14 @@ #define DELTA 0.01 #define MAX_PAGE_DIM_POINTS 5000.0 + /*========================================================*/ /* Private types. */ /*========================================================*/ struct _glTemplateDesignerPrivate { - - GtkBuilder *start_page_gui; - GtkBuilder *name_page_gui; - GtkBuilder *pg_size_page_gui; - GtkBuilder *shape_page_gui; - GtkBuilder *rect_size_page_gui; - GtkBuilder *round_size_page_gui; - GtkBuilder *cd_size_page_gui; - GtkBuilder *nlayouts_page_gui; - GtkBuilder *layout_page_gui; - GtkBuilder *finish_page_gui; + GtkBuilder *builder; /* Assistant pages */ GtkWidget *start_page; @@ -211,6 +200,7 @@ enum { FINISH_PAGE_NUM }; + /*========================================================*/ /* Private globals. */ /*========================================================*/ @@ -280,12 +270,13 @@ static void print_test_cb (glTemplateDesigner *dial static lglTemplate *build_template (glTemplateDesigner *dialog); - + /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ G_DEFINE_TYPE (glTemplateDesigner, gl_template_designer, GTK_TYPE_ASSISTANT); + static void gl_template_designer_class_init (glTemplateDesignerClass *class) { @@ -296,18 +287,55 @@ gl_template_designer_class_init (glTemplateDesignerClass *class) object_class->finalize = gl_template_designer_finalize; } + static void gl_template_designer_init (glTemplateDesigner *dialog) { + GtkBuilder *gui; + static gchar *object_ids[] = { "start_page", + "name_page", + "pg_size_page", + "shape_page", + "rect_size_page", + "round_size_page", + "cd_size_page", + "nlayouts_page", + "layout_page", + "finish_page", + "adjustment1", "adjustment2", "adjustment3", + "adjustment4", "adjustment5", "adjustment6", + "adjustment7", "adjustment8", "adjustment9", + "adjustment10", "adjustment11", "adjustment12", + "adjustment13", "adjustment14", "adjustment15", + "adjustment16", "adjustment17", "adjustment18", + "adjustment19", "adjustment20", "adjustment21", + "adjustment22", "adjustment23", "adjustment24", + "adjustment25", "adjustment26", "adjustment27", + "adjustment28", "adjustment29", "adjustment30", + NULL }; + GError *error = NULL; + gl_debug (DEBUG_TEMPLATE, "START"); dialog->priv = g_new0 (glTemplateDesignerPrivate, 1); + dialog->priv->builder = gtk_builder_new (); + gtk_builder_add_objects_from_file (dialog->priv->builder, + GLABELS_BUILDER_DIR "template-designer.builder", + object_ids, + &error); + if (error) { + g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); + g_error_free (error); + return; + } + gl_debug (DEBUG_TEMPLATE, "END"); return; } + static void gl_template_designer_finalize (GObject *object) { @@ -319,45 +347,9 @@ gl_template_designer_finalize (GObject *object) g_return_if_fail (GL_IS_TEMPLATE_DESIGNER (dialog)); g_return_if_fail (dialog->priv != NULL); - if (dialog->priv->start_page_gui) - { - g_object_unref (dialog->priv->start_page_gui); - } - if (dialog->priv->name_page_gui) - { - g_object_unref (dialog->priv->name_page_gui); - } - if (dialog->priv->pg_size_page_gui) - { - g_object_unref (dialog->priv->pg_size_page_gui); - } - if (dialog->priv->shape_page_gui) - { - g_object_unref (dialog->priv->shape_page_gui); - } - if (dialog->priv->rect_size_page_gui) - { - g_object_unref (dialog->priv->rect_size_page_gui); - } - if (dialog->priv->round_size_page_gui) - { - g_object_unref (dialog->priv->round_size_page_gui); - } - if (dialog->priv->cd_size_page_gui) - { - g_object_unref (dialog->priv->cd_size_page_gui); - } - if (dialog->priv->nlayouts_page_gui) - { - g_object_unref (dialog->priv->nlayouts_page_gui); - } - if (dialog->priv->layout_page_gui) - { - g_object_unref (dialog->priv->layout_page_gui); - } - if (dialog->priv->finish_page_gui) + if (dialog->priv->builder) { - g_object_unref (dialog->priv->finish_page_gui); + g_object_unref (dialog->priv->builder); } g_free (dialog->priv); @@ -366,6 +358,7 @@ gl_template_designer_finalize (GObject *object) gl_debug (DEBUG_TEMPLATE, "END"); } + /*****************************************************************************/ /* NEW preferences dialog. */ /*****************************************************************************/ @@ -389,6 +382,7 @@ gl_template_designer_new (GtkWindow *parent) return dialog; } + /*---------------------------------------------------------------------------*/ /* PRIVATE. Construct composite widget. */ /*---------------------------------------------------------------------------*/ @@ -444,6 +438,7 @@ gl_template_designer_construct (glTemplateDesigner *dialog) gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct start page. */ /*--------------------------------------------------------------------------*/ @@ -451,28 +446,12 @@ static void construct_start_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; - gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-start-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "start_page", &dialog->priv->start_page, NULL); - dialog->priv->start_page_gui = gui; - - gtk_assistant_append_page (GTK_ASSISTANT (dialog), dialog->priv->start_page); @@ -492,6 +471,7 @@ construct_start_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct name page. */ /*--------------------------------------------------------------------------*/ @@ -499,22 +479,9 @@ static void construct_name_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; - gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-name-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "name_page", &dialog->priv->name_page, "brand_entry", &dialog->priv->brand_entry, "part_num_entry", &dialog->priv->part_num_entry, @@ -523,8 +490,6 @@ construct_name_page (glTemplateDesigner *dialog, "description_entry", &dialog->priv->description_entry, NULL); - dialog->priv->name_page_gui = gui; - gtk_assistant_append_page (GTK_ASSISTANT (dialog), dialog->priv->name_page); @@ -548,6 +513,7 @@ construct_name_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct page size page. */ /*--------------------------------------------------------------------------*/ @@ -555,25 +521,13 @@ static void construct_pg_size_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; GList *page_sizes; const gchar *default_page_size_id; gchar *default_page_size_name; gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-pg-size-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "pg_size_page", &dialog->priv->pg_size_page, "pg_size_combo", &dialog->priv->pg_size_combo, "pg_w_spin", &dialog->priv->pg_w_spin, @@ -582,8 +536,6 @@ construct_pg_size_page (glTemplateDesigner *dialog, "pg_h_units_label", &dialog->priv->pg_h_units_label, NULL); - dialog->priv->pg_size_page_gui = gui; - gl_util_combo_box_add_text_model (GTK_COMBO_BOX (dialog->priv->pg_size_combo)); @@ -635,6 +587,7 @@ construct_pg_size_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct shape page. */ /*--------------------------------------------------------------------------*/ @@ -642,30 +595,15 @@ static void construct_shape_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; - gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-shape-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "shape_page", &dialog->priv->shape_page, "shape_rect_radio", &dialog->priv->shape_rect_radio, "shape_round_radio", &dialog->priv->shape_round_radio, "shape_cd_radio", &dialog->priv->shape_cd_radio, NULL); - dialog->priv->shape_page_gui = gui; - gtk_assistant_append_page (GTK_ASSISTANT (dialog), dialog->priv->shape_page); @@ -683,6 +621,7 @@ construct_shape_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct rect size page. */ /*--------------------------------------------------------------------------*/ @@ -690,24 +629,11 @@ static void construct_rect_size_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; GdkPixbuf *pixbuf; gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-rect-size-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "rect_size_page", &dialog->priv->rect_size_page, "rect_image", &dialog->priv->rect_image, "rect_w_spin", &dialog->priv->rect_w_spin, @@ -724,8 +650,6 @@ construct_rect_size_page (glTemplateDesigner *dialog, "rect_margin_units_label", &dialog->priv->rect_margin_units_label, NULL); - dialog->priv->rect_size_page_gui = gui; - gtk_assistant_append_page (GTK_ASSISTANT (dialog), dialog->priv->rect_size_page); @@ -799,6 +723,7 @@ construct_rect_size_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct round size page. */ /*--------------------------------------------------------------------------*/ @@ -806,23 +731,11 @@ static void construct_round_size_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; GdkPixbuf *pixbuf; gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-round-size-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "round_size_page", &dialog->priv->round_size_page, "round_image", &dialog->priv->round_image, "round_r_spin", &dialog->priv->round_r_spin, @@ -833,8 +746,6 @@ construct_round_size_page (glTemplateDesigner *dialog, "round_margin_units_label", &dialog->priv->round_margin_units_label, NULL); - dialog->priv->round_size_page_gui = gui; - gtk_assistant_append_page (GTK_ASSISTANT (dialog), dialog->priv->round_size_page); @@ -884,6 +795,7 @@ construct_round_size_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct CD/DVD size page. */ /*--------------------------------------------------------------------------*/ @@ -891,23 +803,11 @@ static void construct_cd_size_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; GdkPixbuf *pixbuf; gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-cd-size-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "cd_size_page", &dialog->priv->cd_size_page, "cd_image", &dialog->priv->cd_image, "cd_radius_spin", &dialog->priv->cd_radius_spin, @@ -924,8 +824,6 @@ construct_cd_size_page (glTemplateDesigner *dialog, "cd_margin_units_label", &dialog->priv->cd_margin_units_label, NULL); - dialog->priv->cd_size_page_gui = gui; - gtk_assistant_append_page (GTK_ASSISTANT (dialog), dialog->priv->cd_size_page); @@ -995,6 +893,7 @@ construct_cd_size_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct number of layouts page. */ /*--------------------------------------------------------------------------*/ @@ -1002,31 +901,17 @@ static void construct_nlayouts_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; GdkPixbuf *pixbuf; gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-nlayouts-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "nlayouts_page", &dialog->priv->nlayouts_page, "nlayouts_image1", &dialog->priv->nlayouts_image1, "nlayouts_image2", &dialog->priv->nlayouts_image2, "nlayouts_spin", &dialog->priv->nlayouts_spin, NULL); - dialog->priv->nlayouts_page_gui = gui; - gtk_assistant_append_page (GTK_ASSISTANT (dialog), dialog->priv->nlayouts_page); @@ -1041,6 +926,10 @@ construct_nlayouts_page (glTemplateDesigner *dialog, dialog->priv->nlayouts_page, TRUE); + gtk_spin_button_set_range (GTK_SPIN_BUTTON (dialog->priv->nlayouts_spin), + 1, 2); + + /* Initialize illustrations. */ pixbuf = gdk_pixbuf_new_from_file (EX_NLAYOUTS_IMAGE1, NULL); gtk_image_set_from_pixbuf (GTK_IMAGE(dialog->priv->nlayouts_image1), pixbuf); @@ -1050,6 +939,7 @@ construct_nlayouts_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct layout page. */ /*--------------------------------------------------------------------------*/ @@ -1057,22 +947,9 @@ static void construct_layout_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; - gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-layout-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "layout_page", &dialog->priv->layout_page, "layout1_head_label", &dialog->priv->layout1_head_label, "layout1_nx_spin", &dialog->priv->layout1_nx_spin, @@ -1096,8 +973,6 @@ construct_layout_page (glTemplateDesigner *dialog, "layout_test_button", &dialog->priv->layout_test_button, NULL); - dialog->priv->layout_page_gui = gui; - dialog->priv->layout_mini_preview = gl_wdgt_mini_preview_new (175, 200); gtk_container_add (GTK_CONTAINER (dialog->priv->mini_preview_vbox), dialog->priv->layout_mini_preview); @@ -1192,6 +1067,7 @@ construct_layout_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct finish page. */ /*--------------------------------------------------------------------------*/ @@ -1199,27 +1075,12 @@ static void construct_finish_page (glTemplateDesigner *dialog, GdkPixbuf *logo) { - GtkBuilder *gui; - GError *error = NULL; - gl_debug (DEBUG_TEMPLATE, "START"); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "template-designer-finish-page.builder", - &error); - if (error) { - g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); - g_error_free (error); - return; - } - - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (dialog->priv->builder, "finish_page", &dialog->priv->finish_page, NULL); - dialog->priv->finish_page_gui = gui; - gtk_assistant_append_page (GTK_ASSISTANT (dialog), dialog->priv->finish_page); @@ -1240,6 +1101,7 @@ construct_finish_page (glTemplateDesigner *dialog, gl_debug (DEBUG_TEMPLATE, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. cancel callback. */ /*--------------------------------------------------------------------------*/ @@ -1251,6 +1113,7 @@ cancel_cb (glTemplateDesigner *dialog) } + /*--------------------------------------------------------------------------*/ /* PRIVATE. apply callback */ /*--------------------------------------------------------------------------*/ @@ -1266,6 +1129,7 @@ apply_cb (glTemplateDesigner *dialog) gl_mini_preview_pixbuf_cache_add_by_name (name); g_free (name); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. close callback */ @@ -1277,6 +1141,7 @@ close_cb (glTemplateDesigner *dialog) gtk_widget_destroy (GTK_WIDGET(dialog)); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. prepare page callback */ @@ -1323,6 +1188,7 @@ prepare_cb (glTemplateDesigner *dialog, } } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Handle non-linear forward traversal. */ /*--------------------------------------------------------------------------*/ @@ -1374,6 +1240,7 @@ forward_page_function (gint current_page, return -1; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Widget on name page "changed" callback. */ /*--------------------------------------------------------------------------*/ @@ -1422,6 +1289,7 @@ name_page_changed_cb (glTemplateDesigner *dialog) g_free (desc); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Widget on page size page "changed" callback. */ /*--------------------------------------------------------------------------*/ @@ -1469,6 +1337,7 @@ pg_size_page_changed_cb (glTemplateDesigner *dialog) } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Prepare rectangular size page. */ /*--------------------------------------------------------------------------*/ @@ -1511,6 +1380,7 @@ rect_size_page_prepare_cb (glTemplateDesigner *dialog) } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Prepare round size page. */ /*--------------------------------------------------------------------------*/ @@ -1541,6 +1411,7 @@ round_size_page_prepare_cb (glTemplateDesigner *dialog) } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Prepare cd/dvd size page. */ /*--------------------------------------------------------------------------*/ @@ -1583,6 +1454,7 @@ cd_size_page_prepare_cb (glTemplateDesigner *dialog) } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Prepare Layout page cb. */ /*--------------------------------------------------------------------------*/ @@ -1710,6 +1582,7 @@ layout_page_prepare_cb (glTemplateDesigner *dialog) dialog->priv->stop_signals = FALSE; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Layout page widget changed cb. */ /*--------------------------------------------------------------------------*/ @@ -1731,6 +1604,7 @@ layout_page_changed_cb (glTemplateDesigner *dialog) dialog->priv->stop_signals = FALSE; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Print test sheet callback. */ /*--------------------------------------------------------------------------*/ @@ -1757,6 +1631,7 @@ print_test_cb (glTemplateDesigner *dialog) g_object_unref (G_OBJECT(label)); } + /*--------------------------------------------------------------------------*/ /* Build a template based on current assistant settings. */ /*--------------------------------------------------------------------------*/ @@ -1883,3 +1758,13 @@ build_template (glTemplateDesigner *dialog) return template; } + + +/* + * 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 79c4190d..2a5f48a6 100644 --- a/glabels2/src/ui-property-bar.c +++ b/glabels2/src/ui-property-bar.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 - * - * property-bar.c: gLabels property bar +/* + * ui-property-bar.c + * 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 . */ #include @@ -56,7 +52,7 @@ struct _glUIPropertyBarPrivate { glView *view; - GtkBuilder *gui; + GtkBuilder *builder; GtkWidget *tool_bar; @@ -151,7 +147,6 @@ static void set_line_width_items_sensitive (glUIPropertyBar *this, gboolean state); - /****************************************************************************/ /* Boilerplate Object stuff. */ /****************************************************************************/ @@ -198,9 +193,9 @@ gl_ui_property_bar_finalize (GObject *object) { g_object_unref (G_OBJECT(this->priv->view)); } - if (this->priv->gui) + if (this->priv->builder) { - g_object_unref (G_OBJECT(this->priv->gui)); + g_object_unref (G_OBJECT(this->priv->builder)); } g_free (this->priv); @@ -236,27 +231,31 @@ gl_ui_property_bar_new (void) static void gl_ui_property_bar_construct (glUIPropertyBar *this) { - GtkBuilder *gui; - GError *error = NULL; - GList *family_names = NULL; - GList *family_node; - GdkPixbuf *pixbuf = NULL; + GtkBuilder *builder; + static gchar *object_ids[] = { "property_toolbar", + "adjustment1", "adjustment2", + NULL }; + GError *error = NULL; + GList *family_names = NULL; + GList *family_node; + GdkPixbuf *pixbuf = NULL; gl_debug (DEBUG_PROPERTY_BAR, "START"); this->priv->stop_signals = TRUE; - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "property-bar.builder", - &error); + builder = gtk_builder_new (); + gtk_builder_add_objects_from_file (builder, + GLABELS_BUILDER_DIR "property-bar.builder", + object_ids, + &error); if (error) { g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); g_error_free (error); return; } - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (builder, "property_toolbar", &this->priv->tool_bar, "font_family_combo", &this->priv->font_family_combo, "font_size_spin", &this->priv->font_size_spin, @@ -310,7 +309,7 @@ gl_ui_property_bar_construct (glUIPropertyBar *this) this->priv->line_color_combo); /* Save reference to gui tree so we don't lose tooltips */ - this->priv->gui = gui; + this->priv->builder = builder; set_doc_items_sensitive (this, FALSE); @@ -1272,3 +1271,12 @@ set_line_width_items_sensitive (glUIPropertyBar *this, } + +/* + * 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 ab83e799..4213a9b9 100644 --- a/glabels2/src/wdgt-media-select.c +++ b/glabels2/src/wdgt-media-select.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_media_select.c: media selection widget module + * wdgt-media-select.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 @@ -62,7 +58,7 @@ enum { struct _glWdgtMediaSelectPrivate { - GtkBuilder *gui; + GtkBuilder *builder; GtkWidget *notebook; guint current_page_num; @@ -91,12 +87,14 @@ enum { typedef void (*glWdgtMediaSelectSignal) (GObject * object, gpointer data); + /*===========================================*/ /* Private globals */ /*===========================================*/ static gint wdgt_media_select_signals[LAST_SIGNAL] = { 0 }; + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -122,7 +120,8 @@ static void load_recent_list (GtkListStore *store, static void load_search_all_list (GtkListStore *store, GtkTreeSelection *selection, GList *list); - + + /****************************************************************************/ /* Boilerplate Object stuff. */ /****************************************************************************/ @@ -152,6 +151,7 @@ gl_wdgt_media_select_class_init (glWdgtMediaSelectClass *class) gl_debug (DEBUG_MEDIA_SELECT, "END"); } + static void gl_wdgt_media_select_init (glWdgtMediaSelect *media_select) { @@ -162,6 +162,7 @@ gl_wdgt_media_select_init (glWdgtMediaSelect *media_select) gl_debug (DEBUG_MEDIA_SELECT, "END"); } + static void gl_wdgt_media_select_finalize (GObject *object) { @@ -172,9 +173,9 @@ gl_wdgt_media_select_finalize (GObject *object) g_return_if_fail (object != NULL); g_return_if_fail (GL_IS_WDGT_MEDIA_SELECT (object)); - if (media_select->priv->gui) + if (media_select->priv->builder) { - g_object_unref (media_select->priv->gui); + g_object_unref (media_select->priv->builder); } g_object_unref (media_select->priv->recent_store); g_object_unref (media_select->priv->search_all_store); @@ -185,6 +186,7 @@ gl_wdgt_media_select_finalize (GObject *object) gl_debug (DEBUG_MEDIA_SELECT, "END"); } + GtkWidget * gl_wdgt_media_select_new (void) { @@ -201,13 +203,15 @@ gl_wdgt_media_select_new (void) return GTK_WIDGET (media_select); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Construct composite widget. */ /*--------------------------------------------------------------------------*/ static void gl_wdgt_media_select_construct (glWdgtMediaSelect *media_select) { - GtkBuilder *gui; + GtkBuilder *builder; + static gchar *object_ids[] = { "wdgt_media_select_hbox", NULL }; GError *error = NULL; GtkWidget *hbox; GList *brands = NULL; @@ -226,17 +230,18 @@ gl_wdgt_media_select_construct (glWdgtMediaSelect *media_select) g_return_if_fail (GL_IS_WDGT_MEDIA_SELECT (media_select)); g_return_if_fail (media_select->priv != NULL); - gui = gtk_builder_new (); - gtk_builder_add_from_file (gui, - GLABELS_BUILDER_DIR "wdgt-media-select.builder", - &error); + builder = gtk_builder_new (); + gtk_builder_add_objects_from_file (builder, + GLABELS_BUILDER_DIR "wdgt-media-select.builder", + object_ids, + &error); if (error) { g_critical ("%s\n\ngLabels may not be installed correctly!", error->message); g_error_free (error); return; } - gl_util_get_builder_widgets (gui, + gl_util_get_builder_widgets (builder, "wdgt_media_select_hbox", &hbox, "notebook", &media_select->priv->notebook, @@ -251,7 +256,7 @@ gl_wdgt_media_select_construct (glWdgtMediaSelect *media_select) NULL); gtk_container_add (GTK_CONTAINER (media_select), hbox); - media_select->priv->gui = gui; + media_select->priv->builder = builder; media_select->priv->recent_page_num = gtk_notebook_page_num (GTK_NOTEBOOK (media_select->priv->notebook), @@ -371,6 +376,7 @@ gl_wdgt_media_select_construct (glWdgtMediaSelect *media_select) gl_debug (DEBUG_MEDIA_SELECT, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. modify widget due to change in selection */ /*--------------------------------------------------------------------------*/ @@ -431,6 +437,7 @@ filter_changed_cb (GtkComboBox *combo, gl_debug (DEBUG_MEDIA_SELECT, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. modify widget due to change in selection */ /*--------------------------------------------------------------------------*/ @@ -451,6 +458,7 @@ selection_changed_cb (GtkTreeSelection *selection, gl_debug (DEBUG_MEDIA_SELECT, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. modify widget due to change in selection */ /*--------------------------------------------------------------------------*/ @@ -478,6 +486,7 @@ page_changed_cb (GtkNotebook *notebook, gl_debug (DEBUG_MEDIA_SELECT, "END"); } + /****************************************************************************/ /* query selected label template name. */ /****************************************************************************/ @@ -521,6 +530,7 @@ gl_wdgt_media_select_get_name (glWdgtMediaSelect *media_select) return name; } + /****************************************************************************/ /* set selected label template name. */ /****************************************************************************/ @@ -563,6 +573,7 @@ gl_wdgt_media_select_set_name (glWdgtMediaSelect *media_select, gl_debug (DEBUG_MEDIA_SELECT, "END"); } + /****************************************************************************/ /* query current filter parameters. */ /****************************************************************************/ @@ -592,6 +603,7 @@ gl_wdgt_media_select_get_filter_parameters (glWdgtMediaSelect *media_select, g_free (category_name); } + /****************************************************************************/ /* set filter parameters. */ /****************************************************************************/ @@ -628,6 +640,7 @@ gl_wdgt_media_select_set_filter_parameters (glWdgtMediaSelect *media_select, gl_debug (DEBUG_MEDIA_SELECT, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Get a description of the layout and number of labels. */ /*--------------------------------------------------------------------------*/ @@ -647,6 +660,7 @@ get_layout_desc (const lglTemplate *template) return string; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Get label size description. */ /*--------------------------------------------------------------------------*/ @@ -718,6 +732,7 @@ get_label_size_desc (const lglTemplate *template) return string; } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Load list store from template name list. */ /*--------------------------------------------------------------------------*/ @@ -798,6 +813,7 @@ load_recent_list (GtkListStore *store, gl_debug (DEBUG_MEDIA_SELECT, "END"); } + /*--------------------------------------------------------------------------*/ /* PRIVATE. Load list store from template name list. */ /*--------------------------------------------------------------------------*/ @@ -878,3 +894,13 @@ load_search_all_list (GtkListStore *store, gl_debug (DEBUG_MEDIA_SELECT, "END"); } + + +/* + * 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