From: Jordan Bucklin Date: Sat, 17 Jul 2021 01:37:36 +0000 (-0700) Subject: Fix placeholder label text within an empty folder in Trash X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/3fe971e17467e30ba59ca42a53931a273fd7e78b Fix placeholder label text within an empty folder in Trash An empty folder within the Trash bin previously had the placeholder label "Trash is empty". This label should only appear in top-most Trash/ url, and "Folder is empty" otherwise. BUG: 439952 --- diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 9d253c4e0..f5c21a2c5 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -2094,7 +2094,7 @@ void DolphinView::updatePlaceholderLabel() m_placeholderLabel->setText(i18n("No items matching the filter")); } else if (m_url.scheme() == QLatin1String("baloosearch") || m_url.scheme() == QLatin1String("filenamesearch")) { m_placeholderLabel->setText(i18n("No items matching the search")); - } else if (m_url.scheme() == QLatin1String("trash")) { + } else if (m_url.scheme() == QLatin1String("trash") && m_url.path() == QLatin1String("/")) { m_placeholderLabel->setText(i18n("Trash is empty")); } else if (m_url.scheme() == QLatin1String("tags")) { m_placeholderLabel->setText(i18n("No tags"));