From 7beac9db5bc472e75754c3508e4b8b3dec50b70c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 22 Nov 2020 09:32:33 +0200 Subject: [PATCH 1/6] Fix Tape crash on opening. Closes #81 --- ChangeLog.txt | 1 + src/app/tape/tmainwindow.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 46757c1fe..b864e7f40 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,7 @@ # Version 0.7.40 (unreleased) - New function Warning. - [smart-pattern/valentina#80] Allow insertion of multiple nodes. +- [smart-pattern/valentina#81] Tape crash on opening. # Version 0.7.39 Nov 17, 2020 - Fix crash for Line tool notes. diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index e02bdfe23..2733fb09b 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -635,9 +635,12 @@ void TMainWindow::changeEvent(QEvent *event) } { - labelPatternUnit->setText(tr("Pattern unit:")); + if (labelPatternUnit) + { + labelPatternUnit->setText(tr("Pattern unit:")); + } - if (comboBoxUnits != nullptr) + if (comboBoxUnits) { const qint32 index = comboBoxUnits->currentIndex(); comboBoxUnits->blockSignals(true); @@ -4302,6 +4305,11 @@ void TMainWindow::InitComboBoxUnits() //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::InitMeasurementUnits() { + if (not m) + { + return; + } + ui->comboBoxMUnits->blockSignals(true); int current = -1; From 9d323169e2b8f98bdf9afa6810e1a97d933de6d0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 22 Nov 2020 16:07:09 +0200 Subject: [PATCH 2/6] Fix curve name in property browser for segmenting tools. --- ChangeLog.txt | 1 + .../drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index b864e7f40..528147fa0 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,6 +2,7 @@ - New function Warning. - [smart-pattern/valentina#80] Allow insertion of multiple nodes. - [smart-pattern/valentina#81] Tape crash on opening. +- Bug fixes. # Version 0.7.39 Nov 17, 2020 - Fix crash for Line tool notes. diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp index e92ea1ba4..83d1acd30 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp @@ -163,7 +163,7 @@ void VToolCut::SetAliasSuffix2(QString alias) //--------------------------------------------------------------------------------------------------------------------- QString VToolCut::CurveName() const { - return VAbstractTool::data.GetGObject(baseCurveId)->name(); + return VAbstractTool::data.GetGObject(baseCurveId)->ObjectName(); } //--------------------------------------------------------------------------------------------------------------------- From d95cb9428fe4b92818a6fd140d8933ed9ca3a889 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 23 Nov 2020 10:48:04 +0200 Subject: [PATCH 3/6] Lupdate. --- share/translations/valentina.ts | 24 ++--- share/translations/valentina_cs_CZ.ts | 16 +++- share/translations/valentina_de_DE.ts | 16 +++- share/translations/valentina_el_GR.ts | 18 ++-- share/translations/valentina_en_CA.ts | 16 +++- share/translations/valentina_en_IN.ts | 16 +++- share/translations/valentina_en_US.ts | 16 +++- share/translations/valentina_es_ES.ts | 16 +++- share/translations/valentina_fi_FI.ts | 24 ++--- share/translations/valentina_fr_FR.ts | 20 ++-- share/translations/valentina_he_IL.ts | 24 ++--- share/translations/valentina_id_ID.ts | 24 ++--- share/translations/valentina_it_IT.ts | 16 +++- share/translations/valentina_nl_NL.ts | 128 ++++++++++++++------------ share/translations/valentina_pl_PL.ts | 22 ++--- share/translations/valentina_pt_BR.ts | 16 +++- share/translations/valentina_ro_RO.ts | 24 ++--- share/translations/valentina_ru_RU.ts | 16 +++- share/translations/valentina_uk_UA.ts | 16 +++- share/translations/valentina_zh_CN.ts | 24 ++--- 20 files changed, 266 insertions(+), 226 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index b927156dc..e9bd57f01 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -3383,26 +3383,22 @@ DialogInsertNode - - Insert node - - - - Item: - - Piece: - - Uknown - - The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Delete + DialogKnownMaterials @@ -9213,10 +9209,6 @@ Do you want to save your changes? Insert node tool - - Select an item to insert - - Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index b484a30cd..0e3e2715f 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Vložit uzel + Vložit uzel Item: - Položka: + Položka: Piece: @@ -3373,12 +3373,20 @@ Uknown - Neznámý + Neznámý The list of pieces is empty. Please, first create at least one piece for current pattern piece. Seznam dílů je prázdný. Nejprve, prosím, vytvořte alespoň jeden díl pro nynější střih. + + Insert nodes + + + + Delete + Smazat + DialogKnownMaterials @@ -9011,7 +9019,7 @@ Chcete uložit své změny? Select an item to insert - Vyberte položku k vložení + Vyberte položku k vložení Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index 00d86baa2..af0971555 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Knoten einfügen + Knoten einfügen Item: - Item: + Item: Piece: @@ -3373,12 +3373,20 @@ Uknown - Unbekannt + Unbekannt The list of pieces is empty. Please, first create at least one piece for current pattern piece. Die Liste an Schnittteilen ist leer. Bitte erstellen Sie erst mindestens ein Schnittteile für das aktuelle Schnittteil. + + Insert nodes + + + + Delete + + DialogKnownMaterials @@ -9008,7 +9016,7 @@ Sollen die Änderungen gespeichert werden? Select an item to insert - Wählen Sie ein Item zum Einfügen aus + Wählen Sie ein Item zum Einfügen aus Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_el_GR.ts b/share/translations/valentina_el_GR.ts index f47d4af09..cf65e6161 100644 --- a/share/translations/valentina_el_GR.ts +++ b/share/translations/valentina_el_GR.ts @@ -3309,11 +3309,11 @@ DialogInsertNode Insert node - Εισάγετε κόμβο + Εισάγετε κόμβο Item: - Αντικείμενο: + Αντικείμενο: Piece: @@ -3321,12 +3321,20 @@ Uknown - Άγνωστο + Άγνωστο The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Διαγραφή + DialogKnownMaterials @@ -8858,10 +8866,6 @@ Do you want to save your changes? Insert node tool Εισάγετε εργαλείο κόμβου - - Select an item to insert - - Open Tape app for creating or editing measurements file Ανοίξτε την εφαρμογή Tape για δημιουργία ή διόρθωση του αρχείου μετρήσεων diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 35e22d28d..743513d6c 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Insert node + Insert node Item: - Item: + Item: Piece: @@ -3373,12 +3373,20 @@ Uknown - Uknown + Uknown The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Delete + DialogKnownMaterials @@ -9007,7 +9015,7 @@ Do you want to save your changes? Select an item to insert - Select an item to insert + Select an item to insert Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index 45eb63d21..e8bbf684d 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Insert node + Insert node Item: - Item: + Item: Piece: @@ -3373,12 +3373,20 @@ Uknown - Uknown + Uknown The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Delete + DialogKnownMaterials @@ -9007,7 +9015,7 @@ Do you want to save your changes? Select an item to insert - Select an item to insert + Select an item to insert Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 6a4b4e877..d5ae966a3 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Insert node + Insert node Item: - Item: + Item: Piece: @@ -3373,12 +3373,20 @@ Uknown - Uknown + Uknown The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Delete + DialogKnownMaterials @@ -9007,7 +9015,7 @@ Do you want to save your changes? Select an item to insert - Select an item to insert + Select an item to insert Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index 71a7f8fde..d01401264 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Inserte nodo + Inserte nodo Item: - Elemento: + Elemento: Piece: @@ -3373,12 +3373,20 @@ Uknown - Desconocido + Desconocido The list of pieces is empty. Please, first create at least one piece for current pattern piece. La lista de piezas esta vacía. Por favor, primero cree al menos una pieza para el actual patrón de piezas. + + Insert nodes + + + + Delete + + DialogKnownMaterials @@ -9009,7 +9017,7 @@ el patrón. Select an item to insert - Seleccionar un elemento para insertar + Seleccionar un elemento para insertar Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index e7b0410f6..645c10d9b 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -2943,26 +2943,22 @@ DialogInsertNode - - Insert node - - - - Item: - - Piece: - - Uknown - - The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Poista + DialogKnownMaterials @@ -8029,10 +8025,6 @@ Haluatko tallentaa muutokset? Insert node tool - - Select an item to insert - - Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 069adcb43..9260b8a76 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -3361,11 +3361,7 @@ DialogInsertNode Insert node - Insérer un noeud - - - Item: - + Insérer un noeud Piece: @@ -3373,12 +3369,20 @@ Uknown - Inconnu + Inconnu The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + + DialogKnownMaterials @@ -8998,10 +9002,6 @@ Voulez-vous sauvegarder les changements? Insert node tool - - Select an item to insert - - Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 5bc2210dc..e0994e1d4 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -2508,26 +2508,22 @@ DialogInsertNode - - Insert node - - - - Item: - - Piece: - - Uknown - - The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + למחוק + DialogKnownMaterials @@ -7054,10 +7050,6 @@ Do you want to save your changes? Insert node tool - - Select an item to insert - - Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index ffada498a..b47443237 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -2779,26 +2779,22 @@ DialogInsertNode - - Insert node - - - - Item: - - Piece: - - Uknown - - The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + hapus + DialogKnownMaterials @@ -7392,10 +7388,6 @@ Apakah anda ingin menyimpan perubahan anda? Insert node tool - - Select an item to insert - - Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 7d8a2cdc1..0aeb7ae7c 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -3353,11 +3353,11 @@ DialogInsertNode Insert node - Inserisci nodo + Inserisci nodo Item: - Strumento: + Strumento: Piece: @@ -3365,12 +3365,20 @@ Uknown - Sconosciuto + Sconosciuto The list of pieces is empty. Please, first create at least one piece for current pattern piece. La lista di pezzi è vuota. Per favore, creare almeno un pezzo per questo pezzo di modello. + + Insert nodes + + + + Delete + Elimina + DialogKnownMaterials @@ -8997,7 +9005,7 @@ Vuoi salvare i cambiamenti? Select an item to insert - Seleziona un oggetto da inserire + Seleziona un oggetto da inserire Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 415062300..33fd2f538 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -715,7 +715,7 @@ Alias: - + Alias: @@ -842,7 +842,7 @@ Alias: - + Alias: @@ -1044,7 +1044,7 @@ Alias: - + Alias: @@ -1103,7 +1103,7 @@ Alias: - + Alias: @@ -1297,11 +1297,11 @@ Alias1: - + Alias1: Alias2: - + Alias2: @@ -1388,11 +1388,11 @@ Alias1: - + Alias1: Alias2: - + Alias2: @@ -1479,11 +1479,11 @@ Alias1: - + Alias1: Alias2: - + Alias2: @@ -2342,7 +2342,7 @@ Alias: - + Alias: @@ -2687,7 +2687,7 @@ Alias: - + Alias: Pen style: @@ -2703,15 +2703,15 @@ Invalid suffix - + Ongeldig achtervoegsel Invalid group name - + Ongeldige groepsnaam Label: - + Label: Default @@ -2719,15 +2719,15 @@ Invalid point - + Ongeldig punt Invalid label - + Ongeldige label Invalid alias - + Ongeldige alias @@ -2806,7 +2806,7 @@ Alias: - + Alias: Pen style: @@ -2822,15 +2822,15 @@ Invalid suffix - + Ongeldig achtervoegsel Invalid group name - + Ongeldige groepsnaam Label: - + Label: Default @@ -2838,23 +2838,23 @@ Invalid line points - + Ongeldig lijnpunt Invalid first line point - + Ongeldig eerste lijnpunt Invalid second line point - + Ongeldig tweede lijnpunt Invalid label - + Ongeldige label Invalid alias - + Ongeldige alias @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Voeg knooppunt in + Voeg knooppunt in Item: - Item: + Item: Piece: @@ -3373,12 +3373,20 @@ Uknown - Onbekend + Onbekend The list of pieces is empty. Please, first create at least one piece for current pattern piece. De lijst van patroondelen is leeg. Gelieve ten minste één patroondeel aan te maken voor het huidig patroon. + + Insert nodes + + + + Delete + + DialogKnownMaterials @@ -4362,7 +4370,7 @@ Toch de instellingen aanpassen? Alias: - + Alias: Pen style: @@ -4378,15 +4386,15 @@ Toch de instellingen aanpassen? Invalid suffix - + Ongeldig achtervoegsel Invalid group name - + Ongeldige groepsnaam Label: - + Label: Default @@ -4394,23 +4402,23 @@ Toch de instellingen aanpassen? Invalid angle formula - + Ongeldige hoek formule Invalid rotation angle formula - + Ongeldige draaihoek formule Invalid length formula - + Ongeldige lengte formule Invalid label - + Ongeldige label Invalid alias - + Ongeldige alias @@ -6218,7 +6226,7 @@ Toch de instellingen aanpassen? Alias - + Alias Pen style: @@ -6234,35 +6242,35 @@ Toch de instellingen aanpassen? Invalid suffix - + Ongeldig achtervoegsel Invalid group name - + Ongeldige groepsnaam Invalid rotation point - + Ongeldig draaipunt Invalid label - + Ongeldige label Invalid alias - + Ongeldige alias Invalid angle formula - + Ongeldige hoek formule Label: - + Label: Alias: - + Alias: Default @@ -7091,7 +7099,7 @@ Toch de instellingen aanpassen? Alias: - + Alias: @@ -7250,7 +7258,7 @@ Toch de instellingen aanpassen? Alias: - + Alias: @@ -7839,7 +7847,7 @@ Toch de instellingen aanpassen? Formula warning: %1. Program will be terminated. - + Formule waarschuwing: %1. Programma wordt gestopt. @@ -9008,7 +9016,7 @@ Do you want to save your changes? Select an item to insert - Selecteer een item om in te voegen + Selecteer een item om in te voegen Open Tape app for creating or editing measurements file @@ -10462,7 +10470,7 @@ Deze optie wordt actief na een herstart.. Cannot get tokens from formula '%1'. Formula error: %2. - + Kan geen teken van de formule '%1' verkrijgen. Formule fout: %2. @@ -12649,7 +12657,7 @@ Wil je deze veranderingen opslaan? default - + standaardwaarde @@ -12823,7 +12831,7 @@ Wil je deze veranderingen opslaan? Formula warning: %1. Program will be terminated. - + Formule waarschuwing: %1. Programma wordt gestopt. @@ -15121,15 +15129,15 @@ Wil je deze veranderingen opslaan? Alias: - + Alias: Alias1: - + Alias1: Alias2: - + Alias2: @@ -16762,12 +16770,12 @@ Wil je deze veranderingen opslaan? warning Calculation warning - + waarschuwing Show a warning in calculations function warning - + Toon een waarschuwing in berekeningen diff --git a/share/translations/valentina_pl_PL.ts b/share/translations/valentina_pl_PL.ts index 414811858..6e3553ed2 100644 --- a/share/translations/valentina_pl_PL.ts +++ b/share/translations/valentina_pl_PL.ts @@ -3143,26 +3143,26 @@ DialogInsertNode - - Insert node - - - - Item: - - Piece: Uknown - Nieznany + Nieznany The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Usuń + DialogKnownMaterials @@ -8094,10 +8094,6 @@ Do you want to save your changes? Insert node tool - - Select an item to insert - - Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index 56d86514b..9fccdaf41 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Inserir nó + Inserir nó Item: - Item: + Item: Piece: @@ -3373,12 +3373,20 @@ Uknown - Desconhecido + Desconhecido The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Excluir + DialogKnownMaterials @@ -9001,7 +9009,7 @@ Você quer salvar suas mudanças? Select an item to insert - Selecione um item para inserir + Selecione um item para inserir Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 8232f541c..0dc6c4030 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -3112,26 +3112,22 @@ DialogInsertNode - - Insert node - - - - Item: - - Piece: - - Uknown - - The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Șterge + DialogKnownMaterials @@ -8063,10 +8059,6 @@ Do you want to save your changes? Insert node tool - - Select an item to insert - - Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 1b1ebd893..22a2b5c05 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Вставить узел + Вставить узел Item: - Объект: + Объект: Piece: @@ -3373,12 +3373,20 @@ Uknown - Неизвестное + Неизвестное The list of pieces is empty. Please, first create at least one piece for current pattern piece. Список пуст. Пожалуйста, создайте хотя бы одну фигуру для текущей детали выкройки. + + Insert nodes + + + + Delete + Удалить + DialogKnownMaterials @@ -9010,7 +9018,7 @@ Do you want to save your changes? Select an item to insert - Выберите объект для вставки + Выберите объект для вставки Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 82340c88f..6bca1d993 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -3361,11 +3361,11 @@ DialogInsertNode Insert node - Вставити вузол + Вставити вузол Item: - Обєкт: + Обєкт: Piece: @@ -3373,12 +3373,20 @@ Uknown - Невідоме + Невідоме The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + Видалити + DialogKnownMaterials @@ -9008,7 +9016,7 @@ Do you want to save your changes? Select an item to insert - Виберіть обєкт для вставки + Виберіть обєкт для вставки Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index 9af1bdc25..f73c0146f 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -2660,26 +2660,22 @@ DialogInsertNode - - Insert node - - - - Item: - - Piece: - - Uknown - - The list of pieces is empty. Please, first create at least one piece for current pattern piece. + + Insert nodes + + + + Delete + 删除 + DialogKnownMaterials @@ -7176,10 +7172,6 @@ Do you want to save your changes? Insert node tool - - Select an item to insert - - Open Tape app for creating or editing measurements file From 76f195121eaf895256c0daf598290e4aa0c9a6e2 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 23 Nov 2020 10:48:58 +0200 Subject: [PATCH 4/6] Bump version. --- ChangeLog.txt | 2 +- appveyor.yml | 2 +- dist/OBS_debian/debian.changelog | 4 ++-- dist/debian/changelog | 4 ++-- dist/macx/tape/Info.plist | 4 ++-- dist/macx/valentina/Info.plist | 4 ++-- dist/rpm/_service | 2 +- dist/rpm/valentina.spec | 2 +- dist/valentina.dsc | 8 ++++---- share/bintray.json | 6 +++--- src/libs/vmisc/projectversion.cpp | 2 +- src/libs/vmisc/projectversion.h | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 528147fa0..91c025c5e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,4 @@ -# Version 0.7.40 (unreleased) +# Version 0.7.40 Nov 23, 2020 - New function Warning. - [smart-pattern/valentina#80] Allow insertion of multiple nodes. - [smart-pattern/valentina#81] Tape crash on opening. diff --git a/appveyor.yml b/appveyor.yml index 4fb19e9fb..1bb07c3f5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -258,7 +258,7 @@ deploy: package: valentina-win_auto-upload publish: true override: true - version: 0.7.39 + version: 0.7.40 on: DEPLOY: true artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT) diff --git a/dist/OBS_debian/debian.changelog b/dist/OBS_debian/debian.changelog index 6d4012767..edd174349 100644 --- a/dist/OBS_debian/debian.changelog +++ b/dist/OBS_debian/debian.changelog @@ -1,5 +1,5 @@ -valentina (0.7.39) trusty; urgency=low +valentina (0.7.40) trusty; urgency=low * Auto build. - -- dismine Thu, 17 Nov 2020 16:30:00 +0300 + -- dismine Mon, 23 Nov 2020 16:30:00 +0300 diff --git a/dist/debian/changelog b/dist/debian/changelog index 6d4012767..edd174349 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,5 +1,5 @@ -valentina (0.7.39) trusty; urgency=low +valentina (0.7.40) trusty; urgency=low * Auto build. - -- dismine Thu, 17 Nov 2020 16:30:00 +0300 + -- dismine Mon, 23 Nov 2020 16:30:00 +0300 diff --git a/dist/macx/tape/Info.plist b/dist/macx/tape/Info.plist index c9f820da0..c1d416b42 100755 --- a/dist/macx/tape/Info.plist +++ b/dist/macx/tape/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier io.bitbucket.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.7.39 + 0.7.40 CFBundleVersion - 0.7.39.0 + 0.7.40.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/macx/valentina/Info.plist b/dist/macx/valentina/Info.plist index 0278316c8..ec361f021 100755 --- a/dist/macx/valentina/Info.plist +++ b/dist/macx/valentina/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier io.bitbucket.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.7.39 + 0.7.40 CFBundleVersion - 0.7.39.0 + 0.7.40.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/rpm/_service b/dist/rpm/_service index 93aee5dd8..e371343cc 100644 --- a/dist/rpm/_service +++ b/dist/rpm/_service @@ -1,7 +1,7 @@ git://github.com/dismine/Valentina_git.git - 0.7.39 + 0.7.40 valentina git .git diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index be5462663..82cb728b0 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -91,7 +91,7 @@ Requires: poppler-tools Requires: poppler-utils %endif -Version: 0.7.39 +Version: 0.7.40 Release: 0 URL: https://gitlab.com/smart-pattern/valentina License: GPL-3.0+ diff --git a/dist/valentina.dsc b/dist/valentina.dsc index fd71edb9b..ea0093594 100644 --- a/dist/valentina.dsc +++ b/dist/valentina.dsc @@ -2,7 +2,7 @@ Format: 3.0 (native) Source: valentina Binary: valentina Architecture: i386 amd64 -Version: 0.7.39 +Version: 0.7.40 Maintainer: Roman Telezhynskyi Homepage: https://valentinaproject.bitbucket.io Standards-Version: 3.9.5 @@ -18,8 +18,8 @@ Build-Depends: debhelper (>= 8.0.0), Package-List: valentina deb graphics optional Checksums-Sha1: - 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.39.tar + 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.40.tar Checksums-Sha256: - 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.39.tar + 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.40.tar Files: - 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.39.tar + 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.40.tar diff --git a/share/bintray.json b/share/bintray.json index 89f47e01f..95e7731a9 100644 --- a/share/bintray.json +++ b/share/bintray.json @@ -15,10 +15,10 @@ }, "version": { - "name": "0.7.39", + "name": "0.7.40", "desc": "Test branch release", - "released": "2020-11-17", - "vcs_tag": "v0.7.39", + "released": "2020-11-23", + "vcs_tag": "v0.7.40", "gpgSign": false }, diff --git a/src/libs/vmisc/projectversion.cpp b/src/libs/vmisc/projectversion.cpp index 867a956b1..448a121c3 100644 --- a/src/libs/vmisc/projectversion.cpp +++ b/src/libs/vmisc/projectversion.cpp @@ -42,7 +42,7 @@ extern const int MAJOR_VERSION = 0; extern const int MINOR_VERSION = 7; -extern const int DEBUG_VERSION = 39; +extern const int DEBUG_VERSION = 40; extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION) .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE)); diff --git a/src/libs/vmisc/projectversion.h b/src/libs/vmisc/projectversion.h index 890a5766f..eb6e33253 100644 --- a/src/libs/vmisc/projectversion.h +++ b/src/libs/vmisc/projectversion.h @@ -49,8 +49,8 @@ extern const QString APP_VERSION_STR; // Change version number in projectversion.cpp too. // Synchronize valentina.nsi -#define VER_FILEVERSION 0,7,39 -#define VER_FILEVERSION_STR "0.7.39\0" +#define VER_FILEVERSION 0,7,40 +#define VER_FILEVERSION_STR "0.7.40\0" #define V_PRERELEASE // Mark prerelease builds From ce94d0747df9caea23dcb2b96ba906e5dde9e419 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 23 Nov 2020 17:38:25 +0200 Subject: [PATCH 5/6] Lupdate. --- share/translations/valentina.ts | 4 ++++ share/translations/valentina_cs_CZ.ts | 22 +++++----------------- share/translations/valentina_de_DE.ts | 22 +++++----------------- share/translations/valentina_el_GR.ts | 18 +++++------------- share/translations/valentina_en_CA.ts | 22 +++++----------------- share/translations/valentina_en_IN.ts | 22 +++++----------------- share/translations/valentina_en_US.ts | 22 +++++----------------- share/translations/valentina_es_ES.ts | 22 +++++----------------- share/translations/valentina_fi_FI.ts | 6 +++++- share/translations/valentina_fr_FR.ts | 14 +++++--------- share/translations/valentina_he_IL.ts | 4 ++++ share/translations/valentina_id_ID.ts | 4 ++++ share/translations/valentina_it_IT.ts | 22 +++++----------------- share/translations/valentina_nl_NL.ts | 22 +++++----------------- share/translations/valentina_pl_PL.ts | 10 +++++----- share/translations/valentina_pt_BR.ts | 22 +++++----------------- share/translations/valentina_ro_RO.ts | 6 +++++- share/translations/valentina_ru_RU.ts | 22 +++++----------------- share/translations/valentina_uk_UA.ts | 22 +++++----------------- share/translations/valentina_zh_CN.ts | 4 ++++ src/libs/fervor/fvupdatewindow.cpp | 2 +- 21 files changed, 97 insertions(+), 217 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index e9bd57f01..a3594891f 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -7854,6 +7854,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index 0e3e2715f..1dc68efd4 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Vložit uzel - - - Item: - Položka: - Piece: Díl: - - Uknown - Neznámý - The list of pieces is empty. Please, first create at least one piece for current pattern piece. Seznam dílů je prázdný. Nejprve, prosím, vytvořte alespoň jeden díl pro nynější střih. @@ -3385,7 +3373,7 @@ Delete - Smazat + Smazat @@ -7662,6 +7650,10 @@ Přesto použít nastavení? %1 update is available! Je dostupná aktualizace %1! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9017,10 +9009,6 @@ Chcete uložit své změny? Insert node tool Nástroj Vložit uzel - - Select an item to insert - Vyberte položku k vložení - Open Tape app for creating or editing measurements file Otevřít program Tape pro vytvoření nebo upravení souboru s rozměry diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index af0971555..3fe121b9a 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Knoten einfügen - - - Item: - Item: - Piece: Stück: - - Uknown - Unbekannt - The list of pieces is empty. Please, first create at least one piece for current pattern piece. Die Liste an Schnittteilen ist leer. Bitte erstellen Sie erst mindestens ein Schnittteile für das aktuelle Schnittteil. @@ -3385,7 +3373,7 @@ Delete - + Entfernen @@ -7659,6 +7647,10 @@ Einstellungen trotzdem anwenden? %1 update is available! %1 Update ist verfügbar! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9014,10 +9006,6 @@ Sollen die Änderungen gespeichert werden? Insert node tool Knoten einfügen Werkzeug - - Select an item to insert - Wählen Sie ein Item zum Einfügen aus - Open Tape app for creating or editing measurements file Öffnen der Tape App um ein Maß-Datei anzulegen oder zu ändern diff --git a/share/translations/valentina_el_GR.ts b/share/translations/valentina_el_GR.ts index cf65e6161..f35b5e882 100644 --- a/share/translations/valentina_el_GR.ts +++ b/share/translations/valentina_el_GR.ts @@ -3307,22 +3307,10 @@ DialogInsertNode - - Insert node - Εισάγετε κόμβο - - - Item: - Αντικείμενο: - Piece: Κομμάτι: - - Uknown - Άγνωστο - The list of pieces is empty. Please, first create at least one piece for current pattern piece. @@ -3333,7 +3321,7 @@ Delete - Διαγραφή + Διαγραφή @@ -7563,6 +7551,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 743513d6c..d5af7c07c 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Insert node - - - Item: - Item: - Piece: Piece: - - Uknown - Uknown - The list of pieces is empty. Please, first create at least one piece for current pattern piece. @@ -3385,7 +3373,7 @@ Delete - Delete + Delete @@ -7658,6 +7646,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9013,10 +9005,6 @@ Do you want to save your changes? Insert node tool Insert node tool - - Select an item to insert - Select an item to insert - Open Tape app for creating or editing measurements file Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index e8bbf684d..876e12338 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Insert node - - - Item: - Item: - Piece: Piece: - - Uknown - Uknown - The list of pieces is empty. Please, first create at least one piece for current pattern piece. @@ -3385,7 +3373,7 @@ Delete - Delete + Delete @@ -7658,6 +7646,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9013,10 +9005,6 @@ Do you want to save your changes? Insert node tool Insert node tool - - Select an item to insert - Select an item to insert - Open Tape app for creating or editing measurements file Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index d5ae966a3..a53b50993 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Insert node - - - Item: - Item: - Piece: Piece: - - Uknown - Uknown - The list of pieces is empty. Please, first create at least one piece for current pattern piece. @@ -3385,7 +3373,7 @@ Delete - Delete + Delete @@ -7658,6 +7646,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9013,10 +9005,6 @@ Do you want to save your changes? Insert node tool Insert node tool - - Select an item to insert - Select an item to insert - Open Tape app for creating or editing measurements file Open Tape app for creating or editing measurements file diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index d01401264..1d8fabc46 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Inserte nodo - - - Item: - Elemento: - Piece: Pieza: - - Uknown - Desconocido - The list of pieces is empty. Please, first create at least one piece for current pattern piece. La lista de piezas esta vacía. Por favor, primero cree al menos una pieza para el actual patrón de piezas. @@ -3385,7 +3373,7 @@ Delete - + Borrar @@ -7659,6 +7647,10 @@ Aplicar características de todos modos? %1 update is available! ¡%1 actualización esta disponible! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9015,10 +9007,6 @@ el patrón. Insert node tool Insertar herramienta nodo - - Select an item to insert - Seleccionar un elemento para insertar - Open Tape app for creating or editing measurements file Abrir aplicación Tape para crear o editar archivo de medidas diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index 645c10d9b..dd37a34e8 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -2957,7 +2957,7 @@ Delete - Poista + Poista @@ -6891,6 +6891,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 9260b8a76..1c5b61071 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -3359,18 +3359,10 @@ DialogInsertNode - - Insert node - Insérer un noeud - Piece: Pièce: - - Uknown - Inconnu - The list of pieces is empty. Please, first create at least one piece for current pattern piece. @@ -3381,7 +3373,7 @@ Delete - + Effacer @@ -7651,6 +7643,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index e0994e1d4..a984c2e62 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -6021,6 +6021,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index b47443237..a6f3cfa77 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -6358,6 +6358,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 0aeb7ae7c..a21d248cf 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -3351,22 +3351,10 @@ DialogInsertNode - - Insert node - Inserisci nodo - - - Item: - Strumento: - Piece: Pezzo: - - Uknown - Sconosciuto - The list of pieces is empty. Please, first create at least one piece for current pattern piece. La lista di pezzi è vuota. Per favore, creare almeno un pezzo per questo pezzo di modello. @@ -3377,7 +3365,7 @@ Delete - Elimina + Elimina @@ -7652,6 +7640,10 @@ Applicare la configurazione comunque? %1 update is available! %1 un aggiornamento è disponibile! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9003,10 +8995,6 @@ Vuoi salvare i cambiamenti? Insert node tool Inserisci nodo - - Select an item to insert - Seleziona un oggetto da inserire - Open Tape app for creating or editing measurements file Apri Tape per creare o modificare un file di misure diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 33fd2f538..b8796e3fb 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Voeg knooppunt in - - - Item: - Item: - Piece: Onderdeel: - - Uknown - Onbekend - The list of pieces is empty. Please, first create at least one piece for current pattern piece. De lijst van patroondelen is leeg. Gelieve ten minste één patroondeel aan te maken voor het huidig patroon. @@ -3385,7 +3373,7 @@ Delete - + Verwijder @@ -7660,6 +7648,10 @@ Toch de instellingen aanpassen? %1 update is available! %1 bijwerking is beschikbaar! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9014,10 +9006,6 @@ Do you want to save your changes? Insert node tool Voeg knooppunt toe - - Select an item to insert - Selecteer een item om in te voegen - Open Tape app for creating or editing measurements file Open de Tape app om een matenbestand te wijzigen of aan te maken diff --git a/share/translations/valentina_pl_PL.ts b/share/translations/valentina_pl_PL.ts index 6e3553ed2..f2e2c0459 100644 --- a/share/translations/valentina_pl_PL.ts +++ b/share/translations/valentina_pl_PL.ts @@ -3147,10 +3147,6 @@ Piece: - - Uknown - Nieznany - The list of pieces is empty. Please, first create at least one piece for current pattern piece. @@ -3161,7 +3157,7 @@ Delete - Usuń + Usuń @@ -6969,6 +6965,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index 9fccdaf41..b5dd48dd2 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Inserir nó - - - Item: - Item: - Piece: Peça: - - Uknown - Desconhecido - The list of pieces is empty. Please, first create at least one piece for current pattern piece. @@ -3385,7 +3373,7 @@ Delete - Excluir + Excluir @@ -7652,6 +7640,10 @@ Aplicar configurações de qualquer forma? %1 update is available! %1 atualização está disponível! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9007,10 +8999,6 @@ Você quer salvar suas mudanças? Insert node tool Inserir ferramenta de nó - - Select an item to insert - Selecione um item para inserir - Open Tape app for creating or editing measurements file Abrir aplicativo Tape para criar ou editar arquivos de medidas diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 0dc6c4030..047f1fedc 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -3126,7 +3126,7 @@ Delete - Șterge + Șterge @@ -6946,6 +6946,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 22a2b5c05..ce7d48c7e 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Вставить узел - - - Item: - Объект: - Piece: Деталь: - - Uknown - Неизвестное - The list of pieces is empty. Please, first create at least one piece for current pattern piece. Список пуст. Пожалуйста, создайте хотя бы одну фигуру для текущей детали выкройки. @@ -3385,7 +3373,7 @@ Delete - Удалить + Удалить @@ -7662,6 +7650,10 @@ Apply settings anyway? %1 update is available! %1 обновление доступно! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9016,10 +9008,6 @@ Do you want to save your changes? Insert node tool Инструмент Вставить узел - - Select an item to insert - Выберите объект для вставки - Open Tape app for creating or editing measurements file Открыть программу Tape для создания или редактирования файла мерок diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 6bca1d993..578ca754c 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -3359,22 +3359,10 @@ DialogInsertNode - - Insert node - Вставити вузол - - - Item: - Обєкт: - Piece: Деталь: - - Uknown - Невідоме - The list of pieces is empty. Please, first create at least one piece for current pattern piece. @@ -3385,7 +3373,7 @@ Delete - Видалити + Видалити @@ -7660,6 +7648,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater @@ -9014,10 +9006,6 @@ Do you want to save your changes? Insert node tool Інструмент вставка вузла - - Select an item to insert - Виберіть обєкт для вставки - Open Tape app for creating or editing measurements file Відкрити програму Tape для створення чи редагування файлу мірок diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index f73c0146f..a4417e12a 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -6139,6 +6139,10 @@ Apply settings anyway? %1 update is available! + + New %1 test version is now available. Would you like to download it now? + + FvUpdater diff --git a/src/libs/fervor/fvupdatewindow.cpp b/src/libs/fervor/fvupdatewindow.cpp index d51b9c14a..1746c3ed6 100644 --- a/src/libs/fervor/fvupdatewindow.cpp +++ b/src/libs/fervor/fvupdatewindow.cpp @@ -70,7 +70,7 @@ bool FvUpdateWindow::UpdateWindowWithCurrentProposedUpdate() QString downloadString; if (FvUpdater::IsTestBuild()) { - downloadString = QString("New %1 test build is now available. Would you like to download it now?") + downloadString = tr("New %1 test version is now available. Would you like to download it now?") .arg(QGuiApplication::applicationDisplayName()); } else From 1539abaf4d905653cb746cd9919640990c3196ab Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 24 Nov 2020 13:28:42 +0200 Subject: [PATCH 6/6] Fix hiding inserted node in a pattern piece after its removal. --- ChangeLog.txt | 3 +++ src/libs/vtools/tools/vtoolseamallowance.cpp | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 91c025c5e..2a4a53921 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,6 @@ +# Version 0.7.41 (unreleased) +- Bug fixes. + # Version 0.7.40 Nov 23, 2020 - New function Warning. - [smart-pattern/valentina#80] Allow insertion of multiple nodes. diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index bc50f87c0..db6f8e333 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -1788,7 +1788,6 @@ void VToolSeamAllowance::InitNode(const VPieceNode &node, VMainGraphicsScene *sc tool->setParentItem(parent); tool->SetParentType(ParentType::Item); tool->SetExluded(node.IsExcluded()); - doc->IncrementReferens(node.GetId()); } tool->setVisible(not node.IsExcluded());//Hide excluded point break; @@ -1797,7 +1796,7 @@ void VToolSeamAllowance::InitNode(const VPieceNode &node, VMainGraphicsScene *sc case (Tool::NodeElArc): case (Tool::NodeSpline): case (Tool::NodeSplinePath): - doc->IncrementReferens(data->GetGObject(node.GetId())->getIdTool()); + // Do nothing break; default: qDebug()<<"Get wrong tool type. Ignore.";