{{ $t('ConnectionDialog.CheckMoonrakerLog') }}
-
-
- ~/klipper_logs/moonraker.log -
- /tmp/moonraker.log +
- ~/printer_data/logs/moonraker.log
{{ Math.round(uploadSnackbar.percent) }} % @ {{ formatFilesize(Math.round(uploadSnackbar.speed)) }}/s @@ -90,6 +90,7 @@ import { topbarHeight } from '@/store/variables' import { mdiAlertOctagonOutline, mdiContentSave, mdiFileUpload, mdiClose, mdiCloseThick } from '@mdi/js' import EmergencyStopDialog from '@/components/dialogs/EmergencyStopDialog.vue' import InlineSvg from 'vue-inline-svg' +import ThemeMixin from '@/components/mixins/theme' type uploadSnackbar = { status: boolean @@ -112,7 +113,7 @@ type uploadSnackbar = { TheNotificationMenu, }, }) -export default class TheTopbar extends Mixins(BaseMixin) { +export default class TheTopbar extends Mixins(BaseMixin, ThemeMixin) { mdiAlertOctagonOutline = mdiAlertOctagonOutline mdiContentSave = mdiContentSave mdiFileUpload = mdiFileUpload @@ -180,10 +181,6 @@ export default class TheTopbar extends Mixins(BaseMixin) { return this.$store.state.printer.hostname } - get boolWideNavDrawer() { - return this.$store.state.gui.uiSettings.boolWideNavDrawer ?? false - } - get countPrinters() { return this.$store.getters['farm/countPrinters'] } @@ -192,12 +189,8 @@ export default class TheTopbar extends Mixins(BaseMixin) { return this.$store.state.gui.uiSettings.boolHideUploadAndPrintButton ?? false } - get sidebarLogo(): string { - return this.$store.getters['files/getSidebarLogo'] - } - get isSvgLogo() { - return this.sidebarLogo.includes('.svg?timestamp=') + return this.sidebarLogo.includes('.svg?timestamp=') || this.sidebarLogo.endsWith('.svg') } get logoColor(): string { diff --git a/src/components/charts/TempChart.vue b/src/components/charts/TempChart.vue index ff472fdb7..0521918f0 100644 --- a/src/components/charts/TempChart.vue +++ b/src/components/charts/TempChart.vue @@ -350,15 +350,8 @@ export default class TempChart extends Mixins(BaseMixin, ThemeMixin) { } @Watch('selectedLegends') - selectedLegendsChanged(newVal: any, oldVal: any) { - if (this.chart?.isDisposed() !== true) { - Object.keys(newVal).forEach((key) => { - if (newVal[key] !== oldVal[key]) { - const actionType = newVal[key] ? 'legendSelect' : 'legendUnSelect' - this.chart?.dispatchAction({ type: actionType, name: key }) - } - }) - } + selectedLegendsChanged(newVal: any) { + if (this.chart?.isDisposed() !== true) this.chart?.setOption({ legend: { selected: newVal } }) } @Watch('source') diff --git a/src/components/console/ConsoleTableEntry.vue b/src/components/console/ConsoleTableEntry.vue index 9e0cd7897..21c2af4d9 100644 --- a/src/components/console/ConsoleTableEntry.vue +++ b/src/components/console/ConsoleTableEntry.vue @@ -53,6 +53,7 @@ export default class ConsoleTableEntry extends Mixins(BaseMixin) { .consoleTableRow { font-family: 'Roboto Mono', monospace; font-size: 0.95em; + white-space: pre-wrap; &.default { .col { diff --git a/src/components/dialogs/HistoryDetailsDialog.vue b/src/components/dialogs/HistoryDetailsDialog.vue deleted file mode 100644 index dfa3c2c34..000000000 --- a/src/components/dialogs/HistoryDetailsDialog.vue +++ /dev/null @@ -1,170 +0,0 @@ - -
+ {{ $t('Panels.ToolheadControlPanel.SpeedFactor') }}: {{ speed_factor * 100 }} %
+
+
+ {{ $t('Panels.ExtruderControlPanel.ExtrusionFactor') }}: {{ extrudeFactor * 100 }} %
+
+
+ ' + item.metadata.slicer_version diff --git a/src/components/panels/History/HistoryListRow.vue b/src/components/panels/History/HistoryListRow.vue deleted file mode 100644 index 93214a4c6..000000000 --- a/src/components/panels/History/HistoryListRow.vue +++ /dev/null @@ -1,226 +0,0 @@ - -
-
-
- {{ mdiFile }}
-
- - {{ job.metadata?.slicer_version }} - -
+ {{ symbol }}
+ {{ name }}:
+ {{ output }}
+
+
+
+
diff --git a/src/components/panels/MiscellaneousPanel.vue b/src/components/panels/MiscellaneousPanel.vue
index 5f12ca144..8afac842c 100644
--- a/src/components/panels/MiscellaneousPanel.vue
+++ b/src/components/panels/MiscellaneousPanel.vue
@@ -8,7 +8,7 @@
:collapsible="true"
card-class="miscellaneous-panel">
-
-
-
+
+
@@ -56,11 +59,12 @@ import BaseMixin from '@/components/mixins/base'
import MiscellaneousSlider from '@/components/inputs/MiscellaneousSlider.vue'
import MiscellaneousLight from '@/components/inputs/MiscellaneousLight.vue'
import FilamentSensor from '@/components/inputs/FilamentSensor.vue'
+import MoonrakerSensor from '@/components/panels/Miscellaneous/MoonrakerSensor.vue'
import Panel from '@/components/ui/Panel.vue'
import { mdiDipSwitch } from '@mdi/js'
import {PrinterStateLight} from "@/store/printer/types";
@Component({
- components: { Panel, FilamentSensor, MiscellaneousSlider, MiscellaneousLight },
+ components: { Panel, FilamentSensor, MiscellaneousSlider, MiscellaneousLight, MoonrakerSensor },
})
export default class MiscellaneousPanel extends Mixins(BaseMixin) {
mdiDipSwitch = mdiDipSwitch
@@ -77,6 +81,10 @@ export default class MiscellaneousPanel extends Mixins(BaseMixin) {
return this.$store.getters['printer/getLights'] ?? []
}
+ get moonrakerSensors() {
+ return this.$store.getters['server/sensor/getSensors'] ?? []
+ }
+
get showMiscellaneousPanel() {
return (
this.klipperReadyForGui && (this.miscellaneous.length || this.filamentSensors.length || this.lights.length)
diff --git a/src/components/panels/Status/PrintstatusPrinting.vue b/src/components/panels/Status/PrintstatusPrinting.vue
index 0333a58eb..21b2ea512 100644
--- a/src/components/panels/Status/PrintstatusPrinting.vue
+++ b/src/components/panels/Status/PrintstatusPrinting.vue
@@ -239,13 +239,13 @@ export default class StatusPanelPrintstatusPrinting extends Mixins(BaseMixin) {
}
formatDuration(seconds: number) {
- let prefix = seconds < 0 ? '-' : ''
+ const prefix = seconds < 0 ? '-' : ''
let absSeconds = Math.abs(seconds)
- let h = Math.floor(absSeconds / 3600)
+ const h = Math.floor(absSeconds / 3600)
absSeconds %= 3600
- let m = ('0' + Math.floor(absSeconds / 60)).slice(-2)
- let s = ('0' + (absSeconds % 60).toFixed(0)).slice(-2)
+ const m = ('0' + Math.floor(absSeconds / 60)).slice(-2)
+ const s = ('0' + Math.floor(absSeconds % 60)).slice(-2)
return prefix + h + ':' + m + ':' + s
}
diff --git a/src/components/panels/Status/PrintstatusThumbnail.vue b/src/components/panels/Status/PrintstatusThumbnail.vue
index c62cca33c..bcabd19f6 100644
--- a/src/components/panels/Status/PrintstatusThumbnail.vue
+++ b/src/components/panels/Status/PrintstatusThumbnail.vue
@@ -10,7 +10,7 @@
:style="thumbnailStyle"
@focus="focus = true"
@blur="focus = false">
-