[Places Panel] Make use of KFilePlacesView::dragAutoActivationDelay

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

diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index 75fd6a0c799936897ff64a438e1074fd81f118a6..993c6893a98fab7ed83aaf689157062841626a92 100644 (file)
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -40,6 +40,11 @@ QByteArray KItemListRoleEditor::role() const
     return m_role;
 }
 
     return m_role;
 }
 

+void KItemListRoleEditor::setAllowUpDownKeyChainEdit(bool allowChainEdit)
+{
+    m_allowUpDownKeyChainEdit = allowChainEdit;
+}
+

 bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
 {
     if (watched == parentWidget() && event->type() == QEvent::Resize) {
 bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
 {
     if (watched == parentWidget() && event->type() == QEvent::Resize) {


@@ -69,7 +74,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
         // a roleEditingFinished signal (see KItemListRoleEditor::event),
         // which is not wanted in this case.
         m_blockFinishedSignal = true;
         // a roleEditingFinished signal (see KItemListRoleEditor::event),
         // which is not wanted in this case.
         m_blockFinishedSignal = true;

-        emit roleEditingCanceled(m_role, KIO::encodeFileName(toPlainText()));
+        Q_EMIT roleEditingCanceled(m_role, KIO::encodeFileName(toPlainText()));

         m_blockFinishedSignal = false;
         event->accept();
         return;
         m_blockFinishedSignal = false;
         event->accept();
         return;


@@ -78,6 +83,22 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
         emitRoleEditingFinished();
         event->accept();
         return;
         emitRoleEditingFinished();
         event->accept();
         return;

+    case Qt::Key_Tab:
+    case Qt::Key_Down:
+        if (m_allowUpDownKeyChainEdit || event->key() == Qt::Key_Tab) {
+            emitRoleEditingFinished(EditNext);
+            event->accept();
+            return;
+        }
+        break;
+    case Qt::Key_Backtab:
+    case Qt::Key_Up:
+        if (m_allowUpDownKeyChainEdit || event->key() == Qt::Key_Backtab) {
+            emitRoleEditingFinished(EditPrevious);
+            event->accept();
+            return;
+        }
+        break;

     case Qt::Key_Left:
     case Qt::Key_Right: {
         QTextCursor cursor = textCursor();
     case Qt::Key_Left:
     case Qt::Key_Right: {
         QTextCursor cursor = textCursor();


@@ -143,10 +164,13 @@ void KItemListRoleEditor::autoAdjustSize()
     }
 }
 
     }
 }
 

-void KItemListRoleEditor::emitRoleEditingFinished()
+void KItemListRoleEditor::emitRoleEditingFinished(EditResultDirection direction)

 {
 {

+    QVariant ret;
+    ret.setValue(EditResult {KIO::encodeFileName(toPlainText()), direction});
+

     if (!m_blockFinishedSignal) {
     if (!m_blockFinishedSignal) {

-        emit roleEditingFinished(m_role, KIO::encodeFileName(toPlainText()));
+        Q_EMIT roleEditingFinished(m_role, ret);

     }
 }
 
     }
 }