Skip to content

Add confirmation to suspend #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add confirmation to suspend #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions i18n/en/cosmic_greeter.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@ shutdown-timeout = The system will shut down automatically in
*[other] {$seconds} seconds.
}
suspend = Suspend
suspend-now = Suspend now?
suspend-timeout = The system will suspend automatically in
{ $seconds ->
[1] 1 second.
*[other] {$seconds} seconds.
}
user = User
6 changes: 6 additions & 0 deletions i18n/es/cosmic_greeter.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@ shutdown-timeout = El ordenador se apagará automáticamente en
*[other] {$seconds} segundos.
}
suspend = Suspender
suspend-now = ¿Suspender ahora?
suspend-timeout = El ordenador se suspenderá automáticamente en
{ $seconds ->
[1] 1 segundo.
*[other] {$seconds} segundos.
}
user = Usuario
54 changes: 39 additions & 15 deletions src/greeter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ pub struct ActiveLayout {

#[derive(Clone, Copy, Debug)]
pub enum DialogPage {
Suspend(Instant),
Restart(Instant),
Shutdown(Instant),
}
Expand Down Expand Up @@ -773,6 +774,25 @@ impl App {

let popover = widget::popover(menu).modal(true);
match self.dialog_page_opt {
Some(DialogPage::Suspend(instant)) => {
let remaining = DialogPage::remaining(instant).unwrap_or_default();
popover
.popup(
widget::dialog()
.title(fl!("suspend-now"))
.icon(widget::icon::from_name("system-suspend-symbolic").size(64))
.body(fl!("suspend-timeout", seconds = remaining.as_secs()))
.primary_action(
widget::button::suggested(fl!("suspend"))
.on_press(Message::DialogConfirm),
)
.secondary_action(
widget::button::standard(fl!("cancel"))
.on_press(Message::DialogCancel),
),
)
.into()
}
Some(DialogPage::Restart(instant)) => {
let remaining = DialogPage::remaining(instant).unwrap_or_default();
popover
Expand Down Expand Up @@ -1366,6 +1386,18 @@ impl cosmic::Application for App {
}
}
Message::DialogConfirm => match self.dialog_page_opt.take() {
Some(DialogPage::Suspend(_)) => {
#[cfg(feature = "logind")]
return cosmic::task::future::<(), ()>(async move {
match crate::logind::suspend().await {
Ok(()) => (),
Err(err) => {
log::error!("failed to suspend: {:?}", err);
}
}
})
.discard();
}
Some(DialogPage::Restart(_)) => {
#[cfg(feature = "logind")]
return cosmic::task::future::<(), ()>(async move {
Expand Down Expand Up @@ -1408,22 +1440,12 @@ impl cosmic::Application for App {
self.dropdown_opt = None
}
}
Message::Suspend => {
#[cfg(feature = "logind")]
return cosmic::task::future::<(), ()>(async move {
match crate::logind::suspend().await {
Ok(()) => (),
Err(err) => {
log::error!("failed to suspend: {:?}", err);
}
}
})
.discard();
}
Message::Restart | Message::Shutdown => {
Message::Suspend | Message::Restart | Message::Shutdown => {
let instant = Instant::now();

self.dialog_page_opt = Some(if matches!(message, Message::Restart) {
self.dialog_page_opt = Some(if matches!(message, Message::Suspend) {
DialogPage::Suspend(instant)
} else if matches!(message, Message::Restart) {
DialogPage::Restart(instant)
} else {
DialogPage::Shutdown(instant)
Expand Down Expand Up @@ -1452,7 +1474,9 @@ impl cosmic::Application for App {
}
}
Message::Heartbeat => match self.dialog_page_opt {
Some(DialogPage::Restart(instant)) | Some(DialogPage::Shutdown(instant)) => {
Some(DialogPage::Suspend(instant))
| Some(DialogPage::Restart(instant))
| Some(DialogPage::Shutdown(instant)) => {
if DialogPage::remaining(instant).is_none() {
return self.update(Message::DialogConfirm);
}
Expand Down