From e8386c64f35552527b51d2ff7c21ba2d9098f3ee Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Thu, 30 May 2024 14:37:54 +0200 Subject: [PATCH 01/17] UPD: Don't fail fast on release --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7261c3..939a455 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: jobs: release: strategy: + fail-fast: false matrix: include: - name: 🐧 Linux From 2af3a1d990e9fe3800101f1271099a1ef4108eb6 Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Thu, 30 May 2024 15:47:03 +0200 Subject: [PATCH 02/17] UPD: Use latest semantic versioning --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 939a455..e723ca0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: steps: - name: 🔢 Semantic Versioning id: version - uses: paulhatch/semantic-version@v5.3.0 + uses: paulhatch/semantic-version@v5.4.0 with: tag_prefix: "v" bump_each_commit: true From 4e5ed141ab1dedf39bbd3634f6eff0668f67dcf0 Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Thu, 30 May 2024 16:23:03 +0200 Subject: [PATCH 03/17] FIX: Remove appId --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index bfa777b..aa89ca5 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "packageManager": "pnpm@8.14.1", "homepage": "https://github.com/katbinaris/zeroone", "build": { - "appId": "io.binaris.zeroone", "productName": "ZERO_ONE" }, "scripts": { From 3dbd2b28b280e12f178dd4140bdad1c52bc75d0e Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Sat, 1 Jun 2024 19:03:47 +0200 Subject: [PATCH 04/17] UPD: Consistent action variable names --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e723ca0..037350f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,17 +12,17 @@ jobs: include: - name: 🐧 Linux os: ubuntu-latest - pnpm-command: 'build:linux' + pnpm_command: 'build:linux' binary_path: dist/*.deb asset_name: zeroone.deb - name: 🪟 Windows os: windows-latest - pnpm-command: 'build:win' + pnpm_command: 'build:win' binary_path: dist/*.exe asset_name: zeroone.exe - name: 🍏 Mac os: macos-latest - pnpm-command: 'build:mac' + pnpm_command: 'build:mac' binary_path: dist/*.dmg asset_name: zeroone.dmg name: ${{ matrix.name }} Release @@ -49,7 +49,7 @@ jobs: - name: 🔨 Build Project run: | pnpm i - pnpm ${{ matrix.pnpm-command }} + pnpm ${{ matrix.pnpm_command }} - name: 📦 Release binary uses: svenstaro/upload-release-action@v2 From a9280af3667954c221174d18da4f9fb292554b68 Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Sat, 1 Jun 2024 19:04:02 +0200 Subject: [PATCH 05/17] FIX: Profile change update bug! --- src/renderer/src/components/config/ConfigPane.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/components/config/ConfigPane.vue b/src/renderer/src/components/config/ConfigPane.vue index 461c3fe..d616101 100644 --- a/src/renderer/src/components/config/ConfigPane.vue +++ b/src/renderer/src/components/config/ConfigPane.vue @@ -11,7 +11,7 @@ -
+
From c30ec2521863b305058518e6c0062006e6abc660 Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Sat, 1 Jun 2024 19:14:41 +0200 Subject: [PATCH 06/17] UPD: Make auto select optional --- src/renderer/src/appStore.ts | 6 +++++- src/renderer/src/components/navbar/Navbar.vue | 5 +++++ src/renderer/src/deviceStore.ts | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/appStore.ts b/src/renderer/src/appStore.ts index 51470cc..5632605 100644 --- a/src/renderer/src/appStore.ts +++ b/src/renderer/src/appStore.ts @@ -46,7 +46,8 @@ export const useAppStore = defineStore('app', { }, previewDeviceModel: localStorage.getItem('previewDeviceModel') || 'nanoOne', profileManagerDragging: false, - showProfileConfig: false + showProfileConfig: false, + selectOnInput: false } }, getters: { @@ -76,6 +77,9 @@ export const useAppStore = defineStore('app', { setShowProfileConfig(show) { show = false // TODO: Remove this / replace with actual logic this.showProfileConfig = show + }, + toggleSelectOnInput() { + this.selectOnInput = !this.selectOnInput } } }) diff --git a/src/renderer/src/components/navbar/Navbar.vue b/src/renderer/src/components/navbar/Navbar.vue index c56f9da..55f6330 100644 --- a/src/renderer/src/components/navbar/Navbar.vue +++ b/src/renderer/src/components/navbar/Navbar.vue @@ -80,6 +80,11 @@

{{ previewDeviceNames[appStore.previewDeviceModel || 'nanoOne'] }}

⌘S + +

Auto Select: 

+

{{ appStore.selectOnInput ? 'On' : 'Off' }}

+ ⌘K + {{ $t('navbar.device.export') }} diff --git a/src/renderer/src/deviceStore.ts b/src/renderer/src/deviceStore.ts index ab3f22c..52c8872 100644 --- a/src/renderer/src/deviceStore.ts +++ b/src/renderer/src/deviceStore.ts @@ -703,12 +703,12 @@ export const initializeDevices = () => { } if (update.p !== undefined) { deviceStore.setPosition(update.p) - appStore.selectConfigFeature('knob') + if (appStore.selectOnInput) appStore.selectConfigFeature('knob') } if (update.kd !== undefined) { const keyLabel = deviceStore.keyLabels[update.kd] deviceStore.keyStates[keyLabel] = true - appStore.selectKey(keyLabel) + if (appStore.selectOnInput) appStore.selectKey(keyLabel) } if (update.ku !== undefined) { deviceStore.keyStates[deviceStore.keyLabels[update.ku]] = false From 3f151254cdb97f48d6dac3eaeadca982b17b0e6f Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Sat, 1 Jun 2024 19:54:59 +0200 Subject: [PATCH 07/17] ADD: Fields for detent settings --- .../config/values/ControlMidiValue.vue | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/renderer/src/components/config/values/ControlMidiValue.vue b/src/renderer/src/components/config/values/ControlMidiValue.vue index dbbf669..5612567 100644 --- a/src/renderer/src/components/config/values/ControlMidiValue.vue +++ b/src/renderer/src/components/config/values/ControlMidiValue.vue @@ -20,6 +20,16 @@
+
+
+ Total Detents: + +
+
+ Detents/Rotation: + +
+
From 17d655e2aada533feb2144fbf1829889163be5dc Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Sat, 1 Jun 2024 19:56:28 +0200 Subject: [PATCH 08/17] UPD: Min values for detent settings --- .../src/components/config/values/ControlMidiValue.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/components/config/values/ControlMidiValue.vue b/src/renderer/src/components/config/values/ControlMidiValue.vue index 5612567..71ba247 100644 --- a/src/renderer/src/components/config/values/ControlMidiValue.vue +++ b/src/renderer/src/components/config/values/ControlMidiValue.vue @@ -80,14 +80,14 @@ watch(valueMaxInput, (valueMax) => { watch(totalDetentsInput, (totalDetents) => { nextTick(() => { - totalDetentsInput.value = Math.max(1, Math.min(Number(totalDetents), 9999)) + totalDetentsInput.value = Math.max(0, Math.min(Number(totalDetents), 9999)) }) emit('update', { haptic: { endPos: totalDetents } }) }) watch(detentsPerRotationInput, (detentsPerRotation) => { nextTick(() => { - detentsPerRotationInput.value = Math.max(1, Math.min(Number(detentsPerRotation), 9999)) + detentsPerRotationInput.value = Math.max(0, Math.min(Number(detentsPerRotation), 9999)) }) emit('update', { haptic: { detentCount: detentsPerRotation } }) }) From 7f5e227b3fbf9561ca0b6c8b131da4de074a4ec6 Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Sat, 1 Jun 2024 19:59:35 +0200 Subject: [PATCH 09/17] FIX: Deleting actions --- src/renderer/src/components/config/keys/KeyMappingConfig.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/components/config/keys/KeyMappingConfig.vue b/src/renderer/src/components/config/keys/KeyMappingConfig.vue index afb318f..2f4a732 100644 --- a/src/renderer/src/components/config/keys/KeyMappingConfig.vue +++ b/src/renderer/src/components/config/keys/KeyMappingConfig.vue @@ -29,7 +29,7 @@ :actions="heldActions" class="p-2" @add="deviceStore.addKeyAction(null, appStore.selectedKey, 2)" - @delete="(index) => deviceStore.removeKeyAction(index, appStore.selectedKey, 3)" + @delete="(index) => deviceStore.removeKeyAction(index, appStore.selectedKey, 2)" /> From feef2ca44311e564684006422a6beee3ffae0db5 Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Sat, 1 Jun 2024 20:03:43 +0200 Subject: [PATCH 10/17] UPD: Hide category adding for now --- .../src/components/profile/ProfileCategory.vue | 1 + .../src/components/profile/ProfileManager.vue | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/components/profile/ProfileCategory.vue b/src/renderer/src/components/profile/ProfileCategory.vue index 64220a2..0033107 100644 --- a/src/renderer/src/components/profile/ProfileCategory.vue +++ b/src/renderer/src/components/profile/ProfileCategory.vue @@ -2,6 +2,7 @@
diff --git a/src/renderer/src/components/profile/ProfileManager.vue b/src/renderer/src/components/profile/ProfileManager.vue index 4d94d2e..a6b987d 100644 --- a/src/renderer/src/components/profile/ProfileManager.vue +++ b/src/renderer/src/components/profile/ProfileManager.vue @@ -41,7 +41,16 @@ - + + + +
@@ -134,7 +143,7 @@ const dragOptions = ref({ direction: 'vertical' }) -const maxProfiles = 32 +const maxProfiles = 10 const renderProfileConfig = ref(appStore.showProfileConfig) const renderProfileList = ref(!appStore.showProfileConfig) From faff0364e26eec72e646c2357a9e31d92d238022 Mon Sep 17 00:00:00 2001 From: Robert Kossessa Date: Sat, 1 Jun 2024 20:07:16 +0200 Subject: [PATCH 11/17] UPD: Hide mockup features --- src/renderer/src/components/navbar/Navbar.vue | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/renderer/src/components/navbar/Navbar.vue b/src/renderer/src/components/navbar/Navbar.vue index 55f6330..1f35d4e 100644 --- a/src/renderer/src/components/navbar/Navbar.vue +++ b/src/renderer/src/components/navbar/Navbar.vue @@ -45,15 +45,15 @@ - + {{ deviceStore.connected ? $t('navbar.device.disconnect') : $t('navbar.device.connect') }} - ⌘D + ⌘D Next Device - ⌘N + ⌘N @@ -61,7 +61,7 @@

{{ deviceStore.orientationLabels[deviceStore.settings?.deviceOrientation || 0] }}°

- ⌘R + ⌘R

Idle Timeout: 

@@ -72,32 +72,32 @@ : 'Off' }}

- ⌘T + ⌘T

Skin: 

{{ previewDeviceNames[appStore.previewDeviceModel || 'nanoOne'] }}

- ⌘S + ⌘S

Auto Select: 

{{ appStore.selectOnInput ? 'On' : 'Off' }}

- ⌘K + ⌘K - - + {{ $t('navbar.device.export') }} - ⌘E + ⌘E - {{ $t('navbar.device.import') }} - ⌘I + ⌘I - - + {{ $t('navbar.device.quit') }} - ⌘Q + ⌘Q @@ -154,7 +154,7 @@
Unsaved Changes
- Revert + Revert Date: Sat, 1 Jun 2024 12:52:23 -0700 Subject: [PATCH 14/17] pnpm rebuild native --- .github/workflows/release.yml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a1218a..98bb7b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,6 +51,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | pnpm i + pnpm rebuild --recursive pnpm ${{ matrix.pnpm_command }} - name: 📦 Release binary diff --git a/package.json b/package.json index 17116a2..aa89ca5 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dev": "electron-vite dev", "build": "electron-vite build", "build:unpack": "pnpm build && electron-builder --dir", - "build:win": "pnpm build && electron-builder --win --x64", + "build:win": "pnpm build && electron-builder --win", "build:mac": "pnpm build && electron-builder --mac", "build:linux": "pnpm build && electron-builder --linux" }, From 53377a313dfbd4978de02eda6c79931b4e55a1a1 Mon Sep 17 00:00:00 2001 From: matei jordache Date: Sat, 1 Jun 2024 13:26:07 -0700 Subject: [PATCH 15/17] Change windows build to cross-compile on mac --- .github/workflows/release.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98bb7b0..fcb16a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: binary_path: dist/*.deb asset_name: zeroone.deb - name: 🪟 Windows - os: windows-latest + os: macos-latest pnpm_command: 'build:win' binary_path: dist/*.exe asset_name: zeroone.exe diff --git a/package.json b/package.json index aa89ca5..2dded31 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dev": "electron-vite dev", "build": "electron-vite build", "build:unpack": "pnpm build && electron-builder --dir", - "build:win": "pnpm build && electron-builder --win", + "build:win": "pnpm build && electron-builder --win --x86", "build:mac": "pnpm build && electron-builder --mac", "build:linux": "pnpm build && electron-builder --linux" }, From cf1f1dd39757ffddd50c23a238ef809eab232aa6 Mon Sep 17 00:00:00 2001 From: matei jordache Date: Sat, 1 Jun 2024 13:30:21 -0700 Subject: [PATCH 16/17] remove unneeded x86 flag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2dded31..aa89ca5 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dev": "electron-vite dev", "build": "electron-vite build", "build:unpack": "pnpm build && electron-builder --dir", - "build:win": "pnpm build && electron-builder --win --x86", + "build:win": "pnpm build && electron-builder --win", "build:mac": "pnpm build && electron-builder --mac", "build:linux": "pnpm build && electron-builder --linux" }, From eb69f3e1ac558dd5d0c465b5ba4dcd30ed616e0e Mon Sep 17 00:00:00 2001 From: matei jordache Date: Sat, 1 Jun 2024 13:40:27 -0700 Subject: [PATCH 17/17] skip rebuild --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fcb16a0..955716e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,6 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | pnpm i - pnpm rebuild --recursive pnpm ${{ matrix.pnpm_command }} - name: 📦 Release binary