Allow ignoring failures
This commit is contained in:
parent
7adbcaa2d9
commit
c72f917c03
@ -80,5 +80,9 @@
|
||||
"flatpak_transaction_dialog_ok_label": "OK",
|
||||
"flatpak_transaction_dialog_open_log_file_label": "Open Flatpak Log File",
|
||||
"flatpak_transaction_dialog_status_successful": "Flatpak Update Transaction: Successful!",
|
||||
"flatpak_transaction_dialog_status_failed": "Flatpak Update Transaction: Failed!"
|
||||
"flatpak_transaction_dialog_status_failed": "Flatpak Update Transaction: Failed!",
|
||||
"apt_update_dialog_ignore_label": "Ignore APT Updates",
|
||||
"apt_ignored_viewport_page_title": "APT Updates Were Failed & Ignored",
|
||||
"flatpak_update_dialog_ignore_label": "Ignore Flatpak Updates",
|
||||
"flatpak_ignored_viewport_page_title": "Flatpak Updates Were Failed & Ignored"
|
||||
}
|
@ -124,6 +124,13 @@ pub fn apt_update_page(
|
||||
.vexpand(true)
|
||||
.build();
|
||||
|
||||
let packages_ignored_viewport_page = adw::StatusPage::builder()
|
||||
.icon_name("dialog-warning-symbolic")
|
||||
.title(t!("apt_ignored_viewport_page_title"))
|
||||
.hexpand(true)
|
||||
.vexpand(true)
|
||||
.build();
|
||||
|
||||
let viewport_bin = adw::Bin::builder()
|
||||
.child(&packages_no_viewport_page)
|
||||
.build();
|
||||
@ -157,22 +164,45 @@ pub fn apt_update_page(
|
||||
&t!("apt_update_dialog_retry_label").to_string(),
|
||||
);
|
||||
|
||||
apt_update_dialog.add_response(
|
||||
"apt_update_dialog_ignore",
|
||||
&t!("apt_update_dialog_ignore_label").to_string(),
|
||||
);
|
||||
|
||||
apt_update_dialog.set_response_appearance(
|
||||
"apt_update_dialog_retry",
|
||||
adw::ResponseAppearance::Suggested,
|
||||
);
|
||||
|
||||
apt_update_dialog.set_response_enabled("apt_update_dialog_retry", false);
|
||||
apt_update_dialog.set_response_enabled("apt_update_dialog_ignore", false);
|
||||
|
||||
let retry_signal_action0 = retry_signal_action.clone();
|
||||
|
||||
{
|
||||
let viewport_bin = viewport_bin.clone();
|
||||
let flatpak_retry_signal_action = flatpak_retry_signal_action.clone();
|
||||
let flatpak_ran_once = flatpak_ran_once.clone();
|
||||
|
||||
apt_update_dialog
|
||||
.clone()
|
||||
.choose(None::<&gio::Cancellable>, move |choice| {
|
||||
if choice == "apt_update_dialog_retry" {
|
||||
retry_signal_action0.activate(None);
|
||||
match choice.as_str() {
|
||||
"apt_update_dialog_retry" => {
|
||||
retry_signal_action0.activate(None);
|
||||
}
|
||||
"apt_update_dialog_ignore" => {
|
||||
viewport_bin.set_child(Some(&packages_ignored_viewport_page));
|
||||
let mut flatpak_ran_once_borrow = flatpak_ran_once.borrow_mut();
|
||||
if *flatpak_ran_once_borrow != true {
|
||||
flatpak_retry_signal_action.activate(None);
|
||||
*flatpak_ran_once_borrow = true;
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
let bottom_bar = Box::builder().valign(Align::End).build();
|
||||
|
||||
@ -331,6 +361,7 @@ pub fn apt_update_page(
|
||||
apt_update_dialog
|
||||
.set_title(Some(&t!("apt_update_dialog_status_failed").to_string()));
|
||||
apt_update_dialog.set_response_enabled("apt_update_dialog_retry", true);
|
||||
apt_update_dialog.set_response_enabled("apt_update_dialog_ignore", true);
|
||||
}
|
||||
_ => apt_update_dialog.set_body(&state),
|
||||
}
|
||||
|
@ -191,6 +191,13 @@ pub fn flatpak_update_page(
|
||||
.vexpand(true)
|
||||
.build();
|
||||
|
||||
let packages_ignored_viewport_page = adw::StatusPage::builder()
|
||||
.icon_name("dialog-warning-symbolic")
|
||||
.title(t!("flatpak_ignored_viewport_page_title"))
|
||||
.hexpand(true)
|
||||
.vexpand(true)
|
||||
.build();
|
||||
|
||||
let viewport_bin = adw::Bin::builder()
|
||||
.child(&packages_no_viewport_page)
|
||||
.build();
|
||||
@ -229,17 +236,33 @@ pub fn flatpak_update_page(
|
||||
adw::ResponseAppearance::Suggested,
|
||||
);
|
||||
|
||||
flatpak_update_dialog.add_response(
|
||||
"flatpak_update_dialog_ignore",
|
||||
&t!("flatpak_update_dialog_ignore_label").to_string(),
|
||||
);
|
||||
|
||||
flatpak_update_dialog.set_response_enabled("flatpak_update_dialog_retry", false);
|
||||
flatpak_update_dialog.set_response_enabled("flatpak_update_dialog_ignore", false);
|
||||
|
||||
let retry_signal_action0 = retry_signal_action.clone();
|
||||
|
||||
flatpak_update_dialog
|
||||
.clone()
|
||||
.choose(None::<&gio::Cancellable>, move |choice| {
|
||||
if choice == "flatpak_update_dialog_retry" {
|
||||
retry_signal_action0.activate(None);
|
||||
}
|
||||
});
|
||||
{
|
||||
let viewport_bin = viewport_bin.clone();
|
||||
|
||||
flatpak_update_dialog
|
||||
.clone()
|
||||
.choose(None::<&gio::Cancellable>, move |choice| {
|
||||
match choice.as_str() {
|
||||
"flatpak_update_dialog_retry" => {
|
||||
retry_signal_action0.activate(None);
|
||||
}
|
||||
"flatpak_update_dialog_ignore" => {
|
||||
viewport_bin.set_child(Some(&packages_ignored_viewport_page));
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
let bottom_bar = Box::builder().valign(Align::End).build();
|
||||
|
||||
@ -707,6 +730,7 @@ pub fn flatpak_update_page(
|
||||
));
|
||||
flatpak_update_dialog
|
||||
.set_response_enabled("flatpak_update_dialog_retry", true);
|
||||
flatpak_update_dialog.set_response_enabled("flatpak_update_dialog_ignore", true);
|
||||
}
|
||||
_ => flatpak_update_dialog.set_body(&state),
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user