diff --git a/ChangeLog b/ChangeLog index 734f14effa..c05eaf290b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-05-02 Sven Neumann + + * app/widgets/gimpenumwidgets.c + * app/widgets/gimpgrideditor.c + * app/widgets/gimptemplateeditor.c: use the GimpFrame widget, + changed some spacings to better comply with the HIG. + 2004-05-02 Sven Neumann * libgimpwidgets/Makefile.am diff --git a/app/widgets/gimpenumwidgets.c b/app/widgets/gimpenumwidgets.c index f753d09c6f..890a719432 100644 --- a/app/widgets/gimpenumwidgets.c +++ b/app/widgets/gimpenumwidgets.c @@ -145,14 +145,14 @@ gimp_enum_radio_frame_new (GType enum_type, gpointer callback_data, GtkWidget **first_button) { - GtkWidget *frame; - GtkWidget *radio_box; + GtkWidget *frame; + GtkWidget *radio_box; g_return_val_if_fail (G_TYPE_IS_ENUM (enum_type), NULL); g_return_val_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget), NULL); - frame = gtk_frame_new (NULL); + frame = gimp_frame_new (NULL); if (label_widget) { @@ -181,14 +181,14 @@ gimp_enum_radio_frame_new_with_range (GType enum_type, gpointer callback_data, GtkWidget **first_button) { - GtkWidget *frame; - GtkWidget *radio_box; + GtkWidget *frame; + GtkWidget *radio_box; g_return_val_if_fail (G_TYPE_IS_ENUM (enum_type), NULL); g_return_val_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget), NULL); - frame = gtk_frame_new (NULL); + frame = gimp_frame_new (NULL); if (label_widget) { diff --git a/app/widgets/gimpgrideditor.c b/app/widgets/gimpgrideditor.c index ece1f42593..ed63cf79c3 100644 --- a/app/widgets/gimpgrideditor.c +++ b/app/widgets/gimpgrideditor.c @@ -198,9 +198,9 @@ gimp_grid_editor_constructor (GType type, g_assert (editor->grid != NULL); - gtk_box_set_spacing (GTK_BOX (editor), 4); + gtk_box_set_spacing (GTK_BOX (editor), 12); - frame = gtk_frame_new (_("Appearance")); + frame = gimp_frame_new (_("Appearance")); gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0); gtk_widget_show (frame); @@ -237,7 +237,7 @@ gimp_grid_editor_constructor (GType type, gtk_widget_show (table); - frame = gtk_frame_new (_("Spacing")); + frame = gimp_frame_new (_("Spacing")); gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0); gtk_widget_show (frame); @@ -270,7 +270,7 @@ gimp_grid_editor_constructor (GType type, gtk_widget_show (hbox); - frame = gtk_frame_new (_("Offset")); + frame = gimp_frame_new (_("Offset")); gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c index 5c2dd2f2bc..4a8115909c 100644 --- a/app/widgets/gimptemplateeditor.c +++ b/app/widgets/gimptemplateeditor.c @@ -189,7 +189,6 @@ gimp_template_editor_constructor (GType type, GtkWidget *hbox; GtkWidget *table; GtkWidget *table2; - GtkWidget *separator; GtkWidget *label; GtkObject *adjustment; GtkWidget *width_pixels; @@ -210,10 +209,10 @@ gimp_template_editor_constructor (GType type, g_assert (editor->template != NULL); - gtk_box_set_spacing (GTK_BOX (editor), 4); + gtk_box_set_spacing (GTK_BOX (editor), 12); /* Image size frame */ - frame = gtk_frame_new (_("Image Size")); + frame = gimp_frame_new (_("Image Size")); gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0); gtk_widget_show (frame); @@ -226,7 +225,7 @@ gimp_template_editor_constructor (GType type, gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacing (GTK_TABLE (table), 1, 4); - gtk_table_set_row_spacing (GTK_TABLE (table), 2, 4); + gtk_table_set_row_spacing (GTK_TABLE (table), 2, 6); gtk_table_set_row_spacing (GTK_TABLE (table), 4, 4); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); gtk_widget_show (table); @@ -244,11 +243,6 @@ gimp_template_editor_constructor (GType type, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - /* a separator after the pixel section */ - separator = gtk_hseparator_new (); - gtk_table_attach_defaults (GTK_TABLE (table), separator, 0, 2, 2, 3); - gtk_widget_show (separator); - /* the unit size labels */ label = gtk_label_new (_("Width:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); @@ -473,7 +467,7 @@ gimp_template_editor_constructor (GType type, gtk_widget_show (frame); /* frame for Comment */ - frame = gtk_frame_new (_("Image Comment")); + frame = gimp_frame_new (_("Image Comment")); gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/libgimpwidgets/gimpenumwidgets.c b/libgimpwidgets/gimpenumwidgets.c index f753d09c6f..890a719432 100644 --- a/libgimpwidgets/gimpenumwidgets.c +++ b/libgimpwidgets/gimpenumwidgets.c @@ -145,14 +145,14 @@ gimp_enum_radio_frame_new (GType enum_type, gpointer callback_data, GtkWidget **first_button) { - GtkWidget *frame; - GtkWidget *radio_box; + GtkWidget *frame; + GtkWidget *radio_box; g_return_val_if_fail (G_TYPE_IS_ENUM (enum_type), NULL); g_return_val_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget), NULL); - frame = gtk_frame_new (NULL); + frame = gimp_frame_new (NULL); if (label_widget) { @@ -181,14 +181,14 @@ gimp_enum_radio_frame_new_with_range (GType enum_type, gpointer callback_data, GtkWidget **first_button) { - GtkWidget *frame; - GtkWidget *radio_box; + GtkWidget *frame; + GtkWidget *radio_box; g_return_val_if_fail (G_TYPE_IS_ENUM (enum_type), NULL); g_return_val_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget), NULL); - frame = gtk_frame_new (NULL); + frame = gimp_frame_new (NULL); if (label_widget) {