mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 00:11:21 +00:00
Fix Bug 240820 - [Usability Bug] Handling Bad Filenames, dolphin gives unclear error message
Fix Bug 308597 - Regression: Renaming a file/folder to something that contains a "/" will result in several message boxes Uses the same solution as Dolphin-Rename-Dialog does. (KIO::encodeFileName) BUG: 240820 BUG: 308597 REVIEW: 107681 FIXED-IN: 4.9.5
This commit is contained in:
parent
c52d57d872
commit
fe5c03fb58
|
@ -20,6 +20,7 @@
|
||||||
#include "kitemlistroleeditor.h"
|
#include "kitemlistroleeditor.h"
|
||||||
|
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
|
#include <kio/global.h>
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
|
|
||||||
KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
|
KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
|
||||||
|
@ -93,7 +94,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
|
||||||
// a roleEditingFinished signal (see KItemListRoleEditor::event),
|
// a roleEditingFinished signal (see KItemListRoleEditor::event),
|
||||||
// which is not wanted in this case.
|
// which is not wanted in this case.
|
||||||
m_blockFinishedSignal = true;
|
m_blockFinishedSignal = true;
|
||||||
emit roleEditingCanceled(m_index, m_role, toPlainText());
|
emit roleEditingCanceled(m_index, m_role, KIO::encodeFileName(toPlainText()));
|
||||||
m_blockFinishedSignal = false;
|
m_blockFinishedSignal = false;
|
||||||
event->accept();
|
event->accept();
|
||||||
return;
|
return;
|
||||||
|
@ -137,7 +138,7 @@ void KItemListRoleEditor::autoAdjustSize()
|
||||||
void KItemListRoleEditor::emitRoleEditingFinished()
|
void KItemListRoleEditor::emitRoleEditingFinished()
|
||||||
{
|
{
|
||||||
if (!m_blockFinishedSignal) {
|
if (!m_blockFinishedSignal) {
|
||||||
emit roleEditingFinished(m_index, m_role, toPlainText());
|
emit roleEditingFinished(m_index, m_role, KIO::encodeFileName(toPlainText()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue