diff --git a/src-slider_io/Cargo.lock b/src-slider_io/Cargo.lock index c9f6f08..a7329d0 100644 --- a/src-slider_io/Cargo.lock +++ b/src-slider_io/Cargo.lock @@ -615,18 +615,14 @@ dependencies = [ [[package]] name = "interception" -version = "0.1.2" +version = "0.1.0" dependencies = [ "bitflags", - "interception-sys", + "cc", "num_enum", "serde", ] -[[package]] -name = "interception-sys" -version = "0.1.3" - [[package]] name = "ipconfig" version = "0.3.0" diff --git a/src-slider_io/Cargo.toml b/src-slider_io/Cargo.toml index 3693fc2..b20cb84 100644 --- a/src-slider_io/Cargo.toml +++ b/src-slider_io/Cargo.toml @@ -31,7 +31,7 @@ serialport = "4.0.1" wwserial = {path = "../src-wwserial" } vigem-client = { version = "0.1.2", features = ["unstable"] } winapi = "0.3.9" -interception = {path = "../src-interception-rs" } +interception = {path = "../src-interception" } ipconfig = "0.3.0" # webserver diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e0bfa93..21bdeb5 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1499,18 +1499,14 @@ dependencies = [ [[package]] name = "interception" -version = "0.1.2" +version = "0.1.0" dependencies = [ "bitflags", - "interception-sys", + "cc", "num_enum", "serde", ] -[[package]] -name = "interception-sys" -version = "0.1.3" - [[package]] name = "ipconfig" version = "0.3.0" @@ -2064,6 +2060,16 @@ dependencies = [ "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]] name = "palette" version = "0.6.1" @@ -2994,7 +3000,7 @@ version = "0.3.1" dependencies = [ "env_logger", "log", - "open", + "open 2.1.3", "parking_lot 0.12.1", "simple-logging", "slider_io", @@ -3210,9 +3216,11 @@ dependencies = [ "ignore", "objc", "once_cell", + "open 3.0.2", "percent-encoding", "rand 0.8.5", "raw-window-handle", + "regex", "semver 1.0.12", "serde", "serde_json", @@ -3264,6 +3272,7 @@ dependencies = [ "png 0.17.5", "proc-macro2", "quote", + "regex", "semver 1.0.12", "serde", "serde_json", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index eda62b6..3c11c30 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -19,7 +19,7 @@ env_logger = "0.9.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" slider_io = {path = "../src-slider_io" } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index d0e3ef4..aad22a2 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -50,6 +50,9 @@ "all": false, "window": { "startDragging": true + }, + "shell": { + "open": true } }, "windows": [ diff --git a/src/App.svelte b/src/App.svelte index 036f84d..3d0a1a1 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -390,27 +390,33 @@ {/if} {#if outputMode.slice(0, 2) === "kb"} -