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

[weskaggs svn gnome org]

Author: weskaggs
Date: Tue Mar  4 16:40:39 2008
New Revision: 25031
URL: http://svn.gnome.org/viewvc/gimp?rev=25031&view=rev

Log:
Bill Skaggs  <weskaggs primate ucdavis edu>

	* app/display/gimpdisplayshell.[ch]
	* app/display/gimpdisplay.c: factor out duplicated
	code for configuring display shell.


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

Modified: branches/weskaggs/app/display/gimpdisplay.c
==============================================================================
--- branches/weskaggs/app/display/gimpdisplay.c	(original)
+++ branches/weskaggs/app/display/gimpdisplay.c	Tue Mar  4 16:40:39 2008
@@ -659,7 +659,7 @@
   gimp_display_connect (display, image);
 
   if (image->gimp->scratch_image == old_image)
-    gimp_display_shell_reconfigure_from_scratch (GIMP_DISPLAY_SHELL (display->shell));
+    gimp_display_shell_configure (GIMP_DISPLAY_SHELL (display->shell));
 
   g_object_unref (old_image);
 

Modified: branches/weskaggs/app/display/gimpdisplayshell.c
==============================================================================
--- branches/weskaggs/app/display/gimpdisplayshell.c	(original)
+++ branches/weskaggs/app/display/gimpdisplayshell.c	Tue Mar  4 16:40:39 2008
@@ -1093,27 +1093,9 @@
 
   /*  show everything  *******************************************************/
 
-  if (shell->options->show_rulers)
-    {
-      gtk_widget_show (shell->origin);
-      gtk_widget_show (shell->hrule);
-      gtk_widget_show (shell->vrule);
-    }
+  gimp_display_shell_configure (shell);
 
   gtk_widget_show (GTK_WIDGET (shell->canvas));
-
-  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);
-
   gtk_widget_show (main_vbox);
 
   filter = gimp_display_shell_filter_new (shell,
@@ -1135,7 +1117,7 @@
 }
 
 void
-gimp_display_shell_reconfigure_from_scratch (GimpDisplayShell *shell)
+gimp_display_shell_configure (GimpDisplayShell *shell)
 {
   Gimp              *gimp;
   GimpDisplayConfig *display_config;

Modified: branches/weskaggs/app/display/gimpdisplayshell.h
==============================================================================
--- branches/weskaggs/app/display/gimpdisplayshell.h	(original)
+++ branches/weskaggs/app/display/gimpdisplayshell.h	Tue Mar  4 16:40:39 2008
@@ -258,7 +258,7 @@
 void        gimp_display_shell_set_mask            (GimpDisplayShell   *shell,
                                                     GimpDrawable       *mask,
                                                     GimpChannelType     color);
-void   gimp_display_shell_reconfigure_from_scratch (GimpDisplayShell   *shell);
+void        gimp_display_shell_configure           (GimpDisplayShell   *shell);
 
 
 #endif /* __GIMP_DISPLAY_SHELL_H__ */