callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins/imagemap/imap_circle.c plug-ins/imagemap/imap_cmd_gimp_guides.c

Browse Source 
2004-10-25  Sven Neumann  <sven@gimp.org>

	* plug-ins/imagemap/imap_circle.c
	* plug-ins/imagemap/imap_cmd_gimp_guides.c
	* plug-ins/imagemap/imap_cmd_guides.c
	* plug-ins/imagemap/imap_default_dialog.[ch]
	* plug-ins/imagemap/imap_edit_area_info.c
	* plug-ins/imagemap/imap_grid.c
	* plug-ins/imagemap/imap_main.c
	* plug-ins/imagemap/imap_misc.c
	* plug-ins/imagemap/imap_polygon.c
	* plug-ins/imagemap/imap_preferences.c
	* plug-ins/imagemap/imap_rectangle.c
	* plug-ins/imagemap/imap_selection.c
	* plug-ins/imagemap/imap_source.c
	* plug-ins/imagemap/imap_toolbar.c
	* plug-ins/imagemap/imap_tools.c: reviewed for HIG
	compliance. Various other minor fixes. Closes bug #150004.
This commit is contained in:
Sven Neumann
2004-10-25 12:10:13 +00:00
committed by Sven Neumann
parent 1cea494214
commit 537890aacb
17 changed files with 370 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,22 @@
2004-10-25 Sven Neumann <sven@gimp.org>
* plug-ins/imagemap/imap_circle.c
* plug-ins/imagemap/imap_cmd_gimp_guides.c
* plug-ins/imagemap/imap_cmd_guides.c
* plug-ins/imagemap/imap_default_dialog.[ch]
* plug-ins/imagemap/imap_edit_area_info.c
* plug-ins/imagemap/imap_grid.c
* plug-ins/imagemap/imap_main.c
* plug-ins/imagemap/imap_misc.c
* plug-ins/imagemap/imap_polygon.c
* plug-ins/imagemap/imap_preferences.c
* plug-ins/imagemap/imap_rectangle.c
* plug-ins/imagemap/imap_selection.c
* plug-ins/imagemap/imap_source.c
* plug-ins/imagemap/imap_toolbar.c
* plug-ins/imagemap/imap_tools.c: reviewed for HIG
compliance. Various other minor fixes. Closes bug #150004.
2004-10-25 Kevin Cozens <kcozens@cvs.gimp.org> 2004-10-25 Kevin Cozens <kcozens@cvs.gimp.org>
* plug-ins/script-fu/scripts/test-sphere.scm: Added parameter * plug-ins/script-fu/scripts/test-sphere.scm: Added parameter
@ -21,6 +40,7 @@
2004-10-25 Sven Neumann <sven@gimp.org> 2004-10-25 Sven Neumann <sven@gimp.org>
* configure.in:
* app/Makefile.am * app/Makefile.am
* tools/Makefile.am: bumped version to 2.2.0-pre1, set app version * tools/Makefile.am: bumped version to 2.2.0-pre1, set app version
to 2.2, reset other versions to 2.0. Changed library versioning so to 2.2, reset other versions to 2.0. Changed library versioning so

1
plug-ins/imagemap/imap_circle.c
View File

@ -256,7 +256,6 @@ circle_create_info_widget(GtkWidget *frame)
table = gtk_table_new(3, 3, FALSE); table = gtk_table_new(3, 3, FALSE);
gtk_container_add(GTK_CONTAINER(frame), table); gtk_container_add(GTK_CONTAINER(frame), table);
gtk_container_set_border_width(GTK_CONTAINER(table), 0);
gtk_table_set_row_spacings(GTK_TABLE(table), 6); gtk_table_set_row_spacings(GTK_TABLE(table), 6);
gtk_table_set_col_spacings(GTK_TABLE(table), 6); gtk_table_set_col_spacings(GTK_TABLE(table), 6);

9
plug-ins/imagemap/imap_cmd_gimp_guides.c
View File

@ -152,7 +152,7 @@ make_gimp_guides_dialog(void)
gtk_widget_show(frame); gtk_widget_show(frame);
gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1); gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
hbox = gtk_hbox_new(FALSE, 1); hbox = gtk_hbox_new(FALSE, 12);
gtk_container_add(GTK_CONTAINER(frame), hbox); gtk_container_add(GTK_CONTAINER(frame), hbox);
gtk_widget_show(hbox); gtk_widget_show(hbox);
@ -190,19 +190,20 @@ make_gimp_guides_dialog(void)
gtk_container_add(GTK_CONTAINER(vbox), data->lower_border); gtk_container_add(GTK_CONTAINER(vbox), data->lower_border);
gtk_widget_show(data->lower_border); gtk_widget_show(data->lower_border);
hbox = gtk_hbox_new(FALSE, 1); hbox = gtk_hbox_new (FALSE, 6);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
gtk_table_attach_defaults(GTK_TABLE(table), hbox, 0, 2, 2, 3); gtk_table_attach_defaults(GTK_TABLE(table), hbox, 0, 2, 2, 3);
gtk_widget_show(hbox); gtk_widget_show(hbox);
label = gtk_label_new_with_mnemonic(_("_Base URL:")); label = gtk_label_new_with_mnemonic(_("_Base URL:"));
gtk_widget_show(label); gtk_widget_show(label);
gtk_container_add(GTK_CONTAINER(hbox), label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
data->url = gtk_entry_new(); data->url = gtk_entry_new();
gtk_container_add(GTK_CONTAINER(hbox), data->url); gtk_container_add(GTK_CONTAINER(hbox), data->url);
gtk_widget_show(data->url); gtk_widget_show(data->url);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), data->url);
return data; return data;
} }

117
plug-ins/imagemap/imap_cmd_guides.c
View File

@ -127,7 +127,7 @@ recalc_bounds(GtkWidget *widget, gpointer data)
} }
static GuidesDialog_t* static GuidesDialog_t*
make_guides_dialog() make_guides_dialog (void)
{ {
GuidesDialog_t *data = g_new(GuidesDialog_t, 1); GuidesDialog_t *data = g_new(GuidesDialog_t, 1);
DefaultDialog_t *dialog; DefaultDialog_t *dialog;
@ -136,86 +136,91 @@ make_guides_dialog()
GtkWidget *hbox; GtkWidget *hbox;
dialog = data->dialog = make_default_dialog(_("Create Guides")); dialog = data->dialog = make_default_dialog(_("Create Guides"));
default_dialog_set_ok_cb(dialog, guides_ok_cb, data); default_dialog_set_ok_cb (dialog, guides_ok_cb, data);
label = gtk_label_new( label = gtk_label_new (
_("Guides are pre-defined rectangles covering the image. You define\n" _("Guides are pre-defined rectangles covering the image. You define "
"them by their width, height, and spacing from each other. This\n" "them by their width, height, and spacing from each other. This "
"allows you to rapidly create the most common image map type -\n" "allows you to rapidly create the most common image map type - "
"image collection of \"thumbnails\", suitable for navigation bars.")); "image collection of \"thumbnails\", suitable for navigation bars."));
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
gtk_container_set_border_width(
GTK_CONTAINER(GTK_DIALOG(dialog->dialog)->vbox), 10);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), label,
TRUE, TRUE, 10);
gtk_widget_show(label);
data->image_dimensions = gtk_label_new(""); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog->dialog)->vbox), gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
data->image_dimensions); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show(data->image_dimensions); gtk_box_pack_start (GTK_BOX (dialog->vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
data->guide_bounds = gtk_label_new(""); data->image_dimensions = gtk_label_new ("");
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog->dialog)->vbox), gtk_misc_set_alignment (GTK_MISC (data->image_dimensions), 0.0, 0.5);
data->guide_bounds); gtk_box_pack_start (GTK_BOX (dialog->vbox),
gtk_widget_show(data->guide_bounds); data->image_dimensions, FALSE, FALSE, 0);
gtk_widget_show (data->image_dimensions);
table = default_dialog_add_table(dialog, 4, 4); data->guide_bounds = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (data->guide_bounds), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (dialog->vbox),
data->guide_bounds, FALSE, FALSE, 0);
gtk_widget_show (data->guide_bounds);
label = create_label_in_table(table, 0, 0, _("_Width:")); table = default_dialog_add_table (dialog, 4, 4);
data->width = create_spin_button_in_table(table, label, 0, 1, 32, 1, 100);
g_signal_connect(data->width, "changed", label = create_label_in_table (table, 0, 0, _("_Width:"));
G_CALLBACK(recalc_bounds), (gpointer) data); data->width = create_spin_button_in_table (table, label, 0, 1, 32, 1, 100);
g_signal_connect (data->width, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 0, 2, _("_Left Start at:")); label = create_label_in_table(table, 0, 2, _("_Left Start at:"));
data->left = create_spin_button_in_table(table, label, 0, 3, 0, 0, 100); data->left = create_spin_button_in_table (table, label, 0, 3, 0, 0, 100);
g_signal_connect(data->left, "changed", g_signal_connect (data->left, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data); G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 1, 0, _("_Height:")); label = create_label_in_table(table, 1, 0, _("_Height:"));
data->height = create_spin_button_in_table(table, label, 1, 1, 32, 1, 100); data->height = create_spin_button_in_table (table, label, 1, 1, 32, 1, 100);
g_signal_connect(data->height, "changed", g_signal_connect (data->height, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data); G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 1, 2, _("_Top Start at:")); label = create_label_in_table (table, 1, 2, _("_Top Start at:"));
data->top = create_spin_button_in_table(table, label, 1, 3, 0, 0, 100); data->top = create_spin_button_in_table (table, label, 1, 3, 0, 0, 100);
g_signal_connect(data->top, "changed", g_signal_connect (data->top, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data); G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 2, 0, _("_Horz. Spacing:")); label = create_label_in_table (table, 2, 0, _("_Horz. Spacing:"));
data->horz_spacing = create_spin_button_in_table(table, label, 2, 1, 0, 0, data->horz_spacing = create_spin_button_in_table (table, label, 2, 1, 0, 0,
100); 100);
g_signal_connect(data->horz_spacing, "changed", g_signal_connect (data->horz_spacing, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data); G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 2, 2, _("_No. Across:")); label = create_label_in_table(table, 2, 2, _("_No. Across:"));
data->no_across = create_spin_button_in_table(table, label, 2, 3, 0, 0, data->no_across = create_spin_button_in_table(table, label, 2, 3, 0, 0,
100); 100);
g_signal_connect(data->no_across, "changed", g_signal_connect (data->no_across, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data); G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 3, 0, _("_Vert. Spacing:")); label = create_label_in_table(table, 3, 0, _("_Vert. Spacing:"));
data->vert_spacing = create_spin_button_in_table(table, label, 3, 1, 0, 0, data->vert_spacing = create_spin_button_in_table(table, label, 3, 1, 0, 0,
100); 100);
g_signal_connect(data->vert_spacing, "changed", g_signal_connect (data->vert_spacing, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data); G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 3, 2, _("No. _Down:")); label = create_label_in_table(table, 3, 2, _("No. _Down:"));
data->no_down = create_spin_button_in_table(table, label, 3, 3, 0, 0, 100); data->no_down = create_spin_button_in_table (table, label, 3, 3, 0, 0, 100);
g_signal_connect(data->no_down, "changed", g_signal_connect (data->no_down, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data); G_CALLBACK(recalc_bounds), (gpointer) data);
hbox = gtk_hbox_new(FALSE, 1); hbox = gtk_hbox_new (FALSE, 6);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10); gtk_container_add (GTK_CONTAINER (dialog->vbox), hbox);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog->dialog)->vbox), hbox);
label = gtk_label_new_with_mnemonic(_("Base _URL:"));
gtk_widget_show(label);
gtk_container_add(GTK_CONTAINER(hbox), label);
data->base_url = gtk_entry_new();
gtk_container_add(GTK_CONTAINER(hbox), data->base_url);
gtk_widget_show(data->base_url);
gtk_widget_show(hbox); gtk_widget_show(hbox);
label = gtk_label_new_with_mnemonic(_("Base _URL:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
data->base_url = gtk_entry_new ();
gtk_container_add (GTK_CONTAINER(hbox), data->base_url);
gtk_widget_show(data->base_url);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), data->base_url);
return data; return data;
} }

20
plug-ins/imagemap/imap_default_dialog.c
View File

@ -94,7 +94,9 @@ make_default_dialog (const gchar *title)
data->dialog = gimp_dialog_new (title, "imagemap", data->dialog = gimp_dialog_new (title, "imagemap",
NULL, 0, NULL, 0,
gimp_standard_help_func, "plug-in-imagemap", /* gimp_standard_help_func,
"plug-in-imagemap", */
gimp_standard_help_func, NULL,
NULL); NULL);
data->apply = gtk_dialog_add_button (GTK_DIALOG (data->dialog), data->apply = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
@ -113,6 +115,12 @@ make_default_dialog (const gchar *title)
G_CALLBACK (gtk_widget_destroyed), G_CALLBACK (gtk_widget_destroyed),
&data->dialog); &data->dialog);
data->vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (data->vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (data->dialog)->vbox), data->vbox,
TRUE, TRUE, 0);
gtk_widget_show (data->vbox);
return data; return data;
} }
@ -150,8 +158,8 @@ void
default_dialog_set_label(DefaultDialog_t *dialog, gchar *text) default_dialog_set_label(DefaultDialog_t *dialog, gchar *text)
{ {
GtkWidget *label = gtk_label_new(text); GtkWidget *label = gtk_label_new(text);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), label,
TRUE, TRUE, 5); gtk_box_pack_start (GTK_BOX (dialog->vbox), label, TRUE, TRUE, 0);
gtk_widget_show(label); gtk_widget_show(label);
} }
@ -159,10 +167,12 @@ GtkWidget*
default_dialog_add_table(DefaultDialog_t *dialog, gint rows, gint cols) default_dialog_add_table(DefaultDialog_t *dialog, gint rows, gint cols)
{ {
GtkWidget *table = gtk_table_new(rows, cols, FALSE); GtkWidget *table = gtk_table_new(rows, cols, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(table), 12);
gtk_table_set_row_spacings(GTK_TABLE(table), 6); gtk_table_set_row_spacings(GTK_TABLE(table), 6);
gtk_table_set_col_spacings(GTK_TABLE(table), 6); gtk_table_set_col_spacings(GTK_TABLE(table), 6);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog->dialog)->vbox), table);
gtk_container_add (GTK_CONTAINER(dialog->vbox), table);
gtk_widget_show(table); gtk_widget_show(table);
return table; return table;
} }

5
plug-ins/imagemap/imap_default_dialog.h
View File

@ -24,12 +24,13 @@
#ifndef _IMAP_DEFAULT_DIALOG_H #ifndef _IMAP_DEFAULT_DIALOG_H
#define _IMAP_DEFAULT_DIALOG_H #define _IMAP_DEFAULT_DIALOG_H
typedef struct { typedef struct
{
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *vbox;
GtkWidget *ok; GtkWidget *ok;
GtkWidget *apply; GtkWidget *apply;
GtkWidget *cancel; GtkWidget *cancel;
GtkWidget *help;
void (*ok_cb)(gpointer); void (*ok_cb)(gpointer);
gpointer ok_cb_data; gpointer ok_cb_data;
void (*apply_cb)(gpointer); void (*apply_cb)(gpointer);

8
plug-ins/imagemap/imap_edit_area_info.c
View File

@ -189,7 +189,7 @@ create_link_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
GSList *group; GSList *group;
table = gtk_table_new(11, 1, FALSE); table = gtk_table_new(11, 1, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(table), 10); gtk_container_set_border_width(GTK_CONTAINER(table), 12);
gtk_table_set_row_spacings(GTK_TABLE(table), 6); gtk_table_set_row_spacings(GTK_TABLE(table), 6);
gtk_widget_show(table); gtk_widget_show(table);
@ -304,7 +304,7 @@ create_info_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
Object_t *obj = dialog->obj; Object_t *obj = dialog->obj;
vbox = gtk_vbox_new(FALSE, 1); vbox = gtk_vbox_new(FALSE, 1);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10); gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
gtk_widget_show(vbox); gtk_widget_show(vbox);
frame = gimp_frame_new(_("Dimensions")); frame = gimp_frame_new(_("Dimensions"));
@ -333,7 +333,7 @@ create_java_script_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
table = gtk_table_new(11, 1, FALSE); table = gtk_table_new(11, 1, FALSE);
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(table), 10); gtk_container_set_border_width(GTK_CONTAINER(table), 12);
gtk_table_set_row_spacings(GTK_TABLE(table), 6); gtk_table_set_row_spacings(GTK_TABLE(table), 6);
gtk_widget_show(table); gtk_widget_show(table);
@ -454,7 +454,7 @@ create_edit_area_info_dialog(Object_t *obj)
default_dialog_set_cancel_cb(data->dialog, edit_area_cancel_cb, data); default_dialog_set_cancel_cb(data->dialog, edit_area_cancel_cb, data);
data->notebook = notebook = gtk_notebook_new(); data->notebook = notebook = gtk_notebook_new();
gtk_container_set_border_width(GTK_CONTAINER(notebook), 10); gtk_container_set_border_width(GTK_CONTAINER(notebook), 12);
g_signal_connect_after(notebook, "switch_page", g_signal_connect_after(notebook, "switch_page",
G_CALLBACK(switch_page), (gpointer) data); G_CALLBACK(switch_page), (gpointer) data);

8
plug-ins/imagemap/imap_grid.c
View File

@ -211,7 +211,7 @@ create_grid_settings_dialog()
data->type_frame = frame = gimp_frame_new(_("Grid Visibility and Type")); data->type_frame = frame = gimp_frame_new(_("Grid Visibility and Type"));
gtk_widget_show(frame); gtk_widget_show(frame);
gtk_table_attach_defaults(GTK_TABLE(main_table), frame, 0, 2, 1, 2); gtk_table_attach_defaults(GTK_TABLE(main_table), frame, 0, 2, 1, 2);
hbox = gtk_hbox_new(FALSE, 1); hbox = gtk_hbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(frame), hbox); gtk_container_add(GTK_CONTAINER(frame), hbox);
gtk_widget_show(hbox); gtk_widget_show(hbox);
@ -219,7 +219,7 @@ create_grid_settings_dialog()
data->hidden = button; data->hidden = button;
g_signal_connect(button, "toggled", g_signal_connect(button, "toggled",
G_CALLBACK (type_toggled_cb), (gpointer) GRID_HIDDEN); G_CALLBACK (type_toggled_cb), (gpointer) GRID_HIDDEN);
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button); gtk_widget_show(button);
button = gtk_radio_button_new_with_mnemonic_from_widget( button = gtk_radio_button_new_with_mnemonic_from_widget(
@ -228,7 +228,7 @@ create_grid_settings_dialog()
g_signal_connect(button, "toggled", g_signal_connect(button, "toggled",
G_CALLBACK (type_toggled_cb), (gpointer) GRID_LINES); G_CALLBACK (type_toggled_cb), (gpointer) GRID_LINES);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button); gtk_widget_show(button);
button = gtk_radio_button_new_with_mnemonic_from_widget( button = gtk_radio_button_new_with_mnemonic_from_widget(
@ -237,7 +237,7 @@ create_grid_settings_dialog()
g_signal_connect(button, "toggled", g_signal_connect(button, "toggled",
G_CALLBACK (type_toggled_cb), G_CALLBACK (type_toggled_cb),
(gpointer) GRID_CROSSES); (gpointer) GRID_CROSSES);
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button); gtk_widget_show(button);
data->granularity_frame = frame = gimp_frame_new(_("Grid Granularity")); data->granularity_frame = frame = gimp_frame_new(_("Grid Granularity"));

3
plug-ins/imagemap/imap_main.c
View File

@ -1438,8 +1438,7 @@ dialog(GimpDrawable *drawable)
G_CALLBACK (gtk_main_quit), G_CALLBACK (gtk_main_quit),
NULL); NULL);
main_vbox = gtk_vbox_new(FALSE, 1); main_vbox = gtk_vbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 1);
gtk_container_add(GTK_CONTAINER(dlg), main_vbox); gtk_container_add(GTK_CONTAINER(dlg), main_vbox);
gtk_widget_show(main_vbox); gtk_widget_show(main_vbox);

8
plug-ins/imagemap/imap_misc.c
View File

@ -81,10 +81,10 @@ create_base_alert(const gchar *stock_id)
alert->dialog = dialog = make_default_dialog(""); alert->dialog = dialog = make_default_dialog("");
default_dialog_hide_apply_button(dialog); default_dialog_hide_apply_button(dialog);
hbox = gtk_hbox_new(FALSE, 12); hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 6); gtk_container_set_border_width (GTK_CONTAINER(hbox), 12);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), hbox, gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), hbox,
TRUE, TRUE, 10); TRUE, TRUE, 0);
gtk_widget_show(hbox); gtk_widget_show(hbox);
image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_DIALOG); image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_DIALOG);
@ -123,7 +123,7 @@ alert_set_text(Alert_t *alert, const char *primary_text,
text = text =
g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s", g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
primary_text, secondary_text); primary_text, secondary_text);
gtk_label_set_markup(GTK_LABEL(alert->label), text); gtk_label_set_markup (GTK_LABEL(alert->label), text);
g_free(text); g_free(text);
} }

4
plug-ins/imagemap/imap_polygon.c
View File

@ -450,12 +450,11 @@ polygon_create_info_widget(GtkWidget *frame)
GtkCellRenderer *renderer; GtkCellRenderer *renderer;
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
hbox = gtk_hbox_new(FALSE, 1); hbox = gtk_hbox_new(FALSE, 12);
gtk_container_add(GTK_CONTAINER(frame), hbox); gtk_container_add(GTK_CONTAINER(frame), hbox);
gtk_widget_show(hbox); gtk_widget_show(hbox);
swin = gtk_scrolled_window_new(NULL, NULL); swin = gtk_scrolled_window_new(NULL, NULL);
gtk_container_set_border_width(GTK_CONTAINER(swin), 10);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@ -491,7 +490,6 @@ polygon_create_info_widget(GtkWidget *frame)
gtk_container_add (GTK_CONTAINER (swin), view); gtk_container_add (GTK_CONTAINER (swin), view);
table = gtk_table_new(6, 3, FALSE); table = gtk_table_new(6, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(table), 10);
gtk_table_set_row_spacings(GTK_TABLE(table), 6); gtk_table_set_row_spacings(GTK_TABLE(table), 6);
gtk_table_set_col_spacings(GTK_TABLE(table), 6); gtk_table_set_col_spacings(GTK_TABLE(table), 6);
gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, FALSE); gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, FALSE);

4
plug-ins/imagemap/imap_preferences.c
View File

@ -562,12 +562,10 @@ create_preferences_dialog()
default_dialog_set_ok_cb(dialog, preferences_ok_cb, (gpointer) data); default_dialog_set_ok_cb(dialog, preferences_ok_cb, (gpointer) data);
data->notebook = notebook = gtk_notebook_new(); data->notebook = notebook = gtk_notebook_new();
gtk_container_set_border_width(GTK_CONTAINER(notebook), 10);
g_signal_connect_after(notebook, "switch_page", g_signal_connect_after(notebook, "switch_page",
G_CALLBACK(switch_page), (gpointer) data); G_CALLBACK(switch_page), (gpointer) data);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), gtk_box_pack_start (GTK_BOX (data->dialog->vbox), notebook, TRUE, TRUE, 0);
notebook, TRUE, TRUE, 10);
create_general_tab(data, notebook); create_general_tab(data, notebook);
create_menu_tab(data, notebook); create_menu_tab(data, notebook);
create_colors_tab(data, notebook); create_colors_tab(data, notebook);

1
plug-ins/imagemap/imap_rectangle.c
View File

@ -381,7 +381,6 @@ rectangle_create_info_widget(GtkWidget *frame)
table = gtk_table_new(4, 4, FALSE); table = gtk_table_new(4, 4, FALSE);
gtk_container_add(GTK_CONTAINER(frame), table); gtk_container_add(GTK_CONTAINER(frame), table);
gtk_container_set_border_width(GTK_CONTAINER(table), 0);
gtk_table_set_row_spacings(GTK_TABLE(table), 6); gtk_table_set_row_spacings(GTK_TABLE(table), 6);
gtk_table_set_col_spacings(GTK_TABLE(table), 6); gtk_table_set_col_spacings(GTK_TABLE(table), 6);

9
plug-ins/imagemap/imap_selection.c
View File

@ -27,6 +27,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "imap_commands.h" #include "imap_commands.h"
#include "imap_edit_area_info.h" #include "imap_edit_area_info.h"
#include "imap_main.h" #include "imap_main.h"
@ -160,7 +162,7 @@ make_selection_toolbar(Selection_t *data)
toolbar = gtk_toolbar_new(); toolbar = gtk_toolbar_new();
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_VERTICAL); gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width(GTK_CONTAINER(toolbar), 5); gtk_container_set_border_width(GTK_CONTAINER(toolbar), 0);
data->arrow_up = make_toolbar_stock_icon(toolbar, GTK_STOCK_GO_UP, data->arrow_up = make_toolbar_stock_icon(toolbar, GTK_STOCK_GO_UP,
"MoveUp", _("Move Up"), "MoveUp", _("Move Up"),
@ -393,7 +395,7 @@ make_selection(ObjectList_t *object_list)
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_widget_show(frame); gtk_widget_show(frame);
hbox = gtk_hbox_new(FALSE, 1); hbox = gtk_hbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(frame), hbox); gtk_container_add(GTK_CONTAINER(frame), hbox);
gtk_widget_show(hbox); gtk_widget_show(hbox);
@ -401,8 +403,7 @@ make_selection(ObjectList_t *object_list)
gtk_container_add(GTK_CONTAINER(hbox), toolbar); gtk_container_add(GTK_CONTAINER(hbox), toolbar);
/* Create selection */ /* Create selection */
frame = gtk_frame_new(_("Selection")); frame = gimp_frame_new(_("Selection"));
gtk_container_set_border_width(GTK_CONTAINER(frame), 10);
gtk_container_add(GTK_CONTAINER(hbox), frame); gtk_container_add(GTK_CONTAINER(hbox), frame);
gtk_widget_show(frame); gtk_widget_show(frame);

5
plug-ins/imagemap/imap_source.c
View File

@ -72,9 +72,8 @@ do_source_dialog(void)
swin = gtk_scrolled_window_new(NULL, NULL); swin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin),
GTK_SHADOW_IN); GTK_SHADOW_IN);
gtk_widget_set_size_request(swin, 640, 400); gtk_widget_set_size_request(swin, 400, 300);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), swin, gtk_box_pack_start(GTK_BOX(dialog->vbox), swin, TRUE, TRUE, 0);
TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC);

3
plug-ins/imagemap/imap_toolbar.c
View File

@ -94,8 +94,7 @@ make_toolbar(GtkWidget *main_vbox, GtkWidget *window)
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar),
GTK_ORIENTATION_HORIZONTAL); GTK_ORIENTATION_HORIZONTAL);
gtk_container_set_border_width(GTK_CONTAINER(toolbar), 0);
gtk_container_set_border_width(GTK_CONTAINER(toolbar), 5);
gtk_container_add(GTK_CONTAINER(handlebox), toolbar); gtk_container_add(GTK_CONTAINER(handlebox), toolbar);

2
plug-ins/imagemap/imap_tools.c
View File

@ -136,7 +136,7 @@ make_tools(GtkWidget *window)
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
_tools.container = handlebox = gtk_handle_box_new(); _tools.container = handlebox = gtk_handle_box_new();
gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_VERTICAL); gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width(GTK_CONTAINER(toolbar), 5); gtk_container_set_border_width(GTK_CONTAINER(toolbar), 0);
gtk_container_add(GTK_CONTAINER(handlebox), toolbar); gtk_container_add(GTK_CONTAINER(handlebox), toolbar);