Skip to content

Commit

Permalink
Various changes towards v3.3
Browse files Browse the repository at this point in the history
Updated WHATS_NEW and object model to match DSF 3.3
Added PT-BR translations (thanks phcella)
Removed ripple effect from file list items
Changed plugin interfaces to match DSF 3.3
Bug fixe: Auto-indentation used spaces regardless of last line indentation type
Bug fix: Fixed reset prompt for 0:/sys/board.txt (for STM and LPC users only)
Bug fix: Upload errors for dwc-settings and dwc-cache are no longer displayed
Bug fix: Spindle RPM inputs didn't wait for code to finish
Bug fix: Failed uploads for DWC system files are no longer shown
  • Loading branch information
chrishamm committed Feb 7, 2021
1 parent 5a6235c commit 7eb891d
Show file tree
Hide file tree
Showing 16 changed files with 933 additions and 35 deletions.
12 changes: 12 additions & 0 deletions WHATS_NEW.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
Summary of important changes in recent versions
===============================================

Version 3.3.0-b1
================

Compatible versions:
- DuetSoftwareFramework 3.2.0
- RepRapFirmware 2 or newer (1.2x may work but untested)

Bug fixes:
- Auto-indentation used spaces regardless of last line indentation type
- Fixed reset prompt for 0:/sys/board.txt (for STM and LPC users only)
- Upload errors for dwc-settings and dwc-cache are no longer displayed

Version 3.2.0
=============

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "duetwebcontrol",
"version": "3.2.0",
"version": "3.3-b1",
"repository": "github:chrishamm/DuetWebControl",
"homepage": "https://forum.duet3d.com/category/27/duet-web-control",
"license": "GPL-3.0",
Expand Down
1 change: 1 addition & 0 deletions src/components/dialogs/FileEditDialog/FileEditDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export default {
return {
mode: 'application/x-gcode',
theme: this.darkTheme ? 'blackboard' : 'default',
indentWithTabs: true,
lineNumbers: true,
styleActiveLine: true
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/inputs/ToolInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ export default {
if (this.spindle) {
// Set Spindle RPM
if (this.inputValue >= 0) {
this.sendCode(`M3 P${this.spindleIndex} S${this.inputValue}`);
await this.sendCode(`M3 P${this.spindleIndex} S${this.inputValue}`);
} else {
this.sendCode(`M4 P${this.spindleIndex} S${-this.inputValue}`);
await this.sendCode(`M4 P${this.spindleIndex} S${-this.inputValue}`);
}
} else if (this.inputValue >= -273.15 && this.inputValue <= 1999) {
if (this.tool) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/lists/BaseFileList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ td {
</template>

<template #item="props">
<tr v-ripple :active="props.isSelected" @keydown.space.prevent="props.select(!props.isSelected)"
<tr :active="props.isSelected" @keydown.space.prevent="props.select(!props.isSelected)"
@touchstart="onItemTouchStart(props, $event)" @touchend="onItemTouchEnd"
@click="onItemClick(props)" @keydown.enter.prevent="onItemClick(props)"
@contextmenu.stop.prevent="onItemContextmenu(props, $event)" @keydown.escape.prevent="contextMenu.shown = false"
Expand Down
11 changes: 5 additions & 6 deletions src/components/lists/JobFileList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,11 @@ export default {
},
contextMenuAction(menuItem){
let path = Path.combine(this.directory, this.selection[0].name);
if(menuItem.path !== ''){
this.$router.push(menuItem.path).then(() => {
this.$root.$emit(menuItem.action, path);
})
}
else{
if (menuItem.path !== '') {
this.$router.push(menuItem.path).then(() => {
this.$root.$emit(menuItem.action, path);
})
} else {
this.$root.$emit(menuItem.action, path);
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/lists/SystemFileList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export default {
fileEdited(filename) {
const fullName = Path.combine(this.directory, filename);
const configFile = Path.combine(this.systemDirectory, Path.configFile);
if (!isPrinting(this.status) && (fullName === Path.configFile || fullName === configFile || fullName === Path.boardsFile)) {
if (!isPrinting(this.status) && (fullName === Path.configFile || fullName === configFile || fullName === Path.boardFile)) {
// Ask for firmware reset when config.g or 0:/sys/board.txt (RRF on LPC) has been edited
this.showResetPrompt = true;
}
Expand Down
2 changes: 2 additions & 0 deletions src/i18n/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import en from './en.js'
import de from './de.js'
import es from './es.js'
import fr from './fr.js'
import pt_br from './pt_br.js'
import ru from './ru.js'
import tr from './tr.js'
import zh_cn from './zh_cn.js'
Expand All @@ -18,6 +19,7 @@ const messages = {
de,
es,
fr,
pt_br,
ru,
tr,
zh_cn
Expand Down
Loading

0 comments on commit 7eb891d

Please sign in to comment.