From 73eca76e0a51d80632de2933c994bd95e93df0ab Mon Sep 17 00:00:00 2001
From: Lucas Nogueira <lucas@tauri.studio>
Date: Tue, 16 May 2023 12:09:39 -0300
Subject: [PATCH] fixes

---
 Cargo.lock                                    | 14 +++++++-------
 examples/api/src-tauri/Cargo.toml             |  2 +-
 plugins/dialog/src/commands.rs                |  8 ++++----
 plugins/window/src/scripts/toggle-devtools.js |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 80d7bb36..9163d6d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4960,7 +4960,7 @@ dependencies = [
 [[package]]
 name = "tauri"
 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 = [
  "anyhow",
  "bytes 1.4.0",
@@ -5010,7 +5010,7 @@ dependencies = [
 [[package]]
 name = "tauri-build"
 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 = [
  "anyhow",
  "cargo_toml",
@@ -5030,7 +5030,7 @@ dependencies = [
 [[package]]
 name = "tauri-codegen"
 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 = [
  "base64 0.21.0",
  "brotli",
@@ -5055,7 +5055,7 @@ dependencies = [
 [[package]]
 name = "tauri-macros"
 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 = [
  "heck 0.4.1",
  "proc-macro2",
@@ -5449,7 +5449,7 @@ dependencies = [
 [[package]]
 name = "tauri-runtime"
 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 = [
  "gtk",
  "http",
@@ -5469,7 +5469,7 @@ dependencies = [
 [[package]]
 name = "tauri-runtime-wry"
 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 = [
  "cocoa",
  "gtk",
@@ -5489,7 +5489,7 @@ dependencies = [
 [[package]]
 name = "tauri-utils"
 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 = [
  "aes-gcm 0.10.1",
  "brotli",
diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
index 4bd7ce49..17eb0087 100644
--- a/examples/api/src-tauri/Cargo.toml
+++ b/examples/api/src-tauri/Cargo.toml
@@ -28,7 +28,7 @@ tauri-plugin-os = { path = "../../../plugins/os" }
 tauri-plugin-process = { path = "../../../plugins/process" }
 tauri-plugin-shell = { path = "../../../plugins/shell" }
 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]
 workspace = true
diff --git a/plugins/dialog/src/commands.rs b/plugins/dialog/src/commands.rs
index 905c01ca..8232eedf 100644
--- a/plugins/dialog/src/commands.rs
+++ b/plugins/dialog/src/commands.rs
@@ -271,8 +271,8 @@ pub(crate) async fn ask<R: Runtime>(
         title,
         message,
         type_,
-        ok_button_label,
-        cancel_button_label,
+        Some(ok_button_label.unwrap_or_else(|| "Yes".into())),
+        Some(cancel_button_label.unwrap_or_else(|| "No".into())),
     ))
 }
 
@@ -292,7 +292,7 @@ pub(crate) async fn confirm<R: Runtime>(
         title,
         message,
         type_,
-        ok_button_label,
-        cancel_button_label,
+        Some(ok_button_label.unwrap_or_else(|| "Ok".into())),
+        Some(cancel_button_label.unwrap_or_else(|| "Cancel".into())),
     ))
 }
diff --git a/plugins/window/src/scripts/toggle-devtools.js b/plugins/window/src/scripts/toggle-devtools.js
index 11f9ec30..ad9b8794 100644
--- a/plugins/window/src/scripts/toggle-devtools.js
+++ b/plugins/window/src/scripts/toggle-devtools.js
@@ -1,3 +1,3 @@
 window.hotkeys('__SHORTCUT__', () => {
-  window.__TAURI_INVOKE__('plugin:tauri|internal_toggle_devtools');
+  window.__TAURI_INVOKE__('plugin:window|internal_toggle_devtools');
 });