From 1b542ccbbfb4b6a5cefd16f8a0ab1de26085b030 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Fri, 31 May 2024 02:17:16 -0400 Subject: [PATCH] move mode menu to top right --- src/kiri/init.js | 4 ++++ src/kiri/main.js | 2 +- src/kiri/platform.js | 5 ----- src/kiri/settings.js | 1 - web/kiri/index.html | 48 ++++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 51 insertions(+), 9 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 5f11a72d..e5546df0 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -2751,6 +2751,10 @@ gapp.register("kiri.init", [], (root, exports) => { // bind interface action elements $('app-name').onclick = api.help.show; + $('mode-fdm').onclick = () => api.mode.set('FDM'); + $('mode-cam').onclick = () => api.mode.set('CAM'); + $('mode-sla').onclick = () => api.mode.set('SLA'); + $('mode-laser').onclick = () => api.mode.set('LASER'); $('set-device').onclick = (ev) => { ev.stopPropagation(); showDevices() }; $('set-profs').onclick = (ev) => { ev.stopPropagation(); api.conf.show() }; $('set-tools').onclick = (ev) => { ev.stopPropagation(); showTools() }; diff --git a/src/kiri/main.js b/src/kiri/main.js index d046ba26..e0355ca7 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -901,7 +901,7 @@ gapp.register("kiri.main", [], (root, exports) => { MODE = MODES[mode]; DRIVER = kiri.driver[mode]; // update mode drop-down - { + if (false) { const modename = $('mode-name'); const options = modename.options; const optlist = ["FDM","CAM","SLA","LASER"]; diff --git a/src/kiri/platform.js b/src/kiri/platform.js index 30d96115..5bc3b844 100644 --- a/src/kiri/platform.js +++ b/src/kiri/platform.js @@ -234,7 +234,6 @@ function platformUpdateSelected() { const { device } = settings; const { extruders } = device; const { selection, ui } = api; - // const { enable, disable } = ui.options; const selreal = selection.widgets(); const selwid = selection.widgets(true); @@ -243,8 +242,6 @@ function platformUpdateSelected() { if (selcount) { let enaC = selwid.filter(w => w.meta.disabled !== true).length; let disC = selwid.filter(w => w.meta.disabled === true).length; - // enable.style.display = disC ? 'flex' : 'none'; - // disable.style.display = enaC ? 'flex' : 'none'; if (api.feature.meta && selcount === 1) { let sel = selwid[0]; let name = sel.meta.file || sel.meta.url; @@ -268,8 +265,6 @@ function platformUpdateSelected() { ui.mesh.faces.innerText = '-'; } } else { - enable.style.display = 'none'; - disable.style.display = 'none'; ui.mesh.name.innerText = '[0]'; ui.mesh.points.innerText = '-'; ui.mesh.faces.innerText = '-'; diff --git a/src/kiri/settings.js b/src/kiri/settings.js index 7d66e3b1..f8efaecc 100644 --- a/src/kiri/settings.js +++ b/src/kiri/settings.js @@ -162,7 +162,6 @@ function updateSettings(opt = {}) { $('mode-device').innerText = device.deviceName; $('mode-profile').innerText = `${cproc[mode]}${same ? '' : ' *'}`; - $('mode-info').style.display = 'flex'; } function updateSettingsFromFields(setrec, uirec = api.ui, changes) { diff --git a/web/kiri/index.html b/web/kiri/index.html index c3fb0e6c..259ab8d2 100644 --- a/web/kiri/index.html +++ b/web/kiri/index.html @@ -137,6 +137,30 @@ + + + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ @@ -194,16 +218,36 @@
-