Merge with release.

ChangeLog.txt

@@ -1,3 +1,7 @@
+# Version 0.4.1 January 29, 2016
+- [#438] Broken switching pattern pieces.
+- 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)

dist/debian/changelog

@@ -1,4 +1,4 @@
-valentina (0.4.0) trusty; urgency=low
+valentina (0.4.1) trusty; urgency=low
 
   * Auto build.
 

dist/macx/tape/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.valentinaproject.@EXECUTABLE@</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.0</string>
+	<string>0.4.1</string>
 	<key>CFBundleVersion</key>
-	<string>0.4.0.0</string>
+	<string>0.4.1.0</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleDocumentTypes</key>

dist/macx/valentina/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.valentinaproject.@EXECUTABLE@</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.0</string>
+	<string>0.4.1</string>
 	<key>CFBundleVersion</key>
-	<string>0.4.0.0</string>
+	<string>0.4.1.0</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleDocumentTypes</key>

dist/rpm/_service

@@ -1,7 +1,7 @@
 <services>                   
   <service name="tar_scm">
   	<param name="url">https://github.com/dismine/Valentina.git</param>
-  	<param name="versionprefix">0.4.0</param>
+  	<param name="versionprefix">0.4.1</param>
     <param name="filename">valentina</param>
   	<param name="scm">git</param>
     <param name="versionformat">%at</param>

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+

share/translations/valentina.ts

@@ -2423,7 +2423,7 @@ Apply settings anyway?</translation>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Individual measurements</translation>
+        <translation type="vanished">Individual measurements</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2457,6 +2457,10 @@ Apply settings anyway?</translation>
         <source>Choose unique pattern piece name.</source>
         <translation>Choose unique pattern piece name.</translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished">New pattern</translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_cs_CZ.ts

@@ -2395,7 +2395,7 @@ Apply settings anyway?</source>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Individuální míry</translation>
+        <translation type="vanished">Individuální míry</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2429,6 +2429,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_de_DE.ts

@@ -2406,7 +2406,7 @@ Apply settings anyway?</source>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Individuelle Maße</translation>
+        <translation type="vanished">Individuelle Maße</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2440,6 +2440,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation>Eindeutigen Namen für das Schnitteil eingeben. </translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished">Neues Schnittmuster</translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_en_CA.ts

@@ -2423,7 +2423,7 @@ Apply settings anyway?</translation>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Individual measurements</translation>
+        <translation type="vanished">Individual measurements</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2457,6 +2457,10 @@ Apply settings anyway?</translation>
         <source>Choose unique pattern piece name.</source>
         <translation>Choose unique pattern piece name.</translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished">New pattern</translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_en_IN.ts

@@ -2423,7 +2423,7 @@ Apply settings anyway?</translation>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Individual measurements</translation>
+        <translation type="vanished">Individual measurements</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2457,6 +2457,10 @@ Apply settings anyway?</translation>
         <source>Choose unique pattern piece name.</source>
         <translation>Choose unique pattern piece name.</translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished">New pattern</translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_en_US.ts

@@ -2423,7 +2423,7 @@ Apply settings anyway?</translation>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Individual measurements</translation>
+        <translation type="vanished">Individual measurements</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2457,6 +2457,10 @@ Apply settings anyway?</translation>
         <source>Choose unique pattern piece name.</source>
         <translation>Choose unique pattern piece name.</translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished">New pattern</translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_es_ES.ts

@@ -2402,7 +2402,7 @@ Apply settings anyway?</source>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Medidas individuales</translation>
+        <translation type="vanished">Medidas individuales</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2436,6 +2436,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_fi_FI.ts

@@ -2395,7 +2395,7 @@ Apply settings anyway?</source>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Yksilölliset mitat</translation>
+        <translation type="vanished">Yksilölliset mitat</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2429,6 +2429,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_fr_FR.ts

@@ -2418,7 +2418,7 @@ Appliquer les réglages quand-même ?</translation>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Mesures individuelles</translation>
+        <translation type="vanished">Mesures individuelles</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2452,6 +2452,10 @@ Appliquer les réglages quand-même ?</translation>
         <source>Choose unique pattern piece name.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_he_IL.ts

@@ -2173,10 +2173,6 @@ Apply settings anyway?</source>
 </context>
 <context>
     <name>DialogNewPattern</name>
-    <message>
-        <source>Individual measurements</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Units:</source>
         <translation type="unfinished"></translation>
@@ -2205,6 +2201,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_id_ID.ts

@@ -2681,10 +2681,6 @@ Apply settings anyway?</source>
 </context>
 <context>
     <name>DialogNewPattern</name>
-    <message>
-        <source>Individual measurements</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Pattern piece name</source>
         <translation type="obsolete">Nama potongan pola</translation>
@@ -2717,6 +2713,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_it_IT.ts

@@ -2424,7 +2424,7 @@ Applicare le impostazioni comunque?</translation>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Misure individuali</translation>
+        <translation type="vanished">Misure individuali</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2458,6 +2458,10 @@ Applicare le impostazioni comunque?</translation>
         <source>Choose unique pattern piece name.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished">Nuovo pattern</translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_nl_NL.ts

@@ -2414,7 +2414,7 @@ Apply settings anyway?</source>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Individuele maten</translation>
+        <translation type="vanished">Individuele maten</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2448,6 +2448,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_ro_RO.ts

@@ -2402,7 +2402,7 @@ Apply settings anyway?</source>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Măsuri individuale</translation>
+        <translation type="vanished">Măsuri individuale</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2436,6 +2436,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_ru_RU.ts

@@ -2423,7 +2423,7 @@ Apply settings anyway?</source>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Индивидуальные мерки</translation>
+        <translation type="vanished">Индивидуальные мерки</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2457,6 +2457,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation>Выберете уникальное имя чертежа.</translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished">Новое лекало</translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

share/translations/valentina_uk_UA.ts

@@ -2425,7 +2425,7 @@ Apply settings anyway?</source>
     <name>DialogNewPattern</name>
     <message>
         <source>Individual measurements</source>
-        <translation>Індивідуальні мірки</translation>
+        <translation type="vanished">Індивідуальні мірки</translation>
     </message>
     <message>
         <source>Pattern piece name</source>
@@ -2459,6 +2459,10 @@ Apply settings anyway?</source>
         <source>Choose unique pattern piece name.</source>
         <translation>Виберіть унікальне ім&apos;я лекала.</translation>
     </message>
+    <message>
+        <source>New pattern</source>
+        <translation type="unfinished">Нове лекало</translation>
+    </message>
 </context>
 <context>
     <name>DialogNormal</name>

src/app/valentina/dialogs/dialognewpattern.ui

@@ -14,7 +14,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Individual measurements</string>
+   <string>New pattern</string>
   </property>
   <property name="windowIcon">
    <iconset resource="../../../libs/vmisc/share/resources/icon.qrc">

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);
+    if (pattern->DataDetails()->size() > 0)
-    ui->view->ZoomFitBest();
+    {
+        ActionDetails(true);
+        ui->view->ZoomFitBest();
+    }
 
-    ActionDraw(true);
+    if (not ui->actionDraw->isChecked())
-    ui->view->ZoomFitBest();
+    {
+        ActionDraw(true);
+    }
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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));

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             0,4,1,0
-#define VER_FILEVERSION_STR         "0.4.0.0\0"
+#define VER_FILEVERSION_STR         "0.4.1.0\0"
 
 #define V_PRERELEASE // Mark prerelease builds