app/config/gimpdisplayconfig.[ch] also list the default image title and

2005-01-16  Sven Neumann  <sven@gimp.org>

	* app/config/gimpdisplayconfig.[ch]
	* app/dialogs/preferences-dialog.c: also list the default image
	title and statusbar formats.

ChangeLog

+2005-01-16  Sven Neumann  <sven@gimp.org>
+
+	* app/config/gimpdisplayconfig.[ch]
+	* app/dialogs/preferences-dialog.c: also list the default image
+	title and statusbar formats.
+
 2005-01-16  Sven Neumann  <sven@gimp.org>
 
 	* app/dialogs/preferences-dialog.c: renamed default image title

app/config/gimpdisplayconfig.c

@@ -61,8 +61,6 @@ static void  gimp_display_config_fullscreen_notify (GObject    *object,
                                                     gpointer    data);
 
 
-#define DEFAULT_IMAGE_TITLE_FORMAT  "%D*%f-%p.%i (%t, %L) %wx%h"
-#define DEFAULT_IMAGE_STATUS_FORMAT "%n (%m)"
 #define DEFAULT_ACTIVATE_ON_FOCUS   TRUE
 
 
@@ -208,12 +206,12 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
   GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_IMAGE_TITLE_FORMAT,
                                    "image-title-format",
                                    IMAGE_TITLE_FORMAT_BLURB,
-                                   DEFAULT_IMAGE_TITLE_FORMAT,
+                                   GIMP_CONFIG_DEFAULT_IMAGE_TITLE_FORMAT,
                                    0);
   GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_IMAGE_STATUS_FORMAT,
                                    "image-status-format",
                                    IMAGE_STATUS_FORMAT_BLURB,
-                                   DEFAULT_IMAGE_STATUS_FORMAT,
+                                   GIMP_CONFIG_DEFAULT_IMAGE_STATUS_FORMAT,
                                    0);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_CONFIRM_ON_CLOSE,
                                     "confirm-on-close", CONFIRM_ON_CLOSE_BLURB,

app/config/gimpdisplayconfig.h

@@ -27,6 +27,10 @@
 #include "config/gimpcoreconfig.h"
 
 
+#define GIMP_CONFIG_DEFAULT_IMAGE_TITLE_FORMAT  "%D*%f-%p.%i (%t, %L) %wx%h"
+#define GIMP_CONFIG_DEFAULT_IMAGE_STATUS_FORMAT "%n (%m)"
+
+
 #define GIMP_TYPE_DISPLAY_CONFIG            (gimp_display_config_get_type ())
 #define GIMP_DISPLAY_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DISPLAY_CONFIG, GimpDisplayConfig))
 #define GIMP_DISPLAY_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DISPLAY_CONFIG, GimpDisplayConfigClass))

app/dialogs/preferences-dialog.c

@@ -1792,33 +1792,34 @@ prefs_dialog_new (Gimp       *gimp,
     const gchar *format_strings[] =
     {
       NULL,
-      "%f-%p.%i (%t)",
+      NULL,
       "%f-%p.%i (%t) %z%%",
       "%f-%p.%i (%t) %d:%s",
-      "%f-%p.%i (%t) %wx%h",
-      "%f-%p.%i (%t) %m"
+      "%f-%p.%i (%t) %wx%h"
     };
 
     const gchar *format_names[] =
     {
-      N_("Default"),
-      N_("Simple"),
+      N_("Current format"),
+      N_("Default format"),
       N_("Show zoom percentage"),
       N_("Show zoom ratio"),
-      N_("Show image size"),
-      N_("Show memory usage")
+      N_("Show image size")
     };
 
     struct
     {
       gchar       *current_setting;
+      const gchar *default_setting;
       const gchar *title;
       const gchar *property_name;
     }
     formats[] =
     {
-      { NULL, N_("Image Title Format"),     "image-title-format"  },
-      { NULL, N_("Image Statusbar Format"), "image-status-format" }
+      { NULL, GIMP_CONFIG_DEFAULT_IMAGE_TITLE_FORMAT,
+        N_("Image Title Format"),     "image-title-format"  },
+      { NULL, GIMP_CONFIG_DEFAULT_IMAGE_STATUS_FORMAT,
+        N_("Image Statusbar Format"), "image-status-format" }
     };
 
     gint format;
@@ -1838,6 +1839,7 @@ prefs_dialog_new (Gimp       *gimp,
         gint              i;
 
         format_strings[0] = formats[format].current_setting;
+        format_strings[1] = formats[format].default_setting;
 
         vbox2 = prefs_frame_new (gettext (formats[format].title),
                                  GTK_CONTAINER (vbox), TRUE);