leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tweak: copy values into kdeglobals instead of replacing it

Browse source 
Preserves other user settings, and this is how KDE does it
This commit is contained in:
Adil Hanney 2026-02-17 15:09:13 +00:00
parent 48cadf57d7
commit f2ef89831c
No known key found for this signature in database
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
cosmic-theme/src/output/qt_output.rs
View file

@ -1,4 +1,5 @@
use crate::Theme; use crate::Theme;
use configparser::ini::Ini;
use palette::{Mix, Srgba, blend::Compose}; use palette::{Mix, Srgba, blend::Compose};
use std::{ use std::{
fs::{self, File}, fs::{self, File},
@ -224,7 +225,7 @@ widgetStyle=qt6ct-style
Ok(()) Ok(())
} }
/// Apply the color scheme by symlinking it to `~/.config/kdeglobals`. /// Apply the color scheme by copying its values to `~/.config/kdeglobals`.
/// ///
/// See the docs: https://develop.kde.org/docs/plasma/#color-scheme /// See the docs: https://develop.kde.org/docs/plasma/#color-scheme
/// ///
@ -236,24 +237,21 @@ widgetStyle=qt6ct-style
let Some(config_dir) = dirs::config_dir() else { let Some(config_dir) = dirs::config_dir() else {
return Err(OutputError::MissingConfigDir); return Err(OutputError::MissingConfigDir);
}; };
let src_file = Self::get_qt_colors_path(is_dark)?;
let kdeglobals_file = config_dir.join("kdeglobals"); let kdeglobals_file = config_dir.join("kdeglobals");
let mut kdeglobals_ini = Self::read_ini(&kdeglobals_file)?;
#[cfg(target_family = "unix")] let src_file = Self::get_qt_colors_path(is_dark)?;
{ let src_ini = Self::read_ini(&src_file)?;
use std::os::unix::fs::symlink;
Self::backup_non_cosmic_kdeglobals(&kdeglobals_file).map_err(OutputError::Io)?;
if kdeglobals_file.exists() { Self::backup_non_cosmic_kdeglobals(&kdeglobals_file).map_err(OutputError::Io)?;
// Currently we overwrite the file with our symlink.
// Maybe in the future we could merge kdeglobals with our color scheme ini? for (section, key_value) in src_ini.get_map_ref() {
fs::remove_file(&kdeglobals_file).map_err(OutputError::Io)?; for (key, value) in key_value {
kdeglobals_ini.set(section, key, value.clone());
} }
symlink(&src_file, kdeglobals_file).map_err(OutputError::Io)?
} }
kdeglobals_ini.write(kdeglobals_file).map_err(OutputError::Io)?;
Ok(()) Ok(())
} }
@ -300,6 +298,17 @@ widgetStyle=qt6ct-style
Ok(data_dir.join(file_name)) Ok(data_dir.join(file_name))
} }
#[cold]
fn read_ini(path: &PathBuf) -> Result<Ini, OutputError> {
let mut ini = Ini::new_cs();
if !path.exists() {
return Ok(ini);
}
let file_content = fs::read_to_string(path).map_err(OutputError::Io)?;
ini.read(file_content).map_err(OutputError::Ini)?;
Ok(ini)
}
#[cold] #[cold]
fn backup_non_cosmic_kdeglobals(path: &Path) -> io::Result<()> { fn backup_non_cosmic_kdeglobals(path: &Path) -> io::Result<()> {
if !Self::is_cosmic_kdeglobals(path)?.unwrap_or(true) { if !Self::is_cosmic_kdeglobals(path)?.unwrap_or(true) {