macros to macro, minor fixes
This commit is contained in:
@@ -13,7 +13,7 @@ script#control-view-template(type="text/x-template")
|
|||||||
message(:show.sync="showNoGcodeMessage")
|
message(:show.sync="showNoGcodeMessage")
|
||||||
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 macros 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
|
||||||
@@ -21,7 +21,7 @@ script#control-view-template(type="text/x-template")
|
|||||||
message(:show.sync="macrosLoading")
|
message(:show.sync="macrosLoading")
|
||||||
h3(slot="header") Run Macro?
|
h3(slot="header") Run Macro?
|
||||||
div(slot="body")
|
div(slot="body")
|
||||||
p The selected macro is being loaded.
|
p The {{state.selected || "selected macro"}} is being loaded.
|
||||||
|
|
||||||
div(slot="footer")
|
div(slot="footer")
|
||||||
button.pure-button(@click="macrosLoading=false") Cancel
|
button.pure-button(@click="macrosLoading=false") Cancel
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ script#macros-template(type="text/x-template")
|
|||||||
| Selected
|
| Selected
|
||||||
|
|
||||||
message(:show.sync="deleteSelected")
|
message(:show.sync="deleteSelected")
|
||||||
h3(slot="header") Delete Selected Macros?
|
h3(slot="header") Delete Selected Macro?
|
||||||
p(slot="body")
|
p(slot="body")
|
||||||
div(slot="footer")
|
div(slot="footer")
|
||||||
button.pure-button(@click="deleteSelected = false") Cancel
|
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
|
button.pure-button.button-submit(@click="sameName = false") OK
|
||||||
|
|
||||||
message(:show.sync="addMacros")
|
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")
|
p(slot="body")
|
||||||
div(slot="footer")
|
div(slot="footer")
|
||||||
button.pure-button(@click="addMacros = false") Cancel
|
button.pure-button(@click="addMacros = false") Cancel
|
||||||
@@ -61,31 +61,31 @@ script#macros-template(type="text/x-template")
|
|||||||
h1 Macros Configuration
|
h1 Macros Configuration
|
||||||
.flex-row-container
|
.flex-row-container
|
||||||
button.config-button.button-blue(title="Reset Macros", @click="confirmReset=true") Delete All
|
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
|
button.config-button.button-blue(title="Delete a Macros", @click="deleteSelected=true", style="margin-left:5px",:disabled="!macrosLength") Delete Selected
|
||||||
|
|
||||||
.warning-box
|
.warning-box
|
||||||
p
|
p
|
||||||
u Note:
|
u Note:
|
||||||
| Select a Macros 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")
|
||||||
h2 Select Macros
|
h2 Select Macro
|
||||||
select(id="macros-select",title="Select a Macros to edit.",selected
|
select(id="macros-select",title="Select a Macros to edit.",selected
|
||||||
v-model="tab",@change="clearMacros",
|
v-model="tab",@change="clearMacros",
|
||||||
style="width:250px;height:50px;border-radius:10px;padding-left:15px;font-weight:bold;margin-left:30px")
|
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}}
|
option(v-for="(index,file) in macrosList", :value="index+1") {{file}}
|
||||||
.macros-form
|
.macros-form
|
||||||
p.title Macros 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")
|
||||||
input.input-name(type="text",minlength='1',maxlength='15',id="macros-name" ,v-model="macrosName",@keypress="editedName")
|
input.input-name(type="text",minlength='1',maxlength='15',id="macros-name" ,v-model="macrosName",@keypress="editedName")
|
||||||
div
|
div
|
||||||
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 Macros 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="loadMacrosGcode", :disabled="!is_ready",
|
v-model="fileName",@change="loadMacrosGcode", :disabled="!is_ready",
|
||||||
|
|||||||
@@ -671,6 +671,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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user