Merge lp:~elementary-apps/pantheon-photos/sidebar-camera-info into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

BasicProperties.vala: Add camera make and model as a single line above other camera-related info

ExtendedProperties.vala: Remove camera make and model

This moves the camera make and model info near the other camera-related info (like aperture) and combines it into a single line

[Danielle Foré (danrabbit)]

We need to add some magic to make sure we don't duplicate make and model name

review: Needs Fixing

=== 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:15:40 +0000
@@ -13,6 +13,8 @@
     private int photo_count;
     private int event_count;
     private int video_count;
+    private string camera_make;
+    private string camera_model;
     private string exposure;
     private string focal_length;
     private string title;
@@ -31,6 +33,8 @@
 
     protected override void clear_properties () {
         base.clear_properties ();
+        camera_make = "";
+        camera_model = "";
         title = "";
         start_time = 0;
         end_time = 0;
@@ -63,6 +67,9 @@
                                        ((PhotoImportSource) source).get_metadata ();
 
             if (metadata != null) {
+                camera_make = metadata.get_camera_make ();
+                camera_model = metadata.get_camera_model ();
+
                 exposure = metadata.get_exposure_string ();
                 if (exposure == null)
                     exposure = "";
@@ -284,6 +291,22 @@
             add_line ("", raw_assoc);
         }
 
+        if (camera_make != "" && camera_model != "") {
+            string camera_string;
+
+            if (camera_make in camera_model) {
+                camera_string = camera_model;
+            } else {
+                camera_string = camera_make + " " + camera_model;
+            }
+
+            var camera_label = new Gtk.Label (camera_string);
+            camera_label.margin_top = 12;
+            camera_label.xalign = 0;
+
+            attach (camera_label, 0, 8, 2, 1);
+        }
+
         var flowbox = new Gtk.FlowBox ();
         flowbox.column_spacing = 12;
         flowbox.row_spacing = 12;

=== 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:15:40 +0000
@@ -9,8 +9,6 @@
     // Photo stuff
     private string file_path;
     private uint64 filesize;
-    private string camera_make;
-    private string camera_model;
     private string flash;
     private double gps_lat;
     private string gps_lat_ref;
@@ -43,8 +41,6 @@
         development_path = "";
         is_raw = false;
         filesize = 0;
-        camera_make = "";
-        camera_model = "";
         flash = "";
         gps_lat = -1;
         gps_lat_ref = "";
@@ -102,8 +98,6 @@
                 metadata.set_exposure_date_time (new MetadataDateTime (photo.get_timestamp ()));
 
             is_raw = (photo.get_master_file_format () == PhotoFileFormat.RAW);
-            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 ();
@@ -133,12 +127,6 @@
             if (is_raw)
                 add_line (_ ("Developer:"), development_path);
 
-            add_line (_ ("Camera make:"), (camera_make != "" && camera_make != null) ?
-                      camera_make : NO_VALUE);
-
-            add_line (_ ("Camera model:"), (camera_model != "" && camera_model != null) ?
-                      camera_model : NO_VALUE);
-
             add_line (_ ("Flash:"), (flash != "" && flash != null) ? flash : NO_VALUE);
 
             add_line (_ ("Exposure date:"), (exposure_date != "" && exposure_date != null) ?