Merge remote-tracking branch 'origin/KDE/4.10'

[dolphin.git] / src / kitemviews / private / kitemlistroleeditor.cpp

diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index 594b05338ffa5dfe1ba478666694578a855c455e..9f20afea24e81d2b89d3ed37baa067181721b16f 100644 (file)
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -20,16 +20,18 @@
 #include "kitemlistroleeditor.h"
 
 #include <KDebug>
+#include <kio/global.h>
 #include <QKeyEvent>
 
 KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
     KTextEdit(parent),
-    m_index(0),
-    m_role()
+    m_role(),
+    m_blockFinishedSignal(false)
 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setAcceptRichText(false);
+    enableFindReplace(false);
     document()->setDocumentMargin(0);
 
     if (parent) {
@@ -43,16 +45,6 @@ KItemListRoleEditor::~KItemListRoleEditor()
 {
 }
 
-void KItemListRoleEditor::setIndex(int index)
-{
-    m_index = index;
-}
-
-int KItemListRoleEditor::index() const
-{
-    return m_index;
-}
-
 void KItemListRoleEditor::setRole(const QByteArray& role)
 {
     m_role = role;
@@ -66,7 +58,7 @@ QByteArray KItemListRoleEditor::role() const
 bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
 {
     if (watched == parentWidget() && event->type() == QEvent::Resize) {
-        emit roleEditingFinished(m_index, m_role, toPlainText());
+        emitRoleEditingFinished();
     }
 
     return KTextEdit::eventFilter(watched, event);
@@ -77,7 +69,7 @@ bool KItemListRoleEditor::event(QEvent* event)
     if (event->type() == QEvent::FocusOut) {
         QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
         if (focusEvent->reason() != Qt::PopupFocusReason) {
-            emit roleEditingFinished(m_index, m_role, toPlainText());
+            emitRoleEditingFinished();
         }
     }
     return KTextEdit::event(event);
@@ -87,12 +79,18 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
 {
     switch (event->key()) {
     case Qt::Key_Escape:
-        emit roleEditingCanceled(m_index, m_role, toPlainText());
+        // Emitting the signal roleEditingCanceled might result
+        // in losing the focus. Per default losing the focus emits
+        // a roleEditingFinished signal (see KItemListRoleEditor::event),
+        // which is not wanted in this case.
+        m_blockFinishedSignal = true;
+        emit roleEditingCanceled(m_role, KIO::encodeFileName(toPlainText()));
+        m_blockFinishedSignal = false;
         event->accept();
         return;
     case Qt::Key_Enter:
     case Qt::Key_Return:
-        emit roleEditingFinished(m_index, m_role, toPlainText());
+        emitRoleEditingFinished();
         event->accept();
         return;
     default:
@@ -127,4 +125,11 @@ void KItemListRoleEditor::autoAdjustSize()
     }
 }
 
+void KItemListRoleEditor::emitRoleEditingFinished()
+{
+    if (!m_blockFinishedSignal) {
+        emit roleEditingFinished(m_role, KIO::encodeFileName(toPlainText()));
+    }
+}
+
 #include "kitemlistroleeditor.moc"