Skip to content

Commit

Permalink
Merge branch 'develop' into feat/add-community-themes
Browse files Browse the repository at this point in the history
  • Loading branch information
meteyou authored Jun 29, 2024
2 parents 472957d + 2ab0c87 commit 225c6d8
Show file tree
Hide file tree
Showing 87 changed files with 4,200 additions and 1,201 deletions.
65 changes: 65 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,71 @@
# Changelog
All notable changes to Mainsail will be documented in this file.

## [2.11.2](https://github.com/mainsail-crew/mainsail/releases/tag/v2.11.2) - 2024-05-04
### Bug Fixes and Improvements

- **maintenance**: Fix overdue check from printtime based entries ([#1871](https://github.com/mainsail-crew/mainsail/pull/1871))
- **spoolman**: Fix search for spool-id ([#1872](https://github.com/mainsail-crew/mainsail/pull/1872))
- Calc multiplicator for set_pin gcode ([#1870](https://github.com/mainsail-crew/mainsail/pull/1870))

## [2.11.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.11.1) - 2024-05-01
### Bug Fixes and Improvements

- **farm**: Fix switching to other printer function ([#1865](https://github.com/mainsail-crew/mainsail/pull/1865))

## [2.11.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.11.0) - 2024-04-28
### Features

- **miscellaneous**: Add support for pwm_tool and pwm_cycle_time ([#1804](https://github.com/mainsail-crew/mainsail/pull/1804))
- Add fullscreen size for gcodefiles, gcodeviewer and webcam ([#1803](https://github.com/mainsail-crew/mainsail/pull/1803))
- Add qr search function in the spoolman change spool dialog ([#1802](https://github.com/mainsail-crew/mainsail/pull/1802))
- Add confirmation dialog to cooldown button ([#1808](https://github.com/mainsail-crew/mainsail/pull/1808))
- Add only save button to editor ([#1835](https://github.com/mainsail-crew/mainsail/pull/1835))
- Add option to disable favicon progress circle ([#1825](https://github.com/mainsail-crew/mainsail/pull/1825))
- Add support for klipper runtime warnings ([#1809](https://github.com/mainsail-crew/mainsail/pull/1809))
- Show macro description as tooltip when hovering a macro ([#1849](https://github.com/mainsail-crew/mainsail/pull/1849))
- Connect to Moonraker via subdirectory/path ([#1836](https://github.com/mainsail-crew/mainsail/pull/1836))
- Direct link to specific printer via query parameter ([#1837](https://github.com/mainsail-crew/mainsail/pull/1837))
- Expose css variable for changing theme logo color ([#1856](https://github.com/mainsail-crew/mainsail/pull/1856))
- Reminders panel on the History page ([#1274](https://github.com/mainsail-crew/mainsail/pull/1274))

### Bug Fixes and Improvements

- **spoolman**: Break long comments & support multiline comments ([#1781](https://github.com/mainsail-crew/mainsail/pull/1781))
- Fix commit list view on desktop and mobile devices ([#1785](https://github.com/mainsail-crew/mainsail/pull/1785))
- Fix long M117 outputs in the status panel ([#1800](https://github.com/mainsail-crew/mainsail/pull/1800))
- Fix long content lines in console ([#1799](https://github.com/mainsail-crew/mainsail/pull/1799))
- Hide moonraker backups when "Hide backup files" is enabled ([#1801](https://github.com/mainsail-crew/mainsail/pull/1801))
- Hide crowsnest backups when "Hide backup files" is enabled ([#1824](https://github.com/mainsail-crew/mainsail/pull/1824))
- Fix typo issues with save zoffset for probes ([#1821](https://github.com/mainsail-crew/mainsail/pull/1821))
- Fix case sensibility for printer power device ([#1827](https://github.com/mainsail-crew/mainsail/pull/1827))
- Fix WebRTC(MediaMTX) webcam client ([#1843](https://github.com/mainsail-crew/mainsail/pull/1843))
- Ignore wrong default.json file while resetting moonraker db ([#1829](https://github.com/mainsail-crew/mainsail/pull/1829))

### Refactor

- **e-stop**: Remove fullscreen mode on mobile devices ([#1816](https://github.com/mainsail-crew/mainsail/pull/1816))
- Refactor KlippyStatePanel ([#1826](https://github.com/mainsail-crew/mainsail/pull/1826))
- Remove unused attribute in getPrinttimeAvgArray getter ([#1861](https://github.com/mainsail-crew/mainsail/pull/1861))

### Localization

- **de**: Update german translation ([#1860](https://github.com/mainsail-crew/mainsail/pull/1860))
- **en**: Remove unused keys ([#1855](https://github.com/mainsail-crew/mainsail/pull/1855))
- **ru**: Update russian translation ([#1846](https://github.com/mainsail-crew/mainsail/pull/1846))
- **uk**: Update ukrainian translation ([#1788](https://github.com/mainsail-crew/mainsail/pull/1788))
- **zh**: Update chinese locale ([#1791](https://github.com/mainsail-crew/mainsail/pull/1791))

### Documentation

- Add github sponsor link ([#1844](https://github.com/mainsail-crew/mainsail/pull/1844))

### Other

- **ci**: Update caniuse browser list ([#1832](https://github.com/mainsail-crew/mainsail/pull/1832))
- **deps**: Update @sindarius/gcodeviewer ([#1755](https://github.com/mainsail-crew/mainsail/pull/1755)) ([#1783](https://github.com/mainsail-crew/mainsail/pull/1783))
- Fix typo/reword some parts of the pull request template ([#1850](https://github.com/mainsail-crew/mainsail/pull/1850))

## [2.10.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.10.0) - 2024-02-15
### Features

Expand Down
40 changes: 20 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mainsail",
"version": "2.10.0",
"version": "2.11.2",
"private": true,
"decription": "a klipper web interface",
"author": {
Expand Down Expand Up @@ -39,7 +39,7 @@
"codemirror": "^6.0.1",
"core-js": "^3.16.0",
"detect-browser": "^5.3.0",
"echarts": "^5.2.2",
"echarts": "^5.5.0",
"echarts-gl": "^2.0.8",
"hls.js": "^1.3.3",
"jmuxer": "^2.0.5",
Expand Down
3 changes: 1 addition & 2 deletions src/components/TheConnectingDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
<v-divider class="my-3"></v-divider>
<p>{{ $t('ConnectionDialog.CheckMoonrakerLog') }}</p>
<ul>
<li>~/klipper_logs/moonraker.log</li>
<li>/tmp/moonraker.log</li>
<li>~/printer_data/logs/moonraker.log</li>
</ul>
<v-divider class="mt-4 mb-5"></v-divider>
</template>
Expand Down
6 changes: 5 additions & 1 deletion src/components/TheEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
hide-overlay
:transition="false"
@close="close"
@keydown.esc="escClose">
@keydown.esc="escClose"
@keydown.ctrl.shift.s.prevent="restartServiceNameExists && save(restartServiceName)"
@keydown.meta.shift.s.prevent="restartServiceNameExists && save(restartServiceName)"
@keydown.ctrl.s.prevent="save(null)"
@keydown.meta.s.prevent="save(null)">
<panel
card-class="editor-dialog"
:icon="isWriteable ? mdiFileDocumentEditOutline : mdiFileDocumentOutline"
Expand Down
2 changes: 1 addition & 1 deletion src/components/charts/HistoryAllPrintStatusChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default class HistoryAllPrintStatusChart extends Mixins(BaseMixin, ThemeM
}
get selectedJobs() {
return this.$store.state.gui.view.history.selectedJobs ?? []
return this.$store.getters['server/history/getSelectedJobs']
}
get allPrintStatusArray() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/charts/HistoryAllPrintStatusTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { ServerHistoryStateAllPrintStatusEntry } from '@/store/server/history/ty
})
export default class HistoryAllPrintStatusTable extends Mixins(BaseMixin) {
get selectedJobs() {
return this.$store.state.gui.view.history.selectedJobs ?? []
return this.$store.getters['server/history/getSelectedJobs']
}
get allPrintStatusArray() {
Expand Down
11 changes: 2 additions & 9 deletions src/components/charts/TempChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -347,15 +347,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')
Expand Down
1 change: 1 addition & 0 deletions src/components/console/ConsoleTableEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
49 changes: 49 additions & 0 deletions src/components/dialogs/HistoryDeleteJobDialog.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<template>
<v-dialog :value="show" max-width="400" @keydown.esc="close">
<panel :title="$t('History.Delete')" card-class="history-delete-dialog" :margin-bottom="false">
<template #buttons>
<v-btn icon tile @click="close">
<v-icon>{{ mdiCloseThick }}</v-icon>
</v-btn>
</template>
<v-card-text>
<p class="mb-0">
{{ $t('History.DeleteSingleJobQuestion') }}
</p>
</v-card-text>
<v-card-actions>
<v-spacer />
<v-btn color="" text @click="close">{{ $t('History.Cancel') }}</v-btn>
<v-btn color="error" text @click="deleteJob">{{ $t('History.Delete') }}</v-btn>
</v-card-actions>
</panel>
</v-dialog>
</template>
<script lang="ts">
import { Component, Mixins, Prop } from 'vue-property-decorator'
import BaseMixin from '@/components/mixins/base'
import { ServerHistoryStateJob } from '@/store/server/history/types'
import { mdiCloseThick } from '@mdi/js'
@Component
export default class HistoryDeleteJobDialog extends Mixins(BaseMixin) {
mdiCloseThick = mdiCloseThick
@Prop({ type: Boolean, required: true }) show!: boolean
@Prop({ type: Object, required: true }) job!: ServerHistoryStateJob
deleteJob() {
this.$socket.emit(
'server.history.delete_job',
{ uid: this.job.job_id },
{ action: 'server/history/getDeletedJobs' }
)
this.close()
}
close() {
this.$emit('close')
}
}
</script>
58 changes: 58 additions & 0 deletions src/components/dialogs/HistoryDeleteSelectedJobsDialog.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<template>
<v-dialog :value="show" max-width="400" @keydown.esc="close">
<panel :title="$t('History.Delete')" card-class="history-delete-selected-dialog" :margin-bottom="false">
<template #buttons>
<v-btn icon tile @click="close">
<v-icon>{{ mdiCloseThick }}</v-icon>
</v-btn>
</template>
<v-card-text>
<p class="mb-0">
{{ text }}
</p>
</v-card-text>
<v-card-actions>
<v-spacer />
<v-btn color="" text @click="close">{{ $t('History.Cancel') }}</v-btn>
<v-btn color="error" text @click="deleteSelectedJobs">{{ $t('History.Delete') }}</v-btn>
</v-card-actions>
</panel>
</v-dialog>
</template>
<script lang="ts">
import { Component, Mixins, Prop } from 'vue-property-decorator'
import BaseMixin from '@/components/mixins/base'
import { ServerHistoryStateJob } from '@/store/server/history/types'
import { mdiCloseThick } from '@mdi/js'
@Component
export default class HistoryDeleteJobDialog extends Mixins(BaseMixin) {
mdiCloseThick = mdiCloseThick
@Prop({ type: Boolean, required: true }) show!: boolean
@Prop({ type: Array, required: true }) selectedJobs!: ServerHistoryStateJob[]
get text() {
if (this.selectedJobs.length === 1) return this.$t('History.DeleteSingleJobQuestion')
return this.$t('History.DeleteSelectedQuestion', { count: this.selectedJobs.length })
}
deleteSelectedJobs() {
this.selectedJobs.forEach((item: ServerHistoryStateJob) => {
this.$socket.emit(
'server.history.delete_job',
{ uid: item.job_id },
{ action: 'server/history/getDeletedJobs' }
)
})
this.$emit('clear-selected-jobs')
this.close()
}
close() {
this.$emit('close')
}
}
</script>
Loading

0 comments on commit 225c6d8

Please sign in to comment.