github-jwinterm/grim
1
0
Fork 0
mirror of https://github.com/jwinterm/grim.git synced 2026-11-13 01:03:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui + build: title panel refactoring, check node idle state for network title animation, optimize font sizes, run build on several devices for Android

Browse Source
This commit is contained in:
ardocrat
2023-07-14 03:51:06 +03:00
parent dbe178f792
commit c20ee3e629
23 changed files with 185 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/network/setup/dandelion.rs
+8 -8
View File
@@ -127,7 +127,7 @@ impl DandelionSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.epoch_duration"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -147,7 +147,7 @@ impl DandelionSetup {
if self.epoch_edit.parse::<u16>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -212,7 +212,7 @@ impl DandelionSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.embargo_timer"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -232,7 +232,7 @@ impl DandelionSetup {
if self.embargo_edit.parse::<u16>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -297,7 +297,7 @@ impl DandelionSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.aggregation_period"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -317,7 +317,7 @@ impl DandelionSetup {
if self.aggregation_edit.parse::<u16>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -382,7 +382,7 @@ impl DandelionSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.stem_probability"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -402,7 +402,7 @@ impl DandelionSetup {
if self.stem_prob_edit.parse::<u8>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
src/gui/views/network/setup/node.rs
+7 -9
View File
@@ -245,7 +245,7 @@ impl NodeSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.api_port"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(6.0);
@@ -353,7 +353,7 @@ impl NodeSetup {
_ => t!("network_settings.foreign_api_secret")
};
ui.label(RichText::new(description)
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(6.0);
@@ -376,19 +376,17 @@ impl NodeSetup {
ui.spacing_mut().item_spacing = egui::Vec2::new(12.0, 0.0);
let mut buttons_rect = ui.available_rect_before_wrap();
buttons_rect.set_height(46.0);
buttons_rect.set_height(42.0);
ui.allocate_ui_at_rect(buttons_rect, |ui| {
ui.columns(2, |columns| {
columns[0].with_layout(Layout::right_to_left(Align::Center), |ui| {
let copy_title = format!("{} {}", COPY, t!("copy"));
View::button(ui, copy_title, Colors::WHITE, || {
View::button(ui, COPY.to_string(), Colors::WHITE, || {
cb.copy_string_to_buffer(self.secret_edit.clone());
});
});
columns[1].with_layout(Layout::left_to_right(Align::Center), |ui| {
let paste_title = format!("{} {}", CLIPBOARD_TEXT, t!("paste"));
View::button(ui, paste_title, Colors::WHITE, || {
View::button(ui, CLIPBOARD_TEXT.to_string(), Colors::WHITE, || {
self.secret_edit = cb.get_string_from_buffer();
});
});
@@ -469,7 +467,7 @@ impl NodeSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.ftl"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -489,7 +487,7 @@ impl NodeSetup {
if self.ftl_edit.parse::<u64>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
src/gui/views/network/setup/p2p.rs
+11 -11
View File
@@ -235,7 +235,7 @@ impl P2PSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.p2p_port"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -255,7 +255,7 @@ impl P2PSetup {
if !self.port_available_edit {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.port_unavailable"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
}
@@ -389,7 +389,7 @@ impl P2PSetup {
Self::CUSTOM_SEED_MODAL => t!("network_settings.add_seed"),
&_ => t!("network_settings.add_peer")
};
ui.label(RichText::new(label_text).size(18.0).color(Colors::GRAY));
ui.label(RichText::new(label_text).size(17.0).color(Colors::GRAY));
ui.add_space(8.0);
// Draw peer address text edit.
@@ -577,7 +577,7 @@ impl P2PSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.ban_window"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -597,7 +597,7 @@ impl P2PSetup {
if self.ban_window_edit.parse::<i64>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -663,7 +663,7 @@ impl P2PSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.max_inbound_count"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -683,7 +683,7 @@ impl P2PSetup {
if self.max_inbound_count.parse::<u32>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -749,7 +749,7 @@ impl P2PSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.max_outbound_count"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -769,7 +769,7 @@ impl P2PSetup {
if self.max_outbound_count.parse::<u32>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -840,7 +840,7 @@ impl P2PSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.min_outbound_count"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -860,7 +860,7 @@ impl P2PSetup {
if self.min_outbound_count.parse::<u32>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
src/gui/views/network/setup/pool.rs
+11 -11
View File
@@ -129,7 +129,7 @@ impl PoolSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.pool_fee"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -149,7 +149,7 @@ impl PoolSetup {
if self.fee_base_edit.parse::<u64>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -214,7 +214,7 @@ impl PoolSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.reorg_period"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -233,8 +233,8 @@ impl PoolSetup {
// Show error when specified value is not valid or reminder to restart enabled node.
if self.reorg_period_edit.parse::<u32>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.reorg_period"))
.size(18.0)
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -299,7 +299,7 @@ impl PoolSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.max_tx_pool"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -319,7 +319,7 @@ impl PoolSetup {
if self.pool_size_edit.parse::<usize>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -384,7 +384,7 @@ impl PoolSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.max_tx_stempool"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -404,7 +404,7 @@ impl PoolSetup {
if self.stempool_size_edit.parse::<usize>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
@@ -469,7 +469,7 @@ impl PoolSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.max_tx_weight"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -489,7 +489,7 @@ impl PoolSetup {
if self.max_weight_edit.parse::<u64>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
NetworkSettings::node_restart_required_ui(ui);
src/gui/views/network/setup/stratum.rs
+6 -6
View File
@@ -186,7 +186,7 @@ impl StratumSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.stratum_port"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -206,7 +206,7 @@ impl StratumSetup {
if !self.stratum_port_available_edit {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.port_unavailable"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
server_restart_required_ui(ui);
@@ -284,7 +284,7 @@ impl StratumSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.attempt_time"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -304,7 +304,7 @@ impl StratumSetup {
if self.attempt_time_edit.parse::<u32>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
server_restart_required_ui(ui);
@@ -370,7 +370,7 @@ impl StratumSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network_settings.min_share_diff"))
.size(18.0)
.size(17.0)
.color(Colors::GRAY));
ui.add_space(8.0);
@@ -390,7 +390,7 @@ impl StratumSetup {
if self.min_share_diff_edit.parse::<u64>().is_err() {
ui.add_space(12.0);
ui.label(RichText::new(t!("network_settings.not_valid_value"))
.size(18.0)
.size(17.0)
.color(Colors::RED));
} else {
server_restart_required_ui(ui);