pull/361/head
Lucas Nogueira 2 years ago
parent ba24207e49
commit 73eca76e0a
No known key found for this signature in database
GPG Key ID: FFEA6C72E73482F1

14
Cargo.lock generated

@ -4960,7 +4960,7 @@ dependencies = [
[[package]] [[package]]
name = "tauri" name = "tauri"
version = "2.0.0-alpha.8" version = "2.0.0-alpha.8"
source = "git+https://github.com/tauri-apps/tauri?branch=next#6d25c4d07fcf18c2a19ac4faa7d9bedd96d1a75f" source = "git+https://github.com/tauri-apps/tauri?branch=next#e5bd34cb34874239baf5877e0b6a206bd13ff959"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes 1.4.0", "bytes 1.4.0",
@ -5010,7 +5010,7 @@ dependencies = [
[[package]] [[package]]
name = "tauri-build" name = "tauri-build"
version = "2.0.0-alpha.4" version = "2.0.0-alpha.4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#6d25c4d07fcf18c2a19ac4faa7d9bedd96d1a75f" source = "git+https://github.com/tauri-apps/tauri?branch=next#e5bd34cb34874239baf5877e0b6a206bd13ff959"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cargo_toml", "cargo_toml",
@ -5030,7 +5030,7 @@ dependencies = [
[[package]] [[package]]
name = "tauri-codegen" name = "tauri-codegen"
version = "2.0.0-alpha.4" version = "2.0.0-alpha.4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#6d25c4d07fcf18c2a19ac4faa7d9bedd96d1a75f" source = "git+https://github.com/tauri-apps/tauri?branch=next#e5bd34cb34874239baf5877e0b6a206bd13ff959"
dependencies = [ dependencies = [
"base64 0.21.0", "base64 0.21.0",
"brotli", "brotli",
@ -5055,7 +5055,7 @@ dependencies = [
[[package]] [[package]]
name = "tauri-macros" name = "tauri-macros"
version = "2.0.0-alpha.4" version = "2.0.0-alpha.4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#6d25c4d07fcf18c2a19ac4faa7d9bedd96d1a75f" source = "git+https://github.com/tauri-apps/tauri?branch=next#e5bd34cb34874239baf5877e0b6a206bd13ff959"
dependencies = [ dependencies = [
"heck 0.4.1", "heck 0.4.1",
"proc-macro2", "proc-macro2",
@ -5449,7 +5449,7 @@ dependencies = [
[[package]] [[package]]
name = "tauri-runtime" name = "tauri-runtime"
version = "0.13.0-alpha.4" version = "0.13.0-alpha.4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#6d25c4d07fcf18c2a19ac4faa7d9bedd96d1a75f" source = "git+https://github.com/tauri-apps/tauri?branch=next#e5bd34cb34874239baf5877e0b6a206bd13ff959"
dependencies = [ dependencies = [
"gtk", "gtk",
"http", "http",
@ -5469,7 +5469,7 @@ dependencies = [
[[package]] [[package]]
name = "tauri-runtime-wry" name = "tauri-runtime-wry"
version = "0.13.0-alpha.4" version = "0.13.0-alpha.4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#6d25c4d07fcf18c2a19ac4faa7d9bedd96d1a75f" source = "git+https://github.com/tauri-apps/tauri?branch=next#e5bd34cb34874239baf5877e0b6a206bd13ff959"
dependencies = [ dependencies = [
"cocoa", "cocoa",
"gtk", "gtk",
@ -5489,7 +5489,7 @@ dependencies = [
[[package]] [[package]]
name = "tauri-utils" name = "tauri-utils"
version = "2.0.0-alpha.4" version = "2.0.0-alpha.4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#6d25c4d07fcf18c2a19ac4faa7d9bedd96d1a75f" source = "git+https://github.com/tauri-apps/tauri?branch=next#e5bd34cb34874239baf5877e0b6a206bd13ff959"
dependencies = [ dependencies = [
"aes-gcm 0.10.1", "aes-gcm 0.10.1",
"brotli", "brotli",

@ -28,7 +28,7 @@ tauri-plugin-os = { path = "../../../plugins/os" }
tauri-plugin-process = { path = "../../../plugins/process" } tauri-plugin-process = { path = "../../../plugins/process" }
tauri-plugin-shell = { path = "../../../plugins/shell" } tauri-plugin-shell = { path = "../../../plugins/shell" }
tauri-plugin-updater = { path = "../../../plugins/updater" } tauri-plugin-updater = { path = "../../../plugins/updater" }
tauri-plugin-window = { path = "../../../plugins/window" } tauri-plugin-window = { path = "../../../plugins/window", features = ["devtools", "icon-ico", "icon-png"] }
[dependencies.tauri] [dependencies.tauri]
workspace = true workspace = true

@ -271,8 +271,8 @@ pub(crate) async fn ask<R: Runtime>(
title, title,
message, message,
type_, type_,
ok_button_label, Some(ok_button_label.unwrap_or_else(|| "Yes".into())),
cancel_button_label, Some(cancel_button_label.unwrap_or_else(|| "No".into())),
)) ))
} }
@ -292,7 +292,7 @@ pub(crate) async fn confirm<R: Runtime>(
title, title,
message, message,
type_, type_,
ok_button_label, Some(ok_button_label.unwrap_or_else(|| "Ok".into())),
cancel_button_label, Some(cancel_button_label.unwrap_or_else(|| "Cancel".into())),
)) ))
} }

@ -1,3 +1,3 @@
window.hotkeys('__SHORTCUT__', () => { window.hotkeys('__SHORTCUT__', () => {
window.__TAURI_INVOKE__('plugin:tauri|internal_toggle_devtools'); window.__TAURI_INVOKE__('plugin:window|internal_toggle_devtools');
}); });

Loading…
Cancel
Save