nemo-list-view.c: Don't allow the 'Location' column for normal

directories.

The Location column is only useful in special views where files
being shown aren't necessarily all in the same location - Recents,
Favorites and search results. In normal folders, the Location is
identical for all files (their parent folder's path).

Author: mtwebster

libnemo-private/nemo-column-utilities.c

@@ -27,6 +27,7 @@
 
 #include <string.h>
 #include <eel/eel-glib-extensions.h>
+#include <eel/eel-vfs-extensions.h>
 #include <glib/gi18n.h>
 #include <libnemo-extension/nemo-column-provider.h>
 #include <libnemo-private/nemo-module.h>
@@ -152,16 +153,6 @@ get_builtin_columns (void)
 					       "description", _("The SELinux security context of the file."),
 					       NULL));
 #endif
-	columns = g_list_append (columns,
-				 g_object_new (NEMO_TYPE_COLUMN,
-					       "name", "where",
-					       "attribute", "where",
-					       "label", _("Location"),
-					       "description", _("The location of the file."),
-                           "width-chars", 60,
-                           "ellipsize", PANGO_ELLIPSIZE_END,
-					       NULL));
-
 	return columns;
 }
 
@@ -221,13 +212,6 @@ get_search_columns (void)
     static GList *columns = NULL;
 
     if (columns == NULL) {
-        // columns = g_list_append (columns,
-        //              g_object_new (NEMO_TYPE_COLUMN,
-        //                        "name", "search-result-snippet",
-        //                        "attribute", "search_result_snippet",
-        //                        "label", _("Result"),
-        //                        "description", _("A portion of the contents where the string was found"),
-        //                        NULL));
         columns = g_list_append (columns,
                              g_object_new (NEMO_TYPE_COLUMN,
                                            "name", "search_result_count",
@@ -240,6 +224,25 @@ get_search_columns (void)
     return nemo_column_list_copy (columns);
 }
 
+static GList *
+get_mixed_file_list_columns (void)
+{
+    static GList *columns = NULL;
+
+    if (columns == NULL) {
+        columns = g_list_append (columns,
+                     g_object_new (NEMO_TYPE_COLUMN,
+                               "name", "where",
+                               "attribute", "where",
+                               "label", _("Location"),
+                               "description", _("The location of the file."),
+                               "width-chars", 60,
+                               "ellipsize", PANGO_ELLIPSIZE_END,
+                               NULL));
+    }
+
+    return nemo_column_list_copy (columns);
+}
 
 GList *
 nemo_get_common_columns (void)
@@ -258,33 +261,48 @@ GList *
 nemo_get_all_columns (void)
 {
     GList *columns = NULL;
-	GList *with_search_columns = NULL;
 
 	columns = g_list_concat (nemo_get_common_columns (),
 	                         get_trash_columns ());
+    columns = g_list_concat (columns, get_search_columns ());
+    columns = g_list_concat (columns, get_mixed_file_list_columns ());
 
-    with_search_columns = g_list_concat (columns, get_search_columns ());
-
-	return with_search_columns;
+    return columns;
 }
 
 GList *
 nemo_get_columns_for_file (NemoFile *file)
 {
-	GList *columns;
+    GList *columns;
+    gchar *uri;
+
+    columns = nemo_get_common_columns ();
+
+    if (file == NULL) {
+        return columns;
+    }
 
-	columns = nemo_get_common_columns ();
+    uri = nemo_file_get_uri (file);
 
-	if (file != NULL && nemo_file_is_in_trash (file)) {
-		columns = g_list_concat (columns,
-		                         get_trash_columns ());
-	} else
-    if (file != NULL && nemo_file_is_in_search (file)) {
+    if (eel_uri_is_trash (uri)) {
+        columns = g_list_concat (columns,
+                                 get_trash_columns ());
+    } else if (eel_uri_is_search (uri)) {
         columns = g_list_concat (columns,
                                  get_search_columns ());
+        columns = g_list_concat (columns,
+                                 get_mixed_file_list_columns ());
+    } else if (eel_uri_is_favorite (uri)) {
+        columns = g_list_concat (columns,
+                                 get_mixed_file_list_columns ());
+    } else if (eel_uri_is_recent (uri)) {
+        columns = g_list_concat (columns,
+                                 get_mixed_file_list_columns ());
     }
 
-	return columns;
+    g_free (uri);
+
+    return columns;
 }
 
 GList *

src/nemo-list-view.c

@@ -2023,60 +2023,43 @@ column_header_clicked (GtkWidget *column_button,
                        GdkEventButton *event,
                        NemoListView *list_view)
 {
-    GList *current_view_columns, *l;
+    GList *valid_columns, *l;
+    gchar **visible_columns;
     NemoFile *file;
     GtkWidget *menu;
     GtkWidget *menu_item;
 
-	if (event->button != GDK_BUTTON_SECONDARY) {
-		return FALSE;
-	}
+    if (event->button != GDK_BUTTON_SECONDARY) {
+        return FALSE;
+    }
 
     file = nemo_view_get_directory_as_file (NEMO_VIEW (list_view));
 
     menu = gtk_menu_new ();
 
-    current_view_columns = gtk_tree_view_get_columns (list_view->details->tree_view);
-
-    for (l = current_view_columns; l != NULL; l = l->next) {
-        const char *name;
-        char *label;
-        char *lowercase;
-        gboolean visible;
-
-        GtkTreeViewColumn *c = GTK_TREE_VIEW_COLUMN (l->data);
+    visible_columns = get_visible_columns (list_view);
+    valid_columns = nemo_get_columns_for_file (file);
 
-        name = g_object_get_data (G_OBJECT (c), "column-id");
+    for (l = valid_columns; l != NULL; l = l->next) {
+        gchar *name;
+        gchar *label;
 
-        if (!nemo_file_is_in_trash (file)) {
-            if (g_strcmp0 (name, "trashed_on") == 0 ||
-                g_strcmp0 (name, "trash_orig_path") == 0)
-                continue;
-        }
-
-        if (!nemo_file_is_in_search (file)) {
-            if (g_strcmp0 (name, "search_result_count") == 0 ||
-                g_strcmp0 (name, "search_result_snippet") == 0)
-                continue;
-        }
-
-        g_object_get (G_OBJECT (c),
-                      "title", &label,
-                      "visible", &visible,
+        g_object_get (G_OBJECT (l->data),
+                      "name", &name,
+                      "label", &label,
                       NULL);
 
-        lowercase = g_ascii_strdown (name, -1);
-
         menu_item = gtk_check_menu_item_new_with_label (label);
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
         g_object_set_data_full (G_OBJECT (menu_item),
                                 "column-name", g_strdup (name), g_free);
 
-        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), visible);
+        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item),
+                                        g_strv_contains ((const gchar * const *) visible_columns, name));
 
         /* Don't allow hiding the filename */
-        if (g_strcmp0 (lowercase, "name") == 0) {
+        if (g_strcmp0 (name, "name") == 0) {
             gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE);
         }
 
@@ -2085,11 +2068,12 @@ column_header_clicked (GtkWidget *column_button,
                           G_CALLBACK (column_header_menu_toggled),
                           list_view);
 
-        g_clear_pointer (&lowercase, g_free);
-        g_clear_pointer (&label, g_free);
+        g_free (name);
+        g_free (label);
     }
 
-    g_list_free (current_view_columns);
+    g_strfreev (visible_columns);
+    nemo_column_list_free (valid_columns);
 
 	menu_item = gtk_separator_menu_item_new ();
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);