AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add preference for object auto-layout spacing

Browse source
This commit is contained in:
Stewart Allen 2021-02-09 10:35:14 -05:00
commit 2f184703e7
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/kiri/conf.js
View file

@ -646,6 +646,7 @@
showSpeeds: true, showSpeeds: true,
freeLayout: true, freeLayout: true,
autoLayout: true, autoLayout: true,
spaceLayout: 1,
units: "mm", units: "mm",
exportOcto: false, exportOcto: false,
exportGhost: false, exportGhost: false,

3
src/kiri/init.js
View file

@ -1618,9 +1618,10 @@
units: UC.newSelect(LANG.op_unit_s, {title: LANG.op_unit_l, action: unitsSave, modes:CAM, trace:true}, "units"), units: UC.newSelect(LANG.op_unit_s, {title: LANG.op_unit_l, action: unitsSave, modes:CAM, trace:true}, "units"),
layout: UC.newGroup(LANG.lo_menu, $('prefs-lay'), {inline: true}), layout: UC.newGroup(LANG.lo_menu, $('prefs-lay'), {inline: true}),
autoSave: UC.newBoolean(LANG.op_save_s, booleanSave, {title:LANG.op_save_l}),
autoLayout: UC.newBoolean(LANG.op_auto_s, booleanSave, {title:LANG.op_auto_l}), autoLayout: UC.newBoolean(LANG.op_auto_s, booleanSave, {title:LANG.op_auto_l}),
freeLayout: UC.newBoolean(LANG.op_free_s, booleanSave, {title:LANG.op_free_l}), freeLayout: UC.newBoolean(LANG.op_free_s, booleanSave, {title:LANG.op_free_l}),
autoSave: UC.newBoolean(LANG.op_save_s, booleanSave, {title:LANG.op_save_l}), spaceLayout: UC.newInput(LANG.op_spcr_s, {title:LANG.op_spcr_l, convert:UC.toFloat, size:3, units:true}),
export: UC.newGroup(LANG.xp_menu, $('prefs-xpo'), {inline: true}), export: UC.newGroup(LANG.xp_menu, $('prefs-xpo'), {inline: true}),
exportOcto: UC.newBoolean(`OctoPrint`, booleanSave), exportOcto: UC.newBoolean(`OctoPrint`, booleanSave),

2
src/kiri/main.js
View file

@ -1755,7 +1755,7 @@
forAllWidgets(function(w) { platform.select(w, true) }) forAllWidgets(function(w) { platform.select(w, true) })
} }
function platformLayout(event, space) { function platformLayout(event, space = settings.controller.spaceLayout) {
let auto = UI.autoLayout.checked, let auto = UI.autoLayout.checked,
proc = settings.process, proc = settings.process,
dev = settings.device, dev = settings.device,

2
web/kiri/lang/en.js
View file

@ -144,6 +144,8 @@ kiri.lang['en-us'] = {
op_auto_l: "automatically layout platform\nwhen new items added", op_auto_l: "automatically layout platform\nwhen new items added",
op_free_s: "free layout", op_free_s: "free layout",
op_free_l: "permit dragable layout\nno effect in laser mode", op_free_l: "permit dragable layout\nno effect in laser mode",
op_spcr_s: "spacing",
op_spcr_l: "spacing between objects\nduring auto layout\nin workspace units",
op_invr_s: "invert zoom", op_invr_s: "invert zoom",
op_invr_l: "invert mouse wheel\nscroll zoom", op_invr_l: "invert mouse wheel\nscroll zoom",
op_save_s: "auto save", op_save_s: "auto save",