mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 17:01:22 +00:00
Merge branch 'release/20.04'
This commit is contained in:
commit
03bff8361a
|
@ -451,6 +451,14 @@ void DolphinViewContainer::reload()
|
||||||
|
|
||||||
QString DolphinViewContainer::caption() const
|
QString DolphinViewContainer::caption() const
|
||||||
{
|
{
|
||||||
|
if (isSearchModeEnabled()) {
|
||||||
|
if (currentSearchText().isEmpty()){
|
||||||
|
return i18n("Search");
|
||||||
|
} else {
|
||||||
|
return i18n("Search for %1", currentSearchText());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (GeneralSettings::showFullPathInTitlebar()) {
|
if (GeneralSettings::showFullPathInTitlebar()) {
|
||||||
if (!url().isLocalFile()) {
|
if (!url().isLocalFile()) {
|
||||||
return url().adjusted(QUrl::StripTrailingSlash).toString();
|
return url().adjusted(QUrl::StripTrailingSlash).toString();
|
||||||
|
@ -465,13 +473,6 @@ QString DolphinViewContainer::caption() const
|
||||||
return placesModel->text(matchedPlaces.first());
|
return placesModel->text(matchedPlaces.first());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isSearchModeEnabled()) {
|
|
||||||
if (currentSearchText().isEmpty()){
|
|
||||||
return i18n("Search");
|
|
||||||
} else {
|
|
||||||
return i18n("Search for %1", currentSearchText());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!url().isLocalFile()) {
|
if (!url().isLocalFile()) {
|
||||||
QUrl adjustedUrl = url().adjusted(QUrl::StripTrailingSlash);
|
QUrl adjustedUrl = url().adjusted(QUrl::StripTrailingSlash);
|
||||||
|
|
Loading…
Reference in a new issue