Merge lp:~elementary-apps/pantheon-photos/sidebar-extra-props into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

ExtendedProperties.vala: Remove superfluous properties

This is pretty opinionated so I guess I need some opinions. But I think these properties are just generally unhelpful and don't help me make any kind of decision.

Why does it matter what software was running on my camera?

Do I really care where this photo is on the filesystem? I can right-click and show the file if I need to get to it for some reason. This isn't a link or anything so it's not like it's convenient.

What is the original size useful for? So I know this photo was scaled down or cropped in some way. Now what? Is this useful info to someone?

[Felipe Escoto (philip.scott)]

The only property i disagree with removing is the filesystem info. Since we do the automatic importing, it could be nice to know where the photo is without having to depend on Files.

[Danielle Foré (danrabbit)]

I disagree, but in the interest of merging I will fight that fight another day :p

[lp:~elementary-apps/pantheon-photos/sidebar-extra-props]

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

remove unecessary properties

=== modified file 'src/sidebar/metadata/ExtendedProperties.vala'
--- src/sidebar/metadata/ExtendedProperties.vala	2016-11-05 03:11:19 +0000
+++ src/sidebar/metadata/ExtendedProperties.vala	2016-11-06 17:15:54 +0000
@@ -9,7 +9,6 @@
     // Photo stuff
     private string file_path;
     private uint64 filesize;
-    private Dimensions? original_dim;
     private string camera_make;
     private string camera_model;
     private string flash;
@@ -20,7 +19,6 @@
     private double gps_alt;
     private string artist;
     private string copyright;
-    private string software;
     private string exposure_bias;
     private string exposure_date;
     private string exposure_time;
@@ -45,7 +43,6 @@
         development_path = "";
         is_raw = false;
         filesize = 0;
-        original_dim = Dimensions (0, 0);
         camera_make = "";
         camera_model = "";
         flash = "";
@@ -55,7 +52,6 @@
         gps_long_ref = "";
         artist = "";
         copyright = "";
-        software = "";
         exposure_bias = "";
         exposure_date = "";
         exposure_time = "";
@@ -106,14 +102,12 @@
                 metadata.set_exposure_date_time (new MetadataDateTime (photo.get_timestamp ()));
 
             is_raw = (photo.get_master_file_format () == PhotoFileFormat.RAW);
-            original_dim = metadata.get_pixel_dimensions ();
             camera_make = metadata.get_camera_make ();
             camera_model = metadata.get_camera_model ();
             flash = metadata.get_flash_string ();
             metadata.get_gps (out gps_long, out gps_long_ref, out gps_lat, out gps_lat_ref, out gps_alt);
             artist = metadata.get_artist ();
             copyright = metadata.get_copyright ();
-            software = metadata.get_software ();
             exposure_bias = metadata.get_exposure_bias ();
             time_t exposure_time_obj = metadata.get_exposure_date_time ().get_timestamp ();
             exposure_date = get_prettyprint_date (Time.local (exposure_time_obj));
@@ -131,8 +125,7 @@
         if (page is EventsDirectoryPage) {
             // nothing special to be done for now for Events
         } else {
-            add_line (_ ("Location:"), (file_path != "" && file_path != null) ?
-                      file_path.replace ("&", "&") : NO_VALUE);
+            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);
@@ -140,9 +133,6 @@
             if (is_raw)
                 add_line (_ ("Developer:"), development_path);
 
-            add_line (_ ("Original size:"), (original_dim != null && original_dim.has_area ()) ?
-                      "%d × %d".printf (original_dim.width, original_dim.height) : NO_VALUE);
-
             add_line (_ ("Camera make:"), (camera_make != "" && camera_make != null) ?
                       camera_make : NO_VALUE);
 
@@ -168,8 +158,6 @@
             add_line (_ ("Artist:"), (artist != "" && artist != null) ? artist : NO_VALUE);
 
             add_line (_ ("Copyright:"), (copyright != "" && copyright != null) ? copyright : NO_VALUE);
-
-            add_line (_ ("Software:"), (software != "" && software != null) ? software : NO_VALUE);
         }
     }
 }