Consolidate desktop controls with editable holidays and a running-window tray
This commit is contained in:
1 parent
9908dde9f8
commit
326465952a
55 files changed
+4207
-450
No files matched your search
@@ -556,9 +556,11 @@ impl FereseShell {
|
||||
let rows = match &modal.content {
|
||||
Content::Power(action) => {
|
||||
let mut rows = column![
|
||||
self.render.text(action.title()).size(17),
|
||||
self.render
|
||||
.text(action.description())
|
||||
.text(ferese_config::locale::text(action.title()))
|
||||
.size(17),
|
||||
self.render
|
||||
.text(ferese_config::locale::text(action.description()))
|
||||
.size(13)
|
||||
.class(theme::Text::Color(palette.muted)),
|
||||
]
|
||||
@@ -588,9 +590,12 @@ impl FereseShell {
|
||||
.as_ref()
|
||||
.is_some_and(|approval| approval.force())
|
||||
{
|
||||
format!("{} anyway", action.label())
|
||||
ferese_config::locale::format(
|
||||
"{action} anyway",
|
||||
&[("action", ferese_config::locale::translate(action.label()))],
|
||||
)
|
||||
} else {
|
||||
action.label().to_owned()
|
||||
ferese_config::locale::translate(action.label())
|
||||
};
|
||||
if let Some(error) = &modal.error {
|
||||
rows = rows.push(self.render.text(error).size(13));
|
||||
@@ -600,7 +605,7 @@ impl FereseShell {
|
||||
row![
|
||||
Space::new().width(Length::Fill),
|
||||
ferese_theme::controls::text_button(
|
||||
"Cancel",
|
||||
ferese_config::tr!("Cancel"),
|
||||
self.render.font,
|
||||
palette,
|
||||
false
|
||||
|
||||
Reference in new issue
Block a user