muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI changes

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-02 21:46:12 +05:30
parent 83ec3de8d0
commit 6d589ec268
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/control-view.js
View File

@@ -510,7 +510,6 @@ module.exports = {
} }
try{ try{
this.load(); this.load();
console.log("Loaded file");
this.start_pause(); this.start_pause();
}catch(error){ }catch(error){
console.warn("Error running program: ",error); console.warn("Error running program: ",error);

18
src/pug/templates/macros.pug
View File

@@ -39,8 +39,7 @@ script#macros-template(type="text/x-template")
input(type="file", @change="upload", :disabled="!is_ready", input(type="file", @change="upload", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
button.submit-macros(title="Save Macros",@click="saveMacros(0)", button.submit-macros(title="Save Macros",@click="saveMacros(0)") Save Macros
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros
section#content2.tab-content section#content2.tab-content
.macros-form .macros-form
@@ -61,8 +60,7 @@ script#macros-template(type="text/x-template")
input(type="file", @change="upload", :disabled="!is_ready", input(type="file", @change="upload", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
button.submit-macros(title="Save Macros",@click="saveMacros(1)", button.submit-macros(title="Save Macros",@click="saveMacros(1)") Save Macros
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros
section#content3.tab-content section#content3.tab-content
.macros-form .macros-form
@@ -83,8 +81,7 @@ script#macros-template(type="text/x-template")
input(type="file", @change="upload", :disabled="!is_ready", input(type="file", @change="upload", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
button.submit-macros(title="Save Macros",@click="saveMacros(2)", button.submit-macros(title="Save Macros",@click="saveMacros(2)") Save Macros
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros
section#content4.tab-content section#content4.tab-content
.macros-form .macros-form
@@ -105,8 +102,7 @@ script#macros-template(type="text/x-template")
input(type="file", @change="upload", :disabled="!is_ready", input(type="file", @change="upload", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
button.submit-macros(title="Save Macros",@click="saveMacros(3)", button.submit-macros(title="Save Macros",@click="saveMacros(3)") Save Macros
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros
section#content5.tab-content section#content5.tab-content
.macros-form .macros-form
@@ -127,8 +123,7 @@ script#macros-template(type="text/x-template")
input(type="file", @change="upload", :disabled="!is_ready", input(type="file", @change="upload", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
button.submit-macros(title="Save Macros",@click="saveMacros(4)", button.submit-macros(title="Save Macros",@click="saveMacros(4)") Save Macros
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros
section#content6.tab-content section#content6.tab-content
.macros-form .macros-form
@@ -149,8 +144,7 @@ script#macros-template(type="text/x-template")
input(type="file", @change="upload", :disabled="!is_ready", input(type="file", @change="upload", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
button.submit-macros(title="Save Macros",@click="saveMacros(5)", button.submit-macros(title="Save Macros",@click="saveMacros(5)") Save Macros
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros
//- button.pure-button(title="Print config.", @click="printConfig", //- button.pure-button(title="Print config.", @click="printConfig",
//- style="height:50px;width:120px;font-weight:normal;padding-top:5px") print Config //- style="height:50px;width:120px;font-weight:normal;padding-top:5px") print Config

3
src/stylus/style.styl
View File

@@ -637,8 +637,9 @@ span.unit
.submit-macros .submit-macros
height 50px height 50px
width 140px width 140px
margin-top 30px
font-weight normal font-weight normal
background-color #e6e6e6 background-color #add1ad
color #fff color #fff
border 0 border 0