VSinerva/freesewing
1
0
Fork 0
Code Activity

Merge branch 'develop' into cdocs

Browse source
This commit is contained in:
joostdecock 2025-05-24 12:07:19 +02:00
commit b914b6299f
89 changed files with 1571 additions and 737 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/react/components/Editor/lib/export/index.mjs
View file

@ -158,7 +158,9 @@ export const handleExport = async ({
workerArgs.strings.setName = settings?.metadata?.setName
? settings.metadata.setName
: 'ephemeral'
workerArgs.strings.yaml = yaml.dump(settings)
const settingsWithoutLayout = structuredClone(settings)
delete settingsWithoutLayout.layout
workerArgs.strings.yaml = yaml.dump(settingsWithoutLayout)
workerArgs.strings.version = store?.data?.version ? store.data.version : ''
const notes = store?.plugins?.['plugin-annotations']?.flags?.note
? store?.plugins?.['plugin-annotations']?.flags?.note
@ -190,9 +192,9 @@ const flagsToString = (flags, mustache, t) => {
let first = true
let string = ''
for (const flag of Object.values(flags)) {
let title = flag.replace ? mustache.render(flag.title, flag.replace) : flag.title
let title = flag.replace ? mustache.render(t(flag.title), flag.replace) : t(flag.title)
title = he.decode(title)
let desc = flag.replace ? mustache.render(flag.desc, flag.replace) : flag.desc
let desc = flag.replace ? mustache.render(t(flag.desc), flag.replace) : t(flag.desc)
desc = desc.replaceAll('\n\n', '\n')
desc = desc.replaceAll('\n', ' ')
desc = he.decode(desc)

8
packages/react/components/Editor/lib/layout-settings.mjs
View file

@ -20,7 +20,8 @@ const defaultPrintSettings = (units) => ({
size: units === 'imperial' ? 'letter' : 'a4',
orientation: 'portrait',
margin: units === 'imperial' ? 12.7 : 10,
coverPage: true,
coverPage: 1,
iconSize: 0.5,
})
export function menuLayoutSettingsStructure(units) {
@ -76,6 +77,7 @@ export function menuLayoutSettingsStructure(units) {
),
},
icon: PageOrientationIcon,
dflt: defaults.orientation,
},
margin: {
dense: true,
@ -98,7 +100,7 @@ export function menuLayoutSettingsStructure(units) {
0: 'Do not include a cover page',
1: 'Include a cover page',
},
dflt: 0,
dflt: defaults.coverPage,
},
iconSize: {
dense: true,
@ -108,7 +110,7 @@ export function menuLayoutSettingsStructure(units) {
about:
'Controls the size of the icons that allow you to rotate/flip individual pattern parts',
min: 10,
dflt: 0.5,
dflt: defaults.iconSize,
step: 1,
max: 200,
},