Merge branch 'tidy-image-names' into 'master'

app: tidy up image name display, separate export status (Fixes #3591)

Closes #3591

See merge request GNOME/gimp!133

app/config/gimpconfig-dump.c

@@ -407,6 +407,8 @@ static const gchar display_format_description[] =
 "%z  zoom factor as a percentage\n"
 "%s  source scale factor\n"
 "%d  destination scale factor\n"
+"%q  whether the image is imported, exported, or overwritten\n"
+"%Qx expands to x if the image is imported or exported\n"
 "%Dx expands to x if the image is dirty, the empty string otherwise\n"
 "%Cx expands to x if the image is clean, the empty string otherwise\n"
 "%B  expands to (modified) if the image is dirty, the empty string otherwise\n"

app/core/gimpimage.c

@@ -2638,92 +2638,15 @@ gimp_image_set_save_a_copy_file (GimpImage *image,
   g_set_object (&private->save_a_copy_file, file);
 }
 
-static gchar *
+/**
-gimp_image_format_display_uri (GimpImage *image,
+ * gimp_image_get_export_status:
-                               gboolean   basename)
+ * @image: A #GimpImage.
-{
+ *
-  const gchar *uri_format    = NULL;
+ * Returns: a string representing the image's export status, or NULL if the
-  const gchar *export_status = NULL;
+ * image is untitled or has an associated XCF file.
-  GFile       *file          = NULL;
+ **/
-  GFile       *source        = NULL;
-  GFile       *dest          = NULL;
-  GFile       *display_file  = NULL;
-  gboolean     is_imported;
-  gboolean     is_exported;
-  gchar       *display_uri   = NULL;
-  gchar       *format_string;
-  gchar       *tmp;
-
-  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
-
-  file   = gimp_image_get_file (image);
-  source = gimp_image_get_imported_file (image);
-  dest   = gimp_image_get_exported_file (image);
-
-  is_imported = (source != NULL);
-  is_exported = (dest   != NULL);
-
-  if (file)
-    {
-      display_file = g_object_ref (file);
-      uri_format   = "%s";
-    }
-  else
-    {
-      if (is_imported)
-        display_file = source;
-
-      /* Calculate filename suffix */
-      if (! gimp_image_is_export_dirty (image))
-        {
-          if (is_exported)
-            {
-              display_file  = dest;
-              export_status = _(" (exported)");
-            }
-          else if (is_imported)
-            {
-              export_status = _(" (overwritten)");
-            }
-          else
-            {
-              g_warning ("Unexpected code path, Save+export implementation is buggy!");
-            }
-        }
-      else if (is_imported)
-        {
-          export_status = _(" (imported)");
-        }
-
-      if (display_file)
-        display_file = gimp_file_with_new_extension (display_file, NULL);
-
-      uri_format = "[%s]";
-    }
-
-  if (! display_file)
-    display_file = g_object_ref (gimp_image_get_untitled_file (image));
-
-  if (basename)
-    display_uri = g_path_get_basename (gimp_file_get_utf8_name (display_file));
-  else
-    display_uri = g_strdup (gimp_file_get_utf8_name (display_file));
-
-  g_object_unref (display_file);
-
-  format_string = g_strconcat (uri_format, export_status, NULL);
-
-  tmp = g_strdup_printf (format_string, display_uri);
-  g_free (display_uri);
-  display_uri = tmp;
-
-  g_free (format_string);
-
-  return display_uri;
-}
-
 const gchar *
-gimp_image_get_display_name (GimpImage *image)
+gimp_image_get_export_status (GimpImage *image)
 {
   GimpImagePrivate *private;
 
@@ -2731,27 +2654,63 @@ gimp_image_get_display_name (GimpImage *image)
 
   private = GIMP_IMAGE_GET_PRIVATE (image);
 
-  if (! private->display_name)
+  if (gimp_image_get_file (image))
-    private->display_name = gimp_image_format_display_uri (image, TRUE);
+    return NULL;
 
-  return private->display_name;
+  if (private->export_dirty <= private->dirty)
+    {
+      if (gimp_image_get_exported_file (image))
+        return _("Exported");
+      else if (gimp_image_get_imported_file (image))
+        return _("Overwritten");
+      else
+        g_warning ("Unexpected code path, Save+export implementation is buggy!");
+    }
+
+  if (gimp_image_get_imported_file (image))
+    return _("Imported");
+
+  return NULL;
 }
 
 const gchar *
 gimp_image_get_display_path (GimpImage *image)
 {
   GimpImagePrivate *private;
+  GFile            *file;
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
 
   private = GIMP_IMAGE_GET_PRIVATE (image);
 
   if (! private->display_path)
-    private->display_path = gimp_image_format_display_uri (image, FALSE);
+    {
+      file = gimp_image_get_any_file (image);
+      if (! file)
+        file = gimp_image_get_untitled_file(image);
+
+      private->display_path = g_strdup (gimp_file_get_utf8_name (file));
+    }
 
   return private->display_path;
 }
 
+const gchar *
+gimp_image_get_display_name (GimpImage *image)
+{
+  GimpImagePrivate *private;
+  GFile            *file;
+
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  if (! private->display_name)
+    private->display_name = g_path_get_basename (gimp_image_get_display_path (image));
+
+  return private->display_name;
+}
+
 void
 gimp_image_set_load_proc (GimpImage           *image,
                           GimpPlugInProcedure *proc)

app/core/gimpimage.h

@@ -163,8 +163,9 @@ void            gimp_image_set_exported_file     (GimpImage          *image,
 void            gimp_image_set_save_a_copy_file  (GimpImage          *image,
                                                   GFile              *file);
 
-const gchar   * gimp_image_get_display_name      (GimpImage          *image);
+const gchar   * gimp_image_get_export_status     (GimpImage          *image);
 const gchar   * gimp_image_get_display_path      (GimpImage          *image);
+const gchar   * gimp_image_get_display_name      (GimpImage          *image);
 
 void            gimp_image_set_load_proc         (GimpImage          *image,
                                                   GimpPlugInProcedure *proc);

app/display/gimpdisplayshell-title.c

@@ -555,6 +555,27 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
               }
               break;
 
+            case 'q': /* export status */
+              {
+                gchar *export_status = gimp_image_get_export_status (image);
+
+                if (export_status)
+                  i += print (title, title_len, i, "%s", export_status);
+              }
+              break;
+
+            case 'Q': /* export status flag */
+              if (format[1] == 0)
+                {
+                  /* format string ends within %Q-sequence, print literal '%Q' */
+                  i += print (title, title_len, i, "%%Q");
+                  break;
+                }
+              if (gimp_image_get_export_status (image))
+                title[i++] = format[1];
+              format++;
+              break;
+
             case '\xc3': /* utf-8 extended char */
               {
                 format ++;