kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not display full path in the title of the tab

Browse source 
Summary:
Displays the full path only in the window title, not in the tab title.

Screenshot for comparison: ( Dolphin on the right is without D28815 , Dolphin on left has both D28815 and this patch)

{F8240079}

Reviewers: #vdg, #dolphin, ngraham, meven

Reviewed By: #vdg, #dolphin, ngraham, meven

Subscribers: ngraham, elvisangelaccio, meven, kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D28857
This commit is contained in:
Antonio Prcela 2020-04-15 09:29:17 -06:00 committed by Nate Graham
parent 24c9666dad
commit 26f8e68864
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dolphinmainwindow.cpp
View file

@ -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);
}

19
src/dolphinviewcontainer.cpp
View file

@ -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);

7
src/dolphinviewcontainer.h
View file

@ -133,6 +133,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