diff --git a/Assets/Matugen/Matugen.qml b/Assets/Matugen/Matugen.qml index c921c3c3..99fe11cf 100644 --- a/Assets/Matugen/Matugen.qml +++ b/Assets/Matugen/Matugen.qml @@ -24,26 +24,26 @@ Singleton { lines.push('output_path = "' + Settings.configDir + 'colors.json"') } - if (Settings.data.matugen.gtk4) { + if (Settings.data.matugen.gtk) { + lines.push("\n[templates.gtk3]") + lines.push('input_path = "' + Quickshell.shellDir + '/Assets/Matugen/templates/gtk.css"') + lines.push('output_path = "~/.config/gtk-3.0/gtk.css"') + lines.push("\n[templates.gtk4]") - lines.push('input_path = "' + Quickshell.shellDir + '/Assets/Matugen/templates/gtk4.css"') + lines.push('input_path = "' + Quickshell.shellDir + '/Assets/Matugen/templates/gtk.css"') lines.push('output_path = "~/.config/gtk-4.0/gtk.css"') } - if (Settings.data.matugen.gtk3) { - lines.push("\n[templates.gtk3]") - lines.push('input_path = "' + Quickshell.shellDir + '/Assets/Matugen/templates/gtk3.css"') - lines.push('output_path = "~/.config/gtk-3.0/gtk.css"') - } - if (Settings.data.matugen.qt6) { + + if (Settings.data.matugen.qt) { + lines.push("\n[templates.qt5]") + lines.push('input_path = "' + Quickshell.shellDir + '/Assets/Matugen/templates/qtct.conf"') + lines.push('output_path = "~/.config/qt5ct/colors/noctalia.conf"') + lines.push("\n[templates.qt6]") lines.push('input_path = "' + Quickshell.shellDir + '/Assets/Matugen/templates/qtct.conf"') lines.push('output_path = "~/.config/qt6ct/colors/noctalia.conf"') } - if (Settings.data.matugen.qt5) { - lines.push("\n[templates.qt5]") - lines.push('input_path = "' + Quickshell.shellDir + '/Assets/Matugen/templates/qtct.conf"') - lines.push('output_path = "~/.config/qt5ct/colors/noctalia.conf"') - } + if (Settings.data.matugen.kitty) { lines.push("\n[templates.kitty]") lines.push('input_path = "' + Quickshell.shellDir + '/Assets/Matugen/templates/kitty.conf"') diff --git a/Assets/Matugen/templates/gtk3.css b/Assets/Matugen/templates/gtk.css similarity index 100% rename from Assets/Matugen/templates/gtk3.css rename to Assets/Matugen/templates/gtk.css diff --git a/Assets/Matugen/templates/gtk4.css b/Assets/Matugen/templates/gtk4.css deleted file mode 100644 index e0e76e4a..00000000 --- a/Assets/Matugen/templates/gtk4.css +++ /dev/null @@ -1,23 +0,0 @@ -/* -* GTK Colors -* Generated with Matugen -*/ - -@define-color accent_color {{colors.primary.default.hex}}; -@define-color accent_bg_color {{colors.primary.default.hex}}; -@define-color accent_fg_color {{colors.on_primary.default.hex}}; -@define-color window_bg_color {{colors.surface.default.hex}}; -@define-color window_fg_color {{colors.on_surface.default.hex}}; -@define-color headerbar_bg_color {{colors.surface.default.hex}}; -@define-color headerbar_fg_color {{colors.on_surface.default.hex}}; -@define-color popover_bg_color {{colors.surface_variant.default.hex}}; -@define-color popover_fg_color {{colors.on_surface_variant.default.hex}}; -@define-color view_bg_color {{colors.surface.default.hex}}; -@define-color view_fg_color {{colors.on_surface.default.hex}}; -@define-color card_bg_color {{colors.surface.default.hex}}; -@define-color card_fg_color {{colors.on_surface.default.hex}}; - -@define-color sidebar_bg_color {{colors.surface_container.default.hex}}; -@define-color sidebar_fg_color {{colors.on_surface.default.hex}}; -@define-color sidebar_border_color @window_bg_color; -@define-color sidebar_backdrop_color @window_bg_color; diff --git a/Assets/Translations/de.json b/Assets/Translations/de.json index b5af198e..8275c47d 100644 --- a/Assets/Translations/de.json +++ b/Assets/Translations/de.json @@ -519,16 +519,10 @@ "ui": { "label": "UI", "description": "Desktop-Umgebung und UI-Toolkit-Theming.", - "gtk4": { + "gtk": { "description": "Schreibt {filepath}" }, - "gtk3": { - "description": "Schreibt {filepath}" - }, - "qt6": { - "description": "Schreibt {filepath}" - }, - "qt5": { + "qt": { "description": "Schreibt {filepath}" } }, diff --git a/Assets/Translations/en.json b/Assets/Translations/en.json index d956f75d..4a01ea95 100644 --- a/Assets/Translations/en.json +++ b/Assets/Translations/en.json @@ -517,16 +517,10 @@ "ui": { "label": "UI", "description": "Desktop environment and UI toolkit theming.", - "gtk4": { + "gtk": { "description": "Write {filepath}" }, - "gtk3": { - "description": "Write {filepath}" - }, - "qt6": { - "description": "Write {filepath}" - }, - "qt5": { + "qt": { "description": "Write {filepath}" } }, diff --git a/Assets/Translations/es.json b/Assets/Translations/es.json index 7ffdf467..a48fed9f 100644 --- a/Assets/Translations/es.json +++ b/Assets/Translations/es.json @@ -515,16 +515,10 @@ "ui": { "label": "UI", "description": "Tematización del entorno de escritorio y de la interfaz de usuario.", - "gtk4": { + "gtk": { "description": "Escribir {filepath}" }, - "gtk3": { - "description": "Escribir {filepath}" - }, - "qt6": { - "description": "Escribir {filepath}" - }, - "qt5": { + "qt": { "description": "Escribir {filepath}" } }, diff --git a/Assets/Translations/fr.json b/Assets/Translations/fr.json index 5f081725..cf4dd992 100644 --- a/Assets/Translations/fr.json +++ b/Assets/Translations/fr.json @@ -515,17 +515,11 @@ "ui": { "label": "UI", "description": "Thématisation de l'environnement de bureau et de la boîte à outils d'interface utilisateur.", - "gtk4": { - "description": "Écrire ~/.config/gtk-4.0/gtk.css" + "gtk": { + "description": "Écrire {filepath}" }, - "gtk3": { - "description": "Écrire ~/.config/gtk-3.0/gtk.css" - }, - "qt6": { - "description": "Écrire ~/.config/qt6ct/colors/noctalia.conf" - }, - "qt5": { - "description": "Écrire ~/.config/qt5ct/colors/noctalia.conf" + "qt": { + "description": "Écrire {filepath}" } }, "terminal": { diff --git a/Assets/Translations/pt.json b/Assets/Translations/pt.json index 880350ee..103432f5 100644 --- a/Assets/Translations/pt.json +++ b/Assets/Translations/pt.json @@ -481,16 +481,10 @@ "ui": { "label": "UI", "description": "Tematização do ambiente de desktop e kit de ferramentas de UI.", - "gtk4": { + "gtk": { "description": "Escrever {filepath}" }, - "gtk3": { - "description": "Escrever {filepath}" - }, - "qt6": { - "description": "Escrever {filepath}" - }, - "qt5": { + "qt": { "description": "Escrever {filepath}" } }, diff --git a/Assets/Translations/zh-CN.json b/Assets/Translations/zh-CN.json index cf5cdf84..960056fb 100644 --- a/Assets/Translations/zh-CN.json +++ b/Assets/Translations/zh-CN.json @@ -515,16 +515,10 @@ "ui": { "label": "用户界面", "description": "桌面环境和 UI 工具包主题。", - "gtk4": { + "gtk": { "description": "写入 {filepath}" }, - "gtk3": { - "description": "写入 {filepath}" - }, - "qt6": { - "description": "写入 {filepath}" - }, - "qt5": { + "qt": { "description": "写入 {filepath}" } }, diff --git a/Assets/settings-default.json b/Assets/settings-default.json index 56a8974e..7db66303 100644 --- a/Assets/settings-default.json +++ b/Assets/settings-default.json @@ -165,10 +165,8 @@ "matugenSchemeType": "scheme-fruit-salad" }, "matugen": { - "gtk4": false, - "gtk3": false, - "qt6": false, - "qt5": false, + "gtk": false, + "qt": false, "kitty": false, "ghostty": false, "foot": false, diff --git a/Commons/Settings.qml b/Commons/Settings.qml index 71db7fbf..05ace8a7 100644 --- a/Commons/Settings.qml +++ b/Commons/Settings.qml @@ -316,10 +316,8 @@ Singleton { // matugen templates toggles property JsonObject matugen: JsonObject { // Per-template flags to control dynamic config generation - property bool gtk4: false - property bool gtk3: false - property bool qt6: false - property bool qt5: false + property bool gtk: false + property bool qt: false property bool kitty: false property bool ghostty: false property bool foot: false diff --git a/Modules/Settings/Tabs/ColorSchemeTab.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml index 5eb8c029..36c6318f 100644 --- a/Modules/Settings/Tabs/ColorSchemeTab.qml +++ b/Modules/Settings/Tabs/ColorSchemeTab.qml @@ -436,52 +436,26 @@ ColumnLayout { defaultExpanded: false NCheckbox { - label: "GTK 4 (libadwaita)" - description: I18n.tr("settings.color-scheme.matugen.ui.gtk4.description", { - "filepath": "~/.config/gtk-4.0/gtk.css" + label: "GTK" + description: I18n.tr("settings.color-scheme.matugen.ui.gtk.description", { + "filepath": "~/.config/gtk-3.0/gtk.css & ~/.config/gtk-4.0/gtk.css" }) - checked: Settings.data.matugen.gtk4 + checked: Settings.data.matugen.gtk onToggled: checked => { - Settings.data.matugen.gtk4 = checked + Settings.data.matugen.gtk = checked if (Settings.data.colorSchemes.useWallpaperColors) MatugenService.generateFromWallpaper() } } NCheckbox { - label: "GTK 3" - description: I18n.tr("settings.color-scheme.matugen.ui.gtk3.description", { - "filepath": "~/.config/gtk-3.0/gtk.css" + label: "Qt" + description: I18n.tr("settings.color-scheme.matugen.ui.qt.description", { + "filepath": "~/.config/qt5ct/colors/noctalia.conf & ~/.config/qt6ct/colors/noctalia.conf" }) - checked: Settings.data.matugen.gtk3 + checked: Settings.data.matugen.qt onToggled: checked => { - Settings.data.matugen.gtk3 = checked - if (Settings.data.colorSchemes.useWallpaperColors) - MatugenService.generateFromWallpaper() - } - } - - NCheckbox { - label: "Qt6ct" - description: I18n.tr("settings.color-scheme.matugen.ui.qt6.description", { - "filepath": "~/.config/qt6ct/colors/noctalia.conf" - }) - checked: Settings.data.matugen.qt6 - onToggled: checked => { - Settings.data.matugen.qt6 = checked - if (Settings.data.colorSchemes.useWallpaperColors) - MatugenService.generateFromWallpaper() - } - } - - NCheckbox { - label: "Qt5ct" - description: I18n.tr("settings.color-scheme.matugen.ui.qt5.description", { - "filepath": "~/.config/qt5ct/colors/noctalia.conf" - }) - checked: Settings.data.matugen.qt5 - onToggled: checked => { - Settings.data.matugen.qt5 = checked + Settings.data.matugen.qt = checked if (Settings.data.colorSchemes.useWallpaperColors) MatugenService.generateFromWallpaper() } diff --git a/Services/ColorSchemeService.qml b/Services/ColorSchemeService.qml index 4d0311d6..ba541df1 100644 --- a/Services/ColorSchemeService.qml +++ b/Services/ColorSchemeService.qml @@ -132,7 +132,7 @@ Singleton { // Check if any Matugen templates are enabled function hasEnabledMatugenTemplates() { - return Settings.data.matugen.gtk4 || Settings.data.matugen.gtk3 || Settings.data.matugen.qt6 || Settings.data.matugen.qt5 || Settings.data.matugen.kitty || Settings.data.matugen.ghostty || Settings.data.matugen.foot || Settings.data.matugen.fuzzel || Settings.data.matugen.vesktop || Settings.data.matugen.pywalfox + return Settings.data.matugen.gtk || Settings.data.matugen.qt || Settings.data.matugen.kitty || Settings.data.matugen.ghostty || Settings.data.matugen.foot || Settings.data.matugen.fuzzel || Settings.data.matugen.vesktop || Settings.data.matugen.pywalfox } // Writer to colors.json using a JsonAdapter for safety diff --git a/shell.qml b/shell.qml index 26d84837..a4ec2c49 100644 --- a/shell.qml +++ b/shell.qml @@ -38,7 +38,6 @@ import qs.Modules.Notification import qs.Modules.OSD import qs.Modules.Settings import qs.Modules.Toast -import qs.Modules.Tooltip import qs.Modules.Wallpaper ShellRoot {