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

rework right hand settings menu

Browse source
This commit is contained in:
Stewart Allen 2020-06-06 00:38:46 -04:00
commit 757457fed2
5 changed files with 88 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/kiri/init.js
View file

@ -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}),

11
src/kiri/ui.js
View file

@ -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);

68
web/kiri/index.css
View file

@ -1,4 +1,4 @@
a, a:hover, a:visited {
setpopsetpopa, a:hover, a:visited {
border: none;
outline: none;
color: inherit;
@ -172,6 +172,20 @@ th, tr, td, span, div, label, button {
background-image: linear-gradient(to right, #ddd, #666, #ddd);
}
#lt-top {
height: 10px;
border-top-right-radius: 10px;
background-color: #abc;
left: -5px;
}
#lt-end {
height: 10px;
border-bottom-right-radius: 10px;
background-color: #abc;
left: -5px;
}
.pop-lcol {
position: absolute;
display: none;
@ -349,3 +363,55 @@ th, tr, td, span, div, label, button {
margin: 5px;
text-align: center;
}
#settings {
align-items: stretch;
}
#set-top {
color: black;
padding: 1px 10px 2px 2px;
border-top-left-radius: 10px;
border-bottom-left-radius: 0;
background-color: #abc;
}
#set-end {
color: black;
padding: 1px 10px 2px 2px;
border-top-left-radius: 0;
border-bottom-left-radius: 10px;
background-color: #abc;
height: 10px;
}
.setgroup {
align-items: center;
flex-direction: column;
background-color: rgba(255,255,255,0.75);
border: 1px solid rgba(0,0,0,0);
border-radius: 3px;
margin: 2px 0 2px 4px;
padding: 8px 10px 8px 5px;
color: #89a;
right: -5px;
}
.setgroup:hover {
background-color: #eee;
border: 1px solid #aaa;
color: #000;
}
.setpop {
top: 50%;
right: 100%;
position: absolute;
white-space: nowrap;
flex-direction: column;
transform: translateY(-50%);
background-color: rgba(255,255,255,0.5);
border: 1px solid #aaa;
border-radius: 3px;
padding: 5px;
margin-right: 5px;
}
.setpop label {
padding: 2px 4px 2px 0;
flex-grow: 1;
}

4
web/kiri/index.html
View file

@ -32,6 +32,7 @@
<div id="mid-sep"></div>
<div id="mid" class="grow row">
<div id="mid-lcol" class="col j-center">
<div id="lt-top"></div>
<div id="lt-setup" class="lt-menu">
<i class="fas fa-cogs"></i>
<label>setup</label>
@ -86,6 +87,7 @@
</div>
</div>
</div>
<div id="lt-end"></div>
</div>
<div id="mid-mcol" class="grow">
<div id="modal">
@ -109,7 +111,9 @@
</div>
</div>
<div id="mid-rcol" class="col j-center">
<div id="set-top" class="setgroup"><a>settings</a></div>
<div id="settings" class="col"></div>
<div id="set-end" class="setgroup"></div>
<div id="slider" class="col">
<div id="slider-begin">0</div>
<div id="slider-center" class="grow">

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

@ -150,7 +150,7 @@ kiri.lang['en-us'] = {
la_move: "moves",
// SETTINGS
se_menu: "settings",
se_menu: "library",
se_load: "load",
se_save: "save",
@ -275,7 +275,7 @@ kiri.lang['en-us'] = {
cd_lift_l: "lift between plunges\nafter dwell period\nin workspace units\n0 to disable",
// CNC CUTOUT TABS
ct_menu: "cutout tabs",
ct_menu: "tabs",
ct_angl_s: "angle",
ct_angl_l: "starting angle for tab spacing\nin degrees (0-360)",
ct_numb_s: "count",