diff --git a/cosmic-settings/src/pages/applications/startup_apps.rs b/cosmic-settings/src/pages/applications/startup_apps.rs index ee3efe1..6c65e2e 100644 --- a/cosmic-settings/src/pages/applications/startup_apps.rs +++ b/cosmic-settings/src/pages/applications/startup_apps.rs @@ -113,7 +113,7 @@ impl page::Page for Page { fn context_drawer(&self) -> Option> { match &self.context { Some(Context::AddApplication(directory_type)) => { - let search = widget::search_input(fl!("type-to-search"), &self.application_search) + let search = widget::search_input("", &self.application_search) .on_input(|i| Message::ApplicationSearch(i).into()) .on_clear(Message::ApplicationSearch(String::new()).into()) .apply(Element::from); diff --git a/cosmic-settings/src/pages/desktop/appearance/font_config.rs b/cosmic-settings/src/pages/desktop/appearance/font_config.rs index 76fca5a..d3651b4 100644 --- a/cosmic-settings/src/pages/desktop/appearance/font_config.rs +++ b/cosmic-settings/src/pages/desktop/appearance/font_config.rs @@ -163,7 +163,7 @@ impl Model { } pub fn search_input(&self) -> Element<'_, crate::pages::Message> { - widget::search_input(fl!("type-to-search"), &self.font_search) + widget::search_input("", &self.font_search) .on_input(|input| Message::DrawerFont(drawer::FontMessage::Search(input))) .on_clear(Message::DrawerFont(drawer::FontMessage::Search( String::new(), diff --git a/cosmic-settings/src/pages/desktop/appearance/mod.rs b/cosmic-settings/src/pages/desktop/appearance/mod.rs index b3f84cd..23577e7 100644 --- a/cosmic-settings/src/pages/desktop/appearance/mod.rs +++ b/cosmic-settings/src/pages/desktop/appearance/mod.rs @@ -598,17 +598,18 @@ impl Page { }); if let Some(dock_config_helper) = dock_config_helper.as_ref() - && let Some(dock_config) = dock_config.as_mut() { - let padding = match roundness { - Roundness::Round => 4, - Roundness::SlightlyRound => 4, - Roundness::Square => 0, - }; + && let Some(dock_config) = dock_config.as_mut() + { + let padding = match roundness { + Roundness::Round => 4, + Roundness::SlightlyRound => 4, + Roundness::Square => 0, + }; - if let Err(why) = dock_config.set_padding(dock_config_helper, padding) { - tracing::error!(?why, "Error updating dock padding"); - } + if let Err(why) = dock_config.set_padding(dock_config_helper, padding) { + tracing::error!(?why, "Error updating dock padding"); } + } } // TODO: cache panel and dock configs so that they needn't be re-read diff --git a/cosmic-settings/src/pages/display/mod.rs b/cosmic-settings/src/pages/display/mod.rs index c648077..7097646 100644 --- a/cosmic-settings/src/pages/display/mod.rs +++ b/cosmic-settings/src/pages/display/mod.rs @@ -556,13 +556,14 @@ impl Page { } if let Some(v) = self.mirror_map.get(k) - && v.equivalent(&self.active_display) { - if let Some(output) = self.list.outputs.get(k) { - return self.exec_randr(output, Randr::Toggle(true)); - } else { - return Task::none(); - } + && v.equivalent(&self.active_display) + { + if let Some(output) = self.list.outputs.get(k) { + return self.exec_randr(output, Randr::Toggle(true)); + } else { + return Task::none(); } + } } return Task::none(); diff --git a/cosmic-settings/src/pages/input/keyboard/mod.rs b/cosmic-settings/src/pages/input/keyboard/mod.rs index 8d34aea..c741a16 100644 --- a/cosmic-settings/src/pages/input/keyboard/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/mod.rs @@ -281,7 +281,7 @@ impl page::Page for Page { fn context_drawer(&self) -> Option> { self.context.as_ref().map(|context| match context { Context::ShowInputSourcesContext => { - let search = widget::search_input(fl!("type-to-search"), &self.input_source_search) + let search = widget::search_input("", &self.input_source_search) .on_input(Message::InputSourceSearch) .on_clear(Message::InputSourceSearch(String::new())) .apply(Element::from) diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs index b047d79..ff5cf3f 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs @@ -433,7 +433,7 @@ fn shortcuts() -> Section { .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - let search = widget::search_input(fl!("type-to-search"), &page.search.input) + let search = widget::search_input("", &page.search.input) .width(314) .on_clear(Message::Search(String::new())) .on_input(Message::Search) diff --git a/cosmic-settings/src/pages/networking/vpn/mod.rs b/cosmic-settings/src/pages/networking/vpn/mod.rs index f8a9997..6446ae2 100644 --- a/cosmic-settings/src/pages/networking/vpn/mod.rs +++ b/cosmic-settings/src/pages/networking/vpn/mod.rs @@ -651,10 +651,7 @@ impl Page { "username".to_string(), username.clone().unwrap_or_default().into(), ), - ( - "password".to_string(), - password.clone(), - ), + ("password".to_string(), password.clone()), ]), applied_tx, }) diff --git a/cosmic-settings/src/pages/sound/mod.rs b/cosmic-settings/src/pages/sound/mod.rs index 5c0b61b..2b5cf44 100644 --- a/cosmic-settings/src/pages/sound/mod.rs +++ b/cosmic-settings/src/pages/sound/mod.rs @@ -217,18 +217,20 @@ impl Page { self.amplification_sink = enabled; if let Some(config) = &self.sound_config - && let Err(why) = config.set(AMPLIFICATION_SINK, enabled) { - tracing::error!(?why, "Failed to save over amplification setting"); - } + && let Err(why) = config.set(AMPLIFICATION_SINK, enabled) + { + tracing::error!(?why, "Failed to save over amplification setting"); + } } Message::ToggleOverAmplificationSource(enabled) => { self.amplification_source = enabled; if let Some(config) = &self.sound_config - && let Err(why) = config.set(AMPLIFICATION_SOURCE, enabled) { - tracing::error!(?why, "Failed to save over amplification setting"); - } + && let Err(why) = config.set(AMPLIFICATION_SOURCE, enabled) + { + tracing::error!(?why, "Failed to save over amplification setting"); + } } Message::SetProfile(object_id, index) => { diff --git a/cosmic-settings/src/pages/time/date.rs b/cosmic-settings/src/pages/time/date.rs index 2daab6e..62bc470 100644 --- a/cosmic-settings/src/pages/time/date.rs +++ b/cosmic-settings/src/pages/time/date.rs @@ -175,7 +175,7 @@ impl page::Page for Page { fn context_drawer(&self) -> Option> { if self.timezone_context { - let search = widget::search_input(fl!("type-to-search"), &self.timezone_search) + let search = widget::search_input("", &self.timezone_search) .on_input(Message::TimezoneSearch) .on_clear(Message::TimezoneSearch(String::new())) .apply(Element::from) diff --git a/cosmic-settings/src/pages/time/region.rs b/cosmic-settings/src/pages/time/region.rs index 411d973..8359845 100644 --- a/cosmic-settings/src/pages/time/region.rs +++ b/cosmic-settings/src/pages/time/region.rs @@ -160,7 +160,7 @@ impl page::Page for Page { fn context_drawer(&self) -> Option> { Some(match self.context.as_ref()? { ContextView::AddLanguage => { - let search = widget::search_input(fl!("type-to-search"), &self.add_language_search) + let search = widget::search_input("", &self.add_language_search) .on_input(Message::AddLanguageSearch) .on_clear(Message::AddLanguageSearch(String::new())) .apply(Element::from) @@ -183,7 +183,7 @@ impl page::Page for Page { .footer(install_additional_button) } ContextView::Region => { - let search = widget::search_input(fl!("type-to-search"), &self.add_language_search) + let search = widget::search_input("", &self.add_language_search) .on_input(Message::AddLanguageSearch) .on_clear(Message::AddLanguageSearch(String::new())) .apply(Element::from)