Merge branch 'feature/known_measurements' into develop

dist/OBS_debian/debian.tape.1

@@ -1,6 +1,6 @@
 .\" Manpage for tape.
 .\" Contact dismine@gmail.com to correct errors.
-.TH tape 1 "3 October, 2020" "tape man page"
+.TH tape 1 "8 November, 2023" "tape man page"
 .SH NAME
 Tape \- Valentina's measurements editor.
 .SH SYNOPSIS
@@ -28,6 +28,8 @@ Set base for dimension B in the table units.
 Set base for dimension C in the table units.
 .IP "-u, --units <The pattern units>" 
 Set pattern file units: cm, mm, inch.
+.IP "-k, --known"
+Activate known measurements mode.
 .IP "--test"
 Use for unit testing. Run the program and open a file without showing the main window.
 .IP "--no-scaling"

dist/OBS_debian/debian.valentina.mime

@@ -1,4 +1,5 @@
 application/x-valentina-pattern; valentina %s; nametemplate=%s.val; description="Valentina pattern" edit=valentina '%s'; priority=6
-application/x-valentina-i-pattern; tape %s; nametemplate=%s.vit; description="Valentina individual measurments" edit=tape '%s'; priority=6
-application/x-valentina-s-pattern; tape %s; nametemplate=%s.vst; description="Valentina standard measurments" edit=tape '%s'; priority=6
+application/x-valentina-i-pattern; tape %s; nametemplate=%s.vit; description="Valentina individual measurements" edit=tape '%s'; priority=6
+application/x-valentina-s-pattern; tape %s; nametemplate=%s.vst; description="Valentina multisize measurements" edit=tape '%s'; priority=6
+application/x-valentina-k-pattern; tape %s; nametemplate=%s.vst; description="Valentina known measurements" edit=tape '%s'; priority=6
 application/x-valentina-layout; puzzle %s; nametemplate=%s.vlt; description="Valentina layout" edit=puzzle '%s'; priority=6

dist/debian/tape.1

@@ -1,6 +1,6 @@
 .\" Manpage for tape.
 .\" Contact dismine@gmail.com to correct errors.
-.TH tape 1 "3 October, 2020" "tape man page"
+.TH tape 1 "8 November, 2023" "tape man page"
 .SH NAME
 Tape \- Valentina's measurements editor.
 .SH SYNOPSIS
@@ -28,6 +28,8 @@ Set base for dimension B in the table units.
 Set base for dimension C in the table units.
 .IP "-u, --units <The pattern units>" 
 Set pattern file units: cm, mm, inch.
+.IP "-k, --known"
+Activate known measurements mode.
 .IP "--test"
 Use for unit testing. Run the program and open a file without showing the main window.
 .IP "--no-scaling"

dist/debian/valentina.mime

@@ -1,4 +1,5 @@
 application/x-valentina-pattern; valentina %s; nametemplate=%s.val; description="Valentina pattern" edit=valentina '%s'; priority=6
-application/x-valentina-i-pattern; tape %s; nametemplate=%s.vit; description="Valentina individual measurments" edit=tape '%s'; priority=6
-application/x-valentina-s-pattern; tape %s; nametemplate=%s.vst; description="Valentina standard measurments" edit=tape '%s'; priority=6
+application/x-valentina-i-pattern; tape %s; nametemplate=%s.vit; description="Valentina individual measurements" edit=tape '%s'; priority=6
+application/x-valentina-s-pattern; tape %s; nametemplate=%s.vst; description="Valentina multisize measurements" edit=tape '%s'; priority=6
+application/x-valentina-k-pattern; tape %s; nametemplate=%s.vst; description="Valentina known measurements" edit=tape '%s'; priority=6
 application/x-valentina-layout; puzzle %s; nametemplate=%s.vlt; description="Valentina layout" edit=puzzle '%s'; priority=6

dist/macx/tape/Info.plist

@@ -54,6 +54,20 @@
 			<key>LSHandlerRank</key>
 			<string>Owner</string>
 		</dict>
+    <dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleTypeIconFile</key>
+			<string>k-measurements.icns</string>
+			<key>LSItemContentTypes</key>
+			<array>
+                                <string>ua.com.smart-pattern.vkm</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Valentina known measurements</string>
+			<key>LSHandlerRank</key>
+			<string>Owner</string>
+		</dict>
 	</array>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
@@ -100,6 +114,27 @@
 				<key>public.mime-type</key>
 				<string>text/xml</string>
 			</dict>
+      <dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.text</string>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Valentina known measurements</string>
+			<key>UTTypeIconFile</key>
+			<string>k-measurements.icns</string>
+			<key>UTTypeIdentifier</key>
+                        <string>ua.com.smart-pattern.vkm</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>vkm</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>text/xml</string>
+			</dict>
 		</dict>
 	</array>
 </dict>

dist/macx/valentina/Info.plist

@@ -68,6 +68,20 @@
 			<key>LSHandlerRank</key>
 			<string>Alternate</string>
 		</dict>
+    <dict>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>CFBundleTypeIconFile</key>
+			<string>k-measurements.icns</string>
+			<key>LSItemContentTypes</key>
+			<array>
+                                <string>ua.com.smart-pattern.vkm</string>
+			</array>
+			<key>CFBundleTypeName</key>
+                        <string>Valentina known measurements</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+		</dict>
 	</array>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
@@ -134,6 +148,27 @@
 					<string>vst</string>
 				</array>
 				<key>public.mime-type</key>
+        <string>text/xml</string>
+			</dict>
+      <dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.text</string>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeDescription</key>
+            <string>Valentina known measurements</string>
+			<key>UTTypeIconFile</key>
+			<string>k-measurements.icns</string>
+			<key>UTTypeIdentifier</key>
+                        <string>ua.com.smart-pattern.vkm</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>vkm</string>
+				</array>
+				<key>public.mime-type</key>
         <string>text/xml</string>
 			</dict>
 		</dict>

dist/ua.com.smart-pattern.tape.desktop

@@ -9,7 +9,7 @@ Comment=Create and edit measurements
 Comment[uk]=Створюйте і редагуйте мірки
 Icon=tape
 Terminal=false
-MimeType=application/x-valentina-s-measurements;application/x-valentina-i-measurements;
+MimeType=application/x-valentina-s-measurements;application/x-valentina-i-measurements;application/x-valentina-k-measurements
 Categories=Qt;Utility;FileTools;
 TryExec=tape
 Keywords=measurements

qbs/imports/VToolApp.qbs

@@ -61,14 +61,6 @@ VApp {
                 files.push("valentina_" + locales[i] + ".ts");
             }
 
-            var pmSystems = i18nconfig.pmSystems;
-
-            for (var i = 0; i < pmSystems.length; i++) {
-                for (var j = 0; j < locales.length; j++) {
-                    files.push("measurements_" + pmSystems[i] + "_" + locales[j] + ".ts");
-                }
-            }
-
             return files;
         }
     }

qbs/modules/buildconfig/buildconfig.qbs

@@ -560,13 +560,11 @@ Module {
                     "-Qunused-arguments",
                     "-fcolor-diagnostics",
                     "-Wno-gnu-zero-variadic-macro-arguments",
-                    "-fms-extensions" // Need for pragma message
+                    "-fms-extensions", // Need for pragma message
+                    "-Wcompletion-handler",
+                    "-Wno-pre-c++17-compat-pedantic"
                 )
 
-                if (Utilities.versionCompare(cpp.compilerVersion, "14") < 0) {
-                    debugFlags.push("-Wweak-template-vtables")
-                }
-
                 if (Utilities.versionCompare(cpp.compilerVersion, "13") >= 0) {
                     debugFlags.push(
                         "-Wreserved-identifier",
@@ -576,6 +574,16 @@ Module {
                     )
                 }
 
+                if (Utilities.versionCompare(cpp.compilerVersion, "14") < 0) {
+                    debugFlags.push("-Wweak-template-vtables")
+                }
+
+                if (Utilities.versionCompare(cpp.compilerVersion, "14") >= 0) {
+                    debugFlags.push(
+                        "-Wbitwise-instead-of-logical"
+                    )
+                }
+
                 if (Utilities.versionCompare(cpp.compilerVersion, "15") >= 0) {
                     debugFlags.push(
                         "-Warray-parameter"

qbs/modules/i18nconfig/i18nconfig.qbs

@@ -58,11 +58,4 @@ Module {
 //        "sv", Not supported by Valentina
 //        "tr", Not supported by Valentina
     ]
-
-    readonly property stringList pmSystems: [
-        "p0", "p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15",
-        "p16", "p17", "p18", "p19", "p20", "p21", "p22", "p23", "p24", "p25", "p26", "p27", "p28", "p29",
-        "p30", "p31", "p32", "p33", "p34", "p35", "p36", "p37", "p38", "p39", "p40", "p41", "p42", "p43",
-        "p44", "p45", "p46", "p47", "p48", "p49", "p50", "p51", "p52", "p53", "p54", "p998"
-    ]
 }

scripts/lupdate.sh

@@ -6,32 +6,18 @@
 start=$(date +%s)
 
 # Download all translations from transifex.com.
-cd ../share/translations
-RESOURCES=`find . -regextype sed -regex ".*/measurements_p[0-9]\{1,2\}\.ts"`
-cd ../../scripts
 
 # Empty means unstable branch
 MEASUREMENTS_BRANCH='' # For example _05x
 VALENTINA_BRANCH=''    # for example 05x
 
-NUMBER=( $RESOURCES )
-NUMBER=${#NUMBER[@]}
-
 # Certant languages like he_IL and zh_CN are not supported by math parser
-for ((i=0;i<NUMBER;i++)); do
-  tx pull -r valentina-project.measurements_p${i}${MEASUREMENTS_BRANCH}ts --mode=default -f --skip -l "uk,de_DE,cs,he_IL,fr_FR,it_IT,nl,id,es,fi,en_US,en_CA,en_IN,ro_RO,zh_CN,pt_BR,el_GR,pl_PL" &
-  sleep 2
-done
-
-tx pull -r valentina-project.valentina_${VALENTINA_BRANCH}ts --mode=default -f --skip &
-sleep 2
-tx pull -r valentina-project.measurements_p998${MEASUREMENTS_BRANCH}ts --mode=default -f --skip -l "uk,de_DE,cs,he_IL,fr_FR,it_IT,nl,id,es,fi,en_US,en_CA,en_IN,ro_RO,zh_CN,pt_BR,el_GR,pl_PL" &
+tx pull -r valentina-project.valentina_${VALENTINA_BRANCH}ts --mode=default -f --skip -l "${LANGUAGES}" &
 
 wait
 
 # Update local strings
 lupdate -recursive ../share/translations/translations.pro
-lupdate -recursive ../share/translations/measurements.pro
 #clean stale QM files
 rm -f -v ../share/translations/*.qm
 # force to run qmake

scripts/qbs_lupdate.sh

@@ -5,29 +5,14 @@
 start=$(date +%s)
 
 # Download all translations from transifex.com.
-cd ../share/translations
-RESOURCES=`find . -regextype sed -regex ".*/measurements_p[0-9]\{1,2\}\.ts"`
-cd ../../scripts
 
 # Empty means unstable branch
-MEASUREMENTS_BRANCH='' # For example _05x
 VALENTINA_BRANCH=''    # for example 05x
 
 LANGUAGES="uk,de_DE,cs,he_IL,fr_FR,it_IT,nl,id,es,fi,en_US,en_CA,en_IN,ro_RO,zh_CN,pt_BR,el_GR,pl_PL"
 
-NUMBER=( $RESOURCES )
-NUMBER=${#NUMBER[@]}
-
 # Certant languages like he_IL and zh_CN are not supported by math parser
-for ((i=0;i<NUMBER;i++)); do
-  tx pull -r valentina-project.measurements_p${i}${MEASUREMENTS_BRANCH}ts --mode=default -f --skip -l "${LANGUAGES}" &
-  sleep 2
-done
-
 tx pull -r valentina-project.valentina_${VALENTINA_BRANCH}ts --mode=default -f --skip -l "${LANGUAGES}" &
-sleep 2
-tx pull -r valentina-project.measurements_p998${MEASUREMENTS_BRANCH}ts --mode=default -f --skip -l "${LANGUAGES}" &
-
 wait
 
 # cannot fix incorrect placing for pattern making systems
@@ -38,7 +23,6 @@ rm -r ./share
 qbs resolve -d ../../build_translations modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:$HOME/Qt6.5/6.5.0/gcc_64/bin/qmake
 # Update local strings
 qbs -d ../../build_translations -f ../valentina.qbs -p 'Translations' modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:$HOME/Qt6.5/6.5.0/gcc_64/bin/qmake
-qbs -d ../../build_translations -f ../valentina.qbs -p 'MTranslations' modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:$HOME/Qt6.5/6.5.0/gcc_64/bin/qmake
 
 end=$(date +%s)
 runtime=$(python3 -c "print('Time passed %u:%02u seconds' % ((${end} - ${start})/60, (${end} - ${start})%60))")

share/translations/measurements.pro

@@ -1,55 +0,0 @@
-# Don't use this pro file for building project!!!
-# I made this hack for creation one TS file for whole project.
-# Because we have several libraries that also have strings for translation, have several TS files for each
-# subproject annoying.
-#
-# Original idea "How to generate a single translation file for a large Qt project?"
-# https://stackoverflow.com/questions/1829474/how-to-generate-a-single-translation-file-for-a-large-qt-project
-
-TEMPLATE = app
-DEPENDPATH +=  \
-            ../../src/libs/vpatterndb
-
-include(../../src/libs/vpatterndb/trmeasurements.pri)
-
-# Add here path to new translation file with name "valentina_*_*.ts" if you want to add new language.
-# Same paths in variable INSTALL_TRANSLATIONS (translations.pri).
-
-# File measurements_*.ts we use in transifex.com. It is empty translation file only with english inside.
-# transifex.com use this file like base for new language. Don't add path to measurements_*.ts to INSTALL_TRANSLATIONS
-# variable (app.pro).
-# When adding a translation here, also add it in the macx part (translations.pri).
-
-PMSYSTEMS += \
-    p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 p18 p19 p20 p21 p22 p23 p24 p25 p26 p27 p28 p29 p30 \
-    p31 p32 p33 p34 p35 p36 p37 p38 p39 p40 p41 p42 p43 p44 p45 p46 p47 p48 p49 p50 p51 p52 p53 p54 p998
-
-LANGUAGES += \
-    uk_UA \
-    de_DE \
-    cs_CZ \
-    he_IL \
-    fr_FR \
-    it_IT \
-    nl_NL \
-    id_ID \
-    es_ES \
-    fi_FI \
-    en_US \
-    en_CA \
-    en_IN \
-    ro_RO \
-    zh_CN \
-    pt_BR \
-    el_GR \
-    pl_PL
-
-
-for(sys, PMSYSTEMS) {
-	TRANSLATIONS += measurements_$${sys}.ts
-
-	for(lang, LANGUAGES) {
-        TRANSLATIONS += measurements_$${sys}_$${lang}.ts
-    }
-}
-

share/translations/measurements.qbs

@@ -1,48 +0,0 @@
-import qbs.FileInfo
-
-Product {
-    Depends { name: "i18n" }
-    Depends { name: "i18nconfig" }
-
-    name: "MTranslations"
-    type: "ts"
-    builtByDefault: false
-
-    Group {
-        name: "Headers"
-        prefix: project.sourceDirectory + "/src/"
-        files: [
-            "libs/vpatterndb/vtranslatemeasurements.h"
-        ]
-        fileTags: "i18n.hpp"
-    }
-
-    Group {
-        name: "Sources"
-        prefix: project.sourceDirectory + "/src/"
-        files: [
-            "libs/vpatterndb/vtranslatemeasurements.cpp"
-        ]
-        fileTags: "i18n.src"
-    }
-
-    Group {
-        name: "Translations"
-        files: {
-            var files = [];
-
-        var locales = i18nconfig.translationLocales;
-        var pmSystems = i18nconfig.pmSystems;
-
-        for (var i = 0; i < pmSystems.length; i++) {
-            files.push("measurements_" + pmSystems[i] + ".ts");
-            for (var j = 0; j < locales.length; j++) {
-                files.push("measurements_" + pmSystems[i] + "_" + locales[j] + ".ts");
-            }
-        }
-
-            return files;
-        }
-        fileTags: "i18n.ts"
-    }
-}