diff --git a/ChangeLog.txt b/ChangeLog.txt index a505b4469..928d35d93 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,7 @@ -# Version 0.7.37 (unreleased) +# Version 0.7.38 Nov 12, 2020 +- Bug fixes. + +# Version 0.7.37 Nov 11, 2020 - Fix Tape crash on Mac OS X. - Fix issue in VAbstractCurve::CurveIntersectAxis. - Improve editing a spline path through control points for locked angles. diff --git a/appveyor.yml b/appveyor.yml index 2488ff2b3..967bc88e6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -258,7 +258,7 @@ deploy: package: valentina-win_auto-upload publish: true override: true - version: 0.7.36 + version: 0.7.38 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 384fbf8ed..f1462eed1 100644 --- a/dist/OBS_debian/debian.changelog +++ b/dist/OBS_debian/debian.changelog @@ -1,5 +1,5 @@ -valentina (0.7.36) trusty; urgency=low +valentina (0.7.38) trusty; urgency=low * Auto build. - -- dismine Sat, 24 Oct 2020 12:27:00 +0300 + -- dismine Thu, 12 Nov 2020 16:30:00 +0300 diff --git a/dist/debian/changelog b/dist/debian/changelog index 384fbf8ed..f1462eed1 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,5 +1,5 @@ -valentina (0.7.36) trusty; urgency=low +valentina (0.7.38) trusty; urgency=low * Auto build. - -- dismine Sat, 24 Oct 2020 12:27:00 +0300 + -- dismine Thu, 12 Nov 2020 16:30:00 +0300 diff --git a/dist/macx/tape/Info.plist b/dist/macx/tape/Info.plist index 2fd5c2196..4b6bbcff9 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.36 + 0.7.38 CFBundleVersion - 0.7.36.0 + 0.7.38.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/macx/valentina/Info.plist b/dist/macx/valentina/Info.plist index ddedf49e9..2b28a3b12 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.36 + 0.7.38 CFBundleVersion - 0.7.36.0 + 0.7.38.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/rpm/_service b/dist/rpm/_service index f7342140b..a7a5e5d46 100644 --- a/dist/rpm/_service +++ b/dist/rpm/_service @@ -1,7 +1,7 @@ git://github.com/dismine/Valentina_git.git - 0.7.36 + 0.7.38 valentina git .git diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index b7508a2ef..cd6e3f0b0 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.36 +Version: 0.7.38 Release: 0 URL: https://gitlab.com/smart-pattern/valentina License: GPL-3.0+ diff --git a/dist/valentina.dsc b/dist/valentina.dsc index 8a617e86a..f62afb612 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.36 +Version: 0.7.38 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.36.tar + 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.38.tar Checksums-Sha256: - 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.36.tar + 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.38.tar Files: - 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.36.tar + 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.38.tar diff --git a/share/bintray.json b/share/bintray.json index bb6a06cac..58ac90717 100644 --- a/share/bintray.json +++ b/share/bintray.json @@ -15,10 +15,10 @@ }, "version": { - "name": "0.7.36", + "name": "0.7.38", "desc": "Test branch release", - "released": "2020-10-24", - "vcs_tag": "v0.7.36", + "released": "2020-11-12", + "vcs_tag": "v0.7.38", "gpgSign": false }, diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index 9ea7301f0..11ffdbb4d 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -2695,11 +2695,11 @@ Pen style: - Styl pera: + Styl pera: Color: - Barva: + Barva: Ready @@ -2723,7 +2723,7 @@ Default - Výchozí + Výchozí Invalid point @@ -2814,11 +2814,11 @@ Pen style: - Styl pera: + Styl pera: Color: - Barva: + Barva: Ready @@ -2842,7 +2842,7 @@ Default - Výchozí + Výchozí Invalid line points @@ -4370,11 +4370,11 @@ Přesto použít nastavení? Pen style: - Styl pera: + Styl pera: Color: - Barva: + Barva: Ready @@ -4398,7 +4398,7 @@ Přesto použít nastavení? Default - Výchozí + Výchozí Invalid angle formula @@ -6231,11 +6231,11 @@ Přesto použít nastavení? Pen style: - Styl pera: + Styl pera: Color: - Barva: + Barva: Ready @@ -6279,7 +6279,7 @@ Přesto použít nastavení? Default - Výchozí + Výchozí diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index a83b905e2..fe5a33ed8 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -2695,11 +2695,11 @@ Pen style: - Zeichenstil: + Zeichenstil: Color: - Farbe: + Farbe: Ready @@ -2723,7 +2723,7 @@ Default - Standard + Standard Invalid point @@ -2814,11 +2814,11 @@ Pen style: - Zeichenstil: + Zeichenstil: Color: - Farbe: + Farbe: Ready @@ -2842,7 +2842,7 @@ Default - Standard + Standard Invalid line points @@ -4369,11 +4369,11 @@ Einstellungen trotzdem anwenden? Pen style: - Zeichenstil: + Zeichenstil: Color: - Farbe: + Farbe: Ready @@ -4397,7 +4397,7 @@ Einstellungen trotzdem anwenden? Default - Standard + Standard Invalid angle formula @@ -6229,11 +6229,11 @@ Einstellungen trotzdem anwenden? Pen style: - Zeichenstil: + Zeichenstil: Color: - Farbe: + Farbe: Ready @@ -6277,7 +6277,7 @@ Einstellungen trotzdem anwenden? Default - Standard + Standard diff --git a/share/translations/valentina_el_GR.ts b/share/translations/valentina_el_GR.ts index d1cf8316d..7b5318a63 100644 --- a/share/translations/valentina_el_GR.ts +++ b/share/translations/valentina_el_GR.ts @@ -2651,11 +2651,11 @@ Pen style: - Στυλ μαρκαδόρου: + Στυλ μαρκαδόρου: Color: - Χρώμα: + Χρώμα: Ready @@ -2679,7 +2679,7 @@ Default - Προεπιλογή + Προεπιλογή Invalid point @@ -2770,11 +2770,11 @@ Pen style: - Στυλ μαρκαδόρου: + Στυλ μαρκαδόρου: Color: - Χρώμα: + Χρώμα: Ready @@ -2798,7 +2798,7 @@ Default - Προεπιλογή + Προεπιλογή Invalid line points @@ -4297,11 +4297,11 @@ Apply settings anyway? Pen style: - Στυλ μαρκαδόρου: + Στυλ μαρκαδόρου: Color: - Χρώμα: + Χρώμα: Ready @@ -4325,7 +4325,7 @@ Apply settings anyway? Default - Προεπιλογή + Προεπιλογή Invalid angle formula @@ -6141,11 +6141,11 @@ Apply settings anyway? Pen style: - Στυλ μαρκαδόρου: + Στυλ μαρκαδόρου: Color: - Χρώμα: + Χρώμα: Ready @@ -6189,7 +6189,7 @@ Apply settings anyway? Default - Προεπιλογή + Προεπιλογή diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index d39b0e43d..a263a3cd9 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -2695,11 +2695,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2723,7 +2723,7 @@ Default - Default + Default Invalid point @@ -2814,11 +2814,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2842,7 +2842,7 @@ Default - Default + Default Invalid line points @@ -4368,11 +4368,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -4396,7 +4396,7 @@ Apply settings anyway? Default - Default + Default Invalid angle formula @@ -6224,11 +6224,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -6272,7 +6272,7 @@ Apply settings anyway? Default - Default + Default diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index e8e8793e5..88f5aa539 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -2695,11 +2695,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2723,7 +2723,7 @@ Default - Default + Default Invalid point @@ -2814,11 +2814,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2842,7 +2842,7 @@ Default - Default + Default Invalid line points @@ -4368,11 +4368,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -4396,7 +4396,7 @@ Apply settings anyway? Default - Default + Default Invalid angle formula @@ -6224,11 +6224,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -6272,7 +6272,7 @@ Apply settings anyway? Default - Default + Default diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 9b1f79998..2aa5d6110 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -2695,11 +2695,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2723,7 +2723,7 @@ Default - Default + Default Invalid point @@ -2814,11 +2814,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2842,7 +2842,7 @@ Default - Default + Default Invalid line points @@ -4368,11 +4368,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -4396,7 +4396,7 @@ Apply settings anyway? Default - Default + Default Invalid angle formula @@ -6224,11 +6224,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -6272,7 +6272,7 @@ Apply settings anyway? Default - Default + Default diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index d27623e13..d31877e54 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -2695,15 +2695,15 @@ Pen style: - Estilo lápiz: + Estilo lápiz: Color: - Color: + Color: Ready - + Listo Notes @@ -2723,7 +2723,7 @@ Default - + Predeterminado Invalid point @@ -2814,15 +2814,15 @@ Pen style: - Estilo lápiz: + Estilo lápiz: Color: - Color: + Color: Ready - + Listo Notes @@ -2842,7 +2842,7 @@ Default - + Predeterminado Invalid line points @@ -4369,15 +4369,15 @@ Aplicar características de todos modos? Pen style: - Estilo lápiz: + Estilo lápiz: Color: - Color: + Color: Ready - + Listo Notes @@ -4397,7 +4397,7 @@ Aplicar características de todos modos? Default - + Predeterminado Invalid angle formula @@ -6229,15 +6229,15 @@ Aplicar características de todos modos? Pen style: - Estilo lápiz: + Estilo lápiz: Color: - Color: + Color: Ready - + Listo Notes @@ -6277,7 +6277,7 @@ Aplicar características de todos modos? Default - + Predeterminado diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index bdf2c4e6a..bf0f96611 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -2335,7 +2335,7 @@ Default - Oletus + Oletus Invalid point @@ -2450,7 +2450,7 @@ Default - Oletus + Oletus Invalid line points @@ -3893,7 +3893,7 @@ Apply settings anyway? Default - Oletus + Oletus Invalid angle formula @@ -5621,7 +5621,7 @@ Apply settings anyway? Default - Oletus + Oletus diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 0d17f2ee5..345ab918e 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -2695,11 +2695,11 @@ Pen style: - Style de stylo: + Style de stylo: Color: - + Couleur : Ready @@ -2723,7 +2723,7 @@ Default - + Défaut Invalid point @@ -2814,11 +2814,11 @@ Pen style: - Style de stylo: + Style de stylo: Color: - + Couleur : Ready @@ -2842,7 +2842,7 @@ Default - + Défaut Invalid line points @@ -4365,11 +4365,11 @@ Apply settings anyway? Pen style: - Style de stylo: + Style de stylo: Color: - + Couleur : Ready @@ -4393,7 +4393,7 @@ Apply settings anyway? Default - + Défaut Invalid angle formula @@ -6221,11 +6221,11 @@ Apply settings anyway? Pen style: - Style de stylo: + Style de stylo: Color: - + Couleur : Ready @@ -6269,7 +6269,7 @@ Apply settings anyway? Default - + Défaut diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 971bde5a1..9ebbaf0ec 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -2687,11 +2687,11 @@ Pen style: - Stile di penna: + Stile penna: Color: - Colore: + Colore: Ready @@ -2715,7 +2715,7 @@ Default - Default + Default Invalid point @@ -2806,11 +2806,11 @@ Pen style: - Stile di penna: + Stile penna: Color: - Colore: + Colore: Ready @@ -2834,7 +2834,7 @@ Default - Default + Default Invalid line points @@ -4362,11 +4362,11 @@ Applicare la configurazione comunque? Pen style: - Stile di penna: + Stile penna: Color: - Colore: + Colore: Ready @@ -4390,7 +4390,7 @@ Applicare la configurazione comunque? Default - Default + Default Invalid angle formula @@ -6222,11 +6222,11 @@ Applicare la configurazione comunque? Pen style: - Stile di penna: + Stile penna: Color: - Colore: + Colore: Ready @@ -6270,7 +6270,7 @@ Applicare la configurazione comunque? Default - Default + Default diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 38385889c..ceb1481f0 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -2695,15 +2695,15 @@ Pen style: - Pen stijl: + Pen stijl: Color: - Kleur: + Kleur: Ready - + Klaar Notes @@ -2723,7 +2723,7 @@ Default - + Standaard Invalid point @@ -2814,15 +2814,15 @@ Pen style: - Pen stijl: + Pen stijl: Color: - Kleur: + Kleur: Ready - + Klaar Notes @@ -2842,7 +2842,7 @@ Default - + Standaard Invalid line points @@ -4370,15 +4370,15 @@ Toch de instellingen aanpassen? Pen style: - Pen stijl: + Pen stijl: Color: - Kleur: + Kleur: Ready - + Klaar Notes @@ -4398,7 +4398,7 @@ Toch de instellingen aanpassen? Default - + Standaard Invalid angle formula @@ -6230,15 +6230,15 @@ Toch de instellingen aanpassen? Pen style: - Pen stijl: + Pen stijl: Color: - Kleur: + Kleur: Ready - + Klaar Notes @@ -6278,7 +6278,7 @@ Toch de instellingen aanpassen? Default - + Standaard diff --git a/share/translations/valentina_pl_PL.ts b/share/translations/valentina_pl_PL.ts index 127c3f5c3..4c87dd1c0 100644 --- a/share/translations/valentina_pl_PL.ts +++ b/share/translations/valentina_pl_PL.ts @@ -2511,11 +2511,11 @@ Pen style: - Styl pióra: + Styl pióra: Color: - Kolor: + Kolor: Ready @@ -2539,7 +2539,7 @@ Default - Domyślny + Domyślny Invalid point @@ -2630,11 +2630,11 @@ Pen style: - Styl pióra: + Styl pióra: Color: - Kolor: + Kolor: Ready @@ -2658,7 +2658,7 @@ Default - Domyślny + Domyślny Invalid line points @@ -4049,11 +4049,11 @@ Apply settings anyway? Pen style: - Styl pióra: + Styl pióra: Color: - Kolor: + Kolor: Ready @@ -4077,7 +4077,7 @@ Apply settings anyway? Default - Domyślny + Domyślny Invalid angle formula @@ -5706,11 +5706,11 @@ Apply settings anyway? Pen style: - Styl pióra: + Styl pióra: Color: - Kolor: + Kolor: Ready @@ -5754,7 +5754,7 @@ Apply settings anyway? Default - Domyślny + Domyślny diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index 3d6e2eec5..a471b291f 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -2695,11 +2695,11 @@ Pen style: - Estilo Caneta: + Estilo Caneta: Color: - Cor: + Cor: Ready @@ -2723,7 +2723,7 @@ Default - Padrão + Padrão Invalid point @@ -2814,11 +2814,11 @@ Pen style: - Estilo Caneta: + Estilo Caneta: Color: - Cor: + Cor: Ready @@ -2842,7 +2842,7 @@ Default - Padrão + Padrão Invalid line points @@ -4366,11 +4366,11 @@ Aplicar configurações de qualquer forma? Pen style: - Estilo Caneta: + Estilo Caneta: Color: - Cor: + Cor: Ready @@ -4394,7 +4394,7 @@ Aplicar configurações de qualquer forma? Default - Padrão + Padrão Invalid angle formula @@ -6226,11 +6226,11 @@ Aplicar configurações de qualquer forma? Pen style: - Estilo Caneta: + Estilo Caneta: Color: - Cor: + Cor: Ready @@ -6274,7 +6274,7 @@ Aplicar configurações de qualquer forma? Default - Padrão + Padrão diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index a1c242b96..c5407f6c4 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -2480,7 +2480,7 @@ Color: - Culoare: + Culoare: Ready @@ -2595,7 +2595,7 @@ Color: - Culoare: + Culoare: Ready @@ -4042,7 +4042,7 @@ Apply settings anyway? Color: - Culoare: + Culoare: Ready @@ -5655,7 +5655,7 @@ Apply settings anyway? Color: - Culoare: + Culoare: Ready diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 0aa5bd827..338741f0e 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -580,7 +580,7 @@ Notes - + Заметки @@ -707,15 +707,15 @@ Tool - Инструмент + Инструмент Alias: - + Псевдоним: Notes - + Заметки @@ -834,15 +834,15 @@ Tool - Инструмент + Инструмент Alias: - + Псевдоним: Notes - + Заметки @@ -969,7 +969,7 @@ Notes - + Заметки @@ -1036,15 +1036,15 @@ Tool - Инструмент + Инструмент Alias: - + Псевдоним: Notes - + Заметки @@ -1095,15 +1095,15 @@ Tool - Инструмент + Инструмент Alias: - + Псевдоним: Notes - + Заметки @@ -1210,7 +1210,7 @@ Notes - + Заметки @@ -1289,19 +1289,19 @@ Tool - Инструмент + Инструмент Alias1: - + Псевдоним 1: Alias2: - + Псевдоним 2: Notes - + Заметки @@ -1380,19 +1380,19 @@ Tool - Инструмент + Инструмент Alias1: - + Псевдоним 1: Alias2: - + Псевдоним 2: Notes - + Заметки @@ -1471,19 +1471,19 @@ Tool - Инструмент + Инструмент Alias1: - + Псевдоним 1: Alias2: - + Псевдоним 2: Notes - + Заметки @@ -2342,15 +2342,15 @@ Tool - Инструмент + Инструмент Alias: - + Псевдоним: Notes - + Заметки @@ -2461,7 +2461,7 @@ Notes - + Заметки @@ -2687,55 +2687,55 @@ Tool - Инструмент + Инструмент Alias: - + Псевдоним: Pen style: - Стиль пера: + Стиль пера: Color: - Цвет: + Цвет: Ready - + Готово Notes - + Заметки Invalid suffix - + Неправильный суффикс Invalid group name - + Неверное имя группы Label: - + Метка: Default - По умолчанию + По умолчанию Invalid point - + Неправильная точка Invalid label - + Неправильная метка Invalid alias - + Неправильный псевдоним @@ -2806,47 +2806,47 @@ Tool - Инструмент + Инструмент Alias: - + Псевдоним: Pen style: - Стиль пера: + Стиль пера: Color: - Цвет: + Цвет: Ready - + Готово Notes - + Заметки Invalid suffix - + Неправильный суффикс Invalid group name - + Неверное имя группы Label: - + Метка: Default - По умолчанию + По умолчанию Invalid line points - + Неправильные точки линии Invalid first line point @@ -2858,11 +2858,11 @@ Invalid label - + Неправильная метка Invalid alias - + Неправильный псевдоним @@ -2984,7 +2984,7 @@ Notes - + Заметки @@ -3848,7 +3848,7 @@ Apply settings anyway? Notes - + Заметки @@ -3915,7 +3915,7 @@ Apply settings anyway? Notes - + Заметки @@ -4042,7 +4042,7 @@ Apply settings anyway? Notes - + Заметки @@ -4362,63 +4362,63 @@ Apply settings anyway? Tool - Инструмент + Инструмент Alias: - + Псевдоним: Pen style: - Стиль пера: + Стиль пера: Color: - Цвет: + Цвет: Ready - + Готово Notes - + Заметки Invalid suffix - + Неправильный суффикс Invalid group name - + Неверное имя группы Label: - + Метка: Default - По умолчанию + По умолчанию Invalid angle formula - + Неверная формула угла Invalid rotation angle formula - + Неверная формула угла поворота Invalid length formula - + Неверная формула длины Invalid label - + Неправильная метка Invalid alias - + Неправильный псевдоним @@ -4627,7 +4627,7 @@ Apply settings anyway? Notes - + Заметки @@ -5608,7 +5608,7 @@ Apply settings anyway? Notes - + Заметки @@ -5707,7 +5707,7 @@ Apply settings anyway? Notes - + Заметки @@ -5802,7 +5802,7 @@ Apply settings anyway? Notes - + Заметки @@ -5861,7 +5861,7 @@ Apply settings anyway? Notes - + Заметки @@ -5928,7 +5928,7 @@ Apply settings anyway? Notes - + Заметки @@ -6043,7 +6043,7 @@ Apply settings anyway? Notes - + Заметки @@ -6090,7 +6090,7 @@ Apply settings anyway? Notes - + Заметки @@ -6223,63 +6223,63 @@ Apply settings anyway? Tool - Инструмент + Инструмент Alias - + Псевдоним Pen style: - Стиль пера: + Стиль пера: Color: - Цвет: + Цвет: Ready - + Готово Notes - + Заметки Invalid suffix - + Неправильный суффикс Invalid group name - + Неверное имя группы Invalid rotation point - + Неправильная точка вращения Invalid label - + Неправильная метка Invalid alias - + Неправильный псевдоним Invalid angle formula - + Неверная формула угла Label: - + Метка: Alias: - + Псевдоним: Default - По умолчанию + По умолчанию @@ -6914,7 +6914,7 @@ Apply settings anyway? Notes - + Заметки @@ -6957,7 +6957,7 @@ Apply settings anyway? Notes - + Заметки @@ -7100,15 +7100,15 @@ Apply settings anyway? Tool - Инструмент + Инструмент Alias: - + Псевдоним: Notes - + Заметки @@ -7259,15 +7259,15 @@ Apply settings anyway? Tool - Инструмент + Инструмент Alias: - + Псевдоним: Notes - + Заметки @@ -7456,7 +7456,7 @@ Apply settings anyway? Notes - + Заметки @@ -7567,7 +7567,7 @@ Apply settings anyway? Notes - + Заметки @@ -10538,6 +10538,10 @@ This option will take an affect after restart. Cannot prepare passmark '%1' for piece '%2'. Passmark is empty. + + Piece name '%1' is not unique. + Имя детали "%1" не уникальное. + QSaveFile @@ -12774,7 +12778,7 @@ Do you want to save your changes? default - + по умолчанию @@ -14288,7 +14292,7 @@ Do you want to save your changes? Main path of piece %1 - + Главный контур детали %1 @@ -14307,7 +14311,7 @@ Do you want to save your changes? Not supported file suffix '%1' - + Не поддерживаемый суффикс файла '%1' cm @@ -15266,15 +15270,15 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion = Alias: - + Псевдоним: Alias1: - + Псевдоним 1: Alias2: - + Псевдоним 2: diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 54e142859..6068923fb 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -2695,11 +2695,11 @@ Pen style: - Тип пера: + Тип пера: Color: - Колір: + Колір: Ready @@ -2723,7 +2723,7 @@ Default - По замовчуванню + По замовчуванню Invalid point @@ -2814,11 +2814,11 @@ Pen style: - Тип пера: + Тип пера: Color: - Колір: + Колір: Ready @@ -2842,7 +2842,7 @@ Default - По замовчуванню + По замовчуванню Invalid line points @@ -4368,11 +4368,11 @@ Apply settings anyway? Pen style: - Тип пера: + Тип пера: Color: - Колір: + Колір: Ready @@ -4396,7 +4396,7 @@ Apply settings anyway? Default - По замовчуванню + По замовчуванню Invalid angle formula @@ -6225,11 +6225,11 @@ Apply settings anyway? Pen style: - Тип пера: + Тип пера: Color: - Колір: + Колір: Ready @@ -6273,7 +6273,7 @@ Apply settings anyway? Default - По замовчуванню + По замовчуванню diff --git a/src/libs/ifc/schema/pattern/v0.8.10.xsd b/src/libs/ifc/schema/pattern/v0.8.10.xsd index fa45c7e10..c619bee02 100644 --- a/src/libs/ifc/schema/pattern/v0.8.10.xsd +++ b/src/libs/ifc/schema/pattern/v0.8.10.xsd @@ -831,6 +831,7 @@ + @@ -863,6 +864,7 @@ + diff --git a/src/libs/vmisc/projectversion.cpp b/src/libs/vmisc/projectversion.cpp index 21433cd37..86dbfe5c7 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 = 36; +extern const int DEBUG_VERSION = 38; 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 2831c0397..66334edde 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,36 -#define VER_FILEVERSION_STR "0.7.36\0" +#define VER_FILEVERSION 0,7,38 +#define VER_FILEVERSION_STR "0.7.38\0" #define V_PRERELEASE // Mark prerelease builds diff --git a/src/libs/vtest/abstracttest.cpp b/src/libs/vtest/abstracttest.cpp index 2ed18bf9f..a10ebdcd1 100644 --- a/src/libs/vtest/abstracttest.cpp +++ b/src/libs/vtest/abstracttest.cpp @@ -352,9 +352,29 @@ QString AbstractTest::TranslationsPath() const return QCoreApplication::applicationDirPath() + QStringLiteral("/../../../app/valentina/bin/translations"); } +//--------------------------------------------------------------------------------------------------------------------- +int AbstractTest::RunTimeout(int defMsecs) +{ +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + QString timeout = QString::fromLocal8Bit(qgetenv("VTEST_RUN_TIMEOUT")); + if (timeout.isEmpty()) + { + return defMsecs; + } +#else + QString timeout = qEnvironmentVariable("VTEST_RUN_TIMEOUT", QString::number(defMsecs)); +#endif + + bool ok = false; + int msecs = timeout.toInt(&ok); + return ok ? msecs : defMsecs; +} + //--------------------------------------------------------------------------------------------------------------------- int AbstractTest::Run(int exit, const QString &program, const QStringList &arguments, QString &error, int msecs) { + msecs = AbstractTest::RunTimeout(msecs); + const QString parameters = QStringLiteral("Program: %1 \nArguments: %2.") .arg(program, arguments.join(QStringLiteral(", "))); diff --git a/src/libs/vtest/abstracttest.h b/src/libs/vtest/abstracttest.h index 1e858039d..cd7b4c2d9 100644 --- a/src/libs/vtest/abstracttest.h +++ b/src/libs/vtest/abstracttest.h @@ -85,6 +85,8 @@ protected: QString TapePath() const; QString TranslationsPath() const; + static int RunTimeout(int defMsecs); + int Run(int exit, const QString &program, const QStringList &arguments, QString &error, int msecs = 120000); bool CopyRecursively(const QString &srcFilePath, const QString &tgtFilePath) const; diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp index a9ae13539..582794b4e 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp @@ -88,6 +88,9 @@ DialogFlippingByLine::DialogFlippingByLine(const VContainer *data, quint32 toolI this, &DialogFlippingByLine::PointChanged); connect(ui->comboBoxSecondLinePoint, &QComboBox::currentTextChanged, this, &DialogFlippingByLine::PointChanged); + + connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogFlippingByLine::ShowSourceDetails); + connect(ui->lineEditAlias, &QLineEdit::textEdited, this, &DialogFlippingByLine::AliasChanged); connect(ui->comboBoxPenStyle, QOverload::of(&QComboBox::currentIndexChanged), this, &DialogFlippingByLine::PenStyleChanged); connect(ui->comboBoxColor, QOverload::of(&QComboBox::currentIndexChanged), this, diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index a996f4341..283765a87 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -107,6 +107,9 @@ DialogRotation::DialogRotation(const VContainer *data, quint32 toolId, QWidget * connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogRotation::DeployAngleTextEdit); connect(ui->comboBoxOriginPoint, &QComboBox::currentTextChanged, this, &DialogRotation::PointChanged); + + connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogRotation::ShowSourceDetails); + connect(ui->lineEditAlias, &QLineEdit::textEdited, this, &DialogRotation::AliasChanged); connect(ui->comboBoxPenStyle, QOverload::of(&QComboBox::currentIndexChanged), this, &DialogRotation::PenStyleChanged); connect(ui->comboBoxColor, QOverload::of(&QComboBox::currentIndexChanged), this, diff --git a/src/libs/vtools/tools/toolsdef.h b/src/libs/vtools/tools/toolsdef.h index f9743797f..cf144504b 100644 --- a/src/libs/vtools/tools/toolsdef.h +++ b/src/libs/vtools/tools/toolsdef.h @@ -31,15 +31,17 @@ #include #include +#include "../ifc/ifcdef.h" + class VGObject; class VContainer; struct SourceItem { - quint32 id{0}; + quint32 id{NULL_ID}; QString alias{}; - QString penStyle{}; - QString color{}; + QString penStyle{TypeLineDefault}; + QString color{ColorDefault}; }; Q_DECLARE_METATYPE(SourceItem)