konevsa/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #60 from Candunc/master

Browse Source 
Fixed typos, defaulted MacOS update prompt to use https
This commit is contained in:
RustDesk 2021-06-05 08:03:03 +08:00 committed by GitHub
commit c2d97054dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.rs
View File

@ -135,7 +135,7 @@ impl Client {
if ph.socket_addr.is_empty() { if ph.socket_addr.is_empty() {
match ph.failure.enum_value_or_default() { match ph.failure.enum_value_or_default() {
punch_hole_response::Failure::ID_NOT_EXIST => { punch_hole_response::Failure::ID_NOT_EXIST => {
bail!("ID not exist"); bail!("ID does not exist");
} }
punch_hole_response::Failure::OFFLINE => { punch_hole_response::Failure::OFFLINE => {
bail!("Remote desktop is offline"); bail!("Remote desktop is offline");

6
src/ui/index.tis
View File

@ -115,7 +115,7 @@ function createNewConnect(id, type) {
app.remote_id.value = formatId(id); app.remote_id.value = formatId(id);
if (!id) return; if (!id) return;
if (id == handler.get_id()) { if (id == handler.get_id()) {
handler.msgbox("custom-error", "Error", "Sorry, it is yourself"); handler.msgbox("custom-error", "Error", "You cannot connect to your own computer");
return; return;
} }
handler.set_remote_id(id); handler.set_remote_id(id);
@ -421,7 +421,7 @@ class UpgradeMe: Reactor.Component {
var update_or_download = is_osx ? "download" : "update"; var update_or_download = is_osx ? "download" : "update";
return <div .install-me> return <div .install-me>
<div>{handler.get_app_name()} Status</div> <div>{handler.get_app_name()} Status</div>
<div>Your installation is lower version.</div> <div>An update is available for RustDesk.</div>
<div #install-me .link style="padding-top: 1em">Click to upgrade</div> <div #install-me .link style="padding-top: 1em">Click to upgrade</div>
</div>; </div>;
} }
@ -444,7 +444,7 @@ class UpdateMe: Reactor.Component {
event click $(#install-me) { event click $(#install-me) {
if (is_osx) { if (is_osx) {
handler.open_url("http://rustdesk.com"); handler.open_url("https://rustdesk.com");
return; return;
} }
var url = software_update_url + '.' + handler.get_software_ext(); var url = software_update_url + '.' + handler.get_software_ext();

2
src/ui/port_forward.tis
View File

@ -22,7 +22,7 @@ class PortForward: Reactor.Component {
return <div #file-transfer><section> return <div #file-transfer><section>
{pfs.length ? <div style="background: green; color: white; text-align: center; padding: 0.5em;"> {pfs.length ? <div style="background: green; color: white; text-align: center; padding: 0.5em;">
<span style="font-size: 1.2em">Listening ...</span><br/> <span style="font-size: 1.2em">Listening ...</span><br/>
<span style="font-size: 0.8em; color: #ddd">Don't close this window while your are using tunnel</span> <span style="font-size: 0.8em; color: #ddd">Don't close this window while you are using the tunnel</span>
</div> : ""} </div> : ""}
<table #port-forward> <table #port-forward>
<thead> <thead>