mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-28 23:59:05 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3004 from rustdesk/revert-3003-remove-wayland-fix-docs

Browse Source 
Revert "Remove remnant documentation for wayland fix"
This commit is contained in:
RustDesk 2023-01-30 15:49:03 +08:00 committed by GitHub
commit 2fd022a594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/en.rs
View File

@ -25,6 +25,7 @@ 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_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_fix_wayland", "https://rustdesk.com/docs/en/manual/linux/#x11-required"),
("server_not_support", "Not yet supported by the server"),
("android_open_battery_optimizations_tip", "If you want to disable this feature, please go to the next RustDesk application settings page, find and enter [Battery], Uncheck [Unrestricted]"),
("remote_restarting_tip", "Remote device is restarting, please close this message box and reconnect with permanent password after a while"),

30
src/ui/index.tis
View File

@ -558,6 +558,8 @@ class App: Reactor.Component
{is_can_screen_recording && !handler.is_process_trusted(false) ? <TrustMe /> : ""}
{!service_stopped && is_can_screen_recording && handler.is_process_trusted(false) && handler.is_installed() && !handler.is_installed_daemon(false) ? <InstallDaemon /> : ""}
{system_error ? <SystemError /> : ""}
{!system_error && handler.is_login_wayland() && !handler.current_is_wayland() ? <FixWayland /> : ""}
{!system_error && handler.current_is_wayland() ? <ModifyDefaultLogin /> : ""}
</div>
<div .right-pane>
<div .right-content>
@ -744,6 +746,34 @@ class InstallDaemon: Reactor.Component {
}
}
class FixWayland: Reactor.Component {
function render() {
return <div .trust-me>
<div>{translate('Warning')}</div>
<div>{translate('Login screen using Wayland is not supported')}</div>
<div #help-me .link>{translate('Help')}</div>
</div>;
}
event click $(#help-me) {
handler.open_url(translate("doc_fix_wayland"));
}
}
class ModifyDefaultLogin: Reactor.Component {
function render() {
return <div .trust-me>
<div>{translate('Warning')}</div>
<div>{translate('Current Wayland display server is not supported')}</div>
<div #help-me .link>{translate('Help')}</div>
</div>;
}
event click $(#help-me) {
handler.open_url(translate("doc_fix_wayland"));
}
}
function watch_trust() {
// not use TrustMe::update, because it is buggy
var trusted = handler.is_process_trusted(false);