diff options
| -rw-r--r-- | src/dolphinmainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 19 | ||||
| -rw-r--r-- | src/dolphinviewcontainer.h | 7 |
3 files changed, 20 insertions, 8 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 9fe870044..37f6bb8e4 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1269,7 +1269,7 @@ void DolphinMainWindow::tabCountChanged(int count) void DolphinMainWindow::updateWindowTitle() { - const QString newTitle = m_activeViewContainer->caption(); + const QString newTitle = m_activeViewContainer->captionWindowTitle(); if (windowTitle() != newTitle) { setWindowTitle(newTitle); } diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 3a17805ab..0681c67d9 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -449,6 +449,18 @@ void DolphinViewContainer::reload() m_messageWidget->hide(); } +QString DolphinViewContainer::captionWindowTitle() const +{ + if (GeneralSettings::showFullPathInTitlebar() && !isSearchModeEnabled()) { + if (!url().isLocalFile()) { + return url().adjusted(QUrl::StripTrailingSlash).toString(); + } + return url().adjusted(QUrl::StripTrailingSlash).path(); + } else { + return DolphinViewContainer::caption(); + } +} + QString DolphinViewContainer::caption() const { if (isSearchModeEnabled()) { @@ -459,13 +471,6 @@ QString DolphinViewContainer::caption() const } } - if (GeneralSettings::showFullPathInTitlebar()) { - if (!url().isLocalFile()) { - return url().adjusted(QUrl::StripTrailingSlash).toString(); - } - return url().adjusted(QUrl::StripTrailingSlash).path(); - } - KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel(); const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QUrl(url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?")), 1, Qt::MatchRegExp); diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 5207d2d35..52e63cbe0 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -134,6 +134,13 @@ public: void reload(); /** + * @return Returns a Caption suitable for display in the window title. + * It is calculated depending on GeneralSettings::showFullPathInTitlebar(). + * If it's false, it calls caption(). + */ + QString captionWindowTitle() const; + + /** * @return Returns a Caption suitable for display to the user. It is * calculated depending on settings, if a search is active and other * factors. |