Merge remote-tracking branch 'upstream/master' into yoda-dock-magnification

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	cosmic-app-list/src/app.rs
#	cosmic-applet-audio/src/lib.rs
#	cosmic-applet-input-sources/Cargo.toml
#	cosmic-applet-input-sources/src/lib.rs
#	cosmic-applet-status-area/src/components/app.rs
#	cosmic-panel-button/src/lib.rs
This commit is contained in:
Lionel DARNIS 2026-08-19 22:04:42 +02:00
commit 673547dc52
119 changed files with 2247 additions and 1190 deletions

View file

@ -15,5 +15,5 @@ show-more = { $more } weitere anzeigen
clear-group = Gruppe leeren
clear-all = Alle Benachrichtigungen leeren
do-not-disturb = Nicht stören
notification-settings = Benachrichtigungseinstellungen...
notification-settings = Benachrichtigungseinstellungen ...
no-notifications = Keine Benachrichtigungen

View file

@ -0,0 +1,19 @@
hours-ago =
{ $duration ->
[0] Xusto agora
[one] Hai 1 hora
*[other] Hai { $duration } horas
}
minutes-ago =
{ $duration ->
[0] Xusto agora
[one] Hai 1 minuto
*[other] Hai { $duration } minutos
}
show-less = Mostrar menos
show-more = Mostrar { $more } máis
clear-group = Limpar grupo
clear-all = Limpar todas as notificacións
do-not-disturb = Non Molestar
notification-settings = Configuración das notificacións...
no-notifications = Sen notificacións

View file

@ -157,18 +157,23 @@ impl cosmic::Application for Notifications {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
} else {
let new_id = window::Id::unique();
self.popup.replace(new_id);
return cosmic::surface::surface_task(cosmic::surface::action::app_popup(
|_| Default::default(),
|app: &mut Self| {
let new_id = window::Id::unique();
app.popup.replace(new_id);
let popup_settings = self.core.applet.get_popup_settings(
self.core.main_window_id().unwrap(),
new_id,
let popup_settings = app.core.applet.get_popup_settings(
app.core.main_window_id().unwrap(),
new_id,
None,
None,
None,
);
popup_settings
},
None,
None,
None,
);
return get_popup(popup_settings);
));
}
}
Message::DoNotDisturb(b) => {