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

have the grid/guide menu entries reflect the presence of grid/guides in 

2003-08-12 Henrik Brix Andersen <brix@gimp.org>

* app/gui/image-menu.c (image_menu_update): have the grid/guide
menu entries reflect the presence of grid/guides in the image (as
suggested by jimmac)

* app/display/gimpdisplayshell.c (gimp_display_shell_snap_coords):
snap to grid/guides even if the grid/guides are hidden (as
suggested by jimmac)
This commit is contained in:
Henrik Brix Andersen 2003-08-12 18:02:55 +00:00 committed by Henrik Brix Andersen
parent 668ca1e4a3
commit 4172d170bc
5 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2003-08-12 Henrik Brix Andersen <brix@gimp.org>
* app/gui/image-menu.c (image_menu_update): have the grid/guide
menu entries reflect the presence of grid/guides in the image (as
suggested by jimmac)
* app/display/gimpdisplayshell.c (gimp_display_shell_snap_coords):
snap to grid/guides even if the grid/guides are hidden (as
suggested by jimmac)
2003-08-12 Adam D. Moss <adam@gimp.org>
* plug-ins/common/gifload.c: revert one of Sven's -pedantic

6
app/display/gimpdisplayshell-draw.c
View File

@ -1001,15 +1001,13 @@ gimp_display_shell_snap_coords (GimpDisplayShell *shell,
*snapped_coords = *coords;
if (gimp_display_shell_get_show_guides (shell) &&
shell->snap_to_guides &&
if (shell->snap_to_guides &&
shell->gdisp->gimage->guides)
{
snap_to_guides = TRUE;
}
if (gimp_display_shell_get_show_grid (shell) &&
gimp_display_shell_get_snap_to_grid (shell) &&
if (gimp_display_shell_get_snap_to_grid (shell) &&
shell->gdisp->gimage->grid)
{
snap_to_grid = TRUE;

6
app/display/gimpdisplayshell.c
View File

@ -1001,15 +1001,13 @@ gimp_display_shell_snap_coords (GimpDisplayShell *shell,
*snapped_coords = *coords;
if (gimp_display_shell_get_show_guides (shell) &&
shell->snap_to_guides &&
if (shell->snap_to_guides &&
shell->gdisp->gimage->guides)
{
snap_to_guides = TRUE;
}
if (gimp_display_shell_get_show_grid (shell) &&
gimp_display_shell_get_snap_to_grid (shell) &&
if (gimp_display_shell_get_snap_to_grid (shell) &&
shell->gdisp->gimage->grid)
{
snap_to_grid = TRUE;

16
app/gui/image-menu.c
View File

@ -430,9 +430,6 @@ GimpItemFactoryEntry image_menu_entries[] =
view_snap_to_guides_cmd_callback, 0, "<ToggleItem>" },
NULL,
"view/snap_to_guides.html", NULL },
MENU_SEPARATOR ("/View/---"),
{ { N_("/View/S_how Grid"), NULL,
view_toggle_grid_cmd_callback, 0, "<ToggleItem>" },
NULL,
@ -1449,15 +1446,14 @@ image_menu_update (GtkItemFactory *item_factory,
SET_ACTIVE ("/View/Show Selection", gdisp && appearance->selection);
SET_SENSITIVE ("/View/Show Layer Boundary", gdisp);
SET_ACTIVE ("/View/Show Layer Boundary", gdisp && appearance->active_layer);
SET_SENSITIVE ("/View/Show Guides", gdisp);
SET_SENSITIVE ("/View/Show Guides", gdisp && gimage->guides);
SET_ACTIVE ("/View/Show Guides", gdisp && appearance->guides);
SET_SENSITIVE ("/View/Snap to Guides", gdisp);
SET_SENSITIVE ("/View/Snap to Guides", gdisp && gimage->guides);
SET_ACTIVE ("/View/Snap to Guides", gdisp && shell->snap_to_guides);
SET_SENSITIVE ("/View/Show Grid", gdisp);
SET_ACTIVE ("/View/Show Grid", gdisp && appearance->grid);
SET_SENSITIVE ("/View/Snap to Grid", gdisp);
SET_ACTIVE ("/View/Snap to Grid", gdisp && shell->snap_to_grid);
SET_SENSITIVE ("/View/Show Grid", gdisp && gimage->grid);
SET_ACTIVE ("/View/Show Grid", gdisp && appearance->grid);
SET_SENSITIVE ("/View/Snap to Grid", gdisp && gimage->grid);
SET_ACTIVE ("/View/Snap to Grid", gdisp && shell->snap_to_grid);
SET_SENSITIVE ("/View/Show Menubar", gdisp);
SET_ACTIVE ("/View/Show Menubar", gdisp && appearance->menubar);

16
app/menus/image-menu.c
View File

@ -430,9 +430,6 @@ GimpItemFactoryEntry image_menu_entries[] =
view_snap_to_guides_cmd_callback, 0, "<ToggleItem>" },
NULL,
"view/snap_to_guides.html", NULL },
MENU_SEPARATOR ("/View/---"),
{ { N_("/View/S_how Grid"), NULL,
view_toggle_grid_cmd_callback, 0, "<ToggleItem>" },
NULL,
@ -1449,15 +1446,14 @@ image_menu_update (GtkItemFactory *item_factory,
SET_ACTIVE ("/View/Show Selection", gdisp && appearance->selection);
SET_SENSITIVE ("/View/Show Layer Boundary", gdisp);
SET_ACTIVE ("/View/Show Layer Boundary", gdisp && appearance->active_layer);
SET_SENSITIVE ("/View/Show Guides", gdisp);
SET_SENSITIVE ("/View/Show Guides", gdisp && gimage->guides);
SET_ACTIVE ("/View/Show Guides", gdisp && appearance->guides);
SET_SENSITIVE ("/View/Snap to Guides", gdisp);
SET_SENSITIVE ("/View/Snap to Guides", gdisp && gimage->guides);
SET_ACTIVE ("/View/Snap to Guides", gdisp && shell->snap_to_guides);
SET_SENSITIVE ("/View/Show Grid", gdisp);
SET_ACTIVE ("/View/Show Grid", gdisp && appearance->grid);
SET_SENSITIVE ("/View/Snap to Grid", gdisp);
SET_ACTIVE ("/View/Snap to Grid", gdisp && shell->snap_to_grid);
SET_SENSITIVE ("/View/Show Grid", gdisp && gimage->grid);
SET_ACTIVE ("/View/Show Grid", gdisp && appearance->grid);
SET_SENSITIVE ("/View/Snap to Grid", gdisp && gimage->grid);
SET_ACTIVE ("/View/Snap to Grid", gdisp && shell->snap_to_grid);
SET_SENSITIVE ("/View/Show Menubar", gdisp);
SET_ACTIVE ("/View/Show Menubar", gdisp && appearance->menubar);