From 6750667d87527c951342f9174aa71e5329622706 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 12 May 2004 11:37:21 +0000 Subject: [PATCH] libgimpwidgets/gimpwidgets.c (gimp_scale_entry_new_internal) left-align 2004-05-12 Sven Neumann * libgimpwidgets/gimpwidgets.c (gimp_scale_entry_new_internal) * app/widgets/gimpwidgets-utils.c (gimp_table_attach_stock): left-align the label. * app/actions/channels-commands.c * app/actions/layers-commands.c * app/actions/qmask-commands.c * app/actions/vectors-commands.c * app/display/gimpdisplayshell-scale.c * app/gui/brush-select.c * app/gui/file-new-dialog.c * app/gui/info-dialog.c * app/gui/info-window.c * app/gui/module-browser.c * app/gui/offset-dialog.c * app/gui/palette-import-dialog.c * app/gui/preferences-dialog.c * app/gui/resize-dialog.c * app/tools/gimpblendoptions.c * app/tools/gimpcroptool.c * app/tools/gimpmeasuretool.c * app/tools/gimppaintoptions-gui.c * app/tools/gimpscaletool.c * app/tools/gimpselectionoptions.c * app/tools/gimpsheartool.c * app/tools/gimptextoptions.c * app/widgets/gimpcolormapeditor.c * app/widgets/gimpgrideditor.c * app/widgets/gimphistogrameditor.c * app/widgets/gimplayertreeview.c * app/widgets/gimpstrokeeditor.c * app/widgets/gimpwidgets-utils.c: left-align labels as suggested by the HIG. --- ChangeLog | 36 +++++++++++++++++++++++++ app/actions/channels-commands.c | 4 +-- app/actions/layers-commands.c | 8 +++--- app/actions/qmask-commands.c | 2 +- app/actions/quick-mask-commands.c | 2 +- app/actions/vectors-commands.c | 4 +-- app/dialogs/image-new-dialog.c | 2 +- app/dialogs/info-dialog.c | 2 +- app/dialogs/info-window.c | 8 +++--- app/dialogs/module-dialog.c | 2 +- app/dialogs/offset-dialog.c | 4 +-- app/dialogs/palette-import-dialog.c | 8 +++--- app/dialogs/preferences-dialog.c | 16 +++++------ app/dialogs/resize-dialog.c | 40 ++++++++++++++-------------- app/display/gimpdisplayshell-scale.c | 4 +-- app/gui/brush-select.c | 2 +- app/gui/file-new-dialog.c | 2 +- app/gui/info-dialog.c | 2 +- app/gui/info-window.c | 8 +++--- app/gui/module-browser.c | 2 +- app/gui/offset-dialog.c | 4 +-- app/gui/palette-import-dialog.c | 8 +++--- app/gui/preferences-dialog.c | 16 +++++------ app/gui/resize-dialog.c | 40 ++++++++++++++-------------- app/tools/gimpblendoptions.c | 4 +-- app/tools/gimpcroptool.c | 3 ++- app/tools/gimpmeasuretool.c | 4 +-- app/tools/gimppaintoptions-gui.c | 14 +++++----- app/tools/gimpscaletool.c | 4 +-- app/tools/gimpselectionoptions.c | 4 +-- app/tools/gimpsheartool.c | 2 +- app/tools/gimptextoptions.c | 16 +++++------ app/widgets/gimpcolormapeditor.c | 4 +-- app/widgets/gimpgrideditor.c | 6 ++--- app/widgets/gimphistogrameditor.c | 2 +- app/widgets/gimplayertreeview.c | 2 +- app/widgets/gimpstrokeeditor.c | 8 +++--- app/widgets/gimptemplateeditor.c | 4 +-- app/widgets/gimpwidgets-utils.c | 4 +-- libgimpwidgets/gimpwidgets.c | 8 +++--- 40 files changed, 177 insertions(+), 138 deletions(-) diff --git a/ChangeLog b/ChangeLog index b85975beb9..fc7883d6f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +2004-05-12 Sven Neumann + + * libgimpwidgets/gimpwidgets.c (gimp_scale_entry_new_internal) + * app/widgets/gimpwidgets-utils.c (gimp_table_attach_stock): + left-align the label. + + * app/actions/channels-commands.c + * app/actions/layers-commands.c + * app/actions/qmask-commands.c + * app/actions/vectors-commands.c + * app/display/gimpdisplayshell-scale.c + * app/gui/brush-select.c + * app/gui/file-new-dialog.c + * app/gui/info-dialog.c + * app/gui/info-window.c + * app/gui/module-browser.c + * app/gui/offset-dialog.c + * app/gui/palette-import-dialog.c + * app/gui/preferences-dialog.c + * app/gui/resize-dialog.c + * app/tools/gimpblendoptions.c + * app/tools/gimpcroptool.c + * app/tools/gimpmeasuretool.c + * app/tools/gimppaintoptions-gui.c + * app/tools/gimpscaletool.c + * app/tools/gimpselectionoptions.c + * app/tools/gimpsheartool.c + * app/tools/gimptextoptions.c + * app/widgets/gimpcolormapeditor.c + * app/widgets/gimpgrideditor.c + * app/widgets/gimphistogrameditor.c + * app/widgets/gimplayertreeview.c + * app/widgets/gimpstrokeeditor.c + * app/widgets/gimpwidgets-utils.c: left-align labels as suggested + by the HIG. + 2004-05-12 Michael Natterer * app/config/gimpconfig-deserialize.c diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c index df5e5878bf..8f5d874f93 100644 --- a/app/actions/channels-commands.c +++ b/app/actions/channels-commands.c @@ -387,7 +387,7 @@ channels_new_channel_query (GimpImage *gimage, gtk_entry_set_text (GTK_ENTRY (options->name_entry), (channel_name ? channel_name : _("New Channel"))); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Channel Name:"), 1.0, 0.5, + _("Channel Name:"), 0.0, 0.5, options->name_entry, 2, FALSE); /* The opacity scale */ @@ -550,7 +550,7 @@ channels_edit_channel_query (GimpChannel *channel, gtk_entry_set_text (GTK_ENTRY (options->name_entry), gimp_object_get_name (GIMP_OBJECT (channel))); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Channel Name:"), 1.0, 0.5, + _("Channel Name:"), 0.0, 0.5, options->name_entry, 2, FALSE); /* The opacity scale */ diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c index 477a29d1db..4ba3f49b55 100644 --- a/app/actions/layers-commands.c +++ b/app/actions/layers-commands.c @@ -772,18 +772,18 @@ layers_new_layer_query (GimpImage *gimage, gtk_entry_set_text (GTK_ENTRY (options->name_entry), (layer_name ? layer_name : _("New Layer"))); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Layer _Name:"), 1.0, 0.5, + _("Layer _Name:"), 0.0, 0.5, options->name_entry, 1, FALSE); /* The size labels */ - label = gtk_label_new (_("Layer Width:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("Width:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); gtk_widget_show (label); label = gtk_label_new (_("Height:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); gtk_widget_show (label); diff --git a/app/actions/qmask-commands.c b/app/actions/qmask-commands.c index b897f9e535..667c115a02 100644 --- a/app/actions/qmask-commands.c +++ b/app/actions/qmask-commands.c @@ -189,7 +189,7 @@ qmask_channel_query (GimpDisplayShell *shell) gtk_scale_set_value_pos (GTK_SCALE (opacity_scale), GTK_POS_TOP); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Mask Opacity:"), 1.0, 1.0, + _("Mask Opacity:"), 0.0, 1.0, opacity_scale, 1, FALSE); g_signal_connect (opacity_scale_data, "value_changed", diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c index b897f9e535..667c115a02 100644 --- a/app/actions/quick-mask-commands.c +++ b/app/actions/quick-mask-commands.c @@ -189,7 +189,7 @@ qmask_channel_query (GimpDisplayShell *shell) gtk_scale_set_value_pos (GTK_SCALE (opacity_scale), GTK_POS_TOP); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Mask Opacity:"), 1.0, 1.0, + _("Mask Opacity:"), 0.0, 1.0, opacity_scale, 1, FALSE); g_signal_connect (opacity_scale_data, "value_changed", diff --git a/app/actions/vectors-commands.c b/app/actions/vectors-commands.c index 20269499a7..e375e0e89b 100644 --- a/app/actions/vectors-commands.c +++ b/app/actions/vectors-commands.c @@ -509,7 +509,7 @@ vectors_new_vectors_query (GimpImage *gimage, /* The name entry hbox, label and entry */ label = gtk_label_new (_("Path name:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); @@ -627,7 +627,7 @@ vectors_edit_vectors_query (GimpVectors *vectors, /* The name entry */ label = gtk_label_new (_("Path name:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_widget_show (label); diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c index ad33c4ed0c..3e54baef0d 100644 --- a/app/dialogs/image-new-dialog.c +++ b/app/dialogs/image-new-dialog.c @@ -127,7 +127,7 @@ file_new_dialog_new (Gimp *gimp) dialog->combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("_Template:"), 1.0, 0.5, + _("_Template:"), 0.0, 0.5, dialog->combo, 1, FALSE); g_signal_connect (dialog->combo, "select_item", diff --git a/app/dialogs/info-dialog.c b/app/dialogs/info-dialog.c index a12c34baa1..9aef72890b 100644 --- a/app/dialogs/info-dialog.c +++ b/app/dialogs/info-dialog.c @@ -406,7 +406,7 @@ info_dialog_field_new (InfoDialog *idialog, gtk_table_resize (GTK_TABLE (idialog->info_table), 2, row); label = gtk_label_new (title); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (idialog->info_table), label, 0, 1, row - 1, row, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); diff --git a/app/dialogs/info-window.c b/app/dialogs/info-window.c index 3eeae8c0e3..c87a3fbc69 100644 --- a/app/dialogs/info-window.c +++ b/app/dialogs/info-window.c @@ -153,13 +153,13 @@ info_window_create_extended (InfoDialog *info_win, iwd->pixel_labels[0] = gtk_label_new (_("n/a")); gtk_misc_set_alignment (GTK_MISC (iwd->pixel_labels[0]), 0.0, 0.5); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("X:"), 1.0, 0.5, + _("X:"), 0.0, 0.5, iwd->pixel_labels[0], 1, FALSE); iwd->pixel_labels[1] = gtk_label_new (_("n/a")); gtk_misc_set_alignment (GTK_MISC (iwd->pixel_labels[1]), 0.0, 0.5); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Y:"), 1.0, 0.5, + _("Y:"), 0.0, 0.5, iwd->pixel_labels[1], 1, FALSE); frame = gimp_frame_new (_("Units")); @@ -175,13 +175,13 @@ info_window_create_extended (InfoDialog *info_win, iwd->unit_labels[0] = gtk_label_new (_("n/a")); gtk_misc_set_alignment (GTK_MISC (iwd->unit_labels[0]), 0.0, 0.5); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("X:"), 1.0, 0.5, + _("X:"), 0.0, 0.5, iwd->unit_labels[0], 1, FALSE); iwd->unit_labels[1] = gtk_label_new (_("n/a")); gtk_misc_set_alignment (GTK_MISC (iwd->unit_labels[1]), 0.0, 0.5); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Y:"), 1.0, 0.5, + _("Y:"), 0.0, 0.5, iwd->unit_labels[1], 1, FALSE); diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c index 279cc71948..d240c44132 100644 --- a/app/dialogs/module-dialog.c +++ b/app/dialogs/module-dialog.c @@ -510,7 +510,7 @@ browser_info_init (ModuleBrowser *browser, for (i = 0; i < G_N_ELEMENTS (text); i++) { label = gtk_label_new (gettext (text[i])); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, i, i + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 2); gtk_widget_show (label); diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c index b1b75935bb..4ed1780b83 100644 --- a/app/dialogs/offset-dialog.c +++ b/app/dialogs/offset-dialog.c @@ -161,9 +161,9 @@ offset_dialog_new (GimpDrawable *drawable, gtk_widget_show (spinbutton); gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (off_d->off_se), - _("_X:"), 0, 0, 1.0); + _("_X:"), 0, 0, 0.0); gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (off_d->off_se), - _("_Y:"), 1, 0, 1.0); + _("_Y:"), 1, 0, 0.0); gtk_box_pack_start (GTK_BOX (vbox), off_d->off_se, FALSE, FALSE, 0); gtk_widget_show (off_d->off_se); diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c index 0807770378..1112265ef3 100644 --- a/app/dialogs/palette-import-dialog.c +++ b/app/dialogs/palette-import-dialog.c @@ -258,21 +258,21 @@ palette_import_dialog_new (Gimp *gimp) gimp_container_combo_box_new (gimp->gradient_factory->container, import_dialog->context, 24, 1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - NULL, 1.0, 0.5, + NULL, 0.0, 0.5, import_dialog->gradient_combo, 1, FALSE); /* The image menu */ import_dialog->image_combo = gimp_container_combo_box_new (gimp->images, import_dialog->context, 24, 1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - NULL, 1.0, 0.5, + NULL, 0.0, 0.5, import_dialog->image_combo, 1, FALSE); /* Palette file name entry */ import_dialog->filename_entry = gimp_file_entry_new (_("Select palette file"), 0, FALSE, FALSE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, - NULL, 1.0, 0.5, + NULL, 0.0, 0.5, import_dialog->filename_entry, 1, FALSE); gtk_widget_show (import_dialog->filename_entry); @@ -316,7 +316,7 @@ palette_import_dialog_new (Gimp *gimp) gtk_entry_set_text (GTK_ENTRY (import_dialog->entry), gradient ? GIMP_OBJECT (gradient)->name : _("New Import")); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Palette _Name:"), 1.0, 0.5, + _("Palette _Name:"), 0.0, 0.5, import_dialog->entry, 2, FALSE); /* The # of colors */ diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 98d9eec2db..dfac11ebed 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -740,7 +740,7 @@ prefs_color_button_add (GObject *config, if (button) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, button, 1, TRUE); return button; @@ -762,7 +762,7 @@ prefs_enum_combo_box_add (GObject *config, if (combo_box) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, combo_box, 1, TRUE); return combo_box; @@ -784,7 +784,7 @@ prefs_boolean_combo_box_add (GObject *config, if (menu) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, menu, 1, TRUE); return menu; @@ -808,7 +808,7 @@ prefs_spin_button_add (GObject *config, if (spinbutton) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, spinbutton, 1, TRUE); return spinbutton; @@ -827,7 +827,7 @@ prefs_memsize_entry_add (GObject *config, if (entry) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, entry, 1, TRUE); return entry; @@ -1101,7 +1101,7 @@ prefs_dialog_new (Gimp *gimp, combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("From _Template:"), 1.0, 0.5, + _("_Template:"), 0.0, 0.5, combo, 1, FALSE); gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo), NULL); @@ -1334,7 +1334,7 @@ prefs_dialog_new (Gimp *gimp, FALSE, FALSE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Web Browser to Use:"), 1.0, 0.5, + _("Web Browser to Use:"), 0.0, 0.5, fileselection, 1, TRUE); #endif @@ -2048,7 +2048,7 @@ prefs_dialog_new (Gimp *gimp, gettext (dirs[i].fs_label), TRUE, TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, i, - gettext (dirs[i].label), 1.0, 0.5, + gettext (dirs[i].label), 0.0, 0.5, fileselection, 1, FALSE); } } diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index c3ecd1adeb..40f764fc6c 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -289,14 +289,14 @@ resize_dialog_new (GimpViewable *viewable, gtk_widget_show (table); /* the original width & height labels */ - label = gtk_label_new (_("Original Width:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("Current Width:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Height:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("Current Height:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); @@ -315,13 +315,13 @@ resize_dialog_new (GimpViewable *viewable, /* the new size labels */ label = gtk_label_new (_("New Width:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Height:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("New Height:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); @@ -381,14 +381,14 @@ resize_dialog_new (GimpViewable *viewable, orig_labels_update (private->size_se, dialog); /* the scale ratio labels */ - label = gtk_label_new (_("Ratio X:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("X Ratio:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Y:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("Y Ratio:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); @@ -483,9 +483,9 @@ resize_dialog_new (GimpViewable *viewable, gtk_widget_show (spinbutton); gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (private->offset_se), - _("_X:"), 0, 0, 1.0); + _("_X:"), 0, 0, 0.0); gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (private->offset_se), - _("_Y:"), 1, 0, 1.0); + _("_Y:"), 1, 0, 0.0); gtk_box_pack_start (GTK_BOX (vbox), private->offset_se, FALSE, FALSE, 0); gtk_widget_show (private->offset_se); @@ -570,13 +570,13 @@ resize_dialog_new (GimpViewable *viewable, /* the print size labels */ label = gtk_label_new (_("New Width:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Height:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("New Height:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); @@ -636,14 +636,14 @@ resize_dialog_new (GimpViewable *viewable, dialog); /* the resolution labels */ - label = gtk_label_new (_("Resolution X:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("X Resolution:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Y:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("Y Resolution:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c index 7c502cad4d..05c8b23c8c 100644 --- a/app/display/gimpdisplayshell-scale.c +++ b/app/display/gimpdisplayshell-scale.c @@ -534,7 +534,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) hbox = gtk_hbox_new (FALSE, 4); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("Zoom Ratio:"), 1.0, 0.5, + _("Zoom Ratio:"), 0.0, 0.5, hbox, 1, FALSE); if (fabs (shell->other_scale) <= 0.0001) @@ -561,7 +561,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) hbox = gtk_hbox_new (FALSE, 4); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("Zoom:"), 1.0, 0.5, + _("Zoom:"), 0.0, 0.5, hbox, 1, FALSE); spin = gimp_spin_button_new (&data->scale_adj, diff --git a/app/gui/brush-select.c b/app/gui/brush-select.c index 68d1179ea9..4a0828b27d 100644 --- a/app/gui/brush-select.c +++ b/app/gui/brush-select.c @@ -203,7 +203,7 @@ brush_select_new (Gimp *gimp, TRUE, gimp_context_get_paint_mode (bsp->context)); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, - _("Mode:"), 1.0, 0.5, + _("Mode:"), 0.0, 0.5, bsp->paint_mode_menu, 2, TRUE); spacing_adj = GIMP_BRUSH_FACTORY_VIEW (bsp->view)->spacing_adjustment; diff --git a/app/gui/file-new-dialog.c b/app/gui/file-new-dialog.c index ad33c4ed0c..3e54baef0d 100644 --- a/app/gui/file-new-dialog.c +++ b/app/gui/file-new-dialog.c @@ -127,7 +127,7 @@ file_new_dialog_new (Gimp *gimp) dialog->combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("_Template:"), 1.0, 0.5, + _("_Template:"), 0.0, 0.5, dialog->combo, 1, FALSE); g_signal_connect (dialog->combo, "select_item", diff --git a/app/gui/info-dialog.c b/app/gui/info-dialog.c index a12c34baa1..9aef72890b 100644 --- a/app/gui/info-dialog.c +++ b/app/gui/info-dialog.c @@ -406,7 +406,7 @@ info_dialog_field_new (InfoDialog *idialog, gtk_table_resize (GTK_TABLE (idialog->info_table), 2, row); label = gtk_label_new (title); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (idialog->info_table), label, 0, 1, row - 1, row, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); diff --git a/app/gui/info-window.c b/app/gui/info-window.c index 3eeae8c0e3..c87a3fbc69 100644 --- a/app/gui/info-window.c +++ b/app/gui/info-window.c @@ -153,13 +153,13 @@ info_window_create_extended (InfoDialog *info_win, iwd->pixel_labels[0] = gtk_label_new (_("n/a")); gtk_misc_set_alignment (GTK_MISC (iwd->pixel_labels[0]), 0.0, 0.5); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("X:"), 1.0, 0.5, + _("X:"), 0.0, 0.5, iwd->pixel_labels[0], 1, FALSE); iwd->pixel_labels[1] = gtk_label_new (_("n/a")); gtk_misc_set_alignment (GTK_MISC (iwd->pixel_labels[1]), 0.0, 0.5); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Y:"), 1.0, 0.5, + _("Y:"), 0.0, 0.5, iwd->pixel_labels[1], 1, FALSE); frame = gimp_frame_new (_("Units")); @@ -175,13 +175,13 @@ info_window_create_extended (InfoDialog *info_win, iwd->unit_labels[0] = gtk_label_new (_("n/a")); gtk_misc_set_alignment (GTK_MISC (iwd->unit_labels[0]), 0.0, 0.5); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("X:"), 1.0, 0.5, + _("X:"), 0.0, 0.5, iwd->unit_labels[0], 1, FALSE); iwd->unit_labels[1] = gtk_label_new (_("n/a")); gtk_misc_set_alignment (GTK_MISC (iwd->unit_labels[1]), 0.0, 0.5); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Y:"), 1.0, 0.5, + _("Y:"), 0.0, 0.5, iwd->unit_labels[1], 1, FALSE); diff --git a/app/gui/module-browser.c b/app/gui/module-browser.c index 279cc71948..d240c44132 100644 --- a/app/gui/module-browser.c +++ b/app/gui/module-browser.c @@ -510,7 +510,7 @@ browser_info_init (ModuleBrowser *browser, for (i = 0; i < G_N_ELEMENTS (text); i++) { label = gtk_label_new (gettext (text[i])); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, i, i + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 2); gtk_widget_show (label); diff --git a/app/gui/offset-dialog.c b/app/gui/offset-dialog.c index b1b75935bb..4ed1780b83 100644 --- a/app/gui/offset-dialog.c +++ b/app/gui/offset-dialog.c @@ -161,9 +161,9 @@ offset_dialog_new (GimpDrawable *drawable, gtk_widget_show (spinbutton); gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (off_d->off_se), - _("_X:"), 0, 0, 1.0); + _("_X:"), 0, 0, 0.0); gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (off_d->off_se), - _("_Y:"), 1, 0, 1.0); + _("_Y:"), 1, 0, 0.0); gtk_box_pack_start (GTK_BOX (vbox), off_d->off_se, FALSE, FALSE, 0); gtk_widget_show (off_d->off_se); diff --git a/app/gui/palette-import-dialog.c b/app/gui/palette-import-dialog.c index 0807770378..1112265ef3 100644 --- a/app/gui/palette-import-dialog.c +++ b/app/gui/palette-import-dialog.c @@ -258,21 +258,21 @@ palette_import_dialog_new (Gimp *gimp) gimp_container_combo_box_new (gimp->gradient_factory->container, import_dialog->context, 24, 1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - NULL, 1.0, 0.5, + NULL, 0.0, 0.5, import_dialog->gradient_combo, 1, FALSE); /* The image menu */ import_dialog->image_combo = gimp_container_combo_box_new (gimp->images, import_dialog->context, 24, 1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - NULL, 1.0, 0.5, + NULL, 0.0, 0.5, import_dialog->image_combo, 1, FALSE); /* Palette file name entry */ import_dialog->filename_entry = gimp_file_entry_new (_("Select palette file"), 0, FALSE, FALSE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, - NULL, 1.0, 0.5, + NULL, 0.0, 0.5, import_dialog->filename_entry, 1, FALSE); gtk_widget_show (import_dialog->filename_entry); @@ -316,7 +316,7 @@ palette_import_dialog_new (Gimp *gimp) gtk_entry_set_text (GTK_ENTRY (import_dialog->entry), gradient ? GIMP_OBJECT (gradient)->name : _("New Import")); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Palette _Name:"), 1.0, 0.5, + _("Palette _Name:"), 0.0, 0.5, import_dialog->entry, 2, FALSE); /* The # of colors */ diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index 98d9eec2db..dfac11ebed 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -740,7 +740,7 @@ prefs_color_button_add (GObject *config, if (button) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, button, 1, TRUE); return button; @@ -762,7 +762,7 @@ prefs_enum_combo_box_add (GObject *config, if (combo_box) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, combo_box, 1, TRUE); return combo_box; @@ -784,7 +784,7 @@ prefs_boolean_combo_box_add (GObject *config, if (menu) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, menu, 1, TRUE); return menu; @@ -808,7 +808,7 @@ prefs_spin_button_add (GObject *config, if (spinbutton) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, spinbutton, 1, TRUE); return spinbutton; @@ -827,7 +827,7 @@ prefs_memsize_entry_add (GObject *config, if (entry) gimp_table_attach_aligned (table, 0, table_row, - label, 1.0, 0.5, + label, 0.0, 0.5, entry, 1, TRUE); return entry; @@ -1101,7 +1101,7 @@ prefs_dialog_new (Gimp *gimp, combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("From _Template:"), 1.0, 0.5, + _("_Template:"), 0.0, 0.5, combo, 1, FALSE); gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo), NULL); @@ -1334,7 +1334,7 @@ prefs_dialog_new (Gimp *gimp, FALSE, FALSE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Web Browser to Use:"), 1.0, 0.5, + _("Web Browser to Use:"), 0.0, 0.5, fileselection, 1, TRUE); #endif @@ -2048,7 +2048,7 @@ prefs_dialog_new (Gimp *gimp, gettext (dirs[i].fs_label), TRUE, TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, i, - gettext (dirs[i].label), 1.0, 0.5, + gettext (dirs[i].label), 0.0, 0.5, fileselection, 1, FALSE); } } diff --git a/app/gui/resize-dialog.c b/app/gui/resize-dialog.c index c3ecd1adeb..40f764fc6c 100644 --- a/app/gui/resize-dialog.c +++ b/app/gui/resize-dialog.c @@ -289,14 +289,14 @@ resize_dialog_new (GimpViewable *viewable, gtk_widget_show (table); /* the original width & height labels */ - label = gtk_label_new (_("Original Width:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("Current Width:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Height:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("Current Height:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); @@ -315,13 +315,13 @@ resize_dialog_new (GimpViewable *viewable, /* the new size labels */ label = gtk_label_new (_("New Width:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Height:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("New Height:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); @@ -381,14 +381,14 @@ resize_dialog_new (GimpViewable *viewable, orig_labels_update (private->size_se, dialog); /* the scale ratio labels */ - label = gtk_label_new (_("Ratio X:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("X Ratio:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Y:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("Y Ratio:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); @@ -483,9 +483,9 @@ resize_dialog_new (GimpViewable *viewable, gtk_widget_show (spinbutton); gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (private->offset_se), - _("_X:"), 0, 0, 1.0); + _("_X:"), 0, 0, 0.0); gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (private->offset_se), - _("_Y:"), 1, 0, 1.0); + _("_Y:"), 1, 0, 0.0); gtk_box_pack_start (GTK_BOX (vbox), private->offset_se, FALSE, FALSE, 0); gtk_widget_show (private->offset_se); @@ -570,13 +570,13 @@ resize_dialog_new (GimpViewable *viewable, /* the print size labels */ label = gtk_label_new (_("New Width:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Height:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("New Height:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); @@ -636,14 +636,14 @@ resize_dialog_new (GimpViewable *viewable, dialog); /* the resolution labels */ - label = gtk_label_new (_("Resolution X:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("X Resolution:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Y:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + label = gtk_label_new (_("Y Resolution:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); diff --git a/app/tools/gimpblendoptions.c b/app/tools/gimpblendoptions.c index 0aab3f2acc..50942b5e31 100644 --- a/app/tools/gimpblendoptions.c +++ b/app/tools/gimpblendoptions.c @@ -265,13 +265,13 @@ gimp_blend_options_gui (GimpToolOptions *tool_options) gimp_enum_combo_box_set_stock_prefix (GIMP_ENUM_COMBO_BOX (combo), "gimp-gradient"); gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, - _("Shape:"), 1.0, 0.5, + _("Shape:"), 0.0, 0.5, combo, 2, TRUE); /* the repeat option */ combo = gimp_prop_enum_combo_box_new (config, "gradient-repeat", 0, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 5, - _("Repeat:"), 1.0, 0.5, + _("Repeat:"), 0.0, 0.5, combo, 2, TRUE); g_signal_connect (config, "notify::gradient-type", diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c index d705b3a1c1..64b02f2515 100644 --- a/app/tools/gimpcroptool.c +++ b/app/tools/gimpcroptool.c @@ -1018,7 +1018,8 @@ crop_info_create (GimpCropTool *crop) _("Origin X:"), NULL, -1, 1, 1, 10, 1, 1, 2, NULL, NULL); crop->origin_sizeentry = - info_dialog_add_sizeentry (crop->crop_info, _("Y:"), crop->orig_vals, 1, + info_dialog_add_sizeentry (crop->crop_info, + _("Origin Y:"), crop->orig_vals, 1, shell->dot_for_dot ? GIMP_UNIT_PIXEL : gdisp->gimage->unit, "%a", TRUE, TRUE, FALSE, GIMP_SIZE_ENTRY_UPDATE_SIZE, diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c index 760a6a93f2..35707dc0de 100644 --- a/app/tools/gimpmeasuretool.c +++ b/app/tools/gimpmeasuretool.c @@ -860,7 +860,7 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *mtool) label = gtk_label_new (_("Distance:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1); gtk_widget_show (label); @@ -886,7 +886,7 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *mtool) label = gtk_label_new (_("Angle:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2); gtk_widget_show (label); diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c index ae198231b4..262692abce 100644 --- a/app/tools/gimppaintoptions-gui.c +++ b/app/tools/gimppaintoptions-gui.c @@ -119,7 +119,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options) /* the paint mode menu */ optionmenu = gimp_prop_paint_mode_menu_new (config, "paint-mode", TRUE); mode_label = gimp_table_attach_aligned (GTK_TABLE (table), 0, table_row++, - _("Mode:"), 1.0, 0.5, + _("Mode:"), 0.0, 0.5, optionmenu, 2, TRUE); if (tool_type == GIMP_TYPE_ERASER_TOOL || @@ -145,7 +145,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options) _("Open the brush selection dialog")); gimp_table_attach_aligned (GTK_TABLE (table), 0, table_row++, - _("Brush:"), 1.0, 0.5, + _("Brush:"), 0.0, 0.5, button, 2, TRUE); } @@ -162,7 +162,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options) _("Open the pattern selection dialog")); gimp_table_attach_aligned (GTK_TABLE (table), 0, table_row++, - _("Pattern:"), 1.0, 0.5, + _("Pattern:"), 0.0, 0.5, button, 2, TRUE); } @@ -198,7 +198,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options) gtk_widget_show (button); gimp_table_attach_aligned (GTK_TABLE (table), 0, table_row++, - _("Gradient:"), 1.0, 0.5, + _("Gradient:"), 0.0, 0.5, hbox, 2, FALSE); preview = GTK_BIN (gradient_button)->child; @@ -409,7 +409,7 @@ fade_options_gui (GimpFadeOptions *fade, gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 6); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Length:"), 1.0, 0.5, + _("Length:"), 0.0, 0.5, spinbutton, 1, FALSE); /* the fade-out unitmenu */ @@ -467,7 +467,7 @@ gradient_options_gui (GimpGradientOptions *gradient, gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 6); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Length:"), 1.0, 0.5, + _("Length:"), 0.0, 0.5, spinbutton, 1, FALSE); /* the gradient unitmenu */ @@ -481,7 +481,7 @@ gradient_options_gui (GimpGradientOptions *gradient, /* the repeat type */ combo = gimp_prop_enum_combo_box_new (config, "gradient-repeat", 0, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Repeat:"), 1.0, 0.5, + _("Repeat:"), 0.0, 0.5, combo, 2, TRUE); gtk_widget_show (table); diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c index c825808fa3..57064922d4 100644 --- a/app/tools/gimpscaletool.c +++ b/app/tools/gimpscaletool.c @@ -179,7 +179,7 @@ gimp_scale_tool_dialog (GimpTransformTool *tr_tool) NULL, -1, 1, 1, 10, 1, 1, 2, NULL, NULL); sizeentry = info_dialog_add_sizeentry (tr_tool->info_dialog, - _("Height:"), + _("Current Height:"), size_vals, 1, GIMP_UNIT_PIXEL, "%a", TRUE, TRUE, FALSE, @@ -197,7 +197,7 @@ gimp_scale_tool_dialog (GimpTransformTool *tr_tool) _("Scale Ratio X:"), x_ratio_buf); info_dialog_add_label (tr_tool->info_dialog, - _("Y:"), + _("Scale Ratio Y:"), y_ratio_buf); gtk_table_set_row_spacing (GTK_TABLE (tr_tool->info_dialog->info_table), diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c index 170614fa60..911b7fb426 100644 --- a/app/tools/gimpselectionoptions.c +++ b/app/tools/gimpselectionoptions.c @@ -563,7 +563,7 @@ gimp_selection_options_gui (GimpToolOptions *tool_options) gtk_entry_set_width_chars (GTK_ENTRY (width_spinbutton), 6); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Width:"), 1.0, 0.5, + _("Width:"), 0.0, 0.5, width_spinbutton, 1, FALSE); height_spinbutton = gimp_prop_spin_button_new (config, "fixed-height", @@ -571,7 +571,7 @@ gimp_selection_options_gui (GimpToolOptions *tool_options) gtk_entry_set_width_chars (GTK_ENTRY (height_spinbutton), 6); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Height:"), 1.0, 0.5, + _("Height:"), 0.0, 0.5, height_spinbutton, 1, FALSE); menu = gimp_prop_unit_menu_new (config, "fixed-unit", "%a"); diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c index b95dc04e7d..e7b5b1f41c 100644 --- a/app/tools/gimpsheartool.c +++ b/app/tools/gimpsheartool.c @@ -172,7 +172,7 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool) tr_tool); info_dialog_add_spinbutton (tr_tool->info_dialog, - _("Y:"), + _("Shear Magnitude Y:"), &yshear_val, -65536, 65536, 1, 15, 1, 1, 0, G_CALLBACK (shear_y_mag_changed), diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c index 043dcdd42e..82b07dd0c1 100644 --- a/app/tools/gimptextoptions.c +++ b/app/tools/gimptextoptions.c @@ -426,7 +426,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options) _("Open the font selection dialog")); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("_Font:"), 1.0, 0.5, + _("_Font:"), 0.0, 0.5, button, 2, TRUE); entry = gimp_prop_size_entry_new (config, @@ -434,7 +434,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options) GIMP_SIZE_ENTRY_UPDATE_SIZE, 72.0); gimp_table_attach_aligned (GTK_TABLE (table), 0, row, - _("_Size:"), 1.0, 0.5, + _("_Size:"), 0.0, 0.5, entry, 2, FALSE); gtk_widget_show (entry); row++; @@ -442,14 +442,14 @@ gimp_text_options_gui (GimpToolOptions *tool_options) options->size_entry = GIMP_SIZE_ENTRY (entry); button = gimp_prop_check_button_new (config, "hinting", _("_Hinting")); - gtk_table_attach (GTK_TABLE (table), button, 1, 3, row, row + 1, + gtk_table_attach (GTK_TABLE (table), button, 0, 3, row, row + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (button); row++; auto_button = gimp_prop_check_button_new (config, "autohint", _("Force Auto-Hinter")); - gtk_table_attach (GTK_TABLE (table), auto_button, 1, 3, row, row + 1, + gtk_table_attach (GTK_TABLE (table), auto_button, 0, 3, row, row + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (auto_button); row++; @@ -458,7 +458,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options) g_object_set_data (G_OBJECT (button), "set_sensitive", auto_button); button = gimp_prop_check_button_new (config, "antialias", _("Antialiasing")); - gtk_table_attach (GTK_TABLE (table), button, 1, 3, row, row + 1, + gtk_table_attach (GTK_TABLE (table), button, 0, 3, row, row + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (button); row++; @@ -468,18 +468,18 @@ gimp_text_options_gui (GimpToolOptions *tool_options) gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), GIMP_CONTEXT (options)); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("Color:"), 1.0, 0.5, + _("Color:"), 0.0, 0.5, button, 1, FALSE); box = gimp_prop_enum_stock_box_new (config, "justify", "gtk-justify", 0, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("Justify:"), 1.0, 0.5, + _("Justify:"), 0.0, 0.5, box, 2, TRUE); spinbutton = gimp_prop_spin_button_new (config, "indent", 1.0, 10.0, 1); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("Indent:"), 1.0, 0.5, + _("Indent:"), 0.0, 0.5, spinbutton, 1, FALSE); spinbutton = gimp_prop_spin_button_new (config, "line-spacing", 1.0, 10.0, 1); diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c index 94daaca1f3..45ab996674 100644 --- a/app/widgets/gimpcolormapeditor.c +++ b/app/widgets/gimpcolormapeditor.c @@ -380,7 +380,7 @@ gimp_colormap_editor_new (GimpImage *gimage, gimp_spin_button_new ((GtkObject **) &editor->index_adjustment, 0, 0, 0, 1, 10, 10, 1.0, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Color Index:"), 1.0, 0.5, + _("Color Index:"), 0.0, 0.5, editor->index_spinbutton, 1, TRUE); g_signal_connect (editor->index_adjustment, "value_changed", @@ -391,7 +391,7 @@ gimp_colormap_editor_new (GimpImage *gimage, gtk_entry_set_width_chars (GTK_ENTRY (editor->color_entry), 8); gtk_entry_set_max_length (GTK_ENTRY (editor->color_entry), 6); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("He_x Triplet:"), 1.0, 0.5, + _("He_x Triplet:"), 0.0, 0.5, editor->color_entry, 1, TRUE); g_signal_connect (editor->color_entry, "activate", diff --git a/app/widgets/gimpgrideditor.c b/app/widgets/gimpgrideditor.c index b8dfd391cd..16a8613fa1 100644 --- a/app/widgets/gimpgrideditor.c +++ b/app/widgets/gimpgrideditor.c @@ -213,7 +213,7 @@ gimp_grid_editor_constructor (GType type, GIMP_GRID_DOTS, GIMP_GRID_SOLID); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Line _Style:"), 1.0, 0.5, + _("Line _Style:"), 0.0, 0.5, style, 1, TRUE); color_button = gimp_prop_color_button_new (G_OBJECT (editor->grid), "fgcolor", @@ -222,7 +222,7 @@ gimp_grid_editor_constructor (GType type, GRID_EDITOR_COLOR_BUTTON_SIZE, GIMP_COLOR_AREA_FLAT); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("_Foreground Color:"), 1.0, 0.5, + _("_Foreground Color:"), 0.0, 0.5, color_button, 1, TRUE); color_button = gimp_prop_color_button_new (G_OBJECT (editor->grid), "bgcolor", @@ -231,7 +231,7 @@ gimp_grid_editor_constructor (GType type, GRID_EDITOR_COLOR_BUTTON_SIZE, GIMP_COLOR_AREA_FLAT); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, - _("_Background Color:"), 1.0, 0.5, + _("_Background Color:"), 0.0, 0.5, color_button, 1, TRUE); gtk_widget_show (table); diff --git a/app/widgets/gimphistogrameditor.c b/app/widgets/gimphistogrameditor.c index 600baacff4..5962d1ca3d 100644 --- a/app/widgets/gimphistogrameditor.c +++ b/app/widgets/gimphistogrameditor.c @@ -192,7 +192,7 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor) gint y = (i % 3); label = gtk_label_new (gettext (gimp_histogram_editor_labels[i])); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, x, x + 1, y, y + 1, GTK_FILL, GTK_FILL, 2, 2); gtk_widget_show (label); diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index fc8b47357f..526c687631 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -298,7 +298,7 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view) gtk_widget_show (image); gimp_table_attach_aligned (GTK_TABLE (view->options_box), 0, 0, - _("Mode:"), 1.0, 0.5, + _("Mode:"), 0.0, 0.5, hbox, 2, FALSE); /* Opacity scale */ diff --git a/app/widgets/gimpstrokeeditor.c b/app/widgets/gimpstrokeeditor.c index 1643675ed2..e671a93448 100644 --- a/app/widgets/gimpstrokeeditor.c +++ b/app/widgets/gimpstrokeeditor.c @@ -225,13 +225,13 @@ gimp_stroke_editor_constructor (GType type, box = gimp_prop_enum_stock_box_new (G_OBJECT (editor->options), "cap-style", "gimp-cap", 0, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("_Cap Style:"), 1.0, 0.5, + _("_Cap Style:"), 0.0, 0.5, box, 2, TRUE); box = gimp_prop_enum_stock_box_new (G_OBJECT (editor->options), "join-style", "gimp-join", 0, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("_Join Style:"), 1.0, 0.5, + _("_Join Style:"), 0.0, 0.5, box, 2, TRUE); gimp_prop_scale_entry_new (G_OBJECT (editor->options), "miter", @@ -278,7 +278,7 @@ gimp_stroke_editor_constructor (GType type, gtk_container_add (GTK_CONTAINER (frame), box); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("Dash Pattern:"), 1.0, 0.5, frame, 2, FALSE); + _("Dash Pattern:"), 0.0, 0.5, frame, 2, FALSE); box = gimp_enum_combo_box_new (GIMP_TYPE_DASH_PRESET); gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (box), GIMP_DASH_CUSTOM); @@ -290,7 +290,7 @@ gimp_stroke_editor_constructor (GType type, box, G_CONNECT_SWAPPED); gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, - _("Dash Preset:"), 1.0, 0.5, box, 2, TRUE); + _("Dash Preset:"), 0.0, 0.5, box, 2, TRUE); gtk_widget_show (box); diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c index d76cecfd96..980f370794 100644 --- a/app/widgets/gimptemplateeditor.c +++ b/app/widgets/gimptemplateeditor.c @@ -320,13 +320,13 @@ gimp_template_editor_constructor (GType type, gtk_widget_show (table); /* the resolution labels */ - label = gtk_label_new (_("Resolution X:")); + label = gtk_label_new (_("X Resolution:")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (label); - label = gtk_label_new (_("Resolution Y:")); + label = gtk_label_new (_("Y Resolution:")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c index c3ce586b36..586338d91a 100644 --- a/app/widgets/gimpwidgets-utils.c +++ b/app/widgets/gimpwidgets-utils.c @@ -446,8 +446,8 @@ gimp_table_attach_stock (GtkTable *table, label = gtk_label_new_with_mnemonic (label_text); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, yalign); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, yalign); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_table_attach (table, label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (label); diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index 060926c326..195642e829 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -494,7 +494,7 @@ gimp_scale_entry_new_internal (gboolean color_scale, GtkObject *return_adj; label = gtk_label_new_with_mnemonic (text); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); if (tooltip) { @@ -1046,8 +1046,10 @@ gimp_coordinates_new (GimpUnit unit, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 0, x); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1, y); - gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry), xlabel, 0, 0, 1.0); - gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry), ylabel, 1, 0, 1.0); + gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry), + xlabel, 0, 0, 0.0); + gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry), + ylabel, 1, 0, 0.0); chainbutton = gimp_chain_button_new (GIMP_CHAIN_RIGHT); if (chainbutton_active)