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

macros to macro, minor fixes

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-26 21:15:00 +05:30
parent 6fc9ff6004
commit ccf3e89fbd
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ script#control-view-template(type="text/x-template")
message(:show.sync="showNoGcodeMessage")
h3(slot="header") GCode Not Set
div(slot="body")
p Configure the GCode for the selected macros to use it
p Configure the GCode for the selected macro to use it
div(slot="footer")
button.pure-button(@click="showNoGcodeMessage=false") OK
@@ -21,7 +21,7 @@ script#control-view-template(type="text/x-template")
message(:show.sync="macrosLoading")
h3(slot="header") Run Macro?
div(slot="body")
p The selected macro is being loaded.
p The {{state.selected || "selected macro"}} is being loaded.
div(slot="footer")
button.pure-button(@click="macrosLoading=false") Cancel

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

@@ -29,7 +29,7 @@ script#macros-template(type="text/x-template")
|  Selected
message(:show.sync="deleteSelected")
h3(slot="header") Delete Selected Macros?
h3(slot="header") Delete Selected Macro?
p(slot="body")
div(slot="footer")
button.pure-button(@click="deleteSelected = false") Cancel
@@ -52,7 +52,7 @@ script#macros-template(type="text/x-template")
button.pure-button.button-submit(@click="sameName = false") OK
message(:show.sync="addMacros")
h3(slot="header") Do you need to add another macros?
h3(slot="header") Do you need to add another macro?
p(slot="body")
div(slot="footer")
button.pure-button(@click="addMacros = false") Cancel
@@ -61,31 +61,31 @@ script#macros-template(type="text/x-template")
h1 Macros Configuration
.flex-row-container
button.config-button.button-blue(title="Reset Macros", @click="confirmReset=true") Delete All
button.config-button.button-blue(title="Add a Macros", @click="addMacros=true", style="margin-left:5px") New Macros
button.config-button.button-blue(title="Add a Macros", @click="addMacros=true", style="margin-left:5px") New Macro
button.config-button.button-blue(title="Delete a Macros", @click="deleteSelected=true", style="margin-left:5px",:disabled="!macrosLength") Delete Selected
.warning-box
p
u Note:
| Select a Macros to edit its settings.
| Select a Macro to edit its settings.
.tabs
div(style="display:flex;align-items:center;margin-left:30px")
h2 Select Macros
h2 Select Macro
select(id="macros-select",title="Select a Macros to edit.",selected
v-model="tab",@change="clearMacros",
style="width:250px;height:50px;border-radius:10px;padding-left:15px;font-weight:bold;margin-left:30px")
option( selected='' value='0') Select a Macros
option( selected='' value='0') Select a Macro
option(v-for="(index,file) in macrosList", :value="index+1") {{file}}
.macros-form
p.title Macros Name
p.title Macro Name
.input-container
input.input-color(type="color",id="macros-color",value="#ffffff",@change="editedColor")
input.input-name(type="text",minlength='1',maxlength='15',id="macros-name" ,v-model="macrosName",@keypress="editedName")
div
input.input-alert(type="checkbox",id="macros-alert" v-model="isChecked",@change="editedAlert")
label Would you like an alert when running this macro?
p.title Macros G-Code
p.title Macro G-Code
.flex-row-container
select(id="gcode-select",title="Select previously uploaded GCode programs.",selected
v-model="fileName",@change="loadMacrosGcode", :disabled="!is_ready",

1
src/stylus/style.styl
View File

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