Differential D5236 Diff 12961 containments/desktop/plugins/folder/foldermodel.cpp

Changeset View

Standalone View

View Options

containments/desktop/plugins/folder/foldermodel.cpp

Show First 20 Lines • Show All 942 Lines • ▼ Show 20 Line(s)866{
943 Qt::DropActions possibleActions(dropEvent->property("possibleActions").toInt()); 943​ Qt::DropActions possibleActions(dropEvent->property("possibleActions").toInt());
944 Qt::MouseButtons buttons(dropEvent->property("buttons").toInt()); 944​ Qt::MouseButtons buttons(dropEvent->property("buttons").toInt());
945 Qt::KeyboardModifiers modifiers(dropEvent->property("modifiers").toInt()); 945​ Qt::KeyboardModifiers modifiers(dropEvent->property("modifiers").toInt());
946 946​
947 QDropEvent ev(pos, possibleActions, mimeData, buttons, modifiers); 947​ QDropEvent ev(pos, possibleActions, mimeData, buttons, modifiers);
948 ev.setDropAction(proposedAction); 948​ ev.setDropAction(proposedAction);
949 949​
950 KIO::DropJob *dropJob = KIO::drop(&ev, dropTargetUrl); 950​ KIO::DropJob *dropJob = KIO::drop(&ev, dropTargetUrl);
951 dropJob->ui()->setAutoErrorHandlingEnabled(true); 951​ dropJob->uiDelegate()->setAutoErrorHandlingEnabled(true);
952 const int x = dropEvent->property("x").toInt(); 952​ const int x = dropEvent->property("x").toInt();
953 const int y = dropEvent->property("y").toInt(); 953​ const int y = dropEvent->property("y").toInt();
954 954​
955 connect(dropJob, static_cast<void(KIO::DropJob::*)(const KFileItemListProperties &)>(&KIO::DropJob::popupMenuAboutToShow), this, [this, mimeData, x, y, dropJob](const KFileItemListProperties &) { 955​ connect(dropJob, static_cast<void(KIO::DropJob::*)(const KFileItemListProperties &)>(&KIO::DropJob::popupMenuAboutToShow), this, [this, mimeData, x, y, dropJob](const KFileItemListProperties &) {
956 emit popupMenuAboutToShow(dropJob, mimeData, x, y); 956​ emit popupMenuAboutToShow(dropJob, mimeData, x, y);
957 }); 957​ });
958} 958​}
959 959​
Show All 22 Lines980 } else {
982 Qt::DropActions possibleActions(dropEvent->property("possibleActions").toInt()); 982​ Qt::DropActions possibleActions(dropEvent->property("possibleActions").toInt());
983 Qt::MouseButtons buttons(dropEvent->property("buttons").toInt()); 983​ Qt::MouseButtons buttons(dropEvent->property("buttons").toInt());
984 Qt::KeyboardModifiers modifiers(dropEvent->property("modifiers").toInt()); 984​ Qt::KeyboardModifiers modifiers(dropEvent->property("modifiers").toInt());
985 985​
986 QDropEvent ev(QPoint(), possibleActions, mimeData, buttons, modifiers); 986​ QDropEvent ev(QPoint(), possibleActions, mimeData, buttons, modifiers);
987 ev.setDropAction(proposedAction); 987​ ev.setDropAction(proposedAction);
988 988​
989 KIO::DropJob *dropJob = KIO::drop(&ev, m_dirModel->dirLister()->url().adjusted(QUrl::PreferLocalFile)); 989​ KIO::DropJob *dropJob = KIO::drop(&ev, m_dirModel->dirLister()->url().adjusted(QUrl::PreferLocalFile));
990 dropJob->ui()->setAutoErrorHandlingEnabled(true); 990​ dropJob->uiDelegate()->setAutoErrorHandlingEnabled(true);
991 } 991​ }
992} 992​}
993 993​
994void FolderModel::selectionChanged(QItemSelection selected, QItemSelection deselected) 994​void FolderModel::selectionChanged(QItemSelection selected, QItemSelection deselected)
995{ 995​{
996 QModelIndexList indices = selected.indexes(); 996​ QModelIndexList indices = selected.indexes();
997 indices.append(deselected.indexes()); 997​ indices.append(deselected.indexes());
998 998​
▲ Show 20 Lines • Show All 599 Lines • ▼ Show 20 Line(s)1597{
1598 if (!m_selectionModel->hasSelection()) { 1598​ if (!m_selectionModel->hasSelection()) {
1599 return; 1599​ return;
1600 } 1600​ }
1601 1601​
1602 const QList<QUrl> urls = selectedUrls(true); 1602​ const QList<QUrl> urls = selectedUrls(true);
1603 KIO::JobUiDelegate uiDelegate; 1603​ KIO::JobUiDelegate uiDelegate;
1604 if (uiDelegate.askDeleteConfirmation(urls, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) { 1604​ if (uiDelegate.askDeleteConfirmation(urls, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) {
1605 KIO::Job* job = KIO::trash(urls); 1605​ KIO::Job* job = KIO::trash(urls);
1606 job->ui()->setAutoErrorHandlingEnabled(true); 1606​ job->uiDelegate()->setAutoErrorHandlingEnabled(true);
1607 KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, urls, QUrl(QStringLiteral("trash:/")), job); 1607​ KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, urls, QUrl(QStringLiteral("trash:/")), job);
1608 } 1608​ }
1609} 1609​}
1610 1610​
1611void FolderModel::deleteSelected() 1611​void FolderModel::deleteSelected()
1612{ 1612​{
1613 if (!m_selectionModel->hasSelection()) { 1613​ if (!m_selectionModel->hasSelection()) {
1614 return; 1614​ return;
1615 } 1615​ }
1616 1616​
1617 const QList<QUrl> urls = selectedUrls(false); 1617​ const QList<QUrl> urls = selectedUrls(false);
1618 KIO::JobUiDelegate uiDelegate; 1618​ KIO::JobUiDelegate uiDelegate;
1619 if (uiDelegate.askDeleteConfirmation(urls, KIO::JobUiDelegate::Delete, KIO::JobUiDelegate::DefaultConfirmation)) { 1619​ if (uiDelegate.askDeleteConfirmation(urls, KIO::JobUiDelegate::Delete, KIO::JobUiDelegate::DefaultConfirmation)) {
1620 KIO::Job* job = KIO::del(urls); 1620​ KIO::Job* job = KIO::del(urls);
1621 job->ui()->setAutoErrorHandlingEnabled(true); 1621​ job->uiDelegate()->setAutoErrorHandlingEnabled(true);
1622 } 1622​ }
1623} 1623​}
1624 1624​
1625void FolderModel::openSelected() 1625​void FolderModel::openSelected()
1626{ 1626​{
1627 if (!m_selectionModel->hasSelection()) { 1627​ if (!m_selectionModel->hasSelection()) {
1628 return; 1628​ return;
1629 } 1629​ }
Show All 15 Lines
1645} 1645​}
1646 1646​
1647void FolderModel::emptyTrashBin() 1647​void FolderModel::emptyTrashBin()
1648{ 1648​{
1649 KIO::JobUiDelegate uiDelegate; 1649​ KIO::JobUiDelegate uiDelegate;
1650 uiDelegate.setWindow(QApplication::desktop()); 1650​ uiDelegate.setWindow(QApplication::desktop());
1651 if (uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation)) { 1651​ if (uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation)) {
1652 KIO::Job* job = KIO::emptyTrash(); 1652​ KIO::Job* job = KIO::emptyTrash();
1653 job->ui()->setAutoErrorHandlingEnabled(true); 1653​ job->uiDelegate()->setAutoErrorHandlingEnabled(true);
1654 } 1654​ }
1655} 1655​}
1656 1656​
1657void FolderModel::restoreSelectedFromTrash() 1657​void FolderModel::restoreSelectedFromTrash()
1658{ 1658​{
1659 if (!m_selectionModel->hasSelection()) { 1659​ if (!m_selectionModel->hasSelection()) {
1660 return; 1660​ return;
1661 } 1661​ }
1662 1662​
1663 const auto &urls = selectedUrls(true); 1663​ const auto &urls = selectedUrls(true);
1664 1664​
1665 KIO::RestoreJob *job = KIO::restoreFromTrash(urls); 1665​ KIO::RestoreJob *job = KIO::restoreFromTrash(urls);
1666 job->ui()->setAutoErrorHandlingEnabled(true); 1666​ job->uiDelegate()->setAutoErrorHandlingEnabled(true);
1667} 1667​}
1668 1668​
1669void FolderModel::undoTextChanged(const QString &text) 1669​void FolderModel::undoTextChanged(const QString &text)
1670{ 1670​{
1671 if (QAction *action = m_actionCollection.action(QStringLiteral("undo"))) { 1671​ if (QAction *action = m_actionCollection.action(QStringLiteral("undo"))) {
1672 action->setText(text); 1672​ action->setText(text);
1673 } 1673​ }
1674} 1674​}