Merge lp:~elementary-apps/pantheon-photos/sidebar-size-label into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

BasicProperties.vala: Add filesize and combine it with dimensions a la Files

ExtendedProperties.vala: Remove filesize

Mimics the design of Files overlaybar and places size info in a single line separated by an em dash

Relies on the info on top branch because we need source to be a mediasource

[Felipe Escoto (philip.scott)]

Looks good! Just waiting for the sidebar-info-to-top :)

review: Approve

[lp:~elementary-apps/pantheon-photos/sidebar-size-label]

3040. By Danielle Foré on 2016-11-06

put size info on a single line

=== modified file 'src/sidebar/metadata/BasicProperties.vala'
--- src/sidebar/metadata/BasicProperties.vala	2016-11-06 16:56:17 +0000
+++ src/sidebar/metadata/BasicProperties.vala	2016-11-06 18:22:00 +0000
@@ -21,6 +21,7 @@
     private double clip_duration;
     private string raw_developer;
     private string raw_assoc;
+    private uint64 filesize;
 
     public BasicProperties () {
     }
@@ -35,6 +36,7 @@
         start_time = 0;
         end_time = 0;
         dimensions = Dimensions (0, 0);
+        filesize = 0;
         focal_length = "";
         photo_count = -1;
         event_count = -1;
@@ -52,6 +54,7 @@
 
         source = view.get_source () as MediaSource;
 
+        filesize = source.get_master_filesize ();
         title = source.get_name ();
 
         if (source is PhotoSource || source is PhotoImportSource) {
@@ -263,12 +266,12 @@
         }
 
         if (dimensions.has_area ()) {
-            string label = _ ("Size:");
+            var size_label = new Gtk.Label ("%s — %d × %d".printf (format_size ((int64) filesize), dimensions.width, dimensions.height));
+            size_label.use_markup = true;
+            size_label.xalign = 0;
+            attach (size_label, 0, (int) line_count, 2, 1);
 
-            if (dimensions.has_area ()) {
-                add_line (label, "%d × %d".printf (dimensions.width, dimensions.height));
-                label = "";
-            }
+            line_count++;
         }
 
         if (clip_duration > 0.0) {

=== modified file 'src/sidebar/metadata/ExtendedProperties.vala'
--- src/sidebar/metadata/ExtendedProperties.vala	2016-11-06 17:15:40 +0000
+++ src/sidebar/metadata/ExtendedProperties.vala	2016-11-06 18:22:00 +0000
@@ -8,7 +8,6 @@
     private const string NO_VALUE = "";
     // Photo stuff
     private string file_path;
-    private uint64 filesize;
     private string camera_make;
     private string camera_model;
     private string flash;
@@ -42,7 +41,6 @@
         file_path = "";
         development_path = "";
         is_raw = false;
-        filesize = 0;
         camera_make = "";
         camera_model = "";
         flash = "";
@@ -69,7 +67,6 @@
             MediaSource media = (MediaSource) source;
             file_path = media.get_master_file ().get_path ();
             development_path = media.get_file ().get_path ();
-            filesize = media.get_master_filesize ();
 
             // as of right now, all extended properties other than filesize, filepath & comment aren't
             // applicable to non-photo media types, so if the current media source isn't a photo,
@@ -127,9 +124,6 @@
         } else {
             add_line (_("Location:"), (file_path != "" && file_path != null) ? file_path.replace ("&", "&") : NO_VALUE);
 
-            add_line (_ ("File size:"), (filesize > 0) ?
-                      format_size ((int64) filesize) : NO_VALUE);
-
             if (is_raw)
                 add_line (_ ("Developer:"), development_path);