mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
Merge branch 'release/20.12'
This commit is contained in:
commit
ce11325115
|
@ -432,23 +432,23 @@ QAction* DolphinContextMenu::createPasteAction()
|
|||
{
|
||||
QAction* action = nullptr;
|
||||
KFileItem destItem;
|
||||
if (!m_fileInfo.isNull()) {
|
||||
if (!m_fileInfo.isNull() && m_selectedItems.count() <= 1) {
|
||||
destItem = m_fileInfo;
|
||||
} else {
|
||||
destItem = baseFileItem();
|
||||
}
|
||||
|
||||
if (!destItem.isNull() && destItem.isDir()) {
|
||||
if (m_selectedItems.count() <= 1) {
|
||||
const QMimeData *mimeData = QApplication::clipboard()->mimeData();
|
||||
bool canPaste;
|
||||
const QString text = KIO::pasteActionText(mimeData, &canPaste, destItem);
|
||||
action = new QAction(QIcon::fromTheme(QStringLiteral("edit-paste")), text, this);
|
||||
if (canPaste) {
|
||||
if (destItem == m_fileInfo) {
|
||||
// if paste destination is a selected folder
|
||||
action = new QAction(QIcon::fromTheme(QStringLiteral("edit-paste")), text, this);
|
||||
connect(action, &QAction::triggered, m_mainWindow, &DolphinMainWindow::pasteIntoFolder);
|
||||
} else {
|
||||
// don't add the unavailable action
|
||||
action = nullptr;
|
||||
action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue