Commit cd542ab3 authored by Kai Uwe Broulik's avatar Kai Uwe Broulik 🍇

Merge branch 'Plasma/5.12'

parents 963f7f8c 51a92737
......@@ -221,7 +221,7 @@ QVariantList Backend::placesActions(const QUrl &launcherUrl, bool showAllPlaces,
for (int i = 0; i < placesModel->rowCount(); ++i) {
QModelIndex idx = placesModel->index(i, 0);
if (idx.data(KFilePlacesModel::HiddenRole).toBool()) {
if (placesModel->isHidden(idx)) {
continue;
}
......
......@@ -285,6 +285,8 @@ Item {
animated: false
usesPlasmaTheme: false
smooth: true
source: model.decoration
overlays: model.overlays
}
......
......@@ -1175,7 +1175,7 @@ FocusScope {
adapterView: gridView
adapterModel: positioner
adapterIconSize: gridView.iconSize;
adapterIconSize: gridView.iconSize * 2
adapterVisibleArea: Qt.rect(gridView.contentX, gridView.contentY, gridView.contentWidth, gridView.contentHeight)
Component.onCompleted: {
......
......@@ -1914,6 +1914,7 @@ void FolderModel::moveSelectedToTrash()
const QList<QUrl> urls = selectedUrls();
KIO::JobUiDelegate uiDelegate;
if (uiDelegate.askDeleteConfirmation(urls, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) {
KIO::Job* job = KIO::trash(urls);
job->uiDelegate()->setAutoErrorHandlingEnabled(true);
......@@ -1929,6 +1930,7 @@ void FolderModel::deleteSelected()
const QList<QUrl> urls = selectedUrls();
KIO::JobUiDelegate uiDelegate;
if (uiDelegate.askDeleteConfirmation(urls, KIO::JobUiDelegate::Delete, KIO::JobUiDelegate::DefaultConfirmation)) {
KIO::Job* job = KIO::del(urls);
job->uiDelegate()->setAutoErrorHandlingEnabled(true);
......@@ -1961,6 +1963,7 @@ void FolderModel::emptyTrashBin()
{
KIO::JobUiDelegate uiDelegate;
uiDelegate.setWindow(QApplication::desktop());
if (uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation)) {
KIO::Job* job = KIO::emptyTrash();
job->uiDelegate()->setAutoErrorHandlingEnabled(true);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment