\
+ handler.block_msgbox("custom-skip", "Confirm Delete", "
\
Deleting #" + (i + 1) + " of " + n + " files.
\
Are you sure you want to delete this file?
\
" + name + " \
diff --git a/src/ui/grid.tis b/src/ui/grid.tis
index cb5932678..f33b4ef35 100644
--- a/src/ui/grid.tis
+++ b/src/ui/grid.tis
@@ -24,6 +24,11 @@ class Grid: Behavior {
{
return this.$(tbody>tr:current);
}
+
+ function getCurrentRows()
+ {
+ return this.$$(tbody>tr:checked);
+ }
function getCurrentColumn()
{
diff --git a/src/ui/index.tis b/src/ui/index.tis
index ea48bacdc..55fcf6f7c 100644
--- a/src/ui/index.tis
+++ b/src/ui/index.tis
@@ -40,9 +40,7 @@ class ConnectStatus: Reactor.Component {
}
event click $(.connect-status .link) () {
- var options = handler.get_options();
- options["stop-service"] = "";
- handler.set_options(options);
+ handler.set_option("stop-service", "");
}
}
@@ -138,7 +136,6 @@ function createNewConnect(id, type) {
var myIdMenu;
var audioInputMenu;
-var configOptions = {};
class AudioInputs: Reactor.Component {
function this() {
audioInputMenu = this;
@@ -167,7 +164,7 @@ class AudioInputs: Reactor.Component {
}
function get_value() {
- return configOptions["audio-input"] || this.get_default();
+ return handler.get_option("audio-input") || this.get_default();
}
function toggleMenuState() {
@@ -182,8 +179,7 @@ class AudioInputs: Reactor.Component {
var v = me.id;
if (v == this.get_value()) return;
if (v == this.get_default()) v = "";
- configOptions["audio-input"] = v;
- handler.set_options(configOptions);
+ handler.set_option("audio-input", v);
this.toggleMenuState();
}
}
@@ -223,7 +219,6 @@ class MyIdMenu: Reactor.Component {
event click $(svg#menu) (_, me) {
audioInputMenu.update({ show: true });
- configOptions = handler.get_options();
this.toggleMenuState();
var menu = $(menu#config-options);
me.popup(menu);
@@ -232,7 +227,7 @@ class MyIdMenu: Reactor.Component {
function toggleMenuState() {
for (var el in $$(menu#config-options>li)) {
if (el.id && el.id.indexOf("enable-") == 0) {
- var enabled = configOptions[el.id] != "N";
+ var enabled = handler.get_option(el.id) != "N";
el.attributes.toggleClass("selected", enabled);
el.attributes.toggleClass("line-through", !enabled);
}
@@ -241,11 +236,10 @@ class MyIdMenu: Reactor.Component {
event click $(menu#config-options>li) (_, me) {
if (me.id && me.id.indexOf("enable-") == 0) {
- configOptions[me.id] = configOptions[me.id] == "N" ? "" : "N";
- handler.set_options(configOptions);
+ handler.set_option(me.id, handler.get_option(me.id) == "N" ? "" : "N");
}
if (me.id == "whitelist") {
- var old_value = (configOptions["whitelist"] || "").split(",").join("\n");
+ var old_value = handler.get_option("whitelist").split(",").join("\n");
handler.msgbox("custom-whitelist", "IP Whitelisting", "
\
\
\
@@ -253,7 +247,7 @@ class MyIdMenu: Reactor.Component {
if (!res) return;
var value = (res.text || "").trim();
if (value) {
- var values = value.split(/[\s,;]+/g);
+ var values = value.split(/[\s,;\n]+/g);
for (var ip in values) {
if (!ip.match(/^\d+\.\d+\.\d+\.\d+$/)) {
return "Invalid ip: " + ip;
@@ -262,11 +256,11 @@ class MyIdMenu: Reactor.Component {
value = values.join("\n");
}
if (value == old_value) return;
- configOptions["whitelist"] = value.replace("\n", ",");
stdout.println("whitelist updated");
- handler.set_options(configOptions);
+ handler.set_option("whitelist", value.replace("\n", ","));
}, 300);
} else if (me.id == "custom-server") {
+ var configOptions = handler.get_options();
var old_relay = configOptions["relay-server"] || "";
var old_id = configOptions["custom-rendezvous-server"] || "";
handler.msgbox("custom-server", "ID/Relay Server", "
\
@@ -293,8 +287,7 @@ class MyIdMenu: Reactor.Component {
} else if (me.id == "forum") {
handler.open_url("https:://forum.rustdesk.com");
} else if (me.id == "stop-service") {
- configOptions["stop-service"] = service_stopped ? "" : "Y";
- handler.set_options(configOptions);
+ handler.set_option("stop-service", service_stopped ? "" : "Y");
} else if (me.id == "about") {
var name = handler.get_app_name();
handler.msgbox("custom-nocancel-nook-hasclose", "About " + name, "
\
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index 8cd4b09d8..8c82ce4d5 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -694,8 +694,8 @@ impl Handler {
let mut key_event = KeyEvent::new();
if down_or_up == 2 {
/* windows send both keyup/keydown and keychar, so here we avoid keychar
- for <= 0xFF, best practise should only avoid those not on keyboard, but
- for now, we have no way to test, so avoid <= 0xFF totaly
+ for <= 0xFF, best practice should only avoid those not on keyboard, but
+ for now, we have no way to test, so avoid <= 0xFF totally
*/
if code <= 0xFF {
return None;
@@ -891,7 +891,8 @@ impl Handler {
let mut name = name;
#[cfg(target_os = "linux")]
- if code == 65383 { // VK_MENU
+ if code == 65383 {
+ // VK_MENU
name = "Apps".to_owned();
}
@@ -1435,16 +1436,16 @@ impl Remote {
if elapsed <= 0 {
return;
}
- let transfered = job.transfered();
- let last_transfered = {
+ let transferred = job.transferred();
+ let last_transferred = {
if let Some(v) = last_update_jobs_status.1.get(&job.id()) {
v.to_owned()
} else {
0
}
};
- last_update_jobs_status.1.insert(job.id(), transfered);
- let speed = (transfered - last_transfered) as f64 / (elapsed as f64 / 1000.);
+ last_update_jobs_status.1.insert(job.id(), transferred);
+ let speed = (transferred - last_transferred) as f64 / (elapsed as f64 / 1000.);
let file_num = job.file_num() - 1;
handler.call(
"jobProgress",
diff --git a/src/windows.cc b/src/windows.cc
index e9a7294cd..162c8a0a7 100644
--- a/src/windows.cc
+++ b/src/windows.cc
@@ -89,7 +89,7 @@ extern "C"
CreateEnvironmentBlock(&lpEnvironment, // Environment block
hToken, // New token
- TRUE); // Inheritence
+ TRUE); // Inheritance
}
if (lpEnvironment)
{
