diff --git a/dist/OBS_debian/debian.valentina.mime b/dist/OBS_debian/debian.valentina.mime index b863ec357..41cca2cd6 100644 --- a/dist/OBS_debian/debian.valentina.mime +++ b/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 diff --git a/dist/debian/valentina.mime b/dist/debian/valentina.mime index b863ec357..41cca2cd6 100644 --- a/dist/debian/valentina.mime +++ b/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 diff --git a/dist/macx/k-measurements.icns b/dist/macx/k-measurements.icns new file mode 100644 index 000000000..7d0890938 Binary files /dev/null and b/dist/macx/k-measurements.icns differ diff --git a/dist/macx/tape/Info.plist b/dist/macx/tape/Info.plist index 41c3199f6..53fdebdb9 100755 --- a/dist/macx/tape/Info.plist +++ b/dist/macx/tape/Info.plist @@ -54,6 +54,20 @@ LSHandlerRank Owner + + CFBundleTypeRole + Editor + CFBundleTypeIconFile + k-measurements.icns + LSItemContentTypes + + ua.com.smart-pattern.vkm + + CFBundleTypeName + Valentina known measurements + LSHandlerRank + Owner + UTExportedTypeDeclarations @@ -100,6 +114,27 @@ public.mime-type text/xml + + UTTypeConformsTo + + public.text + public.xml + + UTTypeDescription + Valentina known measurements + UTTypeIconFile + k-measurements.icns + UTTypeIdentifier + ua.com.smart-pattern.vkm + UTTypeTagSpecification + + public.filename-extension + + vkm + + public.mime-type + text/xml + diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_128x128.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_128x128.png new file mode 100644 index 000000000..005169078 Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_128x128.png differ diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_128x128@2x.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..6484843d7 Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_128x128@2x.png differ diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_16x16.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_16x16.png new file mode 100644 index 000000000..0f20a1d71 Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_16x16.png differ diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_16x16@2x.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..033e021c8 Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_16x16@2x.png differ diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_256x256.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_256x256.png new file mode 100644 index 000000000..2a9efb2cf Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_256x256.png differ diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_256x256@2x.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..9ca5c5d31 Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_256x256@2x.png differ diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_32x32.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_32x32.png new file mode 100644 index 000000000..218ed2cc7 Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_32x32.png differ diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_32x32@2x.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..95228f9e7 Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_32x32@2x.png differ diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_512x512.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_512x512.png new file mode 100644 index 000000000..9ca5c5d31 Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_512x512.png differ diff --git a/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_512x512@2x.png b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_512x512@2x.png new file mode 100644 index 000000000..56a525bc6 Binary files /dev/null and b/dist/macx/valentina-project.xcassets/k-measurements.iconset/icon_512x512@2x.png differ diff --git a/dist/macx/valentina/Info.plist b/dist/macx/valentina/Info.plist index d84c7d10c..a7368dcc6 100755 --- a/dist/macx/valentina/Info.plist +++ b/dist/macx/valentina/Info.plist @@ -68,6 +68,20 @@ LSHandlerRank Alternate + + CFBundleTypeRole + Viewer + CFBundleTypeIconFile + k-measurements.icns + LSItemContentTypes + + ua.com.smart-pattern.vkm + + CFBundleTypeName + Valentina known measurements + LSHandlerRank + Alternate + UTExportedTypeDeclarations @@ -134,6 +148,27 @@ vst public.mime-type + text/xml + + + UTTypeConformsTo + + public.text + public.xml + + UTTypeDescription + Valentina known measurements + UTTypeIconFile + k-measurements.icns + UTTypeIdentifier + ua.com.smart-pattern.vkm + UTTypeTagSpecification + + public.filename-extension + + vkm + + public.mime-type text/xml diff --git a/dist/ua.com.smart-pattern.tape.desktop b/dist/ua.com.smart-pattern.tape.desktop index b1c6ca9d3..9e1ac9c96 100644 --- a/dist/ua.com.smart-pattern.tape.desktop +++ b/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 diff --git a/dist/win/k-measurements.ico b/dist/win/k-measurements.ico new file mode 100644 index 000000000..5a3d2c639 Binary files /dev/null and b/dist/win/k-measurements.ico differ diff --git a/share/icons/128x128/mimetypes/application-x-valentina-k-measurements.png b/share/icons/128x128/mimetypes/application-x-valentina-k-measurements.png new file mode 100644 index 000000000..49f3bfa1e Binary files /dev/null and b/share/icons/128x128/mimetypes/application-x-valentina-k-measurements.png differ diff --git a/share/icons/256x256/mimetypes/application-x-valentina-k-measurements.png b/share/icons/256x256/mimetypes/application-x-valentina-k-measurements.png new file mode 100644 index 000000000..de2da82e5 Binary files /dev/null and b/share/icons/256x256/mimetypes/application-x-valentina-k-measurements.png differ diff --git a/share/icons/48x48/mimetypes/application-x-valentina-k-measurements.png b/share/icons/48x48/mimetypes/application-x-valentina-k-measurements.png new file mode 100644 index 000000000..caf5055c9 Binary files /dev/null and b/share/icons/48x48/mimetypes/application-x-valentina-k-measurements.png differ diff --git a/share/icons/512x512/mimetypes/application-x-valentina-k-measurements.png b/share/icons/512x512/mimetypes/application-x-valentina-k-measurements.png new file mode 100644 index 000000000..9ca5c5d31 Binary files /dev/null and b/share/icons/512x512/mimetypes/application-x-valentina-k-measurements.png differ diff --git a/share/icons/64x64/mimetypes/application-x-valentina-k-measurements.png b/share/icons/64x64/mimetypes/application-x-valentina-k-measurements.png new file mode 100644 index 000000000..7eb99fe59 Binary files /dev/null and b/share/icons/64x64/mimetypes/application-x-valentina-k-measurements.png differ diff --git a/share/size-guide.png b/share/size-guide.png new file mode 100644 index 000000000..9ca5c5d31 Binary files /dev/null and b/share/size-guide.png differ diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index ad6d30870..027b5af7b 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -111,6 +111,7 @@ unix{ format.path = $$RESOURCES_DIR/ format.files += $$PWD/../../../dist/macx/i-measurements.icns format.files += $$PWD/../../../dist/macx/s-measurements.icns + format.files += $$PWD/../../../dist/macx/k-measurements.icns QMAKE_BUNDLE_DATA += \ templates \ diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs index b49e304f6..e3c8d1388 100644 --- a/src/app/tape/tape.qbs +++ b/src/app/tape/tape.qbs @@ -168,35 +168,40 @@ VToolApp { Group { name: "apps48x48/mimetypes" prefix: project.sourceDirectory + "/share/icons/48x48/mimetypes/" - files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] + files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png", + "application-x-valentina-k-measurements.png"] fileTags: "freedesktop.48x48MimetypesIcons" } Group { name: "apps64x64/mimetypes" prefix: project.sourceDirectory + "/share/icons/64x64/mimetypes/" - files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] + files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png", + "application-x-valentina-k-measurements.png"] fileTags: "freedesktop.64x64MimetypesIcons" } Group { name: "apps128x128/mimetypes" prefix: project.sourceDirectory + "/share/icons/128x128/mimetypes/" - files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] + files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png", + "application-x-valentina-k-measurements.png"] fileTags: "freedesktop.128x128MimetypesIcons" } Group { name: "apps256x256/mimetypes" prefix: project.sourceDirectory + "/share/icons/256x256/mimetypes/" - files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] + files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png", + "application-x-valentina-k-measurements.png"] fileTags: "freedesktop.256x256MimetypesIcons" } Group { name: "apps512x512/mimetypes" prefix: project.sourceDirectory + "/share/icons/512x512/mimetypes/" - files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] + files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png", + "application-x-valentina-k-measurements.png"] fileTags: "freedesktop.512x512MimetypesIcons" } @@ -214,6 +219,7 @@ VToolApp { files: [ "i-measurements.ico", "s-measurements.ico", + "k-measurements.ico", ] qbs.install: true qbs.installDir: buildconfig.installAppPath @@ -235,7 +241,8 @@ VToolApp { prefix: project.sourceDirectory + "/dist/macx/valentina-project.xcassets/" files: [ "i-measurements.iconset", - "s-measurements.iconset" + "s-measurements.iconset", + "k-measurements.iconset" ] } } diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 75afc03cb..9c72ac934 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -175,6 +175,7 @@ unix{ ../../../share/icons/48x48/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/48x48/mimetypes/application-x-valentina-i-measurements.png \ ../../../share/icons/48x48/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/48x48/mimetypes/application-x-valentina-k-measurements.png \ ../../../share/icons/48x48/mimetypes/application-x-valentina-layout.png hicolor_64_apps.path = $$DATADIR/icons/hicolor/64x64/apps/ @@ -188,6 +189,7 @@ unix{ ../../../share/icons/64x64/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/64x64/mimetypes/application-x-valentina-i-measurements.png \ ../../../share/icons/64x64/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/64x64/mimetypes/application-x-valentina-k-measurements.png \ ../../../share/icons/64x64/mimetypes/application-x-valentina-layout.png hicolor_128_apps.path = $$DATADIR/icons/hicolor/128x128/apps/ @@ -201,6 +203,7 @@ unix{ ../../../share/icons/128x128/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/128x128/mimetypes/application-x-valentina-i-measurements.png \ ../../../share/icons/128x128/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/128x128/mimetypes/application-x-valentina-k-measurements.png \ ../../../share/icons/128x128/mimetypes/application-x-valentina-layout.png hicolor_256_apps.path = $$DATADIR/icons/hicolor/256x256/apps/ @@ -214,6 +217,7 @@ unix{ ../../../share/icons/256x256/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/256x256/mimetypes/application-x-valentina-i-measurements.png \ ../../../share/icons/256x256/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/256x256/mimetypes/application-x-valentina-k-measurements.png \ ../../../share/icons/256x256/mimetypes/application-x-valentina-layout.png hicolor_512_apps.path = $$DATADIR/icons/hicolor/512x512/apps/ @@ -227,6 +231,7 @@ unix{ ../../../share/icons/512x512/mimetypes/application-x-valentina-pattern.png \ ../../../share/icons/512x512/mimetypes/application-x-valentina-i-measurements.png \ ../../../share/icons/512x512/mimetypes/application-x-valentina-s-measurements.png \ + ../../../share/icons/512x512/mimetypes/application-x-valentina-k-measurements.png \ ../../../share/icons/512x512/mimetypes/application-x-valentina-layout.png # Path to translation files after installation @@ -310,6 +315,7 @@ unix{ icns_resources.path = $$RESOURCES_DIR/ icns_resources.files += $$PWD/../../../dist/macx/i-measurements.icns icns_resources.files += $$PWD/../../../dist/macx/s-measurements.icns + icns_resources.files += $$PWD/../../../dist/macx/k-measurements.icns icns_resources.files += $$PWD/../../../dist/macx/pattern.icns icns_resources.files += $$PWD/../../../dist/macx/layout.icns @@ -341,6 +347,7 @@ win32:*g++* { $$PWD/../../../dist/win/valentina.ico \ $$PWD/../../../dist/win/i-measurements.ico \ $$PWD/../../../dist/win/s-measurements.ico \ + $$PWD/../../../dist/win/k-measurements.ico \ $$PWD/../../../dist/win/pattern.ico \ $$PWD/../../../dist/win/layout.ico \ $$PWD/../../../dist/win/pdftops.exe \ diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs index 481df0252..1aa45e0a4 100644 --- a/src/app/valentina/valentina.qbs +++ b/src/app/valentina/valentina.qbs @@ -378,7 +378,8 @@ VToolApp { "pattern.iconset", "layout.iconset", "i-measurements.iconset", - "s-measurements.iconset" + "s-measurements.iconset", + "k-measurements.iconset" ] } }