custom-gui-packages/pika-installer-gtk4
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

it's getting better

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-08-20 08:47:20 +03:00
parent fcbd9d246f
commit a1ec14ed42
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/manual_partitioning_page/func.rs
View File

@ -740,6 +740,10 @@ pub fn create_mount_row(
row.set_langaction(language_changed_action); row.set_langaction(language_changed_action);
row.set_id(*extra_mount_id_refcell.borrow());
(*extra_mount_id_refcell.borrow_mut()) += 1;
let null_checkbutton = gtk::CheckButton::builder().build(); let null_checkbutton = gtk::CheckButton::builder().build();

10
src/manual_partitioning_page/mod.rs
View File

@ -32,7 +32,7 @@ pub fn manual_partitioning_page(
let partition_array_refcell = Rc::new(RefCell::new(get_partitions())); let partition_array_refcell = Rc::new(RefCell::new(get_partitions()));
let used_partition_array_refcell: Rc<RefCell<Vec<FstabEntry>>> = Rc::new(RefCell::default()); let used_partition_array_refcell: Rc<RefCell<Vec<FstabEntry>>> = Rc::new(RefCell::default());
let subvol_partition_array_refcell: Rc<RefCell<Vec<String>>> = Rc::new(RefCell::default()); let subvol_partition_array_refcell: Rc<RefCell<Vec<String>>> = Rc::new(RefCell::default());
//let subvol_partition_array_refcell: Rc<RefCell<Vec<String>>> = Rc::new(RefCell::default()); let extra_mount_id_refcell: Rc<RefCell<i32>> = Rc::new(RefCell::default());
// //
@ -73,6 +73,7 @@ pub fn manual_partitioning_page(
&language_changed_action, &language_changed_action,
&used_partition_array_refcell, &used_partition_array_refcell,
&subvol_partition_array_refcell, &subvol_partition_array_refcell,
&extra_mount_id_refcell
); );
let open_disk_utility_button = gtk::Button::builder() let open_disk_utility_button = gtk::Button::builder()
@ -154,6 +155,8 @@ pub fn manual_partitioning_page(
partition_method_manual_luks_enabled_refcell, partition_method_manual_luks_enabled_refcell,
#[strong] #[strong]
partition_method_manual_crypttab_entry_array_refcell, partition_method_manual_crypttab_entry_array_refcell,
#[strong]
extra_mount_id_refcell,
move |_| { move |_| {
while let Some(row) = drive_mounts_adw_listbox.last_child() { while let Some(row) = drive_mounts_adw_listbox.last_child() {
drive_mounts_adw_listbox.remove(&row); drive_mounts_adw_listbox.remove(&row);
@ -172,6 +175,7 @@ pub fn manual_partitioning_page(
&language_changed_action, &language_changed_action,
&used_partition_array_refcell, &used_partition_array_refcell,
&subvol_partition_array_refcell, &subvol_partition_array_refcell,
&extra_mount_id_refcell
); );
} }
)); ));
@ -414,6 +418,7 @@ fn create_hardcoded_rows(
language_changed_action: &gio::SimpleAction, language_changed_action: &gio::SimpleAction,
used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>, used_partition_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>,
subvol_partition_array_refcell: &Rc<RefCell<Vec<String>>>, subvol_partition_array_refcell: &Rc<RefCell<Vec<String>>>,
extra_mount_id_refcell: &Rc<RefCell<i32>>,
) { ) {
let drive_mount_add_button_icon = gtk::Image::builder() let drive_mount_add_button_icon = gtk::Image::builder()
.icon_name("list-add") .icon_name("list-add")
@ -482,6 +487,8 @@ fn create_hardcoded_rows(
used_partition_array_refcell, used_partition_array_refcell,
#[strong] #[strong]
subvol_partition_array_refcell, subvol_partition_array_refcell,
#[strong]
extra_mount_id_refcell,
move |_| { move |_| {
func::create_mount_row( func::create_mount_row(
&drive_mounts_adw_listbox, &drive_mounts_adw_listbox,
@ -491,6 +498,7 @@ fn create_hardcoded_rows(
&language_changed_action, &language_changed_action,
&used_partition_array_refcell, &used_partition_array_refcell,
&subvol_partition_array_refcell, &subvol_partition_array_refcell,
&extra_mount_id_refcell
); );
} }
)); ));