diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84dec08..955716e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,21 +7,22 @@ on: jobs: release: strategy: + fail-fast: false matrix: 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' + os: macos-latest + 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 @@ -29,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 @@ -50,7 +51,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | pnpm i - pnpm ${{ matrix.pnpm-command }} + pnpm ${{ matrix.pnpm_command }} - name: 📦 Release binary uses: svenstaro/upload-release-action@v2 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": { 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/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 @@ -
+
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)" /> diff --git a/src/renderer/src/components/config/values/ControlMidiValue.vue b/src/renderer/src/components/config/values/ControlMidiValue.vue index dbbf669..71ba247 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: + +
+
diff --git a/src/renderer/src/components/navbar/Navbar.vue b/src/renderer/src/components/navbar/Navbar.vue index c56f9da..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,27 +72,32 @@ : 'Off' }}

- ⌘T + ⌘T

Skin: 

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

- ⌘S + ⌘S
- - +

Auto Select: 

+

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

+ ⌘K +
+ + {{ $t('navbar.device.export') }} - ⌘E + ⌘E - {{ $t('navbar.device.import') }} - ⌘I + ⌘I - - + {{ $t('navbar.device.quit') }} - ⌘Q + ⌘Q
@@ -149,7 +154,7 @@
Unsaved Changes
- Revert + Revert
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) 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