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

[Danielle Foré]

EditableTitle.vala: Give the label h3

BasicProperties.vala: Add the title entry to the top of this box

LibraryProperties.vala: Remove the title entry from this box

MetadataSidebar.vala: Move basic properties to the top

Another step in the evil plan for world domination!

[lp:~elementary-apps/pantheon-photos/sidebar-info-to-top]

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

move image info to top

=== modified file 'src/sidebar/EditableTitle.vala'
--- src/sidebar/EditableTitle.vala	2016-11-06 03:44:50 +0000
+++ src/sidebar/EditableTitle.vala	2016-11-06 16:56:42 +0000
@@ -61,6 +61,7 @@
 
         title = new Gtk.Label (title_name);
         title.ellipsize = Pango.EllipsizeMode.END;
+        title.get_style_context ().add_class ("h3");
         title.hexpand = true;
         ((Gtk.Misc) title).xalign = 0;
 

=== modified file 'src/sidebar/metadata/BasicProperties.vala'
--- src/sidebar/metadata/BasicProperties.vala	2016-11-05 23:13:53 +0000
+++ src/sidebar/metadata/BasicProperties.vala	2016-11-06 16:56:42 +0000
@@ -5,15 +5,17 @@
  */
 
 private class BasicProperties : Properties {
-    protected string title;
     private time_t start_time = time_t ();
     private time_t end_time = time_t ();
     private Dimensions dimensions;
+    private EditableTitle title_entry;
+    private MediaSource? source;
     private int photo_count;
     private int event_count;
     private int video_count;
     private string exposure;
     private string focal_length;
+    private string title;
     private string aperture;
     private string iso;
     private double clip_duration;
@@ -48,7 +50,7 @@
     protected override void get_single_properties (DataView view) {
         base.get_single_properties (view);
 
-        DataSource source = view.get_source ();
+        source = view.get_source () as MediaSource;
 
         title = source.get_name ();
 
@@ -194,9 +196,19 @@
     protected override void internal_update_properties (Page page) {
         base.internal_update_properties (page);
 
-        // display the title if a Tag page
-        if (title == "" && page is TagPage)
-            title = ((TagPage) page).get_tag ().get_user_visible_name ();
+        if (title != "") {
+            title_entry = new EditableTitle (null);
+            title_entry.tooltip_text = _("Title");
+
+            if (title != null) {
+                title_entry.text = title;
+            }
+
+            title_entry.changed.connect (title_entry_changed);
+            attach (title_entry, 0, 0, 2, 1);
+
+            line_count++;
+        }
 
         if (photo_count >= 0 || video_count >= 0) {
             string label = _ ("Items:");
@@ -301,6 +313,16 @@
         }
     }
 
+    public override void save_changes_to_source () {
+        if (source != null && title != null && title != source.get_name ()) {
+            AppWindow.get_command_manager ().execute (new EditTitleCommand (source, title));
+        }
+    }
+
+    private void title_entry_changed () {
+        title = title_entry.text;
+    }
+
     private class ExifItem : Gtk.FlowBoxChild {
         public ExifItem (string icon_name, string tooltip_text, string data) {
             can_focus = false;

=== modified file 'src/sidebar/metadata/LibraryProperties.vala'
--- src/sidebar/metadata/LibraryProperties.vala	2016-11-06 16:49:31 +0000
+++ src/sidebar/metadata/LibraryProperties.vala	2016-11-06 16:56:42 +0000
@@ -7,11 +7,9 @@
 private class LibraryProperties : Properties {
     private MediaSource? media_source;
     private string comment;
-    private EditableTitle title_entry;
     private Gtk.Entry tags_entry;
     private PlaceHolderTextView comment_entry;
     private bool is_media;
-    private string title;
     private string tags;
 
     public LibraryProperties () {
@@ -30,7 +28,6 @@
     protected override void clear_properties () {
         base.clear_properties ();
         comment = "";
-        title = "";
         tags = "";
         is_media = false;
     }
@@ -52,7 +49,6 @@
         Flaggable? flaggable = media_source as Flaggable;
         if (media_source != null && flaggable != null) {
             tags = get_initial_tag_text (media_source);
-            title = media_source.get_name ();
             comment = media_source.get_comment ();
             is_media = true;
         }
@@ -62,12 +58,6 @@
         base.internal_update_properties (page);
 
         if (is_media) {
-            title_entry = new EditableTitle (null);
-            if (title != null)
-                title_entry.text = title;
-            title_entry.changed.connect (title_entry_changed);
-            add_entry_line (_("Title"), title_entry);
-
             comment_entry = new PlaceHolderTextView (comment, _("Comment"));
             comment_entry.set_wrap_mode (Gtk.WrapMode.WORD);
             comment_entry.set_size_request (-1, 50);
@@ -88,10 +78,6 @@
         }
     }
 
-    private void title_entry_changed () {
-        title = title_entry.text;
-    }
-
     private void tags_entry_changed () {
         tags = tags_entry.get_text ();
     }
@@ -104,8 +90,6 @@
     public override void save_changes_to_source () {
         if (media_source != null && is_media) {
             comment = comment_entry.get_text ().strip ();
-            if (title != null && title != media_source.get_name ())
-                AppWindow.get_command_manager ().execute (new EditTitleCommand (media_source, title));
             if (comment != null && comment != media_source.get_comment ())
                 AppWindow.get_command_manager ().execute (new EditCommentCommand (media_source, comment));
             Gee.ArrayList<Tag>? new_tags = tag_entry_to_array ();

=== modified file 'src/sidebar/metadata/MetadataSidebar.vala'
--- src/sidebar/metadata/MetadataSidebar.vala	2016-11-04 20:38:30 +0000
+++ src/sidebar/metadata/MetadataSidebar.vala	2016-11-06 16:56:42 +0000
@@ -38,8 +38,8 @@
         grid.row_spacing = 12;
         grid.margin = 12;
 
+        properties_collection.append (new BasicProperties ());
         properties_collection.append (new LibraryProperties ());
-        properties_collection.append (new BasicProperties ());
         properties_collection.append (new ExtendedProperties ());
 
         foreach (var properties in properties_collection) {