From 27c57eef68efb9e1f050a8c42b37d78f586c077f Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 18 Sep 2022 00:37:10 +0200 Subject: [PATCH 01/33] chore: rename and clean up AboutModal (#1090) --- src/components/TheSidebar.vue | 6 +- src/components/dialogs/AboutDialog.vue | 59 ++++++++++++++++ src/components/modals/AboutModal.vue | 93 -------------------------- 3 files changed, 62 insertions(+), 96 deletions(-) create mode 100644 src/components/dialogs/AboutDialog.vue delete mode 100644 src/components/modals/AboutModal.vue diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue index 93040cdd4..ffbec317d 100644 --- a/src/components/TheSidebar.vue +++ b/src/components/TheSidebar.vue @@ -130,7 +130,7 @@ @@ -144,7 +144,7 @@ import { Mixins } from 'vue-property-decorator' import BaseMixin from '@/components/mixins/base' import { PrinterStateKlipperConfig } from '@/store/printer/types' import TheSelectPrinterDialog from '@/components/TheSelectPrinterDialog.vue' -import AboutModal from '@/components/modals/AboutModal.vue' +import AboutDialog from '@/components/dialogs/AboutDialog.vue' import { navigationWidth, topbarHeight } from '@/store/variables' import MainsailLogo from '@/components/ui/MainsailLogo.vue' import { mdiViewDashboardOutline } from '@mdi/js' @@ -152,7 +152,7 @@ import { mdiViewDashboardOutline } from '@mdi/js' @Component({ components: { TheSelectPrinterDialog, - AboutModal, + AboutDialog, MainsailLogo, }, }) diff --git a/src/components/dialogs/AboutDialog.vue b/src/components/dialogs/AboutDialog.vue new file mode 100644 index 000000000..ff69e1a3d --- /dev/null +++ b/src/components/dialogs/AboutDialog.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue deleted file mode 100644 index 38152c347..000000000 --- a/src/components/modals/AboutModal.vue +++ /dev/null @@ -1,93 +0,0 @@ - - - - - From 950dea1e08a2d8ff24be3213979db7a671fe613a Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Sun, 18 Sep 2022 00:43:49 +0200 Subject: [PATCH 02/33] feat: add manual_probe helper dialog (#1077) --- src/App.vue | 3 + .../dialogs/TheManualProbeDialog.vue | 222 ++++++++++++++++++ src/locales/de.json | 6 + src/locales/en.json | 6 + 4 files changed, 237 insertions(+) create mode 100644 src/components/dialogs/TheManualProbeDialog.vue diff --git a/src/App.vue b/src/App.vue index 45bd13d51..f103c65ad 100644 --- a/src/App.vue +++ b/src/App.vue @@ -39,6 +39,7 @@ + @@ -59,6 +60,7 @@ import { panelToolbarHeight, topbarHeight, navigationItemHeight } from '@/store/ import TheTimelapseRenderingSnackbar from '@/components/TheTimelapseRenderingSnackbar.vue' import TheFullscreenUpload from '@/components/TheFullscreenUpload.vue' import TheUploadSnackbar from '@/components/TheUploadSnackbar.vue' +import TheManualProbeDialog from '@/components/dialogs/TheManualProbeDialog.vue' @Component({ components: { @@ -71,6 +73,7 @@ import TheUploadSnackbar from '@/components/TheUploadSnackbar.vue' TheSidebar, TheFullscreenUpload, TheUploadSnackbar, + TheManualProbeDialog, }, metaInfo() { const title = this.$store.getters['getTitle'] diff --git a/src/components/dialogs/TheManualProbeDialog.vue b/src/components/dialogs/TheManualProbeDialog.vue new file mode 100644 index 000000000..e9bf8dc84 --- /dev/null +++ b/src/components/dialogs/TheManualProbeDialog.vue @@ -0,0 +1,222 @@ + + + + + diff --git a/src/locales/de.json b/src/locales/de.json index f2f363f00..fae95c673 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -458,6 +458,12 @@ "UpToDate": "aktuell" } }, + "ManualProbe": { + "Abort": "abbrechen", + "Accept": "akzeptieren", + "Advanced": "Erweitert", + "Headline": "Manuelle Messung" + }, "Panels": { "ExtruderControlPanel": { "Allowed": "Erlaubt", diff --git a/src/locales/en.json b/src/locales/en.json index 7f71c470a..1ee743a6e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -458,6 +458,12 @@ "UpToDate": "up-to-date" } }, + "ManualProbe": { + "Abort": "abort", + "Accept": "accept", + "Advanced": "Advanced", + "Headline": "Manual Probe" + }, "Panels": { "ExtruderControlPanel": { "Allowed": "Allowed", From 78b9864d1112e98ceb4a0f0b5f3fc065bc2a2806 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Sun, 18 Sep 2022 01:28:22 +0200 Subject: [PATCH 03/33] chore: remove LGTM workflow (#1091) --- .github/workflows/lgtm.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/lgtm.yml diff --git a/.github/workflows/lgtm.yml b/.github/workflows/lgtm.yml deleted file mode 100644 index 61c91e5cc..000000000 --- a/.github/workflows/lgtm.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Send LGTM reaction -on: - issue_comment: - types: [created] - pull_request_review: - types: [submitted] -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@1.0.0 - - uses: micnncim/action-lgtm-reaction@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GIPHY_API_KEY: ${{ secrets.GIPHY_API_KEY }} - with: - trigger: '["^(?i)lgtm!*$"]' - source: 'giphy' From 6a40e6047d980d59bb1497057b0ab0acf8bc1527 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Mon, 19 Sep 2022 01:41:00 +0200 Subject: [PATCH 04/33] fix: set init values in TheManualProbeDialog.vue (#1092) --- src/components/dialogs/TheManualProbeDialog.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/dialogs/TheManualProbeDialog.vue b/src/components/dialogs/TheManualProbeDialog.vue index e9bf8dc84..a72ce968b 100644 --- a/src/components/dialogs/TheManualProbeDialog.vue +++ b/src/components/dialogs/TheManualProbeDialog.vue @@ -134,14 +134,14 @@ export default class TheManualProbeDialog extends Mixins(BaseMixin) { } get z_position_lower() { - const value = this.$store.state.printer.manual_probe?.z_position_lower + const value = this.$store.state.printer.manual_probe?.z_position_lower ?? null if (value === null) return '??????' return value.toFixed(3) } get z_position_upper() { - const value = this.$store.state.printer.manual_probe?.z_position_upper + const value = this.$store.state.printer.manual_probe?.z_position_upper ?? null if (value === null) return '??????' return value.toFixed(3) From 37c9fa865743c785193284ef0d3be6e2b3b2f31f Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Fri, 30 Sep 2022 11:21:01 +0200 Subject: [PATCH 05/33] refactor: display bit version of OS (#1101) --- .../panels/Machine/SystemPanelHost.vue | 32 +++++++++++++------ src/store/server/getters.ts | 2 ++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/components/panels/Machine/SystemPanelHost.vue b/src/components/panels/Machine/SystemPanelHost.vue index cf78f5c99..4f69edb5d 100644 --- a/src/components/panels/Machine/SystemPanelHost.vue +++ b/src/components/panels/Machine/SystemPanelHost.vue @@ -9,16 +9,12 @@ Host - + + + {{ cpuDesc }} +
@@ -261,5 +257,21 @@ export default class SystemPanelHost extends Mixins(BaseMixin) { return null } + + get cpuDesc() { + let output = this.hostStats.cpuDesc + + return output + } + + get cpuName() { + let output = this.hostStats.cpuName + + if (this.hostStats.bits) { + output += `, ${this.hostStats.bits}` + } + + return output + } } diff --git a/src/store/server/getters.ts b/src/store/server/getters.ts index 3efd3c061..60d010347 100644 --- a/src/store/server/getters.ts +++ b/src/store/server/getters.ts @@ -44,6 +44,7 @@ export const getters: GetterTree = { interface HostStats { cpuName: string | null cpuDesc: string | null + bits: string | null version: string | null pythonVersion: string | null os: string | null @@ -119,6 +120,7 @@ export const getters: GetterTree = { output = { cpuName: state.system_info?.cpu_info?.processor ?? null, cpuDesc: state.system_info?.cpu_info?.cpu_desc ?? null, + bits: state.system_info?.cpu_info?.bits ?? null, version, pythonVersion, os: state.system_info?.distribution?.name ?? null, From 829e7a497d4ac5765a41d38007b4d087fa110a46 Mon Sep 17 00:00:00 2001 From: lixxbox Date: Tue, 4 Oct 2022 23:32:30 +0200 Subject: [PATCH 06/33] fix: broken link in readme (#1104) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a5329277a..03a52b5c9 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ You can find the latest release notes [here](https://github.com/mainsail-crew/ma - **Power Control:** _Control power devices such as relays, TP-Link and Tasmota devices, and more_ - **Powerful Macro-Management:** _Manage your macros on a micro level_ - **[Configurable Dashboard](https://docs.mainsail.xyz/features/dashboard-organisation):** _Create your own personal dashboard_ -- **[Theming Support](https://docs.mainsail.xyz/features/theming/):** _Customizable user interface including logos, backgrounds, and custom CSS_ +- **[Theming Support](https://docs.mainsail.xyz/features/theming):** _Customizable user interface including logos, backgrounds, and custom CSS_ - **[Additional Sensors](https://docs.mainsail.xyz/quicktips/additional-sensors):** _Add extra sensors to the temperature graph_ - **Exclude Objects:** _Exclude parts of your print (not officially supported by Klipper yet)_ From ff37c7de32564c59354fd6597defd18d785949fc Mon Sep 17 00:00:00 2001 From: th33xitus Date: Wed, 5 Oct 2022 21:15:36 +0200 Subject: [PATCH 07/33] fix(UI): missing bottom border radius in status panel (#1106) --- src/components/panels/StatusPanel.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/components/panels/StatusPanel.vue b/src/components/panels/StatusPanel.vue index fbce6c119..4303996fc 100644 --- a/src/components/panels/StatusPanel.vue +++ b/src/components/panels/StatusPanel.vue @@ -1,5 +1,3 @@ - -