Update button classes

OpenBuilds · Apr 15, 2024 · 6bd632e · 6bd632e
1 parent 06611ee
commit 6bd632e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -432,7 +432,7 @@ <h6>Calculating Toolpaths...</h6>
 						<div class="window drop-shadow mt-2">
 							<div class="window-caption bg-openbuilds">
 								<i class="fa fa-cubes fa-fw ml-1 mr-1"></i>
-								<span class="title">3. Create Gcode</span>
+								<span class="title">3. Create G-code</span>
 								<div class="buttons">
 								</div>
 							</div>
@@ -444,7 +444,7 @@ <h6>Calculating Toolpaths...</h6>
 						<div class="window drop-shadow mt-2">
 							<div class="window-caption bg-openbuilds">
 								<i class="fa fa-save fa-fw ml-1 mr-1"></i>
-								<span class="title">4. Export Gcode</span>
+								<span class="title">4. Export G-code</span>
 								<div class="buttons">
 								</div>
 							</div>

diff --git a/js/advanced-cam-gcode.js b/js/advanced-cam-gcode.js
@@ -36,6 +36,10 @@ function makeGcodeExec() {
     $("#generatetpgcode").html("<i class='fa fa-spinner fa-spin '></i> 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("<i class='fa fa-cubes' aria-hidden='true'></i> 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
@@ -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
@@ -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');