From cb2a52cc7b42e133fbffb9bf6b2453269735e9d8 Mon Sep 17 00:00:00 2001 From: doryan Date: Sat, 27 Jul 2024 22:20:21 +0400 Subject: [PATCH] refactor: remove redundant argument; feat(infobar): add infobar for testing --- src/view/pages/signal_reducing.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/view/pages/signal_reducing.rs b/src/view/pages/signal_reducing.rs index f11215b..ab00a2b 100644 --- a/src/view/pages/signal_reducing.rs +++ b/src/view/pages/signal_reducing.rs @@ -6,14 +6,17 @@ use std::{str::FromStr, time::Duration}; use crate::{ event_handlers::button_event_handlers::BtnEventHandler, model::{builder_traits::Product, models::*}, - view::{components::input::Input, properties::*}, + view::{ + components::{info_bar::InfoBar, input::Input}, + properties::*, + }, }; use gtk::{ prelude::{BoxExt, GridExt, TextBufferExt, TextViewExt}, Align, WrapMode, *, }; -pub fn signal_reducing_page(wrapper: &Box, info_bar: Revealer) { +pub fn signal_reducing_page(wrapper: &Box) { let (input_height, monospace, input_alignment, input_wrapping): (i32, bool, Align, WrapMode) = (24, true, Align::Fill, WrapMode::Word); @@ -66,7 +69,7 @@ pub fn signal_reducing_page(wrapper: &Box, info_bar: Revealer) { let calculate_button = Button::builder().label("Расчитать").build(); // TODO: Make asynchronious auto-hide info bar. - let test = info_bar.clone(); + let test = InfoBar::get_instance(); // let (tx, rx) = std::sync::mpsc::channel::(); @@ -88,8 +91,8 @@ pub fn signal_reducing_page(wrapper: &Box, info_bar: Revealer) { if let Ok(value) = try_extract_value { values[i] = value; } else { + test.set_text_label(Some("Вы ввели некорректное значение поля.")); test.set_reveal_child(true); - // TODO: Make asynchronious auto-hide info bar. // let transmitter = tx.clone(); //