Commit 32d5c889 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/tools/gimptextoptions.c dropped the labels from text tool options that

2005-09-02  Sven Neumann  <sven@gimp.org>

	* app/tools/gimptextoptions.c
	* app/widgets/gimpwidgets-utils.[ch]: dropped the labels from text
	tool options that have icons. Reduces visual clutter.
parent c482da67
2005-09-02 Sven Neumann <sven@gimp.org>
* app/tools/gimptextoptions.c
* app/widgets/gimpwidgets-utils.[ch]: dropped the labels from text
tool options that have icons. Reduces visual clutter.
2005-09-02 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell-callbacks.c
......
......@@ -476,22 +476,19 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
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:"), 0.0, 0.5,
spinbutton, 1, FALSE);
gimp_table_attach_stock (GTK_TABLE (table), row++,
GTK_STOCK_INDENT, spinbutton, 1, TRUE);
spinbutton = gimp_prop_spin_button_new (config, "line-spacing", 1.0, 10.0, 1);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
gimp_table_attach_stock (GTK_TABLE (table), row++,
_("Line\nspacing:"), 0.0,
spinbutton, 1, GIMP_STOCK_LINE_SPACING);
GIMP_STOCK_LINE_SPACING, spinbutton, 1, TRUE);
spinbutton = gimp_prop_spin_button_new (config,
"letter-spacing", 1.0, 10.0, 1);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
gimp_table_attach_stock (GTK_TABLE (table), row++,
_("Letter\nspacing:"), 0.0,
spinbutton, 1, GIMP_STOCK_LETTER_SPACING);
GIMP_STOCK_LETTER_SPACING, spinbutton, 1, TRUE);
button = gtk_button_new_with_label (_("Create Path from Text"));
gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
......
......@@ -197,46 +197,36 @@ gimp_button_menu_position (GtkWidget *button,
void
gimp_table_attach_stock (GtkTable *table,
gint row,
const gchar *label_text,
gdouble yalign,
const gchar *stock_id,
GtkWidget *widget,
gint colspan,
const gchar *stock_id)
gboolean left_align)
{
GtkWidget *image;
GtkWidget *label;
g_return_if_fail (GTK_IS_TABLE (table));
g_return_if_fail (label_text != NULL);
label = gtk_label_new_with_mnemonic (label_text);
g_return_if_fail (stock_id != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
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,
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
gtk_misc_set_alignment (GTK_MISC (image), 1.0, 0.5);
gtk_table_attach (table, image, 0, 1, row, row + 1,
GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
gtk_widget_show (image);
if (widget)
if (left_align)
{
g_return_if_fail (GTK_IS_WIDGET (widget));
GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
gtk_table_attach (table, widget, 1, 1 + colspan, row, row + 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
gtk_widget_show (widget);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
widget = hbox;
}
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
if (image)
{
gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.5);
gtk_table_attach (table, image, 1 + colspan, 2 + colspan, row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (image);
}
gtk_table_attach (table, widget, 1, 1 + colspan, row, row + 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (widget);
}
void
......
......@@ -34,11 +34,10 @@ void gimp_button_menu_position (GtkWidget *button,
void gimp_table_attach_stock (GtkTable *table,
gint row,
const gchar *label_text,
gdouble yalign,
const gchar *stock_id,
GtkWidget *widget,
gint colspan,
const gchar *stock_id);
gboolean left_align);
void gimp_enum_radio_frame_add (GtkFrame *frame,
GtkWidget *widget,
gint enum_value);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment