Fixed issue #50.

--HG--
branch : develop

src/dialogs/dialogincrements.cpp

@@ -29,6 +29,7 @@
 #include "dialogincrements.h"
 #include "ui_dialogincrements.h"
 #include "../widgets/doubledelegate.h"
+#include "../widgets/textdelegate.h"
 #include "../exception/vexception.h"
 
 #include <QPushButton>
@@ -37,10 +38,15 @@ DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget
     :DialogTool(data, parent), ui(new Ui::DialogIncrements), data(data), doc(doc), row(0), column(0)
 {
     ui->setupUi(this);
+    TextDelegate *textDelegate = new TextDelegate(ui->tableWidgetIncrement);
+    Q_CHECK_PTR(textDelegate);
+    ui->tableWidgetIncrement->setItemDelegateForColumn(0, textDelegate);
     DoubleSpinBoxDelegate *doubleDelegate = new DoubleSpinBoxDelegate(ui->tableWidgetIncrement);
+    Q_CHECK_PTR(doubleDelegate);
     ui->tableWidgetIncrement->setItemDelegateForColumn(2, doubleDelegate);
     ui->tableWidgetIncrement->setItemDelegateForColumn(3, doubleDelegate);
     ui->tableWidgetIncrement->setItemDelegateForColumn(4, doubleDelegate);
+
     FillStandardTable();
     FillIncrementTable();
     FillLengthLines();

src/widgets/doubledelegate.h

@@ -32,8 +32,8 @@
 #include <QItemDelegate>
 
 /**
- * @brief The DoubleSpinBoxDelegate class a delegate that allows the user to change integer values from the model
+ * @brief The DoubleSpinBoxDelegate class a delegate that allows the user to change double values from the model
- * using a spin box widget.
+ * using a double spin box widget.
  */
 class DoubleSpinBoxDelegate : public QItemDelegate
 {

src/widgets/textdelegate.cpp

@@ -0,0 +1,108 @@
+/************************************************************************
+ **
+ **  @file   textdelegate.cpp
+ **  @author Roman Telezhinsky <dismine@gmail.com>
+ **  @date   29 1, 2014
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2013 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "textdelegate.h"
+
+#include <QLineEdit>
+
+TextDelegate::TextDelegate(QObject *parent): QItemDelegate(parent), lastText(QString("Name_"))
+{
+    //Little hack. Help save lineedit text in const method.
+    connect(this, &TextDelegate::SaveText, this, &TextDelegate::InitText);
+}
+
+QWidget *TextDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    Q_UNUSED(option);
+    Q_UNUSED(index);
+    QLineEdit *editor = new QLineEdit(parent);
+    Q_CHECK_PTR(editor);
+    QRegExp re("^(([^+ -/()\\^*%:;\"\'=.,><0-9]){1,1}[^+ -/()\\^*%:;\"\'=><]([0-9]){0,}){0,}$");
+    QRegExpValidator *v = new QRegExpValidator(re);
+    Q_CHECK_PTR(v);
+    editor->setValidator( v );
+    connect(editor, &QLineEdit::editingFinished, this, &TextDelegate::commitAndCloseEditor);
+    return editor;
+}
+
+void TextDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
+{
+    QString text = index.model()->data(index, Qt::EditRole).toString();
+
+    QLineEdit *lineEdit = qobject_cast<QLineEdit*>(editor);
+    Q_CHECK_PTR(lineEdit);
+    if ( lastText != text && text.isEmpty() == false)
+    {
+        //Here need save text, but method is const, so, we use signal instead.
+        emit SaveText(text);
+    }
+    lineEdit->setText(text);
+}
+
+void TextDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
+{
+    QLineEdit *lineEdit = qobject_cast<QLineEdit*>(editor);
+    Q_CHECK_PTR(lineEdit);
+    QString text = lineEdit->text();
+    if(text.isEmpty())
+    {
+        text = lastText;
+    }
+
+    model->setData(index, text, Qt::EditRole);
+}
+
+void TextDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
+                                        const QModelIndex &index) const
+{
+    Q_UNUSED(index)
+    editor->setGeometry(option.rect);
+}
+
+void TextDelegate::commitAndCloseEditor()
+{
+    QLineEdit *lineEdit = qobject_cast<QLineEdit*>(sender());
+    Q_CHECK_PTR(lineEdit);
+    QString text = lineEdit->text();
+    if ( lastText != text && text.isEmpty() == false)
+    {
+        lastText = text;
+        emit commitData(lineEdit);
+    }
+    else if(text.isEmpty() == false)
+    {
+        lineEdit->setText(lastText);
+        emit commitData(lineEdit);
+    }
+    emit closeEditor(lineEdit);
+}
+
+void TextDelegate::InitText(const QString &text)
+{
+    lastText = text;
+}

src/widgets/textdelegate.h

@@ -0,0 +1,101 @@
+/************************************************************************
+ **
+ **  @file   textdelegate.h
+ **  @author Roman Telezhinsky <dismine@gmail.com>
+ **  @date   29 1, 2014
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2013 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef TEXTDELEGATE_H
+#define TEXTDELEGATE_H
+
+#include <QItemDelegate>
+
+/**
+ * @brief The TextDelegate class a delegate that allows the user to change text values from the model
+ * using a edit line widget.
+ */
+class TextDelegate : public QItemDelegate
+{
+    Q_OBJECT
+public:
+    /**
+     * @brief TextDelegate constructor.
+     * @param parent parent widget.
+     */
+    explicit TextDelegate(QObject *parent = 0);
+    /**
+     * @brief createEditorReturns the widget used to edit the item specified by index for editing. The parent widget and
+     * style option are used to control how the editor widget appears.
+     * @param parent parent widget.
+     * @param option item options.
+     * @param index index of data item.
+     * @return editor to be used for editing the data item.
+     */
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    /**
+     * @brief setEditorData sets the data to be displayed and edited by the editor from the data model item specified by
+     * the model index.
+     * @param editor editor.
+     * @param index index of data item.
+     */
+    void    setEditorData(QWidget *editor, const QModelIndex &index) const;
+    /**
+     * @brief setModelData gets data from the editor widget and stores it in the specified model at the item index.
+     * @param editor editor.
+     * @param model model.
+     * @param index index of data item.
+     */
+    void    setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
+    /**
+     * @brief updateEditorGeometry updates the editor for the item specified by index according to the style option
+     * given.
+     * @param editor editor.
+     * @param option item options.
+     * @param index index of data item.
+     */
+    void    updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+signals:
+    /**
+     * @brief SaveText help save text value of lineedit.
+     * @param text text.
+     */
+    void    SaveText(const QString &text) const;
+public slots:
+    /**
+     * @brief commitAndCloseEditor commit value if changed.
+     */
+    void    commitAndCloseEditor();
+    /**
+     * @brief InitText initialize text.
+     * @param text text.
+     */
+    void    InitText(const QString &text);
+private:
+    /**
+     * @brief lastValue last saved value.
+     */
+     QString lastText;
+};
+
+#endif // TEXTDELEGATE_H

src/widgets/widgets.pri

@@ -9,7 +9,8 @@ HEADERS += \
     src/widgets/doubledelegate.h \
     src/widgets/vsimplespline.h \
     src/widgets/vsimplesplinepath.h \
-    src/widgets/vsimplearc.h
+    src/widgets/vsimplearc.h \
+    src/widgets/textdelegate.h
 
 SOURCES += \
     src/widgets/vtablegraphicsview.cpp \
@@ -22,4 +23,5 @@ SOURCES += \
     src/widgets/doubledelegate.cpp \
     src/widgets/vsimplespline.cpp \
     src/widgets/vsimplesplinepath.cpp \
-    src/widgets/vsimplearc.cpp
+    src/widgets/vsimplearc.cpp \
+    src/widgets/textdelegate.cpp