rustdesk 2022-05-07 22:47:43 +08:00
parent 12ff1e316e
commit 2705228394
4 changed files with 21 additions and 4 deletions

View File

@ -25,5 +25,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("android_version_audio_tip", "The current Android version does not support audio capture, please upgrade to Android 10 or higher."), ("android_version_audio_tip", "The current Android version does not support audio capture, please upgrade to Android 10 or higher."),
("android_start_service_tip", "Tap [Start Service] or OPEN [Screen Capture] permission to start the screen sharing service."), ("android_start_service_tip", "Tap [Start Service] or OPEN [Screen Capture] permission to start the screen sharing service."),
("doc_mac_permission", "https://rustdesk.com/docs/en/manual/mac/#enable-permissions"), ("doc_mac_permission", "https://rustdesk.com/docs/en/manual/mac/#enable-permissions"),
("doc_fix_wayland", "https://rustdesk.com/docs/en/manual/linux/#x11-required"),
].iter().cloned().collect(); ].iter().cloned().collect();
} }

View File

@ -663,8 +663,12 @@ impl UI {
let p = "explorer"; let p = "explorer";
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let p = "open"; let p = "open";
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
let p = "xdg-open"; let p = if std::path::Path::new("/usr/bin/firefox").exists() {
"firefox"
} else {
"xdg-open"
};
allow_err!(std::process::Command::new(p).arg(url).spawn()); allow_err!(std::process::Command::new(p).arg(url).spawn());
} }

View File

@ -352,7 +352,8 @@ div.trust-me > div:nth-child(3) {
font-weight: bold; font-weight: bold;
} }
div.trust-me > div:nth-child(4) { div.trust-me > div:nth-child(4),
div.trust-me > div:nth-child(5) {
margin-top: 0.5em; margin-top: 0.5em;
text-align: center; text-align: center;
} }

View File

@ -584,6 +584,7 @@ class FixWayland: Reactor.Component {
<div>{translate('Warning')}</div> <div>{translate('Warning')}</div>
<div>{translate('Login screen using Wayland is not supported')}</div> <div>{translate('Login screen using Wayland is not supported')}</div>
<div #fix-wayland .link>{translate('Fix it')}</div> <div #fix-wayland .link>{translate('Fix it')}</div>
<div #help-me .link>{translate('Help')}</div>
<div>({translate('Reboot required')})</div> <div>({translate('Reboot required')})</div>
</div>; </div>;
} }
@ -592,6 +593,10 @@ class FixWayland: Reactor.Component {
handler.fix_login_wayland(); handler.fix_login_wayland();
app.update(); app.update();
} }
event click $(#help-me) {
handler.open_url(translate("doc_fix_wayland"));
}
} }
class ModifyDefaultLogin: Reactor.Component { class ModifyDefaultLogin: Reactor.Component {
@ -600,16 +605,22 @@ class ModifyDefaultLogin: Reactor.Component {
<div>{translate('Warning')}</div> <div>{translate('Warning')}</div>
<div>{translate('Current Wayland display server is not supported')}</div> <div>{translate('Current Wayland display server is not supported')}</div>
<div #modify-default-login .link>{translate('Fix it')}</div> <div #modify-default-login .link>{translate('Fix it')}</div>
<div #help-me .link>{translate('Help')}</div>
<div>({translate('Reboot required')})</div> <div>({translate('Reboot required')})</div>
</div>; </div>;
} }
event click $(#modify-default-login) { event click $(#modify-default-login) {
if (var r = handler.modify_default_login()) { if (var r = handler.modify_default_login()) {
msgbox("custom-error", "Error", r); // without handler, will fail, fucking stupid sciter
handler.msgbox("custom-error", "Error", r);
} }
app.update(); app.update();
} }
event click $(#help-me) {
handler.open_url(translate("doc_fix_wayland"));
}
} }
function watch_trust() { function watch_trust() {