gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

More tweaks to notifications

Browse Source
This commit is contained in:
Luke D. Jones
2023-04-26 12:49:29 +12:00
parent da3017bb89
commit fdc7d88a70
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rog-control-center/src/update_and_notify.rs
View File

@@ -440,7 +440,7 @@ pub fn start_notifications(
&mode, &mode,
) )
} }
_ => do_gfx_action_notif(<&str>::from(action), *action), _ => do_gfx_action_notif(<&str>::from(action), *action, mode),
} }
.map_err(|e| { .map_err(|e| {
error!("zbus signal: do_gfx_action_notif: {e}"); error!("zbus signal: do_gfx_action_notif: {e}");
@@ -540,9 +540,13 @@ fn do_gpu_status_notif(message: &str, data: &GfxPower) -> Result<NotificationHan
Ok(Notification::show(&notif)?) Ok(Notification::show(&notif)?)
} }
fn do_gfx_action_notif(message: &str, data: GfxUserAction) -> Result<()> { fn do_gfx_action_notif(message: &str, action: GfxUserAction, mode: GpuMode) -> Result<()> {
let mut notif = Notification::new(); if matches!(action, GfxUserAction::Reboot) {
do_mux_notification("Graphics mode change requires reboot", &mode).ok();
return Ok(());
}
let mut notif = Notification::new();
notif notif
.summary(NOTIF_HEADER) .summary(NOTIF_HEADER)
.body(message) .body(message)
@@ -552,11 +556,11 @@ fn do_gfx_action_notif(message: &str, data: GfxUserAction) -> Result<()> {
.urgency(Urgency::Critical) .urgency(Urgency::Critical)
.timeout(3000) .timeout(3000)
.icon("dialog-warning") .icon("dialog-warning")
.hint(Hint::Transient(true)) .hint(Hint::Transient(true));
.action("gfx-mode-session-action", "Logout");
let handle = notif.show()?;
if matches!(data, GfxUserAction::Logout) { if matches!(action, GfxUserAction::Logout) {
notif.action("gfx-mode-session-action", "Logout");
let handle = notif.show()?;
if let Ok(desktop) = std::env::var("XDG_CURRENT_DESKTOP") { if let Ok(desktop) = std::env::var("XDG_CURRENT_DESKTOP") {
if desktop.to_lowercase() == "gnome" { if desktop.to_lowercase() == "gnome" {
handle.wait_for_action(|id| { handle.wait_for_action(|id| {
@@ -581,6 +585,8 @@ fn do_gfx_action_notif(message: &str, data: GfxUserAction) -> Result<()> {
// todo: handle alternatives // todo: handle alternatives
} }
} }
} else {
notif.show()?;
} }
Ok(()) Ok(())
} }
@@ -588,10 +594,11 @@ fn do_gfx_action_notif(message: &str, data: GfxUserAction) -> Result<()> {
/// Actual `GpuMode` unused as data is never correct until switched by reboot /// Actual `GpuMode` unused as data is never correct until switched by reboot
fn do_mux_notification(message: &str, m: &GpuMode) -> Result<()> { fn do_mux_notification(message: &str, m: &GpuMode) -> Result<()> {
let mut notif = base_notification(message, &m.to_string()); let mut notif = base_notification(message, &m.to_string());
notif.action("gfx-mode-session-action", "Reboot"); notif
notif.urgency(Urgency::Critical); .action("gfx-mode-session-action", "Reboot")
notif.icon("system-reboot-symbolic"); .urgency(Urgency::Critical)
notif.hint(Hint::Transient(true)); .icon("system-reboot-symbolic")
.hint(Hint::Transient(true));
let handle = notif.show()?; let handle = notif.show()?;
std::thread::spawn(|| { std::thread::spawn(|| {