From fcc2567aa26f4dc06f0658f973cc8dbfb2f05ca7 Mon Sep 17 00:00:00 2001 From: doryan Date: Sun, 18 Aug 2024 10:28:58 -0700 Subject: [PATCH] feat(imports): update imports --- .../view_utils/hamming_code_utils.rs | 2 -- src/controller/view_utils/input_utils.rs | 2 -- .../view_utils/signal_reduce_utils.rs | 1 - src/main.rs | 2 +- src/model/mod.rs | 6 ++---- src/model/models.rs | 2 -- src/view/components/dialogues.rs | 9 ++++----- src/view/components/info_bar.rs | 18 +++++++++--------- src/view/components/input.rs | 2 -- src/view/components/menu.rs | 2 -- src/view/components/tabs.rs | 2 -- src/view/pages/hamming_code.rs | 2 -- src/view/pages/signal_reducing.rs | 2 -- src/view/properties.rs | 2 -- 14 files changed, 16 insertions(+), 38 deletions(-) diff --git a/src/controller/view_utils/hamming_code_utils.rs b/src/controller/view_utils/hamming_code_utils.rs index 49fffc7..9555219 100644 --- a/src/controller/view_utils/hamming_code_utils.rs +++ b/src/controller/view_utils/hamming_code_utils.rs @@ -1,5 +1,3 @@ -use gtk4 as gtk; - use crate::{ model::{models::*, Result}, model_utils::hamming_code_seven_four::*, diff --git a/src/controller/view_utils/input_utils.rs b/src/controller/view_utils/input_utils.rs index 1e4eb5e..d90a237 100644 --- a/src/controller/view_utils/input_utils.rs +++ b/src/controller/view_utils/input_utils.rs @@ -1,5 +1,3 @@ -use gtk4 as gtk; - use bitvec::{order::Lsb0, view::AsBits}; use gtk::{prelude::*, *}; use std::ops::Deref; diff --git a/src/controller/view_utils/signal_reduce_utils.rs b/src/controller/view_utils/signal_reduce_utils.rs index 3537377..2903faa 100644 --- a/src/controller/view_utils/signal_reduce_utils.rs +++ b/src/controller/view_utils/signal_reduce_utils.rs @@ -1,5 +1,4 @@ use gio::glib::Object; -use gtk4 as gtk; use std::str::FromStr; diff --git a/src/main.rs b/src/main.rs index 6dc479d..73359d5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use gtk4 as gtk; +#![windows_subsystem = "windows"] extern crate gio; diff --git a/src/model/mod.rs b/src/model/mod.rs index 825575e..9ce6322 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -1,14 +1,12 @@ pub mod builder_traits; pub mod models; -use crate::gtk::glib; - -use glib::Object; +use gtk::glib::{Object, wrapper}; pub type Result = core::result::Result; pub type Error = std::boxed::Box; -glib::wrapper! { +wrapper! { pub struct Frequency(ObjectSubclass); } diff --git a/src/model/models.rs b/src/model/models.rs index e09d0eb..50bbae0 100644 --- a/src/model/models.rs +++ b/src/model/models.rs @@ -1,7 +1,5 @@ use std::cell::Cell; -use crate::gtk; - use gtk::{ glib::{self, Properties}, prelude::*, diff --git a/src/view/components/dialogues.rs b/src/view/components/dialogues.rs index fabeb72..a326bec 100644 --- a/src/view/components/dialogues.rs +++ b/src/view/components/dialogues.rs @@ -1,10 +1,9 @@ use adw::HeaderBar; use gio::{glib::Variant, SimpleAction}; -use gtk4 as gtk; use gtk::{ prelude::{BoxExt, GtkWindowExt}, - AboutDialog, Box, Image, Label, Orientation, ScrolledWindow, Window, + AboutDialog, Box, Image, Label, Orientation, ScrolledWindow, Window, License, NaturalWrapMode, PolicyType }; use std::path::Path; @@ -24,7 +23,7 @@ pub fn open_about_dialogue(_action: &SimpleAction, _var: Option<&Variant>) { .authors(vec!["Сагиев А.Д.", "Ефимов И.П."]) .version("1.0-beta") .program_name("Прикладная теория информаций") - .license_type(gtk4::License::Apache20) + .license_type(License::Apache20) .logo(&logo) .website("https://gitea.doryan04.ru/doryan/AIT") .build() @@ -44,7 +43,7 @@ pub fn open_help_dialogue(_action: &SimpleAction, _var: Option<&Variant>) { .width_request(400) .max_width_chars(50) .single_line_mode(false) - .natural_wrap_mode(gtk4::NaturalWrapMode::Word) + .natural_wrap_mode(NaturalWrapMode::Word) .label(crate::view::resources::HELP) .build(); @@ -52,7 +51,7 @@ pub fn open_help_dialogue(_action: &SimpleAction, _var: Option<&Variant>) { let scrollable = ScrolledWindow::builder() .child(&help) - .hscrollbar_policy(gtk4::PolicyType::Never) + .hscrollbar_policy(PolicyType::Never) .build(); let custom_header = HeaderBar::new(); diff --git a/src/view/components/info_bar.rs b/src/view/components/info_bar.rs index 0e62811..ea24eb4 100644 --- a/src/view/components/info_bar.rs +++ b/src/view/components/info_bar.rs @@ -1,11 +1,11 @@ -use gtk4 as gtk; +use gio::glib::clone; use std::{collections::VecDeque, sync::LazyLock}; use gtk::{ builders::{BoxBuilder, ButtonBuilder, LabelBuilder}, prelude::{BoxExt, ButtonExt, ObjectExt, WidgetExt}, - Box, Button, Label, Revealer, RevealerTransitionType, + Box, Button, Label, Revealer, RevealerTransitionType }; use crate::model::builder_traits::Product; @@ -94,20 +94,20 @@ impl InfoBarBuilder { info_bar_box.append(&info_bar_label); info_bar_box.append(&info_bar_close_btn); - info_bar_box.set_widget_name("info_bar"); let info_bar: &Revealer = &INFO_BAR_INSTANCE.instance; info_bar.set_transition_type(RevealerTransitionType::SlideUp); info_bar.set_transition_duration(200); - info_bar.set_child(Some(&info_bar_box)); + info_bar.set_widget_name("infobar"); + info_bar.set_css_classes(&[".warning"]); - let info_bar_to_close = info_bar.clone(); - - info_bar_close_btn.connect_clicked(move |_| { - info_bar_to_close.set_reveal_child(false); - }); + info_bar_close_btn.connect_clicked(clone!( + #[strong] + info_bar, + move |_| info_bar.set_reveal_child(false) + )); &INFO_BAR_INSTANCE } diff --git a/src/view/components/input.rs b/src/view/components/input.rs index 81ee91c..0a6fad2 100644 --- a/src/view/components/input.rs +++ b/src/view/components/input.rs @@ -1,5 +1,3 @@ -use gtk4 as gtk; - use crate::{model::builder_traits::*, view::properties::*}; use gtk::{prelude::*, *}; diff --git a/src/view/components/menu.rs b/src/view/components/menu.rs index 1e7d878..d4bc197 100644 --- a/src/view/components/menu.rs +++ b/src/view/components/menu.rs @@ -1,7 +1,5 @@ use std::fmt::{Debug, Display}; -use gtk4 as gtk; - use gio::{ glib::Variant, prelude::ActionMapExtManual, ActionEntry, Menu, SimpleAction, SimpleActionGroup, }; diff --git a/src/view/components/tabs.rs b/src/view/components/tabs.rs index c133c0c..6377427 100644 --- a/src/view/components/tabs.rs +++ b/src/view/components/tabs.rs @@ -1,5 +1,3 @@ -use gtk4 as gtk; - use super::builder_traits::*; use gtk::{Box, Label, Notebook}; diff --git a/src/view/pages/hamming_code.rs b/src/view/pages/hamming_code.rs index 49644e8..2550967 100644 --- a/src/view/pages/hamming_code.rs +++ b/src/view/pages/hamming_code.rs @@ -1,5 +1,3 @@ -use gtk4 as gtk; - use crate::{ model::builder_traits::Product, view::{ diff --git a/src/view/pages/signal_reducing.rs b/src/view/pages/signal_reducing.rs index 12bcad9..2118025 100644 --- a/src/view/pages/signal_reducing.rs +++ b/src/view/pages/signal_reducing.rs @@ -19,8 +19,6 @@ use gtk::{ Align, *, }; -use gtk4 as gtk; - pub fn signal_reducing_page(wrapper: &Box) { let values = Rc::new(Cell::new(SignalReduce::default())); diff --git a/src/view/properties.rs b/src/view/properties.rs index e49c15e..6aadc3a 100644 --- a/src/view/properties.rs +++ b/src/view/properties.rs @@ -1,5 +1,3 @@ -use gtk4 as gtk; - use gtk::builders::*; use gtk::Align;