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

keep scale, rotate, extruders menus present but disabled when not usable

Browse source
This commit is contained in:
Stewart Allen 2020-06-13 19:09:54 -04:00
commit ece3e3367f
4 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/kiri/init.js
View file

@ -1129,7 +1129,6 @@
focuser: $('focuser'), focuser: $('focuser'),
container: container, container: container,
menusep: $('lt-sep'),
rotate: $('lt-rotate'), rotate: $('lt-rotate'),
scale: $('lt-scale'), scale: $('lt-scale'),
nozzle: $('lt-nozzle'), nozzle: $('lt-nozzle'),

18
src/kiri/main.js
View file

@ -1048,13 +1048,19 @@
} }
function platformUpdateSelected() { function platformUpdateSelected() {
let selcount = platform.selected_count();
let extruders = settings.device.extruders; let extruders = settings.device.extruders;
let menu_show = platform.selected_count() ? 'flex': ''; let menu_show = selcount ? 'flex': '';
let ext_show = platform.selected_count() && MODE === 'FDM' ? 'flex': ''; if (selcount) {
UI.scale.style.display = menu_show; UI.scale.classList.add('lt-enabled');
UI.rotate.style.display = menu_show; UI.rotate.classList.add('lt-enabled');
UI.nozzle.style.display = extruders && extruders.length > 1 ? menu_show : ''; UI.nozzle.classList.add('lt-enabled');
UI.menusep.style.display = menu_show; } else {
UI.scale.classList.remove('lt-enabled');
UI.rotate.classList.remove('lt-enabled');
UI.nozzle.classList.remove('lt-enabled');
}
UI.nozzle.style.display = extruders && extruders.length > 1 ? 'flex' : '';
if (extruders) { if (extruders) {
for (let i=0; i<extruders.length; i++) { for (let i=0; i<extruders.length; i++) {
let b = $(`sel-ext-${i}`); let b = $(`sel-ext-${i}`);

9
web/kiri/index.css
View file

@ -388,7 +388,7 @@ th, tr, td {
padding: 5px 5px 5px 10px; padding: 5px 5px 5px 10px;
border: 1px solid rgba(0,0,0,0); border: 1px solid rgba(0,0,0,0);
border-radius: 3px; border-radius: 3px;
color: var(--fg-gray); color: #ccc;
left: -5px; left: -5px;
background-color: rgba(255,255,255,0.75); background-color: rgba(255,255,255,0.75);
} }
@ -399,12 +399,15 @@ th, tr, td {
.lt-menu label { .lt-menu label {
font-size: smaller; font-size: smaller;
} }
.lt-menu:hover { .lt-enabled {
color: var(--fg-gray);
}
.lt-enabled:hover {
background-color: #eee; background-color: #eee;
border: 1px solid #aaa; border: 1px solid #aaa;
color: #000; color: #000;
} }
.lt-menu:hover .pop-lcol { .lt-enabled:hover .pop-lcol {
display: flex; display: flex;
} }

18
web/kiri/index.html
View file

@ -69,7 +69,7 @@
<i class="fas fa-arrow-circle-left"></i> <i class="fas fa-arrow-circle-left"></i>
</div> </div>
<div id="lt-top"></div> <div id="lt-top"></div>
<div id="lt-setup" class="lt-menu"> <div id="lt-setup" class="lt-menu lt-enabled">
<i class="fas fa-cogs"></i> <i class="fas fa-cogs"></i>
<label>setup</label> <label>setup</label>
<div id="set-pop" class="pop-lcol row"> <div id="set-pop" class="pop-lcol row">
@ -87,7 +87,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="lt-file" class="lt-menu"> <div id="lt-file" class="lt-menu lt-enabled">
<i class="fas fa-folder"></i> <i class="fas fa-folder"></i>
<label>files</label> <label>files</label>
<div id="file-pop" class="pop-lcol row"> <div id="file-pop" class="pop-lcol row">
@ -101,7 +101,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="lt-view" class="lt-menu"> <div id="lt-view" class="lt-menu lt-enabled">
<i class="fas fa-eye"></i> <i class="fas fa-eye"></i>
<label>view</label> <label>view</label>
<div id="pop-view" class="pop-lcol row"> <div id="pop-view" class="pop-lcol row">
@ -120,20 +120,20 @@
</div> </div>
</div> </div>
<div id="act-sep"></div> <div id="act-sep"></div>
<div id="act-slice" class="lt-menu"> <div id="act-slice" class="lt-menu lt-enabled">
<i class="fas fa-bars"></i> <i class="fas fa-bars"></i>
<label>slice</label> <label>slice</label>
</div> </div>
<div id="act-preview" class="lt-menu"> <div id="act-preview" class="lt-menu lt-enabled">
<i class="fas fa-cubes"></i> <i class="fas fa-cubes"></i>
<label>preview</label> <label>preview</label>
</div> </div>
<div id="act-export" class="lt-menu"> <div id="act-export" class="lt-menu lt-enabled">
<i class="fas fa-file-download"></i> <i class="fas fa-file-download"></i>
<label>export</label> <label>export</label>
</div> </div>
<div id="lt-sep" class="noshow"></div> <div id="lt-sep"></div>
<div id="lt-rotate" class="lt-menu noshow"> <div id="lt-rotate" class="lt-menu">
<i class="fas fa-sync-alt"></i> <i class="fas fa-sync-alt"></i>
<label>rotate</label> <label>rotate</label>
<div id="pop-rotate" class="pop-lcol row fillh russo"> <div id="pop-rotate" class="pop-lcol row fillh russo">
@ -151,7 +151,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="lt-scale" class="lt-menu noshow"> <div id="lt-scale" class="lt-menu">
<i class="fas fa-expand"></i> <i class="fas fa-expand"></i>
<label>scale</label> <label>scale</label>
<div id="pop-scale" class="pop-lcol row fillh russo"> <div id="pop-scale" class="pop-lcol row fillh russo">