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

ui: move connections add button from panel, wallet settings titles lines color

Browse Source
This commit is contained in:
ardocrat
2024-05-05 16:01:29 +03:00
parent 1783f2c3f7
commit cf541ee8ed
5 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/wallets/setup/common.rs
+3 -3
View File
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use egui::{Align, Id, Layout, RichText, TextStyle, Widget};
use egui::{Id, RichText, Widget};
use crate::gui::Colors;
use crate::gui::icons::{CLOCK_COUNTDOWN, EYE, EYE_SLASH, PASSWORD, PENCIL};
use crate::gui::icons::{CLOCK_COUNTDOWN, PASSWORD, PENCIL};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{Modal, View};
use crate::gui::views::types::{ModalPosition, TextEditOptions};
@@ -131,7 +131,7 @@ impl CommonSetup {
});
ui.add_space(12.0);
View::horizontal_line(ui, Colors::ITEM_STROKE);
View::horizontal_line(ui, Colors::STROKE);
ui.add_space(4.0);
});
}
src/gui/views/wallets/setup/connection.rs
+17 -14
View File
@@ -149,28 +149,28 @@ impl ConnectionSetup {
ui.add_space(2.0);
View::sub_title(ui, format!("{} {}", GLOBE, t!("wallets.conn_method")));
View::horizontal_line(ui, Colors::ITEM_STROKE);
ui.add_space(4.0);
View::horizontal_line(ui, Colors::STROKE);
ui.add_space(6.0);
ui.vertical_centered(|ui| {
// Show integrated node selection.
ui.add_space(6.0);
self.integrated_node_item_ui(ui);
// Show external connections.
ui.add_space(8.0);
ui.label(RichText::new(t!("wallets.ext_conn")).size(16.0).color(Colors::GRAY));
ui.add_space(6.0);
// Show button to add new external node connection.
let add_node_text = format!("{} {}", PLUS_CIRCLE, t!("wallets.add_node"));
View::button(ui, add_node_text, Colors::WHITE, || {
self.show_add_ext_conn_modal(cb);
});
ui.add_space(12.0);
let ext_conn_list = ConnectionsConfig::ext_conn_list();
if !ext_conn_list.is_empty() {
ui.add_space(6.0);
ui.label(RichText::new(t!("wallets.ext_conn")).size(16.0).color(Colors::GRAY));
ui.add_space(6.0);
// Show button to add new external node connection.
let add_node_text = format!("{} {}", PLUS_CIRCLE, t!("wallets.add_node"));
View::button(ui, add_node_text, Colors::WHITE, || {
self.show_add_ext_conn_modal(cb);
});
ui.add_space(12.0);
// Show external connections.
for (index, conn) in ext_conn_list.iter().enumerate() {
ui.horizontal_wrapped(|ui| {
// Draw connection list item.
@@ -179,6 +179,9 @@ impl ConnectionSetup {
}
}
});
ui.add_space(10.0);
View::horizontal_line(ui, Colors::STROKE);
}
/// Draw integrated node connection item content.
src/gui/views/wallets/setup/recovery.rs
+1 -3
View File
@@ -59,11 +59,9 @@ impl RecoverySetup {
// Show modal content for this ui container.
self.modal_content_ui(ui, wallet, cb);
ui.add_space(10.0);
View::horizontal_line(ui, Colors::ITEM_STROKE);
ui.add_space(6.0);
View::sub_title(ui, format!("{} {}", WRENCH, t!("wallets.recovery")));
View::horizontal_line(ui, Colors::ITEM_STROKE);
View::horizontal_line(ui, Colors::STROKE);
ui.add_space(4.0);
ui.vertical_centered(|ui| {