fix: confirmDelete -> cancel Delete
This commit is contained in:
parent
96c7202e4b
commit
050952e5e8
@ -266,6 +266,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
|
|||||||
("android_start_service_tip", "点击 [启动服务] 或打开 [屏幕录制] 权限开启手机屏幕共享服务。"),
|
("android_start_service_tip", "点击 [启动服务] 或打开 [屏幕录制] 权限开启手机屏幕共享服务。"),
|
||||||
("Account", "账号"),
|
("Account", "账号"),
|
||||||
("Quit", "退出"),
|
("Quit", "退出"),
|
||||||
|
("Overwrite", "覆盖"),
|
||||||
|
("This file exists, skip or overwrite this file?", "这个文件/文件夹已存在,跳过/覆盖?")
|
||||||
("doc_mac_permission", "https://rustdesk.com/docs/zh-cn/manual/mac/#启用权限"),
|
("doc_mac_permission", "https://rustdesk.com/docs/zh-cn/manual/mac/#启用权限"),
|
||||||
("Help", "帮助"),
|
("Help", "帮助"),
|
||||||
].iter().cloned().collect();
|
].iter().cloned().collect();
|
||||||
|
@ -266,6 +266,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
|
|||||||
("android_start_service_tip", "Нажмите [Запуск промежуточного сервера] или ОТКРЫТЬ разрешение [Скриншот], чтобы запустить службу демонстрации экрана."),
|
("android_start_service_tip", "Нажмите [Запуск промежуточного сервера] или ОТКРЫТЬ разрешение [Скриншот], чтобы запустить службу демонстрации экрана."),
|
||||||
("Account", "Аккаунт"),
|
("Account", "Аккаунт"),
|
||||||
("Quit", "Выйти"),
|
("Quit", "Выйти"),
|
||||||
|
("Overwrite", "крышка"),
|
||||||
|
("This file exists, skip or overwrite this file?", "Этот файл существует, пропустить или перезаписать этот файл?")
|
||||||
("doc_mac_permission", "https://rustdesk.com/docs/en/manual/mac/#enable-permissions"),
|
("doc_mac_permission", "https://rustdesk.com/docs/en/manual/mac/#enable-permissions"),
|
||||||
("Help", "Помощь"),
|
("Help", "Помощь"),
|
||||||
].iter().cloned().collect();
|
].iter().cloned().collect();
|
||||||
|
@ -265,6 +265,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
|
|||||||
("android_version_audio_tip", ""),
|
("android_version_audio_tip", ""),
|
||||||
("android_start_service_tip", ""),
|
("android_start_service_tip", ""),
|
||||||
("Account", ""),
|
("Account", ""),
|
||||||
|
("Overwrite", ""),
|
||||||
|
("This file exists, skip or overwrite this file?", "")
|
||||||
("Quit", ""),
|
("Quit", ""),
|
||||||
("doc_mac_permission", ""),
|
("doc_mac_permission", ""),
|
||||||
("Help", ""),
|
("Help", ""),
|
||||||
|
@ -266,6 +266,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
|
|||||||
("android_start_service_tip", "點擊 [啟動服務] 或打開 [屏幕錄製] 權限開啟手機屏幕共享服務。"),
|
("android_start_service_tip", "點擊 [啟動服務] 或打開 [屏幕錄製] 權限開啟手機屏幕共享服務。"),
|
||||||
("Account", "帳戶"),
|
("Account", "帳戶"),
|
||||||
("Quit", "退出"),
|
("Quit", "退出"),
|
||||||
|
("Overwrite", "覆蓋"),
|
||||||
|
("This file exists, skip or overwrite this file?", "這個文件/文件夾已存在,跳過/覆蓋?")
|
||||||
("doc_mac_permission", "https://rustdesk.com/docs/zh-tw/manual/mac/#啟用權限"),
|
("doc_mac_permission", "https://rustdesk.com/docs/zh-tw/manual/mac/#啟用權限"),
|
||||||
("Help", "幫助"),
|
("Help", "幫助"),
|
||||||
].iter().cloned().collect();
|
].iter().cloned().collect();
|
||||||
|
@ -136,7 +136,6 @@ impl ConnectionManager {
|
|||||||
dir,
|
dir,
|
||||||
include_hidden,
|
include_hidden,
|
||||||
} => {
|
} => {
|
||||||
// println!("[cm.rs:126] ipc::FS::ReadDir recved");
|
|
||||||
Self::read_dir(&dir, include_hidden, conn).await;
|
Self::read_dir(&dir, include_hidden, conn).await;
|
||||||
}
|
}
|
||||||
ipc::FS::RemoveDir {
|
ipc::FS::RemoveDir {
|
||||||
@ -157,7 +156,6 @@ impl ConnectionManager {
|
|||||||
id,
|
id,
|
||||||
mut files,
|
mut files,
|
||||||
} => {
|
} => {
|
||||||
println!("new write in ipc::FS::NewWrite");
|
|
||||||
write_jobs.push(fs::TransferJob::new_write(
|
write_jobs.push(fs::TransferJob::new_write(
|
||||||
id,
|
id,
|
||||||
path,
|
path,
|
||||||
@ -293,7 +291,6 @@ impl ConnectionManager {
|
|||||||
let mut file_response = FileResponse::new();
|
let mut file_response = FileResponse::new();
|
||||||
file_response.set_dir(fd);
|
file_response.set_dir(fd);
|
||||||
msg_out.set_file_response(file_response);
|
msg_out.set_file_response(file_response);
|
||||||
// println!("[cm.rs:229] set dir");
|
|
||||||
Self::send(msg_out, conn).await;
|
Self::send(msg_out, conn).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -356,7 +353,6 @@ impl ConnectionManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn send(msg: Message, conn: &mut Connection) {
|
async fn send(msg: Message, conn: &mut Connection) {
|
||||||
println!("send msg: {:?}", msg);
|
|
||||||
match msg.write_to_bytes() {
|
match msg.write_to_bytes() {
|
||||||
Ok(bytes) => allow_err!(conn.send(&Data::RawMessage(bytes)).await),
|
Ok(bytes) => allow_err!(conn.send(&Data::RawMessage(bytes)).await),
|
||||||
err => allow_err!(err),
|
err => allow_err!(err),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user