[gnome-photos/gnome-3-24] base-item, view-container: Display names only for collections

[Debarshi Ray <debarshir src gnome org>]

commit 2f68996d6487ae33187aaf589b779c8d8da3489e
Author: Umang Jain <mailumangjain gmail com>
Date:   Sat Apr 8 12:04:31 2017 +0530

    base-item, view-container: Display names only for collections
    
    https://bugzilla.gnome.org/show_bug.cgi?id=780692

 src/photos-base-item.c      |   23 ++++++++++++++++++-----
 src/photos-view-container.c |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)
---
diff --git a/src/photos-base-item.c b/src/photos-base-item.c
index a6b59f8..eb41d0b 100644
--- a/src/photos-base-item.c
+++ b/src/photos-base-item.c
@@ -693,10 +693,18 @@ photos_base_item_main_box_item_get_id (GdMainBoxItem *box_item)
 static const gchar *
 photos_base_item_main_box_item_get_primary_text (GdMainBoxItem *box_item)
 {
-  const gchar *name;
+  PhotosBaseItem *self = PHOTOS_BASE_ITEM (box_item);
+  PhotosBaseItemPrivate *priv;
+  const gchar *primary_text;
 
-  name = photos_base_item_get_name (PHOTOS_BASE_ITEM (box_item));
-  return name;
+  priv = photos_base_item_get_instance_private (self);
+
+  if (priv->collection)
+    primary_text = photos_base_item_get_name (self);
+  else
+    primary_text = NULL;
+
+  return primary_text;
 }
 
 
@@ -2718,8 +2726,13 @@ photos_base_item_get_property (GObject *object, guint prop_id, GValue *value, GP
       break;
 
     case PROP_PRIMARY_TEXT:
-      g_value_set_string (value, priv->name);
-      break;
+      {
+        const gchar *primary_text;
+
+        primary_text = photos_base_item_main_box_item_get_primary_text (GD_MAIN_BOX_ITEM (self));
+        g_value_set_string (value, primary_text);
+        break;
+      }
 
     case PROP_PULSE:
       g_value_set_boolean (value, FALSE);
diff --git a/src/photos-view-container.c b/src/photos-view-container.c
index 1dcf819..f93bfb0 100644
--- a/src/photos-view-container.c
+++ b/src/photos-view-container.c
@@ -101,6 +101,41 @@ photos_view_container_disconnect_view (PhotosViewContainer *self)
 }
 
 
+static gboolean
+photos_view_container_get_show_primary_text (PhotosViewContainer *self)
+{
+  gboolean ret_val;
+
+  switch (self->mode)
+    {
+    case PHOTOS_WINDOW_MODE_COLLECTIONS:
+      ret_val = TRUE;
+      break;
+
+    case PHOTOS_WINDOW_MODE_FAVORITES:
+      ret_val = FALSE;
+      break;
+
+    case PHOTOS_WINDOW_MODE_OVERVIEW:
+      ret_val = FALSE;
+      break;
+
+    case PHOTOS_WINDOW_MODE_SEARCH:
+      ret_val = TRUE;
+      break;
+
+    case PHOTOS_WINDOW_MODE_NONE:
+    case PHOTOS_WINDOW_MODE_EDIT:
+    case PHOTOS_WINDOW_MODE_PREVIEW:
+    default:
+      g_assert_not_reached ();
+      break;
+    }
+
+  return ret_val;
+}
+
+
 static void
 photos_view_container_item_activated (PhotosViewContainer *self, GdMainBoxItem *box_item)
 {
@@ -242,6 +277,7 @@ photos_view_container_constructed (GObject *object)
   GtkWidget *grid;
   PhotosSearchContextState *state;
   gboolean selection_mode;
+  gboolean show_primary_text;
   gboolean status;
 
   G_OBJECT_CLASS (photos_view_container_parent_class)->constructed (object);
@@ -273,6 +309,8 @@ photos_view_container_constructed (GObject *object)
   gtk_container_add (GTK_CONTAINER (grid), self->sw);
 
   self->view = gd_main_box_new (GD_MAIN_BOX_ICON);
+  show_primary_text = photos_view_container_get_show_primary_text (self);
+  gd_main_box_set_show_primary_text (GD_MAIN_BOX (self->view), show_primary_text);
   gtk_container_add (GTK_CONTAINER (self->sw), self->view);
 
   gtk_widget_show_all (GTK_WIDGET (self));