doryan
/
AIT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge stable version #2

Merged
doryan merged 97 commits from experimental into main 2024-08-28 18:54:00 +03:00
Conversation 0 Commits 97 Files Changed 53 +9 -6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bafa837931 - Show all commits

8
src/view/pages/hamming_code.rs
View File

@ -3,7 +3,7 @@ use gtk4 as gtk;
use crate::{ use crate::{
model::builder_traits::Product, model::builder_traits::Product,
view::{ view::{
components::{info_bar::InfoBar, input::Input, wrapper::*}, components::{info_bar::InfoBar, input::Input},
properties::*, properties::*,
}, },
view_utils::{hamming_code_utils::start_hamming_algorithm, input_utils::clearing}, view_utils::{hamming_code_utils::start_hamming_algorithm, input_utils::clearing},
@ -47,13 +47,15 @@ pub fn hamming_code_page(wrapper: &Box) {
let crypt_mode_label = Label::builder().label("Режим: кодирование").build(); let crypt_mode_label = Label::builder().label("Режим: кодирование").build();
let crypt_mode_wrapper = Wrapper::col_builder() let crypt_mode_wrapper = Box::builder()
.orientation(Orientation::Horizontal)
.set_align(Alignment::new(Align::Fill, Align::Center)) .set_align(Alignment::new(Align::Fill, Align::Center))
.hexpand(true) .hexpand(true)
.spacing(10) .spacing(10)
.build(); .build();
let action_components_wrapper = Wrapper::col_builder() let action_components_wrapper = Box::builder()
.orientation(Orientation::Horizontal)
.set_align(Alignment::new(Align::Fill, Align::Fill)) .set_align(Alignment::new(Align::Fill, Align::Fill))
.set_margin(MarginData::MultipleMargin((0, 5, 0, 5))) .set_margin(MarginData::MultipleMargin((0, 5, 0, 5)))
.spacing(10) .spacing(10)

7
src/view/ui.rs
View File

@ -7,7 +7,6 @@ use info_bar::InfoBar;
#[allow(unused)] #[allow(unused)]
use crate::view::{ use crate::view::{
components::{pages::Pages, wrapper::*, *},
pages::*, pages::*,
properties::*, properties::*,
}; };
@ -17,7 +16,8 @@ use super::styles::load_css;
pub fn ui(application: &adw::Application) { pub fn ui(application: &adw::Application) {
load_css(); load_css();
let hamming_code = Wrapper::row_builder() let hamming_code = Box::builder()
.orientation(Orientation::Vertical)
.set_align(Alignment::new(Align::Fill, Align::Fill)) .set_align(Alignment::new(Align::Fill, Align::Fill))
.set_margin(MarginData::EqualsMargin(15)) .set_margin(MarginData::EqualsMargin(15))
.spacing(10) .spacing(10)
@ -30,7 +30,8 @@ pub fn ui(application: &adw::Application) {
hamming_code::hamming_code_page(&hamming_code); hamming_code::hamming_code_page(&hamming_code);
let signal_reducing = Wrapper::row_builder() let signal_reducing = Box::builder()
.orientation(Orientation::Vertical)
.set_align(Alignment::new(Align::Fill, Align::Fill)) .set_align(Alignment::new(Align::Fill, Align::Fill))
.set_margin(MarginData::EqualsMargin(15)) .set_margin(MarginData::EqualsMargin(15))
.spacing(10) .spacing(10)