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

Added mnemonics to align layers dialog (#80804). Added stock warning icon to imagemap error dialogs.

This commit is contained in:
Maurits Rijk 2002-06-18 20:40:28 +00:00
parent 322183c7a6
commit 71ff805389
4 changed files with 45 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2002-06-18 Maurits Rijk <lpeek.mrijk@consunet.nl>
* plug-ins/common/align_layers.c (align_layers_dialog): enable
mnemonics, minor code cleanup.
* plug-ins/imagemap/imap_file.c (create_file_error_dialog): added stock
warning icon to error dialog.
* plug-ins/imagemap/ChangeLog: removed since it wasn't up-to-date and
changes to the plug-in are logged in _this_ ChangeLog.
2002-06-17 Sven Neumann <sven@gimp.org>
Obviously I disagree with Tim about the symbol_name parameter in

51
plug-ins/common/align_layers.c
View File

@ -248,11 +248,10 @@ align_layers (gint32 image_id)
if (0 < visible_layer_num)
{
gboolean uninitialized = TRUE;
gint min_x = 0;
gint min_y = 0;
gint max_x = 0;
gint max_y = 0;
gint min_x = G_MAXINT;
gint min_y = G_MAXINT;
gint max_x = G_MININT;
gint max_y = G_MININT;
/* 0 is the top layer */
for (index = 0; index < layer_num; index++)
@ -260,31 +259,23 @@ align_layers (gint32 image_id)
if (gimp_layer_get_visible (layers[index]))
{
gimp_drawable_offsets (layers[index], &orig_x, &orig_y);
align_layers_get_align_offsets (layers[index], &offset_x, &offset_y);
align_layers_get_align_offsets (layers[index], &offset_x,
&offset_y);
orig_x += offset_x;
orig_y += offset_y;
if (uninitialized)
{
base_x = min_x = max_x = orig_x;
base_y = min_y = max_y = orig_y;
uninitialized = FALSE;
}
else
{
if ( orig_x < min_x ) min_x = orig_x;
if ( max_x < orig_x ) max_x = orig_x;
if ( orig_y < min_y ) min_y = orig_y;
if ( max_y < orig_y ) max_y = orig_y;
}
if ( orig_x < min_x ) min_x = orig_x;
if ( max_x < orig_x ) max_x = orig_x;
if ( orig_y < min_y ) min_y = orig_y;
if ( max_y < orig_y ) max_y = orig_y;
}
}
if (VALS.base_is_bottom_layer)
{
gimp_drawable_offsets (layers[bg_index], &orig_x, &orig_y);
align_layers_get_align_offsets (layers[bg_index], &offset_x, &offset_y);
align_layers_get_align_offsets (layers[bg_index], &offset_x,
&offset_y);
orig_x += offset_x;
orig_y += offset_y;
base_x = min_x = orig_x;
@ -462,7 +453,7 @@ align_layers_dialog (void)
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Horizontal Style:"), 1.0, 0.5,
_("_Horizontal Style:"), 1.0, 0.5,
optionmenu, 1, FALSE);
optionmenu =
@ -475,7 +466,7 @@ align_layers_dialog (void)
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Horizontal Base:"), 1.0, 0.5,
_("Ho_rizontal Base:"), 1.0, 0.5,
optionmenu, 1, FALSE);
optionmenu =
@ -495,7 +486,7 @@ align_layers_dialog (void)
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Vertical Style:"), 1.0, 0.5,
_("_Vertical Style:"), 1.0, 0.5,
optionmenu, 1, FALSE);
optionmenu =
@ -508,12 +499,12 @@ align_layers_dialog (void)
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Vertical Base:"), 1.0, 0.5,
_("Ver_tical Base:"), 1.0, 0.5,
optionmenu, 1, FALSE);
toggle =
gtk_check_button_new_with_label
(_("Ignore the Bottom Layer even if Visible"));
gtk_check_button_new_with_mnemonic
(_("_Ignore the Bottom Layer even if Visible"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), VALS.ignore_bottom);
gtk_table_attach_defaults (GTK_TABLE (table), toggle, 0, 2, 4, 5);
gtk_widget_show (toggle);
@ -523,8 +514,8 @@ align_layers_dialog (void)
&VALS.ignore_bottom);
toggle =
gtk_check_button_new_with_label
(_("Use the (Invisible) Bottom Layer as the Base"));
gtk_check_button_new_with_mnemonic
(_("_Use the (Invisible) Bottom Layer as the Base"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
VALS.base_is_bottom_layer);
gtk_table_attach_defaults (GTK_TABLE (table), toggle, 0, 2, 5, 6);
@ -535,7 +526,7 @@ align_layers_dialog (void)
&VALS.base_is_bottom_layer);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 6,
_("Grid Size:"), SCALE_WIDTH, 0,
_("_Grid Size:"), SCALE_WIDTH, 0,
VALS.grid_size, 0, 200, 1, 10, 0,
TRUE, 0, 0,
NULL, NULL);

248
plug-ins/imagemap/ChangeLog
View File

@ -1,248 +0,0 @@
Thu Oct 21 19:58:39 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 1.3
Sat Oct 9 11:39:14 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_main.c (dialog): removed some obsolete funcs.
Sun Oct 3 20:25:32 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_grid.c: prepare for i8n
* imap_polygon.c (polygon_free_list): added
(polygon_assign): free list before adding new points
Sun Sep 26 13:44:15 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_cmd_select_prev.c: created
* imap_cmd_select_prev.h: created
* imap_cmd_select_next.c: created
* imap_cmd_select_next.h: created
* imap_cmd_object_move.c: created
* imap_cmd_object_move.h: created
Wed Sep 8 19:07:19 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_taglist.h: created
* imap_taglist.c: created
Sat Aug 28 16:32:03 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 1.2
Sun Aug 15 16:54:43 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_cmd_select_region.h: created
* imap_cmd_move_sash.c: created
Mon Aug 9 22:33:12 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_cmd_cut_object.c: created
* imap_cmd_cut_object.h: created
Sun Aug 8 12:54:44 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_cmd_cut.c: created
* imap_cmd_insert_point.c: created
* imap_cmd_insert_point.h: created
* imap_cmd_delete_point.c: created
* imap_object_popup.h: created
Sat Jul 31 12:34:00 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_toolbar.c: Added redo and undo button to toolbar.
Wed Jul 28 22:17:09 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_object.c (object_on_button_press): fixed 'round to grid' bug
for polygons.
Tue Jul 27 23:19:00 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_edit_area_info.c: use BrowseWidget_t for URL.
Mon Jul 26 22:00:58 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_browse.c: created
* imap_object.c (object_list_move_selected_up): fixed move up/down bug.
Mon Jun 28 18:05:24 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_main.c (dialog): fixed annoying bug
Sat Jun 26 16:25:33 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 1.1
Wed Jun 9 21:45:04 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_menu_funcs.c: created
Tue Jun 8 23:02:31 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_popup.c: created
Fri May 28 21:48:40 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 1.0
Wed May 26 22:16:20 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_object.c (do_object_locked_dialog): removed apply button in
message locked dialog.
* imap_default_dialog.c (make_default_dialog): handle delete event
Wed May 19 20:47:52 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_polygon.c (polygon_write_csim): Don't write last duplicate
point.
Fri May 14 16:10:39 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_main.c (close_current): freeze/thaw on selection
* imap_circle.c (circle_update): bug fix second props->x should be
props->y.
Thu May 13 13:54:45 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_main.c: issue warning when closing unsaved data.
* release version 0.9
Sun May 9 16:25:23 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_default_dialog.c: added 'apply' button.
* imap_polygon.c: replaced text entries by spinbuttons.
* imap_circle.c: replaced text entries by spinbuttons.
* imap_rectangle.c: replaced text entries by spinbuttons.
Sun Apr 25 21:55:36 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 0.7
Thu Apr 8 20:19:27 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 0.6
Sun Apr 4 20:52:57 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* Moved to GIMP 1.0.4 and GTK 1.2.1
Sun Mar 21 13:18:25 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_main.c (dialog): Changed auto_shrink to FALSE in
gtk_window_set_policy.
Sat Mar 20 11:50:34 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_main.c (do_data_changed_dialog): replaced some code with
default_dialog_set_label call.
Thu Mar 18 18:27:23 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 0.5
Sat Mar 13 13:36:00 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_settings.c (do_settings_dialog): set initial focus
Thu Mar 11 20:01:17 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_edit_area_info.c: show area number in dialog.
Tue Mar 9 22:26:49 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_table.c (create_spin_button_in_table): make spinbuttons always
numeric.
* imap_guides.c (make_guides_dialog): show image dimensions in dialog
Thu Mar 4 23:15:43 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_toolbar.c : added cut/copy/paste icons
Sun Feb 28 15:29:14 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 0.4
Sun Jan 31 17:09:52 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* Makefile (CC): removed C++ stuff
Sat Jan 30 21:55:10 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 0.3
Sun Jan 24 18:04:33 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_main.c (save_as): write width and height off image to file.
* imap_selection.c : finished 'selection' operations.
* imap_object.c : implemented 'move to front' and 'send to back'.
Thu Jan 21 20:02:43 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_edit_area_info.c : added Browse functionality for URL field.
Tue Jan 19 19:41:26 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_about.c : use DefaultDialog_t
Sat Jan 16 13:33:17 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_edit_area_info.c : new JavaScript tab
* imap_main.c : implemented title in main dialog
* imap_file.c : added file error dialog
Thu Jan 14 20:27:43 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 0.2
Wed Jan 13 21:21:17 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_toolbar.c : added move to front/send to back icons
Tue Jan 12 19:33:00 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_grid.c : implemented 'round to grid'
Mon Jan 11 22:35:29 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_grid.c: completed implementation
Tue Jan 5 22:48:34 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imap_polygon.c: completed polygon info tab
* imap_tools.c (make_tools): implemented radio behaviour
Mon Jan 3 20:18:57 1999 Maurits Rijk <lpeek.mrijk@consunet.nl>
* release version 0.1
Sun Dec 27 12:13:51 1998 Maurits Rijk <lpeek.mrijk@consunet.nl>
* imagemap.c: started coding

16
plug-ins/imagemap/imap_file.c
View File

@ -140,16 +140,26 @@ create_file_error_dialog()
{
FileErrorDialog_t *file_dialog = g_new(FileErrorDialog_t, 1);
DefaultDialog_t *dialog;
GtkWidget *table;
GtkWidget *table, *hbox;
GtkWidget *image;
file_dialog->dialog = dialog = make_default_dialog(_("Error"));
default_dialog_hide_apply_button(dialog);
default_dialog_hide_cancel_button(dialog);
hbox = gtk_hbox_new(FALSE, 10);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), hbox,
TRUE, TRUE, 10);
gtk_widget_show(hbox);
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
table = gtk_table_new(2, 1, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(table), 10);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), table,
TRUE, TRUE, 10);
gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);
gtk_widget_show(table);
file_dialog->error = create_label_in_table(table, 0, 0, "");