diff options
| author | Kai Uwe Broulik <[email protected]> | 2018-09-27 12:56:09 +0200 |
|---|---|---|
| committer | Kai Uwe Broulik <[email protected]> | 2018-09-27 12:56:09 +0200 |
| commit | 0483b8a77f859b8466e2bffe669698ec81663640 (patch) | |
| tree | f9f215304821dd2bb9c3b502caa16600435dd52b /src/dolphinviewcontainer.cpp | |
| parent | a9d10a5c0be36462cc09b19ccac78bcbab53dd1c (diff) | |
Fix window / tab caption in search mode
A search URL is never local, so this part of the code was never reached, resulting in raw baloosearch or filenamesearch URLs
showing up as window and tab title
Differential Revision: https://phabricator.kde.org/D15772
Diffstat (limited to 'src/dolphinviewcontainer.cpp')
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index f747d442e..71a1ae872 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -425,6 +425,15 @@ QString DolphinViewContainer::caption() const if (!matchedPlaces.isEmpty()) { 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); QString caption; @@ -445,14 +454,6 @@ QString DolphinViewContainer::caption() const fileName = '/'; } - if (isSearchModeEnabled()) { - if(currentSearchText().isEmpty()){ - return i18n("Search"); - } else { - return i18n("Search for %1", currentSearchText()); - } - } - return fileName; } |
