rework right hand settings menu
This commit is contained in:
parent
d3680873fe
commit
757457fed2
5 changed files with 88 additions and 23 deletions
|
|
@ -1238,17 +1238,7 @@
|
|||
// allow modules to insert new items at the bottom of the left menu
|
||||
// appendLeft: UC.checkpoint(),
|
||||
|
||||
settingsGroup: UC.newGroup(LANG.se_menu, $('settings'), {region:"right"}),
|
||||
settingsTable: UC.newTableRow([
|
||||
[
|
||||
UI.settingsLoad =
|
||||
UC.newButton(LANG.se_load, settingsLoad),
|
||||
UI.settingsSave =
|
||||
UC.newButton(LANG.se_save, settingsSave)
|
||||
]
|
||||
]),
|
||||
|
||||
process: UC.newGroup(LANG.sl_menu, control, {modes:FDM_LASER}),
|
||||
process: UC.newGroup(LANG.sl_menu, $('settings'), {modes:FDM_LASER}),
|
||||
sliceHeight: UC.newInput(LANG.sl_lahi_s, {title:LANG.sl_lahi_l, convert:UC.toFloat, modes:FDM}),
|
||||
sliceShells: UC.newInput(LANG.sl_shel_s, {title:LANG.sl_shel_l, convert:UC.toInt, modes:FDM}),
|
||||
sliceTopLayers: UC.newInput(LANG.sl_ltop_s, {title:LANG.sl_ltop_l, convert:UC.toInt, modes:FDM}),
|
||||
|
|
@ -1259,7 +1249,7 @@
|
|||
laserSliceHeight: UC.newInput(LANG.ls_lahi_s, {title:LANG.ls_lahi_l, convert:UC.toFloat, modes:LASER}),
|
||||
laserSliceSingle: UC.newBoolean(LANG.ls_sngl_s, onBooleanClick, {title:LANG.ls_sngl_l, modes:LASER}),
|
||||
|
||||
process: UC.newGroup(LANG.fi_menu, control, {modes:FDM}),
|
||||
process: UC.newGroup(LANG.fi_menu, $('settings'), {modes:FDM}),
|
||||
sliceFillType: UC.newSelect(LANG.fi_type, {modes:FDM}, "infill"),
|
||||
sliceFillSparse: UC.newInput(LANG.fi_pcnt_s, {title:LANG.fi_pcnt_l, convert:UC.toFloat, bound:UC.bound(0.0,1.0), modes:FDM}),
|
||||
sliceFillAngle: UC.newInput(LANG.fi_angl_s, {title:LANG.fi_angl_l, convert:UC.toFloat, modes:FDM, expert:true}),
|
||||
|
|
@ -1424,6 +1414,16 @@
|
|||
slaFirstOffset: UC.newInput(LANG.sa_opzo_s, {title:LANG.sa_opzo_l, convert:UC.toFloat, bound:UC.bound(0,1), modes:SLA, expert:true}),
|
||||
slaAntiAlias: UC.newSelect(LANG.sa_opaa_s, {title:LANG.sa_opaa_l, modes:SLA}, "antialias"),
|
||||
|
||||
settingsGroup: UC.newGroup(LANG.se_menu, $('settings')),
|
||||
settingsTable: UC.newTableRow([
|
||||
[
|
||||
UI.settingsLoad =
|
||||
UC.newButton(LANG.se_load, settingsLoad),
|
||||
UI.settingsSave =
|
||||
UC.newButton(LANG.se_save, settingsSave)
|
||||
]
|
||||
]),
|
||||
|
||||
layers: UC.setGroup($("layers")),
|
||||
layerOutline: UC.newBoolean(LANG.la_olin, onLayerToggle, {modes:LOCAL ? ALL : FDM_LASER}),
|
||||
layerTrace: UC.newBoolean(LANG.la_trce, onLayerToggle, {modes:FDM_LASER}),
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
let SELF = self,
|
||||
KIRI = self.kiri,
|
||||
lastRegion = null,
|
||||
lastGroup = null,
|
||||
lastDiv = null,
|
||||
addTo = null,
|
||||
|
|
@ -77,7 +76,7 @@
|
|||
}
|
||||
|
||||
function checkpoint() {
|
||||
return { addTo, lastDiv, lastGroup, lastRegion, groupName };
|
||||
return { addTo, lastDiv, lastGroup, groupName };
|
||||
}
|
||||
|
||||
function restore(opt) {
|
||||
|
|
@ -85,7 +84,6 @@
|
|||
addTo = opt.addTo;
|
||||
lastDiv = opt.lastDiv;
|
||||
lastGroup = opt.lastGroup;
|
||||
lastRegion = opt.lastRegion;
|
||||
groupName = opt.groupName;
|
||||
}
|
||||
}
|
||||
|
|
@ -106,7 +104,6 @@
|
|||
function addCollapsableGroup(label, div, options) {
|
||||
let opt = options || {};
|
||||
let group = opt.group || label;
|
||||
lastRegion = opt.region || lastRegion;
|
||||
hideable[group] = opt.nocompact === true ? false : true;
|
||||
|
||||
let row = DOC.createElement('div'),
|
||||
|
|
@ -116,9 +113,7 @@
|
|||
|
||||
if (popper) {
|
||||
let pop = DOC.createElement('div');
|
||||
pop.classList.add('popper');
|
||||
if (lastRegion) pop.classList.add(lastRegion);
|
||||
if (opt.poprow) pop.classList.add('poprow')
|
||||
pop.classList.add('setpop');
|
||||
row.appendChild(pop);
|
||||
addTo = pop;
|
||||
} else {
|
||||
|
|
@ -126,7 +121,7 @@
|
|||
}
|
||||
|
||||
div.appendChild(row);
|
||||
row.setAttribute("class", "grouphead noselect");
|
||||
row.setAttribute("class", "setgroup noselect");
|
||||
row.appendChild(a);
|
||||
a.appendChild(DOC.createTextNode(label));
|
||||
addModeControls(row, opt);
|
||||
|
|
|
|||
Loading…
Reference in a new issue