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

chore: rename as_qt to as_kcolorscheme

Browse source
This commit is contained in:
Adil Hanney 2026-03-14 16:00:10 +00:00
parent 527194fe77
commit b8097fbb40
No known key found for this signature in database
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-theme/src/output/qt56ct_output.rs
View file

@ -39,7 +39,7 @@ impl Theme {
.map_err(OutputError::Ini)? .map_err(OutputError::Ini)?
.unwrap_or_default(); .unwrap_or_default();
let color_scheme_path = Self::get_qt_colors_path(is_dark)?; let color_scheme_path = Self::get_kcolorscheme_path(is_dark)?;
let icon_theme = if is_dark { "breeze-dark" } else { "breeze" }; let icon_theme = if is_dark { "breeze-dark" } else { "breeze" };
ini.set( ini.set(

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

@ -14,10 +14,11 @@ impl Theme {
/// Produces a color scheme ini file for Qt. /// Produces a color scheme ini file for Qt.
/// ///
/// Some high-level documentation for this file can be found at: /// Some high-level documentation for this file can be found at:
/// https://web.archive.org/web/20250402234329/https://docs.kde.org/stable5/en/plasma-workspace/kcontrol/colors/ /// - https://api.kde.org/kcolorscheme.html
/// - https://web.archive.org/web/20250402234329/https://docs.kde.org/stable5/en/plasma-workspace/kcontrol/colors/
#[must_use] #[must_use]
#[cold] #[cold]
pub fn as_qt(&self) -> String { pub fn as_kcolorscheme(&self) -> String {
// Usually, disabled elements will have strongly reduced contrast and are often notably darker or lighter // Usually, disabled elements will have strongly reduced contrast and are often notably darker or lighter
let disabled_color_effects = IniColorEffects { let disabled_color_effects = IniColorEffects {
color: self.button.disabled, color: self.button.disabled,
@ -212,14 +213,14 @@ widgetStyle=qt6ct-style
/// Returns an `OutputError` if there is an error writing the colors file. /// Returns an `OutputError` if there is an error writing the colors file.
#[cold] #[cold]
pub fn write_qt(&self) -> Result<(), OutputError> { pub fn write_qt(&self) -> Result<(), OutputError> {
let colors = self.as_qt(); let kcolorscheme = self.as_kcolorscheme();
let file_path = Self::get_qt_colors_path(self.is_dark)?; let file_path = Self::get_kcolorscheme_path(self.is_dark)?;
let tmp_file_path = file_path.with_extension("colors.new"); let tmp_file_path = file_path.with_extension("colors.new");
// Write to tmp_file_path first, then move it to file_path // Write to tmp_file_path first, then move it to file_path
let mut tmp_file = File::create(&tmp_file_path).map_err(OutputError::Io)?; let mut tmp_file = File::create(&tmp_file_path).map_err(OutputError::Io)?;
let res = tmp_file let res = tmp_file
.write_all(colors.as_bytes()) .write_all(kcolorscheme.as_bytes())
.and_then(|_| tmp_file.flush()) .and_then(|_| tmp_file.flush())
.and_then(|_| std::fs::rename(&tmp_file_path, file_path)); .and_then(|_| std::fs::rename(&tmp_file_path, file_path));
if let Err(e) = res { if let Err(e) = res {
@ -245,7 +246,7 @@ widgetStyle=qt6ct-style
let kdeglobals_file = config_dir.join("kdeglobals"); let kdeglobals_file = config_dir.join("kdeglobals");
let mut kdeglobals_ini = Self::read_ini(&kdeglobals_file)?; let mut kdeglobals_ini = Self::read_ini(&kdeglobals_file)?;
let src_file = Self::get_qt_colors_path(is_dark)?; let src_file = Self::get_kcolorscheme_path(is_dark)?;
let src_ini = Self::read_ini(&src_file)?; let src_ini = Self::read_ini(&src_file)?;
Self::backup_non_cosmic_kdeglobals(&kdeglobals_ini, &kdeglobals_file) Self::backup_non_cosmic_kdeglobals(&kdeglobals_ini, &kdeglobals_file)
@ -288,7 +289,7 @@ widgetStyle=qt6ct-style
} }
let is_dark = false; // doesn't matter since we're only reading keys let is_dark = false; // doesn't matter since we're only reading keys
let src_file = Self::get_qt_colors_path(is_dark)?; let src_file = Self::get_kcolorscheme_path(is_dark)?;
let src_ini = Self::read_ini(&src_file)?; let src_ini = Self::read_ini(&src_file)?;
for (section, key_value) in src_ini.get_map_ref() { for (section, key_value) in src_ini.get_map_ref() {
@ -303,8 +304,8 @@ widgetStyle=qt6ct-style
Ok(()) Ok(())
} }
/// Gets a path like `~/.config/color-schemes/CosmicDark.colors` /// Gets a path like `~/.local/share/color-schemes/CosmicDark.colors`
pub fn get_qt_colors_path(is_dark: bool) -> Result<PathBuf, OutputError> { pub fn get_kcolorscheme_path(is_dark: bool) -> Result<PathBuf, OutputError> {
let Some(mut data_dir) = dirs::data_dir() else { let Some(mut data_dir) = dirs::data_dir() else {
return Err(OutputError::MissingDataDir); return Err(OutputError::MissingDataDir);
}; };