diff --git a/src/app/valentina/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui
index bab0fa5e3..93b8fa22f 100644
--- a/src/app/valentina/dialogs/dialogpatternproperties.ui
+++ b/src/app/valentina/dialogs/dialogpatternproperties.ui
@@ -14,18 +14,18 @@
Pattern properties
-
+
:/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png
-
- 4
+ 0
- Description
+ Pattern
-
@@ -85,7 +85,7 @@
-
- Author name
+ Author:
@@ -183,7 +183,7 @@
-
- For technical notes.
+ For technical notes
@@ -1205,83 +1205,131 @@
- General info
+ Label data
-
+
-
-
-
-
-
+
+
-
+
- Pattern name:
+ Label:
- -
-
-
- 30
+
-
+
+
+ Edit pattern label
-
-
- -
-
- Pattern number:
+ Edit label
- -
-
-
- 30
+
-
+
+
+ Qt::Horizontal
-
-
- -
-
-
- Company/Designer name:
+
+
+ 40
+ 20
+
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- Customer name:
-
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- Pattern size:
-
-
-
- -
-
-
- 40
-
-
+
+ -
+
+
+
+ 0
+ 1
+
+
+
+ Label data
+
+
+
+ QFormLayout::AllNonFixedFieldsGrow
+
+
-
+
+
+ Pattern name:
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ Pattern number:
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ Company/Designer name:
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ Customer name:
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ Pattern size:
+
+
+
+ -
+
+
+ 40
+
+
+
+
+
+
-
@@ -1298,269 +1346,6 @@
-
-
- Pattern label data
-
-
- -
-
-
-
-
-
- Clear current and begin new label
-
-
- ...
-
-
-
-
-
-
- 24
- 24
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Import from label template
-
-
- ...
-
-
-
-
-
-
- 24
- 24
-
-
-
-
- -
-
-
- Export label as template
-
-
- ...
-
-
-
-
-
-
- 24
- 24
-
-
-
-
-
-
- -
-
-
-
- 0
- 1
-
-
-
- QAbstractItemView::InternalMove
-
-
-
- -
-
-
-
-
-
- 6
-
-
-
-
-
- Bold
-
-
- ...
-
-
-
-
-
- true
-
-
-
- -
-
-
- Italic
-
-
- ...
-
-
-
-
-
- true
-
-
-
- -
-
-
- Aligns with the left edge
-
-
- ...
-
-
-
-
-
- true
-
-
-
- -
-
-
- Centers horizontally in the available space
-
-
- ...
-
-
-
-
-
- true
-
-
-
- -
-
-
- Aligns with the right edge
-
-
- ...
-
-
-
-
-
- true
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 20
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- ...
-
-
-
- ..
-
-
-
- -
-
-
- false
-
-
- ...
-
-
-
- ..
-
-
-
-
-
- -
-
-
- Text:
-
-
-
- -
-
-
-
-
-
- true
-
-
- Line of text
-
-
- true
-
-
-
- -
-
-
- Insert placeholders
-
-
- Insert...
-
-
-
-
-
-
-
-
-
-
@@ -1575,9 +1360,7 @@
-
-
-
+
buttonBox
diff --git a/src/libs/vtools/dialogs/dialogs.pri b/src/libs/vtools/dialogs/dialogs.pri
index 8678e3bfb..5d2fad588 100644
--- a/src/libs/vtools/dialogs/dialogs.pri
+++ b/src/libs/vtools/dialogs/dialogs.pri
@@ -45,7 +45,8 @@ HEADERS += \
$$PWD/tools/piece/dialogseamallowance.h \
$$PWD/tools/piece/dialogpiecepath.h \
$$PWD/tools/dialogpin.h \
- $$PWD/tools/dialoginsertnode.h
+ $$PWD/tools/dialoginsertnode.h \
+ $$PWD/support/dialogeditlabel.h
SOURCES += \
$$PWD/tools/dialogalongline.cpp \
@@ -90,7 +91,8 @@ SOURCES += \
$$PWD/tools/piece/dialogseamallowance.cpp \
$$PWD/tools/piece/dialogpiecepath.cpp \
$$PWD/tools/dialogpin.cpp \
- $$PWD/tools/dialoginsertnode.cpp
+ $$PWD/tools/dialoginsertnode.cpp \
+ $$PWD/support/dialogeditlabel.cpp
FORMS += \
$$PWD/tools/dialogalongline.ui \
@@ -139,4 +141,5 @@ FORMS += \
$$PWD/tools/piece/tabs/tabgrainline.ui \
$$PWD/tools/piece/tabs/tabpins.ui \
$$PWD/tools/dialoginsertnode.ui \
- $$PWD/tools/piece/tabs/tabpassmarks.ui
+ $$PWD/tools/piece/tabs/tabpassmarks.ui \
+ $$PWD/support/dialogeditlabel.ui
diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
new file mode 100644
index 000000000..fcee126b6
--- /dev/null
+++ b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
@@ -0,0 +1,14 @@
+#include "dialogeditlabel.h"
+#include "ui_dialogeditlabel.h"
+
+DialogEditLabel::DialogEditLabel(QWidget *parent) :
+ QDialog(parent),
+ ui(new Ui::DialogEditLabel)
+{
+ ui->setupUi(this);
+}
+
+DialogEditLabel::~DialogEditLabel()
+{
+ delete ui;
+}
diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.h b/src/libs/vtools/dialogs/support/dialogeditlabel.h
new file mode 100644
index 000000000..27222cd3b
--- /dev/null
+++ b/src/libs/vtools/dialogs/support/dialogeditlabel.h
@@ -0,0 +1,22 @@
+#ifndef DIALOGEDITLABEL_H
+#define DIALOGEDITLABEL_H
+
+#include
+
+namespace Ui {
+class DialogEditLabel;
+}
+
+class DialogEditLabel : public QDialog
+{
+ Q_OBJECT
+
+public:
+ explicit DialogEditLabel(QWidget *parent = 0);
+ ~DialogEditLabel();
+
+private:
+ Ui::DialogEditLabel *ui;
+};
+
+#endif // DIALOGEDITLABEL_H
diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.ui b/src/libs/vtools/dialogs/support/dialogeditlabel.ui
new file mode 100644
index 000000000..f03651427
--- /dev/null
+++ b/src/libs/vtools/dialogs/support/dialogeditlabel.ui
@@ -0,0 +1,352 @@
+
+
+ DialogEditLabel
+
+
+
+ 0
+ 0
+ 494
+ 384
+
+
+
+ Dialog
+
+
+ -
+
+
-
+
+
+ false
+
+
+ Clear current and begin new label
+
+
+ ...
+
+
+
+ ..
+
+
+
+ 24
+ 24
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Import from label template
+
+
+ ...
+
+
+
+ ..
+
+
+
+ 24
+ 24
+
+
+
+
+ -
+
+
+ false
+
+
+ Export label as template
+
+
+ ...
+
+
+
+ ..
+
+
+
+ 24
+ 24
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 1
+
+
+
+ QAbstractItemView::InternalMove
+
+
+
+ -
+
+
-
+
+
+ 6
+
+
-
+
+
+ false
+
+
+ Bold
+
+
+ ...
+
+
+
+ ..
+
+
+ true
+
+
+
+ -
+
+
+ false
+
+
+ Italic
+
+
+ ...
+
+
+
+ ..
+
+
+ true
+
+
+
+ -
+
+
+ false
+
+
+ Aligns with the left edge
+
+
+ ...
+
+
+
+ ..
+
+
+ true
+
+
+
+ -
+
+
+ false
+
+
+ Centers horizontally in the available space
+
+
+ ...
+
+
+
+ ..
+
+
+ true
+
+
+
+ -
+
+
+ false
+
+
+ Aligns with the right edge
+
+
+ ...
+
+
+
+ ..
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 20
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ ...
+
+
+
+ ../../../../app/valentina/dialogs../../../../app/valentina/dialogs
+
+
+
+ -
+
+
+ false
+
+
+ ...
+
+
+
+ ../../../../app/valentina/dialogs../../../../app/valentina/dialogs
+
+
+
+
+
+ -
+
+
+ Text:
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+ Line of text
+
+
+ true
+
+
+
+ -
+
+
+ false
+
+
+ Insert placeholders
+
+
+ Insert...
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ DialogEditLabel
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ DialogEditLabel
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+