Merge branch 'feature/UndoRedoWithModelData' into develop

dialogs/abstractdialog.cpp

@@ -0,0 +1,51 @@
+#include "abstractdialog.h"
+
+#include <QDialogButtonBox>
+#include <QGuiApplication>
+#include <QLabel>
+#include <QScreen>
+#include <QVBoxLayout>
+
+AbstractDialog::AbstractDialog(QWidget* parent)
+    : QDialog(parent) {
+  setWindowTitle(tr("Dialog does what?..."));
+  setModal(true);
+
+  m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+  connect(m_buttonBox, &QDialogButtonBox::accepted, this, &AbstractDialog::accept);
+  connect(m_buttonBox, &QDialogButtonBox::rejected, this, &AbstractDialog::reject);
+
+  m_contentContainer = new QLabel("content", this);
+
+  m_outerLayout = new QVBoxLayout;
+  m_outerLayout->addWidget(m_contentContainer);
+  m_outerLayout->addWidget(m_buttonBox);
+
+  setLayout(m_outerLayout);
+}
+
+void AbstractDialog::show() {
+  centerInParent();
+  QWidget::show();
+}
+
+void AbstractDialog::accept() { QDialog::accept(); }
+
+void AbstractDialog::reject() { QDialog::reject(); }
+
+void AbstractDialog::centerInParent() {
+  // BUG the centering in the parent doesn't work the first time (and the later ones seem off too)
+  QWidget* parent = parentWidget();
+
+  if (parent) {
+    auto parentRect = parent->geometry();
+    move(parentRect.center() - rect().center());
+  } else {
+    QRect screenGeometry = QGuiApplication::screens().at(0)->geometry();
+    int x                = (screenGeometry.width() - width()) / 2;
+    int y                = (screenGeometry.height() - height()) / 2;
+    move(x, y);
+  }
+}
+
+void AbstractDialog::closeEvent(QCloseEvent* event) { QWidget::closeEvent(event); }

dialogs/abstractdialog.h

@@ -0,0 +1,33 @@
+#ifndef ABSTRACTDIALOG_H
+#define ABSTRACTDIALOG_H
+
+#include <QDialog>
+
+class QGridLayout;
+class QDialogButtonBox;
+class QVBoxLayout;
+
+class AbstractDialog : public QDialog {
+  Q_OBJECT
+ public:
+  AbstractDialog(QWidget* parent = nullptr);
+  virtual void createContent() = 0;
+
+  /// QDialog interface
+ public slots:
+  void show();
+  void accept() override;
+  void reject() override;
+
+ protected:
+  void centerInParent();
+
+ protected:
+  QWidget* m_contentContainer;
+  QVBoxLayout* m_outerLayout;
+  QDialogButtonBox* m_buttonBox = nullptr;
+
+  void closeEvent(QCloseEvent* event) override;
+};
+
+#endif  // ABSTRACTDIALOG_H

dialogs/edititemdialog.cpp

@@ -0,0 +1,33 @@
+#include "edititemdialog.h"
+
+#include <QVBoxLayout>
+
+#include "../views/itemdetailmapper.h"
+
+EditItemDialog::EditItemDialog(QTableView* tableView, QWidget* parent)
+    : AbstractDialog(parent)
+    , m_tableView(tableView) {}
+
+void EditItemDialog::createContent() {
+  if (m_contentContainer) {
+    delete m_contentContainer;
+  }
+
+  setWindowTitle(tr("Edit item..."));
+
+  m_detailMapper = new ItemDetailMapper(this);
+  m_detailMapper->setModelMappings(m_tableView);
+  m_contentContainer = m_detailMapper;
+
+  m_outerLayout->insertWidget(0, m_contentContainer);
+}
+
+void EditItemDialog::accept() {
+  m_detailMapper->submit();
+  QDialog::accept();
+}
+
+void EditItemDialog::reject() {
+  m_detailMapper->revert();
+  QDialog::reject();
+}

dialogs/edititemdialog.h

@@ -0,0 +1,46 @@
+#ifndef EDITITEMDIALOG_H
+#define EDITITEMDIALOG_H
+
+#include "abstractdialog.h"
+
+class QDoubleSpinBox;
+class QLineEdit;
+class QSpinBox;
+class QLabel;
+class QTableView;
+
+class ItemDetailMapper;
+
+class EditItemDialog : public AbstractDialog {
+  Q_OBJECT
+ public:
+  EditItemDialog(QTableView* tableView, QWidget* parent = nullptr);
+
+  /// AbstractDialog interface
+  void createContent() override;
+
+ public slots:
+  void accept() override;
+  void reject() override;
+
+ private:
+  QTableView* m_tableView = nullptr;
+  ItemDetailMapper* m_detailMapper;
+
+  QLabel* m_nameLabel   = nullptr;
+  QLineEdit* m_nameEdit = nullptr;
+
+  QLabel* m_descriptionLabel   = nullptr;
+  QLineEdit* m_descriptionEdit = nullptr;
+
+  QLabel* m_infoLabel   = nullptr;
+  QLineEdit* m_infoEdit = nullptr;
+
+  QLabel* m_amountLabel = nullptr;
+  QSpinBox* m_amountBox = nullptr;
+
+  QLabel* m_factorLabel       = nullptr;
+  QDoubleSpinBox* m_factorBox = nullptr;
+};
+
+#endif  // EDITITEMDIALOG_H

dialogs/newitemdialog.cpp

@@ -0,0 +1,80 @@
+#include "newitemdialog.h"
+
+#include <QGridLayout>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
+
+#include <model/tablemodel.h>
+
+NewItemDialog::NewItemDialog(QWidget* parent)
+    : AbstractDialog(parent) {}
+
+void NewItemDialog::createContent() {
+  if (m_contentContainer) {
+    delete m_contentContainer;
+  }
+
+  setWindowTitle(tr("New item..."));
+
+  m_contentContainer = new QWidget(this);
+
+  // REFACTOR deduce label names and types from meta data & use a factory
+  m_nameLabel = new QLabel("&Name");
+  m_nameEdit  = new QLineEdit();
+  m_nameLabel->setBuddy(m_nameEdit);
+
+  m_descriptionLabel = new QLabel("&Description");
+  m_descriptionEdit  = new QLineEdit();
+  m_descriptionLabel->setBuddy(m_descriptionEdit);
+
+  m_infoLabel = new QLabel("&Info");
+  m_infoEdit  = new QLineEdit();
+  m_infoLabel->setBuddy(m_infoEdit);
+
+  m_amountLabel = new QLabel("&Amount");
+  m_amountBox   = new QSpinBox();
+  m_amountBox->setMaximum(1000);
+  m_amountLabel->setBuddy(m_amountBox);
+
+  m_factorLabel = new QLabel("&Factor");
+  m_factorBox   = new QDoubleSpinBox();
+  m_factorBox->setMaximum(1000);
+  m_factorLabel->setBuddy(m_factorBox);
+
+  QGridLayout* layout = new QGridLayout();
+  layout->addWidget(m_nameLabel, 0, 0, 1, 1);
+  layout->addWidget(m_nameEdit, 0, 1, 1, 1);
+  layout->addWidget(m_descriptionLabel, 1, 0, 1, 1);
+  layout->addWidget(m_descriptionEdit, 1, 1, 1, 1);
+  layout->addWidget(m_infoLabel, 2, 0, 1, 1);
+  layout->addWidget(m_infoEdit, 2, 1, 1, 1);
+  layout->addWidget(m_amountLabel, 3, 0, 1, 1);
+  layout->addWidget(m_amountBox, 3, 1, 1, 1);
+  layout->addWidget(m_factorLabel, 4, 0, 1, 1);
+  layout->addWidget(m_factorBox, 4, 1, 1, 1);
+
+  m_contentContainer->setLayout(layout);
+
+  m_outerLayout->insertWidget(0, m_contentContainer);
+}
+
+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());
+
+  QJsonDocument jsonDoc;
+  QJsonArray itemArray;
+  itemArray.append(itemObject);
+  jsonDoc.setArray(itemArray);
+  emit addItems(jsonDoc.toJson(QJsonDocument::Compact));
+
+  // resetContent();
+  AbstractDialog::accept();
+}

dialogs/newitemdialog.h

@@ -0,0 +1,43 @@
+#ifndef NEWITEMDIALOG_H
+#define NEWITEMDIALOG_H
+
+#include "abstractdialog.h"
+
+class QDoubleSpinBox;
+class QLineEdit;
+class QSpinBox;
+class QLabel;
+
+class NewItemDialog : public AbstractDialog {
+  Q_OBJECT
+
+ public:
+  NewItemDialog(QWidget* parent = nullptr);
+
+  void createContent() override;
+
+ signals:
+  void addItems(const QByteArray& jsonDoc);
+
+ public slots:
+  void accept() override;
+  // void reject() override;
+
+ private:
+  QLabel* m_nameLabel   = nullptr;
+  QLineEdit* m_nameEdit = nullptr;
+
+  QLabel* m_descriptionLabel   = nullptr;
+  QLineEdit* m_descriptionEdit = nullptr;
+
+  QLabel* m_infoLabel   = nullptr;
+  QLineEdit* m_infoEdit = nullptr;
+
+  QLabel* m_amountLabel = nullptr;
+  QSpinBox* m_amountBox = nullptr;
+
+  QLabel* m_factorLabel       = nullptr;
+  QDoubleSpinBox* m_factorBox = nullptr;
+};
+
+#endif  // NEWITEMDIALOG_H