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

@ -2,3 +2,35 @@ cancel = Cancel·lar
confirm = Confirmar
restart = Reinicia
suspend = Suspèn
confirm-button =
{ $action ->
[restart] { restart }
[suspend] { suspend }
[shutdown] Apaga
[log-out] { log-out }
*[other] { confirm }
}
power = Energia
confirm-body =
{ $action ->
[restart] L'ordinador es reiniciarà
[suspend] L'ordinador se suspendrà
[shutdown] L'ordinador s'apagarà
[lock-screen] La pantalla es bloquejarà
[log-out] La sessió es tancarà
*[other] L'acció seleccionada es durà a terme
} automàticament d'aquí a { $countdown } segons.
lock-screen = Bloqueja la pantalla
shutdown = Apaga
log-out = Tanca la sessió
log-out-shortcut = Súper + Majús + Esc
settings = Configuració...
lock-screen-shortcut = Súper + Esc
confirm-title =
¿{ $action ->
[restart] { restart }
[suspend] { suspend }
[shutdown] { shutdown }
[log-out] Voleu tancar totes les aplicacions i tancar la sessió
*[other] Voleu dur a terme l'acció seleccionada
}?

View file

@ -1,5 +1,5 @@
power = Energie
settings = Einstellungen...
settings = Einstellungen ...
lock-screen = Sperrbildschirm
lock-screen-shortcut = Super + Esc
log-out = Abmelden

View file

@ -0,0 +1,36 @@
power = Enerxía
settings = Axustes...
lock-screen = Pantalla de Bloqueo
lock-screen-shortcut = Super + Esc
log-out = Pechar Sesión
log-out-shortcut = Super + Maiús + Esc
suspend = Suspender
restart = Reiniciar
shutdown = Apagar
confirm = Confirmar
cancel = Cancelar
confirm-button =
{ $action ->
[restart] { restart }
[suspend] { suspend }
[shutdown] Apagar
[log-out] { log-out }
*[other] { confirm }
}
confirm-title =
{ $action ->
[restart] { restart } agora?
[suspend] { suspend } agora?
[shutdown] { shutdown } agora?
[log-out] Pechar todas as aplicacións e pechar a sesión agora?
*[other] Aplicar a acción seleccionada agora
}
confirm-body =
O sistema { $action ->
[restart] reiniciarase
[suspend] suspenderase
[shutdown] apagarase
[lock-screen] bloqueará a pantalla
[log-out] pechará a sesión
*[other] aplicará a acción seleccionada
} automaticamente en { $countdown } segundos.

View file

@ -115,20 +115,27 @@ impl cosmic::Application for Power {
match message {
Message::TogglePopup => {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
return cosmic::surface::surface_task(cosmic::surface::action::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 Power| {
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::OpenSettings => {