dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make sure the button_box is always interted at the very bottom of the 

2004-10-22  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpeditor.c (gimp_editor_ensure_button_box): make
	sure the button_box is always interted at the very bottom of the
	editor.

	* app/widgets/gimpviewabledialog.c: changed the "description"
	property from CONSTRUCT_ONLY to CONSTRUCT.

	* app/widgets/gimpcolormapeditor.c: show the index of the edited
	color in the color dialog and use the correct icon. Replaced label
	"Hex triplet" by "HTML notation" to be consistent with the color
	dialog. Removed wrong 2 pixel border around the table below the
	preview.
This commit is contained in:
Michael Natterer 2004-10-22 15:41:03 +00:00 committed by Michael Natterer
parent 0b43e493dd
commit 59bd430526
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2004-10-22 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpeditor.c (gimp_editor_ensure_button_box): make
sure the button_box is always interted at the very bottom of the
editor.
* app/widgets/gimpviewabledialog.c: changed the "description"
property from CONSTRUCT_ONLY to CONSTRUCT.
* app/widgets/gimpcolormapeditor.c: show the index of the edited
color in the color dialog and use the correct icon. Replaced label
"Hex triplet" by "HTML notation" to be consistent with the color
dialog. Removed wrong 2 pixel border around the table below the
preview.
2004-10-22 Sven Neumann <sven@gimp.org>
* plug-ins/common/wmf.c: fixed non-interactive call with default

15
app/widgets/gimpcolormapeditor.c
View File

@ -241,7 +241,6 @@ gimp_colormap_editor_init (GimpColormapEditor *editor)
/* Some helpful hints */
table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
gtk_box_pack_end (GTK_BOX (editor), table, FALSE, FALSE, 0);
@ -262,7 +261,7 @@ gimp_colormap_editor_init (GimpColormapEditor *editor)
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:"), 0.0, 0.5,
_("HTML notation:"), 0.0, 0.5,
editor->color_entry, 1, TRUE);
g_signal_connect (editor->color_entry, "activate",
@ -874,7 +873,8 @@ gimp_colormap_edit_clicked (GtkWidget *widget,
if (gimage)
{
GimpRGB color;
GimpRGB color;
gchar *desc;
gimp_rgba_set_uchar (&color,
gimage->cmap[editor->col_index * 3],
@ -882,6 +882,8 @@ gimp_colormap_edit_clicked (GtkWidget *widget,
gimage->cmap[editor->col_index * 3 + 2],
OPAQUE_OPACITY);
desc = g_strdup_printf (_("Edit colormap entry #%d"), editor->col_index);
if (! editor->color_dialog)
{
GimpDialogFactory *toplevel_factory;
@ -891,8 +893,8 @@ gimp_colormap_edit_clicked (GtkWidget *widget,
editor->color_dialog =
gimp_color_dialog_new (GIMP_VIEWABLE (gimage),
_("Edit Colormap Entry"),
GIMP_STOCK_CONVERT_INDEXED,
_("Edit colormap entry"),
GIMP_STOCK_INDEXED_PALETTE,
desc,
GTK_WIDGET (editor),
toplevel_factory,
"gimp-colormap-editor-color-dialog",
@ -911,10 +913,13 @@ gimp_colormap_edit_clicked (GtkWidget *widget,
{
gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (editor->color_dialog),
GIMP_VIEWABLE (gimage));
g_object_set (editor->color_dialog, "description", desc, NULL);
gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (editor->color_dialog),
&color);
}
g_free (desc);
gtk_window_present (GTK_WINDOW (editor->color_dialog));
}
}

1
app/widgets/gimpeditor.c
View File

@ -725,6 +725,7 @@ gimp_editor_ensure_button_box (GimpEditor *editor)
{
editor->button_box = gtk_hbox_new (TRUE, button_spacing);
gtk_box_pack_end (GTK_BOX (editor), editor->button_box, FALSE, FALSE, 0);
gtk_box_reorder_child (GTK_BOX (editor), editor->button_box, 0);
gtk_widget_show (editor->button_box);
}

2
app/widgets/gimpviewabledialog.c
View File

@ -115,7 +115,7 @@ gimp_viewable_dialog_class_init (GimpViewableDialogClass *klass)
g_param_spec_string ("description", NULL, NULL,
NULL,
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_PARENT,
g_param_spec_object ("parent", NULL, NULL,
GTK_TYPE_WIDGET,