emit('start-resizing-panel')}>
diff --git a/ui/arduino/components/panel_files.js b/ui/arduino/components/panel_files.js
index 8b2cc7b..446283d 100644
--- a/ui/arduino/components/panel_files.js
+++ b/ui/arduino/components/panel_files.js
@@ -1,15 +1,23 @@
function PanelFiles(state, emit) {
function ListItem(device, file) {
let selectedClass = ''
- if (device === state.selectedDevice && file === state.selectedFile) {
+ if (device === state.selectedDevice && file.path === state.selectedFile) {
selectedClass = 'selected'
}
+ function onClick() {
+ if (file.type === 'folder') {
+ emit('navigate-to', device, file.path)
+ } else {
+ emit('select-file', device, file.path)
+ }
+ }
return html`
emit('select-file', device, file)}
+ onclick=${onClick}
class=${selectedClass}
>
- ${file}
+ ${file.type === 'folder' ? Icon('icons/Folder.svg') : Icon('icons/File.svg')}
+ ${file.path}
`
}
@@ -22,41 +30,90 @@ function PanelFiles(state, emit) {
&& state.diskPath
&& state.selectedDevice === 'serial'
&& state.selectedFile !== null
+ let canRemoveSerial = state.isConnected
+ && state.selectedDevice === 'serial'
+ && state.selectedFile !== null
+ && state.serialFiles.find(f => f.path === state.selectedFile)
+ let canRemoveDisk = state.selectedDevice === 'disk'
+ && state.selectedFile !== null
+ && state.diskFiles.find(f => f.path === state.selectedFile)
+
let upload = Button({
- label: 'Upload',
icon: 'icons/Copy-Left.svg',
onclick: () => emit('upload'),
- disabled: !uploadEnabled
+ disabled: !uploadEnabled,
+ className: 'primary'
})
let download = Button({
- label: 'Download',
icon: 'icons/Copy-Right.svg',
onclick: () => emit('download'),
- disabled: !downloadEnabled
+ disabled: !downloadEnabled,
+ className: 'primary'
+ })
+ let refresh = Button({
+ icon: 'icons/Reboot.svg',
+ onclick: () => emit('update-files'),
+ disabled: !(state.isConnected || state.diskPath)
})
- let remove = Button({
- label: 'Remove',
+
+ let removeSerial = Button({
icon: 'icons/Delete.svg',
onclick: () => emit('remove'),
- disabled: state.selectedFile === null
+ disabled: !canRemoveSerial
+ })
+ let newSerial = Button({
+ icon: 'icons/New.svg',
+ onclick: () => emit('new-file', 'serial'),
+ disabled: !state.isConnected
+ })
+
+ let removeDisk = Button({
+ icon: 'icons/Delete.svg',
+ onclick: () => emit('remove'),
+ disabled: !canRemoveDisk
+ })
+ let newDisk = Button({
+ icon: 'icons/New.svg',
+ onclick: () => emit('new-file', 'disk'),
+ disabled: !state.diskPath
})
return html`
-
Board: ${state.serialPath}
+
+ - emit('navigate-to-parent', 'serial')}>
+ ..
+
${state.serialFiles.map((file) => ListItem('serial', file))}
${upload}
${download}
- ${remove}
+ ${refresh}
-
Disk: ${state.diskPath}
+
+ - emit('navigate-to-parent', 'disk')}>
+ ..
+
${state.diskFiles.map((file) => ListItem('disk', file))}
diff --git a/ui/arduino/components/panel_terminal.js b/ui/arduino/components/panel_terminal.js
index d5641d4..7ae3121 100644
--- a/ui/arduino/components/panel_terminal.js
+++ b/ui/arduino/components/panel_terminal.js
@@ -26,12 +26,12 @@ class XTerm extends Component {
}
resizeTerm() {
- let handleSize = 2 * 0.0225 * window.innerHeight
+ let handleSize = 36
const parentStyle = window.getComputedStyle(document.querySelector('#panel'))
const parentWidth = parseInt(parentStyle.getPropertyValue('width'))
const parentHeight = parseInt(parentStyle.getPropertyValue('height'))
const cols = Math.floor(parentWidth / this.term._core._renderService.dimensions.actualCellWidth)
- const rows = Math.floor((parentHeight-handleSize) / this.term._core._renderService.dimensions.actualCellHeight)
+ const rows = Math.floor((parentHeight-handleSize) / this.term._core._renderService.dimensions.actualCellHeight) - 1
this.term.resize(cols, rows)
}
}
diff --git a/ui/arduino/components/toolbar.js b/ui/arduino/components/toolbar.js
index 3077511..95b18e5 100644
--- a/ui/arduino/components/toolbar.js
+++ b/ui/arduino/components/toolbar.js
@@ -48,18 +48,29 @@ function Toolbar(state, emit) {
onclick: () => emit('open-folder')
})
- const canSaveBoard = state.isConnected
- && state.selectedDevice === 'serial'
- && state.selectedFile
- const canSaveDisk = state.selectedDevice === 'disk'
- && state.selectedFile
- && state.diskPath
- const save = Button({
+ let save = Button({
icon: 'icons/Save.svg',
label: 'Save',
- disabled: !canSaveBoard && !canSaveDisk,
- onclick: () => emit('save')
+ disabled: true,
+ onclick: () => false
})
+ if (state.selectedDevice === 'serial') {
+ const canSaveBoard = state.isConnected && state.selectedFile
+ save = Button({
+ icon: 'icons/Save.svg',
+ label: 'Save',
+ disabled: !canSaveBoard,
+ onclick: () => emit('save')
+ })
+ } else if (state.selectedDevice === 'disk') {
+ const canSaveDisk = state.selectedFile && state.diskPath
+ save = Button({
+ icon: 'icons/Save.svg',
+ label: 'Save',
+ disabled: !canSaveDisk,
+ onclick: () => emit('save')
+ })
+ }
const terminal = Button({
icon: 'icons/Output.svg',
@@ -84,8 +95,6 @@ function Toolbar(state, emit) {
${stop}
${reset}
- ${newFile}
- ${openFolder}
${save}
${terminal}
diff --git a/ui/arduino/icons/Computer.svg b/ui/arduino/icons/Computer.svg
new file mode 100644
index 0000000..27159b0
--- /dev/null
+++ b/ui/arduino/icons/Computer.svg
@@ -0,0 +1,3 @@
+
diff --git a/ui/arduino/icons/File-Explorer.svg b/ui/arduino/icons/File-Explorer.svg
index 5786c76..36d0d19 100644
--- a/ui/arduino/icons/File-Explorer.svg
+++ b/ui/arduino/icons/File-Explorer.svg
@@ -1,4 +1,44 @@
-