gimp r25014 - in branches/weskaggs: . app/display

[weskaggs svn gnome org]

Author: weskaggs
Date: Mon Mar  3 22:43:46 2008
New Revision: 25014
URL: http://svn.gnome.org/viewvc/gimp?rev=25014&view=rev

Log:
Bill Skaggs  <weskaggs primate ucdavis edu>

	* app/display/gimpdisplayshell.[ch]: when we have a scratch
	display, open new images in it instead of creating a new
	display.


Modified:
   branches/weskaggs/ChangeLog
   branches/weskaggs/app/display/gimpdisplayshell.c
   branches/weskaggs/app/display/gimpdisplayshell.h

Modified: branches/weskaggs/app/display/gimpdisplayshell.c
==============================================================================
--- branches/weskaggs/app/display/gimpdisplayshell.c	(original)
+++ branches/weskaggs/app/display/gimpdisplayshell.c	Mon Mar  3 22:43:46 2008
@@ -1135,6 +1135,38 @@
 }
 
 void
+gimp_display_shell_reconfigure_from_scratch (GimpDisplayShell *shell)
+{
+  Gimp              *gimp;
+  GimpDisplayConfig *display_config;
+
+  gimp = shell->display->image->gimp;
+  display_config = GIMP_DISPLAY_CONFIG (gimp->config);
+
+  gimp_config_sync (G_OBJECT (display_config->default_view),
+                    G_OBJECT (shell->options), 0);
+
+  if (shell->options->show_rulers)
+    {
+      gtk_widget_show (shell->origin);
+      gtk_widget_show (shell->hrule);
+      gtk_widget_show (shell->vrule);
+    }
+
+  if (shell->options->show_scrollbars)
+    {
+      gtk_widget_show (shell->vsb);
+      gtk_widget_show (shell->hsb);
+      gtk_widget_show (shell->zoom_button);
+      gtk_widget_show (shell->quick_mask_button);
+      gtk_widget_show (shell->nav_ebox);
+    }
+
+  if (shell->options->show_statusbar)
+    gtk_widget_show (shell->statusbar);
+}
+
+void
 gimp_display_shell_reconnect (GimpDisplayShell *shell)
 {
   g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));

Modified: branches/weskaggs/app/display/gimpdisplayshell.h
==============================================================================
--- branches/weskaggs/app/display/gimpdisplayshell.h	(original)
+++ branches/weskaggs/app/display/gimpdisplayshell.h	Mon Mar  3 22:43:46 2008
@@ -258,6 +258,7 @@
 void        gimp_display_shell_set_mask            (GimpDisplayShell   *shell,
                                                     GimpDrawable       *mask,
                                                     GimpChannelType     color);
+void   gimp_display_shell_reconfigure_from_scratch (GimpDisplayShell   *shell);
 
 
 #endif /* __GIMP_DISPLAY_SHELL_H__ */