Added new-undo == delete

src/items/xqitemdelegate.cpp

@@ -28,6 +28,8 @@
 #include <xqviewmodel.h>
 
 
+//! firz
+
 class XQItemEditorFactory : public QItemEditorFactory
 {
 public:
@@ -60,6 +62,7 @@ public:
 };
 
 
+//! firz
 
 XQItemDelegate::XQItemDelegate( XQViewModel& modelView)
     : _modelView{modelView}
@@ -69,6 +72,8 @@ XQItemDelegate::XQItemDelegate( XQViewModel& modelView)
 }
 
 
+//! firz
+
 XQTreeTable* XQItemDelegate::treeTable() const
 {
   return _modelView.treeTable();
@@ -81,6 +86,8 @@ XQItem& XQItemDelegate::xqItemFromIndex( const QModelIndex& index ) const
 }
 
 
+//! firz
+
 void XQItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
   if( !index.isValid() )
@@ -108,12 +115,11 @@ void XQItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option
         break;
   } // switch
 
-
-
   QStyledItemDelegate::paint(painter, option, index);
 
 }
 
+
 //! einen section header im header-style zeichnen
 
 void XQItemDelegate::drawHeaderStyle(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
@@ -149,7 +155,10 @@ void XQItemDelegate::drawHeaderStyle(QPainter* painter, const QStyleOptionViewIt
   }
 }
 
-void XQItemDelegate::drawProgressBarStyle(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+
+//! firz
+
+void XQItemDelegate::drawProgressBarStyle(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
 
   int progress = index.data(XQItem::ContentRole ).toInt();
@@ -167,7 +176,10 @@ void XQItemDelegate::drawProgressBarStyle(QPainter *painter, const QStyleOptionV
 
 }
 
-void XQItemDelegate::drawComboBoxStyle(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+
+//! firz
+
+void XQItemDelegate::drawComboBoxStyle(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
 
   QWidget* srcWidget = qobject_cast<QWidget*>(option.styleObject);
@@ -196,6 +208,8 @@ void XQItemDelegate::drawComboBoxStyle(QPainter *painter, const QStyleOptionView
   painter->restore();
 }
 
+//! firz
+
 void XQItemDelegate::drawSpinBoxStyle(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
 
@@ -213,7 +227,9 @@ void XQItemDelegate::drawSpinBoxStyle(QPainter* painter, const QStyleOptionViewI
 }
 
 
-QSize XQItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+//! firz
+
+QSize XQItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
   return QStyledItemDelegate::sizeHint(option, index);
 }
@@ -238,53 +254,55 @@ QWidget* XQItemDelegate::createEditor(QWidget* parent, const QStyleOptionViewIte
 }
 
 
-//!
+//! Füttert einen editor mit den model-daten
+
 void XQItemDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
 {
 
   XQItem& item = xqItemFromIndex( index );
   XQItem::EditorType edType = item.editorType();
-  if( edType != XQItem::NoEditorType )
+  if( edType == XQItem::NoEditorType )
+    return;
+
+  switch( edType )
   {
-    switch( edType )
+  case XQItemType::ComboBoxType :
+  {
+    QComboBox* comboBox = qobject_cast<QComboBox*>(editor);
+    comboBox->setModel( item.fixedChoices());
+    comboBox->setCurrentText( item.data().toString() );
+    comboBox->showPopup();
+    return;
+  }
+
+  default:
+
+    // wir benutzen hier die DisplayRole wenn der Inhalt schon formatiert ist.
+    int role = item.renderStyle() == XQItem::FormattedStyle ? Qt::DisplayRole : Qt::EditRole;
+    QVariant value = index.data(role);
+
+    QByteArray userProp = editor->metaObject()->userProperty().name();
+    if (!userProp.isEmpty())
     {
-    case XQItemType::ComboBoxType :
-    {
-      QComboBox* comboBox = qobject_cast<QComboBox*>(editor);
-      comboBox->setModel( item.fixedChoices());
-      comboBox->setCurrentText( item.data().toString() );
-      comboBox->showPopup();
-      return;
-    }
-
-    default:
-      //QStyledItemDelegate::setEditorData(editor, index);
-      // wir benutzen hier die DisplayRole wenn der Inhalt schon formatiert ist.
-      int role = item.renderStyle() == XQItem::FormattedStyle ? Qt::DisplayRole : Qt::EditRole;
-      QVariant value = index.data(role);
-
-      QByteArray userProp = editor->metaObject()->userProperty().name();
-      if (!userProp.isEmpty())
-      {
-        if (!value.isValid())
-          value = QVariant(editor->property(userProp).metaType());
-        editor->setProperty(userProp, value);
-      }
-
+      if (!value.isValid())
+        value = QVariant(editor->property(userProp).metaType());
+      editor->setProperty(userProp, value);
     }
 
   }
 
 }
 
-void XQItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
+
+//! Schreibt die daten aus dem editor ins model zurück
+
+void XQItemDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
 
   XQItem& item = xqItemFromIndex( index );
 
   switch( item.editorType()  )
   {
-
     case XQItem::ComboBoxType :
     {
       QComboBox* comboBox = qobject_cast<QComboBox*>(editor);
@@ -299,6 +317,9 @@ void XQItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, co
   QStyledItemDelegate::setModelData(editor, model, index);
 }
 
+
+//! firz
+
 void XQItemDelegate::updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
   //qDebug() << "  --- update Editor Geometry";

src/items/xqitemdelegate.h

@@ -37,19 +37,19 @@ public:
   XQTreeTable* treeTable() const;
   XQItem&     xqItemFromIndex( const QModelIndex& index ) const;
 
-  void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
-  QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
-  QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
-  void setEditorData(QWidget *editor, const QModelIndex &index) const override;
-  void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
-  void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+  void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  void setEditorData(QWidget* editor, const QModelIndex& index) const override;
+  void setModelData(QWidget* editor, QAbstractItemModel *model, const QModelIndex& index) const override;
+  void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
 protected:
 
-  void drawHeaderStyle(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-  void drawProgressBarStyle(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-  void drawComboBoxStyle(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-  void drawSpinBoxStyle(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+  void drawHeaderStyle(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+  void drawProgressBarStyle(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+  void drawComboBoxStyle(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+  void drawSpinBoxStyle(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
 
   XQViewModel& _modelView;