From 207038bdabcd9d910ed34a3a1f3111155c57f003 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 29 Jan 2016 12:30:34 +0200 Subject: [PATCH 1/7] Fixed window title. --HG-- branch : release --- ChangeLog.txt | 3 +++ src/app/valentina/dialogs/dialognewpattern.ui | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 736a4434d..87bc3e6db 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,6 @@ +# Version 0.4.1 +- Fixed wrong title for dialog "New pattern". + # Version 0.4.0 January 27, 2016 - [#209] New tool for Point from arc and tangent (Draw) - [#232] Intersection of Arcs (Draw) diff --git a/src/app/valentina/dialogs/dialognewpattern.ui b/src/app/valentina/dialogs/dialognewpattern.ui index efcbd1cd0..f6b43a373 100644 --- a/src/app/valentina/dialogs/dialognewpattern.ui +++ b/src/app/valentina/dialogs/dialognewpattern.ui @@ -14,7 +14,7 @@ - Individual measurements + New pattern From 74285749be97a75a6ff40f3af19fa309fb985b38 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 29 Jan 2016 13:12:51 +0200 Subject: [PATCH 2/7] Lupdate. --HG-- branch : release --- share/translations/valentina.ts | 6 +++++- share/translations/valentina_cs_CZ.ts | 6 +++++- share/translations/valentina_de_DE.ts | 6 +++++- 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 | 6 +++++- share/translations/valentina_fi_FI.ts | 6 +++++- share/translations/valentina_fr_FR.ts | 6 +++++- share/translations/valentina_he_IL.ts | 8 ++++---- share/translations/valentina_id_ID.ts | 8 ++++---- share/translations/valentina_it_IT.ts | 6 +++++- share/translations/valentina_nl_NL.ts | 6 +++++- share/translations/valentina_ro_RO.ts | 6 +++++- share/translations/valentina_ru_RU.ts | 6 +++++- share/translations/valentina_uk_UA.ts | 6 +++++- 16 files changed, 78 insertions(+), 22 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index 579f5e869..8f876d141 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -2423,7 +2423,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Individual measurements + Individual measurements Pattern piece name @@ -2457,6 +2457,10 @@ Apply settings anyway? Choose unique pattern piece name. Choose unique pattern piece name. + + New pattern + New pattern + DialogNormal diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index 1feca2bb5..1bae2c604 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -2395,7 +2395,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Individuální míry + Individuální míry Pattern piece name @@ -2429,6 +2429,10 @@ Apply settings anyway? Choose unique pattern piece name. + + New pattern + + DialogNormal diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index 5218d919a..61d82fb7a 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -2406,7 +2406,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Individuelle Maße + Individuelle Maße Pattern piece name @@ -2440,6 +2440,10 @@ Apply settings anyway? Choose unique pattern piece name. Eindeutigen Namen für das Schnitteil eingeben. + + New pattern + Neues Schnittmuster + DialogNormal diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 495fe2ca7..6c98ac305 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -2423,7 +2423,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Individual measurements + Individual measurements Pattern piece name @@ -2457,6 +2457,10 @@ Apply settings anyway? Choose unique pattern piece name. Choose unique pattern piece name. + + New pattern + New pattern + DialogNormal diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index e1a24f241..a1b20e909 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -2423,7 +2423,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Individual measurements + Individual measurements Pattern piece name @@ -2457,6 +2457,10 @@ Apply settings anyway? Choose unique pattern piece name. Choose unique pattern piece name. + + New pattern + New pattern + DialogNormal diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 794fd6eb4..8e8a548c4 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -2423,7 +2423,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Individual measurements + Individual measurements Pattern piece name @@ -2457,6 +2457,10 @@ Apply settings anyway? Choose unique pattern piece name. Choose unique pattern piece name. + + New pattern + New pattern + DialogNormal diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index be6eb4a68..133ce5142 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -2402,7 +2402,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Medidas individuales + Medidas individuales Pattern piece name @@ -2436,6 +2436,10 @@ Apply settings anyway? Choose unique pattern piece name. + + New pattern + + DialogNormal diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index aacd5e3f8..68e51a882 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -2395,7 +2395,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Yksilölliset mitat + Yksilölliset mitat Pattern piece name @@ -2429,6 +2429,10 @@ Apply settings anyway? Choose unique pattern piece name. + + New pattern + + DialogNormal diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 41083c0c7..2d550be19 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -2418,7 +2418,7 @@ Appliquer les réglages quand-même ? DialogNewPattern Individual measurements - Mesures individuelles + Mesures individuelles Pattern piece name @@ -2452,6 +2452,10 @@ Appliquer les réglages quand-même ? Choose unique pattern piece name. + + New pattern + + DialogNormal diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 94dddbd61..9460eef44 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -2173,10 +2173,6 @@ Apply settings anyway? DialogNewPattern - - Individual measurements - - Units: @@ -2205,6 +2201,10 @@ Apply settings anyway? Choose unique pattern piece name. + + New pattern + + DialogNormal diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index 8c6da6d3a..132c9821d 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -2681,10 +2681,6 @@ Apply settings anyway? DialogNewPattern - - Individual measurements - - Pattern piece name Nama potongan pola @@ -2717,6 +2713,10 @@ Apply settings anyway? Choose unique pattern piece name. + + New pattern + + DialogNormal diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 28e9af67d..fc11e9880 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -2424,7 +2424,7 @@ Applicare le impostazioni comunque? DialogNewPattern Individual measurements - Misure individuali + Misure individuali Pattern piece name @@ -2458,6 +2458,10 @@ Applicare le impostazioni comunque? Choose unique pattern piece name. + + New pattern + Nuovo pattern + DialogNormal diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 4367358b9..41e0e2a66 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -2414,7 +2414,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Individuele maten + Individuele maten Pattern piece name @@ -2448,6 +2448,10 @@ Apply settings anyway? Choose unique pattern piece name. + + New pattern + + DialogNormal diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index e06978192..e8cc6fd02 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -2402,7 +2402,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Măsuri individuale + Măsuri individuale Pattern piece name @@ -2436,6 +2436,10 @@ Apply settings anyway? Choose unique pattern piece name. + + New pattern + + DialogNormal diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 834655731..21122b7ad 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -2423,7 +2423,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Индивидуальные мерки + Индивидуальные мерки Pattern piece name @@ -2457,6 +2457,10 @@ Apply settings anyway? Choose unique pattern piece name. Выберете уникальное имя чертежа. + + New pattern + Новое лекало + DialogNormal diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 7d196433b..f99d6c817 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -2425,7 +2425,7 @@ Apply settings anyway? DialogNewPattern Individual measurements - Індивідуальні мірки + Індивідуальні мірки Pattern piece name @@ -2459,6 +2459,10 @@ Apply settings anyway? Choose unique pattern piece name. Виберіть унікальне ім'я лекала. + + New pattern + Нове лекало + DialogNormal From 558c0d75f592aea0a6cc798175f30bfe3e432834 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 29 Jan 2016 16:28:05 +0200 Subject: [PATCH 3/7] Fixed issue #438. Broken switching pattern pieces. --HG-- branch : release --- src/app/valentina/mainwindow.cpp | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 2c94b4cd7..97eafe4ea 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -3901,20 +3901,32 @@ void MainWindow::ZoomFirstShow() /* If don't call ZoomFitBest() twice, after first scaling or moving pattern piece, scene change coordinate and whole * pattern will be moved. Looks very ugly. It is best solution that i have now. */ - ActionDetails(true); - ui->view->ZoomFitBest(); - ActionDraw(true); + if (pattern->DataDetails()->size() > 0) + { + ActionDetails(true); + ui->view->ZoomFitBest(); + } + + if (not ui->actionDraw->isChecked()) + { + ActionDraw(true); + } ui->view->ZoomFitBest(); VMainGraphicsView::NewSceneRect(sceneDraw, ui->view); VMainGraphicsView::NewSceneRect(sceneDetails, ui->view); - ActionDetails(true); - ui->view->ZoomFitBest(); + if (pattern->DataDetails()->size() > 0) + { + ActionDetails(true); + ui->view->ZoomFitBest(); + } - ActionDraw(true); - ui->view->ZoomFitBest(); + if (not ui->actionDraw->isChecked()) + { + ActionDraw(true); + } } //--------------------------------------------------------------------------------------------------------------------- From 5693be112536cc1077b5cee2a6ff30d6df41011b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 29 Jan 2016 16:29:41 +0200 Subject: [PATCH 4/7] Updated change log. --HG-- branch : release --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 87bc3e6db..bbdc43ed6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.1 +- [#438] Broken switching pattern pieces. - Fixed wrong title for dialog "New pattern". # Version 0.4.0 January 27, 2016 From 573c794cb62d87a89d7cf075b2d4cba2d4d39011 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 29 Jan 2016 21:44:19 +0200 Subject: [PATCH 5/7] Updated changelog. Release 0.4.1. --HG-- branch : release --- ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index bbdc43ed6..a58f74350 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,4 @@ -# Version 0.4.1 +# Version 0.4.1 January 29, 2016 - [#438] Broken switching pattern pieces. - Fixed wrong title for dialog "New pattern". From 2f23445c587b0ba802aa2df9327574ba267604e4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 29 Jan 2016 21:46:39 +0200 Subject: [PATCH 6/7] Updated version package scripts. --HG-- branch : release --- dist/debian/changelog | 2 +- dist/macx/tape/Info.plist | 4 ++-- dist/macx/valentina/Info.plist | 4 ++-- dist/rpm/_service | 2 +- dist/rpm/valentina.spec | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/debian/changelog b/dist/debian/changelog index a16a008c0..83c961473 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,4 +1,4 @@ -valentina (0.4.0) trusty; urgency=low +valentina (0.4.1) trusty; urgency=low * Auto build. diff --git a/dist/macx/tape/Info.plist b/dist/macx/tape/Info.plist index c81c44fd7..db5d4e103 100755 --- a/dist/macx/tape/Info.plist +++ b/dist/macx/tape/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier org.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.4.0 + 0.4.1 CFBundleVersion - 0.4.0.0 + 0.4.1.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/macx/valentina/Info.plist b/dist/macx/valentina/Info.plist index 1f2dd83ac..e381ca187 100755 --- a/dist/macx/valentina/Info.plist +++ b/dist/macx/valentina/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier org.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.4.0 + 0.4.1 CFBundleVersion - 0.4.0.0 + 0.4.1.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/rpm/_service b/dist/rpm/_service index 4df3a88ab..1d5fb44f9 100644 --- a/dist/rpm/_service +++ b/dist/rpm/_service @@ -1,7 +1,7 @@ https://github.com/dismine/Valentina.git - 0.4.0 + 0.4.1 valentina git %at diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 7733770e2..039dab584 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -45,7 +45,7 @@ BuildRequires: libqt5-qtxmlpatterns-devel Requires: poppler-utils -Version: 0.4.0 +Version: 0.4.1 Release: 0 URL: https://bitbucket.org/dismine/valentina License: GPL-3.0+ From f572c937489d184451c2562afb853107a769730c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 29 Jan 2016 21:48:21 +0200 Subject: [PATCH 7/7] Change version to 0.4.1. --HG-- branch : release --- src/libs/vmisc/projectversion.cpp | 2 +- src/libs/vmisc/projectversion.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/vmisc/projectversion.cpp b/src/libs/vmisc/projectversion.cpp index 2507b303f..941aae52a 100644 --- a/src/libs/vmisc/projectversion.cpp +++ b/src/libs/vmisc/projectversion.cpp @@ -33,7 +33,7 @@ extern const int MAJOR_VERSION = 0; extern const int MINOR_VERSION = 4; -extern const int DEBUG_VERSION = 0; +extern const int DEBUG_VERSION = 1; 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 f7146f06b..7193dfc97 100644 --- a/src/libs/vmisc/projectversion.h +++ b/src/libs/vmisc/projectversion.h @@ -45,8 +45,8 @@ extern const QString APP_VERSION_STR; // Change version number in projectversion.cpp too. // Synchronize valentina.nsi -#define VER_FILEVERSION 0,4,0,0 -#define VER_FILEVERSION_STR "0.4.0.0\0" +#define VER_FILEVERSION 0,4,1,0 +#define VER_FILEVERSION_STR "0.4.1.0\0" #define V_PRERELEASE // Mark prerelease builds