Make setPrimaryKey+setRequired a single action

1 files changed, 8 insertions, 5 deletions

diff --git a/src/items/database/columnlistmodel.cpp b/src/items/database/columnlistmodel.cpp
index 940115f..c826611 100644
--- a/src/items/database/columnlistmodel.cpp
+++ b/src/items/database/columnlistmodel.cpp
@@ -135,13 +135,16 @@ ColumnListModel::setData(const QModelIndex &index, const QVariant &value, int ro
 				goto OK;
 			}
 			if (index.column() == 3) {
-				m_columnList->table()->document()->undoStack()->push(
-					new SetObjectPropertyCommand(column, "primaryKey", checked));
+				QUndoCommand *command;
 				if (!column->isRequired()) {
-					// TODO is there a simple way to group this with the previous command?
-					m_columnList->table()->document()->undoStack()->push(
-						new SetObjectPropertyCommand(column, "required", true));
+					command = new QUndoCommand();
+					(void *)new SetObjectPropertyCommand(column, "primaryKey", checked, command);
+					(void *)new SetObjectPropertyCommand(column, "required", true, command);
+				}
+				else {
+					command = new SetObjectPropertyCommand(column, "primaryKey", checked);
 				}
+				m_columnList->table()->document()->undoStack()->push(command);
 				goto OK;
 			}
 		}