gimp r25125 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Wed Mar 19 16:54:01 2008
New Revision: 25125
URL: http://svn.gnome.org/viewvc/gimp?rev=25125&view=rev

Log:
2008-03-19  Sven Neumann  <sven gimp org>

	* app/display/gimpdisplayshell.c
	* app/display/gimpdisplayshell-title.c
	* app/display/gimpstatusbar.[ch]: hide/show the cursor label and
	the unit and scale combo-boxes.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-title.c
   trunk/app/display/gimpdisplayshell.c
   trunk/app/display/gimpstatusbar.c
   trunk/app/display/gimpstatusbar.h

Modified: trunk/app/display/gimpdisplayshell-title.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-title.c	(original)
+++ trunk/app/display/gimpdisplayshell-title.c	Wed Mar 19 16:54:01 2008
@@ -115,7 +115,7 @@
       gdk_window_set_title (GTK_WIDGET (shell)->window, GIMP_NAME);
 
       gimp_statusbar_replace (GIMP_STATUSBAR (shell->statusbar), "title",
-                              "%s", "");
+                              "%s", _(" "));
     }
 
   return FALSE;

Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c	(original)
+++ trunk/app/display/gimpdisplayshell.c	Wed Mar 19 16:54:01 2008
@@ -1121,6 +1121,8 @@
   gimp_display_shell_scale_setup (shell);
   gimp_display_shell_scaled (shell);
 
+  gimp_statusbar_empty (GIMP_STATUSBAR (shell->statusbar));
+
   gimp_display_shell_appearance_update (shell);
 
   gimp_display_shell_expose_full (shell);
@@ -1143,6 +1145,8 @@
   gimp_display_shell_set_initial_scale (shell, scale,
                                         &display_width, &display_height);
 
+  gimp_statusbar_fill (GIMP_STATUSBAR (shell->statusbar));
+
   gimp_display_shell_appearance_update (shell);
 }
 

Modified: trunk/app/display/gimpstatusbar.c
==============================================================================
--- trunk/app/display/gimpstatusbar.c	(original)
+++ trunk/app/display/gimpstatusbar.c	Wed Mar 19 16:54:01 2008
@@ -533,6 +533,26 @@
 }
 
 void
+gimp_statusbar_empty (GimpStatusbar *statusbar)
+{
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+
+  gtk_widget_hide (statusbar->cursor_frame);
+  gtk_widget_hide (statusbar->unit_combo);
+  gtk_widget_hide (statusbar->scale_combo);
+}
+
+void
+gimp_statusbar_fill (GimpStatusbar *statusbar)
+{
+  g_return_if_fail (GIMP_IS_STATUSBAR (statusbar));
+
+  gtk_widget_show (statusbar->cursor_frame);
+  gtk_widget_show (statusbar->unit_combo);
+  gtk_widget_show (statusbar->scale_combo);
+}
+
+void
 gimp_statusbar_push (GimpStatusbar *statusbar,
                      const gchar   *context,
                      const gchar   *format,

Modified: trunk/app/display/gimpstatusbar.h
==============================================================================
--- trunk/app/display/gimpstatusbar.h	(original)
+++ trunk/app/display/gimpstatusbar.h	Wed Mar 19 16:54:01 2008
@@ -77,6 +77,8 @@
 gboolean    gimp_statusbar_get_visible      (GimpStatusbar       *statusbar);
 void        gimp_statusbar_set_visible      (GimpStatusbar       *statusbar,
                                              gboolean             visible);
+void        gimp_statusbar_empty            (GimpStatusbar       *statusbar);
+void        gimp_statusbar_fill             (GimpStatusbar       *statusbar);
 
 void        gimp_statusbar_push             (GimpStatusbar       *statusbar,
                                              const gchar         *context,