kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-15 18:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'release/20.04'

Browse source
This commit is contained in:
Nate Graham 2020-04-14 09:15:32 -06:00
parent ac234a9c55 8de24d5802
commit 03bff8361a
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/dolphinviewcontainer.cpp
View file

@ -451,6 +451,14 @@ void DolphinViewContainer::reload()
QString DolphinViewContainer::caption() const
{
if (isSearchModeEnabled()) {
if (currentSearchText().isEmpty()){
return i18n("Search");
} else {
return i18n("Search for %1", currentSearchText());
}
}
if (GeneralSettings::showFullPathInTitlebar()) {
if (!url().isLocalFile()) {
return url().adjusted(QUrl::StripTrailingSlash).toString();
@ -465,13 +473,6 @@ QString DolphinViewContainer::caption() const
return placesModel->text(matchedPlaces.first());
}
if (isSearchModeEnabled()) {
if (currentSearchText().isEmpty()){
return i18n("Search");
} else {
return i18n("Search for %1", currentSearchText());
}
}
if (!url().isLocalFile()) {
QUrl adjustedUrl = url().adjusted(QUrl::StripTrailingSlash);