Commit bf53c3b2 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

removed GIMP_PARAM_RESTART from "marching-ants-speed".

2002-11-24  Michael Natterer  <mitch@gimp.org>

	* app/config/gimpdisplayconfig.c: removed GIMP_PARAM_RESTART from
	"marching-ants-speed".

	* app/display/gimpdisplayshell-selection.[ch]: removed the "speed"
	parameter from the constructor and get the speed from
	GimpDisplayConfig when starting the ants.

	* app/display/gimpdisplayshell-callbacks.c: changed accordingly.

	* app/display/gimpdisplayshell-handlers.c: connect to
	notify::marching-ants-speed and restart the ants in the handler.

	* app/gui/preferences-dialog.c: Added an own frame for the
	canvas padding color. Even more cleanup.

	* themes/Default/images/preferences/Makefile.am
	* themes/Default/images/preferences/image-title.png: new image
	for the new page. copied image-windows.png
parent 4ce4adf8
2002-11-24 Michael Natterer <mitch@gimp.org>
* app/config/gimpdisplayconfig.c: removed GIMP_PARAM_RESTART from
"marching-ants-speed".
* app/display/gimpdisplayshell-selection.[ch]: removed the "speed"
parameter from the constructor and get the speed from
GimpDisplayConfig when starting the ants.
* app/display/gimpdisplayshell-callbacks.c: changed accordingly.
* app/display/gimpdisplayshell-handlers.c: connect to
notify::marching-ants-speed and restart the ants in the handler.
* app/gui/preferences-dialog.c: Added an own frame for the
canvas padding color. Even more cleanup.
* themes/Default/images/preferences/Makefile.am
* themes/Default/images/preferences/image-title.png: new image
for the new page. copied image-windows.png
2002-11-23 Michael Natterer <mitch@gimp.org>
 
* app/config/gimpconfig-utils.[ch]: removed
......
......@@ -124,7 +124,7 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_MARCHING_ANTS_SPEED,
"marching-ants-speed",
50, G_MAXINT, 300,
GIMP_PARAM_RESTART);
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_COLORMAP_CYCLING,
"colormap-cycling",
FALSE,
......
......@@ -520,7 +520,7 @@ prefs_notebook_append_page (Gimp *gimp,
gimp_help_set_help_data (event_box, NULL, help_data);
vbox = gtk_vbox_new (FALSE, 2);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (event_box), vbox);
gtk_widget_show (vbox);
......@@ -634,6 +634,29 @@ prefs_frame_new (gchar *label,
frame = gtk_frame_new (label);
if (FALSE)
{
PangoAttrList *attrs;
PangoAttribute *attr;
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
attrs = pango_attr_list_new ();
attr = pango_attr_scale_new (PANGO_SCALE_LARGE);
attr->start_index = 0;
attr->end_index = -1;
pango_attr_list_insert (attrs, attr);
attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
attr->start_index = 0;
attr->end_index = -1;
pango_attr_list_insert (attrs, attr);
gtk_label_set_attributes (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))), attrs);
pango_attr_list_unref (attrs);
}
if (GTK_IS_BOX (parent))
gtk_box_pack_start (GTK_BOX (parent), frame, expand, expand, 0);
else
......@@ -1046,13 +1069,12 @@ prefs_dialog_new (Gimp *gimp,
/* select this page in the tree */
gtk_tree_selection_select_iter (sel, &top_iter);
frame = gtk_frame_new (_("Default Image Size and Unit"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
/* Default Image Size and Unit */
vbox2 = prefs_frame_new (_("Default Image Size and Unit"),
GTK_CONTAINER (vbox), FALSE);
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_container_add (GTK_CONTAINER (vbox2), hbox);
gtk_widget_show (hbox);
sizeentry = gimp_prop_coordinates_new (config,
......@@ -1077,13 +1099,12 @@ prefs_dialog_new (Gimp *gimp,
gtk_box_pack_start (GTK_BOX (hbox), sizeentry, FALSE, FALSE, 0);
gtk_widget_show (sizeentry);
frame = gtk_frame_new (_("Default Image Resolution and Resolution Unit"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
/* Default Image Resolution and Resolution Unit */
vbox2 = prefs_frame_new (_("Default Image Resolution and Resolution Unit"),
GTK_CONTAINER (vbox), FALSE);
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_container_add (GTK_CONTAINER (vbox2), hbox);
gtk_widget_show (hbox);
pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL);
......@@ -1142,16 +1163,16 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
frame = gtk_frame_new (_("Comment Used for New Images"));
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
/* Comment */
vbox2 = prefs_frame_new (_("Comment Used for New Images"),
GTK_CONTAINER (vbox), TRUE);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 4);
gtk_container_add (GTK_CONTAINER (frame), scrolled_window);
gtk_container_add (GTK_CONTAINER (vbox2), scrolled_window);
gtk_widget_show (scrolled_window);
text_buffer = gimp_prop_text_buffer_new (config, "default-comment",
......@@ -1179,8 +1200,8 @@ prefs_dialog_new (Gimp *gimp,
&top_iter,
page_index++);
/* General */
vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (4, GTK_CONTAINER (vbox2), FALSE);
prefs_enum_option_menu_add (config, "preview-size", 0, 0,
......@@ -1246,6 +1267,7 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
/* General */
vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
prefs_check_button_add (config, "show-tool-tips",
......@@ -1258,8 +1280,8 @@ prefs_dialog_new (Gimp *gimp,
_("Show Tips on _Startup"),
GTK_BOX (vbox2));
/* Help Browser */
vbox2 = prefs_frame_new (_("Help Browser"), GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (1, GTK_CONTAINER (vbox2), FALSE);
prefs_enum_option_menu_add (config, "help-browser", 0, 0,
......@@ -1281,21 +1303,18 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
/* Contiguous Regions */
vbox2 = prefs_frame_new (_("Finding Contiguous Regions"),
GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (1, GTK_CONTAINER (vbox2), FALSE);
/* Default threshold */
prefs_spin_button_add (config, "default-threshold", 1.0, 5.0, 0,
_("Default _Threshold:"),
GTK_TABLE (table), 0);
frame = gtk_frame_new (_("Scaling"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = prefs_table_new (1, GTK_CONTAINER (frame), TRUE);
/* Scaling */
vbox2 = prefs_frame_new (_("Scaling"), GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (1, GTK_CONTAINER (vbox2), TRUE);
prefs_enum_option_menu_add (config, "interpolation-type", 0, 0,
_("Default _Interpolation:"),
......@@ -1316,6 +1335,7 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
/* Input Device Settings */
vbox2 = prefs_frame_new (_("Input Device Settings"),
GTK_CONTAINER (vbox), FALSE);
......@@ -1385,6 +1405,7 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
/* Appearance */
vbox2 = prefs_frame_new (_("Appearance"), GTK_CONTAINER (vbox), FALSE);
prefs_check_button_add (config, "default-dot-for-dot",
......@@ -1403,19 +1424,26 @@ prefs_dialog_new (Gimp *gimp,
_("Show S_tatusbar"),
GTK_BOX (vbox2));
table = prefs_table_new (3, GTK_CONTAINER (vbox2), FALSE);
table = prefs_table_new (1, GTK_CONTAINER (vbox2), FALSE);
prefs_spin_button_add (config, "marching-ants-speed", 10.0, 100.0, 0,
_("Marching _Ants Speed:"),
GTK_TABLE (table), 0);
/* Canvas Padding Color */
vbox2 = prefs_frame_new (_("Canvas Padding Color"),
GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (2, GTK_CONTAINER (vbox2), FALSE);
prefs_enum_option_menu_add (config, "canvas-padding-mode", 0, 0,
_("Canvas Padding Mode:"),
GTK_TABLE (table), 1);
_("Padding Mode:"),
GTK_TABLE (table), 0);
prefs_color_button_add (config, "canvas-padding-color",
_("Custom Canvas _Padding Color:"),
_("Custom Color:"),
_("Select Custom Canvas Padding Color"),
GTK_TABLE (table), 2);
GTK_TABLE (table), 1);
/* Pointer Movement Feedback */
vbox2 = prefs_frame_new (_("Pointer Movement Feedback"),
GTK_CONTAINER (vbox), FALSE);
......@@ -1439,7 +1467,7 @@ prefs_dialog_new (Gimp *gimp,
vbox = prefs_notebook_append_page (gimp,
GTK_NOTEBOOK (notebook),
_("Image Title & Statusbar Format"),
"image-windows.png",
"image-title.png",
GTK_TREE_STORE (tree),
_("Title & Status"),
"dialogs/preferences/image_windows.html",
......@@ -1577,11 +1605,9 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
frame = gtk_frame_new (_("Transparency"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = prefs_table_new (2, GTK_CONTAINER (frame), TRUE);
/* Transparency */
vbox2 = prefs_frame_new (_("Transparency"), GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (2, GTK_CONTAINER (vbox2), TRUE);
prefs_enum_option_menu_add (config, "transparency-type", 0, 0,
_("Transparency _Type:"),
......@@ -1590,6 +1616,7 @@ prefs_dialog_new (Gimp *gimp,
_("Check _Size:"),
GTK_TABLE (table), 1);
/* 8-Bit Displays */
vbox2 = prefs_frame_new (_("8-Bit Displays"), GTK_CONTAINER (vbox), FALSE);
if (gdk_rgb_get_visual ()->depth != 8)
......@@ -1736,6 +1763,7 @@ prefs_dialog_new (Gimp *gimp,
&top_iter,
page_index++);
/* Resource Consumption */
vbox2 = prefs_frame_new (_("Resource Consumption"),
GTK_CONTAINER (vbox), FALSE);
......@@ -1762,8 +1790,8 @@ prefs_dialog_new (Gimp *gimp,
GTK_TABLE (table), 2);
#endif /* ENABLE_MP */
/* File Saving */
vbox2 = prefs_frame_new (_("File Saving"), GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (2, GTK_CONTAINER (vbox2), TRUE);
prefs_boolean_option_menu_add (config, "trust-dirty-flag",
......
......@@ -261,8 +261,7 @@ gimp_display_shell_canvas_realize (GtkWidget *canvas,
shell->select = gimp_display_shell_selection_create (canvas->window,
shell,
gdisp->gimage->height,
gdisp->gimage->width,
config->marching_ants_speed);
gdisp->gimage->width);
shell->disp_width = canvas->allocation.width;
shell->disp_height = canvas->allocation.height;
......
......@@ -34,6 +34,7 @@
#include "gimpdisplayshell-callbacks.h"
#include "gimpdisplayshell-handlers.h"
#include "gimpdisplayshell-scale.h"
#include "gimpdisplayshell-selection.h"
#include "gimpstatusbar.h"
......@@ -78,6 +79,9 @@ static void gimp_display_shell_monitor_res_notify_handler (GObject *c
static void gimp_display_shell_padding_notify_handler (GObject *config,
GParamSpec *param_spec,
GimpDisplayShell *shell);
static void gimp_display_shell_ants_speed_notify_handler (GObject *config,
GParamSpec *param_spec,
GimpDisplayShell *shell);
static gboolean gimp_display_shell_idle_update_icon (gpointer data);
......@@ -173,6 +177,10 @@ gimp_display_shell_connect (GimpDisplayShell *shell)
"notify::canvas-padding-color",
G_CALLBACK (gimp_display_shell_padding_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
"notify::marching-ants-speed",
G_CALLBACK (gimp_display_shell_ants_speed_notify_handler),
shell);
gimp_display_shell_invalidate_preview_handler (gimage, shell);
gimp_display_shell_qmask_changed_handler (gimage, shell);
......@@ -195,6 +203,9 @@ gimp_display_shell_disconnect (GimpDisplayShell *shell)
shell->icon_idle_id = 0;
}
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage->gimp->config),
gimp_display_shell_ants_speed_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage->gimp->config),
gimp_display_shell_padding_notify_handler,
shell);
......@@ -434,6 +445,15 @@ gimp_display_shell_padding_notify_handler (GObject *config,
}
}
static void
gimp_display_shell_ants_speed_notify_handler (GObject *config,
GParamSpec *param_spec,
GimpDisplayShell *shell)
{
gimp_display_shell_selection_pause (shell->select);
gimp_display_shell_selection_resume (shell->select);
}
static gboolean
gimp_display_shell_idle_update_icon (gpointer data)
{
......
......@@ -68,10 +68,10 @@ static gboolean selection_start_marching (gpointer data);
static gboolean selection_march_ants (gpointer data);
static GdkColor marching_ants_colors[8];
static GdkColor marching_ants_colors[8];
static GdkPixmap * marching_ants[9] = { NULL };
static GdkPixmap * cycled_ants_pixmap = NULL;
static GdkPixmap *marching_ants[9] = { NULL };
static GdkPixmap *cycled_ants_pixmap = NULL;
/* public functions */
......@@ -80,8 +80,7 @@ Selection *
gimp_display_shell_selection_create (GdkWindow *win,
GimpDisplayShell *shell,
gint size,
gint width,
gint speed)
gint width)
{
GdkColor fg, bg;
Selection *new;
......@@ -90,7 +89,7 @@ gimp_display_shell_selection_create (GdkWindow *win,
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
new = g_new (Selection, 1);
new = g_new0 (Selection, 1);
base_type = gimp_image_base_type (shell->gdisp->gimage);
if (GIMP_DISPLAY_CONFIG (shell->gdisp->gimage->gimp->config)->colormap_cycling)
......@@ -133,7 +132,6 @@ gimp_display_shell_selection_create (GdkWindow *win,
new->state = INVISIBLE;
new->paused = 0;
new->recalc = TRUE;
new->speed = speed;
new->hidden = FALSE;
new->layer_hidden = FALSE;
......@@ -215,7 +213,7 @@ gimp_display_shell_selection_create (GdkWindow *win,
void
gimp_display_shell_selection_free (Selection *select)
{
if (select->state != INVISIBLE)
if (select->timeout_id)
g_source_remove (select->timeout_id);
if (select->gc_in)
......@@ -238,15 +236,15 @@ gimp_display_shell_selection_free (Selection *select)
void
gimp_display_shell_selection_pause (Selection *select)
{
if (select->state != INVISIBLE)
if (select->timeout_id)
{
g_source_remove (select->timeout_id);
select->timeout_id = 0;
select->state = INVISIBLE;
}
select->paused ++;
select->state = INVISIBLE;
select->paused++;
}
......@@ -282,10 +280,11 @@ gimp_display_shell_selection_start (Selection *select,
if (select->paused > 0)
return;
if (select->state != INVISIBLE)
select->state = INTRO; /* The state before the first draw */
if (select->timeout_id)
g_source_remove (select->timeout_id);
select->state = INTRO; /* The state before the first draw */
select->timeout_id = g_timeout_add (INITIAL_DELAY,
selection_start_marching,
select);
......@@ -297,14 +296,14 @@ gimp_display_shell_selection_invis (Selection *select)
{
gint x1, y1, x2, y2;
if (select->state != INVISIBLE)
if (select->timeout_id)
{
g_source_remove (select->timeout_id);
select->timeout_id = 0;
select->state = INVISIBLE;
}
select->state = INVISIBLE;
/* Find the bounds of the selection */
if (gimp_display_shell_mask_bounds (select->shell, &x1, &y1, &x2, &y2))
{
......@@ -327,14 +326,14 @@ gimp_display_shell_selection_layer_invis (Selection *select)
gint x3, y3;
gint x4, y4;
if (select->state != INVISIBLE)
if (select->timeout_id)
{
g_source_remove (select->timeout_id);
select->timeout_id = 0;
select->state = INVISIBLE;
}
select->state = INVISIBLE;
if (select->segs_layer != NULL && select->num_segs_layer == 4)
{
x1 = select->segs_layer[0].x1 - 1;
......@@ -760,10 +759,13 @@ selection_free_segs (Selection *select)
static gboolean
selection_start_marching (gpointer data)
{
Selection *select;
Selection *select;
GimpDisplayConfig *config;
select = (Selection *) data;
config = GIMP_DISPLAY_CONFIG (select->shell->gdisp->gimage->gimp->config);
/* if the RECALC bit is set, reprocess the boundaries */
if (select->recalc)
{
......@@ -796,7 +798,7 @@ selection_start_marching (gpointer data)
selection_draw (select);
/* Reset the timer */
select->timeout_id = g_timeout_add (select->speed,
select->timeout_id = g_timeout_add (config->marching_ants_speed,
selection_march_ants,
select);
......
......@@ -43,7 +43,6 @@ struct _Selection
gint state; /* internal drawing state */
gint paused; /* count of pause requests */
gboolean recalc; /* flag to recalculate the selection */
gint speed; /* speed of marching ants */
gboolean hidden; /* is the selection hidden? */
gboolean layer_hidden; /* is the layer boundary hidden? */
guint timeout_id; /* timer for successive draws */
......@@ -61,8 +60,7 @@ struct _Selection
Selection * gimp_display_shell_selection_create (GdkWindow *window,
GimpDisplayShell *gdisp,
gint size,
gint width,
gint speed);
gint width);
void gimp_display_shell_selection_free (Selection *select);
void gimp_display_shell_selection_pause (Selection *select);
......
......@@ -520,7 +520,7 @@ prefs_notebook_append_page (Gimp *gimp,
gimp_help_set_help_data (event_box, NULL, help_data);
vbox = gtk_vbox_new (FALSE, 2);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (event_box), vbox);
gtk_widget_show (vbox);
......@@ -634,6 +634,29 @@ prefs_frame_new (gchar *label,
frame = gtk_frame_new (label);
if (FALSE)
{
PangoAttrList *attrs;
PangoAttribute *attr;
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
attrs = pango_attr_list_new ();
attr = pango_attr_scale_new (PANGO_SCALE_LARGE);
attr->start_index = 0;
attr->end_index = -1;
pango_attr_list_insert (attrs, attr);
attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
attr->start_index = 0;
attr->end_index = -1;
pango_attr_list_insert (attrs, attr);
gtk_label_set_attributes (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))), attrs);
pango_attr_list_unref (attrs);
}
if (GTK_IS_BOX (parent))
gtk_box_pack_start (GTK_BOX (parent), frame, expand, expand, 0);
else
......@@ -1046,13 +1069,12 @@ prefs_dialog_new (Gimp *gimp,
/* select this page in the tree */
gtk_tree_selection_select_iter (sel, &top_iter);
frame = gtk_frame_new (_("Default Image Size and Unit"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
/* Default Image Size and Unit */
vbox2 = prefs_frame_new (_("Default Image Size and Unit"),
GTK_CONTAINER (vbox), FALSE);
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_container_add (GTK_CONTAINER (vbox2), hbox);
gtk_widget_show (hbox);
sizeentry = gimp_prop_coordinates_new (config,
......@@ -1077,13 +1099,12 @@ prefs_dialog_new (Gimp *gimp,
gtk_box_pack_start (GTK_BOX (hbox), sizeentry, FALSE, FALSE, 0);
gtk_widget_show (sizeentry);
frame = gtk_frame_new (_("Default Image Resolution and Resolution Unit"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
/* Default Image Resolution and Resolution Unit */
vbox2 = prefs_frame_new (_("Default Image Resolution and Resolution Unit"),
GTK_CONTAINER (vbox), FALSE);
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_container_add (GTK_CONTAINER (vbox2), hbox);
gtk_widget_show (hbox);
pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL);
......@@ -1142,16 +1163,16 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
frame = gtk_frame_new (_("Comment Used for New Images"));
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
/* Comment */
vbox2 = prefs_frame_new (_("Comment Used for New Images"),
GTK_CONTAINER (vbox), TRUE);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 4);
gtk_container_add (GTK_CONTAINER (frame), scrolled_window);
gtk_container_add (GTK_CONTAINER (vbox2), scrolled_window);
gtk_widget_show (scrolled_window);
text_buffer = gimp_prop_text_buffer_new (config, "default-comment",
......@@ -1179,8 +1200,8 @@ prefs_dialog_new (Gimp *gimp,
&top_iter,
page_index++);
/* General */
vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (4, GTK_CONTAINER (vbox2), FALSE);
prefs_enum_option_menu_add (config, "preview-size", 0, 0,
......@@ -1246,6 +1267,7 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
/* General */
vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
prefs_check_button_add (config, "show-tool-tips",
...