github-jwinterm/grim
1
0
Fork 0
mirror of https://github.com/jwinterm/grim.git synced 2026-10-20 07:18:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

ui: fix stratum section at mining screen, optimize copy/paste buttons for tokens, update translations

Browse Source
This commit is contained in:
ardocrat
2023-07-15 21:13:37 +03:00
parent afdcc4dcb9
commit e951fbab73
6 changed files with 116 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/network/mining.rs
+6
View File
@@ -203,6 +203,12 @@ impl NetworkTab for NetworkMining {
StratumSetup::STRATUM_PORT_MODAL => {
self.stratum_server_setup.port_modal(ui, modal, cb);
},
StratumSetup::ATTEMPT_TIME_MODAL => {
self.stratum_server_setup.attempt_modal(ui, modal, cb);
},
StratumSetup::MIN_SHARE_DIFF_MODAL => {
self.stratum_server_setup.min_diff_modal(ui, modal, cb);
},
_ => {}
}
}
src/gui/views/network/setup/node.rs
+48 -37
View File
@@ -15,6 +15,7 @@
use eframe::emath::Align;
use egui::{Id, Layout, RichText, TextStyle, Ui, Widget};
use egui::os::OperatingSystem;
use egui_extras::{Size, StripBuilder};
use grin_core::global::ChainTypes;
use crate::AppConfig;
@@ -357,48 +358,58 @@ impl NodeSetup {
.color(Colors::GRAY));
ui.add_space(6.0);
// Draw API port text edit.
let text_edit_resp = egui::TextEdit::singleline(&mut self.secret_edit)
.id(Id::from(modal.id))
.font(TextStyle::Heading)
.cursor_at_end(true)
.ui(ui);
text_edit_resp.request_focus();
if text_edit_resp.clicked() {
cb.show_keyboard();
}
// Show buttons to copy/paste text for Android.
if OperatingSystem::from_target_os() == OperatingSystem::Android {
ui.add_space(12.0);
ui.scope(|ui| {
// Setup spacing between buttons.
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(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| {
View::button(ui, COPY.to_string(), Colors::WHITE, || {
cb.copy_string_to_buffer(self.secret_edit.clone());
StripBuilder::new(ui)
.size(Size::exact(42.0))
.vertical(|mut strip| {
strip.strip(|builder| {
builder
.size(Size::remainder())
.size(Size::exact(48.0))
.size(Size::exact(48.0))
.horizontal(|mut strip| {
strip.cell(|ui| {
// Draw API port text edit.
let edit = egui::TextEdit::singleline(&mut self.secret_edit)
.id(Id::from(modal.id))
.font(TextStyle::Heading)
.cursor_at_end(true)
.ui(ui);
edit.request_focus();
if edit.clicked() {
cb.show_keyboard();
}
});
strip.cell(|ui| {
ui.vertical_centered(|ui| {
// Draw API port text edit.
let copy_icon = COPY.to_string();
View::button(ui, copy_icon, Colors::WHITE, || {
cb.copy_string_to_buffer(self.secret_edit.clone());
});
});
});
strip.cell(|ui| {
ui.vertical_centered(|ui| {
// Draw paste button.
let paste_icon = CLIPBOARD_TEXT.to_string();
View::button(ui, paste_icon, Colors::WHITE, || {
self.secret_edit = cb.get_string_from_buffer();
});
});
});
});
columns[1].with_layout(Layout::left_to_right(Align::Center), |ui| {
View::button(ui, CLIPBOARD_TEXT.to_string(), Colors::WHITE, || {
self.secret_edit = cb.get_string_from_buffer();
});
});
});
});
})
});
}
// Show reminder to restart enabled node.
NetworkSettings::node_restart_required_ui(ui);
ui.add_space(12.0);
if Node::is_running() {
ui.label(RichText::new(t!("network_settings.restart_node_required"))
.size(16.0)
.color(Colors::GREEN)
);
ui.add_space(8.0);
}
ui.add_space(4.0);
});
// Show modal buttons.
src/gui/views/network/setup/p2p.rs
+2 -3
View File
@@ -386,8 +386,8 @@ impl P2PSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
let label_text = match modal.id {
Self::CUSTOM_SEED_MODAL => t!("network_settings.add_seed"),
&_ => t!("network_settings.add_peer")
Self::CUSTOM_SEED_MODAL => t!("network_settings.seed_address"),
&_ => t!("network_settings.peer_address")
};
ui.label(RichText::new(label_text).size(17.0).color(Colors::GRAY));
ui.add_space(8.0);
@@ -832,7 +832,6 @@ impl P2PSetup {
.size(16.0)
.color(Colors::INACTIVE_TEXT)
);
ui.add_space(2.0);
}
/// Draw minimum number of outbound peers [`Modal`] content.
src/gui/views/network/setup/stratum.rs
+7 -2
View File
@@ -258,7 +258,7 @@ impl StratumSetup {
/// Draw attempt time value setup content.
fn attempt_time_ui(&mut self, ui: &mut Ui, cb: &dyn PlatformCallbacks) {
ui.label(RichText::new(t!("network_settings.attempt_time_desc"))
ui.label(RichText::new(t!("network_settings.attempt_time"))
.size(16.0)
.color(Colors::GRAY)
);
@@ -276,7 +276,12 @@ impl StratumSetup {
Modal::show(time_modal);
cb.show_keyboard();
});
ui.add_space(12.0);
ui.add_space(6.0);
ui.label(RichText::new(t!("network_settings.attempt_time_desc"))
.size(16.0)
.color(Colors::INACTIVE_TEXT)
);
ui.add_space(6.0);
}
/// Draw attempt time [`Modal`] content.