From 6bd632ece037962b43dcd6048293a74105a59814 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Apr 2024 21:38:44 +0200 Subject: [PATCH] Update button classes --- index.html | 4 ++-- js/advanced-cam-gcode.js | 6 ++++++ js/application-settings-controller.js | 4 ---- lib/3dview/3dview.js | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index f91bb07..aeecfb3 100644 --- a/index.html +++ b/index.html @@ -432,7 +432,7 @@
Calculating Toolpaths...
- 3. Create Gcode + 3. Create G-code
@@ -444,7 +444,7 @@
Calculating Toolpaths...
- 4. Export Gcode + 4. Export G-code
diff --git a/js/advanced-cam-gcode.js b/js/advanced-cam-gcode.js index c4f8a49..d595393 100644 --- a/js/advanced-cam-gcode.js +++ b/js/advanced-cam-gcode.js @@ -36,6 +36,10 @@ function makeGcodeExec() { $("#generatetpgcode").html(" Generating, please wait"); $("#generatetpgcode").prop('disabled', true); $("#generatetpgcode").removeClass('success'); + + $('#gcodesavebtn2').addClass('disabled'); + $('#gcodesavebtn2').removeClass('primary'); + // Button on Window bar above Toolpaths @@ -155,6 +159,8 @@ function generateGcode(index, toolpathGrp, cutSpeed, plungeSpeed, laserPwr, rapi $("#generatetpgcode").html(" Generate G-Code"); $("#generatetpgcode").prop('disabled', false); $("#generatetpgcode").addClass('success'); + $('#gcodesavebtn2').removeClass('disabled'); + $('#gcodesavebtn2').addClass('primary'); } else { toolpathGrp.traverse(function(child) { var toolDia = toolpathGrp.userData.toolDia; diff --git a/js/application-settings-controller.js b/js/application-settings-controller.js index 0eb00db..66731e6 100644 --- a/js/application-settings-controller.js +++ b/js/application-settings-controller.js @@ -140,10 +140,6 @@ function checkSettingsLocal() { setTimeout(function() { Metro.dialog.open('#settingsmodal'); }, 1000) - } else { - if (!localStorage.getItem('hideChangelog')) { - getChangelog(); - } } diff --git a/lib/3dview/3dview.js b/lib/3dview/3dview.js index 809ffc9..90c6cbb 100644 --- a/lib/3dview/3dview.js +++ b/lib/3dview/3dview.js @@ -40,10 +40,12 @@ function parseGcodeInWebWorker() { $("#generatetpgcode").addClass('success'); + // $('#gcodesavebtn1').prop('disabled', false); $('#gcodesavebtn2').removeClass('disabled'); $('#gcodesavebtn2').addClass('primary'); $('#gcodetrashbtn2').removeClass('disabled'); + $('#gcodeexporticon').addClass('fg-grayBlue').removeClass('fg-gray'); $('#gcodepreviewicon').addClass('fg-grayBlue').removeClass('fg-gray'); $('#trashicon').addClass('fg-red').removeClass('fg-gray');