From 3f4f6052537b068a571be143e5e72b1311c4ab69 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 21 Aug 2016 13:11:14 +0300 Subject: [PATCH 01/34] Qt::AA_UseHighDpiPixmaps was introduced since Qt 5.1. --HG-- branch : develop --- src/libs/vmisc/vabstractapplication.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp index 117ef8032..b3ef4034c 100644 --- a/src/libs/vmisc/vabstractapplication.cpp +++ b/src/libs/vmisc/vabstractapplication.cpp @@ -78,8 +78,10 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv) #endif // QT_VERSION < QT_VERSION_CHECK(5, 3, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) // Enable support for HiDPI bitmap resources setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif connect(this, &QApplication::aboutToQuit, [this]() { From b0a7af152a5d179ed222101bfd53a72393aca1b9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 21 Aug 2016 13:19:42 +0300 Subject: [PATCH 02/34] was introduced since Qt 5.1. --HG-- branch : develop --- src/libs/vmisc/backport/qmarginsf.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libs/vmisc/backport/qmarginsf.cpp b/src/libs/vmisc/backport/qmarginsf.cpp index 8b3be1d22..b683ba242 100644 --- a/src/libs/vmisc/backport/qmarginsf.cpp +++ b/src/libs/vmisc/backport/qmarginsf.cpp @@ -33,7 +33,10 @@ #include "qmarginsf.h" +#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) #include +#endif + #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) #include #include From bfff8ccb969e374e0d92999daecba22c07071c93 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 21 Aug 2016 18:57:08 +0300 Subject: [PATCH 03/34] Changes for returning support Qt 5.0 and GCC 4.6. --HG-- branch : develop --- .../configpages/tapeconfigurationpage.cpp | 2 +- src/app/tape/tape.pro | 18 +++--- src/app/tape/tmainwindow.cpp | 13 +++- src/app/valentina/mainwindow.cpp | 15 +++-- src/libs/vdxf/dxflib/dl_writer_ascii.cpp | 3 + src/libs/vmisc/abstracttest.h | 14 ++++- src/libs/vmisc/backport/qsavefile.cpp | 4 +- src/libs/vmisc/backport/qsavefile_p.h | 2 + src/libs/vmisc/debugbreak.h | 10 ++-- src/libs/vmisc/vlockguard.h | 6 +- src/libs/vmisc/vsysexits.h | 59 +++++++++++-------- src/libs/vobj/predicates.cpp | 4 ++ src/libs/vtools/tools/drawTools/vdrawtool.h | 2 +- src/libs/vtools/tools/vtooluniondetails.cpp | 5 ++ .../visualization/line/vistoolrotation.cpp | 2 +- src/test/ValentinaTest/ValentinaTest.pro | 18 +++--- 16 files changed, 115 insertions(+), 62 deletions(-) diff --git a/src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp b/src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp index c34398fbd..9707c11a7 100644 --- a/src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp +++ b/src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp @@ -290,7 +290,7 @@ QGroupBox *TapeConfigurationPage::GradationGroup() { defSizeCombo->setCurrentIndex(index); } - connect(defHeightCombo, static_cast(&QComboBox::currentIndexChanged), this, + connect(defHeightCombo, static_cast(&QComboBox::currentIndexChanged), DefGradationChanged); gradationLayout->addRow(defSizeLabel, defSizeCombo); diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index cc66b7ee3..f12b0dfc9 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -376,6 +376,15 @@ DEPENDPATH += $$PWD/../../libs/fervor win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/fervor/$${DESTDIR}/fervor.lib else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/fervor/$${DESTDIR}/libfervor.a +# IFC static library (depend on QMuParser, VMisc) +unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc + +INCLUDEPATH += $$PWD/../../libs/ifc +DEPENDPATH += $$PWD/../../libs/ifc + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a + #VMisc static library unix|win32: LIBS += -L$$OUT_PWD/../../libs/vmisc/$${DESTDIR}/ -lvmisc @@ -394,15 +403,6 @@ DEPENDPATH += $$PWD/../../libs/vgeometry win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/vgeometry.lib else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/libvgeometry.a -# IFC static library (depend on QMuParser) -unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc - -INCLUDEPATH += $$PWD/../../libs/ifc -DEPENDPATH += $$PWD/../../libs/ifc - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a - # VLayout static library unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR}/ -lvlayout diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index adc491a72..49e2a18a4 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -1734,10 +1734,11 @@ void TMainWindow::SetupMenu() for (int i = 0; i < MaxRecentFiles; ++i) { - recentFileActs[i] = new QAction(this); - connect(recentFileActs[i], &QAction::triggered, this, [this]() + QAction *action = new QAction(this); + recentFileActs[i] = action; + connect(action, &QAction::triggered, [action, this]() { - if (auto action = qobject_cast(sender())) + if (action) { const QString filePath = action->data().toString(); if (not filePath.isEmpty()) @@ -2783,6 +2784,7 @@ void TMainWindow::CreateWindowMenu(QMenu *menu) //--------------------------------------------------------------------------------------------------------------------- bool TMainWindow::IgnoreLocking(int error, const QString &path) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) QMessageBox::StandardButton answer = QMessageBox::Abort; if (not qApp->IsTestMode()) { @@ -2844,6 +2846,11 @@ bool TMainWindow::IgnoreLocking(int error, const QString &path) return false; } return true; +#else + Q_UNUSED(error); + Q_UNUSED(path); + return true;// On older Qt lock assumed always taken. Allow user to ignore warning. +#endif // QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index e193e4b58..dfb7dcb9e 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -3612,11 +3612,12 @@ void MainWindow::CreateActions() //Actions for recent files loaded by a main window application. for (int i = 0; i < MaxRecentFiles; ++i) { - recentFileActs[i] = new QAction(this); - recentFileActs[i]->setVisible(false); - connect(recentFileActs[i], &QAction::triggered, this, [this]() + QAction *action = new QAction(this); + action->setVisible(false); + recentFileActs[i] = action; + connect(recentFileActs[i], &QAction::triggered, [action, this]() { - if (QAction *action = qobject_cast(sender())) + if (action) { const QString filePath = action->data().toString(); if (not filePath.isEmpty()) @@ -4524,6 +4525,7 @@ void MainWindow::UpdateWindowTitle() //--------------------------------------------------------------------------------------------------------------------- bool MainWindow::IgnoreLocking(int error, const QString &path) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) QMessageBox::StandardButton answer = QMessageBox::Abort; if (VApplication::IsGUIMode()) { @@ -4586,6 +4588,11 @@ bool MainWindow::IgnoreLocking(int error, const QString &path) return false; } return true; +#else + Q_UNUSED(error); + Q_UNUSED(path); + return true;// On older Qt lock assumed always taken. Allow user to ignore warning. +#endif // QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vdxf/dxflib/dl_writer_ascii.cpp b/src/libs/vdxf/dxflib/dl_writer_ascii.cpp index 06a3d465e..5f4e51839 100644 --- a/src/libs/vdxf/dxflib/dl_writer_ascii.cpp +++ b/src/libs/vdxf/dxflib/dl_writer_ascii.cpp @@ -67,6 +67,9 @@ void DL_WriterA::dxfReal(int gc, double value) const char str[256]; QT_WARNING_PUSH QT_WARNING_DISABLE_MSVC(4996) +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 408 +QT_WARNING_DISABLE_GCC("-Wformat") +#endif if (version==DL_Codes::AC1009_MIN) { sprintf(str, "%.6lf", value); diff --git a/src/libs/vmisc/abstracttest.h b/src/libs/vmisc/abstracttest.h index 35d3566c5..009de142a 100644 --- a/src/libs/vmisc/abstracttest.h +++ b/src/libs/vmisc/abstracttest.h @@ -41,10 +41,18 @@ template class QVector; #include #endif /* Q_CC_MSVC */ +#ifdef __GNUC__ +#define V_UNUSED __attribute__ ((unused)) +#else +#define V_UNUSED +#endif + // Return codes for testing run application -static const auto TST_EX_BIN = -1; // Can't find binary. -static const auto TST_EX_TIME_OUT = -2; // The operation timed out or an error occurred. -static const auto TST_EX_CRASH = -3; // Program crashed. +static const auto V_UNUSED TST_EX_BIN = -1; // Can't find binary. +static const auto V_UNUSED TST_EX_TIME_OUT = -2; // The operation timed out or an error occurred. +static const auto V_UNUSED TST_EX_CRASH = -3; // Program crashed. + +#undef V_UNUSED enum ErrorState {ErrorLoad = 0, ErrorInstall, ErrorSize, NoError}; diff --git a/src/libs/vmisc/backport/qsavefile.cpp b/src/libs/vmisc/backport/qsavefile.cpp index efd5cb06c..f97e36cf3 100644 --- a/src/libs/vmisc/backport/qsavefile.cpp +++ b/src/libs/vmisc/backport/qsavefile.cpp @@ -47,7 +47,7 @@ #include QSaveFilePrivate::QSaveFilePrivate() - : tempFile(0), error(QFile::NoError) + : fileName(), tempFile(0), error(QFile::NoError) { } @@ -256,7 +256,7 @@ bool QSaveFile::open(OpenMode mode) Cannot be called. Call commit() instead. */ -void QSaveFile::close() +Q_NORETURN void QSaveFile::close() { qFatal("QSaveFile::close called"); } diff --git a/src/libs/vmisc/backport/qsavefile_p.h b/src/libs/vmisc/backport/qsavefile_p.h index 27f4c1d48..e070ba03b 100644 --- a/src/libs/vmisc/backport/qsavefile_p.h +++ b/src/libs/vmisc/backport/qsavefile_p.h @@ -69,6 +69,8 @@ public: QTemporaryFile *tempFile; QFile::FileError error; +private: + Q_DISABLE_COPY(QSaveFilePrivate) }; #endif // QT_VERSION < QT_VERSION_CHECK(5, 1, 0) diff --git a/src/libs/vmisc/debugbreak.h b/src/libs/vmisc/debugbreak.h index 7ca85c896..7391a5154 100644 --- a/src/libs/vmisc/debugbreak.h +++ b/src/libs/vmisc/debugbreak.h @@ -42,11 +42,11 @@ extern "C" { enum { /* gcc optimizers consider code after __builtin_trap() dead. * Making __builtin_trap() unsuitable for breaking into the debugger */ - DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP = 0, + DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP = 0 }; #if defined(__i386__) || defined(__x86_64__) -enum { HAVE_TRAP_INSTRUCTION = 1, }; +enum { HAVE_TRAP_INSTRUCTION = 1 }; __attribute__((gnu_inline, always_inline)) __inline__ static void trap_instruction(void) { @@ -81,7 +81,7 @@ __inline__ static void trap_instruction(void) */ } #elif defined(__arm__) && !defined(__thumb__) -enum { HAVE_TRAP_INSTRUCTION = 1, }; +enum { HAVE_TRAP_INSTRUCTION = 1 }; __attribute__((gnu_inline, always_inline)) __inline__ static void trap_instruction(void) { @@ -92,7 +92,7 @@ __inline__ static void trap_instruction(void) * as Thumb mode */ } #elif defined(__aarch64__) -enum { HAVE_TRAP_INSTRUCTION = 1, }; +enum { HAVE_TRAP_INSTRUCTION = 1 }; __attribute__((gnu_inline, always_inline)) __inline__ static void trap_instruction(void) { @@ -101,7 +101,7 @@ __inline__ static void trap_instruction(void) __asm__ volatile(".inst 0xd4200000"); } #else -enum { HAVE_TRAP_INSTRUCTION = 0, }; +enum { HAVE_TRAP_INSTRUCTION = 0 }; #endif __attribute__((gnu_inline, always_inline)) diff --git a/src/libs/vmisc/vlockguard.h b/src/libs/vmisc/vlockguard.h index 48576827c..c6864ac52 100644 --- a/src/libs/vmisc/vlockguard.h +++ b/src/libs/vmisc/vlockguard.h @@ -45,7 +45,7 @@ #define PEDANT_COMPILER ,lock(nullptr) #else #define PEDANT_COMPILER -#warning To have lock-file support you must use Qt 5.1+. Expect collissions when run 2 copies of the program. +#pragma message("To have lock-file support you must use Qt 5.1+. Expect collissions when run 2 copies of the program.") #endif /*@brief @@ -188,6 +188,10 @@ bool VLockGuard::TryLock(const QString &lockName, int stale, int timeou SetFileAttributesW(lockFile.toStdWString().c_str(), FILE_ATTRIBUTE_HIDDEN); #endif } +#else + Q_UNUSED(lockName); + Q_UNUSED(stale); + Q_UNUSED(timeout); #endif return res; } diff --git a/src/libs/vmisc/vsysexits.h b/src/libs/vmisc/vsysexits.h index 198f1c020..dc92c11be 100644 --- a/src/libs/vmisc/vsysexits.h +++ b/src/libs/vmisc/vsysexits.h @@ -31,40 +31,53 @@ #include -static const auto V_EX_OK = 0; /*Indicate the successful exit.*/ +#ifdef __GNUC__ +#define V_UNUSED __attribute__ ((unused)) +#else +#define V_UNUSED +#endif -static const auto V_EX_USAGE = 64; /*The command was used incorrectly, e.g., with the wrong number of - arguments, a bad flag, a bad syntax in a parameter, or whatever.*/ +static const auto V_UNUSED V_EX_OK = 0; /*Indicate the successful exit.*/ -static const auto V_EX_DATAERR = 65; /*The input data was incorrect in some way. This should only be used for - user's data and not system files.*/ +static const auto V_UNUSED V_EX_USAGE = 64; /*The command was used incorrectly, e.g., with the wrong number of + arguments, a bad flag, a bad syntax in a parameter, or whatever.*/ -static const auto V_EX_NOINPUT = 66; /*An input file (not a system file) did not exist or was not readable.*/ +static const auto V_UNUSED V_EX_DATAERR = 65; /*The input data was incorrect in some way. This should only be + used for user's data and not system files.*/ -static const auto V_EX_UNAVAILABLE = 69; /*A service is unavailable. This can occur if a support program or file - does not exist. This can also be used as a catchall message when - something you wanted to do doesn't work, but you don't know why.*/ +static const auto V_UNUSED V_EX_NOINPUT = 66; /*An input file (not a system file) did not exist or was not + readable.*/ -static const auto V_EX_SOFTWARE = 70; /*An internal software error has been detected. This should be limited to - nonoperating operating system related errors as possible.*/ +static const auto V_UNUSED V_EX_UNAVAILABLE = 69; /*A service is unavailable. This can occur if a support program or + file does not exist. This can also be used as a catchall message + when something you wanted to do doesn't work, but you don't know + why.*/ -static const auto V_EX_OSERR = 71; /*An operating system error has been detected. This is intended to be - used for such things as ``cannot fork'', ``cannot create pipe'', or the - like. It includes things like getuid returning a user that does not exist - in the passwd file.*/ +static const auto V_UNUSED V_EX_SOFTWARE = 70; /*An internal software error has been detected. This should be + limited to nonoperating operating system related errors as + possible.*/ -static const auto V_EX_OSFILE = 72; /*Some system file (e.g., /etc/passwd, /var/run/utmp, etc.) does not exist, - cannot be opened, or has some sort of error (e.g., syntax error).*/ +static const auto V_UNUSED V_EX_OSERR = 71; /*An operating system error has been detected. This is intended to be + used for such things as ``cannot fork'', ``cannot create pipe'', or + the like. It includes things like getuid returning a user that does + not exist in the passwd file.*/ -static const auto V_EX_CANTCREAT = 73; /*A (user specified) output file cannot be created.*/ +static const auto V_UNUSED V_EX_OSFILE = 72; /*Some system file (e.g., /etc/passwd, /var/run/utmp, etc.) does not + exist, cannot be opened, or has some sort of error (e.g., syntax + error).*/ -static const auto V_EX_IOERR = 74; /*An error occurred while doing I/O on some file.*/ +static const auto V_UNUSED V_EX_CANTCREAT = 73; /*A (user specified) output file cannot be created.*/ -static const auto V_EX_NOPERM = 77; /*You did not have sufficient permission to perform the operation. This - is not intended for file system problems, which should use EX_NOINPUT or - EX_CANTCREAT, but rather for higher level permissions.*/ +static const auto V_UNUSED V_EX_IOERR = 74; /*An error occurred while doing I/O on some file.*/ -static const auto V_EX_CONFIG = 78; /*Something was found in an unconfigured or misconfigured state.*/ +static const auto V_UNUSED V_EX_NOPERM = 77; /*You did not have sufficient permission to perform the operation. + This is not intended for file system problems, which should use + EX_NOINPUT or EX_CANTCREAT, but rather for higher level + permissions.*/ + +static const auto V_UNUSED V_EX_CONFIG = 78; /*Something was found in an unconfigured or misconfigured state.*/ + +#undef V_UNUSED //--------------------------------------------------------------------------------------------------------------------- inline QTextStream& vStdErr() diff --git a/src/libs/vobj/predicates.cpp b/src/libs/vobj/predicates.cpp index ef144ec51..97ad3a0ac 100644 --- a/src/libs/vobj/predicates.cpp +++ b/src/libs/vobj/predicates.cpp @@ -113,7 +113,11 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_MSVC(4701) QT_WARNING_DISABLE_GCC("-Wold-style-cast") QT_WARNING_DISABLE_GCC("-Wfloat-equal") +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized") +#else +QT_WARNING_DISABLE_GCC("-Wuninitialized") +#endif /* On some machines, the exact arithmetic routines might be defeated by the */ /* use of internal extended precision floating-point registers. Sometimes */ diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 8e8c56dc9..192e8e9af 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -239,7 +239,7 @@ QString VDrawTool::ObjectName(quint32 id) const { try { - return VAbstractTool::data.GeometricObject(id)->name(); + return data.GeometricObject(id)->name(); } catch (const VExceptionBadId &e) { diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index 0b7f7e6c2..f46ef6172 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -1053,7 +1053,12 @@ quint32 VToolUnionDetails::TakeNextId(QVector &children) quint32 idChild = NULL_ID; if (not children.isEmpty()) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) idChild = children.takeFirst(); +#else + idChild = children.first(); + children.remove(0); +#endif } else { diff --git a/src/libs/vtools/visualization/line/vistoolrotation.cpp b/src/libs/vtools/visualization/line/vistoolrotation.cpp index 885a58c63..2101cfb46 100644 --- a/src/libs/vtools/visualization/line/vistoolrotation.cpp +++ b/src/libs/vtools/visualization/line/vistoolrotation.cpp @@ -271,7 +271,7 @@ QGraphicsPathItem *VisToolRotation::GetCurve(quint32 i, const QColor &color) template int VisToolRotation::AddCurve(qreal angle, const QPointF &origin, quint32 id, int i) { - const QSharedPointer curve = Visualization::data->GeometricObject(id); + const QSharedPointer curve = Visualization::data->template GeometricObject(id); ++i; QGraphicsPathItem *path = GetCurve(i, supportColor2); diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index ab9dec109..c72e37346 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -137,6 +137,15 @@ DEPENDPATH += $$PWD/../../libs/vpatterndb win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a +# IFC static library (depend on QMuParser, VMisc) +unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc + +INCLUDEPATH += $$PWD/../../libs/ifc +DEPENDPATH += $$PWD/../../libs/ifc + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a + #VMisc static library unix|win32: LIBS += -L$$OUT_PWD/../../libs/vmisc/$${DESTDIR}/ -lvmisc @@ -155,15 +164,6 @@ DEPENDPATH += $$PWD/../../libs/vgeometry win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/vgeometry.lib else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/libvgeometry.a -# IFC static library (depend on QMuParser) -unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc - -INCLUDEPATH += $$PWD/../../libs/ifc -DEPENDPATH += $$PWD/../../libs/ifc - -win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib -else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a - # VLayout static library unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR} -lvlayout From fb5a9c64b20a36a5eefca0189366931baa37613c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 21 Aug 2016 19:45:16 +0300 Subject: [PATCH 04/34] Cppcheck warnings. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 2 +- src/app/valentina/mainwindow.cpp | 3 ++- src/libs/vgeometry/vabstractarc_p.h | 5 +++-- src/libs/vgeometry/varc_p.h | 4 ++-- src/libs/vgeometry/vspline.cpp | 9 +++++---- src/libs/vgeometry/vspline.h | 6 +++--- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 49e2a18a4..ce83093da 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -1738,7 +1738,7 @@ void TMainWindow::SetupMenu() recentFileActs[i] = action; connect(action, &QAction::triggered, [action, this]() { - if (action) + if (action != nullptr) { const QString filePath = action->data().toString(); if (not filePath.isEmpty()) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index dfb7dcb9e..3fef25852 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -3617,7 +3617,8 @@ void MainWindow::CreateActions() recentFileActs[i] = action; connect(recentFileActs[i], &QAction::triggered, [action, this]() { - if (action) + // cppcheck-suppress nullPointerRedundantCheck + if (action != nullptr) { const QString filePath = action->data().toString(); if (not filePath.isEmpty()) diff --git a/src/libs/vgeometry/vabstractarc_p.h b/src/libs/vgeometry/vabstractarc_p.h index 98ff70226..b9fd832d7 100644 --- a/src/libs/vgeometry/vabstractarc_p.h +++ b/src/libs/vgeometry/vabstractarc_p.h @@ -43,7 +43,7 @@ class VAbstractArcData : public QSharedData public: VAbstractArcData(); VAbstractArcData(const VPointF ¢er, qreal f1, const QString &formulaF1, qreal f2, const QString &formulaF2); - VAbstractArcData(const QString &formulaLength, VPointF center, qreal f1, QString formulaF1); + VAbstractArcData(const QString &formulaLength, const VPointF ¢er, qreal f1, const QString &formulaF1); VAbstractArcData(const VPointF ¢er, qreal f1); VAbstractArcData(const VPointF ¢er, qreal f1, qreal f2); VAbstractArcData(const VAbstractArcData &arc); @@ -96,7 +96,8 @@ VAbstractArcData::VAbstractArcData(const VPointF ¢er, qreal f1, const QStrin {} //--------------------------------------------------------------------------------------------------------------------- -VAbstractArcData::VAbstractArcData(const QString &formulaLength, VPointF center, qreal f1, QString formulaF1) +VAbstractArcData::VAbstractArcData(const QString &formulaLength, const VPointF ¢er, qreal f1, + const QString &formulaF1) : f1(f1), formulaF1(formulaF1), f2(0), diff --git a/src/libs/vgeometry/varc_p.h b/src/libs/vgeometry/varc_p.h index b76dd3e0d..52478ad1c 100644 --- a/src/libs/vgeometry/varc_p.h +++ b/src/libs/vgeometry/varc_p.h @@ -41,7 +41,7 @@ class VArcData : public QSharedData { public: VArcData(); - VArcData(qreal radius, QString formulaRadius); + VArcData(qreal radius, const QString &formulaRadius); explicit VArcData(qreal radius); VArcData(const VArcData &arc); virtual ~VArcData(); @@ -63,7 +63,7 @@ VArcData::VArcData() {} //--------------------------------------------------------------------------------------------------------------------- -VArcData::VArcData(qreal radius, QString formulaRadius) +VArcData::VArcData(qreal radius, const QString &formulaRadius) : radius(radius), formulaRadius(formulaRadius) {} diff --git a/src/libs/vgeometry/vspline.cpp b/src/libs/vgeometry/vspline.cpp index b4834b796..2234caea0 100644 --- a/src/libs/vgeometry/vspline.cpp +++ b/src/libs/vgeometry/vspline.cpp @@ -64,8 +64,8 @@ VSpline::VSpline ( const VSpline & spline ) * @param kAsm1 coefficient of length first control line. * @param kAsm2 coefficient of length second control line. */ -VSpline::VSpline (VPointF p1, VPointF p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve, - quint32 idObject, Draw mode) +VSpline::VSpline (const VPointF &p1, const VPointF &p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, + qreal kCurve, quint32 idObject, Draw mode) : VAbstractCubicBezier(GOType::Spline, idObject, mode), d(new VSplineData(p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve)) { @@ -80,7 +80,8 @@ VSpline::VSpline (VPointF p1, VPointF p4, qreal angle1, qreal angle2, qreal kAsm * @param p3 second control point. * @param p4 second point spline. */ -VSpline::VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, quint32 idObject, Draw mode) +VSpline::VSpline (const VPointF &p1, const QPointF &p2, const QPointF &p3, const VPointF &p4, quint32 idObject, + Draw mode) :VAbstractCubicBezier(GOType::Spline, idObject, mode), d(new VSplineData(p1, p2, p3, p4)) { CreateName(); @@ -101,7 +102,7 @@ VSpline::VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, quint32 idObje * @param c2Length length from second point to first control point. * @param c2LengthFormula formula length from second point to first control point. */ -VSpline::VSpline(VPointF p1, VPointF p4, qreal angle1, const QString &angle1Formula, qreal angle2, +VSpline::VSpline(const VPointF &p1, const VPointF &p4, qreal angle1, const QString &angle1Formula, qreal angle2, const QString &angle2Formula, qreal c1Length, const QString &c1LengthFormula, qreal c2Length, const QString &c2LengthFormula, quint32 idObject, Draw mode) : VAbstractCubicBezier(GOType::Spline, idObject, mode), diff --git a/src/libs/vgeometry/vspline.h b/src/libs/vgeometry/vspline.h index f713b8707..e648a3c80 100644 --- a/src/libs/vgeometry/vspline.h +++ b/src/libs/vgeometry/vspline.h @@ -55,11 +55,11 @@ class VSpline :public VAbstractCubicBezier public: VSpline(); VSpline (const VSpline &spline ); - VSpline (VPointF p1, VPointF p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve, + VSpline (const VPointF &p1, const VPointF &p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve, quint32 idObject = 0, Draw mode = Draw::Calculation); - VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, quint32 idObject = 0, + VSpline (const VPointF &p1, const QPointF &p2, const QPointF &p3, const VPointF &p4, quint32 idObject = 0, Draw mode = Draw::Calculation); - VSpline (VPointF p1, VPointF p4, qreal angle1, const QString &angle1Formula, qreal angle2, + VSpline (const VPointF &p1, const VPointF &p4, qreal angle1, const QString &angle1Formula, qreal angle2, const QString &angle2Formula, qreal c1Length, const QString &c1LengthFormula, qreal c2Length, const QString &c2LengthFormula, quint32 idObject = 0, Draw mode = Draw::Calculation); VSpline Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix = QString()) const; From 50e3e4e9d74d0a519319b1769563da354f68eb4e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 21 Aug 2016 20:01:07 +0300 Subject: [PATCH 05/34] Try to make output less noisy. --HG-- branch : develop --- common.pri | 12 ------------ src/app/translations.pri | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/common.pri b/common.pri index 109e75f86..b8d0ffdc5 100644 --- a/common.pri +++ b/common.pri @@ -66,12 +66,9 @@ defineTest(copyToDestdir) { DDIR = $$2 mkpath($$DDIR) - message("----------------------------------------------begin------------------------------------------------") - message("Copy to" $$DDIR "after link") for(FILE, files) { unix{ QMAKE_POST_LINK += ln -s -f $$quote($$FILE) $$quote($$DDIR/$$basename(FILE)) $$escape_expand(\\n\\t) - message("Command:" ln -s -f $$quote($$FILE) $$quote($$DDIR/$$basename(FILE))) } else { !exists($$DDIR/$$basename(FILE)) { # Replace slashes in paths with backslashes for Windows @@ -80,9 +77,6 @@ defineTest(copyToDestdir) { DDIR ~= s,/,\\,g } QMAKE_POST_LINK += $$VCOPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) - message("Command:" $$VCOPY $$quote($$FILE) $$quote($$DDIR)) - } else { - message("File:" $$DDIR/$$basename(FILE) "already exist") } QMAKE_CLEAN += $$DDIR/$$basename(FILE) @@ -91,7 +85,6 @@ defineTest(copyToDestdir) { export(QMAKE_POST_LINK) export(QMAKE_CLEAN) - message("----------------------------------------------end---------------------------------------------------") } # Alwayse copies the given files to the destination directory @@ -100,12 +93,9 @@ defineTest(forceCopyToDestdir) { DDIR = $$2 mkpath($$DDIR) - message("----------------------------------------------begin------------------------------------------------") - message("Copy to" $$DDIR "after link") for(FILE, files) { unix{ QMAKE_POST_LINK += ln -s -f $$quote($$FILE) $$quote($$DDIR/$$basename(FILE)) $$escape_expand(\\n\\t) - message("Command:" ln -s -f $$quote($$FILE) $$quote($$DDIR/$$basename(FILE))) } else { # Replace slashes in paths with backslashes for Windows win32{ @@ -113,14 +103,12 @@ defineTest(forceCopyToDestdir) { DDIR ~= s,/,\\,g } QMAKE_POST_LINK += $$VCOPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) - message("Command:" $$VCOPY $$quote($$FILE) $$quote($$DDIR)) QMAKE_CLEAN += $$DDIR/$$basename(FILE) } } export(QMAKE_POST_LINK) export(QMAKE_CLEAN) - message("----------------------------------------------end---------------------------------------------------") } # We use precompiled headers for more fast compilation source code. diff --git a/src/app/translations.pri b/src/app/translations.pri index bb620bfa2..6b8888db6 100755 --- a/src/app/translations.pri +++ b/src/app/translations.pri @@ -58,7 +58,7 @@ for(_translation_name, INSTALL_TRANSLATIONS) { _translation_name_ts = $$section(_translation_name_qm, ".", 0, 0).ts !exists($$_translation_name) { - system($$shell_path($$[QT_INSTALL_BINS]/$$LRELEASE) $$shell_path($${TRANSLATIONS_PATH}/$$_translation_name_ts) -qm $$shell_path($$_translation_name)) + system($$shell_path($$[QT_INSTALL_BINS]/$$LRELEASE) -silent $$shell_path($${TRANSLATIONS_PATH}/$$_translation_name_ts) -qm $$shell_path($$_translation_name)) unix { exists($${OUT_PWD}/$$DESTDIR/valentina) { system(rm -fv $${OUT_PWD}/$$DESTDIR/valentina) # force to call linking From 9cd3fc8bcb76c59db4f8361625958125a390f6b0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 21 Aug 2016 23:04:23 +0300 Subject: [PATCH 06/34] Fix for compiler specific code. --HG-- branch : develop --- src/libs/ifc/xml/vpatternconverter.h | 8 ++++---- src/libs/ifc/xml/vvitconverter.h | 8 ++++---- src/libs/ifc/xml/vvstconverter.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index b233d6a7e..bbb307a79 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -53,12 +53,12 @@ public: static const QString PatternMaxVerStr; static const QString CurrentSchema; // GCC 4.6 doesn't allow constexpr and const together -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) > 406 - static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); - static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); -#else +#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) <= 406 static Q_DECL_CONSTEXPR int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); static Q_DECL_CONSTEXPR int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); +#else + static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); + static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); #endif protected: diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h index 942ebf666..45b220183 100644 --- a/src/libs/ifc/xml/vvitconverter.h +++ b/src/libs/ifc/xml/vvitconverter.h @@ -49,12 +49,12 @@ public: static const QString MeasurementMaxVerStr; static const QString CurrentSchema; // GCC 4.6 doesn't allow constexpr and const together -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) > 406 - static Q_DECL_CONSTEXPR const int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 2, 0); - static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); -#else +#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) <= 406 static Q_DECL_CONSTEXPR int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 2, 0); static Q_DECL_CONSTEXPR int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); +#else + static Q_DECL_CONSTEXPR const int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 2, 0); + static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); #endif protected: diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h index 39c07af07..a1c6fb87d 100644 --- a/src/libs/ifc/xml/vvstconverter.h +++ b/src/libs/ifc/xml/vvstconverter.h @@ -49,12 +49,12 @@ public: static const QString MeasurementMaxVerStr; static const QString CurrentSchema; // GCC 4.6 doesn't allow constexpr and const together -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) > 406 - static Q_DECL_CONSTEXPR const int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 3, 0); - static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 2); -#else +#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) <= 406 static Q_DECL_CONSTEXPR int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 3, 0); static Q_DECL_CONSTEXPR int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 2); +#else + static Q_DECL_CONSTEXPR const int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 3, 0); + static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 2); #endif protected: From 134d683c72ec469f63524527f172c0e091d8667d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Aug 2016 11:25:06 +0300 Subject: [PATCH 07/34] Fixed issue #549. Printing fields ignored in paper length. --HG-- branch : develop --- src/app/valentina/mainwindowsnogui.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index 0c478f573..fab419219 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -916,6 +916,11 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr printer->setOrientation(QPrinter::Landscape); } + const qreal left = FromPixel(margins.left(), Unit::Mm); + const qreal top = FromPixel(margins.top(), Unit::Mm); + const qreal right = FromPixel(margins.right(), Unit::Mm); + const qreal bottom = FromPixel(margins.bottom(), Unit::Mm); + if (not isTiled) { QSizeF size = QSizeF(FromPixel(paperSize.width(), Unit::Mm), FromPixel(paperSize.height(), Unit::Mm)); @@ -931,6 +936,8 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr const QPrinter::PageSize pSZ = FindTemplate(size); if (pSZ == QPrinter::Custom) { + size.setWidth(size.width() + left + right); + size.setHeight(size.height() + top + bottom); printer->setPaperSize (size, QPrinter::Millimeter ); } else @@ -939,13 +946,7 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr } } - { - const qreal left = FromPixel(margins.left(), Unit::Mm); - const qreal top = FromPixel(margins.top(), Unit::Mm); - const qreal right = FromPixel(margins.right(), Unit::Mm); - const qreal bottom = FromPixel(margins.bottom(), Unit::Mm); - printer->setPageMargins(left, top, right, bottom, QPrinter::Millimeter); - } + printer->setPageMargins(left, top, right, bottom, QPrinter::Millimeter); switch(printType) { From bf82dc3bb3b07f4f692040780394d5bcfc9d712d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Aug 2016 11:47:21 +0300 Subject: [PATCH 08/34] Make 1 minimal value of the field "Cut number". --HG-- branch : develop --- src/libs/vlayout/vtextmanager.cpp | 2 +- src/libs/vtools/dialogs/tools/dialogdetail.ui | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp index 89695a8e2..5c5ebef24 100644 --- a/src/libs/vlayout/vtextmanager.cpp +++ b/src/libs/vlayout/vtextmanager.cpp @@ -254,7 +254,7 @@ void VTextManager::Update(const QString& qsName, const VPatternPieceData& data) for (int i = 0; i < data.GetMCPCount(); ++i) { MaterialCutPlacement mcp = data.GetMCP(i); - if (mcp.m_iCutNumber > 0) + if (mcp.m_iCutNumber > 0)//Not gonna happen because min value is 1 now, but decided to left { QString qsMat; if (mcp.m_eMaterial == MaterialType::mtUserDefined) diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.ui b/src/libs/vtools/dialogs/tools/dialogdetail.ui index ea9d9a4b2..8ab7b8a79 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.ui +++ b/src/libs/vtools/dialogs/tools/dialogdetail.ui @@ -305,8 +305,7 @@ - - + .. @@ -320,8 +319,7 @@ - - + .. @@ -431,6 +429,9 @@ + + 1 + 1000 From 79507358337b00112cd358f134eeb669557b5b15 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Aug 2016 12:00:12 +0300 Subject: [PATCH 09/34] Fix issue with declension name of material in some languages. --HG-- branch : develop --- src/libs/vlayout/vtextmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp index 5c5ebef24..bd571b356 100644 --- a/src/libs/vlayout/vtextmanager.cpp +++ b/src/libs/vlayout/vtextmanager.cpp @@ -246,7 +246,7 @@ void VTextManager::Update(const QString& qsName, const VPatternPieceData& data) << QApplication::translate("Detail", "Lining", 0) << QApplication::translate("Detail", "Interfacing", 0) << QApplication::translate("Detail", "Interlining", 0); - QString qsText = tr("Cut %1 on %2%3"); + QString qsText = QLatin1String("%1. ") + tr("Cut") + QLatin1String(" %2%3"); QStringList qslPlace; qslPlace << "" << QLatin1String(" ") + tr("on Fold"); tl.m_eFontWeight = QFont::Normal; @@ -265,7 +265,7 @@ void VTextManager::Update(const QString& qsName, const VPatternPieceData& data) { qsMat = qslMaterials[int(mcp.m_eMaterial)]; } - tl.m_qsText = qsText.arg(mcp.m_iCutNumber).arg(qsMat). + tl.m_qsText = qsText.arg(qsMat).arg(mcp.m_iCutNumber). arg(qslPlace[int(mcp.m_ePlacement)]); AddLine(tl); } From 73bcc891076fb6039e7c127b3d538842fb36315c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Aug 2016 12:16:12 +0300 Subject: [PATCH 10/34] Fixed wrong compatibility with Qt 5.0. --HG-- branch : develop --- src/libs/vtools/dialogs/tools/dialogdetail.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index 4a95b77bc..2bea5c536 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -251,7 +251,11 @@ void DialogDetail::AddUpdate() MaterialCutPlacement mcp; QStringList qslUserMaterials = qApp->Settings()->GetUserDefinedMaterials(); +#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) + int i = ui.comboBoxMaterial->itemData(ui.comboBoxMaterial->currentIndex()).toInt(); +#else int i = ui.comboBoxMaterial->currentData().toInt(); +#endif QString qsMat = ui.comboBoxMaterial->currentText(); if (i < m_qslMaterials.count() && qsMat == m_qslMaterials[i]) { From e54e1e4f11c66a6c8bdcb2a29aeb802971607595 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Aug 2016 19:43:22 +0300 Subject: [PATCH 11/34] Allow to select printer in Layout Settings dialog. --HG-- branch : develop --- .../dialogs/dialoglayoutsettings.cpp | 86 ++++++++- .../valentina/dialogs/dialoglayoutsettings.h | 4 + .../valentina/dialogs/dialoglayoutsettings.ui | 176 ++++++++++-------- src/app/valentina/mainwindowsnogui.cpp | 18 +- src/app/valentina/mainwindowsnogui.h | 2 + src/libs/vmisc/def.cpp | 27 ++- src/libs/vmisc/def.h | 3 +- src/libs/vmisc/vsettings.cpp | 8 +- src/libs/vmisc/vsettings.h | 3 + 9 files changed, 231 insertions(+), 96 deletions(-) diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.cpp b/src/app/valentina/dialogs/dialoglayoutsettings.cpp index df271b77c..8ad40ce3c 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.cpp +++ b/src/app/valentina/dialogs/dialoglayoutsettings.cpp @@ -35,6 +35,7 @@ #include #include +#include //must be the same order as PaperSizeTemplate constants const DialogLayoutSettings::FormatsVector DialogLayoutSettings::pageFormatNames = @@ -68,6 +69,7 @@ DialogLayoutSettings::DialogLayoutSettings(VLayoutGenerator *generator, QWidget InitTemplates(); MinimumPaperSize(); MinimumLayoutSize(); + InitPrinter(); //in export console mode going to use defaults if (disableSettings == false) @@ -79,24 +81,27 @@ DialogLayoutSettings::DialogLayoutSettings(VLayoutGenerator *generator, QWidget RestoreDefaults(); } - connect(ui->comboBoxTemplates, static_cast(&QComboBox::currentIndexChanged), + connect(ui->comboBoxPrinter, static_cast(&QComboBox::currentIndexChanged), + this, &DialogLayoutSettings::PrinterMargins); + + connect(ui->comboBoxTemplates, static_cast(&QComboBox::currentIndexChanged), this, &DialogLayoutSettings::TemplateSelected); - connect(ui->comboBoxPaperSizeUnit, static_cast(&QComboBox::currentIndexChanged), + connect(ui->comboBoxPaperSizeUnit, static_cast(&QComboBox::currentIndexChanged), this, &DialogLayoutSettings::ConvertPaperSize); - connect(ui->doubleSpinBoxPaperWidth, static_cast(&QDoubleSpinBox::valueChanged), + connect(ui->doubleSpinBoxPaperWidth, static_cast(&QDoubleSpinBox::valueChanged), this, &DialogLayoutSettings::PaperSizeChanged); - connect(ui->doubleSpinBoxPaperHeight, static_cast(&QDoubleSpinBox::valueChanged), + connect(ui->doubleSpinBoxPaperHeight, static_cast(&QDoubleSpinBox::valueChanged), this, &DialogLayoutSettings::PaperSizeChanged); - connect(ui->doubleSpinBoxPaperWidth, static_cast(&QDoubleSpinBox::valueChanged), + connect(ui->doubleSpinBoxPaperWidth, static_cast(&QDoubleSpinBox::valueChanged), this, &DialogLayoutSettings::FindTemplate); - connect(ui->doubleSpinBoxPaperHeight, static_cast(&QDoubleSpinBox::valueChanged), + connect(ui->doubleSpinBoxPaperHeight, static_cast(&QDoubleSpinBox::valueChanged), this, &DialogLayoutSettings::FindTemplate); - connect(ui->doubleSpinBoxPaperWidth, static_cast(&QDoubleSpinBox::valueChanged), + connect(ui->doubleSpinBoxPaperWidth, static_cast(&QDoubleSpinBox::valueChanged), this, &DialogLayoutSettings::CorrectMaxFileds); - connect(ui->doubleSpinBoxPaperHeight, static_cast(&QDoubleSpinBox::valueChanged), + connect(ui->doubleSpinBoxPaperHeight, static_cast(&QDoubleSpinBox::valueChanged), this, &DialogLayoutSettings::CorrectMaxFileds); connect(ui->checkBoxIgnoreFileds, &QCheckBox::stateChanged, this, &DialogLayoutSettings::IgnoreAllFields); @@ -333,6 +338,12 @@ void DialogLayoutSettings::SetIgnoreAllFields(bool value) ui->checkBoxIgnoreFileds->setChecked(value); } +//--------------------------------------------------------------------------------------------------------------------- +QString DialogLayoutSettings::SelectedPrinter() const +{ + return ui->comboBoxPrinter->currentText(); +} + //--------------------------------------------------------------------------------------------------------------------- void DialogLayoutSettings::TemplateSelected() { @@ -617,6 +628,10 @@ void DialogLayoutSettings::RestoreDefaults() TemplateSelected(); ui->comboBoxTemplates->blockSignals(false); + ui->comboBoxPrinter->blockSignals(true); + InitPrinter(); + ui->comboBoxPrinter->blockSignals(false); + SetLayoutWidth(VSettings::GetDefLayoutWidth()); SetShift(VSettings::GetDefLayoutShift()); SetGroup(VSettings::GetDefLayoutGroup()); @@ -630,6 +645,16 @@ void DialogLayoutSettings::RestoreDefaults() IgnoreAllFields(ui->checkBoxIgnoreFileds->isChecked()); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogLayoutSettings::PrinterMargins() +{ + QPrinterInfo printer = QPrinterInfo::printerInfo(ui->comboBoxPrinter->currentText()); + if (not printer.isNull()) + { + SetFields(VSettings::GetPrinterFields(QSharedPointer(new QPrinter(printer)))); + } +} + //--------------------------------------------------------------------------------------------------------------------- void DialogLayoutSettings::CorrectMaxFileds() { @@ -714,6 +739,51 @@ void DialogLayoutSettings::InitTemplates() ui->comboBoxTemplates->setCurrentIndex(-1); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogLayoutSettings::InitPrinter() +{ + ui->comboBoxPrinter->clear(); + QStringList printerNames; +#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) + const QList printers = QPrinterInfo::availablePrinters(); + for(int i = 0; i < printers.size(); ++i) + { + const QString name = printers.at(i).printerName(); + if (not name.isEmpty()) + { + printerNames.append(name); + } + } +#else + printerNames = QPrinterInfo::availablePrinterNames(); +#endif + + ui->comboBoxPrinter->addItems(printerNames); + + if (ui->comboBoxPrinter->count() == 0) + { + ui->comboBoxPrinter->addItem(tr("None", "Printer")); + } + else + { + QString defPrinterName; +#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) + const QPrinterInfo def = QPrinterInfo::defaultPrinter(); + if(not def.isNull()) + { + defPrinterName = def.printerName(); + } +#else + defPrinterName = QPrinterInfo::defaultPrinterName(); +#endif + const int index = ui->comboBoxPrinter->findText(defPrinterName); + if(index != -1) + { + ui->comboBoxPrinter->setCurrentIndex(index); + } + } +} + //--------------------------------------------------------------------------------------------------------------------- QString DialogLayoutSettings::MakeHelpTemplateList() { diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.h b/src/app/valentina/dialogs/dialoglayoutsettings.h index c5d2ca605..982b0608f 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.h +++ b/src/app/valentina/dialogs/dialoglayoutsettings.h @@ -111,6 +111,8 @@ public: bool IsIgnoreAllFields() const; void SetIgnoreAllFields(bool value); + QString SelectedPrinter() const; + //support functions for the command line parser which uses invisible dialog to properly build layout generator bool SelectTemplate(const PaperSizeTemplate& id); static QString MakeHelpTemplateList(); @@ -131,6 +133,7 @@ private slots: void PaperSizeChanged(); void Swap(bool checked); void RestoreDefaults(); + void PrinterMargins(); void CorrectMaxFileds(); void IgnoreAllFields(int state); @@ -151,6 +154,7 @@ private: void InitPaperUnits(); void InitLayoutUnits(); void InitTemplates(); + void InitPrinter(); QSizeF Template(); QSizeF TemplateSize(const PaperSizeTemplate &tmpl) const; QSizeF RoundTemplateSize(qreal width, qreal height) const; diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.ui b/src/app/valentina/dialogs/dialoglayoutsettings.ui index 639c95100..1cbf210e8 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.ui +++ b/src/app/valentina/dialogs/dialoglayoutsettings.ui @@ -6,7 +6,7 @@ 0 0 - 632 + 600 531 @@ -72,64 +72,6 @@ - - - - - 0 - 0 - - - - Width: - - - - - - - - 0 - 0 - - - - Height: - - - - - - - - 94 - 0 - - - - 2 - - - 99999.000000000000000 - - - - - - - - 94 - 0 - - - - 2 - - - 99999.990000000005239 - - - @@ -180,6 +122,32 @@ + + + + + 0 + 0 + + + + Width: + + + + + + + + 0 + 0 + + + + Height: + + + @@ -196,13 +164,65 @@ + + + + + 94 + 0 + + + + 2 + + + 99999.000000000000000 + + + + + + + + 94 + 0 + + + + 2 + + + 99999.990000000005239 + + + + + + + + + Printer: + + + + + + + + + + + 0 + 0 + + Fields @@ -210,72 +230,78 @@ QFormLayout::ExpandingFieldsGrow - + Left: - + 5 - + Right: - + 5 - + Top: - + 5 - + Bottom: - + 5 - - - - Ignore fileds - - - + + + + + 0 + 0 + + + + Ignore fileds + + + @@ -700,7 +726,7 @@ - + diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index c0dcf2379..5259e4250 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -69,7 +69,8 @@ MainWindowsNoGUI::MainWindowsNoGUI(QWidget *parent) paperSize(), isTiled(false), isAutoCrop(false), - isUnitePages(false) + isUnitePages(false), + layoutPrinterName() { InitTempLayoutScene(); @@ -98,6 +99,7 @@ void MainWindowsNoGUI::ToolLayoutSettings(bool checked) tButton->setChecked(false); return; } + layoutPrinterName = layout.SelectedPrinter(); LayoutSettings(lGenerator); tButton->setChecked(false); } @@ -854,7 +856,12 @@ void MainWindowsNoGUI::PrintPreview() } } - QSharedPointer printer = DefaultPrinter(); + QPrinterInfo info = QPrinterInfo::printerInfo(layoutPrinterName); + if(info.isNull() || info.printerName().isEmpty()) + { + info = QPrinterInfo::defaultPrinter(); + } + QSharedPointer printer = PreparePrinter(info); if (printer.isNull()) { qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")), @@ -881,7 +888,12 @@ void MainWindowsNoGUI::LayoutPrint() } } // display print dialog and if accepted print - QSharedPointer printer = DefaultPrinter(QPrinter::HighResolution); + QPrinterInfo info = QPrinterInfo::printerInfo(layoutPrinterName); + if(info.isNull() || info.printerName().isEmpty()) + { + info = QPrinterInfo::defaultPrinter(); + } + QSharedPointer printer = PreparePrinter(info, QPrinter::HighResolution); if (printer.isNull()) { qCritical("%s\n\n%s", qUtf8Printable(tr("Print error")), diff --git a/src/app/valentina/mainwindowsnogui.h b/src/app/valentina/mainwindowsnogui.h index 84394802a..208828f9d 100644 --- a/src/app/valentina/mainwindowsnogui.h +++ b/src/app/valentina/mainwindowsnogui.h @@ -109,6 +109,8 @@ private: bool isAutoCrop; bool isUnitePages; + QString layoutPrinterName; + void CreateShadows(); void CreateScenes(); diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index d029584c9..3af5215fd 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -1813,24 +1813,35 @@ QString AbsoluteMPath(const QString &patternPath, const QString &relativeMPath) } //--------------------------------------------------------------------------------------------------------------------- -QSharedPointer DefaultPrinter(QPrinter::PrinterMode mode) +QSharedPointer PreparePrinter(const QPrinterInfo &info, QPrinter::PrinterMode mode) { - QPrinterInfo def = QPrinterInfo::defaultPrinter(); - - //if there is no default printer set the print preview won't show - if(def.isNull() || def.printerName().isEmpty()) + QPrinterInfo tmpInfo = info; + if(tmpInfo.isNull() || tmpInfo.printerName().isEmpty()) { - if(QPrinterInfo::availablePrinters().isEmpty()) +#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) + const QList list = QPrinterInfo::availablePrinters(); + if(list.isEmpty()) { return QSharedPointer(); } else { - def = QPrinterInfo::availablePrinters().first(); + tmpInfo = list.first(); } +#else + const QStringList list = QPrinterInfo::availablePrinterNames(); + if(list.isEmpty()) + { + return QSharedPointer(); + } + else + { + tmpInfo = QPrinterInfo::printerInfo(list.first()); + } +#endif } - auto printer = QSharedPointer(new QPrinter(def, mode)); + auto printer = QSharedPointer(new QPrinter(tmpInfo, mode)); printer->setResolution(static_cast(PrintDPI)); return printer; } diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 1d3003616..9a9d385b1 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -620,7 +620,8 @@ QString StrippedName(const QString &fullFileName) Q_REQUIRED_RESULT; QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath) Q_REQUIRED_RESULT; QString AbsoluteMPath(const QString &patternPath, const QString &relativeMPath) Q_REQUIRED_RESULT; -QSharedPointer DefaultPrinter(QPrinter::PrinterMode mode = QPrinter::ScreenResolution) Q_REQUIRED_RESULT; +QSharedPointer PreparePrinter(const QPrinterInfo &info, + QPrinter::PrinterMode mode = QPrinter::ScreenResolution) Q_REQUIRED_RESULT; QPixmap darkenPixmap(const QPixmap &pixmap) Q_REQUIRED_RESULT; diff --git a/src/libs/vmisc/vsettings.cpp b/src/libs/vmisc/vsettings.cpp index a00f73bed..1340562e2 100644 --- a/src/libs/vmisc/vsettings.cpp +++ b/src/libs/vmisc/vsettings.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include "../vmisc/def.h" #include "../vmisc/vmath.h" @@ -375,7 +376,12 @@ QMarginsF VSettings::GetFields() const //--------------------------------------------------------------------------------------------------------------------- QMarginsF VSettings::GetDefFields() { - QSharedPointer printer = DefaultPrinter(); + return GetPrinterFields(PreparePrinter(QPrinterInfo::defaultPrinter())); +} + +//--------------------------------------------------------------------------------------------------------------------- +QMarginsF VSettings::GetPrinterFields(const QSharedPointer &printer) +{ if (printer.isNull()) { return QMarginsF(); diff --git a/src/libs/vmisc/vsettings.h b/src/libs/vmisc/vsettings.h index ec978e1db..f1cf57cd8 100644 --- a/src/libs/vmisc/vsettings.h +++ b/src/libs/vmisc/vsettings.h @@ -39,6 +39,8 @@ #include "vcommonsettings.h" class QMarginsF; +class QPrinter; +template class QSharedPointer; #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) # include "../vmisc/backport/qmarginsf.h" @@ -112,6 +114,7 @@ public: QMarginsF GetFields() const; static QMarginsF GetDefFields(); + static QMarginsF GetPrinterFields(const QSharedPointer &printer); void SetFields(const QMarginsF &value); Cases GetLayoutGroup() const; From 55b93e0d8782436cef72158a5b2e7079d60370a5 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Aug 2016 19:48:16 +0300 Subject: [PATCH 12/34] Fixed issue #549. Printing fields ignored in paper length. --HG-- branch : develop --- src/app/valentina/mainwindowsnogui.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index 5259e4250..a72c7542f 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -928,11 +928,6 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr printer->setOrientation(QPrinter::Landscape); } - const qreal left = FromPixel(margins.left(), Unit::Mm); - const qreal top = FromPixel(margins.top(), Unit::Mm); - const qreal right = FromPixel(margins.right(), Unit::Mm); - const qreal bottom = FromPixel(margins.bottom(), Unit::Mm); - if (not isTiled) { QSizeF size = QSizeF(FromPixel(paperSize.width(), Unit::Mm), FromPixel(paperSize.height(), Unit::Mm)); @@ -941,15 +936,14 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr auto *paper = qgraphicsitem_cast(papers.at(0)); if (paper) { - size = QSizeF(FromPixel(paperSize.width(), Unit::Mm), FromPixel(paper->rect().height(), Unit::Mm)); + size = QSizeF(FromPixel(paperSize.width(), Unit::Mm), + FromPixel(paper->rect().height() + margins.top() + margins.bottom(), Unit::Mm)); } } const QPrinter::PageSize pSZ = FindTemplate(size); if (pSZ == QPrinter::Custom) { - size.setWidth(size.width() + left + right); - size.setHeight(size.height() + top + bottom); printer->setPaperSize (size, QPrinter::Millimeter ); } else @@ -958,6 +952,10 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr } } + const qreal left = FromPixel(margins.left(), Unit::Mm); + const qreal top = FromPixel(margins.top(), Unit::Mm); + const qreal right = FromPixel(margins.right(), Unit::Mm); + const qreal bottom = FromPixel(margins.bottom(), Unit::Mm); printer->setPageMargins(left, top, right, bottom, QPrinter::Millimeter); switch(printType) From fa7afbfc3974c25459ce144d483e75a3e221dd0b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Aug 2016 20:00:42 +0300 Subject: [PATCH 13/34] Don't ignore margins when export to PDF. --HG-- branch : develop --- src/app/valentina/mainwindowsnogui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index a72c7542f..b234c8ea9 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -631,7 +631,7 @@ void MainWindowsNoGUI::PdfFile(const QString &name, int i) const if (paper) { QPrinter printer; - printer.setCreator(qApp->applicationDisplayName()+" "+qApp->applicationVersion()); + printer.setCreator(qApp->applicationDisplayName()+QLatin1String(" ")+qApp->applicationVersion()); printer.setOutputFormat(QPrinter::PdfFormat); printer.setOutputFileName(name); printer.setDocName(FileName()); @@ -646,7 +646,8 @@ void MainWindowsNoGUI::PdfFile(const QString &name, int i) const { printer.setOrientation(QPrinter::Landscape); } - printer.setPaperSize ( QSizeF(FromPixel(r.width(), Unit::Mm), FromPixel(r.height(), Unit::Mm)), + printer.setPaperSize ( QSizeF(FromPixel(r.width() + margins.left() + margins.right(), Unit::Mm), + FromPixel(r.height() + margins.top() + margins.bottom(), Unit::Mm)), QPrinter::Millimeter ); QPainter painter; if (painter.begin( &printer ) == false) From 872fcc52170cbf4810b5764ff87ac0b1da2b1852 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Aug 2016 20:04:50 +0300 Subject: [PATCH 14/34] Added Timo Virtaneva to the list of contributors. --HG-- branch : develop --- AUTHORS.txt | 2 ++ src/app/valentina/dialogs/dialogaboutapp.ui | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index db6575e3e..e57903b48 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -34,3 +34,5 @@ Patch contributors: * Translation. Bettina Gatzlaff * Testing + Timo Virtaneva + * Testing diff --git a/src/app/valentina/dialogs/dialogaboutapp.ui b/src/app/valentina/dialogs/dialogaboutapp.ui index dfa407174..47c3db450 100644 --- a/src/app/valentina/dialogs/dialogaboutapp.ui +++ b/src/app/valentina/dialogs/dialogaboutapp.ui @@ -205,7 +205,8 @@ Roman Telezhinskyi -Susan Spencer +Susan Spencer +Timo Virtaneva luzpazB Christine Neupert Sabine Schmaltz From 6281f46a8e249a72d0c7d434d330e85c4191c850 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 23 Aug 2016 14:02:09 +0300 Subject: [PATCH 15/34] Rewrite describing placeholders %size% and %height%. New way will help avoid translation mistake. --HG-- branch : develop --- .../dialogs/dialogpatternproperties.cpp | 6 +++++- .../dialogs/dialogpatternproperties.ui | 13 +++++------- src/libs/vlayout/vtextmanager.cpp | 11 ++++++++-- src/libs/vmisc/def.cpp | 3 +++ src/libs/vmisc/def.h | 4 ++++ src/libs/vpatterndb/vtranslatevars.cpp | 21 +++++++++++++++++++ src/libs/vpatterndb/vtranslatevars.h | 4 ++++ 7 files changed, 51 insertions(+), 11 deletions(-) diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index ce257ac43..9e3fe361b 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -173,6 +173,11 @@ DialogPatternProperties::DialogPatternProperties(const QString &filePath, VPatte ui->lineEditCustomerName->setText(doc->GetCustomerName()); ui->labelCreationDate->setText(QDate::currentDate().toString(Qt::SystemLocaleLongDate)); ui->lineEditSize->setText(doc->GetPatternSize()); + + const QString plSize = QLatin1String("%") + qApp->TrVars()->PlaceholderToUser(pl_size) + QLatin1String("%"); + const QString plHeight = QLatin1String("%") + qApp->TrVars()->PlaceholderToUser(pl_height) + QLatin1String("%"); + ui->lineEditSize->setToolTip(tr("Use %1 and %2 to insert pattern size and height").arg(plSize, plHeight)); + ui->checkBoxShowDate->setChecked(doc->IsDateVisible()); if (doc->MPath().isEmpty() == true) { @@ -184,7 +189,6 @@ DialogPatternProperties::DialogPatternProperties(const QString &filePath, VPatte ui->checkBoxShowMeasurements->setChecked(doc->IsMeasurementsVisible()); } - connect(ui->lineEditPatternName, &QLineEdit::editingFinished, this, &DialogPatternProperties::GeneralInfoChanged); connect(ui->lineEditPatternNumber, &QLineEdit::editingFinished, this, &DialogPatternProperties::GeneralInfoChanged); connect(ui->lineEditCompanyName, &QLineEdit::editingFinished, this, &DialogPatternProperties::GeneralInfoChanged); diff --git a/src/app/valentina/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui index 5e04e4baf..2ef6a2803 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.ui +++ b/src/app/valentina/dialogs/dialogpatternproperties.ui @@ -1053,7 +1053,7 @@ 10 10 401 - 241 + 252 @@ -1139,9 +1139,6 @@ - - Use %size% and %height% to insert pattern size and height - 40 @@ -1189,8 +1186,8 @@ accept() - 248 - 254 + 257 + 682 157 @@ -1205,8 +1202,8 @@ reject() - 316 - 260 + 325 + 682 286 diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp index bd571b356..dfd19ca1b 100644 --- a/src/libs/vlayout/vtextmanager.cpp +++ b/src/libs/vlayout/vtextmanager.cpp @@ -35,6 +35,7 @@ #include "../ifc/xml/vabstractpattern.h" #include "../vpatterndb/vpatternpiecedata.h" +#include "../vmisc/vabstractapplication.h" #include "vtextmanager.h" //--------------------------------------------------------------------------------------------------------------------- @@ -324,8 +325,14 @@ void VTextManager::Update(const VAbstractPattern *pDoc, qreal dSize, qreal dHeig tl.m_qsText = pDoc->GetPatternSize(); if (tl.m_qsText.isEmpty() == false) { - tl.m_qsText.replace(QApplication::translate("Detail", "%size%", 0), QString::number(dSize)); - tl.m_qsText.replace(QApplication::translate("Detail", "%height%", 0), QString::number(dHeight)); + // Such describing placeholders will help avoid mistake of localization. + // Translators very often remove '%'. + QString placeholder = QLatin1String("%") + qApp->TrVars()->PlaceholderToUser(pl_size) + QLatin1String("%"); + tl.m_qsText.replace(placeholder, QString::number(dSize)); + + placeholder = QLatin1String("%") + qApp->TrVars()->PlaceholderToUser(pl_height) + QLatin1String("%"); + tl.m_qsText.replace(placeholder, QString::number(dHeight)); + tl.m_eFontWeight = QFont::Normal; tl.m_eStyle = QFont::StyleNormal; tl.m_iFontSize = 0; diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index 3af5215fd..9aeb2904a 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -423,6 +423,9 @@ const QStringList builInPostfixOperators = QStringList() << cm_Oprt << mm_Oprt << in_Oprt; +const QString pl_size = QStringLiteral("size"); +const QString pl_height = QStringLiteral("height"); + const QString cursorArrowOpenHand = QStringLiteral("://cursor/cursor-arrow-openhand.png"); const QString cursorArrowCloseHand = QStringLiteral("://cursor/cursor-arrow-closehand.png"); diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 9a9d385b1..ad437abd6 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -592,6 +592,10 @@ extern const QString in_Oprt; extern const QStringList builInPostfixOperators; +// Placeholders +extern const QString pl_size; +extern const QString pl_height; + extern const QString cursorArrowOpenHand; extern const QString cursorArrowCloseHand; diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index d3c0a04e4..ed994d762 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -55,12 +55,14 @@ VTranslateVars::VTranslateVars() variables(QMap()), functions(QMap()), postfixOperators(QMap()), + placeholders(QMap()), stDescriptions(QMap()) { InitPatternMakingSystems(); InitVariables(); InitFunctions(); InitPostfixOperators(); + InitPlaceholder(); } //--------------------------------------------------------------------------------------------------------------------- @@ -430,6 +432,13 @@ void VTranslateVars::InitPostfixOperators() postfixOperators.insert(in_Oprt, translate("VTranslateVars", "in", "inch")); } +//--------------------------------------------------------------------------------------------------------------------- +void VTranslateVars::InitPlaceholder() +{ + placeholders.insert(pl_size, translate("VTranslateVars", "size", "placeholder")); + placeholders.insert(pl_height, translate("VTranslateVars", "height", "placeholder")); +} + #undef translate //--------------------------------------------------------------------------------------------------------------------- @@ -614,6 +623,17 @@ QString VTranslateVars::InternalVarToUser(const QString &var) const } } +//--------------------------------------------------------------------------------------------------------------------- +QString VTranslateVars::PlaceholderToUser(const QString &var) const +{ + if (placeholders.contains(var)) + { + return placeholders.value(var).translate(); + } + + return var; +} + //--------------------------------------------------------------------------------------------------------------------- QString VTranslateVars::VarToUser(const QString &var) const { @@ -945,6 +965,7 @@ void VTranslateVars::Retranslate() InitVariables(); InitFunctions(); InitPostfixOperators(); + InitPlaceholder(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vpatterndb/vtranslatevars.h b/src/libs/vpatterndb/vtranslatevars.h index badace6f0..b95eeef97 100644 --- a/src/libs/vpatterndb/vtranslatevars.h +++ b/src/libs/vpatterndb/vtranslatevars.h @@ -46,6 +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 VarToUser(const QString &var) const; QString VarFromUser(const QString &var) const; @@ -61,6 +62,7 @@ public: QString FormulaToUser(const QString &formula, bool osSeparator) const; virtual void Retranslate() Q_DECL_OVERRIDE; + QMap GetFunctions() const; private: @@ -71,12 +73,14 @@ private: QMap variables; QMap functions; QMap postfixOperators; + QMap placeholders; QMap stDescriptions; void InitPatternMakingSystems(); void InitVariables(); void InitFunctions(); void InitPostfixOperators(); + void InitPlaceholder(); void InitSystem(const QString &code, const qmu::QmuTranslation &name, const qmu::QmuTranslation &author, const qmu::QmuTranslation &book); From 57b4afc232f67845b1cfb20ea0d598228630bc05 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 23 Aug 2016 14:24:24 +0300 Subject: [PATCH 16/34] Lupdate. --HG-- branch : develop --- share/translations/measurements_p0_fr_FR.ts | 10 +- share/translations/measurements_p10_fr_FR.ts | 10 +- share/translations/measurements_p11_fr_FR.ts | 10 +- share/translations/measurements_p12_fr_FR.ts | 10 +- share/translations/measurements_p13_fr_FR.ts | 10 +- share/translations/measurements_p14_fr_FR.ts | 10 +- share/translations/measurements_p15_fr_FR.ts | 10 +- share/translations/measurements_p16_fr_FR.ts | 10 +- share/translations/measurements_p17_fr_FR.ts | 10 +- share/translations/measurements_p18_fr_FR.ts | 10 +- share/translations/measurements_p19_fr_FR.ts | 10 +- share/translations/measurements_p1_fr_FR.ts | 10 +- share/translations/measurements_p20_fr_FR.ts | 10 +- share/translations/measurements_p21_fr_FR.ts | 10 +- share/translations/measurements_p22_fr_FR.ts | 10 +- share/translations/measurements_p23_fr_FR.ts | 10 +- share/translations/measurements_p24_fr_FR.ts | 10 +- share/translations/measurements_p25_fr_FR.ts | 10 +- share/translations/measurements_p26_fr_FR.ts | 10 +- share/translations/measurements_p27_fr_FR.ts | 10 +- share/translations/measurements_p28_fr_FR.ts | 10 +- share/translations/measurements_p29_fr_FR.ts | 10 +- share/translations/measurements_p2_fr_FR.ts | 10 +- share/translations/measurements_p30_fr_FR.ts | 10 +- share/translations/measurements_p31_fr_FR.ts | 10 +- share/translations/measurements_p32_fr_FR.ts | 10 +- share/translations/measurements_p33_fr_FR.ts | 10 +- share/translations/measurements_p34_fr_FR.ts | 10 +- share/translations/measurements_p35_fr_FR.ts | 10 +- share/translations/measurements_p36_fr_FR.ts | 10 +- share/translations/measurements_p37_fr_FR.ts | 10 +- share/translations/measurements_p38_fr_FR.ts | 10 +- share/translations/measurements_p39_fr_FR.ts | 10 +- share/translations/measurements_p3_fr_FR.ts | 10 +- share/translations/measurements_p40_fr_FR.ts | 10 +- share/translations/measurements_p41_fr_FR.ts | 10 +- share/translations/measurements_p42_fr_FR.ts | 10 +- share/translations/measurements_p43_fr_FR.ts | 10 +- share/translations/measurements_p44_fr_FR.ts | 10 +- share/translations/measurements_p45_fr_FR.ts | 10 +- share/translations/measurements_p46_fr_FR.ts | 10 +- share/translations/measurements_p47_fr_FR.ts | 10 +- share/translations/measurements_p48_fr_FR.ts | 10 +- share/translations/measurements_p49_fr_FR.ts | 10 +- share/translations/measurements_p4_fr_FR.ts | 10 +- share/translations/measurements_p50_fr_FR.ts | 10 +- share/translations/measurements_p51_fr_FR.ts | 10 +- share/translations/measurements_p52_fr_FR.ts | 10 +- share/translations/measurements_p53_fr_FR.ts | 10 +- share/translations/measurements_p54_fr_FR.ts | 10 +- share/translations/measurements_p5_fr_FR.ts | 10 +- share/translations/measurements_p6_fr_FR.ts | 10 +- share/translations/measurements_p7_fr_FR.ts | 10 +- share/translations/measurements_p8_fr_FR.ts | 10 +- share/translations/measurements_p998_fr_FR.ts | 10 +- share/translations/measurements_p9_fr_FR.ts | 10 +- share/translations/valentina.ts | 131 +++- share/translations/valentina_cs_CZ.ts | 103 ++- share/translations/valentina_de_DE.ts | 97 ++- share/translations/valentina_en_CA.ts | 141 +++- share/translations/valentina_en_IN.ts | 141 +++- share/translations/valentina_en_US.ts | 141 +++- share/translations/valentina_es_ES.ts | 97 ++- share/translations/valentina_fi_FI.ts | 103 ++- share/translations/valentina_fr_FR.ts | 91 ++- share/translations/valentina_he_IL.ts | 106 ++- share/translations/valentina_id_ID.ts | 106 ++- share/translations/valentina_it_IT.ts | 99 ++- share/translations/valentina_nl_NL.ts | 621 ++++++++++-------- share/translations/valentina_pt_BR.ts | 145 ++-- share/translations/valentina_ro_RO.ts | 103 ++- share/translations/valentina_ru_RU.ts | 99 ++- share/translations/valentina_uk_UA.ts | 93 ++- share/translations/valentina_zh_CN.ts | 106 ++- 74 files changed, 2101 insertions(+), 982 deletions(-) diff --git a/share/translations/measurements_p0_fr_FR.ts b/share/translations/measurements_p0_fr_FR.ts index a95c71299..653464f52 100644 --- a/share/translations/measurements_p0_fr_FR.ts +++ b/share/translations/measurements_p0_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p10_fr_FR.ts b/share/translations/measurements_p10_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p10_fr_FR.ts +++ b/share/translations/measurements_p10_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p11_fr_FR.ts b/share/translations/measurements_p11_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p11_fr_FR.ts +++ b/share/translations/measurements_p11_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p12_fr_FR.ts b/share/translations/measurements_p12_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p12_fr_FR.ts +++ b/share/translations/measurements_p12_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p13_fr_FR.ts b/share/translations/measurements_p13_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p13_fr_FR.ts +++ b/share/translations/measurements_p13_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p14_fr_FR.ts b/share/translations/measurements_p14_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p14_fr_FR.ts +++ b/share/translations/measurements_p14_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p15_fr_FR.ts b/share/translations/measurements_p15_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p15_fr_FR.ts +++ b/share/translations/measurements_p15_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p16_fr_FR.ts b/share/translations/measurements_p16_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p16_fr_FR.ts +++ b/share/translations/measurements_p16_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p17_fr_FR.ts b/share/translations/measurements_p17_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p17_fr_FR.ts +++ b/share/translations/measurements_p17_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p18_fr_FR.ts b/share/translations/measurements_p18_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p18_fr_FR.ts +++ b/share/translations/measurements_p18_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p19_fr_FR.ts b/share/translations/measurements_p19_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p19_fr_FR.ts +++ b/share/translations/measurements_p19_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p1_fr_FR.ts b/share/translations/measurements_p1_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p1_fr_FR.ts +++ b/share/translations/measurements_p1_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p20_fr_FR.ts b/share/translations/measurements_p20_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p20_fr_FR.ts +++ b/share/translations/measurements_p20_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p21_fr_FR.ts b/share/translations/measurements_p21_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p21_fr_FR.ts +++ b/share/translations/measurements_p21_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p22_fr_FR.ts b/share/translations/measurements_p22_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p22_fr_FR.ts +++ b/share/translations/measurements_p22_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p23_fr_FR.ts b/share/translations/measurements_p23_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p23_fr_FR.ts +++ b/share/translations/measurements_p23_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p24_fr_FR.ts b/share/translations/measurements_p24_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p24_fr_FR.ts +++ b/share/translations/measurements_p24_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p25_fr_FR.ts b/share/translations/measurements_p25_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p25_fr_FR.ts +++ b/share/translations/measurements_p25_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p26_fr_FR.ts b/share/translations/measurements_p26_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p26_fr_FR.ts +++ b/share/translations/measurements_p26_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p27_fr_FR.ts b/share/translations/measurements_p27_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p27_fr_FR.ts +++ b/share/translations/measurements_p27_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p28_fr_FR.ts b/share/translations/measurements_p28_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p28_fr_FR.ts +++ b/share/translations/measurements_p28_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p29_fr_FR.ts b/share/translations/measurements_p29_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p29_fr_FR.ts +++ b/share/translations/measurements_p29_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p2_fr_FR.ts b/share/translations/measurements_p2_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p2_fr_FR.ts +++ b/share/translations/measurements_p2_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p30_fr_FR.ts b/share/translations/measurements_p30_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p30_fr_FR.ts +++ b/share/translations/measurements_p30_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p31_fr_FR.ts b/share/translations/measurements_p31_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p31_fr_FR.ts +++ b/share/translations/measurements_p31_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p32_fr_FR.ts b/share/translations/measurements_p32_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p32_fr_FR.ts +++ b/share/translations/measurements_p32_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p33_fr_FR.ts b/share/translations/measurements_p33_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p33_fr_FR.ts +++ b/share/translations/measurements_p33_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p34_fr_FR.ts b/share/translations/measurements_p34_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p34_fr_FR.ts +++ b/share/translations/measurements_p34_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p35_fr_FR.ts b/share/translations/measurements_p35_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p35_fr_FR.ts +++ b/share/translations/measurements_p35_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p36_fr_FR.ts b/share/translations/measurements_p36_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p36_fr_FR.ts +++ b/share/translations/measurements_p36_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p37_fr_FR.ts b/share/translations/measurements_p37_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p37_fr_FR.ts +++ b/share/translations/measurements_p37_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p38_fr_FR.ts b/share/translations/measurements_p38_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p38_fr_FR.ts +++ b/share/translations/measurements_p38_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p39_fr_FR.ts b/share/translations/measurements_p39_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p39_fr_FR.ts +++ b/share/translations/measurements_p39_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p3_fr_FR.ts b/share/translations/measurements_p3_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p3_fr_FR.ts +++ b/share/translations/measurements_p3_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p40_fr_FR.ts b/share/translations/measurements_p40_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p40_fr_FR.ts +++ b/share/translations/measurements_p40_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p41_fr_FR.ts b/share/translations/measurements_p41_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p41_fr_FR.ts +++ b/share/translations/measurements_p41_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p42_fr_FR.ts b/share/translations/measurements_p42_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p42_fr_FR.ts +++ b/share/translations/measurements_p42_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p43_fr_FR.ts b/share/translations/measurements_p43_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p43_fr_FR.ts +++ b/share/translations/measurements_p43_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p44_fr_FR.ts b/share/translations/measurements_p44_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p44_fr_FR.ts +++ b/share/translations/measurements_p44_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p45_fr_FR.ts b/share/translations/measurements_p45_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p45_fr_FR.ts +++ b/share/translations/measurements_p45_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p46_fr_FR.ts b/share/translations/measurements_p46_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p46_fr_FR.ts +++ b/share/translations/measurements_p46_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p47_fr_FR.ts b/share/translations/measurements_p47_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p47_fr_FR.ts +++ b/share/translations/measurements_p47_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p48_fr_FR.ts b/share/translations/measurements_p48_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p48_fr_FR.ts +++ b/share/translations/measurements_p48_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p49_fr_FR.ts b/share/translations/measurements_p49_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p49_fr_FR.ts +++ b/share/translations/measurements_p49_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p4_fr_FR.ts b/share/translations/measurements_p4_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p4_fr_FR.ts +++ b/share/translations/measurements_p4_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p50_fr_FR.ts b/share/translations/measurements_p50_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p50_fr_FR.ts +++ b/share/translations/measurements_p50_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p51_fr_FR.ts b/share/translations/measurements_p51_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p51_fr_FR.ts +++ b/share/translations/measurements_p51_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p52_fr_FR.ts b/share/translations/measurements_p52_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p52_fr_FR.ts +++ b/share/translations/measurements_p52_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p53_fr_FR.ts b/share/translations/measurements_p53_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p53_fr_FR.ts +++ b/share/translations/measurements_p53_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p54_fr_FR.ts b/share/translations/measurements_p54_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p54_fr_FR.ts +++ b/share/translations/measurements_p54_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p5_fr_FR.ts b/share/translations/measurements_p5_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p5_fr_FR.ts +++ b/share/translations/measurements_p5_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p6_fr_FR.ts b/share/translations/measurements_p6_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p6_fr_FR.ts +++ b/share/translations/measurements_p6_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p7_fr_FR.ts b/share/translations/measurements_p7_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p7_fr_FR.ts +++ b/share/translations/measurements_p7_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p8_fr_FR.ts b/share/translations/measurements_p8_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p8_fr_FR.ts +++ b/share/translations/measurements_p8_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p998_fr_FR.ts b/share/translations/measurements_p998_fr_FR.ts index cfe41726b..1a891d188 100644 --- a/share/translations/measurements_p998_fr_FR.ts +++ b/share/translations/measurements_p998_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/measurements_p9_fr_FR.ts b/share/translations/measurements_p9_fr_FR.ts index 5eb5a3b73..8d403275a 100644 --- a/share/translations/measurements_p9_fr_FR.ts +++ b/share/translations/measurements_p9_fr_FR.ts @@ -2509,19 +2509,19 @@ across_chest_half_f Name in a formula. Don't use math symbols and space in name!!!! - + demi_carrure_dev Across Chest, half Full measurement name. - + Demie carrure, devant Half of 'Across Chest'. ('Across Chest' / 2). Full measurement description. - + Moitié de la ligne de carrure, devant. ('carrure devant' / 2). @@ -2569,13 +2569,13 @@ Armfold to Armfold, back Full measurement name. - + Du pli du bras à l'autre, dos. From Armfold to Armfold across the back. Full measurement description. - + Distance du pli du bars dos à l'autre, le long de la carrure. diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index 376b541c4..4e9b9f8d4 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -286,7 +286,7 @@ The text appears under the icon (recommended for beginners). - + The text appears under the icon (recommended for beginners). @@ -317,6 +317,25 @@ delete pattern piece %1 + + Detail + + Fabric + Fabric + + + Lining + Lining + + + Interfacing + Interfacing + + + Interlining + Interlining + + DialogAboutApp @@ -1409,19 +1428,19 @@ Fabric - Fabric + Fabric Lining - Lining + Lining Interfacing - Interfacing + Interfacing Interlining - Interlining + Interlining None @@ -1445,6 +1464,10 @@ on Fold + on Fold + + + You can choose one of the predefined materials or enter a new one @@ -1578,6 +1601,10 @@ Full name Full name + + Functions + + DialogEndLine @@ -2382,8 +2409,17 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + Enabling for sheets that have big height will speed up creating. + + + Printer: + + None + Printer + None + DialogLine @@ -3081,6 +3117,10 @@ Apply settings anyway? Show date of creation Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3222,7 +3262,7 @@ Apply settings anyway? Type: - + Type: @@ -3565,7 +3605,7 @@ Apply settings anyway? Tool point of intersetion arcs - + Tool point of intersetion arcs @@ -3672,7 +3712,7 @@ Apply settings anyway? Tool point of intersection circles - + Tool point of intersection circles @@ -3785,7 +3825,7 @@ Apply settings anyway? Path to destination folder. - Path to destination folder. + Path to destination folder. Select path to destination folder @@ -3801,6 +3841,10 @@ Apply settings anyway? File base name. + File base name. + + + Path to destination folder @@ -5737,31 +5781,31 @@ Do you want to save your changes? Original zoom - + Original zoom Select first circle center - + Select first circle center Select point on tangent - + Select point on tangent Pattern Piece: - + Pattern Piece: Height: - Height: + Height: Size: - Size: + Size: The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location? - + The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location? @@ -5828,7 +5872,7 @@ Do you want to save your changes? Export error. - Export error. + Export error. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5846,6 +5890,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5967,6 +6015,18 @@ Do you want to save your changes? Count steps (0 - no limit): Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -6894,23 +6954,23 @@ Do you want to save your changes? Customer's name - + Customer's name Customer's family name - + Customer's family name Customer's email address - + Customer's email address Height: - Height: + Height: Size: - Size: + Size: @@ -7495,11 +7555,11 @@ Do you want to save your changes? Number corresponding to output format (default = 0, export mode): - + Number corresponding to output format (default = 0, export mode): Number corresponding to page template (default = 0, export mode): - + Number corresponding to page template (default = 0, export mode): @@ -7902,7 +7962,7 @@ Do you want to save your changes? VTextManager Cut %1 on %2%3 - Cut %1 on %2%3 + Cut %1 on %2%3 on Fold @@ -7910,6 +7970,10 @@ Do you want to save your changes? on Fold + on Fold + + + Cut @@ -9140,7 +9204,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9302,6 +9366,21 @@ Do you want to save your changes? Do not add space between words CurrentLength + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index b37901983..00a0f0d44 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -306,6 +306,25 @@ + + Detail + + Fabric + + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1372,22 +1391,6 @@ Pattern label visible - - Fabric - - - - Lining - - - - Interfacing - - - - Interlining - - None @@ -1408,6 +1411,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1527,6 +1534,10 @@ Full name + + Functions + + DialogEndLine @@ -2296,6 +2307,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + + DialogLine @@ -2989,6 +3009,10 @@ Apply settings anyway? Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3635,10 +3659,6 @@ Apply settings anyway? Destination folder - - Path to destination folder. - - Select path to destination folder @@ -3648,7 +3668,7 @@ Apply settings anyway? - File base name. + Path to destination folder @@ -5577,10 +5597,6 @@ Chcete uložit své změny? Can't open printer %1 - - Export error. - - For previewing multipage document all sheet should have the same size. @@ -5593,6 +5609,10 @@ Chcete uložit své změny? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5714,6 +5734,18 @@ Chcete uložit své změny? Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7531,11 +7563,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -8741,7 +8773,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -8903,6 +8935,21 @@ Do you want to save your changes? Do not add space between words + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index 7b8d14b95..2f1537c9b 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -317,6 +317,25 @@ Schnittteil %1 löschen + + Detail + + Fabric + Stoff + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1409,19 +1428,7 @@ Fabric - Stoff - - - Lining - - - - Interfacing - - - - Interlining - + Stoff None @@ -1443,6 +1450,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1574,6 +1585,10 @@ Full name Vollständiger Name + + Functions + + DialogEndLine @@ -2379,6 +2394,15 @@ Einstellungen trotzdem anwenden? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + Keine + DialogLine @@ -3076,6 +3100,10 @@ Einstellungen trotzdem anwenden? Show date of creation Erstelldatum anzeigen + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3780,7 +3808,7 @@ Einstellungen trotzdem anwenden? Path to destination folder. - Pfad zum Zielordner. + Pfad zum Zielordner. Select path to destination folder @@ -3795,7 +3823,7 @@ Einstellungen trotzdem anwenden? Datei-Basisname. - File base name. + Path to destination folder @@ -5823,7 +5851,7 @@ Sollen die Änderungen gespeichert werden? Export error. - Export-Fehler. + Export-Fehler. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5841,6 +5869,10 @@ Sollen die Änderungen gespeichert werden? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5962,6 +5994,18 @@ Sollen die Änderungen gespeichert werden? Count steps (0 - no limit): Schritte (0 - unbegrenzt): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7890,11 +7934,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -9125,7 +9169,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9287,6 +9331,21 @@ Do you want to save your changes? Do not add space between words + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index ba5abcd14..172a2c3a5 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -286,7 +286,7 @@ The text appears under the icon (recommended for beginners). - + The text appears under the icon (recommended for beginners). @@ -317,6 +317,25 @@ delete pattern piece %1 + + Detail + + Fabric + Fabric + + + Lining + Lining + + + Interfacing + Interfacing + + + Interlining + Interlining + + DialogAboutApp @@ -891,7 +910,7 @@ Tool cubic bezier - + Tool cubic bezier @@ -922,7 +941,7 @@ Tool cubic bezier path - + Tool cubic bezier path @@ -1409,19 +1428,19 @@ Fabric - Fabric + Fabric Lining - Lining + Lining Interfacing - Interfacing + Interfacing Interlining - Interlining + Interlining None @@ -1445,6 +1464,10 @@ on Fold + on Fold + + + You can choose one of the predefined materials or enter a new one @@ -1578,6 +1601,10 @@ Full name Full name + + Functions + + DialogEndLine @@ -2382,8 +2409,17 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + Enabling for sheets that have big height will speed up creating. + + + Printer: + + None + Printer + None + DialogLine @@ -3081,6 +3117,10 @@ Apply settings anyway? Show date of creation Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3222,7 +3262,7 @@ Apply settings anyway? Type: - + Type: @@ -3565,7 +3605,7 @@ Apply settings anyway? Tool point of intersetion arcs - + Tool point of intersetion arcs @@ -3672,7 +3712,7 @@ Apply settings anyway? Tool point of intersection circles - + Tool point of intersection circles @@ -3785,7 +3825,7 @@ Apply settings anyway? Path to destination folder. - Path to destination folder. + Path to destination folder. Select path to destination folder @@ -3801,6 +3841,10 @@ Apply settings anyway? File base name. + File base name. + + + Path to destination folder @@ -5737,31 +5781,31 @@ Do you want to save your changes? Original zoom - + Original zoom Select first circle center - + Select first circle center Select point on tangent - + Select point on tangent Pattern Piece: - + Pattern Piece: Height: - Height: + Height: Size: - Size: + Size: The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location? - + The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location? @@ -5828,7 +5872,7 @@ Do you want to save your changes? Export error. - Export error. + Export error. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5846,6 +5890,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5967,6 +6015,18 @@ Do you want to save your changes? Count steps (0 - no limit): Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -6890,27 +6950,27 @@ Do you want to save your changes? Comma-Separated Values - + Comma-Separated Values Customer's name - + Customer's name Customer's family name - + Customer's family name Customer's email address - + Customer's email address Height: - Height: + Height: Size: - Size: + Size: @@ -7495,11 +7555,11 @@ Do you want to save your changes? Number corresponding to output format (default = 0, export mode): - + Number corresponding to output format (default = 0, export mode): Number corresponding to page template (default = 0, export mode): - + Number corresponding to page template (default = 0, export mode): @@ -7902,10 +7962,18 @@ Do you want to save your changes? VTextManager Cut %1 on %2%3 - + Cut %1 on %2%3 + + + on Fold + on Fold on Fold + on Fold + + + Cut @@ -9136,7 +9204,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9298,6 +9366,21 @@ Do you want to save your changes? Do not add space between words CurrentLength + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index 56695f95c..220f3e7e8 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -286,7 +286,7 @@ The text appears under the icon (recommended for beginners). - + The text appears under the icon (recommended for beginners). @@ -317,6 +317,25 @@ delete pattern piece %1 + + Detail + + Fabric + Fabric + + + Lining + Lining + + + Interfacing + Interfacing + + + Interlining + Interlining + + DialogAboutApp @@ -891,7 +910,7 @@ Tool cubic bezier - + Tool cubic bezier @@ -922,7 +941,7 @@ Tool cubic bezier path - + Tool cubic bezier path @@ -1409,19 +1428,19 @@ Fabric - Fabric + Fabric Lining - Lining + Lining Interfacing - Interfacing + Interfacing Interlining - Interlining + Interlining None @@ -1445,6 +1464,10 @@ on Fold + on Fold + + + You can choose one of the predefined materials or enter a new one @@ -1578,6 +1601,10 @@ Full name Full name + + Functions + + DialogEndLine @@ -2382,8 +2409,17 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + Enabling for sheets that have big height will speed up creating. + + + Printer: + + None + Printer + None + DialogLine @@ -3081,6 +3117,10 @@ Apply settings anyway? Show date of creation Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3222,7 +3262,7 @@ Apply settings anyway? Type: - + Type: @@ -3565,7 +3605,7 @@ Apply settings anyway? Tool point of intersetion arcs - + Tool point of intersetion arcs @@ -3672,7 +3712,7 @@ Apply settings anyway? Tool point of intersection circles - + Tool point of intersection circles @@ -3785,7 +3825,7 @@ Apply settings anyway? Path to destination folder. - Path to destination folder. + Path to destination folder. Select path to destination folder @@ -3801,6 +3841,10 @@ Apply settings anyway? File base name. + File base name. + + + Path to destination folder @@ -5737,31 +5781,31 @@ Do you want to save your changes? Original zoom - + Original zoom Select first circle center - + Select first circle center Select point on tangent - + Select point on tangent Pattern Piece: - + Pattern Piece: Height: - Height: + Height: Size: - Size: + Size: The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location? - + The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location? @@ -5828,7 +5872,7 @@ Do you want to save your changes? Export error. - Export error. + Export error. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5846,6 +5890,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5967,6 +6015,18 @@ Do you want to save your changes? Count steps (0 - no limit): Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -6890,27 +6950,27 @@ Do you want to save your changes? Comma-Separated Values - + Comma-Separated Values Customer's name - + Customer's name Customer's family name - + Customer's family name Customer's email address - + Customer's email address Height: - Height: + Height: Size: - Size: + Size: @@ -7495,11 +7555,11 @@ Do you want to save your changes? Number corresponding to output format (default = 0, export mode): - + Number corresponding to output format (default = 0, export mode): Number corresponding to page template (default = 0, export mode): - + Number corresponding to page template (default = 0, export mode): @@ -7902,10 +7962,18 @@ Do you want to save your changes? VTextManager Cut %1 on %2%3 - + Cut %1 on %2%3 + + + on Fold + on Fold on Fold + on Fold + + + Cut @@ -9136,7 +9204,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9298,6 +9366,21 @@ Do you want to save your changes? Do not add space between words CurrentLength + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 55e66a7d6..d56d8aaec 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -286,7 +286,7 @@ The text appears under the icon (recommended for beginners). - + The text appears under the icon (recommended for beginners). @@ -317,6 +317,25 @@ delete pattern piece %1 + + Detail + + Fabric + Fabric + + + Lining + Lining + + + Interfacing + Interfacing + + + Interlining + Interlining + + DialogAboutApp @@ -891,7 +910,7 @@ Tool cubic bezier - + Tool cubic bezier @@ -922,7 +941,7 @@ Tool cubic bezier path - + Tool cubic bezier path @@ -1409,19 +1428,19 @@ Fabric - Fabric + Fabric Lining - Lining + Lining Interfacing - Interfacing + Interfacing Interlining - Interlining + Interlining None @@ -1445,6 +1464,10 @@ on Fold + on Fold + + + You can choose one of the predefined materials or enter a new one @@ -1578,6 +1601,10 @@ Full name Full name + + Functions + + DialogEndLine @@ -2382,8 +2409,17 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + Enabling for sheets that have big height will speed up creating. + + + Printer: + + None + Printer + None + DialogLine @@ -3081,6 +3117,10 @@ Apply settings anyway? Show date of creation Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3222,7 +3262,7 @@ Apply settings anyway? Type: - + Type: @@ -3565,7 +3605,7 @@ Apply settings anyway? Tool point of intersetion arcs - + Tool point of intersetion arcs @@ -3672,7 +3712,7 @@ Apply settings anyway? Tool point of intersection circles - + Tool point of intersection circles @@ -3785,7 +3825,7 @@ Apply settings anyway? Path to destination folder. - Path to destination folder. + Path to destination folder. Select path to destination folder @@ -3801,6 +3841,10 @@ Apply settings anyway? File base name. + File base name. + + + Path to destination folder @@ -5737,31 +5781,31 @@ Do you want to save your changes? Original zoom - + Original zoom Select first circle center - + Select first circle center Select point on tangent - + Select point on tangent Pattern Piece: - + Pattern Piece: Height: - Height: + Height: Size: - Size: + Size: The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location? - + The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location? @@ -5828,7 +5872,7 @@ Do you want to save your changes? Export error. - Export error. + Export error. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5846,6 +5890,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5967,6 +6015,18 @@ Do you want to save your changes? Count steps (0 - no limit): Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -6890,27 +6950,27 @@ Do you want to save your changes? Comma-Separated Values - + Comma-Separated Values Customer's name - + Customer's name Customer's family name - + Customer's family name Customer's email address - + Customer's email address Height: - Height: + Height: Size: - Size: + Size: @@ -7495,11 +7555,11 @@ Do you want to save your changes? Number corresponding to output format (default = 0, export mode): - + Number corresponding to output format (default = 0, export mode): Number corresponding to page template (default = 0, export mode): - + Number corresponding to page template (default = 0, export mode): @@ -7902,10 +7962,18 @@ Do you want to save your changes? VTextManager Cut %1 on %2%3 - + Cut %1 on %2%3 + + + on Fold + on Fold on Fold + on Fold + + + Cut @@ -9136,7 +9204,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9298,6 +9366,21 @@ Do you want to save your changes? Do not add space between words CurrentLength + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index 54ed96458..304507f83 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -317,6 +317,25 @@ borrar pieza %1 de patrón + + Detail + + Fabric + Tela + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1410,19 +1429,7 @@ Fabric - Tela - - - Lining - - - - Interfacing - - - - Interlining - + Tela None @@ -1444,6 +1451,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1575,6 +1586,10 @@ Full name Apellido + + Functions + + DialogEndLine @@ -2380,6 +2395,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + Ninguno + DialogLine @@ -3077,6 +3101,10 @@ Apply settings anyway? Show date of creation Mostrar fecha de creación + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3781,7 +3809,7 @@ Apply settings anyway? Path to destination folder. - Ruta a la carpeta de destino. + Ruta a la carpeta de destino. Select path to destination folder @@ -3796,7 +3824,7 @@ Apply settings anyway? Nombre base del archivo. - File base name. + Path to destination folder @@ -5820,7 +5848,7 @@ Quiere guardar los cambios? Export error. - Error en exportación. + Error en exportación. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5838,6 +5866,10 @@ Quiere guardar los cambios? Pages will be cropped because they do not fit printer paper size. Las páginas serán recortadas porque no se ajustan al tamaño de papel de la impresora. + + Can't create path + + MoveDoubleLabel @@ -5959,6 +5991,18 @@ Quiere guardar los cambios? Count steps (0 - no limit): Contar los pasos (0 - sin limite): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7892,11 +7936,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -9127,7 +9171,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9289,6 +9333,21 @@ Do you want to save your changes? Do not add space between words LongitudActual + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index 2cf9c7329..b5acd3283 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -306,6 +306,25 @@ + + Detail + + Fabric + + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1372,22 +1391,6 @@ Pattern label visible - - Fabric - - - - Lining - - - - Interfacing - - - - Interlining - - None @@ -1408,6 +1411,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1527,6 +1534,10 @@ Full name + + Functions + + DialogEndLine @@ -2296,6 +2307,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + + DialogLine @@ -2989,6 +3009,10 @@ Apply settings anyway? Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3627,10 +3651,6 @@ Apply settings anyway? Destination folder - - Path to destination folder. - - Select path to destination folder @@ -3640,7 +3660,7 @@ Apply settings anyway? - File base name. + Path to destination folder @@ -5569,10 +5589,6 @@ Haluatko tallentaa muutokset? Can't open printer %1 - - Export error. - - For previewing multipage document all sheet should have the same size. @@ -5585,6 +5601,10 @@ Haluatko tallentaa muutokset? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5706,6 +5726,18 @@ Haluatko tallentaa muutokset? Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7523,11 +7555,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -8723,7 +8755,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -8885,6 +8917,21 @@ Do you want to save your changes? Do not add space between words + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 3398ce4c7..12f417b66 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -317,6 +317,25 @@ Supprimer l'élément de patron %1 + + Detail + + Fabric + Tissu + + + Lining + Lin + + + Interfacing + Interfaçage + + + Interlining + Interlignage + + DialogAboutApp @@ -1409,19 +1428,19 @@ Fabric - Tissu + Tissu Lining - Lin + Lin Interfacing - Interfaçage + Interfaçage Interlining - Interlignage + Interlignage None @@ -1447,6 +1466,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1578,6 +1601,10 @@ Full name Nom complet + + Functions + + DialogEndLine @@ -2381,6 +2408,15 @@ Appliquer les réglages quand-même ? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + + DialogLine @@ -3078,6 +3114,10 @@ Appliquer les réglages quand-même ? Show date of creation Voir la date de création + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3782,7 +3822,7 @@ Appliquer les réglages quand-même ? Path to destination folder. - Emplacement du dossier de destination. + Emplacement du dossier de destination. Select path to destination folder @@ -3797,7 +3837,7 @@ Appliquer les réglages quand-même ? Nom du fichier de base. - File base name. + Path to destination folder @@ -5825,7 +5865,7 @@ Voulez-vous sauvegarder les changements? Export error. - Erreur d'exportation. + Erreur d'exportation. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5843,6 +5883,10 @@ Voulez-vous sauvegarder les changements? Pages will be cropped because they do not fit printer paper size. Les pages vont être tronquées du fait de la taille du papier de l'imprimante. + + Can't create path + + MoveDoubleLabel @@ -5964,6 +6008,18 @@ Voulez-vous sauvegarder les changements? Count steps (0 - no limit): Comptage (0 -> sans limite): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7873,11 +7929,11 @@ Voulez-vous enregistrer les changements? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -9108,7 +9164,7 @@ Voulez-vous enregistrer les changements? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9270,6 +9326,21 @@ Voulez-vous enregistrer les changements? Do not add space between words CurrentLength + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index f8602c52a..4bc4cc8b7 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -254,6 +254,25 @@ + + Detail + + Fabric + + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1172,22 +1191,6 @@ Pattern label visible - - Fabric - - - - Lining - - - - Interfacing - - - - Interlining - - None @@ -1208,6 +1211,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1299,6 +1306,10 @@ Full name + + Functions + + DialogEndLine @@ -1992,6 +2003,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + + DialogLine @@ -2633,6 +2653,10 @@ Apply settings anyway? Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3207,10 +3231,6 @@ Apply settings anyway? Destination folder - - Path to destination folder. - - Select path to destination folder @@ -3220,7 +3240,7 @@ Apply settings anyway? - File base name. + Path to destination folder @@ -5004,10 +5024,6 @@ Do you want to save your changes? Can't open printer %1 - - Export error. - - For previewing multipage document all sheet should have the same size. @@ -5020,6 +5036,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5133,6 +5153,18 @@ Do you want to save your changes? Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -6908,11 +6940,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -8076,11 +8108,6 @@ Do you want to save your changes? hyperbolic arcus sine function - - acosh - hyperbolic arcus tangens function - - atanh hyperbolic arcur tangens function @@ -8241,6 +8268,21 @@ Do you want to save your changes? Do not add space between words + + acosh + hyperbolic arcus cosine function + + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index a54b078a5..400c23785 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -302,6 +302,25 @@ + + Detail + + Fabric + + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1312,22 +1331,6 @@ Pattern label visible - - Fabric - - - - Lining - - - - Interfacing - - - - Interlining - - None @@ -1348,6 +1351,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1455,6 +1462,10 @@ Full name + + Functions + + DialogEndLine @@ -2160,6 +2171,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + + DialogLine @@ -2825,6 +2845,10 @@ Apply settings anyway? Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3423,10 +3447,6 @@ Apply settings anyway? Destination folder - - Path to destination folder. - - Select path to destination folder @@ -3436,7 +3456,7 @@ Apply settings anyway? - File base name. + Path to destination folder @@ -5241,10 +5261,6 @@ Apakah anda ingin menyimpan perubahan anda? Can't open printer %1 - - Export error. - - For previewing multipage document all sheet should have the same size. @@ -5257,6 +5273,10 @@ Apakah anda ingin menyimpan perubahan anda? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5370,6 +5390,18 @@ Apakah anda ingin menyimpan perubahan anda? Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7153,11 +7185,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -8321,11 +8353,6 @@ Do you want to save your changes? hyperbolic arcus sine function - - acosh - hyperbolic arcus tangens function - - atanh hyperbolic arcur tangens function @@ -8486,6 +8513,21 @@ Do you want to save your changes? Do not add space between words + + acosh + hyperbolic arcus cosine function + + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 3ba2adf9f..a7d9a9c2f 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -317,6 +317,25 @@ Elimina parte del modello %1 + + Detail + + Fabric + + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1399,22 +1418,6 @@ Pattern label visible - - Fabric - - - - Lining - - - - Interfacing - - - - Interlining - - None Nessuno @@ -1435,6 +1438,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1566,6 +1573,10 @@ Full name Nome intero + + Functions + + DialogEndLine @@ -2364,6 +2375,15 @@ Applicare le impostazioni comunque? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + Nessuno + DialogLine @@ -3057,6 +3077,10 @@ Applicare le impostazioni comunque? Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3761,7 +3785,7 @@ Applicare le impostazioni comunque? Path to destination folder. - Il percorso della cartella di destinazione output. + Il percorso della cartella di destinazione output. Select path to destination folder @@ -3776,7 +3800,7 @@ Applicare le impostazioni comunque? Nome file: - File base name. + Path to destination folder @@ -5788,7 +5812,7 @@ Vuoi salvare i cambiamenti? Export error. - Errore di esportazione. + Errore di esportazione. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5806,6 +5830,10 @@ Vuoi salvare i cambiamenti? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5927,6 +5955,18 @@ Vuoi salvare i cambiamenti? Count steps (0 - no limit): Conto passi (0-infinito): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7835,11 +7875,11 @@ Vuoi salvare le tue modifiche? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -9025,7 +9065,7 @@ Vuoi salvare le tue modifiche? acosh hyperbolic arcus tangens function - arccosh + arccosh atanh @@ -9187,6 +9227,21 @@ Vuoi salvare le tue modifiche? Do not add space between words + + acosh + hyperbolic arcus cosine function + arccosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index ab775d1bb..78f86ecd2 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -286,7 +286,7 @@ The text appears under the icon (recommended for beginners). - + De tekst verschijnt onder het icoon. ( Aanbevolen voor beginners) @@ -300,21 +300,40 @@ DelTool delete tool - Verwijder gereedschap + verwijder gereedschap DeleteDetail delete tool - Verwijder gereedschap + verwijder gereedschap DeletePatternPiece delete pattern piece %1 - Verwijder patroondeel %1 + verwijder patroondeel %1 + + + + Detail + + Fabric + Stof + + + Lining + Voering + + + Interfacing + Vlieseline + + + Interlining + Tussenvoering @@ -411,7 +430,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Point label @@ -526,7 +545,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> First angle @@ -610,11 +629,11 @@ Center point: - Gecentreerde punt: + Middelste punt: Select center point of the arc - Selecteer het gecentreerde punt van de boog + Selecteer het middelste punt van boog Color: @@ -637,7 +656,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> First angle @@ -736,7 +755,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Point label @@ -847,7 +866,7 @@ DialogCubicBezier Cubic bezier - Kubieke bezier + Kubisachtige bezier Color: @@ -891,14 +910,14 @@ Tool cubic bezier - + Kubisachtige bezier gereedschap DialogCubicBezierPath Dialog cubic bezier path - Dialoog kubieke bezier pad + Dialoog kubisachtige bezier pad Point: @@ -918,11 +937,11 @@ Invalid spline path - Ongeldige boogtrekker pad + Ongeldige vrijevormkrommings pad Tool cubic bezier path - + Kubisachtige bezier gereedschap @@ -937,7 +956,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Axis point @@ -1036,7 +1055,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Arc @@ -1111,7 +1130,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Curve @@ -1186,7 +1205,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Curve @@ -1257,7 +1276,7 @@ Bias X - X-coordinaat + Richting X cm @@ -1281,7 +1300,7 @@ Width - Wijdte + Breedte Closed @@ -1345,7 +1364,7 @@ Bias Y: - Richting X: + Richting Y: Name of detail: @@ -1361,67 +1380,67 @@ General - + Algemeen Pattern piece data - + Patroondeel data Material/Cut number/Placement - + Materiaal/Snijnummer/Positie Material type: - + Materiaalsoort: Cut number: - + Snijnummer: Placement: - + Positie: Add - + Voeg toe Cancel - Stop + Stop Remove - + Verwijder Letter: - + Letter: Detail label visible - + Zichtbare detail label Pattern label visible - + Zichtbare patroon label Fabric - + Stof Lining - + Voering Interfacing - + Vlieseline Interlining - + Tussenvoering None @@ -1429,18 +1448,26 @@ Cut on fold - + Knip op vouw Cut %1 of %2%3 - + Knip %1 van %2%3 + + + on Fold + Op vouw Update - + Update on Fold + Op vouw + + + You can choose one of the predefined materials or enter a new one @@ -1464,7 +1491,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Input data @@ -1492,11 +1519,11 @@ Length of curves - Lengte van kromming + Krommingslengte Angle of lines - Hoek van de lijn + Hoek van de lijnen Hide empty measurements @@ -1574,6 +1601,10 @@ Full name Volledige naam + + Functions + + DialogEndLine @@ -1587,7 +1618,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Angle @@ -1698,7 +1729,7 @@ Separator - Scheider + Scheidingsteken Tab @@ -1737,7 +1768,7 @@ New group - Nieuwe naam + Nieuwe groep @@ -1764,7 +1795,7 @@ Show line from first point to our point - Toon lijn vanaf het eerste punt naar ons punt + Toon lijn vanaf het eerste punt naar dit punt Select first point of line @@ -1831,7 +1862,7 @@ Can't create record. - Kan geen melding maken. + Kan geen aantekening creeren %1 - Base point @@ -1955,7 +1986,7 @@ Spline path - Boogtrekker pad + Vrijvormkrommings pad Cubic bezier curve path @@ -2018,7 +2049,7 @@ Lines angles - Lijn hoek + Lijnen hoek Angle @@ -2078,7 +2109,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Description: @@ -2106,15 +2137,15 @@ Increment_%1 - Verhogen_%1 + Verkleinen/vergroten_%1 Edit increment - Verander verhoging + Verander verkleining/vergroting Unique increment name - Unieke vermeerdering naam + Unieke verkleining/vergroting naam Calculation @@ -2157,7 +2188,7 @@ Arranged workpieces: %1 from %2 - Gerangschikt werkstukken: %1 van %2 + Gerangschikte werkstukken: %1 van %2 @@ -2212,7 +2243,7 @@ Descending area - Afnemend gebied + Kleiner wordend gebied Millimiters @@ -2244,7 +2275,7 @@ Gap width: - Opening breedte: + Tussenruimte: Save length of the sheet @@ -2287,7 +2318,7 @@ Drie groepen: groot, medium, klein = 0 Twee groepen: groot, klein = 1 - Aflopende ruimte = 2 + Kleiner wordende ruimte = 2 @@ -2330,7 +2361,7 @@ Fields go beyond printing. Apply settings anyway? - Velden zijn groter dan velden. + Velden zijn groter dan het afdrukkbereik. Toch de instellingen aanpassen? @@ -2342,7 +2373,7 @@ Toch de instellingen aanpassen? Drie groepen: groot, middel, klein = 0; Twee groepen: groot, klein = 1; - Vermindering gebied = 2 + Kleiner wordende ruimte = 2 Layout options @@ -2350,15 +2381,15 @@ Toch de instellingen aanpassen? Shift/Offset length: - Shift/Offset lengte: + Verschuivings/Offset lengte: Rule for choosing the next workpiece - Order voor het kiezen van het volgende werkstuk + Regel voor het kiezen van het volgende werkstuk Enabling for sheets that have big height will speed up creating. - Het mogelijk maken om voor papier van grote afmetingen het creeren te versnellen. + Het mogelijk maken om van grote afmetingen van papier het creatieproces te versnellen. Divide into strips @@ -2378,8 +2409,17 @@ Toch de instellingen aanpassen? Enabling for sheets that have big height will speed up creating. + Het mogelijk maken om van grote afmetingen van papier het creatieproces te versnellen. + + + Printer: + + None + Printer + Geen + DialogLine @@ -2499,7 +2539,7 @@ Toch de instellingen aanpassen? <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Axis point @@ -2629,7 +2669,7 @@ Toch de instellingen aanpassen? Indentation Measurement section - Snede + Inham Circumference and Arc @@ -2703,19 +2743,19 @@ Toch de instellingen aanpassen? Collapse All - Alles stort in elkaar + In elkaar klappen van alles Expand All - Breid alle uit + Uitbreiden van alles Check all - Markeer alles + Alles aanvinken Uncheck all - Demarkeer alles + Alles uitvinken @@ -2816,7 +2856,7 @@ Toch de instellingen aanpassen? <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toont volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toont volledige berekening in berichten box </p></body></html> Point label @@ -2904,7 +2944,7 @@ Toch de instellingen aanpassen? Additional angle degrees: - Aanvullende graden van de hoek: + Aanvullende graden hoek: Type of line: @@ -3043,38 +3083,42 @@ Toch de instellingen aanpassen? General info - + Algemene informatie Pattern name: - + Patroon naam: Pattern number: - + Patroon nummer: Company/Designer name: - + Bedrijfs/ontwerpers naam: Customer name: - + Klant naam: Created: - + Gecreëerd: Pattern size: - + Patroon maat: Show measurements - Toon maten + Toon maten: Show date of creation + Toon datum van creatie + + + Use %1 and %2 to insert pattern size and height @@ -3218,7 +3262,7 @@ Toch de instellingen aanpassen? Type: - + Soort: @@ -3273,14 +3317,14 @@ Toch de instellingen aanpassen? Take: - Neem keuze: + Kies: DialogPointFromCircleAndTangent Point from circle and tangent - Kruispunt van cirkel en raaklijn + Punt van cirkel en raaklijn Radius @@ -3288,7 +3332,7 @@ Toch de instellingen aanpassen? <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toon volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toon volledige berekening in berichten box </p></body></html> Point label @@ -3308,7 +3352,7 @@ Toch de instellingen aanpassen? Take - Neem keuze + Kies Select a circle center @@ -3364,7 +3408,7 @@ Toch de instellingen aanpassen? Take: - Neem: + Kies: @@ -3379,7 +3423,7 @@ Toch de instellingen aanpassen? <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toon volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toon volledige berekening in berichten box </p></body></html> Point label @@ -3529,7 +3573,7 @@ Toch de instellingen aanpassen? Take - Neem + Kies Select second an arc @@ -3557,11 +3601,11 @@ Toch de instellingen aanpassen? Take: - Neem: + Kies: Tool point of intersetion arcs - + Kruispunt van bogen gereedschap @@ -3576,7 +3620,7 @@ Toch de instellingen aanpassen? <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toon volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toon volledige berekening in berichten box </p></body></html> Radius of the second circle @@ -3600,7 +3644,7 @@ Toch de instellingen aanpassen? Take - Neem + Kies Select second circle center @@ -3664,11 +3708,11 @@ Toch de instellingen aanpassen? Take: - Neem: + Kies: Tool point of intersection circles - + Gereedschap kruispunt van cirkels @@ -3781,7 +3825,7 @@ Toch de instellingen aanpassen? Path to destination folder. - Pad naar doelmap. + Pad naar doelmap. Select path to destination folder @@ -3797,6 +3841,10 @@ Toch de instellingen aanpassen? File base name. + Basis bestandsnaam. + + + Path to destination folder @@ -3828,7 +3876,7 @@ Toch de instellingen aanpassen? Images (*.png) - Beelden (*png) + Afbeeldingen (*png) Wavefront OBJ (*.obj) @@ -3848,11 +3896,11 @@ Toch de instellingen aanpassen? Tried to use out of range format number. - Geprobeerd buiten bereik indelings nummer te gebruiken. + Geprobeerd het buiten bereik indelings nummer te gebruiken. Selected not present format. - Geen huidige indeling geslecteerd. + Geen huidige indeling geselecteerd. The base filename has not match regular expression. @@ -3864,7 +3912,7 @@ Toch de instellingen aanpassen? The base filename does not match a regular expression. - De basis bestandsnaam komt niet overeen met een reguliere expressie. + De basis bestandsnaam komt niet overeen met de normale computertaal. @@ -3879,7 +3927,7 @@ Toch de instellingen aanpassen? <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toon volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toon volledige berekening in berichten box </p></body></html> Point label @@ -3903,7 +3951,7 @@ Toch de instellingen aanpassen? Show line from first point to our point - Toon lijn vanaf het eerste punt naar het andere punt + Toon lijn vanaf het eerste punt naar dit punt Select first point of line @@ -4085,7 +4133,7 @@ Toch de instellingen aanpassen? Invalid spline - Ongeldige boogtrekker + Ongeldige vrijevormkromming Length: @@ -4208,7 +4256,7 @@ Toch de instellingen aanpassen? Invalid spline path - Ongeldige boogtrekker pad + Ongeldige vrijevormkrommings pad Length: @@ -4397,7 +4445,7 @@ Toch de instellingen aanpassen? DialogTrueDarts True darts - Coupenaden goed plaatsen + Coupenaden First base point @@ -4417,7 +4465,7 @@ Toch de instellingen aanpassen? First dart point - Eerste coupenaad punt + Eerste figuurnaad punt Third point of angle @@ -4425,7 +4473,7 @@ Toch de instellingen aanpassen? Second dart point - Tweede coupenaad punt + Tweede figuurnaad punt: Show line from second point to this point @@ -4433,15 +4481,15 @@ Toch de instellingen aanpassen? Third dart point - Derde coupenaad punt + Derde figuurnaad punt First new dart point - Eerste nieuwe coupenaad punt + Eerste nieuwe figuurnaad punt Second new dart point - Tweede nieuwe coupenaad punt + Tweede nieuwe figuurnaad punt Select the second base point @@ -4449,15 +4497,15 @@ Toch de instellingen aanpassen? Select the first dart point - Selecteer de eerste coupenaad punt + Selecteer de eerste figuurnaad punt Select the second dart point - Selecteer de tweede coupenaad punt + Selecteer de tweede figuurnaad punt Select the third dart point - Selecteer de derde coupenaad punt + Selecteer de derde figuurnaad punt First base point: @@ -4504,7 +4552,7 @@ Toch de instellingen aanpassen? Error while calculation formula. You can try undo last operation or fix broken formula. - Fout ontstaan bij berekenen van formule. Probeer de laatste operatie ongedaan te maken of incorrecte formule te corrigeren + Fout tijdens het berekenen van de formule. Je kunt proberen om de laatste actie ongedaan te maken of de formule te herstellen. &Undo @@ -4527,7 +4575,7 @@ Toch de instellingen aanpassen? DialogUnionDetails <html><head/><body><p>Do you really want union details?</p></body></html> - <html><head/><body><p>Wil je echt gezamenlijke details?</p></body></html> + <html><head/><body><p>Wil je echt details verenigen?</p></body></html> Union tool @@ -4559,7 +4607,7 @@ Toch de instellingen aanpassen? <html><head/><body><p>Do you really want to unite details?</p></body></html> - <html><head/><body><p>Wil je echt de details verenigen?</p></body></html> + <html><head/><body><p>Wil je echt details verenigen?</p></body></html> Retain original pieces @@ -4605,11 +4653,11 @@ Toch de instellingen aanpassen? Feed parsing failed: %1 %2. - + Doorstroming van uitpakken is mislukt: %1%2. No updates were found. - Geen updates zijn gevonden. + Er zijn geen updates gevonden. Feed error: invalid "enclosure" with the download link @@ -4687,7 +4735,7 @@ Toch de instellingen aanpassen? The pattern unit - Het patroon eenheid + De patrooneenheid Use for unit testing. Run the program and open a file without showing a window. @@ -4699,7 +4747,7 @@ Toch de instellingen aanpassen? Can't begin to listen for incoming connections on name '%1' - Kan niet beginnen met luisteren naar inkomende connecties op naam '%1' + Kan niet beginnen met verwerken van inkomende connecties op naam '%1' Test mode doesn't support openning several files. @@ -5347,11 +5395,11 @@ Do you want to save your changes? Print - Print + Afdrukken Print tiled PDF - + Druk papierfomaatindeling PDF af Split and print a layout into smaller pages (for regular printers) @@ -5359,11 +5407,11 @@ Do you want to save your changes? Print preview - Print voorbeeldweergave + Druk voorbeeldweergave af Print preview original layout - Print voorbeeldweergave van originele opmaak + Druk voorbeeldweergave van originele opmaak af Export As... @@ -5520,7 +5568,7 @@ Do you want to save your changes? Not supported size value '%1' for this pattern file. - Niet ondersteunt maat waarde '%1' voor dit patroon bestand. + Niet ondersteunde maat waarde '%1' voor dit patroon bestand. Couldn't set size. Need a file with standard measurements. @@ -5536,7 +5584,7 @@ Do you want to save your changes? Not supported height value '%1' for this pattern file. - Niet ondersteunt hoogte waarde '%1'voor dit patroon bestand. + Niet ondersteunde hoogte waarde '%1' voor dit patroon bestand. Couldn't set height. Need a file with standard measurements. @@ -5556,15 +5604,15 @@ Do you want to save your changes? Print an original layout - Print een originele opmaak + Druk een originele opmaak af Preview tiled PDF - + Bekijk vooraf papierformaatindeling PDF Print preview tiled layout - Print voorbeeldweergave papierformaatindeling opmaak + Druk voorbeeldweergave papierformaatindeling opmaak af <html><head/><body><p>Mode for working with pattern pieces. These pattern pieces are base for going to the next stage &quot;Details mode&quot;. Before you will be able to enable the &quot;Details mode&quot; need create at least one detail.</p></body></html> @@ -5572,11 +5620,11 @@ Do you want to save your changes? <html><head/><body><p>Mode for working with details. Before you will be able to enable the &quot;Details mode&quot; need create at least one detail on the stage &quot;Draw mode&quot;. Details created on this stage will be used for creating a layout. </p></body></html> - <html><head/><body><p>Modus voor het werken met details. Voordat het mogelijk is om &quote; Details modus&quote;. uit te voeren, heb je in ieder geval een detail nodig op het werkgebied om te maken &quote;Draw modus&quote; Details die op dit werkgebied gemaakt zijn worden gebruikt voor het creëren van een layout. </p></body></html> + <html><head/><body><p>Modus voor het werken met details. Voordat het mogelijk is om &quote; Details modus&quote;. uit te voeren, moet je in ieder geval een detail creeren op het werkgebied &quote;Draw modus&quote; Details die op dit werkgebied gemaakt zijn worden gebruikt voor het creëren van een layout. </p></body></html> <html><head/><body><p>Mode for creating a layout of details. This mode avaliable if was created at least one detail on the stage &quot;Details mode&quot;. The layout can be exported to your prefered file format and saved to your harddirve.</p></body></html> - <html><head/> <body><p>Modus voor het maken van een lay-out van details. Deze modus beschikbaar als ten minste één detail in het werkgebied werd gemaakt. &quot;Details mode&quot;.De lay-out kan worden geëxporteerd naar de bestandsindeling van uw voorkeur en opgeslagen in uw harddrive.</p></body></html> + <html><head/> <body><p>Modus voor het maken van een lay-out van details. Deze modus is beschikbaar als ten minste één detail in het werkgebied is gemaakt. &quot;Details mode&quot;.De lay-out kan worden geëxporteerd naar de bestandsindeling van uw voorkeur en opgeslagen in uw harddrive.</p></body></html> Unload measurements @@ -5596,7 +5644,7 @@ Do you want to save your changes? True darts - Coupenaden goed plaatsen + Coupenaden New pattern @@ -5648,47 +5696,55 @@ Do you want to save your changes? Point intersection curves - + Kruispunt krommingen Select first curve - + Selecteer eerste kromming (read only) - + (alleen lezen) Measurements was changed. Do you want to sync measurements now? - + Maten zijn veranderd. Wil je nu maten synchroniseren? Curve tool which uses point as control handle - + Kromming gereedschap welke een punt gebruikt als control knop Select first curve point - + Selecteer eerste krommingspunt Select point of cubic bezier path - + Selecteer punt van kubusachtige bezier pad + + + Toolbar pointer + Werkbalk aanwijzer Operations - + Operaties Create new group - + Maak een nieuwe groep + + + Groups + Groepen Select one or more objects, <b>Enter</b> - finish creation - + Selecteer een of meer objecten, <b>Enter</b> - voltooi creatie Rotate objects - + Draai objecten Close pattern @@ -5696,15 +5752,15 @@ Do you want to save your changes? Select one or more objects, <b>Enter</b> - confirm selection - + Selecteer een of meer objecten, <b>Enter</b> - bevestig selectie Tool pointer - + Gereedschap aanwijzer Midpoint between two points - + Middelpunt tussen 2 punten Group @@ -5712,43 +5768,43 @@ Do you want to save your changes? Contains all visibility groups - + Bevat alle zichtbare groepen Show which details will go in layout - + Toont welk detail in de opmaak gaat You can't use now the Layout mode. Please, include at least one detail in layout. - + U kunt de Opmaak modus nu niet gebruiken. Alstublieft, sluit in ieder geval een detail in in opmaak. Original zoom - + Originele zoom Select first circle center - + Selecteer eerste cirkel midden Select point on tangent - + Selecteer een punt op raaklijn Pattern Piece: - + Patroon deel: Height: - Hoogte: + Hoogte: Size: - Maat: + Maat: The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location? - + Het maten bestand<br/><br/> <b>%1</b> <br/><br/> kon niet gevonden worden. Wil je de bestanden locatie bijwerken? @@ -5763,7 +5819,7 @@ Do you want to save your changes? For printing multypages document all sheet should have the same size. - Voor het printen van multipagina's document, moeten alle bladen dezelfde maat hebben. + Voor het afdrukken van multipagina's document, moeten alle bladen dezelfde maat hebben. Creating file '%1' failed! %2 @@ -5775,7 +5831,7 @@ Do you want to save your changes? Print to pdf - Print naar PDF + Druk af naar PDF PDF file (*.pdf) @@ -5783,7 +5839,7 @@ Do you want to save your changes? Print error - Print error + Afdruk error Cannot proceed because there are no available printers in your system. @@ -5815,7 +5871,7 @@ Do you want to save your changes? Export error. - Export fout. + Export fout. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5827,22 +5883,26 @@ Do you want to save your changes? For printing multipages document all sheet should have the same size. - Voor het printen van multipagina's document, moeten alle bladen dezelfde maat hebben. + Voor het afdrukken van multipagina's document, moeten alle bladen dezelfde maat hebben. Pages will be cropped because they do not fit printer paper size. Pagina's zullen bijgesneden worden omdat deze niet het papierformaat van de printer hebben. + + Can't create path + + MoveDoubleLabel move the first dart label - Verplaats de eerste coupenaad label + Verplaats de eerste figuurnaad label move the second dart label - Verplaats de tweede coupenaad label + Verplaats de tweede figuurnaad label @@ -5863,14 +5923,14 @@ Do you want to save your changes? MoveSpline move spline - Verplaats sleuf + Verplaats vrijevormkromming MoveSplinePath move spline path - Verplaats sleuf pad + Verplaats vrijevormkrommingspad @@ -5954,6 +6014,18 @@ Do you want to save your changes? Count steps (0 - no limit): Tel stappen (0 - geen limiet): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -6086,7 +6158,7 @@ Do you want to save your changes? too few arguments for function min. parser error message - Te weinig argumenten voor functie min. + Te weinig argumenten voor de min functie. @@ -6094,7 +6166,7 @@ Do you want to save your changes? Unexpected token "$TOK$" found at position $POS$. Math parser error messages. Left untouched "$TOK$" and $POS$ - Onverwacht teken "$TOK$"gevonden op positie $POS$. + Onverwacht teken "$TOK$" gevonden op positie $POS$. Internal error @@ -6283,7 +6355,7 @@ Do you want to save your changes? RotationMoveLabel move point label - Verplaats punt label + verplaats punt label @@ -6344,7 +6416,7 @@ Do you want to save your changes? <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>toon volledige berekening in berichten box </p></body></html> + <html><head/><body><p>Toon volledige berekening in berichten box </p></body></html> Base value: @@ -6500,7 +6572,7 @@ Do you want to save your changes? Add custom - Voeg aangepast/gebruikelijk toe + Voeg op maat toe Read only @@ -6600,7 +6672,7 @@ Do you want to save your changes? untitled - Zonder titel + zonder titel <Empty> @@ -6638,7 +6710,7 @@ Wil je deze veranderingen opslaan? Pattern unit: - Het patroon eenheid: + De patroon eenheid: Find: @@ -6646,7 +6718,7 @@ Wil je deze veranderingen opslaan? Find Previous - Vind eerder + Vind eerdere Ctrl+Shift+G @@ -6734,7 +6806,7 @@ Wil je deze veranderingen opslaan? Move measurement bottom - Verplaats maten naar onderaan + Verplaats maten naar onderen Delete measurement @@ -6861,7 +6933,11 @@ Wil je deze veranderingen opslaan? Export to CSV - + Exporteer naar CSV + + + Comma-Separated Values (*.cvs) + Komma-scheidingsteken waardes (*.cvs) Invalid value @@ -6873,27 +6949,27 @@ Wil je deze veranderingen opslaan? Comma-Separated Values - + Komma-scheidingsteken waardes Customer's name - + Klant naam Customer's family name - + Klant's family naam Customer's email address - + Klant's emailadres Height: - Hoogte: + Hoogte: Size: - Maat: + Maat: @@ -7021,7 +7097,7 @@ Wil je deze veranderingen opslaan? ToggleDetailInLayout detail in layout list - + detail in opmaak lijst @@ -7083,14 +7159,14 @@ Wil je deze veranderingen opslaan? Unexpected version "%1". - + Onverwachte versie "%1". VAbstractCubicBezierPath Can't cut this spline - + Kan deze vrijevormkromming niet knippen @@ -7101,7 +7177,7 @@ Wil je deze veranderingen opslaan? Error creating or updating group - + Fout bij het maken of bijwerken van groep New group @@ -7238,7 +7314,7 @@ Wil je deze veranderingen opslaan? Layout units (as paper's one except px, export mode). - Layout eenheden (als van een papier behalve px, ecport modus). + Opmaak eenheden (als van een papier behalve px, ecport modus). The unit @@ -7246,7 +7322,7 @@ Wil je deze veranderingen opslaan? Shift layout length measured in layout units (export mode). - Shift layout lengte gemeten in layout eenheden (export modus). + Verschuiving opmaak lengte gemeten in opmaak eenheden (export modus). Shift length @@ -7254,7 +7330,7 @@ Wil je deze veranderingen opslaan? Gap width x2, measured in layout units. (export mode). - Tussenruimte x2, gemeten in layout eenheden (export modus). + Tussenruimte x2, gemeten in opmaak eenheden (export modus). The gap width @@ -7262,7 +7338,7 @@ Wil je deze veranderingen opslaan? Sets layout groupping (export mode): - Stelt het groeperen in (export modus): + Stelt het groeperen in opmaak in (export modus): Grouping type @@ -7270,7 +7346,7 @@ Wil je deze veranderingen opslaan? Cannot use pageformat and page explicit size/units together. - kan papierformaat en expliciete paginagrootte/eenheden niet tegelijkertijd gebruiken. + Kan papierformaat en expliciete paginagrootte/eenheden niet tegelijkertijd gebruiken. Page height, width, units must be used all 3 at once. @@ -7290,7 +7366,7 @@ Wil je deze veranderingen opslaan? Unsupported layout units. - Niet ondersteunde layout eenheden. + Niet ondersteunde opmaak eenheden. Export options can be used with single input file only. @@ -7306,7 +7382,7 @@ Wil je deze veranderingen opslaan? The base filename of exported layout files. Use it to enable console export mode. - De basis bestandsnaam van geëxporteerde layout bestanden. Gebruik het om het export modus console in te schakelen. + De basis bestandsnaam van geëxporteerde lopmaak bestanden. Gebruik het om het export modus console in te schakelen. The base filename of layout files @@ -7366,7 +7442,7 @@ Wil je deze veranderingen opslaan? Ignore margins printing (export mode). Set all margins to 0. - Negeer printmarges (export modus). Stel alle marges op 0. + Negeer afdrukmarges (export modus). Stel alle marges op 0. Page left margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. @@ -7386,11 +7462,11 @@ Wil je deze veranderingen opslaan? Shift length must be used together with shift units. - Shift Lengte moet gebruikt worden met shift eenheden + Verschuiving Lengte moet gebruikt worden met verschuiving eenheden Gap width must be used together with shift units. - Breedte tussenruimte moet worden gebruikt in combinatie met shift eenheden. + Tussenruimte moet worden gebruikt in combinatie met verschuiving eenheden. Left margin must be used together with page units. @@ -7418,7 +7494,7 @@ Wil je deze veranderingen opslaan? Ignore margins printing (export mode). Disable value keys: "%1", "%2", "%3", "%4". Set all margins to 0. - Negeer printmarges (export modus). Maak de waarde sleutels onbruikbaar: "%1", "%2", "%3", "%4". Stel alle marges in op 0. + Negeer afdrukmarges (export modus). Maak de waarde sleutels onbruikbaar: "%1", "%2", "%3", "%4". Stel alle marges in op 0. Page left margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key "%1" is used. @@ -7446,19 +7522,19 @@ Wil je deze veranderingen opslaan? Save length of the sheet if set (export mode). The option tells the program to use as much as possible width of sheet. Quality of a layout can be worse when this option was used. - Sla lengte van het blad op wanneer ingesteld (export modus). De optie vertelt het programma een zo groot mogelijk breedte van blad te gebruiken. Kwaliteit van een lay-out kan erger worden wanneer deze optie is gebruikt. + Sla lengte van het blad op wanneer ingesteld (export modus). De optie vertelt het programma een zo groot mogelijk breedte van blad te gebruiken. Kwaliteit van een opmaak kan erger worden wanneer deze optie is gebruikt. Shift layout length measured in layout units (export mode). The option show how many points along edge will be used in creating a layout. - Shift layout lengte gemeten in layout eenheden (export modus). De optie laat zien hoeveel punten langs de rand zal worden gebruikt bij het maken van een lay-out. + Verschuiven van opmaak lengte gemeten in opmaak eenheden (export modus). De optie laat zien hoeveel punten langs de rand zal worden gebruikt bij het maken van een opmaak The layout gap width x2, measured in layout units (export mode). Set distance between details and a detail and a sheet. - De layout tussenruimte x2, gemeten in layout eenheden (export modus). Stel afstand in tussen details en een detail en een blad. + De opmaak tussenruimte x2, gemeten in opmaak eenheden (export modus). Stel afstand in tussen details en een detail en een blad. Sets layout groupping cases (export mode): %1. - Stelt layout in het groeperen van gevallen(export modus): %1. + Stelt opmaak in het groeperen van zaken(export modus): %1. Run the program in a test mode. The program in this mode loads a single pattern file and silently quit without showing the main window. The key have priority before key '%1'. @@ -7466,23 +7542,23 @@ Wil je deze veranderingen opslaan? Shift/Offset layout length measured in layout units (export mode). The option show how many points along edge will be used in creating a layout. - Shift layout lengte gemeten in layout eenheden (export modus). De optie laat zien hoeveel punten langs de rand zal worden gebruikt bij het maken van een lay-out. + Verschuiving/Offset opmaaklengte gemeten in opmaak eenheden (export modus). De optie laat zien hoeveel punten langs de rand zal worden gebruikt bij het maken van een opmaak. Shift/Offset length - Shift/Offset lengte + Verschuivings/Offset lengte Shift/Offset length must be used together with shift units. - Shift/Offset lengte moet gebruikt worden in combinatie met shift eenheden. + Verschuiving/Offset lengte moet gebruikt worden in combinatie met verschuiving eenheden. Number corresponding to output format (default = 0, export mode): - + Nummer behorend bij de uitkomst indeling( standaardinstelling = 0, export modus): Number corresponding to page template (default = 0, export mode): - + Nummer behorende bij de pagina sjabloon( standaardinstelling = 0, export modus): @@ -7501,22 +7577,22 @@ Wil je deze veranderingen opslaan? Number of free id exhausted. - + Hoeveelheid aan gratis id is verbruikt Can't create a curve with type '%1' - + Kan geen kromming maken met soort '%1'. VCubicBezierPath Not enough points to create the spline. - Niet genoeg punten om een vrijevormkromming te maken. + Niet genoeg punten om een vrijevormkromming te maken. This spline does not exist. - Deze vrijevormkromming bestaat niet. + Deze vrijevormkromming bestaat niet. @@ -7780,7 +7856,7 @@ Wil je deze veranderingen opslaan? Error creating or updating union details - Fout bij het maken of bijwerken van gezamelijke details + Fout bij het maken of bijwerken van verenigde details Error creating or updating point of intersection arcs @@ -7812,7 +7888,7 @@ Wil je deze veranderingen opslaan? Unknown spline type '%1'. - Onbekende sleuf type '%1'. + Onbekend vrijvormkromming type '%1'. Unknown arc type '%1'. @@ -7828,31 +7904,31 @@ Wil je deze veranderingen opslaan? Error creating or updating point of intersection curves - + Fout bij het maken of bijwerken van kruispunt van krommingen Error creating or updating simple interactive spline - + Fout bij het maken of bijwerken van simpele interactieve vrijvormkromming Error creating or updating interactive spline path - + Fout bij het maken of bijwerken van interactieve vrijevormkrommings pad Error creating or updating cubic bezier curve - + Fout bij het maken of bijwerken van kubusachtige bezier kromming Error creating or updating cubic bezier path curve - + Fout bij het maken of bijwerken van kubusachtige bezier pad kromming Error creating or updating operation of rotation - + Fout bij het maken van of bijwerken van actie van draaiing Unknown operation type '%1'. - + Onbekende actie type '%1'. @@ -7878,17 +7954,25 @@ Wil je deze veranderingen opslaan? Can't cut spline path with one point - Kan vrijevormkromming pad niet knippen met en punt + Kan vrijevormkromming pad niet knippen met een punt VTextManager Cut %1 on %2%3 - + Knip %1 op %2%3 + + + on Fold + Op vouw on Fold + Op vouw + + + Cut @@ -7904,27 +7988,27 @@ Wil je deze veranderingen opslaan? move pattern piece label - + verplaats patroon deel label resize pattern piece label - + vergroot/verkein patroon deel label rotate pattern piece label - + draai patroon deel label move pattern info label - + verplaats patroon informatie label resize pattern info label - + vergroot/verklein patroon informatie label rotate pattern info label - + draai patroon informatie label @@ -8087,7 +8171,7 @@ Wil je deze veranderingen opslaan? Take - Neem + Kies Tool to make point from intersection two circles @@ -8131,15 +8215,15 @@ Wil je deze veranderingen opslaan? Tool to make point from intersection two curves - + Gereedschap om een punt te maken van een kruising van twee cirkels Vertical correction - + Verticale correctie Horizontal correction - + Horizontale correctie Name @@ -8147,19 +8231,19 @@ Wil je deze veranderingen opslaan? C1: angle - + C1: hoek C1: length - + C1: lengte C2: angle - + C2: hoek C2: length - + C2: lengte Cubic bezier curve @@ -8167,26 +8251,26 @@ Wil je deze veranderingen opslaan? Tool cubic bezier curve - + Gereedschap kubusachtige bezier kromming Tool rotation - + Draai gereedschap Suffix - + Achtervoegsel VToolUnionDetails union details - + samenvoegend details United detail - + Verenigd detail @@ -9024,12 +9108,12 @@ Wil je deze veranderingen opslaan? Spl_ Left symbol _ in name - Spl_ + Vrijevormkromming_ SplPath Do not add symbol _ to the end of name - SplPath + Vrijevormkrommingspad RadiusArc_ @@ -9119,7 +9203,7 @@ Wil je deze veranderingen opslaan? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9214,17 +9298,17 @@ Wil je deze veranderingen opslaan? Line_ Left symbol _ in the name - Lijn_ + Lijn_ AngleLine_ Left symbol _ in the name - HoekLijn_ + HoekLijn_ Arc_ Left symbol _ in the name - Boog_ + Boog_ Spl_ @@ -9274,11 +9358,26 @@ Wil je deze veranderingen opslaan? Seg_ Segment. Left symbol _ in the name - + Seg_ CurrentLength Do not add space between words + HuidigeLengte + + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder @@ -9308,37 +9407,41 @@ Wil je deze veranderingen opslaan? VWidgetDetails Form - + Vorm Unnamed - + Onbenoemd VWidgetGroups + + Form + Vorm + Rename - + Hernoemd Delete - Verwijderen + Verwijder VisToolCubicBezierPath <b>Curved path</b>: select seven or more points - + <b>Krommingspad</b>: selecteer zeven of meer punten <b>Curved path</b>: select seven or more points, <b>Enter</b> - finish creation - + <b>Krommingspad</b>: selecteer zeven of meer punten, <b>Enter</b> - voltooi creatie <b>Curved path</b>: select more points for complete segment - + <b>Krommingspad</b>: selecteer meer punten om segment kompleet te maken @@ -9356,7 +9459,7 @@ Wil je deze veranderingen opslaan? <b>Point at distance and angle</b>: angle = %1°, length = %2%3; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation - + <b>Punt op afstand en hoek</b>: hoek = %1 , lengte = %2%3, <b>Shift</b> - klevende hoek, <b>Enter</b> - voltooi creatie @@ -9370,7 +9473,7 @@ Wil je deze veranderingen opslaan? VisToolSpline Use <b>Shift</b> for sticking angle! - + Gebruik <b>Shift</b> voor klevende hoek! @@ -9385,7 +9488,7 @@ Wil je deze veranderingen opslaan? Use <b>Shift</b> for sticking angle! - + Gebruik <b>Shift</b> voor klevende hoek! @@ -9428,19 +9531,19 @@ Wil je deze veranderingen opslaan? Warning - + Waarschuwing Critical error - + Cruciale fout Fatal error - + Fatale fout Information - Informatie + Informatie diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index 5bb6d4a88..73c8b0249 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -184,6 +184,10 @@ GUI language Idioma da GUI + + Decimal separator parts + Partes do separador decimal + With OS options (%1) @@ -305,6 +309,25 @@ Excluir molde %1 + + Detail + + Fabric + + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -820,7 +843,7 @@ Third point: - + Terceiro ponto Type of line: @@ -851,7 +874,7 @@ Third point: - + Terceiro ponto Fourth point: @@ -1383,22 +1406,6 @@ Pattern label visible - - Fabric - - - - Lining - - - - Interfacing - - - - Interlining - - None nenhum @@ -1419,6 +1426,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1546,6 +1557,10 @@ Full name + + Functions + + DialogEndLine @@ -1994,7 +2009,7 @@ Calculated value: - + Valor calculado Formula: @@ -2018,7 +2033,7 @@ Empty field - + Campo vazio Value @@ -2263,6 +2278,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + nenhum + DialogLine @@ -2284,11 +2308,11 @@ Apply settings anyway? Select second point - + Selecioneo segundo ponto Line between points - + Linha entre pontos Line color @@ -2319,7 +2343,7 @@ Apply settings anyway? First line - + Primeira linha First point @@ -2786,11 +2810,11 @@ Apply settings anyway? Description - + Descrição Author name - + Nome do autor Pattern description @@ -2810,7 +2834,7 @@ Apply settings anyway? All sizes (cm) - + Todos os tamanhos (cm) Default height and size @@ -2936,6 +2960,10 @@ Apply settings anyway? Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3538,10 +3566,6 @@ Apply settings anyway? Destination folder - - Path to destination folder. - - Select path to destination folder @@ -3551,7 +3575,7 @@ Apply settings anyway? - File base name. + Path to destination folder @@ -3710,7 +3734,7 @@ Apply settings anyway? Third point: - + Terceiro ponto Type of line: @@ -3954,7 +3978,7 @@ Apply settings anyway? Empty field - + Campo vazio Value can't be 0 @@ -4025,7 +4049,7 @@ Apply settings anyway? Select second point - + Selecioneo segundo ponto Triangle tool @@ -4405,7 +4429,7 @@ Apply settings anyway? Line between points - + Linha entre pontos Point at line intersection @@ -5375,10 +5399,6 @@ Do you want to save your changes? Can't open printer %1 - - Export error. - - For previewing multipage document all sheet should have the same size. @@ -5391,6 +5411,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5504,6 +5528,18 @@ Do you want to save your changes? Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -5922,7 +5958,7 @@ Do you want to save your changes? Calculated value: - + Valor calculado Full name: @@ -6159,7 +6195,7 @@ Do you want to save your changes? Empty field - + Campo vazio Value @@ -6458,6 +6494,10 @@ Do you want to save your changes? Book: Livro: + + Decimal separator parts + Partes do separador decimal + With OS options (%1) @@ -7295,11 +7335,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -7410,7 +7450,7 @@ Do you want to save your changes? Line between points - + Linha entre pontos Point at line intersection @@ -8481,7 +8521,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -8643,6 +8683,21 @@ Do you want to save your changes? Do not add space between words + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 25fd3a2df..1c18f70a7 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -317,6 +317,25 @@ șterge piesa tipar %1 + + Detail + + Fabric + + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1399,22 +1418,6 @@ Pattern label visible - - Fabric - - - - Lining - - - - Interfacing - - - - Interlining - - None @@ -1435,6 +1438,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1558,6 +1565,10 @@ Full name + + Functions + + DialogEndLine @@ -2327,6 +2338,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + + DialogLine @@ -3020,6 +3040,10 @@ Apply settings anyway? Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3642,10 +3666,6 @@ Apply settings anyway? Destination folder - - Path to destination folder. - - Select path to destination folder @@ -3655,7 +3675,7 @@ Apply settings anyway? - File base name. + Path to destination folder @@ -5579,10 +5599,6 @@ Do you want to save your changes? Can't open printer %1 - - Export error. - - For previewing multipage document all sheet should have the same size. @@ -5595,6 +5611,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5708,6 +5728,18 @@ Do you want to save your changes? Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7499,11 +7531,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -8670,7 +8702,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -8832,6 +8864,21 @@ Do you want to save your changes? Do not add space between words + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 11083e23b..46ece8976 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -317,6 +317,25 @@ удалить чертёж %1 + + Detail + + Fabric + + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1399,22 +1418,6 @@ Pattern label visible - - Fabric - - - - Lining - - - - Interfacing - - - - Interlining - - None Внутреняя @@ -1435,6 +1438,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1566,6 +1573,10 @@ Full name Полное имя + + Functions + + DialogEndLine @@ -2364,6 +2375,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + Внутреняя + DialogLine @@ -3057,6 +3077,10 @@ Apply settings anyway? Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3761,7 +3785,7 @@ Apply settings anyway? Path to destination folder. - Путь к каталогу назначения. + Путь к каталогу назначения. Select path to destination folder @@ -3776,7 +3800,7 @@ Apply settings anyway? Базовое имя файла. - File base name. + Path to destination folder @@ -5788,7 +5812,7 @@ Do you want to save your changes? Export error. - Ошибка экспорта. + Ошибка экспорта. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5806,6 +5830,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5927,6 +5955,18 @@ Do you want to save your changes? Count steps (0 - no limit): Количество шагов (0 - без ограничений): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7857,11 +7897,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -9099,7 +9139,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9261,6 +9301,21 @@ Do you want to save your changes? Do not add space between words + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 9a9c61f3d..2a8a6ea96 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -317,6 +317,25 @@ видалити лекало %1 + + Detail + + Fabric + Тканина + + + Lining + Підклада + + + Interfacing + + + + Interlining + флізелін + + DialogAboutApp @@ -1405,19 +1424,15 @@ Fabric - Тканина + Тканина Lining - Підклада - - - Interfacing - + Підклада Interlining - флізелін + флізелін None @@ -1443,6 +1458,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1574,6 +1593,10 @@ Full name Повне ім'я + + Functions + + DialogEndLine @@ -2376,6 +2399,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + + DialogLine @@ -3069,6 +3101,10 @@ Apply settings anyway? Show date of creation Показати дату створення + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3773,7 +3809,7 @@ Apply settings anyway? Path to destination folder. - Шлях до папки призначення. + Шлях до папки призначення. Select path to destination folder @@ -3788,7 +3824,7 @@ Apply settings anyway? Базова назва файлу. - File base name. + Path to destination folder @@ -5815,7 +5851,7 @@ Do you want to save your changes? Export error. - Помилка експорту. + Помилка експорту. For saving multipage document all sheet should have the same size. Use export function instead. @@ -5833,6 +5869,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. Сторінки будуть обрізані тому що вони не відповідають формату паперу принтера. + + Can't create path + + MoveDoubleLabel @@ -5954,6 +5994,18 @@ Do you want to save your changes? Count steps (0 - no limit): Кількість кроків (0 - без обмежень): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -7883,11 +7935,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -9118,7 +9170,7 @@ Do you want to save your changes? acosh hyperbolic arcus tangens function - acosh + acosh atanh @@ -9280,6 +9332,21 @@ Do you want to save your changes? Do not add space between words ПоточнаДовжина + + acosh + hyperbolic arcus cosine function + acosh + + + size + placeholder + + + + height + placeholder + + VVITConverter diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index 43e295903..22ba545e2 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -266,6 +266,25 @@ + + Detail + + Fabric + + + + Lining + + + + Interfacing + + + + Interlining + + + DialogAboutApp @@ -1136,22 +1155,6 @@ Pattern label visible - - Fabric - - - - Lining - - - - Interfacing - - - - Interlining - - None @@ -1172,6 +1175,10 @@ on Fold + + You can choose one of the predefined materials or enter a new one + + DialogEditWrongFormula @@ -1271,6 +1278,10 @@ Full name + + Functions + + DialogEndLine @@ -1952,6 +1963,15 @@ Apply settings anyway? Enabling for sheets that have big height will speed up creating. + + Printer: + + + + None + Printer + + DialogLine @@ -2581,6 +2601,10 @@ Apply settings anyway? Show date of creation + + Use %1 and %2 to insert pattern size and height + + DialogPatternXmlEdit @@ -3119,10 +3143,6 @@ Apply settings anyway? Destination folder - - Path to destination folder. - - Select path to destination folder @@ -3132,7 +3152,7 @@ Apply settings anyway? - File base name. + Path to destination folder @@ -4908,10 +4928,6 @@ Do you want to save your changes? Can't open printer %1 - - Export error. - - For previewing multipage document all sheet should have the same size. @@ -4924,6 +4940,10 @@ Do you want to save your changes? Pages will be cropped because they do not fit printer paper size. + + Can't create path + + MoveDoubleLabel @@ -5037,6 +5057,18 @@ Do you want to save your changes? Count steps (0 - no limit): + + All user defined materials have been deleted! + + + + User defined materials + + + + Delete all + + QApplication @@ -6820,11 +6852,11 @@ Do you want to save your changes? VTextManager - Cut %1 on %2%3 + on Fold - on Fold + Cut @@ -7988,11 +8020,6 @@ Do you want to save your changes? hyperbolic arcus sine function - - acosh - hyperbolic arcus tangens function - - atanh hyperbolic arcur tangens function @@ -8153,6 +8180,21 @@ Do you want to save your changes? Do not add space between words + + acosh + hyperbolic arcus cosine function + + + + size + placeholder + + + + height + placeholder + + VVITConverter From ea2c601850ed1aa03d22d1dba694cd13d00b0653 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 23 Aug 2016 15:14:56 +0300 Subject: [PATCH 17/34] Lupdate. --HG-- branch : develop --- share/translations/valentina.ts | 6 ++++- share/translations/valentina_cs_CZ.ts | 2 +- share/translations/valentina_de_DE.ts | 4 ++-- share/translations/valentina_en_CA.ts | 6 ++++- share/translations/valentina_en_IN.ts | 6 ++++- share/translations/valentina_en_US.ts | 6 ++++- share/translations/valentina_es_ES.ts | 4 ++-- share/translations/valentina_fi_FI.ts | 2 +- share/translations/valentina_fr_FR.ts | 4 ++-- share/translations/valentina_he_IL.ts | 2 +- share/translations/valentina_id_ID.ts | 2 +- share/translations/valentina_it_IT.ts | 4 ++-- share/translations/valentina_nl_NL.ts | 24 +++++++++++-------- share/translations/valentina_pt_BR.ts | 12 +++++----- share/translations/valentina_ro_RO.ts | 2 +- share/translations/valentina_ru_RU.ts | 4 ++-- share/translations/valentina_uk_UA.ts | 4 ++-- share/translations/valentina_zh_CN.ts | 4 ++-- .../valentina/dialogs/dialogpatternxmledit.ui | 2 +- 19 files changed, 60 insertions(+), 40 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index 4e9b9f8d4..ecd283875 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -3262,7 +3262,11 @@ Apply settings anyway? Type: - Type: + Type: + + + Type: + Type: diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index 00a0f0d44..8cf87b379 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -3153,7 +3153,7 @@ Apply settings anyway? - Type: + Type: diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index 2f1537c9b..824fdb336 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -3244,8 +3244,8 @@ Einstellungen trotzdem anwenden? Sofort übernehmen - Type: - + Type: + Typ: diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 172a2c3a5..c44cffd89 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -3262,7 +3262,11 @@ Apply settings anyway? Type: - Type: + Type: + + + Type: + Type: diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index 220f3e7e8..28bc6fd33 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -3262,7 +3262,11 @@ Apply settings anyway? Type: - Type: + Type: + + + Type: + Type: diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index d56d8aaec..cad586634 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -3262,7 +3262,11 @@ Apply settings anyway? Type: - Type: + Type: + + + Type: + Type: diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index 304507f83..df07eb61f 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -3245,8 +3245,8 @@ Apply settings anyway? Aplicar inmediatamente - Type: - + Type: + Tipo: diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index b5acd3283..c064a13e8 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -3153,7 +3153,7 @@ Apply settings anyway? - Type: + Type: diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 12f417b66..0f9ff0ece 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -3258,8 +3258,8 @@ Appliquer les réglages quand-même ? Appliquer immédiatement - Type: - + Type: + Type: diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 4bc4cc8b7..4f6693fb3 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -2781,7 +2781,7 @@ Apply settings anyway? - Type: + Type: diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index 400c23785..a5b792310 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -2973,7 +2973,7 @@ Apply settings anyway? - Type: + Type: diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index a7d9a9c2f..addaa4ab0 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -3221,8 +3221,8 @@ Applicare le impostazioni comunque? - Type: - + Type: + Tipo: diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 78f86ecd2..0439d74f3 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -286,7 +286,7 @@ The text appears under the icon (recommended for beginners). - De tekst verschijnt onder het icoon. ( Aanbevolen voor beginners) + De tekst verschijnt onder het icoon. (Aanbevolen voor beginners). @@ -1862,7 +1862,7 @@ Can't create record. - Kan geen aantekening creeren + Kan geen aantekening creeren. %1 - Base point @@ -3111,7 +3111,7 @@ Toch de instellingen aanpassen? Show measurements - Toon maten: + Toon maten Show date of creation @@ -3262,7 +3262,11 @@ Toch de instellingen aanpassen? Type: - Soort: + Soort: + + + Type: + Soort: @@ -4445,7 +4449,7 @@ Toch de instellingen aanpassen? DialogTrueDarts True darts - Coupenaden + Coupenaden First base point @@ -7159,7 +7163,7 @@ Wil je deze veranderingen opslaan? Unexpected version "%1". - Onverwachte versie "%1". + Onverwachte versie "%1". @@ -7577,11 +7581,11 @@ Wil je deze veranderingen opslaan? Number of free id exhausted. - Hoeveelheid aan gratis id is verbruikt + Hoeveelheid aan gratis id is verbruikt. Can't create a curve with type '%1' - Kan geen kromming maken met soort '%1'. + Kan geen kromming maken met soort '%1' @@ -7935,7 +7939,7 @@ Wil je deze veranderingen opslaan? VPatternConverter Unexpected version "%1". - Onverwachte versie "%1". + Onverwachte versie "%1". Error restoring backup file: %1. @@ -9396,7 +9400,7 @@ Wil je deze veranderingen opslaan? VVSTConverter Unexpected version "%1". - Onverwachte versie "%1". + Onverwachte versie "%1". Error restoring backup file: %1. diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index 73c8b0249..eaa69e9f0 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -843,7 +843,7 @@ Third point: - Terceiro ponto + Terceiro ponto: Type of line: @@ -874,7 +874,7 @@ Third point: - Terceiro ponto + Terceiro ponto: Fourth point: @@ -2009,7 +2009,7 @@ Calculated value: - Valor calculado + Valor calculado: Formula: @@ -3088,7 +3088,7 @@ Apply settings anyway? - Type: + Type: @@ -3734,7 +3734,7 @@ Apply settings anyway? Third point: - Terceiro ponto + Terceiro ponto: Type of line: @@ -5958,7 +5958,7 @@ Do you want to save your changes? Calculated value: - Valor calculado + Valor calculado: Full name: diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 1c18f70a7..4475c3a75 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -3180,7 +3180,7 @@ Apply settings anyway? - Type: + Type: diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 46ece8976..4a852b346 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -3221,8 +3221,8 @@ Apply settings anyway? Немедленно применить - Type: - + Type: + Тип: diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 2a8a6ea96..183b98b94 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -3245,8 +3245,8 @@ Apply settings anyway? Негайно застосувати - Type: - + Type: + Тип: diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index 22ba545e2..bb773f26a 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -2729,8 +2729,8 @@ Apply settings anyway? - Type: - + Type: + 类型: diff --git a/src/app/valentina/dialogs/dialogpatternxmledit.ui b/src/app/valentina/dialogs/dialogpatternxmledit.ui index 4abcc260b..a43be8414 100644 --- a/src/app/valentina/dialogs/dialogpatternxmledit.ui +++ b/src/app/valentina/dialogs/dialogpatternxmledit.ui @@ -165,7 +165,7 @@ - Type: + Type: From 209d2c46b673af0b3aec19996e0c494cc0420aa4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 23 Aug 2016 15:43:52 +0300 Subject: [PATCH 18/34] Save as tiled pdf should produce only A4 page size output. --HG-- branch : develop --- src/app/valentina/mainwindowsnogui.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index b234c8ea9..6def41607 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -821,6 +821,7 @@ void MainWindowsNoGUI::SaveLayoutAs() } QPrinter printer; SetPrinterSettings(&printer, PrintType::PrintPDF); + printer.setPageSize(QPrinter::A4);// Want to be sure that page size is correct. // Call IsPagesFit after setting a printer settings and check if pages is not bigger than printer's paper size if (not isTiled && not IsPagesFit(printer.paperRect().size())) From be6c67614537821f487092e58641cd14cbdb91eb Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 23 Aug 2016 15:54:44 +0300 Subject: [PATCH 19/34] We don't need these files anymore. --HG-- branch : develop --- src/libs/vmisc/share/resources/icon.qrc | 2 -- .../vmisc/share/resources/icon/Graduation.png | Bin 3958 -> 0 bytes .../vmisc/share/resources/icon/individual.png | Bin 15507 -> 0 bytes 3 files changed, 2 deletions(-) delete mode 100644 src/libs/vmisc/share/resources/icon/Graduation.png delete mode 100644 src/libs/vmisc/share/resources/icon/individual.png diff --git a/src/libs/vmisc/share/resources/icon.qrc b/src/libs/vmisc/share/resources/icon.qrc index 49eb8ac59..ee4e61b21 100644 --- a/src/libs/vmisc/share/resources/icon.qrc +++ b/src/libs/vmisc/share/resources/icon.qrc @@ -16,8 +16,6 @@ icon/16x16/mirror.png icon/config.png icon/pattern_config.png - icon/Graduation.png - icon/individual.png icon/community_config.png icon/32x32/arrowLeft.png icon/32x32/arrowRight.png diff --git a/src/libs/vmisc/share/resources/icon/Graduation.png b/src/libs/vmisc/share/resources/icon/Graduation.png deleted file mode 100644 index f272acef912fb78d597ea6ddfd7bb245649815c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3958 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 F{SO<@ruP5< From 89ce8afe776316bd384fa0a928af899d70723125 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 23 Aug 2016 21:24:14 +0300 Subject: [PATCH 20/34] Localize numeric keyboard's dot key according to locale and user preferences. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 57 +++++++++++++++++++ src/app/tape/tmainwindow.h | 1 + src/app/tape/tmainwindow.ui | 2 +- src/app/valentina/core/vformulaproperty.cpp | 3 + .../valentina/dialogs/dialogincrements.cpp | 35 +++++++++++- src/app/valentina/dialogs/dialogincrements.h | 5 +- .../plugins/vstringproperty.cpp | 40 ++++++++++++- .../plugins/vstringproperty.h | 4 ++ src/libs/vtools/dialogs/tools/dialogtool.cpp | 17 +++++- 9 files changed, 155 insertions(+), 9 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index ce83093da..ea4479341 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -110,6 +110,9 @@ TMainWindow::TMainWindow(QWidget *parent) ui->lineEditEmail->setClearButtonEnabled(true); #endif + ui->lineEditFind->installEventFilter(this); + ui->plainTextEditFormula->installEventFilter(this); + search = QSharedPointer(new VTableSearch(ui->tableWidget)); ui->tabWidget->setVisible(false); @@ -556,6 +559,60 @@ void TMainWindow::showEvent(QShowEvent *event) isInitialized = true;//first show windows are held } +//--------------------------------------------------------------------------------------------------------------------- +bool TMainWindow::eventFilter(QObject *object, QEvent *event) +{ + if (QPlainTextEdit *plainTextEdit = qobject_cast(object)) + { + if (event->type() == QEvent::KeyPress) + { + QKeyEvent *keyEvent = static_cast(event); + if ((keyEvent->key() == Qt::Key_Enter) || (keyEvent->key() == Qt::Key_Return)) + { + // Ignore Enter key + return true; + } + else if ((keyEvent->key() == Qt::Key_Period) && (keyEvent->modifiers() & Qt::KeypadModifier)) + { + if (qApp->Settings()->GetOsSeparator()) + { + plainTextEdit->insertPlainText(QLocale::system().decimalPoint()); + } + else + { + plainTextEdit->insertPlainText(QLocale::c().decimalPoint()); + } + return true; + } + } + } + else if (QLineEdit *textEdit = qobject_cast(object)) + { + if (event->type() == QEvent::KeyPress) + { + QKeyEvent *keyEvent = static_cast(event); + if ((keyEvent->key() == Qt::Key_Period) && (keyEvent->modifiers() & Qt::KeypadModifier)) + { + if (qApp->Settings()->GetOsSeparator()) + { + textEdit->insert(QLocale::system().decimalPoint()); + } + else + { + textEdit->insert(QLocale::c().decimalPoint()); + } + return true; + } + } + } + else + { + // pass the event on to the parent class + return QMainWindow::eventFilter(object, event); + } + return false;// pass the event to the widget +} + //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::FileSave() { diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index c9a5eb8ae..4b1dc532a 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -68,6 +68,7 @@ protected: virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; private slots: void FileNew(); diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui index c31f1bae9..e63c42a86 100644 --- a/src/app/tape/tmainwindow.ui +++ b/src/app/tape/tmainwindow.ui @@ -47,7 +47,7 @@ - 1 + 0 diff --git a/src/app/valentina/core/vformulaproperty.cpp b/src/app/valentina/core/vformulaproperty.cpp index ad5b8dd48..1686dc6d8 100644 --- a/src/app/valentina/core/vformulaproperty.cpp +++ b/src/app/valentina/core/vformulaproperty.cpp @@ -33,6 +33,7 @@ #include "vformulapropertyeditor.h" #include "../vpropertyexplorer/vproperties.h" #include "../vpatterndb/vformula.h" +#include "../vmisc/vabstractapplication.h" enum class ChildType : char {Invalid = 0, Value = 1, Formula = 2}; @@ -48,12 +49,14 @@ VFormulaProperty::VFormulaProperty(const QString &name) addChild(tmpValue); tmpValue->setUpdateBehaviour(true, false); tmpValue->setReadOnly(true); + tmpValue->setOsSeparator(qApp->Settings()->GetOsSeparator()); tmpValue->setTypeForParent(static_cast(ChildType::Value)); VStringProperty* tmpFormula = new VStringProperty(tr("Formula")); addChild(tmpFormula); tmpFormula->setClearButtonEnable(true); tmpFormula->setUpdateBehaviour(true, false); + tmpFormula->setOsSeparator(qApp->Settings()->GetOsSeparator()); tmpFormula->setTypeForParent(static_cast(ChildType::Formula)); setValue(0); diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index cc38efc40..7b07dc8b4 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -68,9 +68,12 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par ui->lineEditFind->setClearButtonEnabled(true); #endif + ui->lineEditFind->installEventFilter(this); + search = QSharedPointer(new VTableSearch(ui->tableWidgetIncrement)); formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); @@ -726,7 +729,37 @@ void DialogIncrements::changeEvent(QEvent *event) FullUpdateFromFile(); } // remember to call base class implementation - QWidget::changeEvent(event); + QWidget::changeEvent(event); +} + +//--------------------------------------------------------------------------------------------------------------------- +bool DialogIncrements::eventFilter(QObject *object, QEvent *event) +{ + if (QLineEdit *textEdit = qobject_cast(object)) + { + if (event->type() == QEvent::KeyPress) + { + QKeyEvent *keyEvent = static_cast(event); + if ((keyEvent->key() == Qt::Key_Period) && (keyEvent->modifiers() & Qt::KeypadModifier)) + { + if (qApp->Settings()->GetOsSeparator()) + { + textEdit->insert(QLocale::system().decimalPoint()); + } + else + { + textEdit->insert(QLocale::c().decimalPoint()); + } + return true; + } + } + } + else + { + // pass the event on to the parent class + return DialogTool::eventFilter(object, event); + } + return false;// pass the event to the widget } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/dialogs/dialogincrements.h b/src/app/valentina/dialogs/dialogincrements.h index d54ef48b3..af30e4b45 100644 --- a/src/app/valentina/dialogs/dialogincrements.h +++ b/src/app/valentina/dialogs/dialogincrements.h @@ -59,8 +59,9 @@ signals: void FullUpdateTree(const Document &parse); protected: - virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; - virtual void changeEvent ( QEvent * event) Q_DECL_OVERRIDE; + virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; + virtual void changeEvent ( QEvent * event) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; private slots: void ShowIncrementDetails(); void AddIncrement(); diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp index 5aaf3e94e..692297516 100644 --- a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp @@ -20,6 +20,7 @@ #include "vstringproperty.h" +#include #include #include #include @@ -38,7 +39,7 @@ using namespace VPE; VPE::VStringProperty::VStringProperty(const QString &name, const QMap &settings) - : VProperty(name, QVariant::String), readOnly(false), typeForParent(0), clearButton(false) + : VProperty(name, QVariant::String), readOnly(false), typeForParent(0), clearButton(false), m_osSeparator(false) { VProperty::setSettings(settings); d_ptr->VariantValue.setValue(QString()); @@ -46,7 +47,7 @@ VPE::VStringProperty::VStringProperty(const QString &name, const QMapVariantValue.setValue(QString()); d_ptr->VariantValue.convert(QVariant::String); @@ -61,6 +62,7 @@ QWidget *VPE::VStringProperty::createEditor(QWidget *parent, const QStyleOptionV QLineEdit* tmpEditor = new QLineEdit(parent); tmpEditor->setLocale(parent->locale()); tmpEditor->setReadOnly(readOnly); + tmpEditor->installEventFilter(this); #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) tmpEditor->setClearButtonEnabled(clearButton); #endif @@ -87,6 +89,11 @@ void VPE::VStringProperty::setReadOnly(bool readOnly) this->readOnly = readOnly; } +void VStringProperty::setOsSeparator(bool separator) +{ + m_osSeparator = separator; +} + void VStringProperty::setClearButtonEnable(bool value) { this->clearButton = value; @@ -150,3 +157,32 @@ void VStringProperty::setTypeForParent(int value) { typeForParent = value; } + +bool VStringProperty::eventFilter(QObject *object, QEvent *event) +{ + if (QLineEdit *textEdit = qobject_cast(object)) + { + if (event->type() == QEvent::KeyPress) + { + QKeyEvent *keyEvent = static_cast(event); + if ((keyEvent->key() == Qt::Key_Period) && (keyEvent->modifiers() & Qt::KeypadModifier)) + { + if (m_osSeparator) + { + textEdit->insert(QLocale::system().decimalPoint()); + } + else + { + textEdit->insert(QLocale::c().decimalPoint()); + } + return true; + } + } + } + else + { + // pass the event on to the parent class + return VProperty::eventFilter(object, event); + } + return false;// pass the event to the widget +} diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.h b/src/libs/vpropertyexplorer/plugins/vstringproperty.h index 0fe83ac43..3c5039357 100644 --- a/src/libs/vpropertyexplorer/plugins/vstringproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.h @@ -63,6 +63,7 @@ public: virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; void setReadOnly(bool readOnly); + void setOsSeparator(bool separator); void setClearButtonEnable(bool value); //! Sets the settings. @@ -94,6 +95,9 @@ protected: bool readOnly; int typeForParent; bool clearButton; + bool m_osSeparator; + + virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VStringProperty) diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index c4090d21f..48a492a0c 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -346,8 +346,7 @@ void DialogTool::MoveCursorToEnd(QPlainTextEdit *plainTextEdit) //--------------------------------------------------------------------------------------------------------------------- bool DialogTool::eventFilter(QObject *object, QEvent *event) { - QPlainTextEdit *plainTextEdit = qobject_cast(object); - if (plainTextEdit != nullptr) + if (QPlainTextEdit *plainTextEdit = qobject_cast(object)) { if (event->type() == QEvent::KeyPress) { @@ -357,6 +356,18 @@ bool DialogTool::eventFilter(QObject *object, QEvent *event) // Ignore Enter key return true; } + else if ((keyEvent->key() == Qt::Key_Period) && (keyEvent->modifiers() & Qt::KeypadModifier)) + { + if (qApp->Settings()->GetOsSeparator()) + { + plainTextEdit->insertPlainText(QLocale::system().decimalPoint()); + } + else + { + plainTextEdit->insertPlainText(QLocale::c().decimalPoint()); + } + return true; + } } } else @@ -364,7 +375,7 @@ bool DialogTool::eventFilter(QObject *object, QEvent *event) // pass the event on to the parent class return QDialog::eventFilter(object, event); } - return false; + return false;// pass the event to the widget } //--------------------------------------------------------------------------------------------------------------------- From 99a2f0f807b2498dff3982c78ec65b51d7e039bd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 25 Aug 2016 19:32:59 +0300 Subject: [PATCH 21/34] Fixed issue #553. Tape.exe crash. Issue with the Search field. (grafted from c4cc1aca74cb29d3fb57cd0718ec282b3dd0dc7b) --HG-- branch : develop --- ChangeLog.txt | 3 +- src/libs/vmisc/vtablesearch.cpp | 50 ++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index b970dacc5..4fac8d9b1 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -58,7 +58,8 @@ - [#544] Error: Color Lines are black until touched. - [#543] Detail loses details. - [#548] Bug Detail tool. Case when seam allowance is wrong. -- Called the main app in console mode doesn't show opening file error in some cases. +- Called the main app in console mode doesn't show opening file error in some cases. +- [#553] Tape.exe crash. Issue with the Search field. # Version 0.4.4 April 12, 2016 - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements. diff --git a/src/libs/vmisc/vtablesearch.cpp b/src/libs/vmisc/vtablesearch.cpp index ec7c36cb6..e33498572 100644 --- a/src/libs/vmisc/vtablesearch.cpp +++ b/src/libs/vmisc/vtablesearch.cpp @@ -49,17 +49,25 @@ void VTableSearch::Clear() { SCASSERT(table != nullptr); - foreach(QTableWidgetItem *item, searchList) + for(int i = 0; i < table->rowCount(); ++i) { - if (item->row() % 2 != 0 && table->alternatingRowColors()) + for(int j = 0; j < table->columnCount(); ++j) { - item->setBackground(QPalette().alternateBase()); - } - else - { - item->setBackground(QPalette().base()); + if (QTableWidgetItem *item = table->item(i, j)) + { + if (item->row() % 2 != 0 && table->alternatingRowColors()) + { + item->setBackground(QPalette().alternateBase()); + } + else + { + item->setBackground(QPalette().base()); + } + } } } + + searchList.clear(); searchIndex = -1; } @@ -87,26 +95,24 @@ void VTableSearch::Find(const QString &term) { SCASSERT(table != nullptr); - const QList list = table->findItems(term, Qt::MatchContains); + Clear(); - if (list.isEmpty() || term.isEmpty()) + if (not term.isEmpty()) { - Clear(); - } - else - { - Clear(); + searchList = table->findItems(term, Qt::MatchContains); - searchList = list; - foreach(QTableWidgetItem *item, searchList) + if (not searchList.isEmpty()) { - item->setBackground(Qt::yellow); - } + foreach(QTableWidgetItem *item, searchList) + { + item->setBackground(Qt::yellow); + } - searchIndex = 0; - QTableWidgetItem *item = searchList.at(searchIndex); - item->setBackground(Qt::red); - table->scrollToItem(item); + searchIndex = 0; + QTableWidgetItem *item = searchList.at(searchIndex); + item->setBackground(Qt::red); + table->scrollToItem(item); + } } } From 88d2919a9bafd5e9cb50c9436f0447e0d40281da Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 25 Aug 2016 20:00:03 +0300 Subject: [PATCH 22/34] TMainWindow will show decimal point according to locale. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 18 +++++++++++------- src/app/tape/tmainwindow.h | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index ea4479341..b99463e0e 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -101,6 +101,8 @@ TMainWindow::TMainWindow(QWidget *parent) { ui->setupUi(this); + qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); + #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) ui->lineEditFind->setClearButtonEnabled(true); ui->lineEditName->setClearButtonEnabled(true); @@ -484,15 +486,17 @@ void TMainWindow::changeEvent(QEvent *event) { if (event->type() == QEvent::LanguageChange) { + qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); + // retranslate designer form (single inheritance approach) ui->retranslateUi(this); if (mType == MeasurementsType::Standard) { ui->labelMType->setText(tr("Standard measurements")); - ui->labelBaseSizeValue->setText(QString().setNum(m->BaseSize()) + " " + + ui->labelBaseSizeValue->setText(QString().setNum(m->BaseSize()) + QLatin1String(" ") + VDomDocument::UnitsToStr(m->MUnit(), true)); - ui->labelBaseHeightValue->setText(QString().setNum(m->BaseHeight()) + " " + + ui->labelBaseHeightValue->setText(QString().setNum(m->BaseHeight()) + QLatin1String(" ") + VDomDocument::UnitsToStr(m->MUnit(), true)); labelGradationHeights = new QLabel(tr("Height:")); @@ -2295,7 +2299,7 @@ void TMainWindow::RefreshTable() } const qreal value = UnitConvertor(*meash->GetValue(), mUnit, pUnit); - AddCell(QString().setNum(value), currentRow, ColumnCalcValue, Qt::AlignHCenter | Qt::AlignVCenter, + AddCell(locale().toString(value), currentRow, ColumnCalcValue, Qt::AlignHCenter | Qt::AlignVCenter, meash->IsFormulaOk()); // calculated value QString formula; @@ -2327,16 +2331,16 @@ void TMainWindow::RefreshTable() } const qreal value = UnitConvertor(data->GetTableValue(meash->GetName(), mType), mUnit, pUnit); - AddCell(QString().setNum(value), currentRow, ColumnCalcValue, + AddCell(locale().toString(value), currentRow, ColumnCalcValue, Qt::AlignHCenter | Qt::AlignVCenter, meash->IsFormulaOk()); // calculated value - AddCell(QString().setNum(meash->GetBase()), currentRow, ColumnBaseValue, + AddCell(locale().toString(meash->GetBase()), currentRow, ColumnBaseValue, Qt::AlignHCenter | Qt::AlignVCenter); // base value - AddCell(QString().setNum(meash->GetKsize()), currentRow, ColumnInSizes, + AddCell(locale().toString(meash->GetKsize()), currentRow, ColumnInSizes, Qt::AlignHCenter | Qt::AlignVCenter); // in sizes - AddCell(QString().setNum(meash->GetKheight()), currentRow, ColumnInHeights, + AddCell(locale().toString(meash->GetKheight()), currentRow, ColumnInHeights, Qt::AlignHCenter | Qt::AlignVCenter); // in heights } } diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index 4b1dc532a..0642f7758 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -51,7 +51,7 @@ class TMainWindow : public QMainWindow Q_OBJECT public: - explicit TMainWindow(QWidget *parent = 0); + explicit TMainWindow(QWidget *parent = nullptr); virtual ~TMainWindow() Q_DECL_OVERRIDE; QString CurrentFile() const; From 707712befda4c81f5a70fcbd104627f79fe6a6c8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 25 Aug 2016 20:26:59 +0300 Subject: [PATCH 23/34] TMainWindow. Comboboxes on the tab Information looked ugly. --HG-- branch : develop --- src/app/tape/tmainwindow.ui | 132 +++++++++++++----------------------- 1 file changed, 46 insertions(+), 86 deletions(-) diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui index e63c42a86..f2f768404 100644 --- a/src/app/tape/tmainwindow.ui +++ b/src/app/tape/tmainwindow.ui @@ -561,9 +561,6 @@ Information - - QFormLayout::ExpandingFieldsGrow - @@ -630,6 +627,32 @@ + + + + PM system: + + + + + + + false + + + + 0 + 0 + + + + + 0 + 0 + + + + @@ -717,7 +740,7 @@ false - + 0 0 @@ -753,6 +776,25 @@ + + + + false + + + + 0 + 0 + + + + + 0 + 0 + + + + @@ -796,88 +838,6 @@ - - - - PM system: - - - - - - - - - false - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - - - - - false - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - From f0cac1c1910ecdbdf94c4d7db53cc580104ce379 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 12:28:30 +0300 Subject: [PATCH 24/34] Improve string to "Material, cut 1 on fold". This will look better. --HG-- branch : develop --- src/libs/vlayout/vtextmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp index dfd19ca1b..936a1a95e 100644 --- a/src/libs/vlayout/vtextmanager.cpp +++ b/src/libs/vlayout/vtextmanager.cpp @@ -247,9 +247,9 @@ void VTextManager::Update(const QString& qsName, const VPatternPieceData& data) << QApplication::translate("Detail", "Lining", 0) << QApplication::translate("Detail", "Interfacing", 0) << QApplication::translate("Detail", "Interlining", 0); - QString qsText = QLatin1String("%1. ") + tr("Cut") + QLatin1String(" %2%3"); + QString qsText = QLatin1String("%1, ") + tr("cut") + QLatin1String(" %2%3"); QStringList qslPlace; - qslPlace << "" << QLatin1String(" ") + tr("on Fold"); + qslPlace << "" << QLatin1String(" ") + tr("on fold"); tl.m_eFontWeight = QFont::Normal; tl.m_iFontSize = 0; for (int i = 0; i < data.GetMCPCount(); ++i) From 23d9898154df5a3540fe94a6e31a302cd1c221d5 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 12:38:23 +0300 Subject: [PATCH 25/34] Use QLocale::c() instead of QLocale(QLocale::C). --HG-- branch : develop --- src/app/tape/dialogs/dialogabouttape.cpp | 4 ++-- src/app/tape/dialogs/tapeconfigdialog.cpp | 4 ++-- src/app/valentina/dialogs/configdialog.cpp | 4 ++-- src/app/valentina/dialogs/dialogaboutapp.cpp | 4 ++-- src/app/valentina/dialogs/dialoghistory.cpp | 2 +- src/app/valentina/dialogs/dialogincrements.cpp | 2 +- src/app/valentina/dialogs/dialoglayoutprogress.cpp | 2 +- src/app/valentina/dialogs/dialoglayoutsettings.cpp | 2 +- src/app/valentina/dialogs/dialognewpattern.cpp | 2 +- src/app/valentina/dialogs/dialogpatternproperties.cpp | 2 +- src/app/valentina/dialogs/dialogpatternxmledit.cpp | 2 +- src/app/valentina/dialogs/dialogsavelayout.cpp | 2 +- src/app/valentina/mainwindow.cpp | 2 +- src/libs/vmisc/vabstractapplication.h | 2 +- src/libs/vpatterndb/vtranslatevars.cpp | 6 +++--- src/libs/vtools/dialogs/support/dialogundo.cpp | 2 +- src/libs/vtools/dialogs/tools/dialogtool.h | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/app/tape/dialogs/dialogabouttape.cpp b/src/app/tape/dialogs/dialogabouttape.cpp index b3f45edd9..808c6a338 100644 --- a/src/app/tape/dialogs/dialogabouttape.cpp +++ b/src/app/tape/dialogs/dialogabouttape.cpp @@ -47,7 +47,7 @@ DialogAboutTape::DialogAboutTape(QWidget *parent) { ui->setupUi(this); - //mApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + //mApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); RetranslateUi(); connect(ui->pushButton_Web_Site, &QPushButton::clicked, [this]() @@ -126,7 +126,7 @@ void DialogAboutTape::RetranslateUi() ui->labelBuildRevision->setText(tr("Build revision: %1").arg(BUILD_REVISION)); ui->label_QT_Version->setText(buildCompatibilityString()); - const QDate date = QLocale(QLocale::C).toDate(QString(__DATE__).simplified(), QLatin1String("MMM d yyyy")); + const QDate date = QLocale::c().toDate(QString(__DATE__).simplified(), QLatin1String("MMM d yyyy")); ui->label_Tape_Built->setText(tr("Built on %1 at %2").arg(date.toString()).arg(__TIME__)); ui->label_Legal_Stuff->setText(QApplication::translate("InternalStrings", diff --git a/src/app/tape/dialogs/tapeconfigdialog.cpp b/src/app/tape/dialogs/tapeconfigdialog.cpp index ca20cd121..833761b46 100644 --- a/src/app/tape/dialogs/tapeconfigdialog.cpp +++ b/src/app/tape/dialogs/tapeconfigdialog.cpp @@ -105,7 +105,7 @@ TapeConfigDialog::TapeConfigDialog(QWidget *parent) setWindowTitle(tr("Config Dialog")); - qApp->TapeSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->TapeSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); } //--------------------------------------------------------------------------------------------------------------------- @@ -201,7 +201,7 @@ void TapeConfigDialog::Apply() default: break; } - qApp->TapeSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->TapeSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); emit UpdateProperties(); setResult(QDialog::Accepted); } diff --git a/src/app/valentina/dialogs/configdialog.cpp b/src/app/valentina/dialogs/configdialog.cpp index 339107245..75be4fd14 100644 --- a/src/app/valentina/dialogs/configdialog.cpp +++ b/src/app/valentina/dialogs/configdialog.cpp @@ -94,7 +94,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) : setWindowTitle(tr("Config Dialog")); - qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); } //--------------------------------------------------------------------------------------------------------------------- @@ -208,7 +208,7 @@ void ConfigDialog::Apply() default: break; } - qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); emit UpdateProperties(); setResult(QDialog::Accepted); } diff --git a/src/app/valentina/dialogs/dialogaboutapp.cpp b/src/app/valentina/dialogs/dialogaboutapp.cpp index e0cdeca31..1e5c3683d 100644 --- a/src/app/valentina/dialogs/dialogaboutapp.cpp +++ b/src/app/valentina/dialogs/dialogaboutapp.cpp @@ -45,13 +45,13 @@ DialogAboutApp::DialogAboutApp(QWidget *parent) : { ui->setupUi(this); - qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); ui->label_Valentina_Version->setText(QString("Valentina %1").arg(APP_VERSION_STR)); ui->labelBuildRevision->setText(QString("Build revision: %1").arg(BUILD_REVISION)); ui->label_QT_Version->setText(buildCompatibilityString()); - QDate date = QLocale(QLocale::C).toDate(QString(__DATE__).simplified(), QLatin1String("MMM d yyyy")); + QDate date = QLocale::c().toDate(QString(__DATE__).simplified(), QLatin1String("MMM d yyyy")); ui->label_Valentina_Built->setText(tr("Built on %1 at %2").arg(date.toString()).arg(__TIME__)); ui->label_Legal_Stuff->setText(QApplication::translate("InternalStrings", diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index 64a069de1..beab2bedb 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -53,7 +53,7 @@ DialogHistory::DialogHistory(VContainer *data, VPattern *doc, QWidget *parent) { ui->setupUi(this); - qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); bOk = ui->buttonBox->button(QDialogButtonBox::Ok); connect(bOk, &QPushButton::clicked, this, &DialogHistory::DialogAccepted); diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index 7b07dc8b4..614f7f720 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -75,7 +75,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par formulaBaseHeight = ui->plainTextEditFormula->height(); ui->plainTextEditFormula->installEventFilter(this); - qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); qCDebug(vDialog, "Showing variables."); ShowUnits(); diff --git a/src/app/valentina/dialogs/dialoglayoutprogress.cpp b/src/app/valentina/dialogs/dialoglayoutprogress.cpp index d7de471bd..2419403f5 100644 --- a/src/app/valentina/dialogs/dialoglayoutprogress.cpp +++ b/src/app/valentina/dialogs/dialoglayoutprogress.cpp @@ -42,7 +42,7 @@ DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent) { ui->setupUi(this); - qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); ui->progressBar->setMaximum(maxCount); ui->progressBar->setValue(0); diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.cpp b/src/app/valentina/dialogs/dialoglayoutsettings.cpp index 8ad40ce3c..fdd8d5e9d 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.cpp +++ b/src/app/valentina/dialogs/dialoglayoutsettings.cpp @@ -60,7 +60,7 @@ DialogLayoutSettings::DialogLayoutSettings(VLayoutGenerator *generator, QWidget { ui->setupUi(this); - qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); //moved from ReadSettings - well...it seems it can be done once only (i.e. constructor) because Init funcs dont //even cleanse lists before adding diff --git a/src/app/valentina/dialogs/dialognewpattern.cpp b/src/app/valentina/dialogs/dialognewpattern.cpp index fcf9b8334..fa7e4882a 100644 --- a/src/app/valentina/dialogs/dialognewpattern.cpp +++ b/src/app/valentina/dialogs/dialognewpattern.cpp @@ -49,7 +49,7 @@ DialogNewPattern::DialogNewPattern(VContainer *data, const QString &patternPiece ui->lineEditName->setClearButtonEnabled(true); #endif - qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); QRect position = this->frameGeometry(); position.moveCenter(QDesktopWidget().availableGeometry().center()); diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 9e3fe361b..89c3afcc1 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -71,7 +71,7 @@ DialogPatternProperties::DialogPatternProperties(const QString &filePath, VPatte SCASSERT(doc != nullptr); - qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); if (m_filePath.isEmpty()) { diff --git a/src/app/valentina/dialogs/dialogpatternxmledit.cpp b/src/app/valentina/dialogs/dialogpatternxmledit.cpp index ae2dcd356..d2509f6e1 100644 --- a/src/app/valentina/dialogs/dialogpatternxmledit.cpp +++ b/src/app/valentina/dialogs/dialogpatternxmledit.cpp @@ -46,7 +46,7 @@ DialogPatternXmlEdit::DialogPatternXmlEdit(QWidget *parent, VPattern *xmldoc) { ui->setupUi(this); - qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); this->xmlmodel = new VXMLTreeView(); this->doc=xmldoc; diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp index f52e30881..f4cb267cd 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.cpp +++ b/src/app/valentina/dialogs/dialogsavelayout.cpp @@ -55,7 +55,7 @@ DialogSaveLayout::DialogSaveLayout(int count, const QString &fileName, QWidget * ui->lineEditFileName->setClearButtonEnabled(true); #endif - qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); SCASSERT(bOk != nullptr); diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 3c2d2612f..b6d2c79ed 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -3914,7 +3914,7 @@ QStringList MainWindow::GetUnlokedRestoreFileList() const //--------------------------------------------------------------------------------------------------------------------- void MainWindow::WindowsLocale() { - qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vmisc/vabstractapplication.h b/src/libs/vmisc/vabstractapplication.h index 333540d2c..e311d7615 100644 --- a/src/libs/vmisc/vabstractapplication.h +++ b/src/libs/vmisc/vabstractapplication.h @@ -157,7 +157,7 @@ template inline QString VAbstractApplication::LocaleToString(const T &value) { QLocale loc; - qApp->Settings()->GetOsSeparator() ? loc = QLocale::system() : loc = QLocale(QLocale::C); + qApp->Settings()->GetOsSeparator() ? loc = QLocale::system() : loc = QLocale::c(); return loc.toString(value); } diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index ed994d762..0ec2efa96 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -779,7 +779,7 @@ QString VTranslateVars::FormulaFromUser(const QString &formula, bool osSeparator } QLocale loc = QLocale::system(); // User locale - if (loc != QLocale(QLocale::C) && osSeparator) + if (loc != QLocale::c() && osSeparator) {// User want use Os separator QList nKeys = numbers.keys();// Positions for all numbers in expression QList nValues = numbers.values(); @@ -794,7 +794,7 @@ QString VTranslateVars::FormulaFromUser(const QString &formula, bool osSeparator continue;//Leave with out translation } - loc = QLocale(QLocale::C);// To internal locale + loc = QLocale::c();// To internal locale const QString dStr = loc.toString(d);// Internal look for number newFormula.replace(nKeys.at(i), nValues.at(i).length(), dStr); const int bias = nValues.at(i).length() - dStr.length(); @@ -922,7 +922,7 @@ QString VTranslateVars::FormulaToUser(const QString &formula, bool osSeparator) QList nValues = numbers.values(); for (int i = 0; i < nKeys.size(); ++i) { - loc = QLocale(QLocale::C);// From pattern locale + loc = QLocale::c();// From pattern locale bool ok = false; const qreal d = loc.toDouble(nValues.at(i), &ok); if (ok == false) diff --git a/src/libs/vtools/dialogs/support/dialogundo.cpp b/src/libs/vtools/dialogs/support/dialogundo.cpp index b5136d9c4..b1c9ae6c7 100644 --- a/src/libs/vtools/dialogs/support/dialogundo.cpp +++ b/src/libs/vtools/dialogs/support/dialogundo.cpp @@ -46,7 +46,7 @@ DialogUndo::DialogUndo(QWidget *parent) { ui->setupUi(this); - qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); bool opening = qApp->getOpeningPattern(); if (opening) diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index 557878c5a..48df6e3d6 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -342,7 +342,7 @@ inline void DialogTool::InitOkCancel(T *ui) SCASSERT(bCancel != nullptr); connect(bCancel, &QPushButton::clicked, this, &DialogTool::DialogRejected); - qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); } //--------------------------------------------------------------------------------------------------------------------- From 32df298cc3670973f0c0c062b2a0d7567fd1c245 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 12:48:55 +0300 Subject: [PATCH 26/34] The field Created was useless. Moved data about date of creation to a checkbox. --HG-- branch : develop --- .../dialogs/dialogpatternproperties.cpp | 3 +- .../dialogs/dialogpatternproperties.ui | 207 ++++++++---------- 2 files changed, 94 insertions(+), 116 deletions(-) diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 89c3afcc1..31e29d4ca 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -171,7 +171,8 @@ DialogPatternProperties::DialogPatternProperties(const QString &filePath, VPatte ui->lineEditPatternNumber->setText(doc->GetPatternNumber()); ui->lineEditCompanyName->setText(doc->GetCompanyName()); ui->lineEditCustomerName->setText(doc->GetCustomerName()); - ui->labelCreationDate->setText(QDate::currentDate().toString(Qt::SystemLocaleLongDate)); + ui->checkBoxShowDate->setText(ui->checkBoxShowDate->text() + .arg(QDate::currentDate().toString(Qt::SystemLocaleLongDate))); ui->lineEditSize->setText(doc->GetPatternSize()); const QString plSize = QLatin1String("%") + qApp->TrVars()->PlaceholderToUser(pl_size) + QLatin1String("%"); diff --git a/src/app/valentina/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui index 2ef6a2803..43970b9b2 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.ui +++ b/src/app/valentina/dialogs/dialogpatternproperties.ui @@ -6,8 +6,8 @@ 0 0 - 757 - 692 + 727 + 649 @@ -1047,119 +1047,96 @@ General info - - - - 10 - 10 - 401 - 252 - - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - Pattern name: - - - - - - - 30 - - - - - - - Pattern number: - - - - - - - 30 - - - - - - - Company/Designer name: - - - - - - - 30 - - - - - - - Customer name: - - - - - - - 30 - - - - - - - - - - - - - - Created: - - - - - - - Pattern size: - - - - - - - 40 - - - - - - - Show measurements - - - - - - - Show date of creation - - - - - + + + + + + + Pattern name: + + + + + + + 30 + + + + + + + Pattern number: + + + + + + + 30 + + + + + + + Company/Designer name: + + + + + + + 30 + + + + + + + Customer name: + + + + + + + 30 + + + + + + + Pattern size: + + + + + + + 40 + + + + + + + + + Show date of layout creation (%1) + + + + + + + Show measurements file + + + + From 758f1caa1bf363078fed2b2cfb6aeb4183bd5a59 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 13:23:50 +0300 Subject: [PATCH 27/34] Refresh search after retranslating the table. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index b99463e0e..853dc7906 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -173,6 +173,7 @@ void TMainWindow::RetranslateTable() const int row = ui->tableWidget->currentRow(); RefreshTable(); ui->tableWidget->selectRow(row); + search->RefreshList(ui->lineEditFind->text()); } } From f22eccf91e20d50cdd8fda28ff83690b36148968 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 13:27:14 +0300 Subject: [PATCH 28/34] Update search after using the qlineedit clear button. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 853dc7906..6be39a824 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -1980,7 +1980,7 @@ void TMainWindow::InitWindow() connect(ui->comboBoxPMSystem, static_cast(&QComboBox::currentIndexChanged), this, &TMainWindow::SavePMSystem); - connect(ui->lineEditFind, &QLineEdit::textEdited, [=] (const QString &term){search->Find(term);}); + connect(ui->lineEditFind, &QLineEdit::textChanged, [=] (const QString &term){search->Find(term);}); connect(ui->toolButtonFindPrevious, &QToolButton::clicked, [=] (){search->FindPrevious();}); connect(ui->toolButtonFindNext, &QToolButton::clicked, [=] (){search->FindNext();}); From ddc34803a0f4fc75dc185f3b75de9060afee8cab Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 13:36:51 +0300 Subject: [PATCH 29/34] Fix issue with Config dialog Apply button. In some cases the Apply or OK buttons will not save settings because of section that was active in the moment of applying. For example made change in one section, change to another and click Apply. The change will not be applied. --HG-- branch : develop --- src/app/tape/dialogs/tapeconfigdialog.cpp | 14 +++--------- src/app/valentina/dialogs/configdialog.cpp | 22 +++++-------------- .../dialogs/configpages/communitypage.cpp | 1 - 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/app/tape/dialogs/tapeconfigdialog.cpp b/src/app/tape/dialogs/tapeconfigdialog.cpp index 833761b46..457a79e4c 100644 --- a/src/app/tape/dialogs/tapeconfigdialog.cpp +++ b/src/app/tape/dialogs/tapeconfigdialog.cpp @@ -190,17 +190,9 @@ void TapeConfigDialog::createIcon(const QString &icon, const QString &text) //--------------------------------------------------------------------------------------------------------------------- void TapeConfigDialog::Apply() { - switch (contentsWidget->currentRow()) - { - case (0): - configurationPage->Apply(); - break; - case (1): - pathPage->Apply(); - break; - default: - break; - } + configurationPage->Apply(); + pathPage->Apply(); + qApp->TapeSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); emit UpdateProperties(); setResult(QDialog::Accepted); diff --git a/src/app/valentina/dialogs/configdialog.cpp b/src/app/valentina/dialogs/configdialog.cpp index 75be4fd14..5e12c1c10 100644 --- a/src/app/valentina/dialogs/configdialog.cpp +++ b/src/app/valentina/dialogs/configdialog.cpp @@ -191,23 +191,11 @@ void ConfigDialog::createIcon(const QString &icon, const QString &text) //--------------------------------------------------------------------------------------------------------------------- void ConfigDialog::Apply() { - switch (contentsWidget->currentRow()) - { - case (0): - configurationPage->Apply(); - break; - case (1): - patternPage->Apply(); - break; - case (2): - communityPage->Apply(); - break; - case (3): - pathPage->Apply(); - break; - default: - break; - } + configurationPage->Apply(); + patternPage->Apply(); + communityPage->Apply(); + pathPage->Apply(); + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); emit UpdateProperties(); setResult(QDialog::Accepted); diff --git a/src/app/valentina/dialogs/configpages/communitypage.cpp b/src/app/valentina/dialogs/configpages/communitypage.cpp index 8b7206e91..7893e5259 100644 --- a/src/app/valentina/dialogs/configpages/communitypage.cpp +++ b/src/app/valentina/dialogs/configpages/communitypage.cpp @@ -90,7 +90,6 @@ void CommunityPage::Apply() settings->SetUsername(this->username->text()); settings->SetSavePassword(this->savePassword->isChecked()); settings->SetUserPassword(this->userpassword->text()); - } //--------------------------------------------------------------------------------------------------------------------- From c35f050b66830ef2efd0ca12cde52d9d31e5e935 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 13:46:23 +0300 Subject: [PATCH 30/34] Improvements for the Dialog Detail. Added spliters, fields Letter and Name of detail have placeholder text. --HG-- branch : develop --- src/libs/vtools/dialogs/tools/dialogdetail.ui | 58 +++++++++++-------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.ui b/src/libs/vtools/dialogs/tools/dialogdetail.ui index 8ab7b8a79..49bca0cf7 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.ui +++ b/src/libs/vtools/dialogs/tools/dialogdetail.ui @@ -6,7 +6,7 @@ 0 0 - 523 + 581 442 @@ -62,8 +62,11 @@ - - + + + Qt::Horizontal + + @@ -329,11 +332,9 @@ - - - - - + + + @@ -356,8 +357,11 @@ - - + + + Qt::Horizontal + + @@ -376,6 +380,9 @@ 3 + + Letter of pattern piece + @@ -393,6 +400,9 @@ 30 + + Name can't be empty + @@ -490,21 +500,19 @@ - - - - - - 180 - 0 - - - - Qt::ClickFocus - - - - + + + + + 180 + 0 + + + + Qt::ClickFocus + + + From 6baa623be32ae2db3524c5a24936a0b9ef420a79 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 16:16:06 +0300 Subject: [PATCH 31/34] Disable buttons Find Next and Find Previous if the search field is empty. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 21 +++++++++++++++++-- .../valentina/dialogs/dialogincrements.cpp | 9 ++++++++ src/libs/vmisc/vtablesearch.cpp | 15 +++++++++++-- src/libs/vmisc/vtablesearch.h | 9 ++++++-- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 6be39a824..c5c48968b 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -1984,6 +1984,15 @@ void TMainWindow::InitWindow() connect(ui->toolButtonFindPrevious, &QToolButton::clicked, [=] (){search->FindPrevious();}); connect(ui->toolButtonFindNext, &QToolButton::clicked, [=] (){search->FindNext();}); + connect(search.data(), &VTableSearch::HasResult, [this] (bool state) + { + ui->toolButtonFindPrevious->setEnabled(state); + }); + connect(search.data(), &VTableSearch::HasResult, [this] (bool state) + { + ui->toolButtonFindNext->setEnabled(state); + }); + ui->plainTextEditNotes->setPlainText(m->Notes()); connect(ui->plainTextEditNotes, &QPlainTextEdit::textChanged, this, &TMainWindow::SaveNotes); @@ -2433,8 +2442,16 @@ void TMainWindow::MFields(bool enabled) } ui->lineEditFind->setEnabled(enabled); - ui->toolButtonFindPrevious->setEnabled(enabled); - ui->toolButtonFindNext->setEnabled(enabled); + if (enabled && not ui->lineEditFind->text().isEmpty()) + { + ui->toolButtonFindPrevious->setEnabled(enabled); + ui->toolButtonFindNext->setEnabled(enabled); + } + else + { + ui->toolButtonFindPrevious->setEnabled(false); + ui->toolButtonFindNext->setEnabled(false); + } } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index 614f7f720..45f750104 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -113,6 +113,15 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par connect(ui->toolButtonFindPrevious, &QToolButton::clicked, [=](){search->FindPrevious();}); connect(ui->toolButtonFindNext, &QToolButton::clicked, [=](){search->FindNext();}); + connect(search.data(), &VTableSearch::HasResult, [this] (bool state) + { + ui->toolButtonFindPrevious->setEnabled(state); + }); + connect(search.data(), &VTableSearch::HasResult, [this] (bool state) + { + ui->toolButtonFindNext->setEnabled(state); + }); + if (ui->tableWidgetIncrement->rowCount() > 0) { ui->tableWidgetIncrement->selectRow(0); diff --git a/src/libs/vmisc/vtablesearch.cpp b/src/libs/vmisc/vtablesearch.cpp index e33498572..b03cc4f83 100644 --- a/src/libs/vmisc/vtablesearch.cpp +++ b/src/libs/vmisc/vtablesearch.cpp @@ -37,8 +37,9 @@ #include "../vmisc/def.h" //--------------------------------------------------------------------------------------------------------------------- -VTableSearch::VTableSearch(QTableWidget *table) - :table(table), +VTableSearch::VTableSearch(QTableWidget *table, QObject *parent) + : QObject(parent), + table(table), searchIndex(-1), searchList() { @@ -69,6 +70,8 @@ void VTableSearch::Clear() searchList.clear(); searchIndex = -1; + + emit HasResult(false); } //--------------------------------------------------------------------------------------------------------------------- @@ -112,6 +115,8 @@ void VTableSearch::Find(const QString &term) QTableWidgetItem *item = searchList.at(searchIndex); item->setBackground(Qt::red); table->scrollToItem(item); + + emit HasResult(true); } } } @@ -217,5 +222,11 @@ void VTableSearch::RefreshList(const QString &term) QTableWidgetItem *item = searchList.at(searchIndex); item->setBackground(Qt::red); table->scrollToItem(item); + + emit HasResult(true); + } + else + { + emit HasResult(false); } } diff --git a/src/libs/vmisc/vtablesearch.h b/src/libs/vmisc/vtablesearch.h index 0e8515144..d7ff81e77 100644 --- a/src/libs/vmisc/vtablesearch.h +++ b/src/libs/vmisc/vtablesearch.h @@ -29,6 +29,7 @@ #ifndef VTABLESEARCH_H #define VTABLESEARCH_H +#include #include #include #include @@ -37,10 +38,11 @@ class QTableWidget; class QTableWidgetItem; -class VTableSearch +class VTableSearch: public QObject { + Q_OBJECT public: - explicit VTableSearch(QTableWidget *table); + explicit VTableSearch(QTableWidget *table, QObject *parent = nullptr); void Find(const QString &term); void FindPrevious(); @@ -49,6 +51,9 @@ public: void AddRow(int row); void RefreshList(const QString &term); +signals: + void HasResult(bool state); + private: Q_DISABLE_COPY(VTableSearch) From 34beaed2b270519cdb5ae120eff9dcbf386967dd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 18:57:39 +0300 Subject: [PATCH 32/34] Tape app. Show tooltip in table. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index c5c48968b..da3ae388b 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -2200,6 +2200,7 @@ QTableWidgetItem *TMainWindow::AddCell(const QString &text, int row, int column, { QTableWidgetItem *item = new QTableWidgetItem(text); item->setTextAlignment(aligment); + item->setToolTip(text); // set the item non-editable (view only), and non-selectable Qt::ItemFlags flags = item->flags(); From c2b7ead2ce819510fa927749469c9e34af5b4664 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 19:20:03 +0300 Subject: [PATCH 33/34] Fixed wrong units in dialog DialogEditWrongFormula. --HG-- branch : develop --- src/libs/vtools/dialogs/tools/dialogrotation.cpp | 2 +- src/libs/vtools/dialogs/tools/dialogspline.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogsplinepath.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index be65540c9..679e0f266 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -294,7 +294,7 @@ void DialogRotation::FXAngle() DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this); dialog->setWindowTitle(tr("Edit angle")); dialog->SetFormula(GetAngle()); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { SetAngle(dialog->GetFormula()); diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index 08b975a5b..301449b8b 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -290,7 +290,7 @@ void DialogSpline::FXAngle1() QString angle1F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditAngle1F->toPlainText(), qApp->Settings()->GetOsSeparator()); dialog->SetFormula(angle1F); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator()); @@ -313,7 +313,7 @@ void DialogSpline::FXAngle2() QString angle2F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditAngle2F->toPlainText(), qApp->Settings()->GetOsSeparator()); dialog->SetFormula(angle2F); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator()); diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 41bd2644e..cd07b4db9 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -462,7 +462,7 @@ void DialogSplinePath::FXAngle1() qApp->Settings()->GetOsSeparator()); dialog->SetFormula(angle1F); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator()); @@ -487,7 +487,7 @@ void DialogSplinePath::FXAngle2() qApp->Settings()->GetOsSeparator()); dialog->SetFormula(angle2F); - dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); + dialog->setPostfix(degreeSymbol); if (dialog->exec() == QDialog::Accepted) { angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator()); From 8cf52dc6745bf9e278196dfd275d1f57cca87743 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 26 Aug 2016 19:33:54 +0300 Subject: [PATCH 34/34] Length to control point can be 0. --HG-- branch : develop --- src/libs/vtools/dialogs/tools/dialogspline.cpp | 6 ++++-- src/libs/vtools/dialogs/tools/dialogsplinepath.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index 301449b8b..3c3689ee5 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -405,7 +405,8 @@ void DialogSpline::EvalLength1() { labelEditFormula = ui->labelEditLength1; const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); - const qreal length1 = Eval(ui->plainTextEditLength1F->toPlainText(), flagLength1, ui->labelResultLength1, postfix); + const qreal length1 = Eval(ui->plainTextEditLength1F->toPlainText(), flagLength1, ui->labelResultLength1, postfix, + false); if (length1 < 0) { @@ -423,7 +424,8 @@ void DialogSpline::EvalLength2() { labelEditFormula = ui->labelEditLength2; const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); - const qreal length2 = Eval(ui->plainTextEditLength2F->toPlainText(), flagLength2, ui->labelResultLength2, postfix); + const qreal length2 = Eval(ui->plainTextEditLength2F->toPlainText(), flagLength2, ui->labelResultLength2, postfix, + false); if (length2 < 0) { diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index cd07b4db9..b9be5f697 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -602,13 +602,13 @@ void DialogSplinePath::EvalLength1() labelEditFormula = ui->labelEditLength1; const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const qreal length1 = Eval(ui->plainTextEditLength1F->toPlainText(), flagLength1[row], ui->labelResultLength1, - postfix); + postfix, false); if (length1 < 0) { flagLength1[row] = false; ChangeColor(labelEditFormula, Qt::red); - ui->labelResultLength1->setText(tr("Error") + " (" + postfix + ")"); + ui->labelResultLength1->setText(tr("Error") + QLatin1String(" (") + postfix + QLatin1String(")")); ui->labelResultLength1->setToolTip(tr("Length can't be negative")); CheckState(); @@ -633,13 +633,13 @@ void DialogSplinePath::EvalLength2() labelEditFormula = ui->labelEditLength2; const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const qreal length2 = Eval(ui->plainTextEditLength2F->toPlainText(), flagLength2[row], ui->labelResultLength2, - postfix); + postfix, false); if (length2 < 0) { flagLength2[row] = false; ChangeColor(labelEditFormula, Qt::red); - ui->labelResultLength2->setText(tr("Error") + " (" + postfix + ")"); + ui->labelResultLength2->setText(tr("Error") + QLatin1String(" (") + postfix + QLatin1String(")")); ui->labelResultLength2->setToolTip(tr("Length can't be negative")); CheckState();