Introduce side-widget in Abstract Slot and use for preview window

libcore/AbstractSlot.vala

@@ -46,9 +46,12 @@ public abstract class Files.AbstractSlot : GLib.Object {
 
     public virtual bool is_frozen { get; set; default = true; }
 
+    //TODO Make private so layout fixed?
     protected Gtk.Box extra_location_widgets;
     protected Gtk.Box extra_action_widgets;
-    protected Gtk.Box content_box;
+    protected Gtk.Grid content_grid; // Holds view, overlay and extra action widgets
+    protected Gtk.Paned main_paned; // Holds all displayed widgets (content_grid and preview or other side widget)
+
     public Gtk.Overlay overlay { get; protected set; }
     public int slot_number { get; protected set; }
     protected int width;
@@ -69,27 +72,32 @@ public abstract class Files.AbstractSlot : GLib.Object {
         extra_action_widgets.add (widget);
     }
 
-    public void add_overlay (Gtk.Widget widget) {
-        // It is assumed this is only called once per slot
-        overlay = new Gtk.Overlay () {
-            hexpand = true,
-            vexpand = true,
-            child = widget
-        };
-        content_box.add (overlay);
+    public void add_overlay_widget (Gtk.Widget widget) {
+        overlay.child = widget;
+    }
+
+    protected void add_side_widget (Gtk.Widget widget, bool resize, bool shrink) {
+        main_paned.pack2 (widget, resize, shrink);
     }
 
     construct {
-        content_box = new Gtk.Box (VERTICAL, 0) {
+        content_grid = new Gtk.Grid () {
             vexpand = true,
             hexpand = true
         };
 
-        extra_location_widgets = new Gtk.Box (VERTICAL, 0);
-        content_box.add (extra_location_widgets);
+        overlay = new Gtk.Overlay () {
+            hexpand = true,
+            vexpand = true,
+        };
+
+        main_paned = new Gtk.Paned (HORIZONTAL);
 
         extra_action_widgets = new Gtk.Box (VERTICAL, 0);
-        content_box.add (extra_action_widgets);
+        content_grid.attach (extra_action_widgets, 0, 0);
+        content_grid.attach (overlay, 0, 1);
+
+        main_paned.pack1 (content_grid, true, true);
         slot_number = -1;
     }
 
@@ -109,8 +117,8 @@ public abstract class Files.AbstractSlot : GLib.Object {
     public virtual void zoom_in () {}
     public virtual void zoom_normal () {}
     public virtual bool set_all_selected (bool all_selected) { return false; }
-    public virtual Gtk.Widget get_content_box () { return content_box as Gtk.Widget; }
+    public virtual Gtk.Widget get_main_widget () { return main_paned as Gtk.Widget; }
     public virtual string? get_root_uri () { return directory.file.uri; }
     public virtual string? get_tip_uri () { return null; }
-    public virtual bool get_realized () { return content_box.get_realized (); }
+    public virtual bool get_realized () { return main_paned.get_realized (); }
 }

libcore/FileUtils.vala

@@ -589,7 +589,8 @@ namespace Files.FileUtils {
     public string get_formatted_time_attribute_from_info (
         FileInfo info,
         string attr,
-        DateFormatMode format = Files.Preferences.get_default ().date_format
+        DateFormatMode format = Files.Preferences.get_default ().date_format,
+        bool pad = true
     ) {
         DateTime? dt = null;
         switch (attr) {
@@ -619,32 +620,36 @@ namespace Files.FileUtils {
                 break;
         }
 
-        return get_formatted_date_time (dt, format);
+        return get_formatted_date_time (dt, format, pad);
     }
 
-    private string get_formatted_date_time (DateTime? dt, DateFormatMode format) {
+    private string get_formatted_date_time (DateTime? dt, DateFormatMode format, bool pad = true) {
         if (dt == null) {
             return "";
         }
 
         switch (format) {
             case DateFormatMode.LOCALE:
-                return emspace_pad (dt.format ("%c"));
+                return emspace_pad (dt.format ("%c"), pad);
             case DateFormatMode.ISO:
-                return emspace_pad (dt.format ("%Y-%m-%d %H:%M:%S"));
+                return emspace_pad (dt.format ("%Y-%m-%d %H:%M:%S"), pad);
             case DateFormatMode.COMPACT :
                 var locale_format_string = Posix.nl_langinfo (D_FMT);
                 var compact_format = string.join (" ", locale_format_string.down (), "%H:%M");
-                return emspace_pad (dt.format (compact_format));
+                return emspace_pad (dt.format (compact_format), pad);
             default:
-                return emspace_pad (get_informal_date_time (dt));
+                return emspace_pad (get_informal_date_time (dt), pad);
         }
     }
 
     // We add a fixed-width space as both prefix and suffix to ensure date is not obscured by the scrollbar (unless hovered)
     // regardless of the text direction
     // See https://github.com/elementary/files/issues/1538
-    private string emspace_pad (string s) {
+    private string emspace_pad (string s, bool pad) {
+        if (!pad) {
+            return s;
+        }
+
         var sb = new StringBuilder (s);
         sb.prepend_unichar (' '); //Unichar emspace (U2003);
         sb.append_unichar (' '); //Unichar emspace (U2003);

plugins/pantheon-files-trash/plugin.vala

@@ -116,11 +116,10 @@ public class Files.Plugins.Trash : Files.Plugins.Base {
                 actionbar.show_all ();
                 actionbars.@set (view, actionbar);
             }
-
-            set_actionbar (actionbar);
         } else if (actionbar != null) {  /* not showing trash directory */
-            actionbar.destroy ();
             actionbars.unset (view);
+            actionbar.destroy ();
+            actionbar = null;
         }
     }
 

src/Utils/AppUtils.vala

@@ -37,7 +37,11 @@ namespace Files {
         return new Gtk.Label (label) {
             halign = Gtk.Align.START,
             selectable = true,
-            use_markup = true
+            use_markup = true,
+            wrap = true,
+            ellipsize = END,
+            lines = 2,
+            xalign = 0
         };
     }
 }

src/View/DetailsColumn.vala

@@ -135,7 +135,9 @@ public class Files.View.DetailsColumn : Gtk.Bin {
 
         var time_created = FileUtils.get_formatted_time_attribute_from_info (
             file.info,
-            FileAttribute.TIME_CREATED
+            FileAttribute.TIME_CREATED,
+            Files.Preferences.get_default ().date_format,
+            false
         );
 
         int n = 5;
@@ -149,7 +151,9 @@ public class Files.View.DetailsColumn : Gtk.Bin {
 
         var time_modified = FileUtils.get_formatted_time_attribute_from_info (
             file.info,
-            FileAttribute.TIME_MODIFIED
+            FileAttribute.TIME_MODIFIED,
+            Files.Preferences.get_default ().date_format,
+            false
         );
 
         if (time_modified != "") {
@@ -163,7 +167,9 @@ public class Files.View.DetailsColumn : Gtk.Bin {
         if (file.is_trashed ()) {
             var deletion_date = FileUtils.get_formatted_time_attribute_from_info (
                 file.info,
-                FileAttribute.TRASH_DELETION_DATE
+                FileAttribute.TRASH_DELETION_DATE,
+                Files.Preferences.get_default ().date_format,
+                false
             );
 
             if (deletion_date != "") {