From ccf3e89fbda30ad51aaf4e47c08c09bb80f34d57 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Tue, 26 Mar 2024 21:15:00 +0530 Subject: [PATCH 1/4] macros to macro, minor fixes --- src/pug/templates/control-view.pug | 4 ++-- src/pug/templates/macros.pug | 16 ++++++++-------- src/stylus/style.styl | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index c5b23cd..ff912ac 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -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 diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug index 2666bea..39b9f2b 100644 --- a/src/pug/templates/macros.pug +++ b/src/pug/templates/macros.pug @@ -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", diff --git a/src/stylus/style.styl b/src/stylus/style.styl index 8200dbf..f419ff2 100644 --- a/src/stylus/style.styl +++ b/src/stylus/style.styl @@ -671,6 +671,7 @@ span.unit .new-gcode height 13rem width 23rem + resize none border-radius 10px padding 20px From b3584c8f4d40af123f454cdc66ff269c3969a3eb Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Tue, 26 Mar 2024 21:20:14 +0530 Subject: [PATCH 2/4] minor changes to alert --- src/pug/templates/control-view.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index ff912ac..fa7b90e 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -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 {{state.selected || "selected macro"}} is being loaded. + p The {{"Macro file "+state.selected || "selected macro"}} is being loaded. div(slot="footer") button.pure-button(@click="macrosLoading=false") Cancel From 75d88e0ce16325425679466c057627c40615d64e Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Tue, 26 Mar 2024 21:53:15 +0530 Subject: [PATCH 3/4] minor changes in alert text --- src/pug/templates/control-view.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index fa7b90e..622247c 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -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 {{"Macro file "+state.selected || "selected macro"}} is being loaded. + p The {{"macro file \""+state.selected+"\"" || "selected macro"}} is being loaded. div(slot="footer") button.pure-button(@click="macrosLoading=false") Cancel From 7ef84f1d76c58104326bb5a5b0df0da292db93e2 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Tue, 26 Mar 2024 22:04:27 +0530 Subject: [PATCH 4/4] fixing textarea --- src/stylus/style.styl | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/stylus/style.styl b/src/stylus/style.styl index f419ff2..c35e8cd 100644 --- a/src/stylus/style.styl +++ b/src/stylus/style.styl @@ -647,14 +647,6 @@ span.unit #macros width 104% - - .gcodeContainer - width 25rem - height 15rem - border-width 1px - border-radius 10px - border-color #424242 - border-style solid .warning-box display flex