mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge remote-tracking branch 'origin/Applications/17.12'
Conflicts: CMakeLists.txt [versions] src/panels/places/placesitemmodel.cpp
This commit is contained in:
commit
1a6b3c0a2b
|
@ -629,20 +629,24 @@ void KFileItemModel::restoreExpandedDirectories(const QSet<QUrl> &urls)
|
||||||
|
|
||||||
void KFileItemModel::expandParentDirectories(const QUrl &url)
|
void KFileItemModel::expandParentDirectories(const QUrl &url)
|
||||||
{
|
{
|
||||||
const int pos = m_dirLister->url().path().length();
|
|
||||||
|
|
||||||
// Assure that each sub-path of the URL that should be
|
// Assure that each sub-path of the URL that should be
|
||||||
// expanded is added to m_urlsToExpand. KDirLister
|
// expanded is added to m_urlsToExpand. KDirLister
|
||||||
// does not care whether the parent-URL has already been
|
// does not care whether the parent-URL has already been
|
||||||
// expanded.
|
// expanded.
|
||||||
QUrl urlToExpand = m_dirLister->url();
|
QUrl urlToExpand = m_dirLister->url();
|
||||||
|
const int pos = urlToExpand.path().length();
|
||||||
|
|
||||||
// first subdir can be empty, if m_dirLister->url().path() does not end with '/'
|
// first subdir can be empty, if m_dirLister->url().path() does not end with '/'
|
||||||
// this happens if baseUrl is not root but a home directory, see FoldersPanel,
|
// this happens if baseUrl is not root but a home directory, see FoldersPanel,
|
||||||
// so using QString::SkipEmptyParts
|
// so using QString::SkipEmptyParts
|
||||||
const QStringList subDirs = url.path().mid(pos).split(QDir::separator(), QString::SkipEmptyParts);
|
const QStringList subDirs = url.path().mid(pos).split(QDir::separator(), QString::SkipEmptyParts);
|
||||||
for (int i = 0; i < subDirs.count() - 1; ++i) {
|
for (int i = 0; i < subDirs.count() - 1; ++i) {
|
||||||
urlToExpand.setPath(urlToExpand.path() + '/' + subDirs.at(i));
|
QString path = urlToExpand.path();
|
||||||
|
if (!path.endsWith(QLatin1Char('/'))) {
|
||||||
|
path.append(QLatin1Char('/'));
|
||||||
|
}
|
||||||
|
urlToExpand.setPath(path + subDirs.at(i));
|
||||||
m_urlsToExpand.insert(urlToExpand);
|
m_urlsToExpand.insert(urlToExpand);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,7 @@ bool FoldersPanel::urlChanged()
|
||||||
void FoldersPanel::reloadTree()
|
void FoldersPanel::reloadTree()
|
||||||
{
|
{
|
||||||
if (m_controller) {
|
if (m_controller) {
|
||||||
loadTree(url());
|
loadTree(url(), AllowJumpHome);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -316,34 +316,42 @@ void FoldersPanel::startFadeInAnimation()
|
||||||
anim->setDuration(200);
|
anim->setDuration(200);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FoldersPanel::loadTree(const QUrl& url)
|
void FoldersPanel::loadTree(const QUrl& url, FoldersPanel::NavigationBehaviour navigationBehaviour)
|
||||||
{
|
{
|
||||||
Q_ASSERT(m_controller);
|
Q_ASSERT(m_controller);
|
||||||
|
|
||||||
m_updateCurrentItem = false;
|
m_updateCurrentItem = false;
|
||||||
|
bool jumpHome = false;
|
||||||
|
|
||||||
QUrl baseUrl;
|
QUrl baseUrl;
|
||||||
if (url.isLocalFile()) {
|
if (!url.isLocalFile()) {
|
||||||
const bool isInHomeFolder = Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url);
|
// Clear the path for non-local URLs and use it as base
|
||||||
if (FoldersPanelSettings::limitFoldersPanelToHome() && isInHomeFolder) {
|
baseUrl = url;
|
||||||
|
baseUrl.setPath(QStringLiteral("/"));
|
||||||
|
} else if (Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url)) {
|
||||||
|
if (FoldersPanelSettings::limitFoldersPanelToHome() ) {
|
||||||
baseUrl = Dolphin::homeUrl();
|
baseUrl = Dolphin::homeUrl();
|
||||||
} else {
|
} else {
|
||||||
// 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() && navigationBehaviour == AllowJumpHome) {
|
||||||
|
baseUrl = Dolphin::homeUrl();
|
||||||
|
jumpHome = true;
|
||||||
} else {
|
} else {
|
||||||
// Clear the path for non-local URLs and use it as base
|
// Use the root directory as base for local URLs (#150941)
|
||||||
baseUrl = url;
|
baseUrl = QUrl::fromLocalFile(QDir::rootPath());
|
||||||
baseUrl.setPath(QString('/'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_model->directory() != baseUrl) {
|
if (m_model->directory() != baseUrl && !jumpHome) {
|
||||||
m_updateCurrentItem = true;
|
m_updateCurrentItem = true;
|
||||||
m_model->refreshDirectory(baseUrl);
|
m_model->refreshDirectory(baseUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
const int index = m_model->index(url);
|
const int index = m_model->index(url);
|
||||||
if (index >= 0) {
|
if (jumpHome) {
|
||||||
|
emit folderActivated(baseUrl);
|
||||||
|
} else if (index >= 0) {
|
||||||
updateCurrentItem(index);
|
updateCurrentItem(index);
|
||||||
} else if (url == baseUrl) {
|
} else if (url == baseUrl) {
|
||||||
// clear the selection when visiting the base url
|
// clear the selection when visiting the base url
|
||||||
|
|
|
@ -85,12 +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 navigationBehaviour Navigation behaviour \see NavigationBehaviour
|
||||||
*/
|
*/
|
||||||
void loadTree(const QUrl& url);
|
void loadTree(const QUrl& url, NavigationBehaviour navigationBehaviour = StayWhereYouAre);
|
||||||
|
|
||||||
void reloadTree();
|
void reloadTree();
|
||||||
|
|
||||||
|
|
|
@ -127,14 +127,13 @@ void TreeViewContextMenu::open()
|
||||||
|
|
||||||
// insert 'Limit to Home Directory'
|
// insert 'Limit to Home Directory'
|
||||||
const QUrl url = m_fileItem.url();
|
const QUrl url = m_fileItem.url();
|
||||||
const bool showLimitToHomeDirectory = url.isLocalFile() && (Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url));
|
const bool enableLimitToHomeDirectory = url.isLocalFile();
|
||||||
if (showLimitToHomeDirectory) {
|
QAction* limitFoldersPanelToHomeAction = new QAction(i18nc("@action:inmenu", "Limit to Home Directory"), this);
|
||||||
QAction* limitFoldersPanelToHomeAction = new QAction(i18nc("@action:inmenu", "Limit to Home Directory"), this);
|
limitFoldersPanelToHomeAction->setCheckable(true);
|
||||||
limitFoldersPanelToHomeAction->setCheckable(true);
|
limitFoldersPanelToHomeAction->setEnabled(enableLimitToHomeDirectory);
|
||||||
limitFoldersPanelToHomeAction->setChecked(m_parent->limitFoldersPanelToHome());
|
limitFoldersPanelToHomeAction->setChecked(m_parent->limitFoldersPanelToHome());
|
||||||
popup->addAction(limitFoldersPanelToHomeAction);
|
popup->addAction(limitFoldersPanelToHomeAction);
|
||||||
connect(limitFoldersPanelToHomeAction, &QAction::toggled, this, &TreeViewContextMenu::setLimitFoldersPanelToHome);
|
connect(limitFoldersPanelToHomeAction, &QAction::toggled, this, &TreeViewContextMenu::setLimitFoldersPanelToHome);
|
||||||
}
|
|
||||||
|
|
||||||
// insert 'Automatic Scrolling'
|
// insert 'Automatic Scrolling'
|
||||||
QAction* autoScrollingAction = new QAction(i18nc("@action:inmenu", "Automatic Scrolling"), this);
|
QAction* autoScrollingAction = new QAction(i18nc("@action:inmenu", "Automatic Scrolling"), this);
|
||||||
|
|
|
@ -107,7 +107,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
|
||||||
m_nameLabel->setFont(font);
|
m_nameLabel->setFont(font);
|
||||||
m_nameLabel->setTextFormat(Qt::PlainText);
|
m_nameLabel->setTextFormat(Qt::PlainText);
|
||||||
m_nameLabel->setAlignment(Qt::AlignHCenter);
|
m_nameLabel->setAlignment(Qt::AlignHCenter);
|
||||||
m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
m_nameLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
|
||||||
|
|
||||||
const bool previewsShown = InformationPanelSettings::previewsShown();
|
const bool previewsShown = InformationPanelSettings::previewsShown();
|
||||||
m_preview->setVisible(previewsShown);
|
m_preview->setVisible(previewsShown);
|
||||||
|
|
|
@ -56,6 +56,17 @@ namespace {
|
||||||
// Hence a prefix to the application-name of the stored bookmarks is
|
// Hence a prefix to the application-name of the stored bookmarks is
|
||||||
// added, which is only read by PlacesItemModel.
|
// added, which is only read by PlacesItemModel.
|
||||||
const char AppNamePrefix[] = "-places-panel";
|
const char AppNamePrefix[] = "-places-panel";
|
||||||
|
|
||||||
|
static QList<QUrl> balooURLs = {
|
||||||
|
QUrl(QStringLiteral("timeline:/today")),
|
||||||
|
QUrl(QStringLiteral("timeline:/yesterday")),
|
||||||
|
QUrl(QStringLiteral("timeline:/thismonth")),
|
||||||
|
QUrl(QStringLiteral("timeline:/lastmonth")),
|
||||||
|
QUrl(QStringLiteral("search:/documents")),
|
||||||
|
QUrl(QStringLiteral("search:/images")),
|
||||||
|
QUrl(QStringLiteral("search:/audio")),
|
||||||
|
QUrl(QStringLiteral("search:/videos"))
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
PlacesItemModel::PlacesItemModel(QObject* parent) :
|
PlacesItemModel::PlacesItemModel(QObject* parent) :
|
||||||
|
@ -630,6 +641,12 @@ bool PlacesItemModel::acceptBookmark(const KBookmark& bookmark) const
|
||||||
const QString udi = bookmark.metaDataItem(QStringLiteral("UDI"));
|
const QString udi = bookmark.metaDataItem(QStringLiteral("UDI"));
|
||||||
const QUrl url = bookmark.url();
|
const QUrl url = bookmark.url();
|
||||||
const QString appName = bookmark.metaDataItem(QStringLiteral("OnlyInApp"));
|
const QString appName = bookmark.metaDataItem(QStringLiteral("OnlyInApp"));
|
||||||
|
|
||||||
|
if (balooURLs.contains(url) && appName.isEmpty()) {
|
||||||
|
// Does not accept baloo URLS with empty appName, this came from new KIO model and will cause duplications
|
||||||
|
qCWarning(DolphinDebug) << "Ignore KIO url:" << url;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
const bool allowedHere = (appName.isEmpty()
|
const bool allowedHere = (appName.isEmpty()
|
||||||
|| appName == KAboutData::applicationData().componentName()
|
|| appName == KAboutData::applicationData().componentName()
|
||||||
|| appName == KAboutData::applicationData().componentName() + AppNamePrefix);
|
|| appName == KAboutData::applicationData().componentName() + AppNamePrefix);
|
||||||
|
|
Loading…
Reference in a new issue