From 4d675ff2a3cefcb95a42d1fd9c7ed04e8847df9e Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Fri, 31 May 2024 19:10:31 -0400 Subject: [PATCH 1/7] wire up widget delete --- src/kiri/platform.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/kiri/platform.js b/src/kiri/platform.js index 9d39f278..1801dc29 100644 --- a/src/kiri/platform.js +++ b/src/kiri/platform.js @@ -572,6 +572,7 @@ function platformChanged() { h.button({ _: w.meta.file || 'no name', id: `ws-${w.id}`, + class: "grow", onmouseenter() { color = w.getColor(); w.setColor(0x0088ff); @@ -585,7 +586,10 @@ function platformChanged() { } }), - h.button([ h.i({ class:"fas fa-trash" }) ]) + h.button( + { onclick() { platformDelete(w) } }, + [ h.i({ class:"fas fa-trash" }), ] + ) ]) ] From 629d48416058a1bd1d568ed7993cb413363155df Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Fri, 31 May 2024 23:35:42 -0400 Subject: [PATCH 2/7] fix a few mode visible elements --- src/kiri/init.js | 18 ++++++++++-------- src/kiri/ui.js | 6 +----- web/kiri/index.css | 6 +++--- web/kiri/index.html | 2 +- web/kiri/lang/en.js | 3 ++- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 568d62f5..29d0ee07 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1739,11 +1739,13 @@ gapp.register("kiri.init", [], (root, exports) => { deviceOrigin: newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:FDM_LZR, show:() => !ui.deviceRound.checked}), deviceRound: newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, trigger:true, show:isNotBelt}), deviceBelt: newBoolean(LANG.dv_belt_s, onBooleanClick, {title:LANG.dv_belt_l, trigger:true, show:() => !ui.deviceRound.checked}), - extruder: newGroup(LANG.dv_gr_ext, $('device2'), {group:"dext", inline:true, modes:FDM}), + _____: newGroup(LANG.dv_gr_ext, $('device2'), {group:"dext", inline:true, modes:FDM}), extFilament: newInput(LANG.dv_fila_s, {title:LANG.dv_fila_l, convert:toFloat, modes:FDM}), extNozzle: newInput(LANG.dv_nozl_s, {title:LANG.dv_nozl_l, convert:toFloat, modes:FDM}), extOffsetX: newInput(LANG.dv_exox_s, {title:LANG.dv_exox_l, convert:toFloat, modes:FDM}), extOffsetY: newInput(LANG.dv_exoy_s, {title:LANG.dv_exoy_l, convert:toFloat, modes:FDM}), + extruder: newGroup(LANG.dv_gr_ext, $('device2'), {group:"dext", inline:true, modes:FDM}), + _____: newGroup(LANG.dv_gr_too, $('device2'), {group:"dext", inline:true, modes:CAM_LZR}), extSelect: newText(LANG.dv_exts_s, {title:LANG.dv_exts_l, size:14, height:3, area:gcode}), extDeselect: newText(LANG.dv_dext_s, {title:LANG.dv_dext_l, size:14, height:3, area:gcode}), extPad: newBlank({class:"grow", modes:FDM}), @@ -1752,7 +1754,7 @@ gapp.register("kiri.init", [], (root, exports) => { ui.extAdd = newButton(undefined, undefined, {icon:''}), ui.extDel = newButton(undefined, undefined, {icon:''}), ui.extNext = newButton(undefined, undefined, {icon:''}) - ], {class:"dev-buttons ext-buttons"}), + ], {class:"dev-buttons ext-buttons", modes:FDM}), palette: newGroup(LANG.dv_gr_pal, $('palette3'), {group:"dext2", inline:true, modes:FDM}), paletteId: newInput(LANG.dv_paid_s, {title:LANG.dv_paid_l, modes:FDM, size:15, text:true}), palettePing: newInput(LANG.dv_paps_s, {title:LANG.dv_paps_l, modes:FDM, convert:toInt}), @@ -1763,7 +1765,7 @@ gapp.register("kiri.init", [], (root, exports) => { paletteHeat: newInput(LANG.dv_pahe_s, {title:LANG.dv_pahe_l, modes:FDM, convert:toInt}), paletteCool: newInput(LANG.dv_paco_s, {title:LANG.dv_paco_l, modes:FDM, convert:toInt}), palettePress: newInput(LANG.dv_pacm_s, {title:LANG.dv_pacm_l, modes:FDM, convert:toInt}), - gcode: newGroup(LANG.dv_gr_out, $('device2'), {group:"dgco", inline:true, modes:CAM_LZR}), + _____: newGroup(LANG.dv_gr_out, $('device2'), {group:"dgco", inline:true, modes:CAM_LZR}), gcodeStrip: newBoolean(LANG.dv_strc_s, onBooleanClick, {title:LANG.dv_strc_l, modes:CAM}), gcodeSpace: newBoolean(LANG.dv_tksp_s, onBooleanClick, {title:LANG.dv_tksp_l, modes:CAM_LZR}), useLaser: newBoolean(LANG.dv_lazr_s, onBooleanClick, {title:LANG.dv_lazr_l, modes:CAM}), @@ -1785,13 +1787,13 @@ gapp.register("kiri.init", [], (root, exports) => { /** Preferences Menu */ - lprefs: newGroup(LANG.op_menu, $('prefs-gen1'), {inline: true}), + _____: newGroup(LANG.op_menu, $('prefs-gen1'), {inline: true}), antiAlias: newBoolean(LANG.op_anta_s, booleanSave, {title:LANG.op_anta_l}), reverseZoom: newBoolean(LANG.op_invr_s, booleanSave, {title:LANG.op_invr_l}), ortho: newBoolean(LANG.op_orth_s, booleanSave, {title:LANG.op_orth_l}), dark: newBoolean(LANG.op_dark_s, booleanSave, {title:LANG.op_dark_l}), devel: newBoolean(LANG.op_devl_s, booleanSave, {title:LANG.op_devl_l}), - lprefs: newGroup(LANG.op_disp, $('prefs-gen2'), {inline: true}), + _____: newGroup(LANG.op_disp, $('prefs-gen2'), {inline: true}), showOrigin: newBoolean(LANG.op_shor_s, booleanSave, {title:LANG.op_shor_l}), showRulers: newBoolean(LANG.op_shru_s, booleanSave, {title:LANG.op_shru_l}), showSpeeds: newBoolean(LANG.op_sped_s, speedSave, {title:LANG.op_sped_l}), @@ -1800,19 +1802,19 @@ gapp.register("kiri.init", [], (root, exports) => { lineType: newSelect(LANG.op_line_s, {title: LANG.op_line_l, action: lineTypeSave, modes:FDM}, "linetype"), animesh: newSelect(LANG.op_anim_s, {title: LANG.op_anim_l, action: aniMeshSave, modes:CAM}, "animesh"), units: newSelect(LANG.op_unit_s, {title: LANG.op_unit_l, action: unitsSave, modes:CAM, trace:false}, "units"), - layout: newGroup(LANG.lo_menu, $('prefs-lay'), {inline: true}), + _____: newGroup(LANG.lo_menu, $('prefs-lay'), {inline: true}), autoSave: newBoolean(LANG.op_save_s, booleanSave, {title:LANG.op_save_l}), autoLayout: newBoolean(LANG.op_auto_s, booleanSave, {title:LANG.op_auto_l}), freeLayout: newBoolean(LANG.op_free_s, booleanSave, {title:LANG.op_free_l}), spaceRandoX: newBoolean(LANG.op_spcx_s, booleanSave, {title:LANG.op_spcx_l, show:isBelt}), spaceLayout: newInput(LANG.op_spcr_s, {title:LANG.op_spcr_l, convert:toFloat, size:3, units:true}), - export: newGroup(LANG.xp_menu, $('prefs-xpo'), {inline: true}), + _____: newGroup(LANG.xp_menu, $('prefs-xpo'), {inline: true}), exportLocal: newBoolean(`Grid:Local`, booleanSave, {title:LANG.op_exgl_l}), exportGhost: newBoolean(`Grid:Host`, booleanSave, {title:LANG.op_exgh_l}), exportOcto: newBoolean(`OctoPrint`, booleanSave, {title:LANG.op_exop_l}), exportThumb: newBoolean(`Thumbnail`, booleanSave, {modes:FDM}), exportPreview: newBoolean(`Code Preview`, booleanSave), - parts: newGroup(LANG.pt_menu, $('prefs-prt'), {inline: true}), + _____: newGroup(LANG.pt_menu, $('prefs-prt'), {inline: true}), detail: newSelect(LANG.pt_qual_s, {title: LANG.pt_qual_l, action: detailSave}, "detail"), healMesh: newBoolean(LANG.pt_heal_s, booleanSave, {title: LANG.pt_heal_l}), threaded: newBoolean(LANG.pt_thrd_s, booleanSave, {title: LANG.pt_thrd_l, modes:FDM_CAM_SLA}), diff --git a/src/kiri/ui.js b/src/kiri/ui.js index 7711b2f9..b8f45cf2 100644 --- a/src/kiri/ui.js +++ b/src/kiri/ui.js @@ -338,9 +338,6 @@ gapp.register("kiri.ui", [], (root, exports) => { } function addModeControls(el, opt = {}) { - if (opt.trace2) { - console.log({ AMC: el, opt, groupName }); - } el.__opt = opt; el.showMe = function() { el.classList.remove('hide'); @@ -349,7 +346,6 @@ gapp.register("kiri.ui", [], (root, exports) => { el.classList.add('hide'); }; el.setVisible = function(show) { - if (opt.trace2) console.log({ setVisible: show, el }); if (show) el.showMe(); else el.hideMe(); }; @@ -357,7 +353,7 @@ gapp.register("kiri.ui", [], (root, exports) => { let xprt = opt.expert === undefined || (opt.expert === lastExpert); let show = opt.show ? safecall(opt.show) : true; let disp = opt.visible ? opt.visible() : true; - if (opt.trace2) console.log({ setMode: el, mode, modes: el.modes, xprt, show, disp, fn: el.__opt.show }); + if (opt.manual) return; el.setVisible(el.hasMode(mode) && show && xprt && disp); } el.hasMode = function(mode) { diff --git a/web/kiri/index.css b/web/kiri/index.css index 4dbb9f19..f38ba2b4 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -690,7 +690,7 @@ th, tr, td, label { align-items: center; } #ws-widgets button.selected { - background-color: var(--blue-4); + background-color: var(--blue-3); color: #000; } .slim-hide { @@ -1944,14 +1944,14 @@ th, tr, td, label { padding: 4px; margin: 3px; } -.set2-group .var-row { +.set2-group .var-row, .var-row { background: #fff; padding: 1px 4px 1px 4px; margin: 0 !important; border-left: 3px solid transparent; border-right: 3px solid transparent; } -.set2-group .var-row:hover { +.set2-group .var-row:hover, .var-row:hover { border-right: 3px solid var(--blue-1); background-color: var(--blue-4) !important; } diff --git a/web/kiri/index.html b/web/kiri/index.html index 10b9a3fb..e307b356 100644 --- a/web/kiri/index.html +++ b/web/kiri/index.html @@ -172,7 +172,7 @@
- +
diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index 15ab1294..fbb8718f 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -27,7 +27,7 @@ self.kiri.lang['en-us'] = { import: "import", language: "language", left: "left", - machine: "machine", // device or machine + machines: "machines", // device or machine mesh: "mesh", // mesh editing metric: "metric", name: "name", @@ -95,6 +95,7 @@ self.kiri.lang['en-us'] = { // DEVICE dialog groups dv_gr_dev: "device", dv_gr_ext: "extruder", + dv_gr_too: "tool", dv_gr_pal: "palette", dv_gr_out: "output", dv_gr_gco: "gcode macros", From 376e8927e7380fbb608d928715c3bf08e05d78a8 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 1 Jun 2024 00:19:10 -0400 Subject: [PATCH 3/7] clean up device editor --- src/kiri/init.js | 18 +++++++++--------- src/kiri/main.js | 2 ++ web/kiri/index.css | 22 ++++++++++++++-------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 29d0ee07..4d35f120 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1720,34 +1720,34 @@ gapp.register("kiri.init", [], (root, exports) => { devbed: newRow([ uc.newLabel(LANG.volume, { class: "grow" }), - uc.newLabel('X'), + uc.newLabel('X', { class: "dim" }), ui.bedWidth = newInput2({title:LANG.dv_bedw_l, convert:toFloat, size:5, units:true, round:2, action:updateDeviceSize}), - uc.newLabel('Y'), + uc.newLabel('Y', { class: "dim" }), ui.bedDepth = newInput2({title:LANG.dv_bedd_l, convert:toFloat, size:5, units:true, round:2, action:updateDeviceSize}), - uc.newLabel('Z'), + uc.newLabel('Z', { class: "dim" }), ui.maxHeight = newInput2({title:LANG.dv_bedh_l, convert:toFloat, size:5, modes:FDM_SLA, action:updateDeviceSize}), - ], { class: "var-area" }), + ], { class: "var-row" }), resolutionX: newInput(LANG.dv_rezx_s, {title:LANG.dv_rezx_l, convert:toInt, size:5, modes:SLA}), resolutionY: newInput(LANG.dv_rezy_s, {title:LANG.dv_rezy_l, convert:toInt, size:5, modes:SLA}), spindleMax: newInput(LANG.dv_spmx_s, {title:LANG.dv_spmx_l, convert:toInt, size:5, modes:CAM, trigger:1}), deviceZMax: newInput(LANG.dv_zmax_s, {title:LANG.dv_zmax_l, convert:toInt, size:5, modes:FDM}), gcodeTime: newInput(LANG.dv_time_s, {title:LANG.dv_time_l, convert:toFloat, size:5, modes:FDM}), - separator: newBlank({class:"pop-sep", modes:FDM}), + separator: newBlank({class:"pop-sep", modes:FDM, driven:true}), filamentSource: newSelect(LANG.dv_fsrc_s, {title: LANG.dv_fsrc_l, action: filamentSourceSave, modes:FDM}, "filasrc"), fwRetract: newBoolean(LANG.dv_retr_s, onBooleanClick, {title:LANG.dv_retr_l, modes:FDM}), deviceOrigin: newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:FDM_LZR, show:() => !ui.deviceRound.checked}), deviceRound: newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, trigger:true, show:isNotBelt}), deviceBelt: newBoolean(LANG.dv_belt_s, onBooleanClick, {title:LANG.dv_belt_l, trigger:true, show:() => !ui.deviceRound.checked}), - _____: newGroup(LANG.dv_gr_ext, $('device2'), {group:"dext", inline:true, modes:FDM}), + extruder: newGroup(LANG.dv_gr_ext, $('device2'), {group:"dext", inline:true, modes:FDM}), extFilament: newInput(LANG.dv_fila_s, {title:LANG.dv_fila_l, convert:toFloat, modes:FDM}), extNozzle: newInput(LANG.dv_nozl_s, {title:LANG.dv_nozl_l, convert:toFloat, modes:FDM}), extOffsetX: newInput(LANG.dv_exox_s, {title:LANG.dv_exox_l, convert:toFloat, modes:FDM}), extOffsetY: newInput(LANG.dv_exoy_s, {title:LANG.dv_exoy_l, convert:toFloat, modes:FDM}), - extruder: newGroup(LANG.dv_gr_ext, $('device2'), {group:"dext", inline:true, modes:FDM}), + separator: newBlank({class:"set-sep", modes:FDM, driven:true}), _____: newGroup(LANG.dv_gr_too, $('device2'), {group:"dext", inline:true, modes:CAM_LZR}), - extSelect: newText(LANG.dv_exts_s, {title:LANG.dv_exts_l, size:14, height:3, area:gcode}), - extDeselect: newText(LANG.dv_dext_s, {title:LANG.dv_dext_l, size:14, height:3, area:gcode}), + extSelect: newText(LANG.dv_exts_s, {title:LANG.dv_exts_l, size:14, height:3, area:gcode, modes:GCODE}), + extDeselect: newText(LANG.dv_dext_s, {title:LANG.dv_dext_l, size:14, height:3, area:gcode, modes:GCODE}), extPad: newBlank({class:"grow", modes:FDM}), extActions: newRow([ ui.extPrev = newButton(undefined, undefined, {icon:''}), diff --git a/src/kiri/main.js b/src/kiri/main.js index 4988997b..1dd210eb 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -908,6 +908,8 @@ gapp.register("kiri.main", [], (root, exports) => { options.selectedIndex = optlist.indexOf(mode); modename.onchange = (ev) => setMode(optlist[options.selectedIndex]); } + // gcode edit area for any non-SLA mode + api.uc.setVisible($('gcode-edit'), mode !== 'SLA'); // highlight selected mode menu item ["FDM","CAM","SLA","LASER"].forEach(sm => { const cl = $(`mode-${sm.toLowerCase()}`).classList; diff --git a/web/kiri/index.css b/web/kiri/index.css index f38ba2b4..56b18699 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -439,6 +439,9 @@ th, tr, td, label { .grow { flex-grow: 1; } +.shrink0 { + flex-shrink: 0; +} .a-start { align-items: flex-start; } @@ -1229,7 +1232,6 @@ th, tr, td, label { display: none; padding: 10px; min-height: 20px; - font-size: smaller; background-color: #fff; } @@ -1243,10 +1245,16 @@ th, tr, td, label { max-height: 350px; } #mod-x { + border-radius: 5px; + border: 2px solid rgba(255,255,255,0.5); + background-color: rgba(255,255,255,0.5); position: absolute; z-index: 30; bottom: -20px; - right: 5px; + right: 0; +} +#mod-x svg { + aspect-ratio: 1 / 1 !important; } #mod-setup { height: 550px; @@ -2048,14 +2056,12 @@ th, tr, td, label { flex-grow: 1; font-size: smaller; } -.var-area { - gap: 3px; -} -.var-area label { - padding: 2px 0 2px 0; +.var-row .dim { + text-align: right; + padding-right: 3px; font-size: smaller; } -.var-row input, .var-area input { +.var-row input { margin-right: 0; margin-bottom: 1px; padding-bottom: 1px; From 818ce36168d9216f2043be744141d856b34de675 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 1 Jun 2024 01:27:43 -0400 Subject: [PATCH 4/7] work on device dialog --- src/kiri/ui.js | 1 + web/kiri/index.css | 13 ++++++++----- web/kiri/index.html | 18 +++++++++--------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/kiri/ui.js b/src/kiri/ui.js index b8f45cf2..03e74886 100644 --- a/src/kiri/ui.js +++ b/src/kiri/ui.js @@ -427,6 +427,7 @@ gapp.register("kiri.ui", [], (root, exports) => { cols = Math.max(cols, row.length); }); txt.setAttribute("cols", Math.max(30, cols + 1)); + txt.setAttribute("rows", 6); let showing = btn === lastBtn; hidePop(); diff --git a/web/kiri/index.css b/web/kiri/index.css index 56b18699..aa091181 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -1257,8 +1257,10 @@ th, tr, td, label { aspect-ratio: 1 / 1 !important; } #mod-setup { - height: 550px; - width: 725px; + min-height: 550px; + max-height: 60%; + min-width: 725px; + max-width: 70%; padding-bottom: 5px; } #mod-setup .header { @@ -1669,9 +1671,9 @@ th, tr, td, label { #devices { width: 225px; } -#device1, #device2, #palette3 { +/* #device1, #device2, #palette3 { width: 225px; -} +} */ #palette3 { display: none; } @@ -2058,8 +2060,9 @@ th, tr, td, label { } .var-row .dim { text-align: right; - padding-right: 3px; font-size: smaller; + align-self: center; + justify-self: center; } .var-row input { margin-right: 0; diff --git a/web/kiri/index.html b/web/kiri/index.html index e307b356..328956da 100644 --- a/web/kiri/index.html +++ b/web/kiri/index.html @@ -376,19 +376,19 @@
-
+
-
+
-
-
- - - -
-
+
+
+
+ + + +
From 18f9975390cbd70eec5855bc87c83449ee1a6b9d Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 1 Jun 2024 16:49:26 -0400 Subject: [PATCH 5/7] refactor of device settings viewer / editor --- src/kiri/init.js | 202 +++++++++++++++++-------------------------- src/kiri/platform.js | 3 - src/kiri/ui.js | 86 +++--------------- src/moto/webui.js | 5 +- web/kiri/index.css | 40 ++++----- web/kiri/index.html | 57 +++++------- web/kiri/lang/en.js | 3 +- 7 files changed, 133 insertions(+), 263 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 4d35f120..70a07817 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -27,6 +27,7 @@ gapp.register("kiri.init", [], (root, exports) => { CAM = [MODES.CAM], SLA = [MODES.SLA], FDM = [MODES.FDM], + FDM_CAM = [MODES.FDM,MODES.CAM], FDM_SLA = [MODES.FDM,MODES.SLA], FDM_LZR = [MODES.LASER,MODES.FDM], FDM_CAM_SLA = [MODES.CAM,MODES.FDM,MODES.SLA], @@ -274,18 +275,18 @@ gapp.register("kiri.init", [], (root, exports) => { return active && (active.nodeName === "INPUT" || active.nodeName === "TEXTAREA"); } - function inputTextOK() { - return DOC.activeElement === ui.deviceName; - } + // function inputTextOK() { + // return DOC.activeElement === ui.deviceName; + // } - function textAreaHasFocus() { - let active = DOC.activeElement; - return active && active.nodeName === "TEXTAREA"; - } + // function textAreaHasFocus() { + // let active = DOC.activeElement; + // return active && active.nodeName === "TEXTAREA"; + // } - function inputSize() { - return parseInt(DOC.activeElement.size); - } + // function inputSize() { + // return parseInt(DOC.activeElement.size); + // } function cca(c) { return c.charCodeAt(0); @@ -784,7 +785,7 @@ gapp.register("kiri.init", [], (root, exports) => { dev.new = false; dev.deviceName = devicename; - ui.deviceName.value = devicename; + // ui.deviceName.value = devicename; ui.deviceBelt.checked = dev.bedBelt; ui.deviceRound.checked = dev.bedRound; ui.deviceOrigin.checked = dev.outputOriginCenter || dev.originCenter || dev.bedRound; @@ -802,7 +803,7 @@ gapp.register("kiri.init", [], (root, exports) => { // disable editing for non-local devices [ - ui.deviceName, + // ui.deviceName, ui.gcodePre, ui.gcodePost, ui.bedDepth, @@ -847,14 +848,19 @@ gapp.register("kiri.init", [], (root, exports) => { ui.deviceSave.disabled = !local; ui.deviceDelete.disabled = !local; + ui.deviceRename.disabled = !local; ui.deviceExport.disabled = !local; + ui.deviceAdd.style.display = mode === 'SLA' ? 'none' : ''; + if (local) { ui.deviceAdd.innerText = "copy"; ui.deviceDelete.style.display = ''; + ui.deviceRename.style.display = ''; ui.deviceExport.style.display = ''; } else { ui.deviceAdd.innerText = "customize"; ui.deviceDelete.style.display = 'none'; + ui.deviceRename.style.display = 'none'; ui.deviceExport.style.display = 'none'; } ui.deviceAdd.disabled = dev.noclone; @@ -981,9 +987,8 @@ gapp.register("kiri.init", [], (root, exports) => { space.world.add(deviceImage = mesh); } - function updateDeviceName() { - let newname = ui.deviceName.value, - selected = api.device.get(), + function updateDeviceName(newname) { + let selected = api.device.get(), devs = settings().devices; if (newname !== selected) { devs[newname] = devs[selected]; @@ -1000,8 +1005,7 @@ gapp.register("kiri.init", [], (root, exports) => { } function renderDevices(devices) { - let selectedIndex = -1, - selected = api.device.get(), + let selected = api.device.get() || devices[0], features = api.feature, devs = settings().devices, dfilter = typeof(features.device_filter) === 'function' ? features.device_filter : undefined; @@ -1039,8 +1043,13 @@ gapp.register("kiri.init", [], (root, exports) => { ui.deviceDelete.onclick = function() { api.function.clear(); removeLocalDevice(getSelectedDevice()); + selectDevice(getModeDevices()[0]); showDevices(); }; + ui.deviceRename.onclick = function() { + const newname = prompt(`Rename "${selected}`, selected); + if (newname) updateDeviceName(newname); + }; ui.deviceExport.onclick = function(event) { const record = { version: kiri.version, @@ -1054,12 +1063,9 @@ gapp.register("kiri.init", [], (root, exports) => { api.device.export(exp, selected, { event, record }); }; - ui.deviceList.innerHTML = ''; - ui.deviceMy.innerHTML = ''; - let incr = 0; - let found = null; - let first = devices[0]; let dedup = {}; + let list_cdev = []; + let list_mdev = []; devices.forEach(function(device, index) { // prevent device from appearing twice // such as local name = standard device name @@ -1068,48 +1074,31 @@ gapp.register("kiri.init", [], (root, exports) => { } dedup[device] = device; let loc = isLocalDevice(device); - // if filter set, use - if (!loc && deviceFilter && device.toLowerCase().indexOf(deviceFilter) < 0) { - return; - } - // allow for device filter feature if (dfilter && dfilter(device) === false) { return; } - if (incr === 0) { - first = device; - } - let opt = DOC.createElement('button'); - opt.appendChild(DOC.createTextNode(device.replace(/\./g,' '))); - opt.onclick = function() { - selectDevice(device); - opt.classList.add("selected"); - if (found && found !== opt) { - found.classList.remove("selected"); - } - found = opt; - api.platform.layout(); - }; if (loc) { - ui.deviceMy.appendChild(opt); + list_mdev.push(h.option(device)); } else { - ui.deviceList.appendChild(opt); + list_cdev.push(h.option(device)); } - if (device === selected) { - // scroll to highlighted selection - setTimeout(() => ui.deviceList.scrollTop = opt.offsetTop, 0); - opt.classList.add("selected"); - selectedIndex = incr; - found = opt; - } - incr++; }); - if (selectedIndex >= 0) { - selectDevice(selected); - } else { - selectDevice(first); + let dev_list = $('dev-list'); + h.bind(dev_list, [ + h.option({ _: '-- My Devices --', disabled: true }), + ...list_mdev, + h.option({ _: '-- Stock Devices --', disabled: true }), + ...list_cdev + ]); + let dev_opts = [...dev_list.options].map(o => o.label); + dev_list.selectedIndex = dev_opts.indexOf(selected); + dev_list.onchange = ev => { + const seldev = dev_list.options[dev_list.selectedIndex]; + selectDevice(seldev.label); + api.platform.layout(); } + selectDevice(selected); } function renderTools() { @@ -1362,8 +1351,12 @@ gapp.register("kiri.init", [], (root, exports) => { // not the best way to do this, but main decl of api.show is broken api.show.tools = showTools; + function getModeDevices() { + return Object.keys(devices[api.mode.get_lower()]).sort(); + } + function updateDeviceList() { - renderDevices(Object.keys(devices[api.mode.get_lower()]).sort()); + renderDevices(getModeDevices()); } async function sync_get() { @@ -1379,10 +1372,8 @@ gapp.register("kiri.init", [], (root, exports) => { } function _showDevices() { - // disable device filter and show devices - ui.dev.header.onclick(true); + updateDeviceList(); api.modal.show('setup'); - ui.deviceList.focus(); } function dragOverHandler(evt) { @@ -1516,7 +1507,7 @@ gapp.register("kiri.init", [], (root, exports) => { let { event, conf, view, show } = api; let { bound, toInt, toFloat } = uc; let { newBlank, newButton, newBoolean, newGroup, newInput } = uc; - let { newInput2, newSelect, newText, newRow, newGCode } = uc; + let { newSelect, newText, newRow, newGCode } = uc; event.emit('init.one'); @@ -1624,13 +1615,6 @@ gapp.register("kiri.init", [], (root, exports) => { speedbar: $('speedbar'), context: $('context-menu'), - // options: { - // // area: $('lt-options'), - // // trash: $('lt-trash'), - // // enable: $('lt-w-enable'), - // // disable: $('lt-w-disable'), - // }, - back: $('lt-back'), ltsetup: $('lt-setup'), ltfile: $('lt-file'), @@ -1638,7 +1622,6 @@ gapp.register("kiri.init", [], (root, exports) => { ltact: $('lt-start'), edit: $('lt-tools'), nozzle: $('menu-nozzle'), - // render: $('menu-render'), modal: $('modal'), modalBox: $('modal-box'), @@ -1656,10 +1639,9 @@ gapp.register("kiri.init", [], (root, exports) => { catalogList: $('catalogList'), devices: $('devices'), - deviceList: $('device-list'), - deviceMy: $('device-my'), deviceAdd: $('device-add'), deviceDelete: $('device-del'), + deviceRename: $('device-ren'), deviceExport: $('device-exp'), deviceSave: $('device-save'), @@ -1715,37 +1697,34 @@ gapp.register("kiri.init", [], (root, exports) => { /** Device Browser / Editor */ - device: newGroup(LANG.dv_gr_dev, $('device1'), {group:"ddev", inline:true, class:"noshow"}), - deviceName: newInput(LANG.dv_name_s, {title:LANG.dv_name_l, size:"70%", text:true, action:updateDeviceName}), + _____: uc.newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true }), + device: newGroup(LANG.dv_gr_dev, null, {group:"ddev", inline:true, class:"noshow"}), - devbed: newRow([ - uc.newLabel(LANG.volume, { class: "grow" }), - uc.newLabel('X', { class: "dim" }), - ui.bedWidth = newInput2({title:LANG.dv_bedw_l, convert:toFloat, size:5, units:true, round:2, action:updateDeviceSize}), - uc.newLabel('Y', { class: "dim" }), - ui.bedDepth = newInput2({title:LANG.dv_bedd_l, convert:toFloat, size:5, units:true, round:2, action:updateDeviceSize}), - uc.newLabel('Z', { class: "dim" }), - ui.maxHeight = newInput2({title:LANG.dv_bedh_l, convert:toFloat, size:5, modes:FDM_SLA, action:updateDeviceSize}), - ], { class: "var-row" }), - - resolutionX: newInput(LANG.dv_rezx_s, {title:LANG.dv_rezx_l, convert:toInt, size:5, modes:SLA}), - resolutionY: newInput(LANG.dv_rezy_s, {title:LANG.dv_rezy_l, convert:toInt, size:5, modes:SLA}), + _____: newGroup("workspace", null, {group:"dext", inline:true}), + bedWidth: newInput('X (width)', {title:LANG.dv_bedw_l, convert:toFloat, size:6, units:true, round:2, action:updateDeviceSize}), + bedDepth: newInput('Y (depth)', {title:LANG.dv_bedw_l, convert:toFloat, size:6, units:true, round:2, action:updateDeviceSize}), + maxHeight: newInput('Z (height)', {title:LANG.dv_bedw_l, convert:toFloat, size:6, units:true, round:2, action:updateDeviceSize}), + resolutionX: newInput(LANG.dv_rezx_s, {title:LANG.dv_rezx_l, convert:toInt, size:6, modes:SLA}), + resolutionY: newInput(LANG.dv_rezy_s, {title:LANG.dv_rezy_l, convert:toInt, size:6, modes:SLA}), + _____: uc.newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:GCODE }), + _____: newGroup("firmware", null, {group:"dext", inline:true}), + fwRetract: newBoolean(LANG.dv_retr_s, onBooleanClick, {title:LANG.dv_retr_l, modes:FDM}), + deviceOrigin: newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:FDM_LZR, show:() => !ui.deviceRound.checked}), + deviceRound: newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, modes:FDM, trigger:true, show:isNotBelt}), + deviceBelt: newBoolean(LANG.dv_belt_s, onBooleanClick, {title:LANG.dv_belt_l, modes:FDM, trigger:true, show:() => !ui.deviceRound.checked}), + separator: newBlank({class:"pop-sep", modes:FDM, driven:true}), spindleMax: newInput(LANG.dv_spmx_s, {title:LANG.dv_spmx_l, convert:toInt, size:5, modes:CAM, trigger:1}), deviceZMax: newInput(LANG.dv_zmax_s, {title:LANG.dv_zmax_l, convert:toInt, size:5, modes:FDM}), gcodeTime: newInput(LANG.dv_time_s, {title:LANG.dv_time_l, convert:toFloat, size:5, modes:FDM}), - separator: newBlank({class:"pop-sep", modes:FDM, driven:true}), - filamentSource: newSelect(LANG.dv_fsrc_s, {title: LANG.dv_fsrc_l, action: filamentSourceSave, modes:FDM}, "filasrc"), - fwRetract: newBoolean(LANG.dv_retr_s, onBooleanClick, {title:LANG.dv_retr_l, modes:FDM}), - deviceOrigin: newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:FDM_LZR, show:() => !ui.deviceRound.checked}), - deviceRound: newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, trigger:true, show:isNotBelt}), - deviceBelt: newBoolean(LANG.dv_belt_s, onBooleanClick, {title:LANG.dv_belt_l, trigger:true, show:() => !ui.deviceRound.checked}), - extruder: newGroup(LANG.dv_gr_ext, $('device2'), {group:"dext", inline:true, modes:FDM}), + filamentSource: newSelect(LANG.dv_fsrc_s, {title: LANG.dv_fsrc_l, action: filamentSourceSave, modes:FDM, show:() => false}, "filasrc"), + _____: uc.newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:FDM }), + extruder: newGroup(LANG.dv_gr_ext, null, {group:"dext", inline:true}), extFilament: newInput(LANG.dv_fila_s, {title:LANG.dv_fila_l, convert:toFloat, modes:FDM}), extNozzle: newInput(LANG.dv_nozl_s, {title:LANG.dv_nozl_l, convert:toFloat, modes:FDM}), extOffsetX: newInput(LANG.dv_exox_s, {title:LANG.dv_exox_l, convert:toFloat, modes:FDM}), extOffsetY: newInput(LANG.dv_exoy_s, {title:LANG.dv_exoy_l, convert:toFloat, modes:FDM}), - separator: newBlank({class:"set-sep", modes:FDM, driven:true}), - _____: newGroup(LANG.dv_gr_too, $('device2'), {group:"dext", inline:true, modes:CAM_LZR}), + _____: uc.newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:GCODE }), + _____: newGroup(LANG.dv_gr_too, null, {group:"dext", inline:true}), extSelect: newText(LANG.dv_exts_s, {title:LANG.dv_exts_l, size:14, height:3, area:gcode, modes:GCODE}), extDeselect: newText(LANG.dv_dext_s, {title:LANG.dv_dext_l, size:14, height:3, area:gcode, modes:GCODE}), extPad: newBlank({class:"grow", modes:FDM}), @@ -1755,7 +1734,8 @@ gapp.register("kiri.init", [], (root, exports) => { ui.extDel = newButton(undefined, undefined, {icon:''}), ui.extNext = newButton(undefined, undefined, {icon:''}) ], {class:"dev-buttons ext-buttons", modes:FDM}), - palette: newGroup(LANG.dv_gr_pal, $('palette3'), {group:"dext2", inline:true, modes:FDM}), + _____: uc.newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:FDM, show: () => false && ui.filamentSource.selectedOptions[0].value === 'palette3' }), + palette: newGroup(LANG.dv_gr_pal, null, {group:"dext2", inline:true, modes:FDM}), paletteId: newInput(LANG.dv_paid_s, {title:LANG.dv_paid_l, modes:FDM, size:15, text:true}), palettePing: newInput(LANG.dv_paps_s, {title:LANG.dv_paps_l, modes:FDM, convert:toInt}), paletteFeed: newInput(LANG.dv_pafe_s, {title:LANG.dv_pafe_l, modes:FDM, convert:toInt}), @@ -1765,7 +1745,8 @@ gapp.register("kiri.init", [], (root, exports) => { paletteHeat: newInput(LANG.dv_pahe_s, {title:LANG.dv_pahe_l, modes:FDM, convert:toInt}), paletteCool: newInput(LANG.dv_paco_s, {title:LANG.dv_paco_l, modes:FDM, convert:toInt}), palettePress: newInput(LANG.dv_pacm_s, {title:LANG.dv_pacm_l, modes:FDM, convert:toInt}), - _____: newGroup(LANG.dv_gr_out, $('device2'), {group:"dgco", inline:true, modes:CAM_LZR}), + _____: uc.newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:CAM_LZR }), + _____: newGroup(LANG.dv_gr_out, null, {group:"dgco", inline:true}), gcodeStrip: newBoolean(LANG.dv_strc_s, onBooleanClick, {title:LANG.dv_strc_l, modes:CAM}), gcodeSpace: newBoolean(LANG.dv_tksp_s, onBooleanClick, {title:LANG.dv_tksp_l, modes:CAM_LZR}), useLaser: newBoolean(LANG.dv_lazr_s, onBooleanClick, {title:LANG.dv_lazr_l, modes:CAM}), @@ -1801,7 +1782,7 @@ gapp.register("kiri.init", [], (root, exports) => { shiny: newBoolean(LANG.op_shny_s, booleanSave, {title:LANG.op_shny_l, modes:FDM}), lineType: newSelect(LANG.op_line_s, {title: LANG.op_line_l, action: lineTypeSave, modes:FDM}, "linetype"), animesh: newSelect(LANG.op_anim_s, {title: LANG.op_anim_l, action: aniMeshSave, modes:CAM}, "animesh"), - units: newSelect(LANG.op_unit_s, {title: LANG.op_unit_l, action: unitsSave, modes:CAM, trace:false}, "units"), + units: newSelect(LANG.op_unit_s, {title: LANG.op_unit_l, action: unitsSave, modes:CAM}, "units"), _____: newGroup(LANG.lo_menu, $('prefs-lay'), {inline: true}), autoSave: newBoolean(LANG.op_save_s, booleanSave, {title:LANG.op_save_l}), autoLayout: newBoolean(LANG.op_auto_s, booleanSave, {title:LANG.op_auto_l}), @@ -1962,7 +1943,7 @@ gapp.register("kiri.init", [], (root, exports) => { camStockIndexed: newBoolean(LANG.cs_indx_s, onBooleanClick, {title:LANG.cs_indx_l}), camStockIndexGrid: newBoolean(LANG.cs_ishg_s, onBooleanClick, {title:LANG.cs_ishg_l, show:() => ui.camStockIndexed.checked}), camLimits: newGroup(LANG.cc_menu, $('cam-limits'), { modes:CAM, driven, separator }), - camZAnchor: newSelect(LANG.ou_zanc_s, {title: LANG.ou_zanc_l, action:zAnchorSave, trace:false, show:() => !ui.camStockIndexed.checked}, "zanchor"), + camZAnchor: newSelect(LANG.ou_zanc_s, {title: LANG.ou_zanc_l, action:zAnchorSave, show:() => !ui.camStockIndexed.checked}, "zanchor"), camZOffset: newInput(LANG.ou_ztof_s, {title:LANG.ou_ztof_l, convert:toFloat, units:true}), camZBottom: newInput(LANG.ou_zbot_s, {title:LANG.ou_zbot_l, convert:toFloat, units:true, trigger: true}), camZThru: newInput(LANG.ou_ztru_s, {title:LANG.ou_ztru_l, convert:toFloat, bound:bound(0.0,100), units:true, show:() => { return ui.camZBottom.value == 0 }}), @@ -2192,30 +2173,6 @@ gapp.register("kiri.init", [], (root, exports) => { if (!ev.buttons) api.event.emit('slider.unlabel'); }; - ui.dev.header.onclick = (hide) => { - let style = ui.dev.filter.style; - if (style.display === 'flex' || hide === true) { - style.display = ''; - deviceFilter = null; - updateDeviceList(); - } else { - style.display = 'flex'; - ui.dev.filter.focus(); - deviceFilter = ui.dev.filter.value.toLowerCase(); - updateDeviceList(); - } - }; - - ui.dev.filter.onkeyup = (ev) => { - deviceFilter = ui.dev.filter.value.toLowerCase(); - updateDeviceList(); - }; - - ui.dev.filter.onclick = (ev) => { - ev.preventDefault(); - ev.stopPropagation(); - }; - api.event.on('slider.unlabel', (values) => { }); @@ -2686,9 +2643,6 @@ gapp.register("kiri.init", [], (root, exports) => { // fill device list updateDeviceList(); - // ensure settings has gcode - selectDevice(DEVNAME || api.device.get()); - // update ui fields from settings api.conf.update_fields(); diff --git a/src/kiri/platform.js b/src/kiri/platform.js index 1801dc29..9ad485fd 100644 --- a/src/kiri/platform.js +++ b/src/kiri/platform.js @@ -566,7 +566,6 @@ function platformChanged() { h.bind($('ws-widgets'), api.widgets.all().map(w => { let color; return [ - h.div([ h.button({ @@ -585,12 +584,10 @@ function platformChanged() { color = w.getColor(); } }), - h.button( { onclick() { platformDelete(w) } }, [ h.i({ class:"fas fa-trash" }), ] ) - ]) ] })); diff --git a/src/kiri/ui.js b/src/kiri/ui.js index 03e74886..580729d9 100644 --- a/src/kiri/ui.js +++ b/src/kiri/ui.js @@ -56,11 +56,11 @@ gapp.register("kiri.ui", [], (root, exports) => { newBoolean, newButton, newBlank, + newDiv, newGCode, newGroup, newLabel, newInput, - newInput2, newRange, newRow, newSelect, @@ -333,19 +333,23 @@ gapp.register("kiri.ui", [], (root, exports) => { try { return fn(); } catch (e) { - return true; + // console.log({ safecall_error: e }); + return false; } } function addModeControls(el, opt = {}) { el.__opt = opt; el.showMe = function() { + if (opt.trace) console.log({ showMe: el }); el.classList.remove('hide'); }; el.hideMe = function() { + if (opt.trace) console.log({ hideMe: el }); el.classList.add('hide'); }; el.setVisible = function(show) { + if (opt.trace) console.log({ setVisible: show }); if (show) el.showMe(); else el.hideMe(); }; @@ -353,8 +357,10 @@ gapp.register("kiri.ui", [], (root, exports) => { let xprt = opt.expert === undefined || (opt.expert === lastExpert); let show = opt.show ? safecall(opt.show) : true; let disp = opt.visible ? opt.visible() : true; + let hmod = el.hasMode(mode); + if (opt.trace) console.log({ setMode: mode, xprt, show, disp, hmod, modes:el.modes }); if (opt.manual) return; - el.setVisible(el.hasMode(mode) && show && xprt && disp); + el.setVisible(hmod && show && xprt && disp); } el.hasMode = function(mode) { return el.modes.length === 0 || el.modes.contains(mode); @@ -366,8 +372,10 @@ gapp.register("kiri.ui", [], (root, exports) => { function newDiv(opt = {}) { let div = DOC.createElement('div'); addModeControls(div, opt); - addTo.appendChild(div); - lastGroup.push(div); + (opt.addto || addTo).appendChild(div); + if (opt.addto) lastDiv = addTo = div; + if (opt.addto && opt.class) div.setAttribute('class', opt.class); + lastGroup?.push(div); div._group = groupName; return div; } @@ -608,74 +616,6 @@ gapp.register("kiri.ui", [], (root, exports) => { return ip; } - function newInput2(opt = {}) { - let hide = opt.hide, - size = opt.size || 5, - height = opt.height || 0, - ip = height > 1 ? DOC.createElement('textarea') : DOC.createElement('input'), - action = opt.action || bindTo || inputAction; - - ip.setAttribute("class", "var-input"); - if (Number.isInteger(size)) { - ip.setAttribute("size", size); - } else { - ip.setAttribute("style", `width:${size}`); - } - ip.setAttribute("type", "text"); - ip.setAttribute("spellcheck", "false"); - if (opt.disabled) ip.setAttribute("disabled", "true"); - if (opt.title) ip.setAttribute("title", opt.title); - if (opt.convert) ip.convert = opt.convert.bind(ip); - if (opt.bound) ip.bound = opt.bound; - if (opt.action) action = opt.action; - ip.addEventListener('focus', function(event) { - hidePop(); - setSticky(true); - }); - if (action) { - ip.addEventListener('keydown', function(event) { - let key = event.key; - if ( - opt.text || - (key >= '0' && key <= '9') || - key === '.' || - key === '-' || - key === 'Backspace' || - key === 'Delete' || - key === 'ArrowLeft' || - key === 'ArrowRight' || - key === 'Tab' || - event.metaKey || - event.ctrlKey || - (key === ',' && opt.comma) - ) { - return; - } - event.preventDefault(); - event.stopPropagation(); - }); - ip.addEventListener('keyup', function(event) { - if (event.keyCode === 13) { - ip.blur(); - } - }); - ip.addEventListener('blur', function(event) { - setSticky(false); - lastChange = ip; - action(event); - if (opt.trigger) { - refresh(); - } - }); - if (opt.units) { - addUnits(ip, opt.round || 3); - } - } - if (!ip.convert) ip.convert = raw.bind(ip); - - return ip; - } - function addUnits(input, round) { setters.push(input); input.setv = function(value) { diff --git a/src/moto/webui.js b/src/moto/webui.js index 26fd7000..4e079af7 100644 --- a/src/moto/webui.js +++ b/src/moto/webui.js @@ -133,7 +133,10 @@ gapp.overlay(root, { }); // add common element types -["a", "i", "hr", "div", "span", "label", "input", "button", "svg", "textarea"].forEach(type => { +[ + "a", "i", "hr", "div", "span", "label", "input", + "button", "svg", "textarea", "select", "option" +].forEach(type => { h[type] = (attr, innr) => { return h.el(type, attr, innr); } diff --git a/web/kiri/index.css b/web/kiri/index.css index aa091181..f7aab9fc 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -123,7 +123,7 @@ input:focus { input[disabled] { background-color: #ddd; color: #000; - border-width: 1px; + /* border-width: 1px; */ } input[type="range"] { width: 85px; @@ -1263,6 +1263,9 @@ th, tr, td, label { max-width: 70%; padding-bottom: 5px; } +#mod-setup textarea { + border-radius: 3px; +} #mod-setup .header { text-align: center; border-bottom: 1px solid rgba(126,153,183,1); @@ -1273,33 +1276,12 @@ th, tr, td, label { #mod-setup .header.sub { padding-top: 10px; } -#dev-search { - position: absolute; - font-size: 10px; - right: 3px; -} -#dev-search:hover { - color: #00f; -} -#dev-filter { - transform: translateY(-7px); - text-align: center; - position: absolute; - display: none; - padding: 1px; - right: 150%; -} #mod-setup .left { width: 180px; padding-right: 10px; margin-right: 10px; border-right: 1px solid #ddd; } -#mod-setup .footer { - padding-top: 5px; - margin-top: 5px; - border-top: 1px solid rgba(150,130,200,0.5); -} .devlist { background-color: #fdfdfd; } @@ -1684,7 +1666,7 @@ th, tr, td, label { width: 100%; background-color: #f8f8f8; } -#device-action, #tool-action { +#tool-action { margin-top: 5px; } #device-action button, #tool-action button { @@ -1946,6 +1928,16 @@ th, tr, td, label { .settings .set-header a { font-size: smaller; } +#dev-sel { + margin-bottom: 0; +} +#dev-list { + align-self: stretch; + padding: 0 5px 0 5px; +} +#dev-list:hover { + background-color: var(--blue-4); +} .set2-group { border-radius: 3px; border: 1px solid #ddd !important; @@ -1965,7 +1957,7 @@ th, tr, td, label { border-right: 3px solid var(--blue-1); background-color: var(--blue-4) !important; } -.set2-group .var-row label { +.set2-group .var-row label, #mod-setup .var-row label { margin-right: 25px; } .set2-sep { diff --git a/web/kiri/index.html b/web/kiri/index.html index 328956da..84365bf9 100644 --- a/web/kiri/index.html +++ b/web/kiri/index.html @@ -367,50 +367,33 @@
-
-
-
- - -
-
-
-
- -
-
-
-
-
+
+
+ + +
+ -
-
- -
-
-
-
-
-
-
-
-
-
-
-
- diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index fbb8718f..294aeaf2 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -37,6 +37,7 @@ self.kiri.lang['en-us'] = { prefs: "preferences", // right menu "preferences" preview: "preview", recent: "recent", + rename: "rename", render: "render", // left render pop menu reset: "reset", right: "right", @@ -95,7 +96,7 @@ self.kiri.lang['en-us'] = { // DEVICE dialog groups dv_gr_dev: "device", dv_gr_ext: "extruder", - dv_gr_too: "tool", + dv_gr_too: "tool macros", dv_gr_pal: "palette", dv_gr_out: "output", dv_gr_gco: "gcode macros", From 51f0783411b9893a2cbd8df18e2bc83ec319ee76 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 1 Jun 2024 16:51:46 -0400 Subject: [PATCH 6/7] activate device/settings label click-to-set --- src/kiri/init.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 70a07817..2ca04a7a 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -2391,14 +2391,6 @@ gapp.register("kiri.init", [], (root, exports) => { return lbl; } - // for (let mode of ["fdm","sla","cam","laser"]) { - // if (api.feature.modes.indexOf(mode) >= 0) { - // $(`mode-${mode}`).appendChild(mksvg(icons[mode])); - // } else { - // $(`mode-${mode}`).style.display = 'none'; - // } - // } - api.platform.update_size(); function mouseOnHover(int, event, ints) { @@ -2707,6 +2699,8 @@ gapp.register("kiri.init", [], (root, exports) => { // bind interface action elements $('app-name').onclick = api.help.show; + $('mode-device').onclick = showDevices; + $('mode-profile').onclick = settingsLoad; $('mode-fdm').onclick = () => api.mode.set('FDM'); $('mode-cam').onclick = () => api.mode.set('CAM'); $('mode-sla').onclick = () => api.mode.set('SLA'); From 66cad1948de50f498d60418d7faacea381825003 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 1 Jun 2024 16:52:51 -0400 Subject: [PATCH 7/7] bump rev 4.0.D8 --- package.json | 2 +- src/main/kiri.js | 2 +- src/moto/license.js | 2 +- web/kiri/manifest.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 6d83b277..b6273d8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grid-apps", - "version": "4.0.7D", + "version": "4.0.8D", "description": "grid.space 3d slice & modeling tools", "author": "Stewart Allen ", "license": "MIT", diff --git a/src/main/kiri.js b/src/main/kiri.js index 491eb174..30353dfc 100644 --- a/src/main/kiri.js +++ b/src/main/kiri.js @@ -15,7 +15,7 @@ gapp.main("main.kiri", [], (root) => { const modfns = root.kirimod = ( root.kirimod || [] ); const kiri = root.kiri = { - beta: 4007, + beta: 4008, driver: {}, // driver modules load(fn) { modfns.push(fn); diff --git a/src/moto/license.js b/src/moto/license.js index 27e356a5..0ea30b80 100644 --- a/src/moto/license.js +++ b/src/moto/license.js @@ -5,7 +5,7 @@ let terms = { COPYRIGHT: "Copyright (C) Stewart Allen - All Rights Reserved", LICENSE: "See the license.md file included with the source distribution", - VERSION: (is_self ? self : this).debug_version || "4.0.D7" + VERSION: (is_self ? self : this).debug_version || "4.0.D8" }; if (typeof(module) === 'object') { diff --git a/web/kiri/manifest.json b/web/kiri/manifest.json index f6f928bd..58fe920a 100644 --- a/web/kiri/manifest.json +++ b/web/kiri/manifest.json @@ -1,5 +1,5 @@ { - "name": "Kiri:Moto 4.0.D7", + "name": "Kiri:Moto 4.0.D8", "short_name": "Kiri:Moto", "description": "Slicer for 3D printers, CNC mills, laser cutters and more", "start_url": "/kiri/",