AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tweak compact menu order and titles

Browse source
This commit is contained in:
Stewart Allen 2020-06-01 21:53:14 -04:00
commit b01b2be818
3 changed files with 38 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

81
js/kiri-init.js
View file

@ -1192,72 +1192,35 @@ var gs_kiri_init = exports;
mode: UC.newGroup(LANG.mo_menu, assets, {region:"left", poprow:false}), mode: UC.newGroup(LANG.mo_menu, assets, {region:"left", poprow:false}),
modeTable: UC.newTableRow([ modeTable: UC.newTableRow([
[ [ UI.modeFDM = UC.newButton(LANG.mo_fdmp, function() { API.mode.set('FDM',null,platform.update_size) }, {icon: KIRI.icons.fdm}) ],
UI.modeFDM = [ UI.modeSLA = UC.newButton(LANG.mo_slap, function() { API.mode.set('SLA',null,platform.update_size) }, {icon: KIRI.icons.sla}) ],
UC.newButton(LANG.mo_fdmp, function() { API.mode.set('FDM',null,platform.update_size) }, {icon: KIRI.icons.fdm}), [ UI.modeLASER = UC.newButton(LANG.mo_lazr, function() { API.mode.set('LASER',null,platform.update_size) }, {icon: KIRI.icons.laser}) ],
],[ [ UI.modeCAM = UC.newButton(LANG.mo_cncm, function() { API.mode.set('CAM',null,platform.update_size) }, {icon: KIRI.icons.cam, id:"modeCAM"}) ]
UI.modeSLA =
UC.newButton(LANG.mo_slap, function() { API.mode.set('SLA',null,platform.update_size) }, {icon: KIRI.icons.sla}),
],[
UI.modeLASER =
UC.newButton(LANG.mo_lazr, function() { API.mode.set('LASER',null,platform.update_size) }, {icon: KIRI.icons.laser}),
],[
UI.modeCAM =
UC.newButton(LANG.mo_cncm, function() { API.mode.set('CAM',null,platform.update_size) }, {icon: KIRI.icons.cam, id:"modeCAM"}),
]
]), ]),
system: UC.newGroup(LANG.su_menu), system: UC.newGroup(LANG.su_menu),
sysTable: UC.newTableRow([ sysTable: UC.newTableRow([
[ [ UI.setupDevices = UC.newButton(LANG.su_devi, showDevices) ],
UI.setupDevices = [ UI.setupTools = UC.newButton(LANG.su_tool, showTools, {modes:CAM}) ],
UC.newButton(LANG.su_devi, showDevices) [ UI.setupExport = UC.newButton(LANG.su_xprt, settingsExport, {modes:ALL, expert:true}) ],
],[ [ UI.localButton = UC.newButton(LANG.su_locl, API.show.local, {modes:FDM_CAM, expert:true}) ]
UI.setupTools = ]),
UC.newButton(LANG.su_tool, showTools, {modes:CAM}) wsFile: UC.newGroup(LANG.fe_menu),
],[ wsFileTable: UC.newTableRow([
UI.setupExport = [ UI.import = UC.newButton(LANG.fn_recn, undefined, {class:"asym"}) ],
UC.newButton(LANG.su_xprt, settingsExport, {modes:ALL, expert:true}) [ UI.load = UC.newButton(LANG.fn_impo, function() { API.event.import() }, {class:"asym"}) ]
],[
UI.localButton =
UC.newButton(LANG.su_locl, API.show.local, {modes:FDM_CAM, expert:true})
],[
UI.helpButton =
UC.newButton(LANG.su_help, API.help.show)
]
]), ]),
wsFunc: UC.newGroup(LANG.fn_menu), wsFunc: UC.newGroup(LANG.fn_menu),
wsFuncTable: UC.newTableRow([ wsFuncTable: UC.newTableRow([
[ [ UI.modeArrange = UC.newButton(LANG.fn_arra, platform.layout) ],
UI.load = [ UI.modeSlice = UC.newButton(LANG.fn_slic, API.function.slice) ],
UC.newButton(LANG.fn_impo, function() { API.event.import() }, {class:"asym"}), [ UI.modePreview = UC.newButton(LANG.fn_prev, API.function.print) ],
UI.import = [ UI.modeExport = UC.newButton(LANG.fn_expo, API.function.export) ]
UC.newButton("+", undefined, {class:"asym"})
],[
UI.modeArrange =
UC.newButton(LANG.fn_arra, platform.layout),
],[
UI.modeSlice =
UC.newButton(LANG.fn_slic, API.function.slice)
],[
UI.modePreview =
UC.newButton(LANG.fn_prev, API.function.print),
],[
UI.modeExport =
UC.newButton(LANG.fn_expo, API.function.export)
]
]), ]),
camera: UC.newGroup(LANG.vu_menu), camera: UC.newGroup(LANG.vu_menu),
camTable: UC.newTableRow([ camTable: UC.newTableRow([
[ [ UC.newButton(LANG.vu_sptp, SPACE.view.top) ],
UC.newButton(LANG.vu_home, SPACE.view.home), [ UC.newButton(LANG.vu_home, SPACE.view.home) ],
UC.newButton(LANG.vu_rset, SPACE.view.reset) [ UC.newButton(LANG.vu_rset, SPACE.view.reset) ]
],[
UC.newButton(LANG.vu_sptp, SPACE.view.top),
UC.newButton(LANG.vu_spfr, SPACE.view.front),
],[
UC.newButton(LANG.vu_splt, SPACE.view.left),
UC.newButton(LANG.vu_sprt, SPACE.view.right)
]
]), ]),
workspace: UC.newGroup(LANG.ws_menu, undefined, {modes:ALL, expert:true}), workspace: UC.newGroup(LANG.ws_menu, undefined, {modes:ALL, expert:true}),
@ -1265,7 +1228,6 @@ var gs_kiri_init = exports;
[ [
UI.saveButton = UI.saveButton =
UC.newButton(LANG.ws_save, API.space.save), UC.newButton(LANG.ws_save, API.space.save),
],[
UC.newButton(LANG.ws_cler, API.space.clear) UC.newButton(LANG.ws_cler, API.space.clear)
] ]
], {modes:ALL, expert:true}), ], {modes:ALL, expert:true}),
@ -1789,9 +1751,6 @@ var gs_kiri_init = exports;
// ensure hot keys work even in iframes // ensure hot keys work even in iframes
API.focus(); API.focus();
// place version number a couple of places to help users
UI.helpButton.title = `${LANG.version} ` + KIRI.version;
// restore expert setting preference // restore expert setting preference
UC.setExpert(control.expert); UC.setExpert(control.expert);

24
js/moto-space.js
View file

@ -387,21 +387,21 @@ var MOTO = window.moto = window.moto || {};
case cca('h'): case cca('h'):
Space.view.home(); Space.view.home();
break; break;
case cca('f'):
Space.view.front();
break;
case cca('l'):
Space.view.left();
break;
case cca('r'):
Space.view.right();
break;
case cca('t'): case cca('t'):
Space.view.top(); Space.view.top();
break; break;
case cca('b'): // case cca('f'):
Space.view.back(); // Space.view.front();
break; // break;
// case cca('l'):
// Space.view.left();
// break;
// case cca('r'):
// Space.view.right();
// break;
// case cca('b'):
// Space.view.back();
// break;
default: default:
handled = false; handled = false;
break; break;

8
web/kiri/lang/en.js
View file

@ -85,9 +85,13 @@ kiri.lang['en-us'] = {
su_xprt: "Export", su_xprt: "Export",
su_help: "Help", su_help: "Help",
// FUNCTION // LOAD
fn_menu: "function", fe_menu: "file",
fn_recn: "Recent",
fn_impo: "Import", fn_impo: "Import",
// FUNCTION
fn_menu: "action",
fn_arra: "Arrange", fn_arra: "Arrange",
fn_slic: "Slice", fn_slic: "Slice",
fn_prev: "Preview", fn_prev: "Preview",