diff --git a/app.js b/app.js
index bc35f12f..a75f489a 100644
--- a/app.js
+++ b/app.js
@@ -471,7 +471,6 @@ function initModule(mod, file, dir) {
const script = {
kiri : [
"@devices",
- "@icons",
"kiri/ui",
"&main/kiri",
"&kiri/lang-en"
@@ -651,16 +650,7 @@ function serveCode(req, res, code) {
res.end(code.code);
}
-function generateIcons() {
- let root = PATH.join(dir,"src","kiri-ico");
- let icos = {};
- fs.readdirSync(root).forEach(file => {
- let name = file.split(".")[0] ;
- icos[name] = fs.readFileSync(`${root}/${file}`).toString();
- });
- synth.icons = `self.icons = ${JSON.stringify(icos)};`;
-}
-
+// pack/concat device script strings to inject into /code/ scripts
function generateDevices() {
let root = PATH.join(dir,"src","kiri-dev");
let devs = {};
@@ -670,12 +660,11 @@ function generateDevices() {
map[device] = JSON.parse(fs.readFileSync(PATH.join(root,type,device)));
});
});
- // console.log({ devs });
synth.devices = `self.devices = ${JSON.stringify(devs)};`;
}
+// pack/concat code modules served under "/code/"
function prepareScripts() {
- generateIcons();
generateDevices();
for (let key of Object.keys(script)) {
code[key] = concatCode(script[key]);
diff --git a/src/kiri-ico/cam.svg b/src/kiri-ico/cam.svg
deleted file mode 100644
index 857b7dca..00000000
--- a/src/kiri-ico/cam.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/kiri-ico/fdm.svg b/src/kiri-ico/fdm.svg
deleted file mode 100644
index 07acde06..00000000
--- a/src/kiri-ico/fdm.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/kiri-ico/laser.svg b/src/kiri-ico/laser.svg
deleted file mode 100644
index f7dd21bf..00000000
--- a/src/kiri-ico/laser.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/kiri-ico/sla.svg b/src/kiri-ico/sla.svg
deleted file mode 100644
index 53268e1e..00000000
--- a/src/kiri-ico/sla.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/kiri-ico/spin.svg b/src/kiri-ico/spin.svg
deleted file mode 100644
index d8dbd086..00000000
--- a/src/kiri-ico/spin.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/kiri-mode/sla/client.js b/src/kiri-mode/sla/client.js
index 81486597..51bc8675 100644
--- a/src/kiri-mode/sla/client.js
+++ b/src/kiri-mode/sla/client.js
@@ -31,8 +31,9 @@ function init(kiri, api) {
const fileroot = names[0] || "print";
const filename = `${fileroot}-${new Date().getTime().toString(36)}`;
- api.ajax("/kiri/output-sla.html", html => {
- api.ui.print.innerHTML = html;
+ api.modal.show('xsla');
+ // api.ajax("/kiri/output-sla.html", html => {
+ // api.ui.print.innerHTML = html;
let settings = api.conf.get(),
process = settings.process,
@@ -88,8 +89,8 @@ function init(kiri, api) {
break;
}
- api.modal.show('print');
- });
+ // api.modal.show('print');
+ // });
}
function saveFile(api, file, ext) {
diff --git a/src/kiri/export.js b/src/kiri/export.js
index 793d7b36..5ed03502 100644
--- a/src/kiri/export.js
+++ b/src/kiri/export.js
@@ -127,17 +127,18 @@ function exportLaserDialog(data, names) {
);
}
- api.ajax("/kiri/output-laser.html", function(html) {
+ // api.ajax("/kiri/output-laser.html", function(html) {
+ api.modal.show('xlaser');
let segments = 0;
data.forEach(layer => { segments += layer.length });
- ui.print.innerHTML = html;
+ // ui.print.innerHTML = html;
$('print-filename').value = filename;
$('print-lines').value = util.comma(segments);
$('print-svg').onclick = download_svg;
$('print-dxf').onclick = download_dxf;
$('print-lg').onclick = download_gcode;
- api.modal.show('print');
- });
+ // api.modal.show('print');
+ // });
}
function bindField(field, varname) {
@@ -465,8 +466,9 @@ function exportGCodeDialog(gcode, sections, info, names) {
$('output-time').value = [pad(hours),pad(mins),pad(secs)].join(':');
}
- fetch("/kiri/output-gcode.html").then(r => r.text()).then(html => {
- ui.print.innerHTML = html;
+ api.modal.show('xany');
+ // fetch("/kiri/output-gcode.html").then(r => r.text()).then(html => {
+ // ui.print.innerHTML = html;
let set = api.conf.get();
let fdm = MODE === MODES.FDM;
let octo = set.controller.exportOcto && MODE !== MODES.CAM;
@@ -696,8 +698,8 @@ function exportGCodeDialog(gcode, sections, info, names) {
if (preview && gcode) $('code-preview-textarea').value = gcode.substring(0,65535);
// show dialog
- api.modal.show('print');
- });
+ // api.modal.show('print');
+ // });
}
});
diff --git a/src/kiri/init.js b/src/kiri/init.js
index 33b02b8e..601782fe 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -1553,7 +1553,9 @@ gapp.register("kiri.init", [], (root, exports) => {
files: $('mod-files'),
saves: $('mod-saves'),
tools: $('mod-tools'),
- print: $('mod-print'),
+ xany: $('mod-x-any'),
+ xsla: $('mod-x-sla'),
+ xlaser: $('mod-x-laser'),
local: $('mod-local'),
any: $('mod-any'),
diff --git a/src/kiri/main.js b/src/kiri/main.js
index f8533081..bd716ddc 100644
--- a/src/kiri/main.js
+++ b/src/kiri/main.js
@@ -670,7 +670,7 @@ gapp.register("kiri.main", [], (root, exports) => {
visible = modalShowing(),
info = { pct: 0 };
- ["help","setup","tools","prefs","saves","files","print","local","any"].forEach(function(name) {
+ ["help","setup","tools","prefs","saves","files","xany","xlaser","xsla","local","any"].forEach(name => {
UI[name].style.display = name === which ? 'flex' : '';
});
diff --git a/web/kiri/index.css b/web/kiri/index.css
index 99dfac26..6b47b7b3 100644
--- a/web/kiri/index.css
+++ b/web/kiri/index.css
@@ -276,8 +276,8 @@ th, tr, td, label {
.dark .mdialog,
.dark .t-body,
.dark .cam-pop-op,
-.dark #mod-print,
-.dark #mod-print .header label
+.dark .mod-print,
+.dark .mod-print .header label
{
background-color: #282828;
color: white;
@@ -856,7 +856,7 @@ th, tr, td, label {
pointer-events: none;
}
-#mod-print button, #catalogList button, #settingsList button {
+.mod-print button, #catalogList button, #settingsList button {
text-transform: none !important;
}
@@ -1555,13 +1555,13 @@ th, tr, td, label {
font-family: monospace;
padding-top: 5px;
}
-#mod-print {
+.mod-print {
background-color: rgba(255,255,255,0.85);
}
-#mod-print .grow button {
+.mod-print .grow button {
margin-left: 5px;
}
-#mod-print .hint {
+.mod-print .hint {
color: #345;
font-size: 12px;
font-style: italic;
@@ -1569,50 +1569,50 @@ th, tr, td, label {
font-weight: normal;
padding-top: 5px;
}
-.dark #mod-print .box {
+.dark .mod-print .box {
background-color: rgba(0,0,0,0.15);
border-color: #555;
}
-#mod-print .box {
+.mod-print .box {
background-color: rgba(255,255,255,0.5);
border: 1px solid #bbb;
border-radius: 3px;
padding: 20px 10px 10px 10px;
}
-#mod-print .box select {
+.mod-print .box select {
min-width: 10em;
}
-#mod-print .header {
+.mod-print .header {
flex-direction: column;
justify-content: center;
align-items: center;
transform: translateY(50%);
z-index: 10;
}
-#mod-print .header label {
+.mod-print .header label {
background-color: white;
padding: 0 10px 0 10px;
border-radius: 5px;
border-right: 1px solid #bbb;
border-left: 1px solid #bbb;
}
-#mod-print a {
+.mod-print a {
text-decoration: underline;
}
-#mod-print a:hover {
+.mod-print a:hover {
color: #567;
background-color: #ddd;
}
-#mod-print label {
+.mod-print label {
flex-grow: 1;
font-weight: bold;
padding-right: 10px;
}
-.dark #mod-print button {
+.dark .mod-print button {
background-color: #555;
border-color: #777;
}
-#mod-print button {
+.mod-print button {
flex-direction: column;
justify-content: center;
align-items: center;
diff --git a/web/kiri/index.html b/web/kiri/index.html
index ab85e299..ada25718 100644
--- a/web/kiri/index.html
+++ b/web/kiri/index.html
@@ -579,7 +579,94 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web/kiri/output-sla.html b/web/kiri/output-sla.html
deleted file mode 100644
index 6ee7da5e..00000000
--- a/web/kiri/output-sla.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-