Merge lp:~jeremywootten/pantheon-files/fix-count-items-selected into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix item count in Overlay

This branch fixes a bug in the overlay causing it to show "0 items selected" when multiple files (not including folders) are selected.

To test:

FUNCTION:
1) Select different numbers of files (not including folders) in icon or Miller view. The overlay shows the appropriate number of items selected.

REGRESSIONS:
2) Select different combinations of files and folders in Icon or Miller view. The overlay shows appropriate information.

[PerfectCarl (name-is-carl)]

Tested with https://github.com/PerfectCarl/elementary-files-testing/blob/master/selection.md

review: Approve

=== modified file 'src/View/OverlayBar.vala'
--- src/View/OverlayBar.vala	2014-11-13 20:24:33 +0000
+++ src/View/OverlayBar.vala	2015-01-16 23:47:13 +0000
@@ -94,14 +94,11 @@
         }
 
        private void real_update (GLib.List<GOF.File>? files) {
-            count = 0;
             goffile = null;
             folders_count = 0;
             files_count = 0;
             files_size = 0;
 
-            /* cancel any pending subfolder scan */
-            //cancellable.cancel ();
             if (files != null) {
                 visible = showbar;
 
@@ -127,7 +124,7 @@
                 image_cancellable = null;
             }
 
-            if (goffile != null) {
+            if (goffile != null) { /* a single file is hovered or selected */
                 if (goffile.is_network_uri_scheme ()) {
                     status = goffile.get_display_target_uri ();
                 } else if (!goffile.is_folder ()) {
@@ -143,7 +140,7 @@
                     status = "%s - %s".printf (goffile.info.get_name (), goffile.formated_type);
 
                 }
-            } else {
+            } else { /* hovering over multiple selection */
                 string str = null;
                 if (folders_count > 1) {
                     str = _("%u folders").printf (folders_count);
@@ -161,9 +158,8 @@
                                          files_count);
                     else
                         str += _(" selected");
-                } else {
-                    str = _("%u items selected (%s)").printf (count, format_size ((int64) files_size));
-                }
+                } else /* folder_count = 0 and files_count > 0 */
+                    str = _("%u items selected (%s)").printf (files_count, format_size ((int64) files_size));
 
                 status = str;
 
@@ -177,7 +173,6 @@
             foreach (var gof in files) {
                 if (gof.is_folder ()) {
                     folders_count++;
-                    //scan_folder (gof.location);
                 } else {
                     files_count++;
                     files_size += PropertiesWindow.file_real_size (gof);