update ui

pull/13/head
4yn 2022-07-24 21:11:48 +08:00
parent 571eec24d3
commit e0046ede81
6 changed files with 50 additions and 36 deletions

View File

@ -615,18 +615,14 @@ dependencies = [
[[package]] [[package]]
name = "interception" name = "interception"
version = "0.1.2" version = "0.1.0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"interception-sys", "cc",
"num_enum", "num_enum",
"serde", "serde",
] ]
[[package]]
name = "interception-sys"
version = "0.1.3"
[[package]] [[package]]
name = "ipconfig" name = "ipconfig"
version = "0.3.0" version = "0.3.0"

View File

@ -31,7 +31,7 @@ serialport = "4.0.1"
wwserial = {path = "../src-wwserial" } wwserial = {path = "../src-wwserial" }
vigem-client = { version = "0.1.2", features = ["unstable"] } vigem-client = { version = "0.1.2", features = ["unstable"] }
winapi = "0.3.9" winapi = "0.3.9"
interception = {path = "../src-interception-rs" } interception = {path = "../src-interception" }
ipconfig = "0.3.0" ipconfig = "0.3.0"
# webserver # webserver

23
src-tauri/Cargo.lock generated
View File

@ -1499,18 +1499,14 @@ dependencies = [
[[package]] [[package]]
name = "interception" name = "interception"
version = "0.1.2" version = "0.1.0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"interception-sys", "cc",
"num_enum", "num_enum",
"serde", "serde",
] ]
[[package]]
name = "interception-sys"
version = "0.1.3"
[[package]] [[package]]
name = "ipconfig" name = "ipconfig"
version = "0.3.0" version = "0.3.0"
@ -2064,6 +2060,16 @@ dependencies = [
"windows-sys", "windows-sys",
] ]
[[package]]
name = "open"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f23a407004a1033f53e93f9b45580d14de23928faad187384f891507c9b0c045"
dependencies = [
"pathdiff",
"windows-sys",
]
[[package]] [[package]]
name = "palette" name = "palette"
version = "0.6.1" version = "0.6.1"
@ -2994,7 +3000,7 @@ version = "0.3.1"
dependencies = [ dependencies = [
"env_logger", "env_logger",
"log", "log",
"open", "open 2.1.3",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"simple-logging", "simple-logging",
"slider_io", "slider_io",
@ -3210,9 +3216,11 @@ dependencies = [
"ignore", "ignore",
"objc", "objc",
"once_cell", "once_cell",
"open 3.0.2",
"percent-encoding", "percent-encoding",
"rand 0.8.5", "rand 0.8.5",
"raw-window-handle", "raw-window-handle",
"regex",
"semver 1.0.12", "semver 1.0.12",
"serde", "serde",
"serde_json", "serde_json",
@ -3264,6 +3272,7 @@ dependencies = [
"png 0.17.5", "png 0.17.5",
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex",
"semver 1.0.12", "semver 1.0.12",
"serde", "serde",
"serde_json", "serde_json",

View File

@ -19,7 +19,7 @@ env_logger = "0.9.0"
parking_lot = "0.12.0" parking_lot = "0.12.0"
tauri = { version = "1.0.4", features = ["system-tray", "window-start-dragging"] } tauri = { version = "1.0.4", features = ["shell-open", "system-tray", "window-start-dragging"] }
open = "2.0.2" open = "2.0.2"
slider_io = {path = "../src-slider_io" } slider_io = {path = "../src-slider_io" }

View File

@ -50,6 +50,9 @@
"all": false, "all": false,
"window": { "window": {
"startDragging": true "startDragging": true
},
"shell": {
"open": true
} }
}, },
"windows": [ "windows": [

View File

@ -390,27 +390,33 @@
</div> </div>
{/if} {/if}
{#if outputMode.slice(0, 2) === "kb"} {#if outputMode.slice(0, 2) === "kb"}
<div class="row"> <div class="row">
<div class="label" title="Larger means harder to trigger"> <div class="label" />
Use DirectInput emulation <div class="input">
<span>
<input
type="checkbox"
id="direct-input"
style="width: unset;"
bind:checked={keyboardDirectInput}
on:change={markDirty}
/>
<label for="disable-air">Use DirectInput</label>
</span>
</div>
</div> </div>
<div class="input"> {#if keyboardDirectInput}
<input <div class="row">
type="checkbox" <div class="label" />
bind:checked={keyboardDirectInput} <div class="input comment">
on:change={markDirty} DirectInput emulation requires <Link
/> href="https://github.com/oblitum/Interception/releases/tag/v1.0.1"
</div> >Interception</Link
</div> >
<div class="row"> </div>
<div class="label" /> </div>
<div class="input comment"> {/if}
DirectInput emulation requires <Link {/if}
href="https://github.com/oblitum/Interception/releases/tag/v1.0.1">Interception</Link
> to be installed
</div>
</div>
{/if}
{#if outputMode === "websocket"} {#if outputMode === "websocket"}
<div class="row"> <div class="row">
<div class="label">Output URL</div> <div class="label">Output URL</div>
@ -544,7 +550,7 @@
{#if ledMode === "serial"} {#if ledMode === "serial"}
<div class="row"> <div class="row">
<div class="label" /> <div class="label" />
<div class="input"> <div class="input comment">
Serial LED may require <Link Serial LED may require <Link
href="https://sourceforge.net/projects/com0com/files/com0com/2.2.2.0/com0com-2.2.2.0-x64-fre-signed.zip/download" href="https://sourceforge.net/projects/com0com/files/com0com/2.2.2.0/com0com-2.2.2.0-x64-fre-signed.zip/download"
>com0com</Link >com0com</Link