Changing submit policy of QDataWidgetMapper to AutoSubmit because if multiple changes are made at once not all of them are applied.

dialogs/abstractdialog.cpp

@@ -6,12 +6,12 @@
 #include <QScreen>
 #include <QVBoxLayout>
 
-AbstractDialog::AbstractDialog(QWidget* parent)
+AbstractDialog::AbstractDialog(QDialogButtonBox::StandardButtons buttons, QWidget* parent)
     : QDialog(parent) {
   setWindowTitle(tr("Dialog does what?..."));
   setModal(true);
 
-  m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+  m_buttonBox = new QDialogButtonBox(buttons, this);
   connect(m_buttonBox, &QDialogButtonBox::accepted, this, &AbstractDialog::accept);
   connect(m_buttonBox, &QDialogButtonBox::rejected, this, &AbstractDialog::reject);
 

dialogs/abstractdialog.h

@@ -2,15 +2,15 @@
 #define ABSTRACTDIALOG_H
 
 #include <QDialog>
+#include <QDialogButtonBox>
 
 class QGridLayout;
-class QDialogButtonBox;
 class QVBoxLayout;
 
 class AbstractDialog : public QDialog {
   Q_OBJECT
  public:
-  AbstractDialog(QWidget* parent = nullptr);
+  AbstractDialog(QDialogButtonBox::StandardButtons buttons, QWidget* parent = nullptr);
   virtual void createContent() = 0;
 
   /// QDialog interface

dialogs/edititemdialog.cpp

@@ -1,11 +1,12 @@
 #include "edititemdialog.h"
 
+#include <QDialogButtonBox>
 #include <QVBoxLayout>
 
 #include "../views/itemdetailmapper.h"
 
 EditItemDialog::EditItemDialog(QTableView* tableView, QWidget* parent)
-    : AbstractDialog(parent)
+    : AbstractDialog(QDialogButtonBox::Close, parent)
     , m_tableView(tableView) {}
 
 void EditItemDialog::createContent() {

dialogs/newitemdialog.cpp

@@ -6,11 +6,11 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QSpinBox>
-
-#include <model/tablemodel.h>
+#include "formats/jsonparser.h"
+#include "model/metadata.h"
 
 NewItemDialog::NewItemDialog(QWidget* parent)
-    : AbstractDialog(parent) {}
+    : AbstractDialog(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, parent) {}
 
 void NewItemDialog::createContent() {
   if (m_contentContainer) {
@@ -21,7 +21,9 @@ void NewItemDialog::createContent() {
 
   m_contentContainer = new QWidget(this);
 
-  // REFACTOR deduce label names and types from meta data & use a factory
+  // REFACTOR use a data structure for input widgets which can be iterated through
+  //        using a factory which iterates through the roles from metadata.h
+  //        and create the input widgets based on the data type of this role
   m_nameLabel = new QLabel("&Name");
   m_nameEdit  = new QLineEdit();
   m_nameLabel->setBuddy(m_nameEdit);
@@ -62,18 +64,17 @@ void NewItemDialog::createContent() {
 }
 
 void NewItemDialog::accept() {
-  QJsonObject itemObject;
-  itemObject.insert("Name", m_nameEdit->text());
-  itemObject.insert("Description", m_descriptionEdit->text());
-  itemObject.insert("Info", m_infoEdit->text());
-  itemObject.insert("Amount", m_amountBox->value());
-  itemObject.insert("Factor", m_factorBox->value());
+  QHash<int, QVariant> itemValues;
+  // TODO (after refactoring data structure for input widgets) use iteration through the relevant
+  //    roles and their input widgets
+  itemValues.insert(NameRole, m_nameEdit->text());
+  itemValues.insert(DescriptionRole, m_descriptionEdit->text());
+  itemValues.insert(InfoRole, m_infoEdit->text());
+  itemValues.insert(AmountRole, m_amountBox->value());
+  itemValues.insert(FactorRole, m_factorBox->value());
 
-  QJsonDocument jsonDoc;
-  QJsonArray itemArray;
-  itemArray.append(itemObject);
-  jsonDoc.setArray(itemArray);
-  emit addItems(jsonDoc.toJson(QJsonDocument::Compact));
+  const QByteArray jsonDoc = JsonParser::itemValuesListToJson({itemValues}, ITEM_KEY_STRING);
+  emit addItems(jsonDoc);
 
   // resetContent();
   AbstractDialog::accept();

mainwindow.cpp

@@ -329,10 +329,6 @@ void MainWindow::createUndoActions() {
   //  connect(m_showUndoViewAction, &QAction::toggled, this, &MainWindow::onShowUndoViewToggled);
   connect(m_showModelUndoViewAct.get(), &QAction::triggered, this,
           &MainWindow::onShowUndoViewToggled);
-
-  // TODO ? add a keyboard short cut?
-  //  m_showUndoViewAction->setShortcuts(QKeySequence::Copy);
-
   ui->menu_View->addAction(m_showModelUndoViewAct.get());
 }
 

views/itemdetailmapper.cpp

@@ -15,7 +15,14 @@ ItemDetailMapper::ItemDetailMapper(QWidget* parent)
     : QWidget{parent} {
   /// model mapping
   m_mapper = std::make_unique<QDataWidgetMapper>(this);
-  m_mapper->setSubmitPolicy(QDataWidgetMapper::ManualSubmit);
+  /// BUG: If multiple columns are changed not all changes are applied.
+  ///     Multiple changes are set individually by calling setData().
+  ///     Probably due to a conflicting dataChanged signal for too many roles&columns the data of
+  ///     the remaining columns is reset before setData is called.
+  ///     And a manual submit would also create multiple undo steps anyway.
+  /// Workaround: ManualSubmit -> AutoSubmit
+  // m_mapper->setSubmitPolicy(QDataWidgetMapper::ManualSubmit);
+  m_mapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
 
   /// model mapping buttons
   m_nextButton     = new QPushButton(tr("Ne&xt"));