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>
* plug-ins/script-fu/scripts/test-sphere.scm: Added parameter
@ -21,6 +40,7 @@
2004-10-25 Sven Neumann <sven@gimp.org>
* configure.in:
* app/Makefile.am
* 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

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

@ -52,11 +52,11 @@ static gpointer circle_create_info_widget(GtkWidget *frame);
static void circle_fill_info_tab(Object_t *obj, gpointer data);
static void circle_set_initial_focus(Object_t *obj, gpointer data);
static void circle_update(Object_t* obj, gpointer data);
static void circle_write_csim(Object_t* obj, gpointer param,
static void circle_write_csim(Object_t* obj, gpointer param,
OutputFunc_t output);
static void circle_write_cern(Object_t* obj, gpointer param,
static void circle_write_cern(Object_t* obj, gpointer param,
OutputFunc_t output);
static void circle_write_ncsa(Object_t* obj, gpointer param,
static void circle_write_ncsa(Object_t* obj, gpointer param,
OutputFunc_t output);
static const gchar* circle_get_stock_icon_name(void);
@ -161,13 +161,13 @@ move_sash(Object_t *obj, gint dx, gint dy)
circle->r = (rx > ry) ? rx : ry;
}
static void
static void
circle_resize(Object_t *obj, gint percentage_x, gint percentage_y)
{
Circle_t *circle = ObjectToCircle(obj);
circle->x = circle->x * percentage_x / 100;
circle->y = circle->y * percentage_y / 100;
circle->r = circle->r * ((percentage_x < percentage_y)
circle->r = circle->r * ((percentage_x < percentage_y)
? percentage_x : percentage_y) / 100;
}
@ -194,7 +194,7 @@ circle_point_is_on(Object_t *obj, gint x, gint y)
return x * x + y * y <= circle->r * circle->r;
}
static void
static void
circle_get_dimensions(Object_t *obj, gint *x, gint *y,
gint *width, gint *height)
{
@ -256,36 +256,35 @@ circle_create_info_widget(GtkWidget *frame)
table = gtk_table_new(3, 3, FALSE);
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_col_spacings(GTK_TABLE(table), 6);
gtk_widget_show(table);
label = create_label_in_table(table, 0, 0, _("Center _x:"));
props->x = create_spin_button_in_table(table, label, 0, 1, 1, 0,
props->x = create_spin_button_in_table(table, label, 0, 1, 1, 0,
max_width - 1);
g_signal_connect(props->x, "value_changed",
g_signal_connect(props->x, "value_changed",
G_CALLBACK (x_changed_cb), (gpointer) props);
create_label_in_table(table, 0, 2, _("pixels"));
label = create_label_in_table(table, 1, 0, _("Center _y:"));
props->y = create_spin_button_in_table(table, label, 1, 1, 1, 0,
props->y = create_spin_button_in_table(table, label, 1, 1, 1, 0,
max_height - 1);
g_signal_connect(props->y, "value_changed",
g_signal_connect(props->y, "value_changed",
G_CALLBACK (y_changed_cb), (gpointer) props);
create_label_in_table(table, 1, 2, _("pixels"));
label = create_label_in_table(table, 2, 0, _("_Radius:"));
props->r = create_spin_button_in_table(table, label, 2, 1, 1, 1, G_MAXINT);
g_signal_connect(props->r, "value_changed",
g_signal_connect(props->r, "value_changed",
G_CALLBACK (r_changed_cb), (gpointer) props);
create_label_in_table(table, 2, 2, _("pixels"));
return props;
}
static void
static void
circle_fill_info_tab(Object_t *obj, gpointer data)
{
Circle_t *circle = ObjectToCircle(obj);
@ -297,14 +296,14 @@ circle_fill_info_tab(Object_t *obj, gpointer data)
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->r), circle->r);
}
static void
static void
circle_set_initial_focus(Object_t *obj, gpointer data)
{
CircleProperties_t *props = (CircleProperties_t*) data;
gtk_widget_grab_focus(props->x);
}
static void
static void
circle_update(Object_t* obj, gpointer data)
{
Circle_t *circle = ObjectToCircle(obj);

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

@ -89,7 +89,7 @@ gimp_guides_ok_cb(gpointer data)
hguides = NULL;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(param->lower_border)))
hguides = g_slist_append(hguides,
hguides = g_slist_append(hguides,
GINT_TO_POINTER(gimp_image_height(image_ID)));
url = gtk_entry_get_text(GTK_ENTRY(param->url));
@ -101,7 +101,7 @@ gimp_guides_ok_cb(gpointer data)
while (guide_num > 0) {
gint position = gimp_image_get_guide_position(image_ID, guide_num);
if (gimp_image_get_guide_orientation(image_ID, guide_num)
if (gimp_image_get_guide_orientation(image_ID, guide_num)
== GIMP_ORIENTATION_HORIZONTAL) {
hguides = g_slist_insert_sorted(hguides, GINT_TO_POINTER(position),
guide_sort_func);
@ -116,11 +116,11 @@ gimp_guides_ok_cb(gpointer data)
subcommand_start(_("Use Gimp Guides"));
for (hg = hguides; hg && hg->next;
for (hg = hguides; hg && hg->next;
hg = (all) ? hg->next : hg->next->next) {
gint y = GPOINTER_TO_INT(hg->data);
gint height = GPOINTER_TO_INT(hg->next->data) - y;
for (vg = vguides; vg && vg->next;
for (vg = vguides; vg && vg->next;
vg = (all) ? vg->next : vg->next->next) {
gint x = GPOINTER_TO_INT(vg->data);
gint width = GPOINTER_TO_INT(vg->next->data) - x;
@ -143,7 +143,7 @@ make_gimp_guides_dialog(void)
DefaultDialog_t *dialog;
GtkWidget *table, *frame, *hbox, *vbox;
GtkWidget *label;
dialog = data->dialog = make_default_dialog(_("Use Gimp Guides"));
default_dialog_set_ok_cb(dialog, gimp_guides_ok_cb, data);
table = default_dialog_add_table(dialog, 3, 2);
@ -152,11 +152,11 @@ make_gimp_guides_dialog(void)
gtk_widget_show(frame);
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_widget_show(hbox);
data->alternate =
data->alternate =
gtk_radio_button_new_with_mnemonic_from_widget(NULL, _("Al_ternate"));
gtk_box_pack_start(GTK_BOX(hbox), data->alternate, TRUE, TRUE, 0);
gtk_widget_show(data->alternate);
@ -190,19 +190,20 @@ make_gimp_guides_dialog(void)
gtk_container_add(GTK_CONTAINER(vbox), data->lower_border);
gtk_widget_show(data->lower_border);
hbox = gtk_hbox_new(FALSE, 1);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
hbox = gtk_hbox_new (FALSE, 6);
gtk_table_attach_defaults(GTK_TABLE(table), hbox, 0, 2, 2, 3);
gtk_widget_show(hbox);
label = gtk_label_new_with_mnemonic(_("_Base URL:"));
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();
gtk_container_add(GTK_CONTAINER(hbox), data->url);
gtk_widget_show(data->url);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), data->url);
return data;
}
@ -247,7 +248,7 @@ gimp_guides_command_new(ObjectList_t *list, GimpDrawable *drawable)
GimpGuidesCommand_t *command = g_new(GimpGuidesCommand_t, 1);
command->list = list;
command->drawable = drawable;
return command_init(&command->parent, _("Use Gimp Guides"),
return command_init(&command->parent, _("Use Gimp Guides"),
&gimp_guides_command_class);
}

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

@ -110,7 +110,7 @@ recalc_bounds(GtkWidget *widget, gpointer data)
bounds = g_strdup_printf (_("Resulting Guide Bounds: %d,%d to %d,%d (%d areas)"),
left, top, left + bound_w, top + bound_h, rows * cols);
if (left + bound_w > get_image_width() ||
if (left + bound_w > get_image_width() ||
top + bound_h > get_image_height())
{
gtk_dialog_set_response_sensitive (GTK_DIALOG (param->dialog->dialog),
@ -127,95 +127,100 @@ recalc_bounds(GtkWidget *widget, gpointer data)
}
static GuidesDialog_t*
make_guides_dialog()
make_guides_dialog (void)
{
GuidesDialog_t *data = g_new(GuidesDialog_t, 1);
DefaultDialog_t *dialog;
GtkWidget *table;
GtkWidget *label;
GtkWidget *hbox;
dialog = data->dialog = make_default_dialog(_("Create Guides"));
default_dialog_set_ok_cb(dialog, guides_ok_cb, data);
label = gtk_label_new(
_("Guides are pre-defined rectangles covering the image. You define\n"
"them by their width, height, and spacing from each other. This\n"
"allows you to rapidly create the most common image map type -\n"
default_dialog_set_ok_cb (dialog, guides_ok_cb, data);
label = gtk_label_new (
_("Guides are pre-defined rectangles covering the image. You define "
"them by their width, height, and spacing from each other. This "
"allows you to rapidly create the most common image map type - "
"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_container_add(GTK_CONTAINER(GTK_DIALOG(dialog->dialog)->vbox),
data->image_dimensions);
gtk_widget_show(data->image_dimensions);
data->guide_bounds = gtk_label_new("");
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog->dialog)->vbox),
data->guide_bounds);
gtk_widget_show(data->guide_bounds);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (dialog->vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
table = default_dialog_add_table(dialog, 4, 4);
data->image_dimensions = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (data->image_dimensions), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (dialog->vbox),
data->image_dimensions, FALSE, FALSE, 0);
gtk_widget_show (data->image_dimensions);
label = create_label_in_table(table, 0, 0, _("_Width:"));
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);
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);
table = default_dialog_add_table (dialog, 4, 4);
label = create_label_in_table (table, 0, 0, _("_Width:"));
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:"));
data->left = create_spin_button_in_table(table, label, 0, 3, 0, 0, 100);
g_signal_connect(data->left, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
data->left = create_spin_button_in_table (table, label, 0, 3, 0, 0, 100);
g_signal_connect (data->left, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 1, 0, _("_Height:"));
data->height = create_spin_button_in_table(table, label, 1, 1, 32, 1, 100);
g_signal_connect(data->height, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
data->height = create_spin_button_in_table (table, label, 1, 1, 32, 1, 100);
g_signal_connect (data->height, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
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);
g_signal_connect(data->top, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
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);
g_signal_connect (data->top, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 2, 0, _("_Horz. Spacing:"));
data->horz_spacing = create_spin_button_in_table(table, label, 2, 1, 0, 0,
100);
g_signal_connect(data->horz_spacing, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table (table, 2, 0, _("_Horz. Spacing:"));
data->horz_spacing = create_spin_button_in_table (table, label, 2, 1, 0, 0,
100);
g_signal_connect (data->horz_spacing, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
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);
g_signal_connect(data->no_across, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
g_signal_connect (data->no_across, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
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);
g_signal_connect(data->vert_spacing, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
g_signal_connect (data->vert_spacing, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
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);
g_signal_connect(data->no_down, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
data->no_down = create_spin_button_in_table (table, label, 3, 3, 0, 0, 100);
g_signal_connect (data->no_down, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
hbox = gtk_hbox_new(FALSE, 1);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
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);
hbox = gtk_hbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (dialog->vbox), 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;
}
@ -229,7 +234,7 @@ init_guides_dialog(GuidesDialog_t *dialog, ObjectList_t *list)
get_image_height());
gtk_label_set_text(GTK_LABEL(dialog->image_dimensions), dimension);
g_free (dimension);
gtk_label_set_text(GTK_LABEL(dialog->guide_bounds),
gtk_label_set_text(GTK_LABEL(dialog->guide_bounds),
_("Resulting Guide Bounds: 0,0 to 0,0 (0 areas)"));
gtk_widget_grab_focus(dialog->width);
}

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",
NULL, 0,
gimp_standard_help_func, "plug-in-imagemap",
/* gimp_standard_help_func,
"plug-in-imagemap", */
gimp_standard_help_func, NULL,
NULL);
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),
&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;
}
@ -150,8 +158,8 @@ void
default_dialog_set_label(DefaultDialog_t *dialog, gchar *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);
}
@ -159,10 +167,12 @@ GtkWidget*
default_dialog_add_table(DefaultDialog_t *dialog, gint rows, gint cols)
{
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_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);
return table;
}

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

@ -24,12 +24,13 @@
#ifndef _IMAP_DEFAULT_DIALOG_H
#define _IMAP_DEFAULT_DIALOG_H
typedef struct {
typedef struct
{
GtkWidget *dialog;
GtkWidget *vbox;
GtkWidget *ok;
GtkWidget *apply;
GtkWidget *cancel;
GtkWidget *help;
void (*ok_cb)(gpointer);
gpointer ok_cb_data;
void (*apply_cb)(gpointer);
@ -41,10 +42,10 @@ typedef struct {
DefaultDialog_t *make_default_dialog(const gchar *title);
void default_dialog_set_ok_cb(DefaultDialog_t *dialog, void (*ok_cb)(gpointer),
gpointer ok_cb_data);
void default_dialog_set_apply_cb(DefaultDialog_t *dialog,
void default_dialog_set_apply_cb(DefaultDialog_t *dialog,
void (*apply_cb)(gpointer),
gpointer apply_cb_data);
void default_dialog_set_cancel_cb(DefaultDialog_t *dialog,
void default_dialog_set_cancel_cb(DefaultDialog_t *dialog,
void (*ok_cb)(gpointer),
gpointer ok_cb_data);
void default_dialog_show(DefaultDialog_t *dialog);
@ -53,7 +54,7 @@ void default_dialog_hide_apply_button(DefaultDialog_t *dialog);
void default_dialog_hide_help_button(DefaultDialog_t *dialog);
void default_dialog_set_title(DefaultDialog_t *dialog, const gchar *title);
void default_dialog_set_label(DefaultDialog_t *dialog, gchar *text);
GtkWidget *default_dialog_add_table(DefaultDialog_t *dialog, gint rows,
GtkWidget *default_dialog_add_table(DefaultDialog_t *dialog, gint rows,
gint cols);
#endif /* _IMAP_DEFAULT_DIALOG_H */

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;
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_widget_show(table);
@ -304,7 +304,7 @@ create_info_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
Object_t *obj = dialog->obj;
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);
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);
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_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);
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_CALLBACK(switch_page), (gpointer) data);

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

@ -120,7 +120,7 @@ type_toggled_cb(GtkWidget *widget, gpointer data)
static void
toggle_preview_cb(GtkWidget *widget, GridDialog_t *param)
{
param->enable_preview =
param->enable_preview =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
redraw_preview();
}
@ -197,49 +197,49 @@ create_grid_settings_dialog()
GtkWidget *hbox;
GtkWidget *button;
GtkWidget *chain_button;
data->dialog = dialog = make_default_dialog(_("Grid Settings"));
default_dialog_set_ok_cb(dialog, grid_settings_ok_cb, (gpointer) data);
main_table = default_dialog_add_table(dialog, 4, 2);
data->snap = gtk_check_button_new_with_mnemonic(_("_Snap-To Grid Enabled"));
g_signal_connect(data->snap, "toggled",
g_signal_connect(data->snap, "toggled",
G_CALLBACK (snap_toggled_cb), data);
gtk_table_attach_defaults(GTK_TABLE(main_table), data->snap, 0, 1, 0, 1);
gtk_widget_show(data->snap);
data->type_frame = frame = gimp_frame_new(_("Grid Visibility and Type"));
gtk_widget_show(frame);
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_widget_show(hbox);
button = gtk_radio_button_new_with_mnemonic_from_widget(NULL, _("_Hidden"));
data->hidden = button;
g_signal_connect(button, "toggled",
g_signal_connect(button, "toggled",
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);
button = gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(button), _("_Lines"));
data->lines = button;
g_signal_connect(button, "toggled",
g_signal_connect(button, "toggled",
G_CALLBACK (type_toggled_cb), (gpointer) GRID_LINES);
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);
button = gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(button), _("C_rosses"));
data->crosses = button;
g_signal_connect(button, "toggled",
G_CALLBACK (type_toggled_cb),
g_signal_connect(button, "toggled",
G_CALLBACK (type_toggled_cb),
(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);
data->granularity_frame = frame = gimp_frame_new(_("Grid Granularity"));
gtk_table_attach_defaults(GTK_TABLE(main_table), frame, 0, 1, 2, 3);
table = gtk_table_new(2, 4, FALSE);
@ -249,13 +249,13 @@ create_grid_settings_dialog()
label = create_label_in_table(table, 0, 0, _("_Width"));
data->width = create_spin_button_in_table(table, label, 0, 1, 15, 1, 100);
g_signal_connect(data->width, "value_changed",
g_signal_connect(data->width, "value_changed",
G_CALLBACK (width_changed_cb), (gpointer) data);
create_label_in_table(table, 0, 3, _("pixels"));
label = create_label_in_table(table, 1, 0, _("_Height"));
data->height = create_spin_button_in_table(table, label, 1, 1, 15, 1, 100);
g_signal_connect(data->height, "value_changed",
g_signal_connect(data->height, "value_changed",
G_CALLBACK (height_changed_cb), (gpointer) data);
create_label_in_table(table, 1, 3, _("pixels"));
@ -266,7 +266,7 @@ create_grid_settings_dialog()
gtk_widget_show(table);
gtk_widget_show(frame);
data->offset_frame = frame = gimp_frame_new(_("Grid Offset"));
gtk_table_attach_defaults(GTK_TABLE(main_table), frame, 1, 2, 2, 3);
table = gtk_table_new(2, 3, FALSE);
@ -276,12 +276,12 @@ create_grid_settings_dialog()
label = create_label_in_table(table, 0, 2, _("pixels from l_eft"));
data->left = create_spin_button_in_table(table, label, 0, 0, 0, 0, 100);
g_signal_connect(data->left, "value_changed",
g_signal_connect(data->left, "value_changed",
G_CALLBACK (left_changed_cb), (gpointer) data);
label = create_label_in_table(table, 1, 2, _("pixels from _top"));
data->top = create_spin_button_in_table(table, label, 1, 0, 0, 0, 100);
g_signal_connect(data->top, "value_changed",
g_signal_connect(data->top, "value_changed",
G_CALLBACK (top_changed_cb), (gpointer) data);
chain_button = gimp_chain_button_new(GIMP_CHAIN_RIGHT);
@ -289,9 +289,9 @@ create_grid_settings_dialog()
gtk_table_attach_defaults(GTK_TABLE(table), chain_button, 1, 2, 0, 2);
gtk_widget_show(chain_button);
data->preview = create_check_button_in_table(main_table, 3, 0,
data->preview = create_check_button_in_table(main_table, 3, 0,
_("_Preview"));
g_signal_connect(data->preview, "toggled",
g_signal_connect(data->preview, "toggled",
G_CALLBACK (toggle_preview_cb), (gpointer) data);
gtk_widget_show(data->preview);
@ -348,7 +348,7 @@ draw_crosses(GdkWindow *window, GdkGC* gc, gint width, gint height)
for (x = grid_left; x < width; x += grid_width) {
for (y = grid_top; y < height; y += grid_height) {
draw_line(window, gc, x - 3, y, x + 3, y);
draw_line(window, gc, x, y - 3, x, y + 3);
draw_line(window, gc, x, y - 3, x, y + 3);
}
}
}
@ -359,7 +359,7 @@ draw_grid(GtkWidget *preview)
if (grid_snap && grid_type != GRID_HIDDEN) {
gint width = preview_get_width(preview);
gint height = preview_get_height(preview);
if (!grid_gc) {
grid_gc = gdk_gc_new(preview->window);
@ -369,7 +369,7 @@ draw_grid(GtkWidget *preview)
if (grid_type == GRID_LINES)
draw_lines(preview->window, grid_gc, width, height);
else
draw_crosses(preview->window, preview->style->black_gc, width,
draw_crosses(preview->window, preview->style->black_gc, width,
height);
}
}
@ -385,18 +385,18 @@ toggle_grid(void)
static gint
grid_nearest_x(gint x)
{
return grid_left + (x - grid_left + grid_width / 2) / grid_width
return grid_left + (x - grid_left + grid_width / 2) / grid_width
* grid_width;
}
static gint
grid_nearest_y(gint y)
{
return grid_top + (y - grid_top + grid_height / 2) / grid_height
return grid_top + (y - grid_top + grid_height / 2) / grid_height
* grid_height;
}
void
void
round_to_grid(gint *x, gint *y)
{
if (grid_snap) {
@ -408,13 +408,13 @@ round_to_grid(gint *x, gint *y)
gboolean
grid_near_x(gint x)
{
return grid_snap && grid_type != GRID_HIDDEN
return grid_snap && grid_type != GRID_HIDDEN
&& abs(grid_nearest_x(x) - x) <= 1;
}
gboolean
grid_near_y(gint y)
{
return grid_snap && grid_type != GRID_HIDDEN
return grid_snap && grid_type != GRID_HIDDEN
&& abs(grid_nearest_x(y) - y) <= 1;
}

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

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

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

@ -29,8 +29,8 @@
#include "imap_misc.h"
GtkWidget*
make_toolbar_stock_icon(GtkWidget *toolbar, const gchar *stock_id,
const char *identifier, const char *tooltip,
make_toolbar_stock_icon(GtkWidget *toolbar, const gchar *stock_id,
const char *identifier, const char *tooltip,
void (*callback)(GtkWidget*, gpointer), gpointer udata)
{
GtkWidget *iconw;
@ -43,12 +43,12 @@ make_toolbar_stock_icon(GtkWidget *toolbar, const gchar *stock_id,
GtkWidget*
make_toolbar_radio_icon(GtkWidget *toolbar, const gchar *stock_id,
GtkWidget *prev, const char *identifier,
const char *tooltip,
GtkWidget *prev, const char *identifier,
const char *tooltip,
void (*callback)(GtkWidget*, gpointer),
gpointer udata)
{
GtkWidget *iconw = gtk_image_new_from_stock(stock_id,
GtkWidget *iconw = gtk_image_new_from_stock(stock_id,
GTK_ICON_SIZE_SMALL_TOOLBAR);
return gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_CHILD_RADIOBUTTON, prev,
@ -58,11 +58,11 @@ make_toolbar_radio_icon(GtkWidget *toolbar, const gchar *stock_id,
GtkWidget*
make_toolbar_toggle_icon(GtkWidget *toolbar, const gchar *stock_id,
const char *identifier, const char *tooltip,
const char *identifier, const char *tooltip,
void (*callback)(GtkWidget*, gpointer),
gpointer udata)
{
GtkWidget *iconw = gtk_image_new_from_stock(stock_id,
GtkWidget *iconw = gtk_image_new_from_stock(stock_id,
GTK_ICON_SIZE_SMALL_TOOLBAR);
return gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
@ -81,10 +81,10 @@ create_base_alert(const gchar *stock_id)
alert->dialog = dialog = make_default_dialog("");
default_dialog_hide_apply_button(dialog);
hbox = gtk_hbox_new(FALSE, 12);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 6);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), hbox,
TRUE, TRUE, 10);
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER(hbox), 12);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), hbox,
TRUE, TRUE, 0);
gtk_widget_show(hbox);
image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_DIALOG);
@ -115,15 +115,15 @@ create_confirm_alert(const gchar *stock_id)
}
void
alert_set_text(Alert_t *alert, const char *primary_text,
alert_set_text(Alert_t *alert, const char *primary_text,
const char *secondary_text)
{
gchar *text;
text =
text =
g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
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);
}
@ -141,7 +141,7 @@ set_sash_size(gboolean double_size)
void
draw_sash(GdkWindow *window, GdkGC *gc, gint x, gint y)
{
draw_rectangle(window, gc, TRUE, x - _sash_size / 2, y - _sash_size / 2,
draw_rectangle(window, gc, TRUE, x - _sash_size / 2, y - _sash_size / 2,
_sash_size, _sash_size);
}

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

@ -58,11 +58,11 @@ static void polygon_update_info_widget(Object_t *obj, gpointer data);
static void polygon_fill_info_tab(Object_t *obj, gpointer data);
static void polygon_set_initial_focus(Object_t *obj, gpointer data);
static void polygon_update(Object_t* obj, gpointer data);
static void polygon_write_csim(Object_t* obj, gpointer param,
static void polygon_write_csim(Object_t* obj, gpointer param,
OutputFunc_t output);
static void polygon_write_cern(Object_t* obj, gpointer param,
static void polygon_write_cern(Object_t* obj, gpointer param,
OutputFunc_t output);
static void polygon_write_ncsa(Object_t* obj, gpointer param,
static void polygon_write_ncsa(Object_t* obj, gpointer param,
OutputFunc_t output);
static void polygon_do_popup(Object_t *obj, GdkEventButton *event);
static const gchar* polygon_get_stock_icon_name(void);
@ -120,7 +120,7 @@ polygon_destruct(Object_t *obj)
polygon_free_list(polygon);
}
static gboolean
static gboolean
polygon_is_valid(Object_t *obj)
{
return g_list_length(ObjectToPolygon(obj)->points) > 2;
@ -132,7 +132,7 @@ polygon_clone(Object_t *obj)
Polygon_t *polygon = ObjectToPolygon(obj);
Polygon_t *clone = g_new(Polygon_t, 1);
GList *p;
clone->points = NULL;
for (p = polygon->points; p; p = p->next) {
GdkPoint *point = (GdkPoint*) p->data;
@ -238,7 +238,7 @@ polygon_point_is_on(Object_t *obj, gint x, gint y)
return count % 2;
}
static void
static void
polygon_get_dimensions(Object_t *obj, gint *x, gint *y,
gint *width, gint *height)
{
@ -264,7 +264,7 @@ polygon_get_dimensions(Object_t *obj, gint *x, gint *y,
*height = max_y - min_y;
}
static void
static void
polygon_resize(Object_t *obj, gint percentage_x, gint percentage_y)
{
Polygon_t *polygon = ObjectToPolygon(obj);
@ -363,7 +363,7 @@ insert_button_clicked(GtkWidget *widget, PolygonProperties_t *data)
gtk_tree_model_get (model, &iter, 0, &point, -1);
here = g_list_find(polygon->points, point);
polygon->points = g_list_insert_before(polygon->points, here,
polygon->points = g_list_insert_before(polygon->points, here,
new_point(x, y));
polygon_fill_info_tab(data->obj, data);
}
@ -392,7 +392,7 @@ remove_button_clicked(GtkWidget *widget, PolygonProperties_t *data)
gtk_tree_model_get (model, &iter, 0, &point, -1);
polygon->points = g_list_remove(polygon->points, point);
g_free(point);
polygon_fill_info_tab(data->obj, data);
}
}
@ -416,7 +416,7 @@ y_changed_cb(GtkWidget *widget, gpointer data)
}
static void
render_x(GtkTreeViewColumn *column, GtkCellRenderer *cell,
render_x(GtkTreeViewColumn *column, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
GdkPoint *point;
@ -428,7 +428,7 @@ render_x(GtkTreeViewColumn *column, GtkCellRenderer *cell,
}
static void
render_y(GtkTreeViewColumn *column, GtkCellRenderer *cell,
render_y(GtkTreeViewColumn *column, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
GdkPoint *point;
@ -450,14 +450,13 @@ polygon_create_info_widget(GtkWidget *frame)
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
hbox = gtk_hbox_new(FALSE, 1);
hbox = gtk_hbox_new(FALSE, 12);
gtk_container_add(GTK_CONTAINER(frame), hbox);
gtk_widget_show(hbox);
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_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(swin),
GTK_SHADOW_IN);
@ -471,7 +470,7 @@ polygon_create_info_widget(GtkWidget *frame)
gtk_widget_show (view);
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("x (pixels)"),
column = gtk_tree_view_column_new_with_attributes (_("x (pixels)"),
renderer,
NULL);
gtk_tree_view_column_set_cell_data_func(column, renderer,
@ -480,8 +479,8 @@ polygon_create_info_widget(GtkWidget *frame)
gtk_tree_view_append_column (GTK_TREE_VIEW (view), column);
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("y (pixels)"),
renderer,
column = gtk_tree_view_column_new_with_attributes (_("y (pixels)"),
renderer,
NULL);
gtk_tree_view_column_set_cell_data_func(column, renderer,
render_y, props, NULL);
@ -491,24 +490,23 @@ polygon_create_info_widget(GtkWidget *frame)
gtk_container_add (GTK_CONTAINER (swin), view);
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_col_spacings(GTK_TABLE(table), 6);
gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, FALSE);
gtk_widget_show(table);
label = create_label_in_table(table, 0, 0, "_x:");
props->x = create_spin_button_in_table(table, label, 0, 1, 1, 0,
props->x = create_spin_button_in_table(table, label, 0, 1, 1, 0,
max_width - 1);
g_signal_connect(props->x, "changed",
g_signal_connect(props->x, "changed",
G_CALLBACK(x_changed_cb), (gpointer) props);
gtk_widget_set_size_request(props->x, 64, -1);
create_label_in_table(table, 0, 2, _("pixels"));
label = create_label_in_table(table, 1, 0, "_y:");
props->y = create_spin_button_in_table(table, label, 1, 1, 1, 0,
props->y = create_spin_button_in_table(table, label, 1, 1, 1, 0,
max_height - 1);
g_signal_connect(props->y, "changed",
g_signal_connect(props->y, "changed",
G_CALLBACK(y_changed_cb), (gpointer) props);
gtk_widget_set_size_request(props->y, 64, -1);
create_label_in_table(table, 1, 2, _("pixels"));
@ -560,7 +558,7 @@ polygon_update_info_widget(Object_t *obj, gpointer data)
{
PolygonProperties_t *props = (PolygonProperties_t*) data;
GtkTreeIter iter;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->x), _sash_point->x);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->y), _sash_point->y);
@ -568,7 +566,7 @@ polygon_update_info_widget(Object_t *obj, gpointer data)
NULL, _sash_index)) {
gtk_tree_selection_select_iter(props->selection, &iter);
}
if (props->timeout)
g_source_remove(props->timeout);
props->timeout = g_timeout_add(1000, update_timeout, data);
@ -586,7 +584,7 @@ polygon_fill_info_tab(Object_t *obj, gpointer data)
gtk_list_store_clear(props->store);
for (p = polygon->points; p; p = p->next) {
for (p = polygon->points; p; p = p->next) {
gtk_list_store_append(props->store, &iter);
gtk_list_store_set(props->store, &iter, 0, p->data, -1);
}
@ -598,14 +596,14 @@ polygon_fill_info_tab(Object_t *obj, gpointer data)
set_buttons_sensitivity(props);
}
static void
static void
polygon_set_initial_focus(Object_t *obj, gpointer data)
{
PolygonProperties_t *props = (PolygonProperties_t*) data;
gtk_widget_grab_focus(props->x);
}
static void
static void
polygon_update(Object_t* obj, gpointer data)
{
/* Nothing to be done! */
@ -670,7 +668,7 @@ polygon_insert_point(GtkWidget *widget, gpointer data)
static void
polygon_delete_point(GtkWidget *widget, gpointer data)
{
Command_t *command = delete_point_command_new(get_popup_object(),
Command_t *command = delete_point_command_new(get_popup_object(),
_sash_point);
command_execute(command);
}
@ -712,7 +710,7 @@ polygon_near_edge(Object_t *obj, gint x, gint y)
return (point_near_edge(prev, first, x, y)) ? n + 1 : 0;
}
static void
static void
polygon_do_popup(Object_t *obj, GdkEventButton *event)
{
gint x = get_real_coord((gint) event->x);
@ -722,7 +720,7 @@ polygon_do_popup(Object_t *obj, GdkEventButton *event)
static ObjectPopup_t *delete_popup;
if (!delete_popup) {
delete_popup = make_object_popup();
object_popup_prepend_menu(delete_popup, _("Delete Point"),
object_popup_prepend_menu(delete_popup, _("Delete Point"),
polygon_delete_point, delete_popup);
}
object_handle_popup(delete_popup, obj, event);
@ -736,7 +734,7 @@ polygon_do_popup(Object_t *obj, GdkEventButton *event)
if (!insert_popup) {
insert_popup = make_object_popup();
object_popup_prepend_menu(insert_popup, _("Insert Point"),
object_popup_prepend_menu(insert_popup, _("Insert Point"),
polygon_insert_point, insert_popup);
}
object_handle_popup(insert_popup, obj, event);
@ -746,7 +744,7 @@ polygon_do_popup(Object_t *obj, GdkEventButton *event)
}
}
static const gchar*
static const gchar*
polygon_get_stock_icon_name(void)
{
return IMAP_STOCK_POLYGON;
@ -778,7 +776,7 @@ polygon_factory_cancel(GdkEventButton *event, Object_t *obj)
} else {
Polygon_t *polygon = ObjectToPolygon(obj);
GList *link = _prev_link;
_prev_link = _prev_link->prev;
g_free((GdkPoint*) link->data);
polygon->points = g_list_remove_link(polygon->points, link);

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

@ -194,16 +194,16 @@ preferences_save(PreferencesData_t *data)
fprintf(out, "(mru-size %d)\n", data->mru_size);
fprintf(out, "(normal-fg-color %d %d %d)\n",
colors->normal_fg.red, colors->normal_fg.green,
colors->normal_fg.red, colors->normal_fg.green,
colors->normal_fg.blue);
fprintf(out, "(normal-bg-color %d %d %d)\n",
colors->normal_bg.red, colors->normal_bg.green,
colors->normal_bg.red, colors->normal_bg.green,
colors->normal_bg.blue);
fprintf(out, "(selected-fg-color %d %d %d)\n",
colors->selected_fg.red, colors->selected_fg.green,
colors->selected_fg.red, colors->selected_fg.green,
colors->selected_fg.blue);
fprintf(out, "(selected-bg-color %d %d %d)\n",
colors->selected_bg.red, colors->selected_bg.green,
colors->selected_bg.red, colors->selected_bg.green,
colors->selected_bg.blue);
mru_write(get_mru(), out);
@ -243,9 +243,9 @@ preferences_ok_cb(gpointer data)
old_data->use_doublesized = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(param->use_doublesized));
old_data->mru_size =
old_data->mru_size =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(param->mru_size));
old_data->undo_levels =
old_data->undo_levels =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(param->undo_levels));
mru_set_size(mru, old_data->mru_size);
menu_build_mru_items(mru);
@ -265,16 +265,16 @@ preferences_ok_cb(gpointer data)
static void
set_button_colors(PreferencesDialog_t *dialog, ColorSelData_t *colors)
{
gdk_window_set_background(dialog->normal_fg->window,
gdk_window_set_background(dialog->normal_fg->window,
&colors->normal_fg);
gdk_window_clear(dialog->normal_fg->window);
gdk_window_set_background(dialog->normal_bg->window,
gdk_window_set_background(dialog->normal_bg->window,
&colors->normal_bg);
gdk_window_clear(dialog->normal_bg->window);
gdk_window_set_background(dialog->selected_fg->window,
gdk_window_set_background(dialog->selected_fg->window,
&colors->selected_fg);
gdk_window_clear(dialog->selected_fg->window);
gdk_window_set_background(dialog->selected_bg->window,
gdk_window_set_background(dialog->selected_bg->window,
&colors->selected_bg);
gdk_window_clear(dialog->selected_bg->window);
}
@ -304,7 +304,7 @@ color_changed(GtkWidget *widget, gpointer data)
}
static void
change_color(PreferencesDialog_t *param, GtkWidget *button,
change_color(PreferencesDialog_t *param, GtkWidget *button,
GdkColor *gdk_color)
{
GdkColormap *colormap;
@ -348,7 +348,7 @@ selected_bg_color_changed(GtkWidget *widget, gpointer data)
static gint
area_event(GtkWidget *widget, GdkEvent *event, PreferencesDialog_t *param,
GdkColor *gdk_color,
GdkColor *gdk_color,
void (*color_changed_func)(GtkWidget *widget, gpointer data))
{
if (event->type != GDK_BUTTON_PRESS)
@ -361,8 +361,8 @@ area_event(GtkWidget *widget, GdkEvent *event, PreferencesDialog_t *param,
param->color_sel = GTK_COLOR_SELECTION_DIALOG(
param->color_sel_dlg)->colorsel;
g_signal_connect(param->color_sel, "color_changed",
g_signal_connect(param->color_sel, "color_changed",
G_CALLBACK(color_changed), (gpointer) param);
g_signal_connect(GTK_COLOR_SELECTION_DIALOG(dialog)->ok_button,
@ -398,19 +398,19 @@ edit_normal_bg(GtkWidget *widget, GdkEvent *event, PreferencesDialog_t *param)
}
static gint
edit_selected_fg(GtkWidget *widget, GdkEvent *event,
edit_selected_fg(GtkWidget *widget, GdkEvent *event,
PreferencesDialog_t *param)
{
return area_event(widget, event, param,
return area_event(widget, event, param,
&param->old_data->colors.selected_fg,
selected_fg_color_changed);
}
static gint
edit_selected_bg(GtkWidget *widget, GdkEvent *event,
edit_selected_bg(GtkWidget *widget, GdkEvent *event,
PreferencesDialog_t *param)
{
return area_event(widget, event, param,
return area_event(widget, event, param,
&param->old_data->colors.selected_bg,
selected_bg_color_changed);
}
@ -431,11 +431,11 @@ create_tab(GtkWidget *notebook, gchar *label, gint rows, gint cols)
gtk_table_set_col_spacings(GTK_TABLE(table), 6);
gtk_widget_show(table);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
gtk_label_new_with_mnemonic(label));
return table;
}
}
static void
create_general_tab(PreferencesDialog_t *data, GtkWidget *notebook)
@ -462,17 +462,17 @@ create_general_tab(PreferencesDialog_t *data, GtkWidget *notebook)
gtk_box_pack_start(GTK_BOX(hbox), data->csim, TRUE, TRUE, 10);
gtk_widget_show(data->csim);
data->prompt_for_area_info =
data->prompt_for_area_info =
create_check_button_in_table(table, 1, 0, _("_Prompt for area info"));
data->require_default_url =
data->require_default_url =
create_check_button_in_table(table, 2, 0, _("_Require default URL"));
data->show_area_handle =
data->show_area_handle =
create_check_button_in_table(table, 3, 0, _("Show area _handles"));
data->keep_circles_round =
data->keep_circles_round =
create_check_button_in_table(table, 4, 0, _("_Keep NCSA circles true"));
data->show_url_tip =
create_check_button_in_table(table, 5, 0, _("Show area URL _tip"));
data->use_doublesized =
data->use_doublesized =
create_check_button_in_table(table, 6, 0,
_("_Use double-sized grab handles"));
gtk_widget_show(frame);
@ -484,25 +484,25 @@ create_menu_tab(PreferencesDialog_t *data, GtkWidget *notebook)
GtkWidget *table = create_tab(notebook, _("Menu"), 2, 2);
GtkWidget *label;
label = create_label_in_table(table, 0, 0,
label = create_label_in_table(table, 0, 0,
_("Number of _Undo levels (1 - 99):"));
data->undo_levels = create_spin_button_in_table(table, label, 0, 1, 1, 1,
data->undo_levels = create_spin_button_in_table(table, label, 0, 1, 1, 1,
99);
label = create_label_in_table(table, 1, 0,
label = create_label_in_table(table, 1, 0,
_("Number of M_RU entries (1 - 16):"));
data->mru_size = create_spin_button_in_table(table, label, 1, 1, 1, 1, 16);
}
static GtkWidget*
create_color_field(PreferencesDialog_t *data, GtkWidget *table, gint row,
create_color_field(PreferencesDialog_t *data, GtkWidget *table, gint row,
gint col, GCallback func)
{
GtkWidget *area = gtk_drawing_area_new();
gtk_widget_set_size_request(area, 16, 8);
gtk_widget_set_events(area, GDK_BUTTON_PRESS_MASK);
gtk_table_attach_defaults(GTK_TABLE(table), area, col, col + 1, row,
gtk_table_attach_defaults(GTK_TABLE(table), area, col, col + 1, row,
row + 1);
g_signal_connect(area, "event", func, (gpointer) data);
gtk_widget_show(area);
@ -514,9 +514,9 @@ static void
create_colors_tab(PreferencesDialog_t *data, GtkWidget *notebook)
{
GtkWidget *table = create_tab(notebook, _("Colors"), 2, 3);
create_label_in_table(table, 0, 0, _("Normal:"));
data->normal_fg = create_color_field(data, table, 0, 1,
data->normal_fg = create_color_field(data, table, 0, 1,
G_CALLBACK(edit_normal_fg));
data->normal_bg = create_color_field(data, table, 0, 2,
G_CALLBACK(edit_normal_bg));
@ -534,14 +534,14 @@ create_contiguous_regions_tab(PreferencesDialog_t *data, GtkWidget *notebook)
GtkWidget *table = create_tab(notebook, _("Co_ntiguous Region"), 2, 2);
GtkWidget *label;
label = create_label_in_table(table, 0, 0,
label = create_label_in_table(table, 0, 0,
_("_Threshold:"));
data->auto_convert =
create_check_button_in_table(table, 1, 0, _("_Automatically convert"));
}
static void
switch_page(GtkWidget *widget, GtkNotebookPage *page, gint page_num,
switch_page(GtkWidget *widget, GtkNotebookPage *page, gint page_num,
gpointer data)
{
if (page_num == 2) {
@ -560,14 +560,12 @@ create_preferences_dialog()
data->color_sel_dlg = NULL;
data->dialog = dialog = make_default_dialog( _("General Preferences"));
default_dialog_set_ok_cb(dialog, preferences_ok_cb, (gpointer) data);
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);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
notebook, TRUE, TRUE, 10);
gtk_box_pack_start (GTK_BOX (data->dialog->vbox), notebook, TRUE, TRUE, 0);
create_general_tab(data, notebook);
create_menu_tab(data, notebook);
create_colors_tab(data, notebook);
@ -614,10 +612,10 @@ do_preferences_dialog(void)
old_data->show_url_tip);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->use_doublesized),
old_data->use_doublesized);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->undo_levels),
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->undo_levels),
old_data->undo_levels);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->mru_size),
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->mru_size),
old_data->mru_size);
default_dialog_show(dialog->dialog);

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

@ -50,18 +50,18 @@ static MoveSashFunc_t rectangle_near_sash(Object_t *obj, gint x, gint y);
static gboolean rectangle_point_is_on(Object_t *obj, gint x, gint y);
static void rectangle_get_dimensions(Object_t *obj, gint *x, gint *y,
gint *width, gint *height);
static void rectangle_resize(Object_t *obj, gint percentage_x,
static void rectangle_resize(Object_t *obj, gint percentage_x,
gint percentage_y);
static void rectangle_move(Object_t *obj, gint dx, gint dy);
static gpointer rectangle_create_info_widget(GtkWidget *frame);
static void rectangle_fill_info_tab(Object_t *obj, gpointer data);
static void rectangle_set_initial_focus(Object_t *obj, gpointer data);
static void rectangle_update(Object_t *obj, gpointer data);
static void rectangle_write_csim(Object_t *obj, gpointer param,
static void rectangle_write_csim(Object_t *obj, gpointer param,
OutputFunc_t output);
static void rectangle_write_cern(Object_t *obj, gpointer param,
static void rectangle_write_cern(Object_t *obj, gpointer param,
OutputFunc_t output);
static void rectangle_write_ncsa(Object_t *obj, gpointer param,
static void rectangle_write_ncsa(Object_t *obj, gpointer param,
OutputFunc_t output);
static const gchar* rectangle_get_stock_icon_name(void);
@ -107,7 +107,7 @@ create_rectangle(gint x, gint y, gint width, gint height)
}
static void
draw_any_rectangle(GdkWindow *window, GdkGC *gc, gint x, gint y, gint w,
draw_any_rectangle(GdkWindow *window, GdkGC *gc, gint x, gint y, gint w,
gint h)
{
if (w < 0) {
@ -182,12 +182,12 @@ rectangle_draw_sashes(Object_t *obj, GdkWindow *window, GdkGC *gc)
draw_sash(window, gc, rectangle->x + rectangle->width / 2, rectangle->y);
draw_sash(window, gc, rectangle->x + rectangle->width, rectangle->y);
draw_sash(window, gc, rectangle->x, rectangle->y + rectangle->height / 2);
draw_sash(window, gc, rectangle->x + rectangle->width,
draw_sash(window, gc, rectangle->x + rectangle->width,
rectangle->y + rectangle->height / 2);
draw_sash(window, gc, rectangle->x, rectangle->y + rectangle->height);
draw_sash(window, gc, rectangle->x + rectangle->width / 2,
draw_sash(window, gc, rectangle->x + rectangle->width / 2,
rectangle->y + rectangle->height);
draw_sash(window, gc, rectangle->x + rectangle->width,
draw_sash(window, gc, rectangle->x + rectangle->width,
rectangle->y + rectangle->height);
}
@ -267,18 +267,18 @@ rectangle_near_sash(Object_t *obj, gint x, gint y)
return MoveUpperSash;
else if (near_sash(rectangle->x + rectangle->width, rectangle->y, x, y))
return MoveUpperRightSash;
else if (near_sash(rectangle->x, rectangle->y + rectangle->height / 2,
else if (near_sash(rectangle->x, rectangle->y + rectangle->height / 2,
x, y))
return MoveLeftSash;
else if (near_sash(rectangle->x + rectangle->width,
else if (near_sash(rectangle->x + rectangle->width,
rectangle->y + rectangle->height / 2, x, y))
return MoveRightSash;
else if (near_sash(rectangle->x, rectangle->y + rectangle->height, x, y))
return MoveLowerLeftSash;
else if (near_sash(rectangle->x + rectangle->width / 2,
else if (near_sash(rectangle->x + rectangle->width / 2,
rectangle->y + rectangle->height, x, y))
return MoveLowerSash;
else if (near_sash(rectangle->x + rectangle->width,
else if (near_sash(rectangle->x + rectangle->width,
rectangle->y + rectangle->height, x, y))
return MoveLowerRightSash;
return NULL;
@ -292,7 +292,7 @@ rectangle_point_is_on(Object_t *obj, gint x, gint y)
y >= rectangle->y && y <= rectangle->y + rectangle->height;
}
static void
static void
rectangle_get_dimensions(Object_t *obj, gint *x, gint *y,
gint *width, gint *height)
{
@ -303,7 +303,7 @@ rectangle_get_dimensions(Object_t *obj, gint *x, gint *y,
*height = rectangle->height;
}
static void
static void
rectangle_resize(Object_t *obj, gint percentage_x, gint percentage_y)
{
Rectangle_t *rectangle = ObjectToRectangle(obj);
@ -381,37 +381,36 @@ rectangle_create_info_widget(GtkWidget *frame)
table = gtk_table_new(4, 4, FALSE);
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_col_spacings(GTK_TABLE(table), 6);
gtk_widget_show(table);
label = create_label_in_table(table, 0, 0, _("Upper left _x:"));
props->x = create_spin_button_in_table(table, label, 0, 1, 1, 0,
props->x = create_spin_button_in_table(table, label, 0, 1, 1, 0,
max_width - 1);
g_signal_connect(props->x, "value_changed",
g_signal_connect(props->x, "value_changed",
G_CALLBACK(x_changed_cb), (gpointer) props);
create_label_in_table(table, 0, 3, _("pixels"));
label = create_label_in_table(table, 1, 0, _("Upper left _y:"));
props->y = create_spin_button_in_table(table, label, 1, 1, 1, 0,
props->y = create_spin_button_in_table(table, label, 1, 1, 1, 0,
max_height - 1);
g_signal_connect(props->y, "value_changed",
g_signal_connect(props->y, "value_changed",
G_CALLBACK(y_changed_cb), (gpointer) props);
create_label_in_table(table, 1, 3, _("pixels"));
label = create_label_in_table(table, 2, 0, _("_Width:"));
props->width = create_spin_button_in_table(table, label, 2, 1, 1, 1,
props->width = create_spin_button_in_table(table, label, 2, 1, 1, 1,
max_width);
g_signal_connect(props->width, "value_changed",
g_signal_connect(props->width, "value_changed",
G_CALLBACK(width_changed_cb), (gpointer) props);
create_label_in_table(table, 2, 3, _("pixels"));
label = create_label_in_table(table, 3, 0, _("_Height:"));
props->height = create_spin_button_in_table(table, label, 3, 1, 1, 1,
props->height = create_spin_button_in_table(table, label, 3, 1, 1, 1,
max_height);
g_signal_connect(props->height, "value_changed",
g_signal_connect(props->height, "value_changed",
G_CALLBACK(height_changed_cb), (gpointer) props);
create_label_in_table(table, 3, 3, _("pixels"));
@ -423,7 +422,7 @@ rectangle_create_info_widget(GtkWidget *frame)
return props;
}
static void
static void
rectangle_fill_info_tab(Object_t *obj, gpointer data)
{
Rectangle_t *rectangle = ObjectToRectangle(obj);
@ -433,18 +432,18 @@ rectangle_fill_info_tab(Object_t *obj, gpointer data)
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->x), rectangle->x);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->y), rectangle->y);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->width), rectangle->width);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->height),
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->height),
rectangle->height);
}
static void
static void
rectangle_set_initial_focus(Object_t *obj, gpointer data)
{
RectangleProperties_t *props = (RectangleProperties_t*) data;
gtk_widget_grab_focus(props->x);
}
static void
static void
rectangle_update(Object_t* obj, gpointer data)
{
Rectangle_t *rectangle = ObjectToRectangle(obj);
@ -498,7 +497,7 @@ rectangle_factory_finish(Object_t *obj, gint x, gint y)
rectangle->height = y - rectangle->y;
rectangle_normalize(obj);
return TRUE;
}

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

@ -27,6 +27,8 @@
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "imap_commands.h"
#include "imap_edit_area_info.h"
#include "imap_main.h"
@ -43,9 +45,9 @@ set_buttons(Selection_t *data)
if (gtk_tree_selection_get_selected (data->selection, &model, &iter)) {
#ifdef _OLD_
gtk_widget_set_sensitive(data->arrow_up,
gtk_widget_set_sensitive(data->arrow_up,
(data->selected_row) ? TRUE : FALSE);
if (data->selected_row < GTK_CLIST(data->list)->rows - 1)
if (data->selected_row < GTK_CLIST(data->list)->rows - 1)
gtk_widget_set_sensitive(data->arrow_down, TRUE);
else
gtk_widget_set_sensitive(data->arrow_down, FALSE);
@ -78,7 +80,7 @@ changed_cb(GtkTreeSelection *selection, gpointer param)
gtk_tree_selection_get_selected (selection, &model, &iter);
gtk_tree_model_get (GTK_TREE_MODEL(data->store), &iter, 0, &obj, -1);
printf("%d %d\n", count, obj->selected);
if (count == 1) {
@ -87,10 +89,10 @@ changed_cb(GtkTreeSelection *selection, gpointer param)
command = unselect_command_new (obj);
} else {
Command_t *sub_command;
gtk_tree_selection_get_selected (selection, &model, &iter);
gtk_tree_model_get (GTK_TREE_MODEL(data->store), &iter, 0, &obj, -1);
command = subcommand_start (NULL);
sub_command = unselect_all_command_new (data->object_list, NULL);
command_add_subcommand (command, sub_command);
@ -160,23 +162,23 @@ make_selection_toolbar(Selection_t *data)
toolbar = gtk_toolbar_new();
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
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,
"MoveUp", _("Move Up"),
data->arrow_up = make_toolbar_stock_icon(toolbar, GTK_STOCK_GO_UP,
"MoveUp", _("Move Up"),
selection_command,
&data->cmd_move_up);
data->arrow_down = make_toolbar_stock_icon(toolbar, GTK_STOCK_GO_DOWN,
"MoveDown", _("Move Down"),
selection_command,
data->arrow_down = make_toolbar_stock_icon(toolbar, GTK_STOCK_GO_DOWN,
"MoveDown", _("Move Down"),
selection_command,
&data->cmd_move_down);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
data->edit = make_toolbar_stock_icon(toolbar, GTK_STOCK_PROPERTIES,
"Edit", _("Edit"), selection_command,
"Edit", _("Edit"), selection_command,
&data->cmd_edit);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
data->remove = make_toolbar_stock_icon(toolbar, GTK_STOCK_DELETE, "Delete",
_("Delete"), selection_command,
_("Delete"), selection_command,
&data->cmd_delete);
gtk_widget_show(toolbar);
@ -189,7 +191,7 @@ selection_set_selected(Selection_t *selection, gint row)
{
GtkTreeIter iter;
if (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (selection->store), &iter,
if (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (selection->store), &iter,
NULL, row)) {
Object_t *obj;
@ -211,7 +213,7 @@ object_added_cb(Object_t *obj, gpointer data)
Selection_t *selection = (Selection_t*) data;
GtkTreeIter iter;
gint position = object_get_position_in_list (obj);
selection->nr_rows++;
if (position < selection->nr_rows - 1) {
gtk_list_store_insert (selection->store, &iter, position);
@ -222,20 +224,20 @@ object_added_cb(Object_t *obj, gpointer data)
}
static gboolean
selection_find_object(Selection_t *selection, Object_t *lookup,
selection_find_object(Selection_t *selection, Object_t *lookup,
GtkTreeIter *iter)
{
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (selection->store),
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (selection->store),
iter)) {
do {
Object_t *obj;
gtk_tree_model_get (GTK_TREE_MODEL(selection->store), iter, 0,
gtk_tree_model_get (GTK_TREE_MODEL(selection->store), iter, 0,
&obj, -1);
if (obj == lookup)
return TRUE;
} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (selection->store),
} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (selection->store),
iter));
}
return FALSE;
@ -301,14 +303,14 @@ selection_get_object (GtkTreeModel *tree_model, GtkTreeIter *iter)
return obj;
}
static void
handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
static void
handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
GtkSelectionData *data, guint info, guint time)
{
gboolean success = FALSE;
if (data->length >= 0 && data->format == 8) {
GtkTreePath *path;
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), x, y,
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), x, y,
&path, NULL, NULL, NULL)) {
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
GtkTreeIter iter;
@ -329,7 +331,7 @@ handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
}
static void
render_image (GtkTreeViewColumn *column, GtkCellRenderer *cell,
render_image (GtkTreeViewColumn *column, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
@ -337,7 +339,7 @@ render_image (GtkTreeViewColumn *column, GtkCellRenderer *cell,
}
static void
render_nr (GtkTreeViewColumn *column, GtkCellRenderer *cell,
render_nr (GtkTreeViewColumn *column, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
@ -349,7 +351,7 @@ render_nr (GtkTreeViewColumn *column, GtkCellRenderer *cell,
}
static void
render_url (GtkTreeViewColumn *column, GtkCellRenderer *cell,
render_url (GtkTreeViewColumn *column, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
@ -357,7 +359,7 @@ render_url (GtkTreeViewColumn *column, GtkCellRenderer *cell,
}
static void
render_target (GtkTreeViewColumn *column, GtkCellRenderer *cell,
render_target (GtkTreeViewColumn *column, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
@ -365,7 +367,7 @@ render_target (GtkTreeViewColumn *column, GtkCellRenderer *cell,
}
static void
render_comment (GtkTreeViewColumn *column, GtkCellRenderer *cell,
render_comment (GtkTreeViewColumn *column, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
@ -393,16 +395,15 @@ make_selection(ObjectList_t *object_list)
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_widget_show(frame);
hbox = gtk_hbox_new(FALSE, 1);
gtk_container_add(GTK_CONTAINER(frame), hbox);
hbox = gtk_hbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(frame), hbox);
gtk_widget_show(hbox);
toolbar = make_selection_toolbar(data);
gtk_container_add(GTK_CONTAINER(hbox), toolbar);
/* Create selection */
frame = gtk_frame_new(_("Selection"));
gtk_container_set_border_width(GTK_CONTAINER(frame), 10);
frame = gimp_frame_new(_("Selection"));
gtk_container_add(GTK_CONTAINER(hbox), frame);
gtk_widget_show(frame);
@ -412,7 +413,7 @@ make_selection(ObjectList_t *object_list)
g_object_unref (data->store);
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (N_("#"),
column = gtk_tree_view_column_new_with_attributes (N_("#"),
renderer,
NULL);
gtk_tree_view_column_set_cell_data_func (column, renderer,
@ -424,15 +425,15 @@ make_selection(ObjectList_t *object_list)
column = gtk_tree_view_column_new ();
gtk_tree_view_column_set_title (column, _("URL"));
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start(column, renderer, FALSE);
gtk_tree_view_column_set_cell_data_func (column, renderer,
render_image, data, NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, renderer, TRUE);
gtk_tree_view_column_set_cell_data_func (column, renderer, render_url, data,
gtk_tree_view_column_set_cell_data_func (column, renderer, render_url, data,
NULL);
gtk_tree_view_column_set_min_width (column, 80);
gtk_tree_view_column_set_resizable (column, TRUE);
@ -443,7 +444,7 @@ make_selection(ObjectList_t *object_list)
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("ALT Text"), renderer,
NULL);
gtk_tree_view_column_set_cell_data_func (column, renderer, render_comment,
gtk_tree_view_column_set_cell_data_func (column, renderer, render_comment,
data, NULL);
gtk_tree_view_column_set_min_width (column, 64);
gtk_tree_view_column_set_resizable (column, TRUE);
@ -471,15 +472,15 @@ make_selection(ObjectList_t *object_list)
gtk_widget_show (list);
/* Drop support */
gtk_drag_dest_set (list, GTK_DEST_DEFAULT_ALL, target_table, 2,
gtk_drag_dest_set (list, GTK_DEST_DEFAULT_ALL, target_table, 2,
GDK_ACTION_COPY);
g_signal_connect (list, "drag_data_received", G_CALLBACK(handle_drop), NULL);
/* For handling doubleclick */
g_signal_connect (list, "button_press_event",
g_signal_connect (list, "button_press_event",
G_CALLBACK(button_press_cb), data);
g_signal_connect (list, "button_release_event",
g_signal_connect (list, "button_release_event",
G_CALLBACK(button_release_cb), data);
/* Callbacks we are interested in */
@ -511,12 +512,12 @@ selection_toggle_visibility(Selection_t *selection)
}
}
void
void
selection_freeze(Selection_t *selection)
{
}
void
void
selection_thaw(Selection_t *selection)
{
}

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

@ -34,7 +34,7 @@
#include "libgimp/stdplugins-intl.h"
static void
static void
save_to_view(GtkTextBuffer *buffer, const char* format, ...)
{
va_list ap;
@ -49,7 +49,7 @@ save_to_view(GtkTextBuffer *buffer, const char* format, ...)
gtk_text_buffer_insert(buffer, &iter, scratch, -1);
}
void
void
do_source_dialog(void)
{
static DefaultDialog_t *dialog;
@ -70,13 +70,12 @@ do_source_dialog(void)
gtk_widget_show(text);
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_widget_set_size_request(swin, 640, 400);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), swin,
TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
GTK_POLICY_AUTOMATIC,
gtk_widget_set_size_request(swin, 400, 300);
gtk_box_pack_start(GTK_BOX(dialog->vbox), swin, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_widget_show(swin);
gtk_container_add(GTK_CONTAINER(swin), text);

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

@ -92,10 +92,9 @@ make_toolbar(GtkWidget *main_vbox, GtkWidget *window)
gtk_box_pack_start(GTK_BOX(main_vbox), handlebox, FALSE, FALSE, 0);
data->toolbar = toolbar = gtk_toolbar_new();
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_container_set_border_width(GTK_CONTAINER(toolbar), 5);
gtk_container_set_border_width(GTK_CONTAINER(toolbar), 0);
gtk_container_add(GTK_CONTAINER(handlebox), toolbar);
@ -105,63 +104,63 @@ make_toolbar(GtkWidget *main_vbox, GtkWidget *window)
_("Save"), toolbar_command, &data->cmd_save);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
make_toolbar_stock_icon(toolbar, GTK_STOCK_PREFERENCES, "Preferences",
_("Preferences"), toolbar_command,
_("Preferences"), toolbar_command,
&data->cmd_preferences);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
data->undo = make_toolbar_stock_icon(toolbar, GTK_STOCK_UNDO, "Undo",
_("Undo"), toolbar_command,
data->undo = make_toolbar_stock_icon(toolbar, GTK_STOCK_UNDO, "Undo",
_("Undo"), toolbar_command,
&data->cmd_undo);
gtk_widget_set_sensitive(data->undo, FALSE);
data->redo = make_toolbar_stock_icon(toolbar, GTK_STOCK_REDO, "Redo",
_("Redo"), toolbar_command,
data->redo = make_toolbar_stock_icon(toolbar, GTK_STOCK_REDO, "Redo",
_("Redo"), toolbar_command,
&data->cmd_redo);
gtk_widget_set_sensitive(data->redo, FALSE);
command_list_add_update_cb(command_list_changed, data);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
data->cut = make_toolbar_stock_icon(toolbar, GTK_STOCK_CUT, "Cut",
data->cut = make_toolbar_stock_icon(toolbar, GTK_STOCK_CUT, "Cut",
_("Cut"), toolbar_command, &data->cmd_cut);
gtk_widget_set_sensitive(data->cut, FALSE);
data->copy = make_toolbar_stock_icon(toolbar, GTK_STOCK_COPY, "Copy",
data->copy = make_toolbar_stock_icon(toolbar, GTK_STOCK_COPY, "Copy",
_("Copy"), toolbar_command, &data->cmd_copy);
gtk_widget_set_sensitive(data->copy, FALSE);
paste = make_toolbar_stock_icon(toolbar, GTK_STOCK_PASTE, "Paste",
_("Paste"), toolbar_command,
_("Paste"), toolbar_command,
&data->cmd_paste);
gtk_widget_set_sensitive(paste, FALSE);
paste_buffer_add_add_cb(paste_buffer_added, (gpointer) paste);
paste_buffer_add_remove_cb(paste_buffer_removed, (gpointer) paste);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
data->zoom_in = make_toolbar_stock_icon(toolbar, GTK_STOCK_ZOOM_IN,
"ZoomIn", _("Zoom in"),
toolbar_command,
data->zoom_in = make_toolbar_stock_icon(toolbar, GTK_STOCK_ZOOM_IN,
"ZoomIn", _("Zoom in"),
toolbar_command,
&data->cmd_zoom_in);
data->zoom_out = make_toolbar_stock_icon(toolbar, GTK_STOCK_ZOOM_OUT,
data->zoom_out = make_toolbar_stock_icon(toolbar, GTK_STOCK_ZOOM_OUT,
"ZoomOut",
_("Zoom out"), toolbar_command,
_("Zoom out"), toolbar_command,
&data->cmd_zoom_out);
gtk_widget_set_sensitive(data->zoom_out, FALSE);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
make_toolbar_stock_icon(toolbar, IMAP_STOCK_MAP_INFO, "EditMapInfo",
_("Edit map info"), toolbar_command,
_("Edit map info"), toolbar_command,
&data->cmd_edit_map_info);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
data->to_front = make_toolbar_stock_icon(toolbar, IMAP_STOCK_TO_FRONT,
"ToFront", _("Move To Front"),
data->to_front = make_toolbar_stock_icon(toolbar, IMAP_STOCK_TO_FRONT,
"ToFront", _("Move To Front"),
toolbar_command,
&data->cmd_move_to_front);
gtk_widget_set_sensitive(data->to_front, FALSE);
data->to_back = make_toolbar_stock_icon(toolbar, IMAP_STOCK_TO_BACK,
data->to_back = make_toolbar_stock_icon(toolbar, IMAP_STOCK_TO_BACK,
"ToBack",
_("Send To Back"), toolbar_command,
_("Send To Back"), toolbar_command,
&data->cmd_send_to_back);
gtk_widget_set_sensitive(data->to_back, FALSE);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
data->grid = make_toolbar_toggle_icon(toolbar, GIMP_STOCK_GRID, "Grid",
_("Grid"), toolbar_command,
_("Grid"), toolbar_command,
&data->cmd_grid);
gtk_widget_show(toolbar);
@ -170,14 +169,14 @@ make_toolbar(GtkWidget *main_vbox, GtkWidget *window)
return data;
}
void
void
toolbar_set_zoom_sensitivity(ToolBar_t *toolbar, gint factor)
{
gtk_widget_set_sensitive(toolbar->zoom_in, factor < 8);
gtk_widget_set_sensitive(toolbar->zoom_out, factor > 1);
}
void
void
toolbar_set_grid(ToolBar_t *toolbar, gboolean active)
{
_command_lock = TRUE;

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

@ -136,33 +136,33 @@ make_tools(GtkWidget *window)
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
_tools.container = handlebox = gtk_handle_box_new();
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);
_tools.arrow = make_toolbar_radio_icon(toolbar, IMAP_STOCK_ARROW,
NULL, _("Select"),
_("Select existing area"),
NULL, _("Select"),
_("Select existing area"),
arrow_clicked, NULL);
#ifdef _NOT_READY_YET_
_tools.fuzzy_select =
_tools.fuzzy_select =
make_toolbar_radio_icon(toolbar, GIMP_STOCK_TOOL_FUZZY_SELECT,
_tools.arrow, _("Fuzzy Select"),
_("Select contiguous regions"),
fuzzy_select_clicked, NULL);
#endif
_tools.rectangle = make_toolbar_radio_icon(toolbar, IMAP_STOCK_RECTANGLE,
_tools.arrow,
_("Rectangle"),
_("Define Rectangle area"),
_tools.rectangle = make_toolbar_radio_icon(toolbar, IMAP_STOCK_RECTANGLE,
_tools.arrow,
_("Rectangle"),
_("Define Rectangle area"),
rectangle_clicked, NULL);
_tools.circle = make_toolbar_radio_icon(toolbar, IMAP_STOCK_CIRCLE,
_tools.circle = make_toolbar_radio_icon(toolbar, IMAP_STOCK_CIRCLE,
_tools.rectangle, _("Circle"),
_("Define Circle/Oval area"),
_("Define Circle/Oval area"),
circle_clicked, NULL);
_tools.polygon = make_toolbar_radio_icon(toolbar, IMAP_STOCK_POLYGON,
_tools.polygon = make_toolbar_radio_icon(toolbar, IMAP_STOCK_POLYGON,
_tools.circle, _("Polygon"),
_("Define Polygon area"),
_("Define Polygon area"),
polygon_clicked, NULL);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
_tools.edit = make_toolbar_stock_icon(toolbar, GTK_STOCK_PROPERTIES,