diff --git a/index.css b/index.css index 1f13ec6b..d5dd366e 100644 --- a/index.css +++ b/index.css @@ -509,7 +509,7 @@ fieldset>form.option div.item.button { border-radius:var(--button-radius); } fieldset>div.action div.item.button { border-radius:var(--button-radius); } fieldset>div.action div.item.button:last-child { margin-right:var(--button-margin); } fieldset.input.date.float>div.action div.item.button:last-child { margin-right:0; } -fieldset>div.action div.item.select:not(.button) { border-bottom:var(--box-notice3); } +// fieldset>div.action div.item.select:not(.button) { border-bottom:var(--box-notice3); } fieldset>div.action div.item:not(.state) { box-shadow:var(--input-box-shadow); } fieldset>div.action>div.tabs { box-shadow:var(--legend-box-shadow); } fieldset>div.action>div.cmds { box-shadow:var(--legend-box-shadow); } diff --git a/lib/user.js b/lib/user.js index cb74de6b..7094e1f4 100644 --- a/lib/user.js +++ b/lib/user.js @@ -67,7 +67,7 @@ Volcanos("user", { isEnglish: function(can) { return can.base.isIn(can.core.Split(can.user.language(can).toLowerCase()||"en", "_-.")[0], "en", "en-us") }, trans: function(can, text, list, zone) { if (can.base.isNumber(text)) { return text+"" } if (can.user.isEnglish(can)) { return text } if (can.base.isObject(text)) { return can.core.Item(text, function(k, v) { can.core.Value(can._trans, can.core.Keys(zone, k), v) }) } - if (can.base.isFunc(text)) { text = text.name||"" } if (can.base.isString(list)) { return list } + if (can.base.isFunc(text)) { text = text.name||"" } if (list && can.base.isString(list)) { return list } var key = can.core.Keys(zone, text) return can.core.Value(list, key) || can.core.Value(can._trans, key) || can.Conf(["trans", key]) || can.Conf(["feature._trans", key]) || diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 02444d5e..1157ff7a 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -39,6 +39,7 @@ fieldset.inner>div.output>div.layout>div.layout div.content div.tips { line-heig fieldset.inner.cmd>div.output>div.layout>div.tabs:not(.hide) { background-color:var(--plugin-bg-color); height:var(--code-tabs-height); display:flex; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div { height:var(--code-tabs-height); } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.icon>div.icon { font-size:26px; line-height:32px; padding:2px 5px; position:sticky; top:0; } +body.windows fieldset.inner.cmd>div.output>div.layout>div.tabs>div.icon>div.icon { font-size:20px !important; padding-top:6px; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs { justify-content:flex-start; flex-grow:1; flex-wrap:wrap; overflow:auto; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs:hover { background-color:unset; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs>div.tabs { padding:var(--input-padding) var(--button-padding); height:var(--code-tabs-height); display:flex; align-items:center; } diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index d4c2febf..960694f6 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -69,11 +69,8 @@ Volcanos(chat.ONACTION, {list: [ if (msg.IsErr()) { return can.user.toastFailure(can, msg.Result()) } can.onimport.tabview(can, msg.Option(nfs.PATH), msg.Option(nfs.FILE)), can.ui.zone.source.refresh() }) }, - _runs: function(event, can, button, cb) { - var meta = can.Conf() - var msg = can.request(event) - msg.Option(ctx.ACTION, button) - can.user.input(event, can, meta.feature[button], function(args) { can.onaction._run(event, can, button, args, cb) }) }, + _runs: function(event, can, button, cb) { var meta = can.Conf(), msg = can.request(event); msg.Option(ctx.ACTION, button) + can.user.input(event, can, meta.feature[button], function(args) { can.onaction._run(event, can, button, args, cb) }) }, save: function(event, can, button) { can.request(event, {file: can.Option(nfs.FILE), content: can.onexport.content(can)}) function imports(str) { var block = "", count = 0; can.core.List(str.split(lex.NL), function(item) { if (can.base.beginWith(item, "import (")) { block = can.core.Split(item)[0]; return } @@ -81,11 +78,12 @@ Volcanos(chat.ONACTION, {list: [ if (can.base.beginWith(item, "import ")) { count++; return } if (block == "import") { count++ } }); return count } + var p = can.Option(nfs.PATH)+can.Option(nfs.FILE); can.user.toastProcess(can, p, button) can.onaction._run(event, can, button, [can.onexport.parse(can), can.Option(nfs.FILE), can.Option(nfs.PATH)], function(msg) { if (can.onexport.parse(can) == nfs.GO) { var line = can.onaction.selectLine(can); can.onmotion.clear(can, can.ui.content) can.ui.content._max = 0, can.core.List(msg.Result().split(lex.NL), function(item) { can.onaction.appendLine(can, item) }) can.onaction.selectLine(can, line+imports(msg.Result())-imports(msg.Option(nfs.CONTENT))) - } can.user.toastSuccess(can, can.Option(nfs.PATH)+can.Option(nfs.FILE), button) + } can.user.toastSuccess(can, p, button) }) }, trash: function(event, can, button) { can.onaction._run(event, can, button, [can.Option(nfs.PATH)+can.Option(nfs.FILE)], function() { can._msg._tab._close() }) }, diff --git a/plugin/story/studio.js b/plugin/story/studio.js index 55b648ae..ef059f47 100644 --- a/plugin/story/studio.js +++ b/plugin/story/studio.js @@ -5,7 +5,8 @@ Volcanos(chat.ONIMPORT, { }, _tabs: function(can, msg) { can.onappend.style(can, web.STUDIO), can.onmotion.clear(can, can._action) var margin = html.PLUGIN_MARGIN*2 - msg.Table(function(value, index) { value.nick = can.user.trans(can, value.index.split(nfs.PT).pop(), value.help) + msg.Table(function(value, index) { + value.nick = can.user.trans(can, value.index.split(nfs.PT).pop(), value.help) var target = can.onimport.item(can, value, function() { if (value._plugin) { return can.onmotion.select(can, can._output, html.FIELDSET, value._plugin._target) } can.onappend.plugin(can, value, function(sub) { value._plugin = sub @@ -18,7 +19,8 @@ Volcanos(chat.ONIMPORT, { }, _full: function(can, msg) { can.ui = can.onappend.layout(can), can.page.style(can, can.ui.content, html.PADDING, 10) - msg.Table(function(value, index) { value.nick = value.help||value.name.split(" ")[0] + msg.Table(function(value, index) { + value.nick = can.user.trans(can, value.index.split(nfs.PT).pop(), value.help) var target = can.onimport.item(can, value, function(event) { if (can.onmotion.cache(can, function() { return value.index }, can.ui.content)) { return } can.onappend.plugin(can, value, function(sub) {