Resolved issue #634. New feature: Fabric manager.
Merge with feature. --HG-- branch : develop
This commit is contained in:
Roman Telezhynskyi
commit
d62a8d03f2
|
|
@ -13,6 +13,7 @@
|
|||
- [#660] New export: Export details without layout.
|
||||
- [#734] Optimization. Stop increments/variables table from updating immediately.
|
||||
- [#750] Info Box Beside Mouse.
|
||||
- [#634] New feature: Fabric manager.
|
||||
|
||||
# Version 0.5.1
|
||||
- [#683] Tool Seam allowance's dialog is off screen on small resolutions.
|
||||
|
|
|
|||
|
|
@ -1832,6 +1832,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished">on fold</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2754,6 +2758,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3616,6 +3639,21 @@ Apply settings anyway?</translation>
|
|||
<translation>Line color:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Dialog</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Value</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3834,6 +3872,22 @@ Apply settings anyway?</translation>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -7951,6 +8005,30 @@ Do you want to save your changes?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9879,6 +9957,13 @@ Do you want to save your changes?</translation>
|
|||
<translation>Exception thrown: %1. Program will be terminated.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12961,6 +13046,11 @@ Do you want to save your changes?</translation>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1479,6 +1479,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2357,6 +2361,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3174,6 +3197,21 @@ Apply settings anyway?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Dialog</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Hodnota</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3352,6 +3390,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -6928,6 +6982,30 @@ Chcete uložit své změny?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QCommandLineParser</name>
|
||||
|
|
@ -8617,6 +8695,13 @@ Do you want to save your changes?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -11429,6 +11514,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1756,6 +1756,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2674,6 +2678,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3535,6 +3558,21 @@ Einstellungen trotzdem anwenden?</translation>
|
|||
<translation>Linienfarbe:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Dialog</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Wert</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3749,6 +3787,22 @@ Einstellungen trotzdem anwenden?</translation>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -7642,6 +7696,30 @@ Sollen die Änderungen gespeichert werden?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9484,6 +9562,13 @@ Do you want to save your changes?</source>
|
|||
<translation>Ausnahme ausgelöst: %1. Programm wird beendet.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12456,6 +12541,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1788,6 +1788,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished">στη δίπλωση</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2698,6 +2702,25 @@
|
|||
<translation>Άγνωστο</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3541,6 +3564,21 @@ Apply settings anyway?</source>
|
|||
<translation>Χρώμα γραμμής:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Διάλογος</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Τιμή</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3755,6 +3793,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -4828,10 +4882,6 @@ Apply settings anyway?</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>DialogSeamAllowance</name>
|
||||
<message>
|
||||
<source>Seam allowance tool</source>
|
||||
<translation type="vanished">Εργαλείο περιθωρίου ραφής</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ready!</source>
|
||||
<translation>Έτοιμο!</translation>
|
||||
|
|
@ -7616,6 +7666,30 @@ Do you want to save your changes?</source>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QCommandLineParser</name>
|
||||
|
|
@ -9401,6 +9475,13 @@ Do you want to save your changes?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12253,6 +12334,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1832,6 +1832,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished">on fold</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2750,6 +2754,25 @@
|
|||
<translation>Uknown</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3612,6 +3635,21 @@ Apply settings anyway?</translation>
|
|||
<translation>Line color:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Dialog</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Value</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3830,6 +3868,22 @@ Apply settings anyway?</translation>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -4915,10 +4969,6 @@ Apply settings anyway?</translation>
|
|||
</context>
|
||||
<context>
|
||||
<name>DialogSeamAllowance</name>
|
||||
<message>
|
||||
<source>Seam allowance tool</source>
|
||||
<translation type="vanished">Seam allowance tool</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ready!</source>
|
||||
<translation>Ready!</translation>
|
||||
|
|
@ -7075,10 +7125,6 @@ Do you want to save your changes?</translation>
|
|||
<source>Select point of center of elliptical arc</source>
|
||||
<translation>Select point of center of elliptical arc</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Piece path tool</source>
|
||||
<translation type="vanished">Piece path tool</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select main path objects clockwise.</source>
|
||||
<translation>Select main path objects clockwise.</translation>
|
||||
|
|
@ -7775,6 +7821,30 @@ Do you want to save your changes?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9648,6 +9718,13 @@ Do you want to save your changes?</translation>
|
|||
<translation>Exception thrown: %1. Program will be terminated.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12700,6 +12777,11 @@ Do you want to save your changes?</translation>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1832,6 +1832,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished">on fold</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2750,6 +2754,25 @@
|
|||
<translation>Uknown</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3612,6 +3635,21 @@ Apply settings anyway?</translation>
|
|||
<translation>Line color:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Dialog</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Value</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3830,6 +3868,22 @@ Apply settings anyway?</translation>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -4915,10 +4969,6 @@ Apply settings anyway?</translation>
|
|||
</context>
|
||||
<context>
|
||||
<name>DialogSeamAllowance</name>
|
||||
<message>
|
||||
<source>Seam allowance tool</source>
|
||||
<translation type="vanished">Seam allowance tool</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ready!</source>
|
||||
<translation>Ready!</translation>
|
||||
|
|
@ -7075,10 +7125,6 @@ Do you want to save your changes?</translation>
|
|||
<source>Select point of center of elliptical arc</source>
|
||||
<translation>Select point of center of elliptical arc</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Piece path tool</source>
|
||||
<translation type="vanished">Piece path tool</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select main path objects clockwise.</source>
|
||||
<translation>Select main path objects clockwise.</translation>
|
||||
|
|
@ -7775,6 +7821,30 @@ Do you want to save your changes?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9648,6 +9718,13 @@ Do you want to save your changes?</translation>
|
|||
<translation>Exception thrown: %1. Program will be terminated.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12700,6 +12777,11 @@ Do you want to save your changes?</translation>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1832,6 +1832,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished">on fold</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2750,6 +2754,25 @@
|
|||
<translation>Uknown</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3612,6 +3635,21 @@ Apply settings anyway?</translation>
|
|||
<translation>Line color:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Dialog</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Value</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3830,6 +3868,22 @@ Apply settings anyway?</translation>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -4915,10 +4969,6 @@ Apply settings anyway?</translation>
|
|||
</context>
|
||||
<context>
|
||||
<name>DialogSeamAllowance</name>
|
||||
<message>
|
||||
<source>Seam allowance tool</source>
|
||||
<translation type="vanished">Seam allowance tool</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ready!</source>
|
||||
<translation>Ready!</translation>
|
||||
|
|
@ -7075,10 +7125,6 @@ Do you want to save your changes?</translation>
|
|||
<source>Select point of center of elliptical arc</source>
|
||||
<translation>Select point of center of elliptical arc</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Piece path tool</source>
|
||||
<translation type="vanished">Piece path tool</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select main path objects clockwise.</source>
|
||||
<translation>Select main path objects clockwise.</translation>
|
||||
|
|
@ -7775,6 +7821,30 @@ Do you want to save your changes?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9648,6 +9718,13 @@ Do you want to save your changes?</translation>
|
|||
<translation>Exception thrown: %1. Program will be terminated.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12700,6 +12777,11 @@ Do you want to save your changes?</translation>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1833,6 +1833,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished">en pliegue</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2751,6 +2755,25 @@
|
|||
<translation>Desconocido</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3612,6 +3635,21 @@ Apply settings anyway?</source>
|
|||
<translation>Color de la línea:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Diálogo</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3830,6 +3868,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -4915,10 +4969,6 @@ Apply settings anyway?</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>DialogSeamAllowance</name>
|
||||
<message>
|
||||
<source>Seam allowance tool</source>
|
||||
<translation type="vanished">Herramienta para las costuras</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ready!</source>
|
||||
<translation>¡Listo!</translation>
|
||||
|
|
@ -7075,10 +7125,6 @@ Quiere guardar los cambios?</translation>
|
|||
<source>Select point of center of elliptical arc</source>
|
||||
<translation>Seleccionar el punto del centro del arco elíptico</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Piece path tool</source>
|
||||
<translation type="vanished">Herramienta de trayectoria de piezas</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select main path objects clockwise.</source>
|
||||
<translation>Seleccionar los objetos de la ruta principal en el sentido horario.</translation>
|
||||
|
|
@ -7775,6 +7821,30 @@ Quiere guardar los cambios?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9647,6 +9717,13 @@ Do you want to save your changes?</source>
|
|||
<translation>Se ha lanzado una excepción: %1. El programa se terminará.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12699,6 +12776,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1472,6 +1472,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2350,6 +2354,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3167,6 +3190,21 @@ Apply settings anyway?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Arvo</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3345,6 +3383,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -6913,6 +6967,30 @@ Haluatko tallentaa muutokset?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QCoreApplication</name>
|
||||
|
|
@ -8567,6 +8645,13 @@ Do you want to save your changes?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -11369,6 +11454,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1832,6 +1832,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2750,6 +2754,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3609,6 +3632,21 @@ Appliquer les réglages quand-même ?</translation>
|
|||
<translation>Couleur de la ligne:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Dialogue</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Valeur</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3827,6 +3865,22 @@ Appliquer les réglages quand-même ?</translation>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -4912,10 +4966,6 @@ Appliquer les réglages quand-même ?</translation>
|
|||
</context>
|
||||
<context>
|
||||
<name>DialogSeamAllowance</name>
|
||||
<message>
|
||||
<source>Seam allowance tool</source>
|
||||
<translation type="vanished">Outil marge de couture</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ready!</source>
|
||||
<translation>Prêt!</translation>
|
||||
|
|
@ -7756,6 +7806,30 @@ Voulez-vous sauvegarder les changements?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9621,6 +9695,13 @@ Voulez-vous enregistrer les changements?</translation>
|
|||
<translation>Erreur : %1. Fin du programme.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12656,6 +12737,11 @@ Voulez-vous enregistrer les changements?</translation>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1145,6 +1145,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -1935,6 +1939,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -2684,6 +2707,21 @@ Apply settings anyway?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -2850,6 +2888,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPiecePath</name>
|
||||
|
|
@ -5964,6 +6018,30 @@ Do you want to save your changes?</source>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QCoreApplication</name>
|
||||
|
|
@ -7513,6 +7591,13 @@ Do you want to save your changes?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -10154,6 +10239,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VWidgetDetails</name>
|
||||
|
|
|
|||
|
|
@ -1384,6 +1384,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2202,6 +2206,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -2975,6 +2998,21 @@ Apply settings anyway?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3149,6 +3187,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPiecePath</name>
|
||||
|
|
@ -6308,6 +6362,30 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QCoreApplication</name>
|
||||
|
|
@ -7899,6 +7977,13 @@ Do you want to save your changes?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -10552,6 +10637,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VWidgetDetails</name>
|
||||
|
|
|
|||
|
|
@ -1756,6 +1756,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2666,6 +2670,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3524,6 +3547,21 @@ Applicare le impostazioni comunque?</translation>
|
|||
<translation>Colore della linea:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Finestra</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3734,6 +3772,22 @@ Applicare le impostazioni comunque?</translation>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -7647,6 +7701,30 @@ Vuoi salvare i cambiamenti?</translation>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9512,6 +9590,13 @@ Vuoi salvare le tue modifiche?</translation>
|
|||
<translation>Eccezione generata:%1. Il programma verrà terminato.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12373,6 +12458,11 @@ Vuoi salvare le tue modifiche?</translation>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1832,6 +1832,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished">op vouw</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2750,6 +2754,25 @@
|
|||
<translation>Onbekend</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3612,6 +3635,21 @@ Toch de instellingen aanpassen?</translation>
|
|||
<translation>Lijnkleur:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Dialoog</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Waarde</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3830,6 +3868,22 @@ Toch de instellingen aanpassen?</translation>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -4915,10 +4969,6 @@ Toch de instellingen aanpassen?</translation>
|
|||
</context>
|
||||
<context>
|
||||
<name>DialogSeamAllowance</name>
|
||||
<message>
|
||||
<source>Seam allowance tool</source>
|
||||
<translation type="vanished">Naadtoeslag gereedschap</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ready!</source>
|
||||
<translation>Klaar!</translation>
|
||||
|
|
@ -7074,10 +7124,6 @@ Do you want to save your changes?</source>
|
|||
<source>Select point of center of elliptical arc</source>
|
||||
<translation>Selecteer het middelpunt van de ellipsvormige boog</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Piece path tool</source>
|
||||
<translation type="vanished">Gereedschap om pad van onderdeel te bepalen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select main path objects clockwise.</source>
|
||||
<translation>Selecteer hoofdpad objecten met de klok mee.</translation>
|
||||
|
|
@ -7774,6 +7820,30 @@ Do you want to save your changes?</source>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9647,6 +9717,13 @@ Wil je deze veranderingen opslaan?</translation>
|
|||
<translation>Uitgeworpen uitzondering: %1. Programma wordt beëindigd.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12699,6 +12776,11 @@ Wil je deze veranderingen opslaan?</translation>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1804,6 +1804,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2690,6 +2694,25 @@
|
|||
<translation>Desconhecido</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3511,6 +3534,21 @@ Apply settings anyway?</source>
|
|||
<translation>Cor da linha:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Caixa de diálogo</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Valor</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3721,6 +3759,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -7172,6 +7226,30 @@ Do you want to save your changes?</source>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QCoreApplication</name>
|
||||
|
|
@ -8830,6 +8908,13 @@ Do you want to save your changes?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -11571,6 +11656,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1633,6 +1633,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2515,6 +2519,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3336,6 +3359,21 @@ Apply settings anyway?</source>
|
|||
<translation>Culoarea liniei:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Dialog</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Valoare</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3514,6 +3552,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -6890,6 +6944,30 @@ Do you want to save your changes?</source>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QCoreApplication</name>
|
||||
|
|
@ -8532,6 +8610,13 @@ Do you want to save your changes?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -11236,6 +11321,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VWidgetDetails</name>
|
||||
|
|
|
|||
|
|
@ -1832,6 +1832,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished">на сгибе</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2750,6 +2754,25 @@
|
|||
<translation>Неизвестное</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3612,6 +3635,21 @@ Apply settings anyway?</source>
|
|||
<translation>Цвет линии:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Диалог</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Значение</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3830,6 +3868,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -4915,10 +4969,6 @@ Apply settings anyway?</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>DialogSeamAllowance</name>
|
||||
<message>
|
||||
<source>Seam allowance tool</source>
|
||||
<translation type="vanished">Деталь</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ready!</source>
|
||||
<translation>Готовы!</translation>
|
||||
|
|
@ -7075,10 +7125,6 @@ Do you want to save your changes?</source>
|
|||
<source>Select point of center of elliptical arc</source>
|
||||
<translation>Укажите точку размещения центра эллиптической дуги</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Piece path tool</source>
|
||||
<translation type="vanished">Инструмент контур детали</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select main path objects clockwise.</source>
|
||||
<translation>Выберите объекты основного контура по часовой стрелке.</translation>
|
||||
|
|
@ -7775,6 +7821,30 @@ Do you want to save your changes?</source>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9648,6 +9718,13 @@ Do you want to save your changes?</source>
|
|||
<translation>Программное исключение: %1. Работа программы будет завершена.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12705,6 +12782,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1832,6 +1832,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished">на згиб</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2750,6 +2754,25 @@
|
|||
<translation>Невідоме</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -3612,6 +3635,21 @@ Apply settings anyway?</source>
|
|||
<translation>Колір лінії:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished">Діалог</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished">Значення</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -3830,6 +3868,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternXmlEdit</name>
|
||||
|
|
@ -4915,10 +4969,6 @@ Apply settings anyway?</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>DialogSeamAllowance</name>
|
||||
<message>
|
||||
<source>Seam allowance tool</source>
|
||||
<translation type="vanished">Інструмент прибавка на шви</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ready!</source>
|
||||
<translation>Готовий!</translation>
|
||||
|
|
@ -7074,10 +7124,6 @@ Do you want to save your changes?</source>
|
|||
<source>Select point of center of elliptical arc</source>
|
||||
<translation>Виберіть точку центру еліптичної дуги</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Piece path tool</source>
|
||||
<translation type="vanished">Інструмент контур деталі</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select main path objects clockwise.</source>
|
||||
<translation>Виберіть основний контур за годиниковою стрілкою.</translation>
|
||||
|
|
@ -7774,6 +7820,30 @@ Do you want to save your changes?</source>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
|
|
@ -9647,6 +9717,13 @@ Do you want to save your changes?</source>
|
|||
<translation>Програмне виключення: %1. Програма буде закрита.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -12698,6 +12775,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VVITConverter</name>
|
||||
|
|
|
|||
|
|
@ -1259,6 +1259,10 @@
|
|||
<source>on fold</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogEditWrongFormula</name>
|
||||
|
|
@ -2041,6 +2045,25 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogKnownMaterials</name>
|
||||
<message>
|
||||
<source>Known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Material:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name of material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogLayoutProgress</name>
|
||||
<message>
|
||||
|
|
@ -2782,6 +2805,21 @@ Apply settings anyway?</source>
|
|||
<translation>线颜色:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternMaterials</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Placeholder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Value</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPatternProperties</name>
|
||||
<message>
|
||||
|
|
@ -2948,6 +2986,22 @@ Apply settings anyway?</source>
|
|||
<source>Label data were changed. Do you want to save them before editing label template?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DialogPiecePath</name>
|
||||
|
|
@ -6048,6 +6102,30 @@ Do you want to save your changes?</source>
|
|||
<source>Time:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Known materials:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage list of known materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Manage</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>When manage pattern materials save them to known materials list</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Remeber pattern materials</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QCoreApplication</name>
|
||||
|
|
@ -7662,6 +7740,13 @@ Do you want to save your changes?</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VComboBoxDelegate</name>
|
||||
<message>
|
||||
<source>Select material</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VCommandLine</name>
|
||||
<message>
|
||||
|
|
@ -10299,6 +10384,11 @@ Do you want to save your changes?</source>
|
|||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>userMaterial</source>
|
||||
<comment>placeholder</comment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VWidgetDetails</name>
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include "../../core/vapplication.h"
|
||||
#include "../ifc/xml/vabstractpattern.h"
|
||||
#include "../dialogdatetimeformats.h"
|
||||
#include "../dialogknownmaterials.h"
|
||||
|
||||
#include <QMessageBox>
|
||||
#include <QDate>
|
||||
|
|
@ -55,19 +56,28 @@ QStringList ComboBoxAllStrings(QComboBox *combo)
|
|||
//---------------------------------------------------------------------------------------------------------------------
|
||||
PreferencesPatternPage::PreferencesPatternPage(QWidget *parent)
|
||||
: QWidget(parent),
|
||||
ui(new Ui::PreferencesPatternPage)
|
||||
ui(new Ui::PreferencesPatternPage),
|
||||
m_knownMaterials()
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->graphOutputCheck->setChecked(qApp->ValentinaSettings()->GetGraphicalOutput());
|
||||
ui->undoCount->setValue(qApp->ValentinaSettings()->GetUndoCount());
|
||||
|
||||
VSettings *settings = qApp->ValentinaSettings();
|
||||
|
||||
ui->graphOutputCheck->setChecked(settings->GetGraphicalOutput());
|
||||
ui->undoCount->setValue(settings->GetUndoCount());
|
||||
|
||||
InitDefaultSeamAllowance();
|
||||
InitLabelDateTimeFormats();
|
||||
|
||||
ui->forbidFlippingCheck->setChecked(qApp->ValentinaSettings()->GetForbidWorkpieceFlipping());
|
||||
ui->doublePassmarkCheck->setChecked(qApp->ValentinaSettings()->IsDoublePassmark());
|
||||
ui->checkBoxHideMainPath->setChecked(qApp->ValentinaSettings()->IsHideMainPath());
|
||||
ui->fontComboBoxLabelFont->setCurrentFont(qApp->ValentinaSettings()->GetLabelFont());
|
||||
ui->forbidFlippingCheck->setChecked(settings->GetForbidWorkpieceFlipping());
|
||||
ui->doublePassmarkCheck->setChecked(settings->IsDoublePassmark());
|
||||
ui->checkBoxHideMainPath->setChecked(settings->IsHideMainPath());
|
||||
ui->fontComboBoxLabelFont->setCurrentFont(settings->GetLabelFont());
|
||||
|
||||
ui->checkBoxRemeberPatternMaterials->setChecked(settings->IsRememberPatternMaterials());
|
||||
m_knownMaterials = settings->GetKnownMaterials();
|
||||
|
||||
connect(ui->pushButtonKnownMaterials, &QPushButton::clicked, this, &PreferencesPatternPage::ManageKnownMaterials);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
@ -108,6 +118,9 @@ void PreferencesPatternPage::Apply()
|
|||
|
||||
settings->SetUserDefinedDateFormats(ComboBoxAllStrings(ui->comboBoxDateFormats));
|
||||
settings->SetUserDefinedTimeFormats(ComboBoxAllStrings(ui->comboBoxTimeFormats));
|
||||
|
||||
settings->SetKnownMaterials(m_knownMaterials);
|
||||
settings->SetRememberPatternMaterials(ui->checkBoxRemeberPatternMaterials->isChecked());
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
@ -135,6 +148,18 @@ void PreferencesPatternPage::EditDateTimeFormats()
|
|||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void PreferencesPatternPage::ManageKnownMaterials()
|
||||
{
|
||||
DialogKnownMaterials editor;
|
||||
editor.SetList(m_knownMaterials);
|
||||
|
||||
if (QDialog::Accepted == editor.exec())
|
||||
{
|
||||
m_knownMaterials = editor.GetList();
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void PreferencesPatternPage::InitLabelDateTimeFormats()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -51,10 +51,12 @@ public:
|
|||
|
||||
private slots:
|
||||
void EditDateTimeFormats();
|
||||
void ManageKnownMaterials();
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(PreferencesPatternPage)
|
||||
Ui::PreferencesPatternPage *ui;
|
||||
QStringList m_knownMaterials;
|
||||
|
||||
void InitLabelDateTimeFormats();
|
||||
void InitComboBoxFormats(QComboBox *box, const QStringList &items, const QString ¤tFormat);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<property name="windowTitle">
|
||||
<string notr="true">Pattern</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_2">
|
||||
<property name="title">
|
||||
|
|
@ -191,6 +191,68 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="title">
|
||||
<string>Materials</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_12">
|
||||
<property name="text">
|
||||
<string>Known materials:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButtonKnownMaterials">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Manage list of known materials</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Manage</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="checkBoxRemeberPatternMaterials">
|
||||
<property name="toolTip">
|
||||
<string>When manage pattern materials save them to known materials list</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Remeber pattern materials</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
|
|
|
|||
161
src/app/valentina/dialogs/dialogknownmaterials.cpp
Normal file
161
src/app/valentina/dialogs/dialogknownmaterials.cpp
Normal file
|
|
@ -0,0 +1,161 @@
|
|||
/************************************************************************
|
||||
**
|
||||
** @file dialogknownmaterials.cpp
|
||||
** @author Roman Telezhynskyi <dismine(at)gmail.com>
|
||||
** @date 28 8, 2017
|
||||
**
|
||||
** @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) 2017 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 "dialogknownmaterials.h"
|
||||
#include "ui_dialogknownmaterials.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
DialogKnownMaterials::DialogKnownMaterials(QWidget *parent)
|
||||
: QDialog(parent),
|
||||
ui(new Ui::DialogKnownMaterials)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
ui->lineEditMaterial->setClearButtonEnabled(true);
|
||||
|
||||
connect(ui->toolButtonAdd, &QToolButton::clicked, this, &DialogKnownMaterials::Add);
|
||||
connect(ui->toolButtonRemove, &QToolButton::clicked, this, &DialogKnownMaterials::Remove);
|
||||
connect(ui->lineEditMaterial, &QLineEdit::textEdited, this, &DialogKnownMaterials::SaveText);
|
||||
connect(ui->listWidget, &QListWidget::itemSelectionChanged, this, &DialogKnownMaterials::ShowDetails);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
DialogKnownMaterials::~DialogKnownMaterials()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogKnownMaterials::SetList(const QStringList &list)
|
||||
{
|
||||
ui->listWidget->blockSignals(true);
|
||||
ui->listWidget->clear();
|
||||
|
||||
int row = -1;
|
||||
|
||||
for (int i=0; i<list.size(); ++i)
|
||||
{
|
||||
if (not list.at(i).isEmpty())
|
||||
{
|
||||
QListWidgetItem *item = new QListWidgetItem(list.at(i));
|
||||
ui->listWidget->insertItem(++row, item);
|
||||
}
|
||||
}
|
||||
|
||||
ui->listWidget->blockSignals(false);
|
||||
|
||||
if (ui->listWidget->count() > 0)
|
||||
{
|
||||
ui->listWidget->setCurrentRow(0);
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QStringList DialogKnownMaterials::GetList() const
|
||||
{
|
||||
QStringList list;
|
||||
|
||||
for (int i=0; i<ui->listWidget->count(); ++i)
|
||||
{
|
||||
if (const QListWidgetItem *item = ui->listWidget->item(i))
|
||||
{
|
||||
if (not item->text().isEmpty())
|
||||
{
|
||||
list.append(item->text());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogKnownMaterials::ShowDetails()
|
||||
{
|
||||
if (ui->listWidget->count() > 0)
|
||||
{
|
||||
const QListWidgetItem *line = ui->listWidget->currentItem();
|
||||
if (line)
|
||||
{
|
||||
ui->lineEditMaterial->blockSignals(true);
|
||||
ui->lineEditMaterial->setText(line->text());
|
||||
ui->lineEditMaterial->blockSignals(false);
|
||||
}
|
||||
}
|
||||
|
||||
SetupControls();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogKnownMaterials::Add()
|
||||
{
|
||||
int row = ui->listWidget->currentRow();
|
||||
ui->listWidget->insertItem(++row, new QListWidgetItem(tr("User material")));
|
||||
ui->listWidget->setCurrentRow(row);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogKnownMaterials::Remove()
|
||||
{
|
||||
ui->listWidget->blockSignals(true);
|
||||
QListWidgetItem *curLine = ui->listWidget->takeItem(ui->listWidget->currentRow());
|
||||
if (curLine)
|
||||
{
|
||||
delete curLine;
|
||||
}
|
||||
ui->listWidget->blockSignals(false);
|
||||
ShowDetails();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogKnownMaterials::SaveText(const QString &text)
|
||||
{
|
||||
QListWidgetItem *curLine = ui->listWidget->currentItem();
|
||||
if (curLine)
|
||||
{
|
||||
curLine->setText(text);
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogKnownMaterials::SetupControls()
|
||||
{
|
||||
const bool enabled = ui->listWidget->count() > 0;
|
||||
|
||||
if (not enabled)
|
||||
{
|
||||
ui->lineEditMaterial->blockSignals(true);
|
||||
ui->lineEditMaterial->clear();
|
||||
ui->lineEditMaterial->blockSignals(false);
|
||||
}
|
||||
|
||||
ui->toolButtonAdd->setEnabled(true);
|
||||
|
||||
ui->toolButtonRemove->setEnabled(enabled);
|
||||
ui->lineEditMaterial->setEnabled(enabled);
|
||||
}
|
||||
63
src/app/valentina/dialogs/dialogknownmaterials.h
Normal file
63
src/app/valentina/dialogs/dialogknownmaterials.h
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
/************************************************************************
|
||||
**
|
||||
** @file dialogknownmaterials.h
|
||||
** @author Roman Telezhynskyi <dismine(at)gmail.com>
|
||||
** @date 28 8, 2017
|
||||
**
|
||||
** @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) 2017 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 DIALOGKNOWNMATERIALS_H
|
||||
#define DIALOGKNOWNMATERIALS_H
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class DialogKnownMaterials;
|
||||
}
|
||||
|
||||
class DialogKnownMaterials : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DialogKnownMaterials(QWidget *parent = nullptr);
|
||||
virtual ~DialogKnownMaterials();
|
||||
|
||||
void SetList(const QStringList &list);
|
||||
QStringList GetList() const;
|
||||
|
||||
private slots:
|
||||
void ShowDetails();
|
||||
void Add();
|
||||
void Remove();
|
||||
void SaveText(const QString &text);
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(DialogKnownMaterials)
|
||||
Ui::DialogKnownMaterials *ui;
|
||||
|
||||
void SetupControls();
|
||||
};
|
||||
|
||||
#endif // DIALOGKNOWNMATERIALS_H
|
||||
149
src/app/valentina/dialogs/dialogknownmaterials.ui
Normal file
149
src/app/valentina/dialogs/dialogknownmaterials.ui
Normal file
|
|
@ -0,0 +1,149 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>DialogKnownMaterials</class>
|
||||
<widget class="QDialog" name="DialogKnownMaterials">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>365</width>
|
||||
<height>369</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Known materials</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset resource="../../../libs/vmisc/share/resources/icon.qrc">
|
||||
<normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QListWidget" name="listWidget">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Material:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="VLineEdit" name="lineEditMaterial">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
<horstretch>1</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="placeholderText">
|
||||
<string>Name of material</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="toolButtonAdd">
|
||||
<property name="text">
|
||||
<string notr="true">...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="list-add">
|
||||
<normaloff>.</normaloff>.</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="toolButtonRemove">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="list-remove">
|
||||
<normaloff>.</normaloff>.</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>VLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>vlineedit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="../../../libs/vmisc/share/resources/icon.qrc"/>
|
||||
</resources>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>DialogKnownMaterials</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>DialogKnownMaterials</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
196
src/app/valentina/dialogs/dialogpatternmaterials.cpp
Normal file
196
src/app/valentina/dialogs/dialogpatternmaterials.cpp
Normal file
|
|
@ -0,0 +1,196 @@
|
|||
/************************************************************************
|
||||
**
|
||||
** @file dialogpatternmaterials.cpp
|
||||
** @author Roman Telezhynskyi <dismine(at)gmail.com>
|
||||
** @date 28 8, 2017
|
||||
**
|
||||
** @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) 2017 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 "dialogpatternmaterials.h"
|
||||
#include "ui_dialogpatternmaterials.h"
|
||||
|
||||
#include "../vmisc/def.h"
|
||||
#include "../core/vapplication.h"
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QItemDelegate>
|
||||
|
||||
namespace
|
||||
{
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QStringList PrepareKnowMaterials(const QStringList &patternMaterials, bool rememberPM)
|
||||
{
|
||||
QStringList knownMaterials = qApp->ValentinaSettings()->GetKnownMaterials();
|
||||
|
||||
if (rememberPM)
|
||||
{
|
||||
for(int i=0; i < patternMaterials.size(); ++i)
|
||||
{
|
||||
if (not patternMaterials.at(i).isEmpty() && not knownMaterials.contains(patternMaterials.at(i)))
|
||||
{
|
||||
knownMaterials.append(patternMaterials.at(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
return knownMaterials;
|
||||
}
|
||||
}
|
||||
|
||||
class VComboBoxDelegate : public QItemDelegate
|
||||
{
|
||||
public:
|
||||
VComboBoxDelegate(const QStringList &items, QObject *parent = nullptr)
|
||||
: QItemDelegate(parent),
|
||||
m_items(items)
|
||||
{
|
||||
m_items.prepend(QLatin1String("--") + tr("Select material") + QLatin1String("--"));
|
||||
}
|
||||
|
||||
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
|
||||
const QModelIndex &index) const Q_DECL_OVERRIDE
|
||||
{
|
||||
Q_UNUSED(option)
|
||||
Q_UNUSED(index)
|
||||
|
||||
QComboBox *editor = new QComboBox(parent);
|
||||
editor->addItems(m_items);
|
||||
|
||||
return editor;
|
||||
}
|
||||
|
||||
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE
|
||||
{
|
||||
const QString value = index.model()->data(index, Qt::EditRole).toString();
|
||||
|
||||
QComboBox *comboBox = static_cast<QComboBox*>(editor);
|
||||
const int cIndex = comboBox->findText(value);
|
||||
|
||||
if (cIndex != -1)
|
||||
{
|
||||
comboBox->setCurrentIndex(cIndex);
|
||||
}
|
||||
}
|
||||
|
||||
virtual void setModelData(QWidget *editor, QAbstractItemModel *model,
|
||||
const QModelIndex &index) const Q_DECL_OVERRIDE
|
||||
{
|
||||
QComboBox *comboBox = static_cast<QComboBox*>(editor);
|
||||
QString value;
|
||||
const int cIndex = comboBox->currentIndex();
|
||||
|
||||
if (cIndex > 0)
|
||||
{
|
||||
value = comboBox->currentText();
|
||||
}
|
||||
|
||||
model->setData(index, value, Qt::EditRole);
|
||||
}
|
||||
|
||||
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
|
||||
const QModelIndex &index) const Q_DECL_OVERRIDE
|
||||
{
|
||||
Q_UNUSED(index)
|
||||
editor->setGeometry(option.rect);
|
||||
}
|
||||
private:
|
||||
Q_DISABLE_COPY(VComboBoxDelegate)
|
||||
QStringList m_items;
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
DialogPatternMaterials::DialogPatternMaterials(const QMap<int, QString> &list, bool rememberPM, QWidget *parent)
|
||||
: QDialog(parent),
|
||||
ui(new Ui::DialogPatternMaterials),
|
||||
m_knownMaterials()
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
m_knownMaterials = PrepareKnowMaterials(list.values(), rememberPM);
|
||||
SetPatternMaterials(list);
|
||||
|
||||
ui->tableWidget->setItemDelegateForColumn(1, new VComboBoxDelegate(m_knownMaterials, this));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
DialogPatternMaterials::~DialogPatternMaterials()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogPatternMaterials::SetPatternMaterials(const QMap<int, QString> &list)
|
||||
{
|
||||
ui->tableWidget->setRowCount(userMaterialPlaceholdersQuantity);
|
||||
QLatin1String per("%");
|
||||
|
||||
for (int i = 0; i < userMaterialPlaceholdersQuantity; ++i)
|
||||
{
|
||||
const QString translated = qApp->TrVars()->PlaceholderToUser(pl_userMaterial + QString::number(i + 1));
|
||||
QTableWidgetItem *item = new QTableWidgetItem(per + translated + per);
|
||||
item->setFlags(item->flags() ^ Qt::ItemIsEditable);
|
||||
item->setTextAlignment(Qt::AlignLeft);
|
||||
|
||||
QFont font = item->font();
|
||||
font.setBold(true);
|
||||
item->setFont(font);
|
||||
|
||||
ui->tableWidget->setItem(i, 0, item);
|
||||
|
||||
QString value;
|
||||
if (list.contains(i + 1))
|
||||
{
|
||||
value = list.value(i + 1);
|
||||
}
|
||||
|
||||
item = new QTableWidgetItem(value);
|
||||
item->setTextAlignment(Qt::AlignHCenter);
|
||||
ui->tableWidget->setItem(i, 1, item);
|
||||
}
|
||||
|
||||
ui->tableWidget->resizeColumnsToContents();
|
||||
ui->tableWidget->resizeRowsToContents();
|
||||
ui->tableWidget->verticalHeader()->setDefaultSectionSize(20);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QMap<int, QString> DialogPatternMaterials::GetPatternMaterials() const
|
||||
{
|
||||
QMap<int, QString> materials;
|
||||
|
||||
for (int i = 0; i < ui->tableWidget->rowCount(); ++i)
|
||||
{
|
||||
const QTableWidgetItem *item = ui->tableWidget->item(i, 1);
|
||||
if (not item->text().isEmpty())
|
||||
{
|
||||
materials.insert(i + 1, item->text());
|
||||
}
|
||||
}
|
||||
|
||||
return materials;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QStringList DialogPatternMaterials::GetKnownMaterials() const
|
||||
{
|
||||
return m_knownMaterials;
|
||||
}
|
||||
61
src/app/valentina/dialogs/dialogpatternmaterials.h
Normal file
61
src/app/valentina/dialogs/dialogpatternmaterials.h
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
/************************************************************************
|
||||
**
|
||||
** @file dialogpatternmaterials.h
|
||||
** @author Roman Telezhynskyi <dismine(at)gmail.com>
|
||||
** @date 28 8, 2017
|
||||
**
|
||||
** @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) 2017 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 DIALOGPATTERNMATERIALS_H
|
||||
#define DIALOGPATTERNMATERIALS_H
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class DialogPatternMaterials;
|
||||
}
|
||||
|
||||
class VComboBoxDelegate;
|
||||
|
||||
class DialogPatternMaterials : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DialogPatternMaterials(const QMap<int, QString> &list, bool rememberPM, QWidget *parent = nullptr);
|
||||
virtual ~DialogPatternMaterials();
|
||||
|
||||
|
||||
QMap<int, QString> GetPatternMaterials() const;
|
||||
QStringList GetKnownMaterials() const;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(DialogPatternMaterials)
|
||||
Ui::DialogPatternMaterials *ui;
|
||||
QStringList m_knownMaterials;
|
||||
|
||||
void SetPatternMaterials(const QMap<int, QString> &list);
|
||||
};
|
||||
|
||||
#endif // DIALOGPATTERNMATERIALS_H
|
||||
105
src/app/valentina/dialogs/dialogpatternmaterials.ui
Normal file
105
src/app/valentina/dialogs/dialogpatternmaterials.ui
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>DialogPatternMaterials</class>
|
||||
<widget class="QDialog" name="DialogPatternMaterials">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>419</width>
|
||||
<height>472</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QTableWidget" name="tableWidget">
|
||||
<property name="editTriggers">
|
||||
<set>QAbstractItemView::AllEditTriggers</set>
|
||||
</property>
|
||||
<property name="alternatingRowColors">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="selectionMode">
|
||||
<enum>QAbstractItemView::SingleSelection</enum>
|
||||
</property>
|
||||
<property name="selectionBehavior">
|
||||
<enum>QAbstractItemView::SelectRows</enum>
|
||||
</property>
|
||||
<property name="showGrid">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="gridStyle">
|
||||
<enum>Qt::NoPen</enum>
|
||||
</property>
|
||||
<attribute name="horizontalHeaderVisible">
|
||||
<bool>true</bool>
|
||||
</attribute>
|
||||
<attribute name="horizontalHeaderStretchLastSection">
|
||||
<bool>true</bool>
|
||||
</attribute>
|
||||
<attribute name="verticalHeaderVisible">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
<column>
|
||||
<property name="text">
|
||||
<string>Placeholder</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
<property name="text">
|
||||
<string>Value</string>
|
||||
</property>
|
||||
</column>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>DialogPatternMaterials</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>DialogPatternMaterials</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
|
|
@ -39,6 +39,8 @@
|
|||
#include "../vpatterndb/vcontainer.h"
|
||||
#include "../core/vapplication.h"
|
||||
#include "../vtools/dialogs/support/dialogeditlabel.h"
|
||||
#include "dialogknownmaterials.h"
|
||||
#include "dialogpatternmaterials.h"
|
||||
|
||||
// calc how many combinations we have
|
||||
static const int heightsCount = (static_cast<int>(GHeights::H200) -
|
||||
|
|
@ -63,11 +65,13 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, VContainer *pat
|
|||
labelDataChanged(false),
|
||||
askSaveLabelData(false),
|
||||
templateDataChanged(false),
|
||||
patternMaterialsChanged(false),
|
||||
deleteAction(nullptr),
|
||||
changeImageAction(nullptr),
|
||||
saveImageAction(nullptr),
|
||||
showImageAction(nullptr),
|
||||
templateLines()
|
||||
templateLines(),
|
||||
patternMaterials()
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
|
|
@ -76,6 +80,8 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, VContainer *pat
|
|||
VSettings *settings = qApp->ValentinaSettings();
|
||||
settings->GetOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
|
||||
|
||||
patternMaterials = doc->GetPatternMaterials();
|
||||
|
||||
if (qApp->GetPPath().isEmpty())
|
||||
{
|
||||
ui->lineEditPathToFile->setText(tr("<Empty>"));
|
||||
|
|
@ -181,6 +187,8 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, VContainer *pat
|
|||
connect(ui->lineEditCompanyName, &QLineEdit::editingFinished, this, &DialogPatternProperties::LabelDataChanged);
|
||||
connect(ui->lineEditCustomerName, &QLineEdit::editingFinished, this, &DialogPatternProperties::LabelDataChanged);
|
||||
connect(ui->pushButtonEditPatternLabel, &QPushButton::clicked, this, &DialogPatternProperties::EditLabel);
|
||||
connect(ui->pushButtonPatternMaterials, &QPushButton::clicked, this,
|
||||
&DialogPatternProperties::ManagePatternMaterials);
|
||||
|
||||
InitComboBoxFormats(ui->comboBoxDateFormat,
|
||||
VSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(),
|
||||
|
|
@ -219,6 +227,7 @@ void DialogPatternProperties::Apply()
|
|||
case 3:
|
||||
SaveLabelData();
|
||||
SaveTemplateData();
|
||||
SaveMaterialData();
|
||||
emit doc->UpdatePatternLabel();
|
||||
break;
|
||||
default:
|
||||
|
|
@ -235,6 +244,7 @@ void DialogPatternProperties::Ok()
|
|||
SaveReadOnlyState();
|
||||
SaveLabelData();
|
||||
SaveTemplateData();
|
||||
SaveMaterialData();
|
||||
|
||||
emit doc->UpdatePatternLabel();
|
||||
|
||||
|
|
@ -548,7 +558,6 @@ void DialogPatternProperties::SaveDescription()
|
|||
doc->SetDescription(ui->plainTextEditDescription->document()->toPlainText());
|
||||
|
||||
descriptionChanged = false;
|
||||
emit doc->patternChanged(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -561,7 +570,6 @@ void DialogPatternProperties::SaveGradation()
|
|||
doc->SetGradationSizes(sizes);
|
||||
emit UpdateGradation();
|
||||
gradationChanged = false;
|
||||
emit doc->patternChanged(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -599,8 +607,6 @@ void DialogPatternProperties::SaveLabelData()
|
|||
|
||||
labelDataChanged = false;
|
||||
askSaveLabelData = false;
|
||||
emit doc->patternChanged(false);
|
||||
emit doc->UpdatePatternLabel();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -611,8 +617,16 @@ void DialogPatternProperties::SaveTemplateData()
|
|||
{
|
||||
doc->SetPatternLabelTemplate(templateLines);
|
||||
templateDataChanged = false;
|
||||
emit doc->patternChanged(false);
|
||||
emit doc->UpdatePatternLabel();
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogPatternProperties::SaveMaterialData()
|
||||
{
|
||||
if (patternMaterialsChanged)
|
||||
{
|
||||
doc->SetPatternMaterials(patternMaterials);
|
||||
patternMaterialsChanged = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -900,3 +914,22 @@ void DialogPatternProperties::EditLabel()
|
|||
templateDataChanged = true;
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogPatternProperties::ManagePatternMaterials()
|
||||
{
|
||||
VSettings *settings = qApp->ValentinaSettings();
|
||||
|
||||
DialogPatternMaterials editor(patternMaterials, settings->IsRememberPatternMaterials());
|
||||
|
||||
if (QDialog::Accepted == editor.exec())
|
||||
{
|
||||
patternMaterials = editor.GetPatternMaterials();
|
||||
patternMaterialsChanged = true;
|
||||
|
||||
if (settings->IsRememberPatternMaterials())
|
||||
{
|
||||
settings->SetKnownMaterials(editor.GetKnownMaterials());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ private slots:
|
|||
void ChangeImage();
|
||||
void SaveImage();
|
||||
void EditLabel();
|
||||
void ManagePatternMaterials();
|
||||
private:
|
||||
Q_DISABLE_COPY(DialogPatternProperties)
|
||||
Ui::DialogPatternProperties *ui;
|
||||
|
|
@ -79,12 +80,14 @@ private:
|
|||
bool labelDataChanged;
|
||||
bool askSaveLabelData;
|
||||
bool templateDataChanged;
|
||||
bool patternMaterialsChanged;
|
||||
QAction *deleteAction;
|
||||
QAction *changeImageAction;
|
||||
QAction *saveImageAction;
|
||||
QAction *showImageAction;
|
||||
|
||||
QVector<VLabelTemplateLine> templateLines;
|
||||
QMap<int, QString> patternMaterials;
|
||||
|
||||
void SetHeightsChecked(bool enabled);
|
||||
void SetSizesChecked(bool enabled);
|
||||
|
|
@ -103,6 +106,7 @@ private:
|
|||
void SaveDefValues();
|
||||
void SaveLabelData();
|
||||
void SaveTemplateData();
|
||||
void SaveMaterialData();
|
||||
void SaveReadOnlyState();
|
||||
|
||||
void SetDefaultHeight(const QString &def);
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>3</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab">
|
||||
<attribute name="title">
|
||||
|
|
@ -1239,7 +1239,7 @@
|
|||
<property name="title">
|
||||
<string>Label data</string>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<layout class="QFormLayout" name="formLayout_2">
|
||||
<property name="fieldGrowthPolicy">
|
||||
<enum>QFormLayout::ExpandingFieldsGrow</enum>
|
||||
</property>
|
||||
|
|
@ -1322,6 +1322,48 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_2">
|
||||
<property name="title">
|
||||
<string>Materials</string>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<property name="fieldGrowthPolicy">
|
||||
<enum>QFormLayout::ExpandingFieldsGrow</enum>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_14">
|
||||
<property name="text">
|
||||
<string>Pattern materials:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QPushButton" name="pushButtonPatternMaterials">
|
||||
<property name="toolTip">
|
||||
<string>Manage list of pattern materials</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Manage</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>90</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,9 @@ HEADERS += \
|
|||
$$PWD/configpages/preferencesconfigurationpage.h \
|
||||
$$PWD/configpages/preferencespatternpage.h \
|
||||
$$PWD/configpages/preferencespathpage.h \
|
||||
$$PWD/dialogdatetimeformats.h
|
||||
$$PWD/dialogdatetimeformats.h \
|
||||
$$PWD/dialogknownmaterials.h \
|
||||
$$PWD/dialogpatternmaterials.h
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/dialogincrements.cpp \
|
||||
|
|
@ -34,7 +36,9 @@ SOURCES += \
|
|||
$$PWD/configpages/preferencesconfigurationpage.cpp \
|
||||
$$PWD/configpages/preferencespatternpage.cpp \
|
||||
$$PWD/configpages/preferencespathpage.cpp \
|
||||
$$PWD/dialogdatetimeformats.cpp
|
||||
$$PWD/dialogdatetimeformats.cpp \
|
||||
$$PWD/dialogknownmaterials.cpp \
|
||||
$$PWD/dialogpatternmaterials.cpp
|
||||
|
||||
FORMS += \
|
||||
$$PWD/dialogincrements.ui \
|
||||
|
|
@ -51,4 +55,6 @@ FORMS += \
|
|||
$$PWD/configpages/preferencesconfigurationpage.ui \
|
||||
$$PWD/configpages/preferencespatternpage.ui \
|
||||
$$PWD/configpages/preferencespathpage.ui \
|
||||
$$PWD/dialogdatetimeformats.ui
|
||||
$$PWD/dialogdatetimeformats.ui \
|
||||
$$PWD/dialogknownmaterials.ui \
|
||||
$$PWD/dialogpatternmaterials.ui
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ void VPattern::Parse(const Document &parse)
|
|||
QStringList tags = QStringList() << TagDraw << TagIncrements << TagDescription << TagNotes
|
||||
<< TagMeasurements << TagVersion << TagGradation << TagImage << TagUnit
|
||||
<< TagPatternName << TagPatternNum << TagCompanyName << TagCustomerName
|
||||
<< TagPatternLabel;
|
||||
<< TagPatternLabel << TagPatternMaterials;
|
||||
PrepareForParse(parse);
|
||||
QDomNode domNode = documentElement().firstChild();
|
||||
while (domNode.isNull() == false)
|
||||
|
|
@ -223,6 +223,9 @@ void VPattern::Parse(const Document &parse)
|
|||
case 13: // TagPatternLabel
|
||||
qCDebug(vXML, "Pattern label.");
|
||||
break;
|
||||
case 14: // TagPatternMaterials
|
||||
qCDebug(vXML, "Pattern materials.");
|
||||
break;
|
||||
default:
|
||||
qCDebug(vXML, "Wrong tag name %s", qUtf8Printable(domElement.tagName()));
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
<file>schema/pattern/v0.5.0.xsd</file>
|
||||
<file>schema/pattern/v0.5.1.xsd</file>
|
||||
<file>schema/pattern/v0.6.0.xsd</file>
|
||||
<file>schema/pattern/v0.6.1.xsd</file>
|
||||
<file>schema/standard_measurements/v0.3.0.xsd</file>
|
||||
<file>schema/standard_measurements/v0.4.0.xsd</file>
|
||||
<file>schema/standard_measurements/v0.4.1.xsd</file>
|
||||
|
|
|
|||
955
src/libs/ifc/schema/pattern/v0.6.1.xsd
Normal file
955
src/libs/ifc/schema/pattern/v0.6.1.xsd
Normal file
|
|
@ -0,0 +1,955 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
|
||||
<!-- XML Schema Generated from XML Document-->
|
||||
<xs:element name="pattern">
|
||||
<xs:complexType>
|
||||
<xs:sequence minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:element name="version" type="formatVersion"/>
|
||||
<xs:element name="unit" type="units"/>
|
||||
<xs:element name="image" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:simpleContent>
|
||||
<xs:extension base="xs:string">
|
||||
<xs:attribute name="extension" type="imageExtension"/>
|
||||
</xs:extension>
|
||||
</xs:simpleContent>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="notes" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="gradation" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="heights">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="all" type="xs:boolean" use="required"/>
|
||||
<xs:attribute name="h50" type="xs:boolean"/>
|
||||
<xs:attribute name="h56" type="xs:boolean"/>
|
||||
<xs:attribute name="h62" type="xs:boolean"/>
|
||||
<xs:attribute name="h68" type="xs:boolean"/>
|
||||
<xs:attribute name="h74" type="xs:boolean"/>
|
||||
<xs:attribute name="h80" type="xs:boolean"/>
|
||||
<xs:attribute name="h86" type="xs:boolean"/>
|
||||
<xs:attribute name="h92" type="xs:boolean"/>
|
||||
<xs:attribute name="h98" type="xs:boolean"/>
|
||||
<xs:attribute name="h104" type="xs:boolean"/>
|
||||
<xs:attribute name="h110" type="xs:boolean"/>
|
||||
<xs:attribute name="h116" type="xs:boolean"/>
|
||||
<xs:attribute name="h122" type="xs:boolean"/>
|
||||
<xs:attribute name="h128" type="xs:boolean"/>
|
||||
<xs:attribute name="h134" type="xs:boolean"/>
|
||||
<xs:attribute name="h140" type="xs:boolean"/>
|
||||
<xs:attribute name="h146" type="xs:boolean"/>
|
||||
<xs:attribute name="h152" type="xs:boolean"/>
|
||||
<xs:attribute name="h158" type="xs:boolean"/>
|
||||
<xs:attribute name="h164" type="xs:boolean"/>
|
||||
<xs:attribute name="h170" type="xs:boolean"/>
|
||||
<xs:attribute name="h176" type="xs:boolean"/>
|
||||
<xs:attribute name="h182" type="xs:boolean"/>
|
||||
<xs:attribute name="h188" type="xs:boolean"/>
|
||||
<xs:attribute name="h194" type="xs:boolean"/>
|
||||
<xs:attribute name="h200" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="sizes">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="all" type="xs:boolean" use="required"/>
|
||||
<xs:attribute name="s22" type="xs:boolean"/>
|
||||
<xs:attribute name="s24" type="xs:boolean"/>
|
||||
<xs:attribute name="s26" type="xs:boolean"/>
|
||||
<xs:attribute name="s28" type="xs:boolean"/>
|
||||
<xs:attribute name="s30" type="xs:boolean"/>
|
||||
<xs:attribute name="s32" type="xs:boolean"/>
|
||||
<xs:attribute name="s34" type="xs:boolean"/>
|
||||
<xs:attribute name="s36" type="xs:boolean"/>
|
||||
<xs:attribute name="s38" type="xs:boolean"/>
|
||||
<xs:attribute name="s40" type="xs:boolean"/>
|
||||
<xs:attribute name="s42" type="xs:boolean"/>
|
||||
<xs:attribute name="s44" type="xs:boolean"/>
|
||||
<xs:attribute name="s46" type="xs:boolean"/>
|
||||
<xs:attribute name="s48" type="xs:boolean"/>
|
||||
<xs:attribute name="s50" type="xs:boolean"/>
|
||||
<xs:attribute name="s52" type="xs:boolean"/>
|
||||
<xs:attribute name="s54" type="xs:boolean"/>
|
||||
<xs:attribute name="s56" type="xs:boolean"/>
|
||||
<xs:attribute name="s58" type="xs:boolean"/>
|
||||
<xs:attribute name="s60" type="xs:boolean"/>
|
||||
<xs:attribute name="s62" type="xs:boolean"/>
|
||||
<xs:attribute name="s64" type="xs:boolean"/>
|
||||
<xs:attribute name="s66" type="xs:boolean"/>
|
||||
<xs:attribute name="s68" type="xs:boolean"/>
|
||||
<xs:attribute name="s70" type="xs:boolean"/>
|
||||
<xs:attribute name="s72" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="custom" type="xs:boolean"/>
|
||||
<xs:attribute name="defHeight" type="baseHeight"/>
|
||||
<xs:attribute name="defSize" type="baseSize"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="patternName" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="patternNumber" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="company" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="customer" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="patternLabel" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="line" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="text" type="xs:string" use="required"/>
|
||||
<xs:attribute name="bold" type="xs:boolean"/>
|
||||
<xs:attribute name="italic" type="xs:boolean"/>
|
||||
<xs:attribute name="alignment" type="alignmentType"/>
|
||||
<xs:attribute name="sfIncrement" type="xs:unsignedInt"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="dateFormat" type="xs:string"/>
|
||||
<xs:attribute name="timeFormat" type="xs:string"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="material" minOccurs="0" maxOccurs="9">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="number" type="userMaterialType" use="required"/>
|
||||
<xs:attribute name="name" type="xs:string"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="measurements" type="xs:string"/>
|
||||
<xs:element name="increments" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:element name="increment" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="description" type="xs:string" use="required"/>
|
||||
<xs:attribute name="name" type="shortName" use="required"/>
|
||||
<xs:attribute name="formula" type="xs:string" use="required"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
<xs:unique name="incrementName">
|
||||
<xs:selector xpath="increment"/>
|
||||
<xs:field xpath="@name"/>
|
||||
</xs:unique>
|
||||
</xs:element>
|
||||
<xs:element name="draw" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="calculation" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:choice minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:element name="point" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="x" type="xs:double"/>
|
||||
<xs:attribute name="y" type="xs:double"/>
|
||||
<xs:attribute name="mx" type="xs:double"/>
|
||||
<xs:attribute name="my" type="xs:double"/>
|
||||
<xs:attribute name="type" type="xs:string"/>
|
||||
<xs:attribute name="name" type="shortName"/>
|
||||
<xs:attribute name="firstPoint" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="secondPoint" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="thirdPoint" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="basePoint" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="pShoulder" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="p1Line" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="p2Line" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="length" type="xs:string"/>
|
||||
<xs:attribute name="angle" type="xs:string"/>
|
||||
<xs:attribute name="typeLine" type="linePenStyle"/>
|
||||
<xs:attribute name="splinePath" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="spline" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="p1Line1" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="p1Line2" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="p2Line1" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="p2Line2" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="center" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="radius" type="xs:string"/>
|
||||
<xs:attribute name="axisP1" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="axisP2" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="arc" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="elArc" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="curve" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="curve1" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="curve2" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="lineColor" type="colors"/>
|
||||
<xs:attribute name="color" type="colors"/>
|
||||
<xs:attribute name="firstArc" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="secondArc" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="crossPoint" type="crossType"/>
|
||||
<xs:attribute name="vCrossPoint" type="crossType"/>
|
||||
<xs:attribute name="hCrossPoint" type="crossType"/>
|
||||
<xs:attribute name="c1Center" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="c2Center" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="c1Radius" type="xs:string"/>
|
||||
<xs:attribute name="c2Radius" type="xs:string"/>
|
||||
<xs:attribute name="cRadius" type="xs:string"/>
|
||||
<xs:attribute name="tangent" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="cCenter" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="name1" type="shortName"/>
|
||||
<xs:attribute name="mx1" type="xs:double"/>
|
||||
<xs:attribute name="my1" type="xs:double"/>
|
||||
<xs:attribute name="name2" type="shortName"/>
|
||||
<xs:attribute name="mx2" type="xs:double"/>
|
||||
<xs:attribute name="my2" type="xs:double"/>
|
||||
<xs:attribute name="point1" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="point2" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="dartP1" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="dartP2" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="dartP3" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="baseLineP1" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="baseLineP2" type="xs:unsignedInt"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="line" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="firstPoint" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="secondPoint" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="typeLine" type="linePenStyle"/>
|
||||
<xs:attribute name="lineColor" type="colors"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="operation" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="source" minOccurs="1" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="item" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="destination" minOccurs="1" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="item" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="mx" type="xs:double"/>
|
||||
<xs:attribute name="my" type="xs:double"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="center" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="angle" type="xs:string"/>
|
||||
<xs:attribute name="length" type="xs:string"/>
|
||||
<xs:attribute name="suffix" type="xs:string"/>
|
||||
<xs:attribute name="type" type="xs:string" use="required"/>
|
||||
<xs:attribute name="p1Line" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="p2Line" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="axisType" type="axisType"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="arc" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="angle1" type="xs:string"/>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="angle2" type="xs:string"/>
|
||||
<xs:attribute name="radius" type="xs:string"/>
|
||||
<xs:attribute name="center" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="type" type="xs:string"/>
|
||||
<xs:attribute name="color" type="colors"/>
|
||||
<xs:attribute name="penStyle" type="curvePenStyle"/>
|
||||
<xs:attribute name="length" type="xs:string"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="elArc" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="angle1" type="xs:string"/>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="angle2" type="xs:string"/>
|
||||
<xs:attribute name="rotationAngle" type="xs:string"/>
|
||||
<xs:attribute name="radius1" type="xs:string"/>
|
||||
<xs:attribute name="radius2" type="xs:string"/>
|
||||
<xs:attribute name="center" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="type" type="xs:string"/>
|
||||
<xs:attribute name="color" type="colors"/>
|
||||
<xs:attribute name="penStyle" type="curvePenStyle"/>
|
||||
<xs:attribute name="length" type="xs:string"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="spline" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="pathPoint" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="kAsm2" type="xs:string"/>
|
||||
<xs:attribute name="pSpline" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="angle" type="xs:string"/>
|
||||
<xs:attribute name="angle1" type="xs:string"/>
|
||||
<xs:attribute name="angle2" type="xs:string"/>
|
||||
<xs:attribute name="length1" type="xs:string"/>
|
||||
<xs:attribute name="length2" type="xs:string"/>
|
||||
<xs:attribute name="kAsm1" type="xs:string"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="kCurve" type="xs:double"/>
|
||||
<xs:attribute name="type" type="xs:string"/>
|
||||
<xs:attribute name="kAsm1" type="xs:double"/>
|
||||
<xs:attribute name="kAsm2" type="xs:double"/>
|
||||
<xs:attribute name="angle1" type="xs:string"/>
|
||||
<xs:attribute name="angle2" type="xs:string"/>
|
||||
<xs:attribute name="length1" type="xs:string"/>
|
||||
<xs:attribute name="length2" type="xs:string"/>
|
||||
<xs:attribute name="point1" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="point2" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="point3" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="point4" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="color" type="colors"/>
|
||||
<xs:attribute name="penStyle" type="curvePenStyle"/>
|
||||
<xs:attribute name="duplicate" type="xs:unsignedInt"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:choice>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="modeling" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:choice minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:element name="point" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="idObject" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="mx" type="xs:double"/>
|
||||
<xs:attribute name="my" type="xs:double"/>
|
||||
<xs:attribute name="type" type="xs:string"/>
|
||||
<xs:attribute name="idTool" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="inUse" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="arc" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="idObject" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="type" type="xs:string"/>
|
||||
<xs:attribute name="idTool" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="inUse" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="elArc" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="idObject" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="type" type="xs:string"/>
|
||||
<xs:attribute name="idTool" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="inUse" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="spline" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="idObject" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="type" type="xs:string"/>
|
||||
<xs:attribute name="idTool" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="inUse" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="path" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="nodes" minOccurs="1" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="node" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="type" type="xs:string" use="required"/>
|
||||
<xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="reverse" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="excluded" type="xs:boolean"/>
|
||||
<xs:attribute name="before" type="xs:double"/>
|
||||
<xs:attribute name="after" type="xs:double"/>
|
||||
<xs:attribute name="angle" type="nodeAngle"/>
|
||||
<xs:attribute name="passmark" type="xs:boolean"/>
|
||||
<xs:attribute name="passmarkLine" type="passmarkLineType"/>
|
||||
<xs:attribute name="passmarkAngle" type="passmarkAngleType"/>
|
||||
<xs:attribute name="showSecondPassmark" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="type" type="piecePathType"/>
|
||||
<xs:attribute name="idTool" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="inUse" type="xs:boolean"/>
|
||||
<xs:attribute name="name" type="xs:string"/>
|
||||
<xs:attribute name="typeLine" type="curvePenStyle"/>
|
||||
<xs:attribute name="cut" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="tools" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="det" minOccurs="2" maxOccurs="2">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="nodes" minOccurs="1" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="node" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="type" type="xs:string" use="required"/>
|
||||
<xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="reverse" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="excluded" type="xs:boolean"/>
|
||||
<xs:attribute name="before" type="xs:string"/>
|
||||
<xs:attribute name="after" type="xs:string"/>
|
||||
<xs:attribute name="angle" type="nodeAngle"/>
|
||||
<xs:attribute name="passmark" type="xs:boolean"/>
|
||||
<xs:attribute name="passmarkLine" type="passmarkLineType"/>
|
||||
<xs:attribute name="passmarkAngle" type="passmarkAngleType"/>
|
||||
<xs:attribute name="showSecondPassmark" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="csa" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="record" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="start" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="path" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="end" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="reverse" type="xs:boolean"/>
|
||||
<xs:attribute name="includeAs" type="piecePathIncludeType"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="iPaths" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="record" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="path" type="xs:unsignedInt" use="required"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="pins" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="record" type="xs:unsignedInt" minOccurs="1" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="children" minOccurs="1" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="nodes" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="child" type="xs:unsignedInt" minOccurs="1" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="csa" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="iPaths" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="pins" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="type" type="xs:string"/>
|
||||
<xs:attribute name="indexD1" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="indexD2" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="inUse" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:choice>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="details" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="detail" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="data" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="line" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="text" type="xs:string" use="required"/>
|
||||
<xs:attribute name="bold" type="xs:boolean"/>
|
||||
<xs:attribute name="italic" type="xs:boolean"/>
|
||||
<xs:attribute name="alignment" type="alignmentType"/>
|
||||
<xs:attribute name="sfIncrement" type="xs:unsignedInt"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="letter" type="xs:string"/>
|
||||
<xs:attribute name="annotation" type="xs:string"/>
|
||||
<xs:attribute name="orientation" type="xs:string"/>
|
||||
<xs:attribute name="rotationWay" type="xs:string"/>
|
||||
<xs:attribute name="tilt" type="xs:string"/>
|
||||
<xs:attribute name="foldPosition" type="xs:string"/>
|
||||
<xs:attribute name="visible" type="xs:boolean"/>
|
||||
<xs:attribute name="onFold" type="xs:boolean"/>
|
||||
<xs:attribute name="fontSize" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="mx" type="xs:double"/>
|
||||
<xs:attribute name="my" type="xs:double"/>
|
||||
<xs:attribute name="width" type="xs:string"/>
|
||||
<xs:attribute name="height" type="xs:string"/>
|
||||
<xs:attribute name="rotation" type="xs:string"/>
|
||||
<xs:attribute name="centerPin" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="topLeftPin" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="quantity" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="bottomRightPin" type="xs:unsignedInt"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="patternInfo" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="visible" type="xs:boolean"/>
|
||||
<xs:attribute name="fontSize" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="mx" type="xs:double"/>
|
||||
<xs:attribute name="my" type="xs:double"/>
|
||||
<xs:attribute name="width" type="xs:string"/>
|
||||
<xs:attribute name="height" type="xs:string"/>
|
||||
<xs:attribute name="rotation" type="xs:string"/>
|
||||
<xs:attribute name="centerPin" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="topLeftPin" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="bottomRightPin" type="xs:unsignedInt"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="grainline" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="visible" type="xs:boolean"/>
|
||||
<xs:attribute name="mx" type="xs:double"/>
|
||||
<xs:attribute name="my" type="xs:double"/>
|
||||
<xs:attribute name="length" type="xs:string"/>
|
||||
<xs:attribute name="rotation" type="xs:string"/>
|
||||
<xs:attribute name="arrows" type="arrowType"/>
|
||||
<xs:attribute name="centerPin" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="topPin" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="bottomPin" type="xs:unsignedInt"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="nodes" minOccurs="1" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="node" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="type" type="xs:string" use="required"/>
|
||||
<xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="reverse" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="excluded" type="xs:boolean"/>
|
||||
<xs:attribute name="before" type="xs:string"/>
|
||||
<xs:attribute name="after" type="xs:string"/>
|
||||
<xs:attribute name="angle" type="nodeAngle"/>
|
||||
<xs:attribute name="mx" type="xs:double"/>
|
||||
<xs:attribute name="my" type="xs:double"/>
|
||||
<xs:attribute name="passmark" type="xs:boolean"/>
|
||||
<xs:attribute name="passmarkLine" type="passmarkLineType"/>
|
||||
<xs:attribute name="passmarkAngle" type="passmarkAngleType"/>
|
||||
<xs:attribute name="showSecondPassmark" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="csa" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="record" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="start" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="path" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="end" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="reverse" type="xs:boolean"/>
|
||||
<xs:attribute name="includeAs" type="piecePathIncludeType"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="iPaths" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="record" minOccurs="1" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="path" type="xs:unsignedInt" use="required"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="pins" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="record" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="version" type="pieceVersion"/>
|
||||
<xs:attribute name="mx" type="xs:double"/>
|
||||
<xs:attribute name="my" type="xs:double"/>
|
||||
<xs:attribute name="name" type="xs:string"/>
|
||||
<xs:attribute name="inLayout" type="xs:boolean"/>
|
||||
<xs:attribute name="forbidFlipping" type="xs:boolean"/>
|
||||
<xs:attribute name="width" type="xs:string"/>
|
||||
<xs:attribute name="seamAllowance" type="xs:boolean"/>
|
||||
<xs:attribute name="seamAllowanceBuiltIn" type="xs:boolean"/>
|
||||
<xs:attribute name="united" type="xs:boolean"/>
|
||||
<xs:attribute name="closed" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="hideMainPath" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="groups" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="group" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="item" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="object" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="tool" type="xs:unsignedInt"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="id" type="xs:unsignedInt" use="required"/>
|
||||
<xs:attribute name="name" type="xs:string"/>
|
||||
<xs:attribute name="visible" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="name" type="xs:string"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="readOnly" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:simpleType name="shortName">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:pattern value="^([^\p{Nd}\p{Zs}*/&|!<>^\()\-−+.,٫, ٬.’=?:;'\"]){1,1}([^\p{Zs}*/&|!<>^\()\-−+.,٫, ٬.’=?:;\"]){0,}$"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="units">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="mm"/>
|
||||
<xs:enumeration value="cm"/>
|
||||
<xs:enumeration value="inch"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="measurementsTypes">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="standard"/>
|
||||
<xs:enumeration value="individual"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="formatVersion">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:pattern value="^(0|([1-9][0-9]*))\.(0|([1-9][0-9]*))\.(0|([1-9][0-9]*))$"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="imageExtension">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="PNG"/>
|
||||
<xs:enumeration value="JPG"/>
|
||||
<xs:enumeration value="BMP"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="colors">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="black"/>
|
||||
<xs:enumeration value="green"/>
|
||||
<xs:enumeration value="blue"/>
|
||||
<xs:enumeration value="darkRed"/>
|
||||
<xs:enumeration value="darkGreen"/>
|
||||
<xs:enumeration value="darkBlue"/>
|
||||
<xs:enumeration value="yellow"/>
|
||||
<xs:enumeration value="lightsalmon"/>
|
||||
<xs:enumeration value="goldenrod"/>
|
||||
<xs:enumeration value="orange"/>
|
||||
<xs:enumeration value="deeppink"/>
|
||||
<xs:enumeration value="violet"/>
|
||||
<xs:enumeration value="darkviolet"/>
|
||||
<xs:enumeration value="mediumseagreen"/>
|
||||
<xs:enumeration value="lime"/>
|
||||
<xs:enumeration value="deepskyblue"/>
|
||||
<xs:enumeration value="cornflowerblue"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="linePenStyle">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="none"/>
|
||||
<xs:enumeration value="hair"/>
|
||||
<xs:enumeration value="dashLine"/>
|
||||
<xs:enumeration value="dotLine"/>
|
||||
<xs:enumeration value="dashDotLine"/>
|
||||
<xs:enumeration value="dashDotDotLine"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="curvePenStyle">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="hair"/>
|
||||
<xs:enumeration value="dashLine"/>
|
||||
<xs:enumeration value="dotLine"/>
|
||||
<xs:enumeration value="dashDotLine"/>
|
||||
<xs:enumeration value="dashDotDotLine"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="baseHeight">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="50"/>
|
||||
<xs:enumeration value="56"/>
|
||||
<xs:enumeration value="62"/>
|
||||
<xs:enumeration value="68"/>
|
||||
<xs:enumeration value="74"/>
|
||||
<xs:enumeration value="80"/>
|
||||
<xs:enumeration value="86"/>
|
||||
<xs:enumeration value="92"/>
|
||||
<xs:enumeration value="98"/>
|
||||
<xs:enumeration value="104"/>
|
||||
<xs:enumeration value="110"/>
|
||||
<xs:enumeration value="116"/>
|
||||
<xs:enumeration value="122"/>
|
||||
<xs:enumeration value="128"/>
|
||||
<xs:enumeration value="134"/>
|
||||
<xs:enumeration value="140"/>
|
||||
<xs:enumeration value="146"/>
|
||||
<xs:enumeration value="152"/>
|
||||
<xs:enumeration value="158"/>
|
||||
<xs:enumeration value="164"/>
|
||||
<xs:enumeration value="170"/>
|
||||
<xs:enumeration value="176"/>
|
||||
<xs:enumeration value="182"/>
|
||||
<xs:enumeration value="188"/>
|
||||
<xs:enumeration value="194"/>
|
||||
<xs:enumeration value="200"/>
|
||||
<xs:enumeration value="500"/>
|
||||
<xs:enumeration value="560"/>
|
||||
<xs:enumeration value="620"/>
|
||||
<xs:enumeration value="680"/>
|
||||
<xs:enumeration value="740"/>
|
||||
<xs:enumeration value="800"/>
|
||||
<xs:enumeration value="860"/>
|
||||
<xs:enumeration value="920"/>
|
||||
<xs:enumeration value="980"/>
|
||||
<xs:enumeration value="1040"/>
|
||||
<xs:enumeration value="1100"/>
|
||||
<xs:enumeration value="1160"/>
|
||||
<xs:enumeration value="1220"/>
|
||||
<xs:enumeration value="1280"/>
|
||||
<xs:enumeration value="1340"/>
|
||||
<xs:enumeration value="1400"/>
|
||||
<xs:enumeration value="1460"/>
|
||||
<xs:enumeration value="1520"/>
|
||||
<xs:enumeration value="1580"/>
|
||||
<xs:enumeration value="1640"/>
|
||||
<xs:enumeration value="1700"/>
|
||||
<xs:enumeration value="1760"/>
|
||||
<xs:enumeration value="1820"/>
|
||||
<xs:enumeration value="1880"/>
|
||||
<xs:enumeration value="1940"/>
|
||||
<xs:enumeration value="2000"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="baseSize">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="22"/>
|
||||
<xs:enumeration value="24"/>
|
||||
<xs:enumeration value="26"/>
|
||||
<xs:enumeration value="28"/>
|
||||
<xs:enumeration value="30"/>
|
||||
<xs:enumeration value="32"/>
|
||||
<xs:enumeration value="34"/>
|
||||
<xs:enumeration value="36"/>
|
||||
<xs:enumeration value="38"/>
|
||||
<xs:enumeration value="40"/>
|
||||
<xs:enumeration value="42"/>
|
||||
<xs:enumeration value="44"/>
|
||||
<xs:enumeration value="46"/>
|
||||
<xs:enumeration value="48"/>
|
||||
<xs:enumeration value="50"/>
|
||||
<xs:enumeration value="52"/>
|
||||
<xs:enumeration value="54"/>
|
||||
<xs:enumeration value="56"/>
|
||||
<xs:enumeration value="58"/>
|
||||
<xs:enumeration value="60"/>
|
||||
<xs:enumeration value="62"/>
|
||||
<xs:enumeration value="64"/>
|
||||
<xs:enumeration value="66"/>
|
||||
<xs:enumeration value="68"/>
|
||||
<xs:enumeration value="70"/>
|
||||
<xs:enumeration value="72"/>
|
||||
<xs:enumeration value="220"/>
|
||||
<xs:enumeration value="240"/>
|
||||
<xs:enumeration value="260"/>
|
||||
<xs:enumeration value="280"/>
|
||||
<xs:enumeration value="300"/>
|
||||
<xs:enumeration value="320"/>
|
||||
<xs:enumeration value="340"/>
|
||||
<xs:enumeration value="360"/>
|
||||
<xs:enumeration value="380"/>
|
||||
<xs:enumeration value="400"/>
|
||||
<xs:enumeration value="420"/>
|
||||
<xs:enumeration value="440"/>
|
||||
<xs:enumeration value="460"/>
|
||||
<xs:enumeration value="480"/>
|
||||
<xs:enumeration value="500"/>
|
||||
<xs:enumeration value="520"/>
|
||||
<xs:enumeration value="540"/>
|
||||
<xs:enumeration value="560"/>
|
||||
<xs:enumeration value="580"/>
|
||||
<xs:enumeration value="600"/>
|
||||
<xs:enumeration value="620"/>
|
||||
<xs:enumeration value="640"/>
|
||||
<xs:enumeration value="660"/>
|
||||
<xs:enumeration value="680"/>
|
||||
<xs:enumeration value="700"/>
|
||||
<xs:enumeration value="720"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="crossType">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="1"/>
|
||||
<xs:enumeration value="2"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="axisType">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="1"/>
|
||||
<xs:enumeration value="2"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="arrowType">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="0"/>
|
||||
<!--Both-->
|
||||
<xs:enumeration value="1"/>
|
||||
<!--Front-->
|
||||
<xs:enumeration value="2"/>
|
||||
<!--Rear-->
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="pieceVersion">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="1"/>
|
||||
<!--Old version-->
|
||||
<xs:enumeration value="2"/>
|
||||
<!--New version-->
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="nodeAngle">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="0"/>
|
||||
<!--by length-->
|
||||
<xs:enumeration value="1"/>
|
||||
<!--by points intersections-->
|
||||
<xs:enumeration value="2"/>
|
||||
<!--by second edge symmetry-->
|
||||
<xs:enumeration value="3"/>
|
||||
<!--by first edge symmetry-->
|
||||
<xs:enumeration value="4"/>
|
||||
<!--by first edge right angle-->
|
||||
<xs:enumeration value="5"/>
|
||||
<!--by first edge right angle-->
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="piecePathType">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="1"/>
|
||||
<!--custom seam allowance-->
|
||||
<xs:enumeration value="2"/>
|
||||
<!--internal path-->
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="piecePathIncludeType">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="0"/>
|
||||
<!--as main path-->
|
||||
<xs:enumeration value="1"/>
|
||||
<!--as custom seam allowance-->
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="passmarkLineType">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="one"/>
|
||||
<xs:enumeration value="two"/>
|
||||
<xs:enumeration value="three"/>
|
||||
<xs:enumeration value="tMark"/>
|
||||
<xs:enumeration value="vMark"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="passmarkAngleType">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="straightforward"/>
|
||||
<xs:enumeration value="bisector"/>
|
||||
<xs:enumeration value="intersection"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="alignmentType">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="0"/><!--default (no aligns)-->
|
||||
<xs:enumeration value="1"/><!--aligns with the left edge-->
|
||||
<xs:enumeration value="2"/><!--aligns with the right edge-->
|
||||
<xs:enumeration value="4"/><!--Centers horizontally in the available space-->
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="userMaterialType">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:minInclusive value="1"/>
|
||||
<xs:maxInclusive value="9"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:schema>
|
||||
|
|
@ -86,6 +86,8 @@ const QString VAbstractPattern::TagPatternNum = QStringLiteral("patternNum
|
|||
const QString VAbstractPattern::TagCustomerName = QStringLiteral("customer");
|
||||
const QString VAbstractPattern::TagCompanyName = QStringLiteral("company");
|
||||
const QString VAbstractPattern::TagPatternLabel = QStringLiteral("patternLabel");
|
||||
const QString VAbstractPattern::TagPatternMaterials = QStringLiteral("patternMaterials");
|
||||
const QString VAbstractPattern::TagMaterial = QStringLiteral("material");
|
||||
const QString VAbstractPattern::TagGrainline = QStringLiteral("grainline");
|
||||
const QString VAbstractPattern::TagPath = QStringLiteral("path");
|
||||
const QString VAbstractPattern::TagNodes = QStringLiteral("nodes");
|
||||
|
|
@ -121,6 +123,7 @@ const QString VAbstractPattern::AttrEnd = QStringLiteral("end");
|
|||
const QString VAbstractPattern::AttrIncludeAs = QStringLiteral("includeAs");
|
||||
const QString VAbstractPattern::AttrWidth = QStringLiteral("width");
|
||||
const QString VAbstractPattern::AttrRotation = QStringLiteral("rotation");
|
||||
const QString VAbstractPattern::AttrNumber = QStringLiteral("number");
|
||||
|
||||
const QString VAbstractPattern::AttrAll = QStringLiteral("all");
|
||||
|
||||
|
|
@ -195,6 +198,7 @@ const QString VAbstractPattern::NodeSplinePath = QStringLiteral("NodeSplinePath"
|
|||
|
||||
QHash<quint32, VDataTool*> VAbstractPattern::tools = QHash<quint32, VDataTool*>();
|
||||
QVector<VLabelTemplateLine> VAbstractPattern::patternLabelLines = QVector<VLabelTemplateLine>();
|
||||
QMap<int, QString> VAbstractPattern::patternMaterials = QMap<int, QString>();
|
||||
bool VAbstractPattern::patternLabelWasChanged = false;
|
||||
|
||||
namespace
|
||||
|
|
@ -1404,7 +1408,7 @@ QVector<VLabelTemplateLine> VAbstractPattern::GetPatternLabelTemplate() const
|
|||
if (patternLabelLines.isEmpty())
|
||||
{
|
||||
const QDomNodeList list = elementsByTagName(TagPatternLabel);
|
||||
if (list.isEmpty())
|
||||
if (list.isEmpty() || list.at(0).childNodes().count() == 0)
|
||||
{
|
||||
return QVector<VLabelTemplateLine>();
|
||||
}
|
||||
|
|
@ -1415,6 +1419,35 @@ QVector<VLabelTemplateLine> VAbstractPattern::GetPatternLabelTemplate() const
|
|||
return patternLabelLines;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VAbstractPattern::SetPatternMaterials(const QMap<int, QString> &materials)
|
||||
{
|
||||
QDomElement tag = CheckTagExists(TagPatternMaterials);
|
||||
RemoveAllChildren(tag);
|
||||
SetMaterials(tag, materials);
|
||||
patternMaterials = materials;
|
||||
patternLabelWasChanged = true;
|
||||
modified = true;
|
||||
emit patternChanged(false);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QMap<int, QString> VAbstractPattern::GetPatternMaterials() const
|
||||
{
|
||||
if (patternMaterials.isEmpty())
|
||||
{
|
||||
const QDomNodeList list = elementsByTagName(TagPatternMaterials);
|
||||
if (list.isEmpty() || list.at(0).childNodes().count() == 0)
|
||||
{
|
||||
return QMap<int, QString>();
|
||||
}
|
||||
|
||||
patternMaterials = GetMaterials(list.at(0).toElement());
|
||||
}
|
||||
|
||||
return patternMaterials;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VAbstractPattern::SetPatternWasChanged(bool changed)
|
||||
{
|
||||
|
|
@ -1569,7 +1602,7 @@ QDomElement VAbstractPattern::CheckTagExists(const QString &tag)
|
|||
{
|
||||
const QStringList tags = QStringList() << TagUnit << TagImage << TagDescription << TagNotes
|
||||
<< TagGradation << TagPatternName << TagPatternNum << TagCompanyName
|
||||
<< TagCustomerName << TagPatternLabel;
|
||||
<< TagCustomerName << TagPatternLabel << TagPatternMaterials;
|
||||
switch (tags.indexOf(tag))
|
||||
{
|
||||
case 1: //TagImage
|
||||
|
|
@ -1609,6 +1642,9 @@ QDomElement VAbstractPattern::CheckTagExists(const QString &tag)
|
|||
case 9: // TagPatternLabel
|
||||
element = createElement(TagPatternLabel);
|
||||
break;
|
||||
case 10: // TagPatternMaterials
|
||||
element = createElement(TagPatternMaterials);
|
||||
break;
|
||||
case 0: //TagUnit (Mandatory tag)
|
||||
default:
|
||||
return QDomElement();
|
||||
|
|
@ -2018,6 +2054,52 @@ QPair<bool, QMap<quint32, quint32> > VAbstractPattern::ParseItemElement(const QD
|
|||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QMap<int, QString> VAbstractPattern::GetMaterials(const QDomElement &element) const
|
||||
{
|
||||
QMap<int, QString> materials;
|
||||
|
||||
if (not element.isNull())
|
||||
{
|
||||
QDomElement tagMaterial = element.firstChildElement();
|
||||
while (tagMaterial.isNull() == false)
|
||||
{
|
||||
if (tagMaterial.tagName() == TagMaterial)
|
||||
{
|
||||
const int number = GetParametrUInt(tagMaterial, AttrNumber, "0");
|
||||
const QString name = GetParametrEmptyString(tagMaterial, AttrName);
|
||||
|
||||
if (number > 0 && number <= userMaterialPlaceholdersQuantity)
|
||||
{
|
||||
materials.insert(number, name);
|
||||
}
|
||||
}
|
||||
tagMaterial = tagMaterial.nextSiblingElement(TagMaterial);
|
||||
}
|
||||
}
|
||||
|
||||
return materials;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VAbstractPattern::SetMaterials(QDomElement &element, const QMap<int, QString> &materials)
|
||||
{
|
||||
if (not element.isNull())
|
||||
{
|
||||
QMap<int, QString>::const_iterator i = materials.constBegin();
|
||||
while (i != materials.constEnd())
|
||||
{
|
||||
QDomElement tagMaterial = createElement(TagMaterial);
|
||||
|
||||
SetAttribute(tagMaterial, AttrNumber, i.key());
|
||||
SetAttribute(tagMaterial, AttrName, i.value());
|
||||
|
||||
element.appendChild(tagMaterial);
|
||||
++i;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief IsModified state of the document for cases that do not cover QUndoStack.
|
||||
|
|
|
|||
|
|
@ -160,6 +160,9 @@ public:
|
|||
void SetPatternLabelTemplate(const QVector<VLabelTemplateLine> &lines);
|
||||
QVector<VLabelTemplateLine> GetPatternLabelTemplate() const;
|
||||
|
||||
void SetPatternMaterials(const QMap<int, QString> &materials);
|
||||
QMap<int, QString> GetPatternMaterials() const;
|
||||
|
||||
void SetPatternWasChanged(bool changed);
|
||||
bool GetPatternWasChanged() const;
|
||||
|
||||
|
|
@ -216,6 +219,8 @@ public:
|
|||
static const QString TagCompanyName;
|
||||
static const QString TagCustomerName;
|
||||
static const QString TagPatternLabel;
|
||||
static const QString TagPatternMaterials;
|
||||
static const QString TagMaterial;
|
||||
static const QString TagGrainline;
|
||||
static const QString TagPath;
|
||||
static const QString TagNodes;
|
||||
|
|
@ -251,6 +256,7 @@ public:
|
|||
static const QString AttrIncludeAs;
|
||||
static const QString AttrWidth;
|
||||
static const QString AttrRotation;
|
||||
static const QString AttrNumber;
|
||||
|
||||
static const QString AttrAll;
|
||||
|
||||
|
|
@ -395,6 +401,8 @@ protected:
|
|||
static QHash<quint32, VDataTool*> tools;
|
||||
/** @brief patternLabelLines list to speed up reading a template by many pieces. */
|
||||
static QVector<VLabelTemplateLine> patternLabelLines;
|
||||
/** @brief patternMaterials list to speed up reading materials by many pieces. */
|
||||
static QMap<int, QString> patternMaterials;
|
||||
static bool patternLabelWasChanged;
|
||||
|
||||
static void ToolExists(const quint32 &id);
|
||||
|
|
@ -431,6 +439,9 @@ private:
|
|||
|
||||
QPair<bool, QMap<quint32, quint32> > ParseItemElement(const QDomElement &domElement);
|
||||
|
||||
QMap<int, QString> GetMaterials(const QDomElement &element) const;
|
||||
void SetMaterials(QDomElement &element, const QMap<int, QString> &materials);
|
||||
|
||||
};
|
||||
|
||||
#endif // VABSTRACTPATTERN_H
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ class QDomElement;
|
|||
*/
|
||||
|
||||
const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0");
|
||||
const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.6.0");
|
||||
const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.6.0.xsd");
|
||||
const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.6.1");
|
||||
const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.6.1.xsd");
|
||||
|
||||
//VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!!
|
||||
//VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!!
|
||||
|
|
@ -241,6 +241,8 @@ QString VPatternConverter::XSDSchema(int ver) const
|
|||
case (0x000501):
|
||||
return QStringLiteral("://schema/pattern/v0.5.1.xsd");
|
||||
case (0x000600):
|
||||
return QStringLiteral("://schema/pattern/v0.6.0.xsd");
|
||||
case (0x000601):
|
||||
return CurrentSchema;
|
||||
default:
|
||||
InvalidVersion(ver);
|
||||
|
|
@ -391,6 +393,10 @@ void VPatternConverter::ApplyPatches()
|
|||
ValidateXML(XSDSchema(0x000600), m_convertedFileName);
|
||||
V_FALLTHROUGH
|
||||
case (0x000600):
|
||||
ToV0_6_1();
|
||||
ValidateXML(XSDSchema(0x000601), m_convertedFileName);
|
||||
V_FALLTHROUGH
|
||||
case (0x000601):
|
||||
break;
|
||||
default:
|
||||
InvalidVersion(m_ver);
|
||||
|
|
@ -409,7 +415,7 @@ void VPatternConverter::DowngradeToCurrentMaxVersion()
|
|||
bool VPatternConverter::IsReadOnly() const
|
||||
{
|
||||
// Check if attribute readOnly was not changed in file format
|
||||
Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == CONVERTER_VERSION_CHECK(0, 6, 0),
|
||||
Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == CONVERTER_VERSION_CHECK(0, 6, 1),
|
||||
"Check attribute readOnly.");
|
||||
|
||||
// Possibly in future attribute readOnly will change position etc.
|
||||
|
|
@ -812,6 +818,16 @@ void VPatternConverter::ToV0_6_0()
|
|||
Save();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VPatternConverter::ToV0_6_1()
|
||||
{
|
||||
// TODO. Delete if minimal supported version is 0.6.1
|
||||
Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < CONVERTER_VERSION_CHECK(0, 6, 1),
|
||||
"Time to refactor the code.");
|
||||
SetVersion(QStringLiteral("0.6.1"));
|
||||
Save();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VPatternConverter::TagUnitToV0_2_0()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public:
|
|||
static const QString PatternMaxVerStr;
|
||||
static const QString CurrentSchema;
|
||||
static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0);
|
||||
static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 6, 0);
|
||||
static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 6, 1);
|
||||
|
||||
protected:
|
||||
virtual int MinVer() const Q_DECL_OVERRIDE;
|
||||
|
|
@ -106,6 +106,7 @@ private:
|
|||
void ToV0_5_0();
|
||||
void ToV0_5_1();
|
||||
void ToV0_6_0();
|
||||
void ToV0_6_1();
|
||||
|
||||
void TagUnitToV0_2_0();
|
||||
void TagIncrementToV0_2_0();
|
||||
|
|
|
|||
|
|
@ -102,6 +102,20 @@ QMap<QString, QString> PreparePlaceholders(const VAbstractPattern *doc)
|
|||
placeholders.insert(pl_height, curHeight);
|
||||
placeholders.insert(pl_mExt, mExt);
|
||||
|
||||
const QMap<int, QString> materials = doc->GetPatternMaterials();
|
||||
for (int i = 0; i < userMaterialPlaceholdersQuantity; ++i)
|
||||
{
|
||||
const QString number = QString::number(i + 1);
|
||||
|
||||
QString value;
|
||||
if (materials.contains(i + 1))
|
||||
{
|
||||
value = materials.value(i + 1);
|
||||
}
|
||||
|
||||
placeholders.insert(pl_userMaterial + number, value);
|
||||
}
|
||||
|
||||
// Piece tags
|
||||
placeholders.insert(pl_pLetter, "");
|
||||
placeholders.insert(pl_pAnnotation, "");
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@ const QString pl_patternName = QStringLiteral("patternName");
|
|||
const QString pl_patternNumber = QStringLiteral("patternNumber");
|
||||
const QString pl_author = QStringLiteral("author");
|
||||
const QString pl_customer = QStringLiteral("customer");
|
||||
const QString pl_userMaterial = QStringLiteral("userMaterial");
|
||||
const QString pl_pExt = QStringLiteral("pExt");
|
||||
const QString pl_pFileName = QStringLiteral("pFileName");
|
||||
const QString pl_mFileName = QStringLiteral("mFileName");
|
||||
|
|
@ -144,6 +145,7 @@ const QStringList labelTemplatePlaceholders = QStringList() << pl_size
|
|||
<< pl_patternNumber
|
||||
<< pl_author
|
||||
<< pl_customer
|
||||
<< pl_userMaterial
|
||||
<< pl_pExt
|
||||
<< pl_pFileName
|
||||
<< pl_mFileName
|
||||
|
|
|
|||
|
|
@ -359,6 +359,7 @@ extern const QString pl_patternName;
|
|||
extern const QString pl_patternNumber;
|
||||
extern const QString pl_author;
|
||||
extern const QString pl_customer;
|
||||
extern const QString pl_userMaterial;
|
||||
extern const QString pl_pExt;
|
||||
extern const QString pl_pFileName;
|
||||
extern const QString pl_mFileName;
|
||||
|
|
@ -378,6 +379,8 @@ extern const QString pl_mInterlining;
|
|||
extern const QString pl_wCut;
|
||||
extern const QString pl_wOnFold;
|
||||
|
||||
const int userMaterialPlaceholdersQuantity = 9;
|
||||
|
||||
extern const QStringList labelTemplatePlaceholders;
|
||||
|
||||
extern const QString cursorArrowOpenHand;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,9 @@ const QString settingConfigurationLabelLanguage = QStringLiteral("configuration/
|
|||
const QString settingPathsPattern = QStringLiteral("paths/pattern");
|
||||
const QString settingPathsLayout = QStringLiteral("paths/layout");
|
||||
|
||||
const QString settingPatternGraphicalOutput = QStringLiteral("pattern/graphicalOutput");
|
||||
const QString settingPatternGraphicalOutput = QStringLiteral("pattern/graphicalOutput");
|
||||
const QString settingPatternKnownMaterials = QStringLiteral("pattern/knownMaterials");
|
||||
const QString settingPatternRememberMaterials = QStringLiteral("pattern/rememberMaterials");
|
||||
|
||||
const QString settingCommunityServer = QStringLiteral("community/server");
|
||||
const QString settingCommunityServerSecure = QStringLiteral("community/serverSecure");
|
||||
|
|
@ -606,3 +608,26 @@ void VSettings::SetTextAsPaths(bool value)
|
|||
setValue(settingTextAsPaths, value);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QStringList VSettings::GetKnownMaterials() const
|
||||
{
|
||||
return value(settingPatternKnownMaterials, QStringList()).toStringList();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VSettings::SetKnownMaterials(const QStringList &list)
|
||||
{
|
||||
setValue(settingPatternKnownMaterials, list);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
bool VSettings::IsRememberPatternMaterials() const
|
||||
{
|
||||
return value(settingPatternRememberMaterials, true).toBool();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VSettings::SetRememberPatternMaterials(bool value)
|
||||
{
|
||||
setValue(settingPatternRememberMaterials, value);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -155,6 +155,12 @@ public:
|
|||
static bool GetDefTextAsPaths();
|
||||
void SetTextAsPaths(bool value);
|
||||
|
||||
QStringList GetKnownMaterials() const;
|
||||
void SetKnownMaterials(const QStringList &list);
|
||||
|
||||
bool IsRememberPatternMaterials() const;
|
||||
void SetRememberPatternMaterials(bool value);
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VSettings)
|
||||
};
|
||||
|
|
|
|||
|
|
@ -465,6 +465,7 @@ void VTranslateVars::InitPlaceholder()
|
|||
placeholders.insert(pl_patternNumber, translate("VTranslateVars", "patternNumber", "placeholder"));
|
||||
placeholders.insert(pl_author, translate("VTranslateVars", "author", "placeholder"));
|
||||
placeholders.insert(pl_customer, translate("VTranslateVars", "customer", "placeholder"));
|
||||
placeholders.insert(pl_userMaterial, translate("VTranslateVars", "userMaterial", "placeholder"));
|
||||
placeholders.insert(pl_pExt, translate("VTranslateVars", "pExt", "placeholder"));
|
||||
placeholders.insert(pl_pFileName, translate("VTranslateVars", "pFileName", "placeholder"));
|
||||
placeholders.insert(pl_mFileName, translate("VTranslateVars", "mFileName", "placeholder"));
|
||||
|
|
@ -687,11 +688,18 @@ QString VTranslateVars::InternalVarToUser(const QString &var) const
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QString VTranslateVars::PlaceholderToUser(const QString &var) const
|
||||
QString VTranslateVars::PlaceholderToUser(QString var) const
|
||||
{
|
||||
QString number;
|
||||
if (var.startsWith(pl_userMaterial) && var.length() > pl_userMaterial.length())
|
||||
{
|
||||
number = var.right(var.length() - pl_userMaterial.length());
|
||||
var = pl_userMaterial;
|
||||
}
|
||||
|
||||
if (placeholders.contains(var))
|
||||
{
|
||||
return placeholders.value(var).translate();
|
||||
return placeholders.value(var).translate() + number;
|
||||
}
|
||||
|
||||
return var;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public:
|
|||
bool VariablesToUser(QString &newFormula, int position, const QString &token, int &bias) const;
|
||||
|
||||
QString InternalVarToUser(const QString &var) const;
|
||||
QString PlaceholderToUser(const QString &var) const;
|
||||
QString PlaceholderToUser(QString var) const;
|
||||
|
||||
QString PlaceholderToUserText(QString text) const;
|
||||
QString PlaceholderFromUserText(QString text) const;
|
||||
|
|
|
|||
|
|
@ -506,6 +506,21 @@ void DialogEditLabel::InitPlaceholders()
|
|||
m_placeholders.insert(pl_height, qMakePair(tr("Height"), curHeight));
|
||||
m_placeholders.insert(pl_mExt, qMakePair(tr("Measurments extension"), mExt));
|
||||
|
||||
const QString materialDescription = tr("User material");
|
||||
const QMap<int, QString> materials = m_doc->GetPatternMaterials();
|
||||
for (int i = 0; i < userMaterialPlaceholdersQuantity; ++i)
|
||||
{
|
||||
const QString number = QString::number(i + 1);
|
||||
|
||||
QString value;
|
||||
if (materials.contains(i + 1))
|
||||
{
|
||||
value = materials.value(i + 1);
|
||||
}
|
||||
|
||||
m_placeholders.insert(pl_userMaterial + number, qMakePair(materialDescription + number, value));
|
||||
}
|
||||
|
||||
// Piece tags
|
||||
m_placeholders.insert(pl_pLetter, qMakePair(tr("Piece letter"), QString("")));
|
||||
m_placeholders.insert(pl_pAnnotation, qMakePair(tr("Piece annotation"), QString("")));
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user