Commit 70b6bd6a authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

plug-ins/Lighting/lighting_ui.c plug-ins/MapObject/mapobject_ui.c

2004-05-28  Sven Neumann  <sven@gimp.org>

	* plug-ins/Lighting/lighting_ui.c
	* plug-ins/MapObject/mapobject_ui.c
	* plug-ins/common/warp.c
	* plug-ins/gfig/gfig.c: tooltips can't be set on a GtkComboBox so
	we need to pack it into a GtkEventBox when a tooltip is needed.
parent 281eac1d
2004-05-28 Sven Neumann <sven@gimp.org>
* plug-ins/Lighting/lighting_ui.c
* plug-ins/MapObject/mapobject_ui.c
* plug-ins/common/warp.c
* plug-ins/gfig/gfig.c: tooltips can't be set on a GtkComboBox so
we need to pack it into a GtkEventBox when a tooltip is needed.
2004-05-28 Michael Natterer <mitch@gimp.org>
* app/text/gimpfont.c (gimp_font_get_popup_size)
......
......@@ -464,6 +464,7 @@ create_light_page (void)
GtkWidget *frame;
GtkWidget *table;
GtkWidget *combo;
GtkWidget *ebox;
GtkWidget *colorbutton;
GtkObject *adj;
......@@ -492,10 +493,14 @@ create_light_page (void)
G_CALLBACK (lightmenu_callback),
&mapvals.lightsource.type);
ebox = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (ebox), combo);
gtk_widget_show (combo);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("L_ight Type:"), 0.0, 0.5, combo, 1, FALSE);
_("L_ight Type:"), 0.0, 0.5, ebox, 1, FALSE);
gimp_help_set_help_data (combo, _("Type of light source to apply"), NULL);
gimp_help_set_help_data (ebox, _("Type of light source to apply"), NULL);
colorbutton = gimp_color_button_new (_("Select Lightsource Color"),
64, 16,
......@@ -541,7 +546,7 @@ create_light_page (void)
G_CALLBACK (interactive_preview_callback),
NULL);
gimp_help_set_help_data ( spin_pos_x,
gimp_help_set_help_data (spin_pos_x,
_("Light source X position in XYZ space"), NULL);
spin_pos_y = gimp_spin_button_new (&adj, mapvals.lightsource.position.y,
......@@ -558,7 +563,7 @@ create_light_page (void)
NULL);
gimp_help_set_help_data ( spin_pos_y,
gimp_help_set_help_data (spin_pos_y,
_("Light source Y position in XYZ space"), NULL);
spin_pos_z = gimp_spin_button_new (&adj, mapvals.lightsource.position.z,
......@@ -946,6 +951,7 @@ create_environment_page (void)
GtkWidget *table;
GtkWidget *frame;
GtkWidget *combo;
GtkWidget *ebox;
page = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (page), 12);
......@@ -985,10 +991,14 @@ create_environment_page (void)
G_CALLBACK (envmap_combo_callback),
NULL);
ebox = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (ebox), combo);
gtk_widget_show (combo);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("En_vironment Image:"), 0.0, 0.5,
combo, 1, FALSE);
gimp_help_set_help_data (combo, _("Environment image to use"), NULL);
ebox, 1, FALSE);
gimp_help_set_help_data (ebox, _("Environment image to use"), NULL);
gtk_widget_show (page);
......
......@@ -492,6 +492,7 @@ create_options_page (void)
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *combo;
GtkWidget *ebox;
GtkWidget *toggle;
GtkWidget *table;
GtkWidget *spinbutton;
......@@ -529,10 +530,14 @@ create_options_page (void)
G_CALLBACK (mapmenu_callback),
&mapvals.maptype);
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
ebox = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (ebox), combo);
gtk_widget_show (combo);
gimp_help_set_help_data (combo, _("Type of object to map to"), NULL);
gtk_box_pack_start (GTK_BOX (hbox), ebox, TRUE, TRUE, 0);
gtk_widget_show (ebox);
gimp_help_set_help_data (ebox, _("Type of object to map to"), NULL);
toggle = gtk_check_button_new_with_label (_("Transparent Background"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
......@@ -643,6 +648,7 @@ create_light_page (void)
GtkWidget *frame;
GtkWidget *table;
GtkWidget *combo;
GtkWidget *ebox;
GtkWidget *colorbutton;
GtkWidget *spinbutton;
GtkObject *adj;
......@@ -670,11 +676,15 @@ create_light_page (void)
G_CALLBACK (lightmenu_callback),
&mapvals.lightsource.type);
ebox = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (ebox), combo);
gtk_widget_show (combo);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Lightsource Type:"), 0.0, 0.5,
combo, 1, FALSE);
ebox, 1, FALSE);
gimp_help_set_help_data (combo, _("Type of light source to apply"), NULL);
gimp_help_set_help_data (ebox, _("Type of light source to apply"), NULL);
colorbutton = gimp_color_button_new (_("Select Lightsource Color"),
64, 16,
......
......@@ -381,6 +381,7 @@ warp_dialog (GimpDrawable *drawable)
GtkWidget *spinbutton;
GtkObject *adj;
GtkWidget *combo;
GtkWidget *ebox;
GtkSizeGroup *label_group;
GtkSizeGroup *spin_group;
GSList *group = NULL;
......@@ -659,11 +660,15 @@ warp_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_int_combo_box_get_active),
&dvals.grad_map);
gtk_table_attach (GTK_TABLE (table), combo, 2, 3, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
ebox = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (ebox), combo);
gtk_widget_show (combo);
gimp_help_set_help_data (combo, _("Gradient map selection menu"), NULL);
gtk_table_attach (GTK_TABLE (table), ebox, 2, 3, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (ebox);
gimp_help_set_help_data (ebox, _("Gradient map selection menu"), NULL);
/* ---------------------------------------------- */
......@@ -702,11 +707,15 @@ warp_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_int_combo_box_get_active),
&dvals.vector_map);
gtk_table_attach (GTK_TABLE (table), combo, 2, 3, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
ebox = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (ebox), combo);
gtk_widget_show (combo);
gimp_help_set_help_data (combo,
gtk_table_attach (GTK_TABLE (table), ebox, 2, 3, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (ebox);
gimp_help_set_help_data (ebox,
_("Fixed-direction-vector map selection menu"),
NULL);
......
......@@ -1631,15 +1631,14 @@ gfig_brush_preview (GtkWidget **pv)
GtkWidget *frame;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *ebox;
gint y;
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
hbox = gtk_hbox_new (FALSE, 6);
gtk_widget_show (hbox);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 0);
gtk_widget_show (frame);
*pv = gtk_preview_new (GTK_PREVIEW_COLOR);
......@@ -1674,15 +1673,20 @@ gfig_brush_preview (GtkWidget **pv)
G_CALLBACK (gfig_brush_combo_callback),
*pv);
gtk_container_add (GTK_CONTAINER (vbox), combo);
gimp_help_set_help_data (combo,
ebox = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (ebox), combo);
gtk_widget_show (combo);
gtk_container_add (GTK_CONTAINER (vbox), ebox);
gimp_help_set_help_data (ebox,
_("Use the brush/pencil or the airbrush when "
"drawing on the image. Pattern paints with "
"currently selected brush with a pattern. Only "
"applies to circles/ellipses if the "
"\"Approx. Circles/Ellipses\" toggle is set."),
NULL);
gtk_widget_show (combo);
gtk_widget_show (ebox);
gtk_container_add (GTK_CONTAINER (hbox), vbox);
gtk_container_add (GTK_CONTAINER (hbox), frame);
......
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