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

Merge branch 'v1.4.0-alpha' into file-management

Browse Source
This commit is contained in:
sanjayk03-dev
2024-05-12 23:20:46 +05:30
parent a4d76bafd9 7ef84f1d76
commit b39d093654
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pug/templates/control-view.pug
View File

@@ -14,6 +14,7 @@ script#control-view-template(type="text/x-template")
h3(slot="header") GCode Not Set h3(slot="header") GCode Not Set
div(slot="body") div(slot="body")
p Configure the GCode for the selected macro to use it p Configure the GCode for the selected macro to use it
p Configure the GCode for the selected macro to use it
div(slot="footer") div(slot="footer")
button.pure-button(@click="showNoGcodeMessage=false") OK button.pure-button(@click="showNoGcodeMessage=false") OK

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

@@ -77,6 +77,7 @@ script#macros-template(type="text/x-template")
p p
u Note: u Note:
| Select a Macro to edit its settings. | Select a Macro to edit its settings.
| Select a Macro to edit its settings.
.tabs .tabs
div(style="display:flex;align-items:center;margin-left:30px") div(style="display:flex;align-items:center;margin-left:30px")
@@ -87,6 +88,7 @@ script#macros-template(type="text/x-template")
option( selected='' value='0') Select a Macro option( selected='' value='0') Select a Macro
option(v-for="(index,file) in macros_list", :value="index+1") {{file}} option(v-for="(index,file) in macros_list", :value="index+1") {{file}}
.macros-form .macros-form
p.title Macro Name
p.title Macro Name p.title Macro Name
.input-container .input-container
input.input-color(type="color",id="macros-color",value="#ffffff",@change="editedColor") input.input-color(type="color",id="macros-color",value="#ffffff",@change="editedColor")
@@ -95,6 +97,7 @@ script#macros-template(type="text/x-template")
input.input-alert(type="checkbox",id="macros-alert" v-model="isChecked",@change="editedAlert") input.input-alert(type="checkbox",id="macros-alert" v-model="isChecked",@change="editedAlert")
label Would you like an alert when running this macro? label Would you like an alert when running this macro?
p.title Macro G-Code p.title Macro G-Code
p.title Macro G-Code
.flex-row-container .flex-row-container
select(id="gcode-select",title="Select previously uploaded GCode programs.",selected select(id="gcode-select",title="Select previously uploaded GCode programs.",selected
v-model="fileName",@change="load", :disabled="!is_ready", v-model="fileName",@change="load", :disabled="!is_ready",

1
src/stylus/style.styl
View File

@@ -667,6 +667,7 @@ span.unit
.new-gcode .new-gcode
height 13rem height 13rem
width 23rem width 23rem
resize none
border-radius 10px border-radius 10px
padding 20px padding 20px
resize none resize none