portable-service: better prompt message

Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2022-11-15 16:49:55 +08:00
parent abd665153b
commit ca8cb5a3b0
38 changed files with 131 additions and 124 deletions

View File

@@ -20,18 +20,14 @@ use hbb_common::fs::{
use hbb_common::message_proto::permission_info::Permission;
use hbb_common::protobuf::Message as _;
use hbb_common::rendezvous_proto::ConnType;
#[cfg(windows)]
use hbb_common::tokio::sync::Mutex as TokioMutex;
use hbb_common::tokio::{
self,
sync::mpsc,
time::{self, Duration, Instant, Interval},
};
#[cfg(windows)]
use hbb_common::tokio::sync::Mutex as TokioMutex;
use hbb_common::{
allow_err,
message_proto::*,
sleep,
};
use hbb_common::{allow_err, message_proto::*, sleep};
use hbb_common::{fs, log, Stream};
use std::collections::HashMap;
@@ -998,23 +994,31 @@ impl<T: InvokeUiSession> Remote<T> {
}
}
Some(misc::Union::Uac(uac)) => {
let msgtype = "custom-uac-nocancel";
let title = "Prompt";
let text = "Please wait for confirmation of UAC...";
let link = "";
if uac {
self.handler.msgbox(
"custom-uac-nocancel",
"Warning",
"uac_warning",
"",
);
self.handler.msgbox(msgtype, title, text, link);
} else {
self.handler
.cancel_msgbox(
&format!("{}-{}-{}-{}", msgtype, title, text, link,),
);
}
}
Some(misc::Union::ForegroundWindowElevated(elevated)) => {
let msgtype = "custom-elevated-foreground-nocancel";
let title = "Prompt";
let text = "elevated_foreground_window_tip";
let link = "";
if elevated {
self.handler.msgbox(
"custom-elevated-foreground-nocancel",
"Warning",
"elevated_foreground_window_warning",
"",
);
self.handler.msgbox(msgtype, title, text, link);
} else {
self.handler
.cancel_msgbox(
&format!("{}-{}-{}-{}", msgtype, title, text, link,),
);
}
}
_ => {}