Merge lp:~jeremywootten/pantheon-files/fix-1585736-empty-trash-subfolder-message into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Correct empty message for trash subfolder (lp 1585736)

Give correct empty message when in a trash sub-folder.
Remove code duplication in determining correct empty message.

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2016-05-27 16:29:19 +0000
+++ src/View/AbstractDirectoryView.vala	2016-05-29 14:58:50 +0000
@@ -2990,16 +2990,7 @@
                 if (!style_context.has_class (MESSAGE_CLASS))
                     style_context.add_class (MESSAGE_CLASS);
 
-
-                if (slot.directory.permission_denied) {
-                    layout.set_markup (slot.denied_message, -1);
-                } else if (slot.directory.is_trash) {
-                    layout.set_markup (slot.empty_trash_message, -1);
-                } else if (slot.directory.is_recent) {
-                    layout.set_markup (slot.empty_recents_message, -1);
-                } else {
-                    layout.set_markup (slot.empty_message, -1);
-                }
+                layout.set_markup (slot.get_empty_message (), -1);
 
                 Pango.Rectangle? extents = null;
                 layout.get_extents (null, out extents);

=== modified file 'src/View/Slot.vala'
--- src/View/Slot.vala	2016-05-13 19:51:34 +0000
+++ src/View/Slot.vala	2016-05-29 14:58:50 +0000
@@ -36,10 +36,10 @@
             get {return ctab.window;}
         }
 
-        public string empty_message = _("This Folder Is Empty");
-        public string empty_trash_message = _("Trash Is Empty");
-        public string empty_recents_message = _("There Are No Recent Files");
-        public string denied_message = _("Access Denied");
+        private const string EMPTY_MESSAGE = _("This Folder Is Empty");
+        private const string EMPTY_TRASH_MESSAGE = _("Trash Is Empty");
+        private const string EMPTY_RECENT_MESSAGE = _("There Are No Recent Files");
+        private const string DENIED_MESSAGE = _("Access Denied");
 
         public override bool locked_focus {
             get {
@@ -222,15 +222,7 @@
             Pango.Layout layout = dir_view.create_pango_layout (null);
 
             if (directory.is_empty ()) { /* No files in the file cache */
-                if (directory.permission_denied) {
-                    layout.set_markup (denied_message, -1);
-                } else if (directory.is_trash) {
-                    layout.set_markup (empty_trash_message, -1);
-                } else if (directory.is_recent) {
-                    layout.set_markup (empty_recents_message, -1);
-                } else {
-                    layout.set_markup (empty_message, -1);
-                }
+                layout.set_markup (get_empty_message (), -1);
             } else {
                 layout.set_markup (GLib.Markup.escape_text (directory.longest_file_name), -1);
             }
@@ -426,5 +418,17 @@
                 id = 0;
             }
         }
+
+        public string get_empty_message () {
+            string msg = EMPTY_MESSAGE;
+            if (directory.is_recent) {
+                msg = EMPTY_RECENT_MESSAGE;
+            } else if (directory.is_trash && (uri == Marlin.TRASH_URI + Path.DIR_SEPARATOR_S)) {
+                msg = EMPTY_TRASH_MESSAGE;
+            } else if (directory.permission_denied) {
+                msg = DENIED_MESSAGE; 
+            }
+            return msg;
+        }
     }
 }