Skip to content

Commit ded1a14

Browse files
committed
- properly working keyboard layout editor multiselect property editor
- icons for the sidebar - overall color changes - fullsize keyboard for the key picker
1 parent a23fe50 commit ded1a14

22 files changed

+817
-413
lines changed

electron-builder.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,15 @@ dmg:
4747
artifactName: ${name}-${version}-${arch}.${ext}
4848
linux:
4949
target:
50-
- AppImage
51-
- snap
52-
- deb
50+
- target: AppImage
51+
arch:
52+
- x64
53+
# - snap
54+
# - deb
5355
maintainer: Jan Lunge
5456
category: Utility
5557
appImage:
56-
artifactName: ${name}-${version}.${ext}
58+
artifactName: ${name}-${version}-${arch}.${ext}
5759
npmRebuild: false
5860
publish:
5961
provider: github

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pog",
3-
"version": "0.8.0",
3+
"version": "0.9.3",
44
"description": "A KMK firmware configurator",
55
"main": "./out/main/index.js",
66
"author": "Jan Lunge",
@@ -22,6 +22,7 @@
2222
"build:win": "npm run build && electron-builder --win --config",
2323
"build:mac": "npm run build && electron-builder --mac --config",
2424
"build:linux": "npm run build && electron-builder --linux --config",
25+
"build:all": "npm run build && electron-builder --win --mac --linux --config",
2526
"devtools": "./node_modules/.bin/vue-devtools"
2627
},
2728
"dependencies": {
@@ -35,11 +36,13 @@
3536
"@web3modal/html": "^2.1.2",
3637
"@wlard/vue-class-store": "^3.0.0",
3738
"@wlard/vue3-popper": "^1.3.1",
39+
"chroma-js": "^2.4.2",
3840
"daisyui": "^2.50.0",
3941
"dayjs": "^1.11.7",
4042
"decompress": "^4.2.1",
4143
"electron-updater": "^5.3.0",
4244
"ethers": "^5",
45+
"lighten-darken-color": "^1.0.0",
4346
"mini-svg-data-uri": "^1.4.4",
4447
"request": "^2.88.2",
4548
"sass": "^1.58.0",

src/renderer/src/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { keyboardStore, notifications } from './store'
55
const store = computed(() => {
66
return keyboardStore
77
})
8-
console.log('store initiated', store.value.path)
8+
console.log('store added to debug menu', store)
99
</script>
1010

1111
<template>
1.36 KB
Loading
846 KB
Loading

src/renderer/src/components/Community.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@ const web3modal = new Web3Modal(
4343
},
4444
ethereumClient
4545
)
46+
console.log(web3modal)
4647
// const unsubscribe = web3modal.subscribeModal((newState) =>
4748
// console.log(newState)
4849
// );
4950
const accountAddress = ref('')
50-
const unwatch = watchAccount((account) => {
51+
watchAccount((account) => {
5152
if (account.address) {
5253
console.log('account changed', account.address)
5354
accountAddress.value = account.address

src/renderer/src/components/CoordMap.vue

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div>
33
<p class="py-4">1. install the debug code on the keyboard</p>
4-
<button class="btn-primary btn" @click="flashCoordMapping">
4+
<button class="btn-primary btn btn-sm" @click="flashCoordMapping">
55
Flash CoordMap Finder to keyboard
66
</button>
77
<div>
@@ -15,8 +15,10 @@
1515
<div class="flex gap-2 py-4">
1616
<button class="btn-primary btn" @click="addRow">new Row</button>
1717
<button class="btn-primary btn" @click="addSpc">add Space</button>
18+
<button class="btn-primary btn" @click="rmLast">remove last</button>
19+
<button class="btn-primary btn" @click="clear">clear</button>
1820
</div>
19-
<p class="py-4">
21+
<p class="mb-4">
2022
3. Now press each key starting in the top left corner in the first row and moving to the right
2123
when you reached the end press the last key once again to start with the next row
2224
</p>
@@ -32,9 +34,16 @@
3234
<div>
3335
<pre class="my-2 rounded bg-base-300 p-4">{{ coordmapstring }}</pre>
3436
</div>
37+
<div class="flex gap-2">
38+
3539
<button class="btn-primary btn mt-2" @click="done">
36-
{{ initialSetup ? 'next' : 'save Coord Maping' }}
40+
{{ initialSetup ? 'next' : 'save Coord Maping & create keyboard layout' }}
41+
</button>
42+
<button class="btn-primary btn mt-2" @click="onlySave" v-if="!initialSetup">
43+
only save Coord Maping
3744
</button>
45+
</div>
46+
<p class="my-4">note if your key indexes changed you need to rebuild your layout or adjust the indexes on the layout editor, only saving the coord map is only advisable if you wanted to modify spacings but not the order of the keys</p>
3847
</div>
3948
</template>
4049

@@ -66,6 +75,9 @@ const done = () => {
6675
keyboardStore.coordMap = keys.value
6776
emits('next')
6877
}
78+
const onlySave = () => {
79+
keyboardStore.coordMap = keys.value
80+
}
6981
const flashCoordMapping = async () => {
7082
keyboardStore.coordMapSetup = true
7183
await window.api.saveConfiguration(
@@ -118,6 +130,13 @@ const keyboardlayout = computed(() => {
118130
console.log(realKeys)
119131
return realKeys
120132
})
133+
134+
const rmLast = () => {
135+
coordmap.value = coordmap.value.split(' ').slice(0, -1).join(' ');
136+
}
137+
const clear = ()=>{
138+
coordmap.value=''
139+
}
121140
</script>
122141

123142
<style lang="scss" scoped></style>

src/renderer/src/components/EncoderSetup.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<i class="mdi mdi-delete"></i> remove encoder
1111
</button>
1212
</div>
13+
<p>Prefix: {{keyboardStore.pinPrefix}} - {{pinPfrefixHint}}</p>
1314
<div class="flex items-center gap-4 mb-2">
1415
<label>Pad A</label>
1516
<input
@@ -44,7 +45,7 @@
4445
</template>
4546

4647
<script lang="ts" setup>
47-
import {keyboardStore} from "../store";
48+
import {keyboardStore, pinPfrefixHint} from "../store";
4849
import EncoderLayer from "./EncoderLayer.vue";
4950
5051
const cleanEncoders = () => {

0 commit comments

Comments
 (0)