diff --git a/base/tcp/wifi.go b/base/tcp/wifi.go index 8c861490..51b59d54 100644 --- a/base/tcp/wifi.go +++ b/base/tcp/wifi.go @@ -38,7 +38,7 @@ func init() { m.ProcessHold() } }}, - }, mdb.HashAction(mdb.SHORT, SSID, mdb.FIELD, "time,ssid,password")), Hand: func(m *ice.Message, arg ...string) { + }, mdb.ExportHashAction(mdb.SHORT, SSID, mdb.FIELD, "time,ssid,password")), Hand: func(m *ice.Message, arg ...string) { if mdb.HashSelect(m, arg...).PushAction(CONNECT, mdb.REMOVE); len(arg) > 0 { m.EchoQRCode(kit.Format("WIFI:T:WPA;S:%s;P:%s;H:false;;", m.Append(SSID), m.Append(aaa.PASSWORD))) } diff --git a/core/chat/macos/desktop.css b/core/chat/macos/desktop.css index 2216a6dd..2ed07ebf 100644 --- a/core/chat/macos/desktop.css +++ b/core/chat/macos/desktop.css @@ -67,9 +67,15 @@ fieldset.desktop>div.output>div.desktop>fieldset.web.chat.macos.finder>div.statu fieldset.desktop>div.output>div.desktop>fieldset.web.chat.macos.finder>div.output div.item.disable { display:none; } fieldset.desktop>div.output>fieldset.web.chat.macos.dock>div.output div.item.disable { display:none; } fieldset.desktop>div.output>div.desktop>div.item.disable { display:none; } -fieldset.macos.menu>div.output>div.item { padding:0 var(--input-padding); height:var(--desktop-menu-height); float:right; } +fieldset.macos.menu>div.output>div.item { padding:0 var(--button-padding); height:var(--desktop-menu-height); float:right; } +body.mobile fieldset.macos.menu>div.output>div.item { padding:0 var(--input-padding); } +body.mobile fieldset.macos.menu>div.output>div.tabs { display:none; } +body.mobile fieldset.macos.menu>div.output>div.icon.create { display:none; } +body.mobile fieldset.macos.menu>div.output>div.item.search { display:none; } +body.mobile fieldset.macos.menu>div.output>div.item.notify { display:none; } fieldset.macos.menu>div.output>div.item.avatar>img { padding:0; height:var(--desktop-menu-height); } -fieldset.macos.menu>div.output>div.menu { padding:0 var(--input-padding); float:left; } +fieldset.macos.menu>div.output>div.menu { padding:0 var(--button-padding); float:left; } +body.mobile fieldset.macos.menu>div.output>div.menu { padding:0 var(--input-padding); } fieldset.macos.menu>div.output>div.tabs { font-style:italic; padding:0 var(--input-padding); float:left; } fieldset.macos.menu.cmd>div.output>div.tabs { padding:0 var(--button-padding); } fieldset.macos.menu>div.output>div.tabs.select { background-color:var(--panel-hover-bg-color); color:var(--panel-hover-fg-color); } diff --git a/core/chat/macos/desktop.js b/core/chat/macos/desktop.js index 12cffabf..f7646c4e 100644 --- a/core/chat/macos/desktop.js +++ b/core/chat/macos/desktop.js @@ -1,7 +1,7 @@ (function() { Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.isCmdMode() && can.onappend.style(can, html.OUTPUT) - can.onlayout.background(can, can.misc.ResourceIcons(can, can.user.info.background||"/p/usr/icons/background.jpg"), can._fields) + can.onlayout.background(can, can.misc.ResourceIcons(can, can.user.info.background||"usr/icons/background.png"), can._fields) can.onimport._menu(can), can.onimport._notifications(can), can.onimport._searchs(can), can.onimport._dock(can) can.sup.onexport.link = function() { return can.misc.MergeURL(can, {pod: can.ConfSpace()||can.misc.Search(can, ice.POD), cmd: web.DESKTOP}) } can.onexport.title(can, can.ConfHelp(), can.user.titles) diff --git a/core/chat/macos/dock.js b/core/chat/macos/dock.js index 40dc768c..5df78e2b 100644 --- a/core/chat/macos/dock.js +++ b/core/chat/macos/dock.js @@ -1,10 +1,13 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.page.style(can, can._output, html.MAX_WIDTH, can.page.width()) - can.onimport.icon(can, msg = msg||can._msg, can._output, function(target, item) { can.page.Modify(can, target, { - onclick: function(event) { can.sup.onexport.record(can, item.name, mdb.NAME, item) }, - oncontextmenu: function(event) { var carte = can.user.carte(event, can, { - remove: function() { item.name != "Finder" && can.runAction(event, mdb.REMOVE, [item.hash]) }, - }); can.page.style(can, carte._target, html.LEFT, event.x) }, - }) }), can.page.Append(can, can._output, [{view: "space"}]) + can.onimport.icon(can, msg = msg||can._msg, can._output, function(target, item) { + can.page.Modify(can, target, { + style: {"max-width": (can.page.width()-15)/msg.Length()}, + onclick: function(event) { can.sup.onexport.record(can, item.name, mdb.NAME, item) }, + oncontextmenu: function(event) { var carte = can.user.carte(event, can, { + remove: function() { item.name != "Finder" && can.runAction(event, mdb.REMOVE, [item.hash]) }, + }); can.page.style(can, carte._target, html.LEFT, event.x) }, + }) + }), can.page.Append(can, can._output, [{view: "space"}]) }, }) diff --git a/core/chat/macos/menu.js b/core/chat/macos/menu.js index d2b2174f..341ed1d4 100644 --- a/core/chat/macos/menu.js +++ b/core/chat/macos/menu.js @@ -1,9 +1,9 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg) { can.page.style(can, can._output, html.MAX_WIDTH, "") can.page.Append(can, can._output, can.user.header(can.sup._desktop)), can.page.Append(can, can._output, [ - {view: [html.ITEM], list: [{icon: icon.notifications}], onclick: function(event) { can.sup.onexport.record(can, "notifications") }}, - {view: [html.ITEM], list: [{icon: icon.search}], onclick: function(event) { can.sup.onexport.record(can, "searchs") }}, + {view: [[html.ITEM, "state", "notify"]], list: [{icon: icon.notifications}], onclick: function(event) { can.sup.onexport.record(can, "notifications") }}, + {view: [[html.ITEM, "state", "search"]], list: [{icon: icon.search}], onclick: function(event) { can.sup.onexport.record(can, "searchs") }}, ].concat(msg.Table(function(item) { - return {view: [html.ITEM], list: [{img: can.page.drawText(can, item.name||item.index, 25, 0, 20)}], onclick: function(event) { can.sup.onexport.record(can, item) }} + return {view: [[html.ITEM, item.name]], list: [{img: can.page.drawText(can, item.name||item.index, 25, 0, 20)}], onclick: function(event) { can.sup.onexport.record(can, item) }} }), [ {view: [[html.MENU, html.TITLE]], list: [ {img: can.misc.ResourceFavicon(can, msg.Option(html.FAVICON), can.ConfSpace())},