leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use theme_manager::Manager for consistent behavior with the UI

Browse source
This commit is contained in:
Frederic Laing 2025-12-03 08:53:48 +01:00 • committed by Jacob Kauffmann
parent 45be8267e6
commit a679d056b9
1 changed files with 22 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

74
cosmic-settings/src/pages/desktop/appearance/commands.rs
View file

@ -3,10 +3,11 @@
//! CLI commands for theme import and export. //! CLI commands for theme import and export.
use cosmic::cosmic_config::CosmicConfigEntry; use cosmic::cosmic_theme::ThemeBuilder;
use cosmic::cosmic_theme::{Theme, ThemeBuilder, ThemeMode};
use std::path::Path; use std::path::Path;
use super::theme_manager::Manager;
/// Import a theme from a RON file and apply it. /// Import a theme from a RON file and apply it.
/// ///
/// # Errors /// # Errors
@ -38,41 +39,24 @@ pub fn import_theme(path: &Path) -> color_eyre::Result<()> {
let is_dark = builder.palette.is_dark(); let is_dark = builder.palette.is_dark();
let mode_str = if is_dark { "dark" } else { "light" }; let mode_str = if is_dark { "dark" } else { "light" };
if let Ok(mode_config) = ThemeMode::config() { let mut manager = Manager::default();
let mut mode = ThemeMode::get_entry(&mode_config).unwrap_or_default();
if mode.is_dark != is_dark { if manager.mode().is_dark != is_dark {
let _ = mode.set_is_dark(&mode_config, is_dark); if let Err(err) = manager.dark_mode(is_dark) {
return Err(color_eyre::eyre::eyre!(
"Failed to set {} mode: {:?}",
mode_str,
err
));
} }
} }
let (theme_config, builder_config) = if is_dark { manager
(Theme::dark_config(), ThemeBuilder::dark_config()) .selected_customizer_mut()
} else { .set_builder(builder.clone())
(Theme::light_config(), ThemeBuilder::light_config()) .set_theme(builder.build())
}; .apply_builder()
.apply_theme();
if let Ok(config) = builder_config {
builder.write_entry(&config).map_err(|e| {
color_eyre::eyre::eyre!("Failed to write theme builder config: {:?}", e)
})?;
} else {
return Err(color_eyre::eyre::eyre!(
"Failed to get {} theme builder config",
mode_str
));
}
let theme = builder.build();
if let Ok(config) = theme_config {
theme
.write_entry(&config)
.map_err(|e| color_eyre::eyre::eyre!("Failed to write theme config: {:?}", e))?;
} else {
return Err(color_eyre::eyre::eyre!(
"Failed to get {} theme config",
mode_str
));
}
println!( println!(
"Successfully imported {} theme from: {}", "Successfully imported {} theme from: {}",
@ -96,27 +80,13 @@ pub fn export_theme(path: &Path) -> color_eyre::Result<()> {
)); ));
} }
let mode_config = ThemeMode::config() let manager = Manager::default();
.map_err(|e| color_eyre::eyre::eyre!("Failed to get theme mode config: {:?}", e))?; let is_dark = manager.mode().is_dark;
let mode = ThemeMode::get_entry(&mode_config).unwrap_or_default();
let is_dark = mode.is_dark;
let mode_str = if is_dark { "dark" } else { "light" }; let mode_str = if is_dark { "dark" } else { "light" };
let builder_config = if is_dark { let builder = manager.builder();
ThemeBuilder::dark_config()
} else {
ThemeBuilder::light_config()
}
.map_err(|e| {
color_eyre::eyre::eyre!("Failed to get {} theme builder config: {:?}", mode_str, e)
})?;
let builder = ThemeBuilder::get_entry(&builder_config).map_err(|e| { let ron_string = ron::ser::to_string_pretty(builder, Default::default())
color_eyre::eyre::eyre!("Failed to get {} theme builder: {:?}", mode_str, e)
})?;
let ron_string = ron::ser::to_string_pretty(&builder, Default::default())
.map_err(|e| color_eyre::eyre::eyre!("Failed to serialize theme to RON: {}", e))?; .map_err(|e| color_eyre::eyre::eyre!("Failed to serialize theme to RON: {}", e))?;
std::fs::write(path, ron_string).map_err(|e| { std::fs::write(path, ron_string).map_err(|e| {