Allow multiline text editing in table editor (ctrl+enter inserts a li…

…ne break)
qgis · Jan 14, 2020 · 979af78 · 979af78
1 parent 60d5e22
commit 979af78
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 10 deletions.
diff --git a/src/gui/tableeditor/qgstableeditorwidget.cpp b/src/gui/tableeditor/qgstableeditorwidget.cpp
@@ -21,7 +21,7 @@
 #include <QKeyEvent>
 #include <QHeaderView>
 #include <QMenu>
-#include <QLineEdit>
+#include <QPlainTextEdit>
 
 QgsTableEditorWidget::QgsTableEditorWidget( QWidget *parent )
   : QTableWidget( parent )
@@ -875,36 +875,71 @@ void QgsTableEditorWidget::setSelectionColumnWidth( double width )
 }
 
 /// @cond PRIVATE
+
+QgsTableEditorTextEdit::QgsTableEditorTextEdit( QWidget *parent )
+  : QPlainTextEdit( parent )
+{
+  // narrower default margins
+  document()->setDocumentMargin( document()->documentMargin() / 2 );
+}
+
+void QgsTableEditorTextEdit::keyPressEvent( QKeyEvent *event )
+{
+  switch ( event->key() )
+  {
+    case Qt::Key_Enter:
+    case Qt::Key_Return:
+    {
+      if ( event->modifiers() & Qt::ControlModifier )
+      {
+        // ctrl+enter inserts a line break
+        insertPlainText( QString( '\n' ) );
+      }
+      else
+      {
+        // closes editor
+        event->ignore();
+      }
+      break;
+    }
+
+    default:
+      QPlainTextEdit::keyPressEvent( event );
+  }
+}
+
+
 QgsTableEditorDelegate::QgsTableEditorDelegate( QObject *parent )
   : QStyledItemDelegate( parent )
 {
 
 }
 
-QWidget *QgsTableEditorDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &index ) const
+QWidget *QgsTableEditorDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem &, const QModelIndex & ) const
 {
-  QLineEdit *w = new QLineEdit( parent ); \
-  w->setText( index.model()->data( index, Qt::EditRole ).toString() );
+  QgsTableEditorTextEdit *w = new QgsTableEditorTextEdit( parent );
   return w;
 }
 
 void QgsTableEditorDelegate::setEditorData( QWidget *editor, const QModelIndex &index ) const
 {
   QVariant value = index.model()->data( index, Qt::EditRole );
-  if ( QLineEdit *lineEdit = qobject_cast<QLineEdit * >( editor ) )
+  if ( QgsTableEditorTextEdit *lineEdit = qobject_cast<QgsTableEditorTextEdit * >( editor ) )
   {
-    lineEdit->setText( value.toString() );
+    lineEdit->setPlainText( value.toString() );
+    lineEdit->selectAll();
   }
 }
 
 void QgsTableEditorDelegate::setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const
 {
-  if ( QLineEdit *lineEdit = qobject_cast<QLineEdit * >( editor ) )
+  if ( QgsTableEditorTextEdit *lineEdit = qobject_cast<QgsTableEditorTextEdit * >( editor ) )
   {
-    model->setData( index, lineEdit->text(), Qt::EditRole );
-    model->setData( index, lineEdit->text(), Qt::DisplayRole );
+    model->setData( index, lineEdit->toPlainText(), Qt::EditRole );
+    model->setData( index, lineEdit->toPlainText(), Qt::DisplayRole );
   }
 }
 
 
 ///@endcond
+
diff --git a/src/gui/tableeditor/qgstableeditorwidget.h b/src/gui/tableeditor/qgstableeditorwidget.h
@@ -21,12 +21,25 @@
 #include "qgis_gui.h"
 #include "qgstablecell.h"
 #include <QTableWidget>
+#include <QPlainTextEdit>
 #include <QStyledItemDelegate>
 
 
 #ifndef SIP_RUN
 ///@cond PRIVATE
-///
+
+class QgsTableEditorTextEdit : public QPlainTextEdit
+{
+    Q_OBJECT
+  public:
+    QgsTableEditorTextEdit( QWidget *parent );
+
+  protected:
+
+    void keyPressEvent( QKeyEvent *e ) override;
+
+};
+
 class QgsTableEditorDelegate : public QStyledItemDelegate
 {
     Q_OBJECT