From da39a8f87fae104807d55765e96c95311b33c747 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 25 Oct 2014 07:15:29 +0000 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) --- konqueror/about/konq_aboutpage.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/konqueror/about/konq_aboutpage.desktop b/konqueror/about/konq_aboutpage.desktop index bbb16736c2..6cb9aad596 100644 --- a/konqueror/about/konq_aboutpage.desktop +++ b/konqueror/about/konq_aboutpage.desktop @@ -26,7 +26,7 @@ Name[es]=Página «Acerca de» para Konqueror Name[et]=Konquerori info Name[eu]=Konqueror-en 'Honi buruz' orrialdea Name[fa]=صفحه درباره برای Konqueror -Name[fi]=Konquerorin tietoja-sivu +Name[fi]=Konquerorin tietoa-sivu Name[fr]=Page « À propos » de Konqueror Name[fy]=Ynformaasjeside foar Konqueror Name[ga]=Leathanach Eolais le haghaidh Konqueror From 9e477d9c76ee503ee0e5771be9a7d1ca48011d01 Mon Sep 17 00:00:00 2001 From: Arjun AK Date: Mon, 27 Oct 2014 12:46:58 +0530 Subject: [PATCH 2/2] Do not show "move" option while dragging and dropping a read only directory posix does not permit the movement of a read-only folder, regardless of the permissions on its parent. This patch removes the move option from the drag and drop context menu if the user doesn't have write permission on the directory. BUG: 337486 REVIEW: 119372 FIXED-IN: 4.14.3 --- lib/konq/konq_operations.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/konq/konq_operations.cpp b/lib/konq/konq_operations.cpp index 220a90a3f6..6548cd3f25 100644 --- a/lib/konq/konq_operations.cpp +++ b/lib/konq/konq_operations.cpp @@ -470,8 +470,18 @@ void KonqOperations::doDropFileCopy() for (KUrl::List::ConstIterator it = lst.begin(); it != lst.end(); ++it) { bool local = (*it).isLocalFile(); - if ( KProtocolManager::supportsDeleting( *it ) && (!local || QFileInfo((*it).directory()).isWritable() )) - mlst.append(*it); + if ( KProtocolManager::supportsDeleting( *it ) ) { + if (!local) { + mlst.append(*it); + } else { + QFileInfo itemInfo((*it).toLocalFile()); + QFileInfo dirInfo(itemInfo.absolutePath()); + // Posix does not permit the movement of a read-only folder, regardless of the permissions of its parent + if (dirInfo.isWritable() && (!itemInfo.isDir() || itemInfo.isWritable())) { + mlst.append(*it); + } + } + } if ( local && KDesktopFile::isDesktopFile((*it).toLocalFile())) isDesktopFile = true; if ( local && (*it).path().startsWith(KGlobalSettings::desktopPath()))