Merge with develop.

--HG-- branch : feature
2017-06-30 11:43:40 +03:00 · 2017-06-30 11:43:40 +03:00 · bca2623d32
commit bca2623d32
parent c97af5a9f9 b18f5fa928
7 changed files with 87 additions and 42 deletions
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@ -5,6 +5,7 @@
 - [#244] New feature: Adjust line and point thickness and label size.
 - [#637] Max scene size too small to fit all objects.
 - New feature Zoom Fit Best Current pattern piece.
+- [#693] New feature: Sort workpiece "Groups" by name.
 - [#630] Improve export: upgrade to DXF r14 format.

 # Version 0.5.1
@ -25,6 +26,8 @@
 - [#703] Valentina warns about format rewriting for unsaved files.
 - [#704] Valentina crashes if click on detail.
 - [#706] Default unit in preferences not changing new file unit.
+- Fix bug. Valentina overrids exported file even if a user said no.
+- Fix bug. Date on label doesn't obey GUI language locale.

 # Version 0.5.0 May 9, 2017
 - [#581] User can now filter input lists by keyword in function wizard.
--- a/share/translations/measurements_p14_fr_FR.ts
+++ b/share/translations/measurements_p14_fr_FR.ts
@ -690,19 +690,19 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="509"/>
        <source>foot_instep_circ</source>
        <comment>Name in a formula. Don&apos;t use math symbols and space in name!!!!</comment>
-        <translation>tour_coup_de_pied</translation>
+        <translation>tour_voute_de_pied</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="511"/>
        <source>Foot: Instep circumference</source>
        <comment>Full measurement name.</comment>
-        <translation>tour_de_cou_de_pied</translation>
+        <translation>Pied : Tour de la Voûte du pied</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="512"/>
        <source>Measure circumference at tallest part of instep.</source>
        <comment>Full measurement description.</comment>
-        <translation>Mesure du tour au plus creux du cou-de-pied</translation>
+        <translation>Mesure du tour au plus creux de la voûte du pied.</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="528"/>
@ -726,13 +726,13 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="535"/>
        <source>head_length</source>
        <comment>Name in a formula. Don&apos;t use math symbols and space in name!!!!</comment>
-        <translation>tete_longueur</translation>
+        <translation>tete_hauteur</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="537"/>
        <source>Head: Length</source>
        <comment>Full measurement name.</comment>
-        <translation>Tête: Longueur</translation>
+        <translation>Tête: Hauteur</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="538"/>
@ -744,7 +744,7 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="542"/>
        <source>head_depth</source>
        <comment>Name in a formula. Don&apos;t use math symbols and space in name!!!!</comment>
-        <translation>Tete_profondeur</translation>
+        <translation>tete_profondeur</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="544"/>
@ -768,7 +768,7 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="551"/>
        <source>Head: Width</source>
        <comment>Full measurement name.</comment>
-        <translation>Tête : largeur</translation>
+        <translation>Tête : Largeur</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="552"/>
@ -786,7 +786,7 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="558"/>
        <source>Head: Crown to Neck Back</source>
        <comment>Full measurement name.</comment>
-        <translation>Tête: Du haut à la nuque</translation>
+        <translation>Tête: Du Haut à la Nuque</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="559"/>
@ -804,7 +804,7 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="565"/>
        <source>Head: Chin to Neck Back</source>
        <comment>Full measurement name.</comment>
-        <translation>Tête: Du menton à la nuque</translation>
+        <translation>Tête: Du Menton à la Nuque</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="566"/>
@ -828,7 +828,7 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="586"/>
        <source>Circumference of Neck midsection, about halfway between jaw and torso.</source>
        <comment>Full measurement description.</comment>
-        <translation>Circonférence du cou, à la moitié entre la machoire et le torse.</translation>
+        <translation>Circonférence du cou, à la moitié entre la mâchoire et le torse.</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="590"/>
@ -852,13 +852,13 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="598"/>
        <source>highbust_circ</source>
        <comment>Name in a formula. Don&apos;t use math symbols and space in name!!!!</comment>
-        <translation>tour_surpoitrinaire</translation>
+        <translation>surpoitrine_circ</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="600"/>
        <source>Highbust circumference</source>
        <comment>Full measurement name.</comment>
-        <translation>Tour surpoitrinaire</translation>
+        <translation>Tour Sur-Poitrine</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="601"/>
@ -882,19 +882,19 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="608"/>
        <source>Circumference around Bust, parallel to floor.</source>
        <comment>Full measurement description.</comment>
-        <translation>Circonférence autour du buste, parallèle au sol</translation>
+        <translation>Circonférence autour du buste, parallèle au sol.</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="612"/>
        <source>lowbust_circ</source>
        <comment>Name in a formula. Don&apos;t use math symbols and space in name!!!!</comment>
-        <translation>tour_souspoitrinaire</translation>
+        <translation>tour_souspoitrine</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="614"/>
        <source>Lowbust circumference</source>
        <comment>Full measurement name.</comment>
-        <translation>Tour sous-poitrinaire</translation>
+        <translation>Tour Sous-poitrine</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="615"/>
@ -912,7 +912,7 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="621"/>
        <source>Rib circumference</source>
        <comment>Full measurement name.</comment>
-        <translation>Tour cage thoracique</translation>
+        <translation>Tour Cage Thoracique</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="622"/>
@ -930,7 +930,7 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="629"/>
        <source>Waist circumference</source>
        <comment>Full measurement name.</comment>
-        <translation>Tour de taille</translation>
+        <translation>Tour de Taille</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="635"/>
@ -942,7 +942,7 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="637"/>
        <source>Highhip circumference</source>
        <comment>Full measurement name.</comment>
-        <translation>Tour des petites hanches</translation>
+        <translation>Tour des Petites Hanches</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="630"/>
@ -954,19 +954,19 @@
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="345"/>
        <source>height_waist_back</source>
        <comment>Name in a formula. Don&apos;t use math symbols and space in name!!!!</comment>
-        <translation>haut_taille_dos</translation>
+        <translation>hauteur_taille_dos</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="347"/>
        <source>Height: Waist Back</source>
        <comment>Full measurement name.</comment>
-        <translation>Hauteur taille dos</translation>
+        <translation>Hauteur Taille Dos</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="348"/>
        <source>Vertical height from Waist Back to floor. (&apos;Height: Waist Front&apos;&apos; - &apos;Leg: Crotch to floor&apos;&apos;).</source>
        <comment>Full measurement description.</comment>
-        <translation>hauteur_taille_dos</translation>
+        <translation>Hauteur Verticale partant de la Taille Dos jusqu&apos;au sol. (Hauteur: Taille Devant&quot; - &quot;Jambe: Fourche jusqu&apos;au sol&quot;).</translation>
    </message>
    <message>
        <location filename="../../src/libs/vpatterndb/vtranslatemeasurements.cpp" line="428"/>
--- a/share/translations/valentina_es_ES.ts
+++ b/share/translations/valentina_es_ES.ts
@ -2484,7 +2484,7 @@
    </message>
    <message>
        <source>Uknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Desconocido</translation>
    </message>
 </context>
 <context>
@ -3124,7 +3124,7 @@ Apply settings anyway?</source>
    </message>
    <message>
        <source>Move</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover</translation>
    </message>
 </context>
 <context>
@ -7089,7 +7089,7 @@ Quiere guardar los cambios?</translation>
    </message>
    <message>
        <source>Layout</source>
-        <translation type="vanished">Diseño</translation>
+        <translation type="vanished">Plano</translation>
    </message>
    <message>
        <source>Templates</source>
@ -7183,7 +7183,7 @@ Quiere guardar los cambios?</translation>
    </message>
    <message>
        <source>GUI language:</source>
-        <translation type="unfinished">Idioma de interfaz gráfica de usuario:</translation>
+        <translation>Idioma del interfaz gráfica de usuario:</translation>
    </message>
    <message>
        <source>Decimal separator parts:</source>
@ -8864,7 +8864,7 @@ Do you want to save your changes?</source>
    </message>
    <message>
        <source>GUI language:</source>
-        <translation type="unfinished">Idioma de interfaz gráfica de usuario:</translation>
+        <translation>Idioma del interfaz gráfica de usuario:</translation>
    </message>
    <message>
        <source>Decimal separator parts:</source>
--- a/share/translations/valentina_pt_BR.ts
+++ b/share/translations/valentina_pt_BR.ts
@ -1472,10 +1472,42 @@
        <source>Interlining</source>
        <translation type="vanished">Forro interno</translation>
    </message>
+    <message>
+        <source>Cut on fold</source>
+        <translation type="vanished">Cortar e dobrar</translation>
+    </message>
+    <message>
+        <source>Grainline</source>
+        <translation type="vanished">Fio</translation>
+    </message>
+    <message>
+        <source>Grainline visible</source>
+        <translation type="vanished">Fio visível</translation>
+    </message>
    <message>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mostrar cálculo completo na caixa de mensagem&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
+    <message>
+        <source>Length should be positive</source>
+        <translation type="vanished">Comprimento deve ser positivo</translation>
+    </message>
+    <message>
+        <source>Arrows:</source>
+        <translation type="vanished">Setas:</translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="vanished">Ambos</translation>
+    </message>
+    <message>
+        <source>Just front</source>
+        <translation type="vanished">Apenas frente</translation>
+    </message>
+    <message>
+        <source>Just rear</source>
+        <translation type="vanished">Apenas costas</translation>
+    </message>
 </context>
 <context>
    <name>DialogEditWrongFormula</name>
@ -1581,7 +1613,7 @@
    </message>
    <message>
        <source>Curve angle</source>
-        <translation type="unfinished"></translation>
+        <translation>Ângulo da curva</translation>
    </message>
    <message>
        <source>Formula:</source>
@ -1601,11 +1633,11 @@
    </message>
    <message>
        <source>Full name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome completo</translation>
    </message>
    <message>
        <source>Functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Funções</translation>
    </message>
    <message>
        <source>Lengths to control points</source>
@ -3175,15 +3207,15 @@ Apply settings anyway?</source>
    </message>
    <message>
        <source>Change image</source>
-        <translation type="unfinished"></translation>
+        <translation>Trocar imagem</translation>
    </message>
    <message>
        <source>Save image to file</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvar imagem para arquivo</translation>
    </message>
    <message>
        <source>Show image</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar imagem</translation>
    </message>
    <message>
        <source>Image for pattern</source>
@ -4076,7 +4108,7 @@ Apply settings anyway?</source>
    </message>
    <message>
        <source>Grainline</source>
-        <translation type="unfinished"></translation>
+        <translation>Fio</translation>
    </message>
    <message>
        <source>Select main path objects clockwise, &lt;b&gt;Shift&lt;/b&gt; - reverse direction curve, &lt;b&gt;Enter&lt;/b&gt; - finish creation</source>
@ -4112,7 +4144,7 @@ Apply settings anyway?</source>
    </message>
    <message>
        <source>Length should be positive</source>
-        <translation type="unfinished"></translation>
+        <translation>Comprimento deve ser positivo</translation>
    </message>
    <message>
        <source>Parser error: %1</source>
@ -4172,19 +4204,19 @@ Apply settings anyway?</source>
    </message>
    <message>
        <source>Cut on fold</source>
-        <translation type="unfinished"></translation>
+        <translation>Cortar e dobrar</translation>
    </message>
    <message>
        <source>Both</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambos</translation>
    </message>
    <message>
        <source>Just front</source>
-        <translation type="unfinished"></translation>
+        <translation>Apenas frente</translation>
    </message>
    <message>
        <source>Just rear</source>
-        <translation type="unfinished"></translation>
+        <translation>Apenas costas</translation>
    </message>
    <message>
        <source>Pins</source>
@ -7118,7 +7150,7 @@ Do you want to save your changes?</source>
    </message>
    <message>
        <source>Full name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome completo</translation>
    </message>
    <message>
        <source>File &apos;%1&apos; doesn&apos;t exist!</source>
@ -7328,7 +7360,7 @@ Do you want to save your changes?</source>
    <name>TabGrainline</name>
    <message>
        <source>Grainline visible</source>
-        <translation type="unfinished"></translation>
+        <translation>Fio visível</translation>
    </message>
    <message>
        <source>Rotation:</source>
@ -7368,7 +7400,7 @@ Do you want to save your changes?</source>
    </message>
    <message>
        <source>Arrows:</source>
-        <translation type="unfinished"></translation>
+        <translation>Setas:</translation>
    </message>
 </context>
 <context>
--- a/src/app/valentina/dialogs/vwidgetdetails.cpp
+++ b/src/app/valentina/dialogs/vwidgetdetails.cpp
@ -149,6 +149,7 @@ void VWidgetDetails::FillTable(const QHash<quint32, VPiece> *details)
        ui->tableWidget->setItem(currentRow, 1, item);
        ++i;
    }
+    ui->tableWidget->sortItems(1, Qt::AscendingOrder);
    ui->tableWidget->resizeColumnsToContents();
    ui->tableWidget->resizeRowsToContents();

--- a/src/app/valentina/dialogs/vwidgetgroups.cpp
+++ b/src/app/valentina/dialogs/vwidgetgroups.cpp
@ -88,6 +88,8 @@ void VWidgetGroups::RenameGroup(int row, int column)

    const quint32 id = ui->tableWidget->item(row, 0)->data(Qt::UserRole).toUInt();
    doc->SetGroupName(id, ui->tableWidget->item(row, column)->text());
+
+    UpdateGroups();
 }

 //---------------------------------------------------------------------------------------------------------------------
@ -174,6 +176,7 @@ void VWidgetGroups::FillTable(const QMap<quint32, QPair<QString, bool> > &groups
        ui->tableWidget->setItem(currentRow, 1, item);
        ++i;
    }
+    ui->tableWidget->sortItems(1, Qt::AscendingOrder);
    ui->tableWidget->resizeColumnsToContents();
    ui->tableWidget->resizeRowsToContents();
    ui->tableWidget->blockSignals(false);
--- a/src/app/valentina/mainwindow.cpp
+++ b/src/app/valentina/mainwindow.cpp
@ -2306,6 +2306,7 @@ void MainWindow::ActionDraw(bool checked)
        ui->dockWidgetToolOptions->setVisible(isDockToolOptionsVisible);

        ui->dockWidgetGroups->setWidget(groupsWidget);
+        ui->dockWidgetGroups->setWindowTitle(tr("Group"));
        ui->dockWidgetGroups->setVisible(isDockGroupsVisible);
        ui->dockWidgetGroups->setToolTip(tr("Contains all visibility groups"));
    }
@ -2380,6 +2381,7 @@ void MainWindow::ActionDetails(bool checked)
        ui->dockWidgetToolOptions->setVisible(isDockToolOptionsVisible);

        ui->dockWidgetGroups->setWidget(detailsWidget);
+        ui->dockWidgetGroups->setWindowTitle(tr("Details"));
        ui->dockWidgetGroups->setVisible(isDockGroupsVisible);
        ui->dockWidgetGroups->setToolTip(tr("Show which details will go in layout"));

@ -2906,7 +2908,11 @@ void MainWindow::FullParseFile()
    }
    comboBoxDraws->blockSignals(true);
    comboBoxDraws->clear();
-    comboBoxDraws->addItems(doc->getPatternPieces());
+
+    QStringList patternPieceNames = doc->getPatternPieces();
+    patternPieceNames.sort();
+    comboBoxDraws->addItems(patternPieceNames);
+
    if (not drawMode)
    {
        comboBoxDraws->setCurrentIndex(comboBoxDraws->count()-1);