From 62b59db9763773862e75b687f5789abd7ffd45a6 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 2 Jun 2004 17:56:02 +0000 Subject: [PATCH] app/display/gimpdisplayshell-scale.c app/gui/info-window.c 2004-06-02 Sven Neumann * app/display/gimpdisplayshell-scale.c * app/gui/info-window.c * app/gui/preferences-dialog.c * app/gui/resize-dialog.c * app/tools/gimpcolorbalancetool.c * app/tools/gimpcurvestool.c * app/tools/gimphuesaturationtool.c * app/tools/gimplevelstool.c * app/tools/gimpthresholdtool.c * app/widgets/gimpdockable.c * app/widgets/gimpfiledialog.c * app/widgets/gimpgradienteditor.c * app/widgets/gimphistogrambox.c * app/widgets/gimplayertreeview.c * app/widgets/gimpstrokeeditor.c: tweaked some spacings for consistency and better HIG compliance. --- ChangeLog | 19 +++++++++++++++++++ app/dialogs/info-window.c | 2 +- app/dialogs/preferences-dialog.c | 4 ++-- app/dialogs/resize-dialog.c | 2 +- app/display/gimpdisplayshell-scale.c | 10 +++++----- app/gui/info-window.c | 2 +- app/gui/preferences-dialog.c | 4 ++-- app/gui/resize-dialog.c | 2 +- app/tools/gimpcolorbalancetool.c | 2 +- app/tools/gimpcurvestool.c | 2 +- app/tools/gimphuesaturationtool.c | 2 +- app/tools/gimplevelstool.c | 11 +++++------ app/tools/gimpthresholdtool.c | 2 +- app/widgets/gimpdockable.c | 2 +- app/widgets/gimpfiledialog.c | 9 +++++---- app/widgets/gimpgradienteditor.c | 2 +- app/widgets/gimphistogrambox.c | 2 +- app/widgets/gimplayertreeview.c | 2 +- app/widgets/gimpstrokeeditor.c | 2 +- 19 files changed, 51 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc158ebf21..95ff71a0ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2004-06-02 Sven Neumann + + * app/display/gimpdisplayshell-scale.c + * app/gui/info-window.c + * app/gui/preferences-dialog.c + * app/gui/resize-dialog.c + * app/tools/gimpcolorbalancetool.c + * app/tools/gimpcurvestool.c + * app/tools/gimphuesaturationtool.c + * app/tools/gimplevelstool.c + * app/tools/gimpthresholdtool.c + * app/widgets/gimpdockable.c + * app/widgets/gimpfiledialog.c + * app/widgets/gimpgradienteditor.c + * app/widgets/gimphistogrambox.c + * app/widgets/gimplayertreeview.c + * app/widgets/gimpstrokeeditor.c: tweaked some spacings for + consistency and better HIG compliance. + 2004-06-02 Michael Natterer * tools/pdbgen/pdb/gradient_edit.pdb: set_blending_function() and diff --git a/app/dialogs/info-window.c b/app/dialogs/info-window.c index 26ef856330..262d387620 100644 --- a/app/dialogs/info-window.c +++ b/app/dialogs/info-window.c @@ -186,7 +186,7 @@ info_window_create_extended (InfoDialog *info_win, /* color information */ - hbox = gtk_hbox_new (TRUE, 4); + hbox = gtk_hbox_new (TRUE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 389af3407a..031a6b4080 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -818,7 +818,7 @@ prefs_display_options_frame_add (Gimp *gimp, vbox = prefs_frame_new (label, parent, FALSE); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -1247,7 +1247,7 @@ prefs_dialog_new (Gimp *gimp, gimp); } - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index c71150cc19..3df4dd451c 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -699,7 +699,7 @@ resize_dialog_new (GimpViewable *viewable, GtkWidget *hbox; GtkWidget *combo; - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c index 977bab55d1..242f2b9047 100644 --- a/app/display/gimpdisplayshell-scale.c +++ b/app/display/gimpdisplayshell-scale.c @@ -529,16 +529,16 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) data); table = gtk_table_new (2, 2, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 2); - gtk_table_set_row_spacings (GTK_TABLE (table), 4); + gtk_container_set_border_width (GTK_CONTAINER (table), 12); + gtk_table_set_col_spacings (GTK_TABLE (table), 6); + gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell->scale_dialog)->vbox), table); gtk_widget_show (table); row = 0; - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, _("Zoom Ratio:"), 0.0, 0.5, hbox, 1, FALSE); @@ -565,7 +565,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0); gtk_widget_show (spin); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, _("Zoom:"), 0.0, 0.5, hbox, 1, FALSE); diff --git a/app/gui/info-window.c b/app/gui/info-window.c index 26ef856330..262d387620 100644 --- a/app/gui/info-window.c +++ b/app/gui/info-window.c @@ -186,7 +186,7 @@ info_window_create_extended (InfoDialog *info_win, /* color information */ - hbox = gtk_hbox_new (TRUE, 4); + hbox = gtk_hbox_new (TRUE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index 389af3407a..031a6b4080 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -818,7 +818,7 @@ prefs_display_options_frame_add (Gimp *gimp, vbox = prefs_frame_new (label, parent, FALSE); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -1247,7 +1247,7 @@ prefs_dialog_new (Gimp *gimp, gimp); } - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/gui/resize-dialog.c b/app/gui/resize-dialog.c index c71150cc19..3df4dd451c 100644 --- a/app/gui/resize-dialog.c +++ b/app/gui/resize-dialog.c @@ -699,7 +699,7 @@ resize_dialog_new (GimpViewable *viewable, GtkWidget *hbox; GtkWidget *combo; - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c index 963cb6397e..7da2200c6e 100644 --- a/app/tools/gimpcolorbalancetool.c +++ b/app/tools/gimpcolorbalancetool.c @@ -320,7 +320,7 @@ gimp_color_balance_tool_dialog (GimpImageMapTool *image_map_tool) G_CALLBACK (color_balance_yb_adjustment_update), cb_tool); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c index cb101a17cf..33ac92238f 100644 --- a/app/tools/gimpcurvestool.c +++ b/app/tools/gimpcurvestool.c @@ -469,7 +469,7 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool) vbox = image_map_tool->main_vbox; /* The option menu for selecting channels */ - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c index 8a4ffd7ade..a74cb012ce 100644 --- a/app/tools/gimphuesaturationtool.c +++ b/app/tools/gimphuesaturationtool.c @@ -400,7 +400,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool) G_CALLBACK (hue_saturation_saturation_adjustment_update), hs_tool); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c index d44e10b2d7..10a83a04ed 100644 --- a/app/tools/gimplevelstool.c +++ b/app/tools/gimplevelstool.c @@ -404,7 +404,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) vbox = image_map_tool->main_vbox; /* The option menu for selecting channels */ - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -501,7 +501,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (bar); /* Horizontal box for input levels spinbuttons */ - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -604,7 +604,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (tool->output_bar); /* Horizontal box for levels spin widgets */ - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -663,13 +663,12 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) _("Save levels settings to file"), NULL); gtk_widget_show (image_map_tool->save_button); - hbbox = gtk_hbox_new (FALSE, 4); - gtk_container_set_border_width (GTK_CONTAINER (hbbox), 2); + hbbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_end (GTK_BOX (hbox), hbbox, FALSE, FALSE, 0); gtk_widget_show (hbbox); button = gtk_button_new_with_mnemonic (_("_Auto")); - gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 2); + gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0); gimp_help_set_help_data (button, _("Adjust levels automatically"), NULL); gtk_widget_show (button); diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c index b46b4436b3..c073d3f157 100644 --- a/app/tools/gimpthresholdtool.c +++ b/app/tools/gimpthresholdtool.c @@ -261,7 +261,7 @@ gimp_threshold_tool_dialog (GimpImageMapTool *image_map_tool) vbox = image_map_tool->main_vbox; - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c index 0e757200a0..4d26158474 100644 --- a/app/widgets/gimpdockable.c +++ b/app/widgets/gimpdockable.c @@ -803,7 +803,7 @@ gimp_dockable_get_tab_widget (GimpDockable *dockable, case GIMP_TAB_STYLE_ICON_BLURB: case GIMP_TAB_STYLE_PREVIEW_NAME: case GIMP_TAB_STYLE_PREVIEW_BLURB: - tab_widget = gtk_hbox_new (FALSE, 4); + tab_widget = gtk_hbox_new (FALSE, 2); gtk_box_pack_start (GTK_BOX (tab_widget), icon, FALSE, FALSE, 0); gtk_widget_show (icon); diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c index fd2356e240..9e32a3b546 100644 --- a/app/widgets/gimpfiledialog.c +++ b/app/widgets/gimpfiledialog.c @@ -187,7 +187,7 @@ gimp_file_dialog_new (Gimp *gimp, dialog, FALSE); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), hbox); gtk_widget_show (hbox); @@ -236,8 +236,8 @@ gimp_file_dialog_new (Gimp *gimp, if (file_proc->menu_paths && file_proc->extensions_list) { - gchar *name; - GSList *ext; + const gchar *name; + GSList *ext; if (file_proc->menu_label) name = file_proc->menu_label; @@ -250,6 +250,7 @@ gimp_file_dialog_new (Gimp *gimp, for (ext = file_proc->extensions_list; ext; ext = g_slist_next (ext)) { gchar *pattern = g_strdup_printf ("*.%s", (gchar *) ext->data); + gtk_file_filter_add_pattern (filter, pattern); g_free (pattern); } @@ -283,7 +284,7 @@ gimp_file_dialog_set_file_proc (GimpFileDialog *dialog, if (uri && strlen (uri)) { - gchar *last_dot = last_dot = strrchr (uri, '.'); + const gchar *last_dot = strrchr (uri, '.'); if (last_dot != uri) { diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index 351b6997ba..d0ff99320b 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -378,7 +378,7 @@ gimp_gradient_editor_init (GimpGradientEditor *editor) /* Instant update toggle */ editor->instant_update = TRUE; - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/widgets/gimphistogrambox.c b/app/widgets/gimphistogrambox.c index de362b4bf8..f15f1b704f 100644 --- a/app/widgets/gimphistogrambox.c +++ b/app/widgets/gimphistogrambox.c @@ -143,7 +143,7 @@ gimp_histogram_box_init (GimpHistogramBox *box) bar); /* The range selection */ - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index abefe19e72..ca136b165b 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -259,7 +259,7 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view) gtk_box_reorder_child (GTK_BOX (view), view->options_box, 0); gtk_widget_show (view->options_box); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_hbox_new (FALSE, 6); /* Paint mode menu */ diff --git a/app/widgets/gimpstrokeeditor.c b/app/widgets/gimpstrokeeditor.c index e671a93448..6cd0e14839 100644 --- a/app/widgets/gimpstrokeeditor.c +++ b/app/widgets/gimpstrokeeditor.c @@ -191,7 +191,7 @@ gimp_stroke_editor_constructor (GType type, gtk_box_set_spacing (GTK_BOX (editor), 6); - box = gtk_hbox_new (FALSE, 4); + box = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (editor), box, FALSE, FALSE, 0); gtk_widget_show (box);