From 25eb31747a9c83578d8d3692f6b57012cff5ce02 Mon Sep 17 00:00:00 2001 From: Ly-sec Date: Sun, 28 Sep 2025 10:43:02 +0200 Subject: [PATCH] ColorSchemeTab: hide predefined colorschemes when matugen is enabled --- Assets/Translations/de.json | 2 +- Assets/Translations/en.json | 2 +- Assets/Translations/es.json | 2 +- Assets/Translations/fr.json | 2 +- Assets/Translations/pt.json | 2 +- Assets/Translations/zh.json | 2 +- Modules/Settings/Tabs/ColorSchemeTab.qml | 2 ++ 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Assets/Translations/de.json b/Assets/Translations/de.json index a07cc9e8..a6732da6 100644 --- a/Assets/Translations/de.json +++ b/Assets/Translations/de.json @@ -487,7 +487,7 @@ "predefined": { "section": { "label": "Vordefinierte Farbschemata", - "description": "Um diese Farbschemata zu verwenden, müssen Sie Matugen ausschalten. Mit aktiviertem Matugen werden Farben automatisch aus Ihrem Hintergrundbild generiert." + "description": "Wählen Sie aus einer Sammlung vordefinierter Farbschemata." } }, "matugen": { diff --git a/Assets/Translations/en.json b/Assets/Translations/en.json index ab808c11..24c6326f 100644 --- a/Assets/Translations/en.json +++ b/Assets/Translations/en.json @@ -491,7 +491,7 @@ "predefined": { "section": { "label": "Predefined color schemes", - "description": "To use these color schemes, you must turn off Matugen. With Matugen enabled, colors are automatically generated from your wallpaper." + "description": "Choose from a collection of predefined color schemes." } }, "matugen": { diff --git a/Assets/Translations/es.json b/Assets/Translations/es.json index 0c23929f..ee2ac979 100644 --- a/Assets/Translations/es.json +++ b/Assets/Translations/es.json @@ -485,7 +485,7 @@ "predefined": { "section": { "label": "Esquemas de colores predefinidos", - "description": "Para usar estos esquemas de colores, debes desactivar Matugen. Con Matugen activado, los colores se generan automáticamente a partir de tu fondo de pantalla." + "description": "Elige entre una colección de esquemas de colores predefinidos." } }, "matugen": { diff --git a/Assets/Translations/fr.json b/Assets/Translations/fr.json index 5a77f950..c30b0590 100644 --- a/Assets/Translations/fr.json +++ b/Assets/Translations/fr.json @@ -485,7 +485,7 @@ "predefined": { "section": { "label": "Jeux de couleurs prédéfinis", - "description": "Pour utiliser ces jeux de couleurs, vous devez désactiver Matugen. Avec Matugen activé, les couleurs sont générées automatiquement à partir de votre fond d'écran." + "description": "Choisissez parmi une collection de jeux de couleurs prédéfinis." } }, "matugen": { diff --git a/Assets/Translations/pt.json b/Assets/Translations/pt.json index cc913f62..7beb64d9 100644 --- a/Assets/Translations/pt.json +++ b/Assets/Translations/pt.json @@ -451,7 +451,7 @@ "predefined": { "section": { "label": "Esquemas de cores predefinidos", - "description": "Para usar esses esquemas de cores, você deve desativar o Matugen. Com o Matugen ativado, as cores são geradas automaticamente a partir do seu papel de parede." + "description": "Escolha entre uma coleção de esquemas de cores predefinidos." } }, "matugen": { diff --git a/Assets/Translations/zh.json b/Assets/Translations/zh.json index a0710bd5..b66d5ebf 100644 --- a/Assets/Translations/zh.json +++ b/Assets/Translations/zh.json @@ -489,7 +489,7 @@ "predefined": { "section": { "label": "预定义配色方案", - "description": "要使用这些配色方案,您必须关闭 Matugen。启用 Matugen 后,颜色会根据您的壁纸自动生成。" + "description": "从预定义配色方案集合中选择。" } }, "matugen": { diff --git a/Modules/Settings/Tabs/ColorSchemeTab.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml index be5ed002..57f3d399 100644 --- a/Modules/Settings/Tabs/ColorSchemeTab.qml +++ b/Modules/Settings/Tabs/ColorSchemeTab.qml @@ -188,12 +188,14 @@ ColumnLayout { Layout.fillWidth: true Layout.topMargin: Style.marginXL * scaling Layout.bottomMargin: Style.marginXL * scaling + visible: !Settings.data.colorSchemes.useWallpaperColors } // Predefined Color Schemes ColumnLayout { spacing: Style.marginM * scaling Layout.fillWidth: true + visible: !Settings.data.colorSchemes.useWallpaperColors NHeader { label: I18n.tr("settings.color-scheme.predefined.section.label")