mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Folderspanel's context-menu option "Limit to Home Directory" is always visible
Summary: Applied suggested changes to [[ https://phabricator.kde.org/D9662 | D9662 ]] - Enum instead of bool - Use QStringLiteral Test Plan: Visual inspection Reviewers: ngraham, elvisangelaccio, #dolphin Reviewed By: ngraham, #dolphin Subscribers: #dolphin Tags: #dolphin, #kde_applications Differential Revision: https://phabricator.kde.org/D9911
This commit is contained in:
parent
3cb3d58fbf
commit
64d2fd2981
|
@ -137,7 +137,7 @@ bool FoldersPanel::urlChanged()
|
||||||
void FoldersPanel::reloadTree()
|
void FoldersPanel::reloadTree()
|
||||||
{
|
{
|
||||||
if (m_controller) {
|
if (m_controller) {
|
||||||
loadTree(url(), true);
|
loadTree(url(), AllowJumpHome);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -316,7 +316,7 @@ void FoldersPanel::startFadeInAnimation()
|
||||||
anim->setDuration(200);
|
anim->setDuration(200);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FoldersPanel::loadTree(const QUrl& url, bool allowJumpHome)
|
void FoldersPanel::loadTree(const QUrl& url, FoldersPanel::NavigationBehaviour navigationBehaviour)
|
||||||
{
|
{
|
||||||
Q_ASSERT(m_controller);
|
Q_ASSERT(m_controller);
|
||||||
|
|
||||||
|
@ -327,7 +327,7 @@ void FoldersPanel::loadTree(const QUrl& url, bool allowJumpHome)
|
||||||
if (!url.isLocalFile()) {
|
if (!url.isLocalFile()) {
|
||||||
// Clear the path for non-local URLs and use it as base
|
// Clear the path for non-local URLs and use it as base
|
||||||
baseUrl = url;
|
baseUrl = url;
|
||||||
baseUrl.setPath(QString('/'));
|
baseUrl.setPath(QStringLiteral("/"));
|
||||||
} else if (Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url)) {
|
} else if (Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url)) {
|
||||||
if (FoldersPanelSettings::limitFoldersPanelToHome() ) {
|
if (FoldersPanelSettings::limitFoldersPanelToHome() ) {
|
||||||
baseUrl = Dolphin::homeUrl();
|
baseUrl = Dolphin::homeUrl();
|
||||||
|
@ -335,7 +335,7 @@ void FoldersPanel::loadTree(const QUrl& url, bool allowJumpHome)
|
||||||
// Use the root directory as base for local URLs (#150941)
|
// Use the root directory as base for local URLs (#150941)
|
||||||
baseUrl = QUrl::fromLocalFile(QDir::rootPath());
|
baseUrl = QUrl::fromLocalFile(QDir::rootPath());
|
||||||
}
|
}
|
||||||
} else if (FoldersPanelSettings::limitFoldersPanelToHome() && allowJumpHome) {
|
} else if (FoldersPanelSettings::limitFoldersPanelToHome() && navigationBehaviour == AllowJumpHome) {
|
||||||
baseUrl = Dolphin::homeUrl();
|
baseUrl = Dolphin::homeUrl();
|
||||||
jumpHome = true;
|
jumpHome = true;
|
||||||
} else {
|
} else {
|
||||||
|
@ -349,7 +349,7 @@ void FoldersPanel::loadTree(const QUrl& url, bool allowJumpHome)
|
||||||
}
|
}
|
||||||
|
|
||||||
const int index = m_model->index(url);
|
const int index = m_model->index(url);
|
||||||
if (jumpHome == true) {
|
if (jumpHome) {
|
||||||
emit folderActivated(baseUrl);
|
emit folderActivated(baseUrl);
|
||||||
} else if (index >= 0) {
|
} else if (index >= 0) {
|
||||||
updateCurrentItem(index);
|
updateCurrentItem(index);
|
||||||
|
|
|
@ -85,13 +85,20 @@ private slots:
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
/**
|
||||||
|
* Indicate if it is allowed to leave current location.
|
||||||
|
*/
|
||||||
|
enum NavigationBehaviour {
|
||||||
|
StayWhereYouAre, ///< Don't leave current location.
|
||||||
|
AllowJumpHome ///< Go Home only when context menu option got checked.
|
||||||
|
};
|
||||||
/**
|
/**
|
||||||
* Initializes the base URL of the tree and expands all
|
* Initializes the base URL of the tree and expands all
|
||||||
* directories until \a url.
|
* directories until \a url.
|
||||||
* @param url URL of the leaf directory that should get expanded.
|
* @param url URL of the leaf directory that should get expanded.
|
||||||
* @param allowJumpHome indicate context menu got checked.
|
* @param navigationBehaviour Navigation behaviour \see NavigationBehaviour
|
||||||
*/
|
*/
|
||||||
void loadTree(const QUrl& url, bool allowJumpHome = false);
|
void loadTree(const QUrl& url, NavigationBehaviour navigationBehaviour = StayWhereYouAre);
|
||||||
|
|
||||||
void reloadTree();
|
void reloadTree();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue