#5692 Select first inserted row after inserting multiple rows in Grid View.

Author: Paweł Salawa

ChangeLog.md

@@ -113,6 +113,7 @@
 - BUGFIX: #5609 Fixed SQL syntax highlighter for multi-line comments with empty linies inside.
 - BUGFIX: #5628 Fixed PDF export bugs (first page size too small, occasional table overlapping, page numbers cut off).
 - BUGFIX: #5691 Fixed tooltip in Database Dialog with Wayland under Linux.
+- BUGFIX: #5692 Select first inserted row after inserting multiple rows in Grid View.
 
 ### 3.4.21
 - ADDED: #5466 Support foreign keys with implicit columns (proper values in FK combobox columns).

Letos/gui/datagrid/sqlquerymodel.cpp

@@ -2017,18 +2017,20 @@ void SqlQueryModel::addNewRow()
     emit commitStatusChanged(true);
 }
 
-void SqlQueryModel::addMultipleRows()
+int SqlQueryModel::addMultipleRows()
 {
     bool ok;
     int rows = QInputDialog::getInt(view, tr("Insert multiple rows"), tr("Number of rows to insert:"), 1, 1, 10000, 1, &ok);
     if (!ok)
-        return;
+        return -1;
 
-    int row = getInsertRowIndex();
+    int initialRow = getInsertRowIndex();
+    int row = initialRow;
     for (int i = 0; i < rows; i++)
         addNewRowInternal(row++);
 
     emit commitStatusChanged(true);
+    return initialRow;
 }
 
 void SqlQueryModel::deleteSelectedRows()

Letos/gui/datagrid/sqlquerymodel.h

@@ -559,7 +559,11 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
         void reload();
         void updateSelectiveCommitRollbackActions(const QItemSelection& selected, const QItemSelection& deselected);
         void addNewRow();
-        void addMultipleRows();
+
+        /**
+         * @return row index of first inserted row
+         */
+        int addMultipleRows();
         void deleteSelectedRows();
         void handlePossibleTableModification(Db* modDb, const QString& database, const QString& objName);
         void handlePossibleTableRename(Db* modDb, const QString& database, const QString& oldName, const QString& newName);

Letos/gui/datagrid/sqlqueryview.cpp

@@ -1149,7 +1149,7 @@ void SqlQueryView::closeEditor(QWidget* editor, QAbstractItemDelegate::EndEditHi
 
 void SqlQueryView::scrollTo(const QModelIndex& index, ScrollHint hint)
 {
-    if (index.column() > 0)
+    if (index.column() >= 0)
         QTableView::scrollTo(index, hint);
 }
 

Letos/gui/dataview.cpp

@@ -1108,7 +1108,8 @@ void DataView::insertMultipleRows()
     if (!model->features().testFlag(SqlQueryModel::INSERT_ROW))
         return;
 
-    model->addMultipleRows();
+    int firstInsertedRow = model->addMultipleRows();
+    gridView->setCurrentRow(firstInsertedRow);
     formView->updateFromGrid();
     updateCurrentFormViewRow();
     formViewFocusFirstEditor();

Letos/gui/uiconfig.h

@@ -162,7 +162,7 @@ CFG_UI_CATEGORIES(Ui,
         CFG_ENTRY(int,                     StatusFieldMsgFadingMode,    Cfg::StatusFieldFadingMode::GRAY_OUT)
         CFG_ENTRY(Cfg::DataEditorsOrder,   DataEditorsOrder,            Cfg::DataEditorsOrder())
         CFG_ENTRY(Cfg::DataRenderers,      DataRenderers,               Cfg::DataRenderers())
-        CFG_ENTRY(bool,                    DataEditAutoAdvanceOnEnter,  false)
+        CFG_ENTRY(bool,                    DataEditAutoAdvanceOnEnter,  true)
         CFG_ENTRY(bool,                    DataEditAutoAdvanceEdit,     false,          CFG_DEP(DataEditAutoAdvanceOnEnter))
         CFG_ENTRY(QString,                 FileDialogLastPath,          QString())
         CFG_ENTRY(int,                     MaxInitialColumnWith,        600)