diff --git a/README.md b/README.md index cf801b4..516ce20 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ NEVidebla-EKOnomia (invisible economy) * `sudo apt install -y libssl-dev build-essential libgpgme-dev` * `git clone https://github.com/creating2morrow/neveko` * `cd neveko && ./scripts/build_all_and_run.sh "-- -h"` -* Example to start neveko with remote stagenet node for development: - * `./scripts/build_all_and_run.sh "-- --monero-rpc-daemon http://stagenet.community.rino.io:38081 --remote-node --monero-location /path/to/monero-x86_64-linux-gnu-v0.18.2.2/ --i2p-zero-dir /path/to/i2p-zero-linux.v1.21/"` +* Example to start neveko with remote stagenet node / i2p proxy remote for development: + * `./scripts/build_all_and_run.sh "-- --monero-rpc-daemon http://stagenet.community.rino.io:38081 --remote-node --monero-location /path/to/monero-x86_64-linux-gnu-v0.18.2.2/ --i2p-proxy-host x.x.x.x:port --i2p-tunnels-json /path/to/manual-i2p/config/ --i2p-advanced` * the `--monero-location` flag is needed even when using a remote node because neveko has its own monero-wallet-rpc instance * gui built with rust [egui](https://docs.rs/egui/latest/egui/) diff --git a/docs/index.txt b/docs/index.txt index 45d6294..f5269b0 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -28,8 +28,8 @@ B -> http://c2m66oddrzozztxyzjegbdwtgbeiibq5vz2tpchmqamrzcahcfoq.b32.i2p - /pgp.txt - public gpg signing key - /index.txt - this page - /canary.txt - - /download/neveko-x86_64-linux-gnu-v0.4.1-alpha.tar.bz2 - latest neveko download - - /download/neveko-x86_64-linux-gnu-v0.4.1-alpha.tar.bz2.sig - detached sig + - /download/neveko-x86_64-linux-gnu-v0.4.2-alpha.tar.bz2 - latest neveko download + - /download/neveko-x86_64-linux-gnu-v0.4.2-alpha.tar.bz2.sig - detached sig NEVEKO Links (Clear) @@ -38,9 +38,9 @@ NEVEKO Links (Clear) git clone https://github.com/creating2morrow/neveko.git -----BEGIN PGP SIGNATURE----- -iJIEARYKADoWIQQEoRcoLQbE3ctKJgFaPK5QG49jTAUCZI/cIRwcY3JlYXRpbmdf -dG9tb3Jyb3dAcHJvdG9uLm1lAAoJEFo8rlAbj2NMcGoA/3k4+EoTAHAdUNUDB1oW -gmbYCOJIEuXoksSmQeSgSvX2AP4iQ2a15s+/Y7Gn0HGMylq3EA6QKC2DPFANYT5L -EC0vAg== -=vZ7T ------END PGP SIGNATURE----- \ No newline at end of file +iJIEARYKADoWIQQEoRcoLQbE3ctKJgFaPK5QG49jTAUCZJIw9xwcY3JlYXRpbmdf +dG9tb3Jyb3dAcHJvdG9uLm1lAAoJEFo8rlAbj2NM8moA/jvYnAos9hU3NKv6lzUn +37Q6iQupJMEUM8GVaodM+NLGAQDdSWbC/wM3VxnCRxWO8DE5bcbu9jlBfUb1QJmI +DM+wAQ== +=zCby +-----END PGP SIGNATURE----- diff --git a/neveko-gui/src/apps/home.rs b/neveko-gui/src/apps/home.rs index 1fe5c96..b3952ee 100644 --- a/neveko-gui/src/apps/home.rs +++ b/neveko-gui/src/apps/home.rs @@ -256,21 +256,25 @@ impl eframe::App for HomeApp { ui.text_edit_singleline(&mut self.connections.monero_location) .labelled_by(cm_xmr_dir_label.id); }); - ui.horizontal(|ui| { - let cm_i2p_dir_label = ui.label("i2p-zero path: \t"); - ui.text_edit_singleline(&mut self.connections.i2p_zero_dir) - .labelled_by(cm_i2p_dir_label.id); - }); - ui.horizontal(|ui| { - let cm_i2p_proxy_label = ui.label("i2p proxy host: \t"); - ui.text_edit_singleline(&mut self.connections.i2p_proxy_host) - .labelled_by(cm_i2p_proxy_label.id); - }); - ui.horizontal(|ui| { - let cm_i2p_tunnels_label = ui.label("tunnels.json dir: "); - ui.text_edit_singleline(&mut self.connections.i2p_tunnels_json) - .labelled_by(cm_i2p_tunnels_label.id); - }); + if !self.connections.is_i2p_advanced { + ui.horizontal(|ui| { + let cm_i2p_dir_label = ui.label("i2p-zero path: \t"); + ui.text_edit_singleline(&mut self.connections.i2p_zero_dir) + .labelled_by(cm_i2p_dir_label.id); + }); + } + if self.connections.is_i2p_advanced { + ui.horizontal(|ui| { + let cm_i2p_proxy_label = ui.label("i2p proxy host: \t"); + ui.text_edit_singleline(&mut self.connections.i2p_proxy_host) + .labelled_by(cm_i2p_proxy_label.id); + }); + ui.horizontal(|ui| { + let cm_i2p_tunnels_label = ui.label("tunnels.json dir: "); + ui.text_edit_singleline(&mut self.connections.i2p_tunnels_json) + .labelled_by(cm_i2p_tunnels_label.id); + }); + } let mut is_remote_node = self.connections.is_remote_node; if ui.checkbox(&mut is_remote_node, "remote node").changed() { self.connections.is_remote_node = !self.connections.is_remote_node; @@ -293,16 +297,18 @@ impl eframe::App for HomeApp { self.is_editing_connections = false; utils::kill_child_processes(true); utils::start_core(&self.connections); - // set the i2p proxy host for advanced user re-use - std::env::set_var( - neveko_core::NEVEKO_I2P_PROXY_HOST, - self.connections.i2p_proxy_host.clone(), - ); - std::env::set_var( - neveko_core::NEVEKO_I2P_TUNNELS_JSON, - self.connections.i2p_tunnels_json.clone(), - ); - std::env::set_var(neveko_core::NEVEKO_I2P_ADVANCED_MODE, String::from("1")); + if self.connections.is_i2p_advanced { + // set the i2p proxy host for advanced user re-use + std::env::set_var( + neveko_core::NEVEKO_I2P_PROXY_HOST, + self.connections.i2p_proxy_host.clone(), + ); + std::env::set_var( + neveko_core::NEVEKO_I2P_TUNNELS_JSON, + self.connections.i2p_tunnels_json.clone(), + ); + std::env::set_var(neveko_core::NEVEKO_I2P_ADVANCED_MODE, String::from("1")); + } self.is_loading = true; start_core_timeout(self.core_timeout_tx.clone(), ctx.clone()); }