mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Fix wrong window titles
Summary: BUG: 389135 FIXED-IN: 19.11.80 Currently dolphin shows a folder's name instead of a "place" name if the current path has trailing slash and place's name doesn't, or vice versa. This patch fixes this behavior, so that dolphin always shows a "place" name. The QUrl::FullyEncoded string conversion is required because that's how the places model stores the places URLs in the XML bookmarks file. Test Plan: Test configuration: https://imgur.com/a/U4zBp8c Before (wrong window titles are in red): https://imgur.com/a/dB4xRwo After (all window titles are correct): https://imgur.com/a/W7virBn Reviewers: #dolphin, elvisangelaccio Subscribers: elvisangelaccio, ngraham, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D23706
This commit is contained in:
parent
79bbadb263
commit
681d8bb6cd
|
@ -456,7 +456,7 @@ QString DolphinViewContainer::caption() const
|
|||
}
|
||||
|
||||
KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
|
||||
const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, url(), 1, Qt::MatchExactly);
|
||||
const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QUrl(url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?")), 1, Qt::MatchRegExp);
|
||||
|
||||
if (!matchedPlaces.isEmpty()) {
|
||||
return placesModel->text(matchedPlaces.first());
|
||||
|
|
Loading…
Reference in a new issue