From: Jim Evins Date: Wed, 17 Jan 2007 05:07:34 +0000 (+0000) Subject: 2007-01-17 Jim Evins X-Git-Tag: glabels-2_3_0~365 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=151648533ca01ebdc95b8c28bb261ab8f4cdce50;p=glabels 2007-01-17 Jim Evins * src/Makefile.am: * src/hig.c: Deleted hig.c. * src/hig.h: * src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type), (gl_wdgt_print_copies_construct): * src/wdgt-print-copies.h: * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type), (gl_wdgt_print_merge_construct): * src/wdgt-print-merge.h: Removed all remaining HIG wrapper widgets. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@607 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 2b94897e..1194dcf2 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,17 @@ +2007-01-17 Jim Evins + + * src/Makefile.am: + * src/hig.c: + Deleted hig.c. + * src/hig.h: + * src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type), + (gl_wdgt_print_copies_construct): + * src/wdgt-print-copies.h: + * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type), + (gl_wdgt_print_merge_construct): + * src/wdgt-print-merge.h: + Removed all remaining HIG wrapper widgets. + 2007-01-16 Jim Evins * src/Makefile.am: diff --git a/glabels2/src/Makefile.am b/glabels2/src/Makefile.am index f4ffa687..6c84a274 100644 --- a/glabels2/src/Makefile.am +++ b/glabels2/src/Makefile.am @@ -75,7 +75,6 @@ glabels_SOURCES = \ prefs-model.h \ prefs-dialog.c \ prefs-dialog.h \ - hig.c \ hig.h \ view.c \ view.h \ @@ -255,7 +254,6 @@ glabels_batch_SOURCES = \ wdgt-print-merge.h \ wdgt-mini-preview.c \ wdgt-mini-preview.h \ - hig.c \ hig.h \ $(BUILT_SOURCES) diff --git a/glabels2/src/hig.c b/glabels2/src/hig.c deleted file mode 100644 index 81643c63..00000000 --- a/glabels2/src/hig.c +++ /dev/null @@ -1,387 +0,0 @@ -/* - * (GLABELS) Label and Business Card Creation program for GNOME - * - * hig.c: HIG inspired dialogs and layout tools - * - * Copyright (C) 2001 Jim Evins . - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 - */ - -#include - -#include "hig.h" - -#include -#include -#include -#include -#include -#include - -/*========================================================*/ -/* Private macros and constants. */ -/*========================================================*/ -#define HIG_DIALOG_BORDER 12 -#define HIG_DIALOG_VBOX_SPACING 18 -#define HIG_DIALOG_OUTER_VBOX_SPACING 12 - -#define HIG_VBOX_OUTER_SPACING 18 -#define HIG_VBOX_OUTER_BORDER 12 - -#define HIG_VBOX_INNER_SPACING 6 - -#define HIG_HBOX_SPACING 12 - -/*===========================================*/ -/* Private globals */ -/*===========================================*/ -static GtkVBoxClass *hig_category_parent_class; -static GtkVBoxClass *hig_vbox_parent_class; -static GtkHBoxClass *hig_hbox_parent_class; - - -/*===========================================*/ -/* Local function prototypes */ -/*===========================================*/ - -static void gl_hig_category_class_init (glHigCategoryClass *class); -static void gl_hig_category_init (glHigCategory *hig_category); -static void gl_hig_category_finalize (GObject *object); - -static void gl_hig_vbox_class_init (glHigVBoxClass *class); -static void gl_hig_vbox_init (glHigVBox *hig_vbox); -static void gl_hig_vbox_finalize (GObject *object); - -static void gl_hig_hbox_class_init (glHigHBoxClass *class); -static void gl_hig_hbox_init (glHigHBox *hig_hbox); -static void gl_hig_hbox_finalize (GObject *object); - -/****************************************************************************/ -/****************************************************************************/ -/* Boilerplate Category Object stuff. */ -/****************************************************************************/ -/****************************************************************************/ -GType -gl_hig_category_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof (glHigCategoryClass), - NULL, - NULL, - (GClassInitFunc) gl_hig_category_class_init, - NULL, - NULL, - sizeof (glHigCategory), - 0, - (GInstanceInitFunc) gl_hig_category_init, - NULL - }; - - type = g_type_register_static (GTK_TYPE_VBOX, - "glHigCategory", &info, 0); - } - - return type; -} - -static void -gl_hig_category_class_init (glHigCategoryClass *class) -{ - GObjectClass *object_class = (GObjectClass *) class; - - hig_category_parent_class = g_type_class_peek_parent (class); - - object_class->finalize = gl_hig_category_finalize; -} - -static void -gl_hig_category_init (glHigCategory *hig_category) -{ - GtkWidget *hbox; - - gtk_box_set_spacing (GTK_BOX(hig_category), HIG_VBOX_INNER_SPACING); - - /* 1st row: Label */ - hig_category->label = gtk_label_new (""); - gtk_label_set_use_markup (GTK_LABEL(hig_category->label), TRUE); - gtk_misc_set_alignment (GTK_MISC(hig_category->label), 0.0, 0.0); - gtk_box_pack_start (GTK_BOX(hig_category), - hig_category->label, FALSE, FALSE, 0); - - /* 2nd row: HBOX */ - hbox = gtk_hbox_new (FALSE, HIG_VBOX_INNER_SPACING); - gtk_box_pack_start (GTK_BOX(hig_category), hbox, FALSE, FALSE, 0); - - /* 2nd row, Column 1: Indentation spacing */ - gtk_box_pack_start (GTK_BOX(hbox), - gtk_label_new (" "), FALSE, FALSE, 0); - - /* 2nd row, Column 2: User area (inner vbox) */ - hig_category->vbox = gtk_vbox_new (FALSE, HIG_VBOX_INNER_SPACING); - gtk_box_pack_start (GTK_BOX(hbox), - hig_category->vbox, TRUE, TRUE, 0); -} - -static void -gl_hig_category_finalize (GObject *object) -{ - glHigCategory *hig_category; - - g_return_if_fail (object != NULL); - g_return_if_fail (GL_IS_HIG_CATEGORY (object)); - - hig_category = GL_HIG_CATEGORY (object); - - G_OBJECT_CLASS (hig_category_parent_class)->finalize (object); -} - - -/****************************************************************************/ -/* Create a category layout container that attempts to be HIG compliant. */ -/****************************************************************************/ -GtkWidget* gl_hig_category_new (const gchar *header) -{ - GtkWidget *category; - gchar *marked_up_header; - - category = g_object_new (gl_hig_category_get_type (), NULL); - - marked_up_header = g_strdup_printf ("%s", - header); - gtk_label_set_text (GTK_LABEL(GL_HIG_CATEGORY(category)->label), - marked_up_header); - g_free (marked_up_header); - - gtk_label_set_use_markup (GTK_LABEL(GL_HIG_CATEGORY(category)->label), - TRUE); - - return category; -} - -/****************************************************************************/ -/* Add widget (from top) to category's vbox. */ -/****************************************************************************/ -void -gl_hig_category_add_widget (glHigCategory *cat, - GtkWidget *widget) -{ - gtk_box_pack_start (GTK_BOX (cat->vbox), widget, FALSE, FALSE, 0); -} - - -/****************************************************************************/ -/****************************************************************************/ -/* Boilerplate VBox Object stuff. */ -/****************************************************************************/ -/****************************************************************************/ -GType -gl_hig_vbox_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof (glHigVBoxClass), - NULL, - NULL, - (GClassInitFunc) gl_hig_vbox_class_init, - NULL, - NULL, - sizeof (glHigVBox), - 0, - (GInstanceInitFunc) gl_hig_vbox_init, - NULL - }; - - type = g_type_register_static (GTK_TYPE_VBOX, - "glHigVBox", &info, 0); - } - - return type; -} - -static void -gl_hig_vbox_class_init (glHigVBoxClass *class) -{ - GObjectClass *object_class = (GObjectClass *) class; - - hig_vbox_parent_class = g_type_class_peek_parent (class); - - object_class->finalize = gl_hig_vbox_finalize; -} - -static void -gl_hig_vbox_init (glHigVBox *hig_vbox) -{ - /* defaults to an INNER VBox */ - gtk_box_set_spacing (GTK_BOX(hig_vbox), HIG_VBOX_INNER_SPACING); - gtk_container_set_border_width (GTK_CONTAINER(hig_vbox), 0); -} - -static void -gl_hig_vbox_finalize (GObject *object) -{ - glHigVBox *hig_vbox; - - g_return_if_fail (object != NULL); - g_return_if_fail (GL_IS_HIG_VBOX (object)); - - hig_vbox = GL_HIG_VBOX (object); - - G_OBJECT_CLASS (hig_vbox_parent_class)->finalize (object); -} - - -/****************************************************************************/ -/* Create a vbox wrapper that attempts to be HIG compliant. */ -/****************************************************************************/ -GtkWidget* gl_hig_vbox_new (glHigVBoxType type) -{ - GtkWidget *hig_vbox; - - hig_vbox = g_object_new (gl_hig_vbox_get_type (), NULL); - - switch (type) { - - case GL_HIG_VBOX_OUTER: - gtk_box_set_spacing (GTK_BOX(hig_vbox), - HIG_VBOX_OUTER_SPACING); - gtk_container_set_border_width (GTK_CONTAINER(hig_vbox), - HIG_VBOX_OUTER_BORDER); - break; - - case GL_HIG_VBOX_INNER: - gtk_box_set_spacing (GTK_BOX(hig_vbox), - HIG_VBOX_INNER_SPACING); - gtk_container_set_border_width (GTK_CONTAINER(hig_vbox), 0); - - default: - break; - - } - - return hig_vbox; -} - -/****************************************************************************/ -/* Add widget (from top) to vbox. */ -/****************************************************************************/ -void -gl_hig_vbox_add_widget (glHigVBox *hig_vbox, - GtkWidget *widget) -{ - gtk_box_pack_start (GTK_BOX (hig_vbox), widget, FALSE, FALSE, 0); -} - - -/****************************************************************************/ -/****************************************************************************/ -/* Boilerplate HBox Object stuff. */ -/****************************************************************************/ -/****************************************************************************/ -GType -gl_hig_hbox_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof (glHigHBoxClass), - NULL, - NULL, - (GClassInitFunc) gl_hig_hbox_class_init, - NULL, - NULL, - sizeof (glHigHBox), - 0, - (GInstanceInitFunc) gl_hig_hbox_init, - NULL - }; - - type = g_type_register_static (GTK_TYPE_HBOX, - "glHigHBox", &info, 0); - } - - return type; -} - -static void -gl_hig_hbox_class_init (glHigHBoxClass *class) -{ - GObjectClass *object_class = (GObjectClass *) class; - - hig_hbox_parent_class = g_type_class_peek_parent (class); - - object_class->finalize = gl_hig_hbox_finalize; -} - -static void -gl_hig_hbox_init (glHigHBox *hig_hbox) -{ - gtk_box_set_spacing (GTK_BOX(hig_hbox), HIG_HBOX_SPACING); - gtk_container_set_border_width (GTK_CONTAINER(hig_hbox), 0); -} - -static void -gl_hig_hbox_finalize (GObject *object) -{ - glHigHBox *hig_hbox; - - g_return_if_fail (object != NULL); - g_return_if_fail (GL_IS_HIG_HBOX (object)); - - hig_hbox = GL_HIG_HBOX (object); - - G_OBJECT_CLASS (hig_hbox_parent_class)->finalize (object); -} - - -/****************************************************************************/ -/* Create a hbox wrapper that attempts to be HIG compliant. */ -/****************************************************************************/ -GtkWidget* gl_hig_hbox_new (void) -{ - GtkWidget *hig_hbox; - - hig_hbox = g_object_new (gl_hig_hbox_get_type (), NULL); - - return hig_hbox; -} - -/****************************************************************************/ -/* Add widget (from left) to hbox. */ -/****************************************************************************/ -void -gl_hig_hbox_add_widget (glHigHBox *hig_hbox, - GtkWidget *widget) -{ - gtk_box_pack_start (GTK_BOX (hig_hbox), widget, FALSE, FALSE, 0); -} - -/****************************************************************************/ -/* Add widget (from left) to hbox with a right justification. */ -/****************************************************************************/ -void -gl_hig_hbox_add_widget_justify (glHigHBox *hig_hbox, - GtkWidget *widget) -{ - gtk_box_pack_start (GTK_BOX (hig_hbox), widget, TRUE, TRUE, 0); -} - - diff --git a/glabels2/src/hig.h b/glabels2/src/hig.h index 8fb170ad..cb2bb4e8 100644 --- a/glabels2/src/hig.h +++ b/glabels2/src/hig.h @@ -23,126 +23,11 @@ #ifndef __HIG_H__ #define __HIG_H__ -#include -#include -#include - G_BEGIN_DECLS #define GL_HIG_PAD1 6 #define GL_HIG_PAD2 12 - -/*===========================================================================*/ -/* HIG Category (analogous to a gtk_frame). */ -/*===========================================================================*/ - -#define GL_TYPE_HIG_CATEGORY (gl_hig_category_get_type ()) -#define GL_HIG_CATEGORY(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_HIG_CATEGORY, glHigCategory )) -#define GL_HIG_CATEGORY_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_HIG_CATEGORY, glHigCategoryClass)) -#define GL_IS_HIG_CATEGORY(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_HIG_CATEGORY)) -#define GL_IS_HIG_CATEGORY_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_HIG_CATEGORY)) - -typedef struct _glHigCategory glHigCategory; -typedef struct _glHigCategoryClass glHigCategoryClass; - -struct _glHigCategory { - GtkVBox parent_widget; - - GtkWidget *label; - GtkWidget *vbox; -}; - -struct _glHigCategoryClass { - GtkVBoxClass parent_class; -}; - -GType gl_hig_category_get_type (void) G_GNUC_CONST; - -GtkWidget *gl_hig_category_new (const gchar *header); - -void gl_hig_category_add_widget (glHigCategory *cat, - GtkWidget *widget); - - -/*===========================================================================*/ -/* HIG VBOX wrapper. */ -/*===========================================================================*/ - -typedef enum { - GL_HIG_VBOX_OUTER, - GL_HIG_VBOX_INNER, -} glHigVBoxType; - -#define GL_TYPE_HIG_VBOX (gl_hig_vbox_get_type ()) -#define GL_HIG_VBOX(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_HIG_VBOX, glHigVBox )) -#define GL_HIG_VBOX_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_HIG_VBOX, glHigVBoxClass)) -#define GL_IS_HIG_VBOX(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_HIG_VBOX)) -#define GL_IS_HIG_VBOX_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_HIG_VBOX)) - -typedef struct _glHigVBox glHigVBox; -typedef struct _glHigVBoxClass glHigVBoxClass; - -struct _glHigVBox { - GtkVBox parent_widget; -}; - -struct _glHigVBoxClass { - GtkVBoxClass parent_class; -}; - -GType gl_hig_vbox_get_type (void) G_GNUC_CONST; - -GtkWidget *gl_hig_vbox_new (glHigVBoxType type); - -void gl_hig_vbox_add_widget (glHigVBox *hig_vbox, - GtkWidget *widget); - - -/*===========================================================================*/ -/* HIG HBOX wrapper. */ -/*===========================================================================*/ - -#define GL_TYPE_HIG_HBOX (gl_hig_hbox_get_type ()) -#define GL_HIG_HBOX(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_HIG_HBOX, glHigHBox )) -#define GL_HIG_HBOX_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_HIG_HBOX, glHigHBoxClass)) -#define GL_IS_HIG_HBOX(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_HIG_HBOX)) -#define GL_IS_HIG_HBOX_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_HIG_HBOX)) - -typedef struct _glHigHBox glHigHBox; -typedef struct _glHigHBoxClass glHigHBoxClass; - -struct _glHigHBox { - GtkHBox parent_widget; -}; - -struct _glHigHBoxClass { - GtkHBoxClass parent_class; -}; - -GType gl_hig_hbox_get_type (void) G_GNUC_CONST; - -GtkWidget *gl_hig_hbox_new (void); - -void gl_hig_hbox_add_widget (glHigHBox *hig_hbox, - GtkWidget *widget); - -void gl_hig_hbox_add_widget_justify (glHigHBox *hig_hbox, - GtkWidget *widget); - - G_END_DECLS #endif /* __HIG_H__ */ diff --git a/glabels2/src/wdgt-print-copies.c b/glabels2/src/wdgt-print-copies.c index 2cdded62..7d3b633d 100644 --- a/glabels2/src/wdgt-print-copies.c +++ b/glabels2/src/wdgt-print-copies.c @@ -29,7 +29,9 @@ #include #include #include +#include +#include "hig.h" #include "wdgt-mini-preview.h" #include "marshal.h" @@ -89,7 +91,7 @@ gl_wdgt_print_copies_get_type (void) NULL }; - type = g_type_register_static (GL_TYPE_HIG_HBOX, + type = g_type_register_static (GTK_TYPE_HBOX, "glWdgtPrintCopies", &info, 0); } @@ -174,50 +176,48 @@ gl_wdgt_print_copies_construct (glWdgtPrintCopies *copies, WDGT_MINI_PREVIEW_WIDTH); gl_wdgt_mini_preview_set_template (GL_WDGT_MINI_PREVIEW(copies->mini_preview), template); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox), copies->mini_preview); + gtk_box_pack_start (GTK_BOX(whbox), copies->mini_preview, FALSE, FALSE, 0); - wvbox = gl_hig_vbox_new (GL_HIG_VBOX_INNER); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox), wvbox); + wvbox = gtk_vbox_new (FALSE, GL_HIG_PAD1); + gtk_box_pack_start (GTK_BOX(whbox), wvbox, FALSE, FALSE, 0); /* Sheet controls */ - whbox1 = gl_hig_hbox_new (); - gl_hig_vbox_add_widget (GL_HIG_VBOX(wvbox), whbox1); + whbox1 = gtk_hbox_new (FALSE, GL_HIG_PAD2); + gtk_box_pack_start (GTK_BOX(wvbox), whbox1, FALSE, FALSE, 0); copies->sheets_radio = gtk_radio_button_new_with_label (radio_group, _("Sheets:")); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), copies->sheets_radio); + gtk_box_pack_start (GTK_BOX(whbox1), copies->sheets_radio, FALSE, FALSE, 0); adjust = gtk_adjustment_new (1, 1.0, 10.0, 1.0, 10.0, 10.0); copies->sheets_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), copies->sheets_spin); + gtk_box_pack_start (GTK_BOX(whbox1), copies->sheets_spin, FALSE, FALSE, 0); gl_wdgt_mini_preview_highlight_range (GL_WDGT_MINI_PREVIEW(copies->mini_preview), 1, copies->labels_per_sheet); /* Blank line */ - gl_hig_vbox_add_widget (GL_HIG_VBOX(wvbox), gtk_label_new ("")); + gtk_box_pack_start (GTK_BOX(wvbox), gtk_label_new (""), FALSE, FALSE, 0); /* Label controls */ - whbox1 = gl_hig_hbox_new (); - gl_hig_vbox_add_widget (GL_HIG_VBOX(wvbox), whbox1); + whbox1 = gtk_hbox_new (FALSE, GL_HIG_PAD2); + gtk_box_pack_start (GTK_BOX(wvbox), whbox1, FALSE, FALSE, 0); radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (copies->sheets_radio)); copies->labels_radio = gtk_radio_button_new_with_label (radio_group, _("Labels")); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), copies->labels_radio); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), - gtk_label_new (_("from:"))); + gtk_box_pack_start (GTK_BOX(whbox1), copies->labels_radio, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("from:")), FALSE, FALSE, 0); adjust = gtk_adjustment_new (1, 1.0, copies->labels_per_sheet, 1.0, 10.0, 10.0); copies->first_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), copies->first_spin); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), - gtk_label_new (_("to:"))); + gtk_box_pack_start (GTK_BOX(whbox1), copies->first_spin, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("to:")), FALSE, FALSE, 0); adjust = gtk_adjustment_new (copies->labels_per_sheet, 1.0, copies->labels_per_sheet, 1.0, 10.0, 10.0); copies->last_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), copies->last_spin); + gtk_box_pack_start (GTK_BOX(whbox1), copies->last_spin, FALSE, FALSE, 0); gtk_widget_set_sensitive (copies->first_spin, FALSE); gtk_widget_set_sensitive (copies->last_spin, FALSE); diff --git a/glabels2/src/wdgt-print-copies.h b/glabels2/src/wdgt-print-copies.h index 9185b9fd..5180b185 100644 --- a/glabels2/src/wdgt-print-copies.h +++ b/glabels2/src/wdgt-print-copies.h @@ -24,7 +24,7 @@ #define __WDGT_PRINT_COPIES_H__ #include "label.h" -#include "hig.h" +#include G_BEGIN_DECLS @@ -42,7 +42,7 @@ typedef struct _glWdgtPrintCopies glWdgtPrintCopies; typedef struct _glWdgtPrintCopiesClass glWdgtPrintCopiesClass; struct _glWdgtPrintCopies { - glHigHBox parent_widget; + GtkHBox parent_widget; gint labels_per_sheet; @@ -57,7 +57,7 @@ struct _glWdgtPrintCopies { }; struct _glWdgtPrintCopiesClass { - glHigHBoxClass parent_class; + GtkHBoxClass parent_class; }; GType gl_wdgt_print_copies_get_type (void) G_GNUC_CONST; diff --git a/glabels2/src/wdgt-print-merge.c b/glabels2/src/wdgt-print-merge.c index 94d7d4ce..1d0295aa 100644 --- a/glabels2/src/wdgt-print-merge.c +++ b/glabels2/src/wdgt-print-merge.c @@ -30,8 +30,9 @@ #include #include #include +#include - +#include "hig.h" #include "wdgt-mini-preview.h" #include "marshal.h" @@ -92,7 +93,7 @@ gl_wdgt_print_merge_get_type (void) NULL }; - type = g_type_register_static (GL_TYPE_HIG_HBOX, + type = g_type_register_static (GTK_TYPE_HBOX, "glWdgtPrintMerge", &info, 0); } @@ -173,48 +174,48 @@ gl_wdgt_print_merge_construct (glWdgtPrintMerge * merge, WDGT_MINI_PREVIEW_WIDTH); gl_wdgt_mini_preview_set_template( GL_WDGT_MINI_PREVIEW (merge->mini_preview), template ); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox), merge->mini_preview); + gtk_box_pack_start (GTK_BOX(whbox), merge->mini_preview, FALSE, FALSE, 0); gl_wdgt_mini_preview_highlight_range (GL_WDGT_MINI_PREVIEW(merge->mini_preview), 1, 1); - wvbox = gl_hig_vbox_new (GL_HIG_VBOX_INNER); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox), wvbox); + wvbox = gtk_vbox_new (FALSE, GL_HIG_PAD1); + gtk_box_pack_start (GTK_BOX(whbox), wvbox, FALSE, FALSE, 0); /* First Label controls */ - whbox1 = gl_hig_hbox_new (); - gl_hig_vbox_add_widget (GL_HIG_VBOX(wvbox), whbox1); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), - gtk_label_new (_("Start on label"))); + whbox1 = gtk_hbox_new (FALSE, GL_HIG_PAD2); + gtk_box_pack_start (GTK_BOX(wvbox), whbox1, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(whbox1), + gtk_label_new (_("Start on label")), FALSE, FALSE, 0); adjust = gtk_adjustment_new (1, 1.0, merge->labels_per_sheet, 1.0, 10.0, 10.0); merge->first_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), merge->first_spin); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), - gtk_label_new (_("on 1st sheet"))); + gtk_box_pack_start (GTK_BOX(whbox1), merge->first_spin, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(whbox1), + gtk_label_new (_("on 1st sheet")), FALSE, FALSE, 0); /* Blank line */ - gl_hig_vbox_add_widget (GL_HIG_VBOX(wvbox), gtk_label_new ("")); + gtk_box_pack_start (GTK_BOX(wvbox), gtk_label_new (""), FALSE, FALSE, 0); /* Copy & collate controls*/ - whbox1 = gl_hig_hbox_new (); - gl_hig_vbox_add_widget (GL_HIG_VBOX(wvbox), whbox1); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), - gtk_label_new (_("Copies:"))); + whbox1 = gtk_hbox_new (FALSE, GL_HIG_PAD2); + gtk_box_pack_start (GTK_BOX(wvbox), whbox1, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(whbox1), + gtk_label_new (_("Copies:")), FALSE, FALSE, 0); adjust = gtk_adjustment_new (1, 1.0, 10.0, 1.0, 10.0, 10.0); merge->copies_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), merge->copies_spin); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), gtk_label_new (" ")); + gtk_box_pack_start (GTK_BOX(whbox1), merge->copies_spin, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (" "), FALSE, FALSE, 0); merge->collate_check = gtk_check_button_new_with_label (_("Collate")); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), merge->collate_check); + gtk_box_pack_start (GTK_BOX(whbox1), merge->collate_check, FALSE, FALSE, 0); pixbuf = gdk_pixbuf_new_from_xpm_data ( (const char **)nocollate_xpm); merge->collate_image = gtk_image_new_from_pixbuf(pixbuf); gtk_widget_set_sensitive (merge->collate_check, FALSE); gtk_widget_set_sensitive (merge->collate_image, FALSE); - gl_hig_hbox_add_widget (GL_HIG_HBOX(whbox1), merge->collate_image); + gtk_box_pack_start (GTK_BOX(whbox1), merge->collate_image, FALSE, FALSE, 0); /* Connect signals to controls */ g_signal_connect (G_OBJECT (merge->mini_preview), "clicked", diff --git a/glabels2/src/wdgt-print-merge.h b/glabels2/src/wdgt-print-merge.h index 5ff39ded..a2a2d387 100644 --- a/glabels2/src/wdgt-print-merge.h +++ b/glabels2/src/wdgt-print-merge.h @@ -24,7 +24,7 @@ #define __WDGT_PRINT_MERGE_H__ #include "label.h" -#include "hig.h" +#include G_BEGIN_DECLS @@ -42,7 +42,7 @@ typedef struct _glWdgtPrintMerge glWdgtPrintMerge; typedef struct _glWdgtPrintMergeClass glWdgtPrintMergeClass; struct _glWdgtPrintMerge { - glHigHBox parent_widget; + GtkHBox parent_widget; gint labels_per_sheet; GtkWidget *mini_preview; @@ -56,7 +56,7 @@ struct _glWdgtPrintMerge { }; struct _glWdgtPrintMergeClass { - glHigHBoxClass parent_class; + GtkHBoxClass parent_class; }; GType gl_wdgt_print_merge_get_type (void) G_GNUC_CONST;