gimp r25416 - in branches/weskaggs: . app/actions app/display menus

[weskaggs svn gnome org]

Author: weskaggs
Date: Tue Apr  8 21:41:01 2008
New Revision: 25416
URL: http://svn.gnome.org/viewvc/gimp?rev=25416&view=rev

Log:
Bill Skaggs  <weskaggs primate ucdavis edu>

	* app/display/gimpdisplayshell-appearance.c
	* app/actions/view-actions.c
	* app/actions/view-commands.c
	* menus/image-toolbar.xml
	* menus/image-menu.xml.in: tweak show grid and show selection
	actions, and make sure updating is correct.


Modified:
   branches/weskaggs/ChangeLog
   branches/weskaggs/app/actions/view-actions.c
   branches/weskaggs/app/actions/view-commands.c
   branches/weskaggs/app/display/gimpdisplayshell-appearance.c
   branches/weskaggs/menus/image-menu.xml.in
   branches/weskaggs/menus/image-toolbar.xml

Modified: branches/weskaggs/app/actions/view-actions.c
==============================================================================
--- branches/weskaggs/app/actions/view-actions.c	(original)
+++ branches/weskaggs/app/actions/view-actions.c	Tue Apr  8 21:41:01 2008
@@ -141,11 +141,11 @@
     TRUE,
     GIMP_HELP_VIEW_DOT_FOR_DOT },
 
-  { "view-show-selection", GIMP_STOCK_SELECTION_ALL,
-    N_("Show _Selection"), "<control>T",
-    N_("Display the selection outline"),
+  { "view-hide-selection", GIMP_STOCK_SELECTION_ALL,
+    N_("Hide _Selection"), "<control>T",
+    N_("Don't show the selection outline"),
     G_CALLBACK (view_toggle_selection_cmd_callback),
-    TRUE,
+    FALSE,
     GIMP_HELP_VIEW_SHOW_SELECTION },
 
   { "view-show-layer-boundary", NULL,
@@ -613,8 +613,8 @@
   SET_SENSITIVE ("view-navigation-window", display);
   SET_SENSITIVE ("view-display-filters",   display);
 
-  SET_SENSITIVE ("view-show-selection",      display);
-  SET_ACTIVE    ("view-show-selection",      display && options->show_selection);
+  SET_SENSITIVE ("view-hide-selection",      display);
+  SET_ACTIVE    ("view-hide-selection",      display && ! options->show_selection);
   SET_SENSITIVE ("view-show-layer-boundary", display);
   SET_ACTIVE    ("view-show-layer-boundary", display && options->show_layer_boundary);
   SET_SENSITIVE ("view-show-guides",         display);

Modified: branches/weskaggs/app/actions/view-commands.c
==============================================================================
--- branches/weskaggs/app/actions/view-commands.c	(original)
+++ branches/weskaggs/app/actions/view-commands.c	Tue Apr  8 21:41:01 2008
@@ -343,7 +343,7 @@
 
   active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 
-  gimp_display_shell_set_show_selection (shell, active);
+  gimp_display_shell_set_show_selection (shell, ! active);
 }
 
 void
@@ -485,6 +485,9 @@
   active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 
   gimp_display_shell_set_show_grid (shell, active);
+
+  /* allow show & snap to be set with a single action */
+  gimp_display_shell_set_snap_to_grid (shell, active);
 }
 
 void

Modified: branches/weskaggs/app/display/gimpdisplayshell-appearance.c
==============================================================================
--- branches/weskaggs/app/display/gimpdisplayshell-appearance.c	(original)
+++ branches/weskaggs/app/display/gimpdisplayshell-appearance.c	Tue Apr  8 21:41:01 2008
@@ -75,9 +75,9 @@
   if (fullscreen != gimp_display_shell_get_fullscreen (shell))
     {
       if (fullscreen)
-        gtk_window_fullscreen (GTK_WINDOW (shell));
+        gtk_window_fullscreen (shell->container_window);
       else
-        gtk_window_unfullscreen (GTK_WINDOW (shell));
+        gtk_window_unfullscreen (shell->container_window);
     }
 }
 
@@ -301,10 +301,11 @@
 
   gimp_display_shell_selection_set_hidden (shell, ! show);
 
-  SET_ACTIVE (shell->menubar_manager, "view-show-selection", show);
+  SET_ACTIVE (shell->menubar_manager, "view-hide-selection", ! show);
+  SET_ACTIVE (shell->toolbar_manager, "view-hide-selection", ! show);
 
   if (IS_ACTIVE_DISPLAY (shell))
-    SET_ACTIVE (shell->popup_manager, "view-show-selection", show);
+    SET_ACTIVE (shell->popup_manager, "view-hide-selection", ! show);
 }
 
 gboolean
@@ -405,6 +406,7 @@
     gimp_display_shell_expose_full (shell);
 
   SET_ACTIVE (shell->menubar_manager, "view-show-grid", show);
+  SET_ACTIVE (shell->toolbar_manager, "view-show-grid", show);
 
   if (IS_ACTIVE_DISPLAY (shell))
     SET_ACTIVE (shell->popup_manager, "view-show-grid", show);

Modified: branches/weskaggs/menus/image-menu.xml.in
==============================================================================
--- branches/weskaggs/menus/image-menu.xml.in	(original)
+++ branches/weskaggs/menus/image-menu.xml.in	Tue Apr  8 21:41:01 2008
@@ -231,7 +231,7 @@
           <menuitem action="view-navigation-window" />
         <menuitem action="view-display-filters" />
         <separator />
-        <menuitem action="view-show-selection" />
+        <menuitem action="view-hide-selection" />
         <menuitem action="view-show-layer-boundary" />
         <menuitem action="view-show-guides" />
         <menuitem action="view-show-grid" />

Modified: branches/weskaggs/menus/image-toolbar.xml
==============================================================================
--- branches/weskaggs/menus/image-toolbar.xml	(original)
+++ branches/weskaggs/menus/image-toolbar.xml	Tue Apr  8 21:41:01 2008
@@ -9,7 +9,7 @@
     <toolitem action="view-fullscreen" />
     <separator />
     <toolitem action="view-show-grid" />
-    <toolitem action="view-show-selection" />
+    <toolitem action="view-hide-selection" />
     <toolitem action="quick-mask-toggle" />
     <separator expand="true"/>
     <toolitem action="edit-undo" />