Merge branch 'main' of github.com:noctalia-dev/noctalia-shell

Assets/Translations/de.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "Datei durchsuchen",
         "browse-library": "Bibliothek durchsuchen",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "Wende die Designfarben auf das Logo deiner Distribution an.",
+          "description": "Aktiviert die Färbung für das Kontrollzentrum-Symbol und wendet Themenfarben an.",
-          "label": "Distro-Logo einfärben"
+          "label": "Färbung aktivieren"
+        },
+        "color-selection": {
+          "description": "Wendet Themenfarben auf Symbole an.",
+          "label": "Farbauswahl"
         },
         "icon": {
           "description": "Symbol aus der Bibliothek oder eine benutzerdefinierte Datei auswählen.",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "Zusätzliche Konfigurationsoptionen.",
+          "description": "Erstellen Sie Ihre eigenen Vorlagen",
-          "label": "Verschiedenes",
+          "label": "Erweitert",
           "user-templates": {
-            "description": "Benutzerdefinierte Matugen-Konfiguration aktivieren. Eine Vorlagendatei wird beim ersten Aktivieren unter ~/.config/noctalia/user-templates.toml erstellt",
+            "description": "Nur aktivieren, wenn Sie wissen, was Sie tun. Weitere Informationen finden Sie in unserer Online-Dokumentation",
-            "label": "Benutzer-Vorlagen"
+            "label": "Benutzer-Vorlagen aktivieren"
           }
         },
         "programs": {

Assets/Translations/en.json

@@ -102,14 +102,18 @@
       "control-center": {
         "browse-file": "Browse File",
         "browse-library": "Browse Library",
-        "colorize-distro-logo": {
-          "description": "Apply theme colors to your distribution logo.",
-          "label": "Colorize distro logo"
-        },
         "icon": {
           "description": "Select an icon from the library or a custom file.",
           "label": "Icon"
         },
+        "enable-colorization": {
+          "description": "Enable colorization for the control center icon, applying theme colors.",
+          "label": "Enable Colorization"
+        },
+        "color-selection": {
+          "description": "Apply theme colors to icons.",
+          "label": "Select Color"
+        },
         "select-custom-icon": "Select a custom icon",
         "use-distro-logo": {
           "description": "Use your distribution's logo instead of a custom icon.",
@@ -542,6 +546,7 @@
     },
     "colors": {
       "error": "Error",
+      "none": "None",
       "onSurface": "On Surface",
       "primary": "Primary",
       "secondary": "Secondary",
@@ -1048,11 +1053,11 @@
           }
         },
         "misc": {
-          "description": "Additional configuration options.",
+          "description": "Create your own Templates",
-          "label": "Misc",
+          "label": "Advanced",
           "user-templates": {
-            "description": "Enable user-defined Matugen config. A template file will be created at ~/.config/noctalia/user-templates.toml on first enable",
+            "description": "Only enable if you know what you are doing, refer to our online documentation",
-            "label": "User templates"
+            "label": "Enable user templates"
           }
         },
         "programs": {

Assets/Translations/es.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "Explorar archivo",
         "browse-library": "Explorar biblioteca",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "Aplica los colores del tema a tu logotipo de distribución.",
+          "description": "Habilita la coloración para el ícono del centro de control, aplicando colores del tema.",
-          "label": "Colorear logotipo de la distribución"
+          "label": "Habilitar Coloración"
+        },
+        "color-selection": {
+          "description": "Aplica colores del tema a los íconos.",
+          "label": "Seleccionar Color"
         },
         "icon": {
           "description": "Selecciona un icono de la biblioteca o un archivo personalizado.",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "Opciones de configuración adicionales.",
+          "description": "Crea tus propias plantillas",
-          "label": "Varios",
+          "label": "Avanzado",
           "user-templates": {
-            "description": "Habilitar configuración de Matugen definida por el usuario. Se creará un archivo de plantilla en ~/.config/noctalia/user-templates.toml al activar por primera vez",
+            "description": "Solo habilita si sabes lo que estás haciendo, consulta nuestra documentación en línea",
-            "label": "Plantillas de usuario"
+            "label": "Habilitar plantillas de usuario"
           }
         },
         "programs": {

Assets/Translations/fr.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "Parcourir les fichiers",
         "browse-library": "Parcourir la bibliothèque",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "Appliquez les couleurs du thème au logo de votre distribution.",
+          "description": "Active la coloration pour l'icône du centre de contrôle, en appliquant les couleurs du thème.",
-          "label": "Coloriser le logo de la distribution"
+          "label": "Activer la Coloration"
+        },
+        "color-selection": {
+          "description": "Applique les couleurs du thème aux icônes.",
+          "label": "Sélectionner la Couleur"
         },
         "icon": {
           "description": "Sélectionnez une icône de la bibliothèque ou un fichier personnalisé.",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "Options de configuration supplémentaires.",
+          "description": "Créez vos propres modèles",
-          "label": "Divers",
+          "label": "Avancé",
           "user-templates": {
-            "description": "Activer la configuration Matugen définie par l'utilisateur. Un fichier modèle sera créé dans ~/.config/noctalia/user-templates.toml lors de la première activation",
+            "description": "N'activez que si vous savez ce que vous faites, consultez notre documentation en ligne",
-            "label": "Modèles utilisateur"
+            "label": "Activer les modèles utilisateur"
           }
         },
         "programs": {

Assets/Translations/ja.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "ファイルを参照",
         "browse-library": "ライブラリを参照",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "ディストリビューションのロゴにテーマカラーを適用します。",
+          "description": "コントロールセンターのアイコンの色付けを有効にし、テーマの色を適用します。",
-          "label": "テーマカラーの適用"
+          "label": "色の有効化"
+        },
+        "color-selection": {
+          "description": "アイコンにテーマの色を適用します。",
+          "label": "色の選択"
         },
         "icon": {
           "description": "ライブラリまたはカスタムファイルからアイコンを選択します。",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "その他の設定オプション",
+          "description": "独自のテンプレートを作成",
-          "label": "その他",
+          "label": "詳細設定",
           "user-templates": {
-            "description": "ユーザー定義の Matugen 設定を有効にします。初回有効化時に ~/.config/noctalia/user-templates.toml にテンプレートファイルが作成されます。",
+            "description": "操作方法を理解している場合のみ有効にしてください。オンラインドキュメントを参照してください",
-            "label": "ユーザーテンプレート"
+            "label": "ユーザーテンプレートを有効化"
           }
         },
         "programs": {

Assets/Translations/nl.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "Bestand kiezen",
         "browse-library": "Bibliotheek doorbladeren",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "Pas themakleuren toe op je distributielogo.",
+          "description": "Schakel kleuring in voor het pictogram van het controlecentrum, waarbij themakleuren worden toegepast.",
-          "label": "Distributielogo inkleuren"
+          "label": "Kleuren inschakelen"
+        },
+        "color-selection": {
+          "description": "Themakleuren toepassen op pictogrammen.",
+          "label": "Kleur selecteren"
         },
         "icon": {
           "description": "Selecteer een pictogram uit de bibliotheek of een aangepast bestand.",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "Aanvullende configuratie-opties.",
+          "description": "Maak uw eigen sjablonen",
-          "label": "Diversen",
+          "label": "Geavanceerd",
           "user-templates": {
-            "description": "Schakel door de gebruiker gedefinieerde Matugen-configuratie in. Er wordt een sjabloonbestand aangemaakt op ~/.config/noctalia/user-templates.toml bij de eerste keer inschakelen.",
+            "description": "Alleen inschakelen als u weet wat u doet, raadpleeg onze online documentatie",
-            "label": "Gebruikerssjablonen"
+            "label": "Gebruikerssjablonen inschakelen"
           }
         },
         "programs": {

Assets/Translations/pt.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "Navegar por Arquivo",
         "browse-library": "Navegar na Biblioteca",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "Aplicar as cores do tema ao logotipo da sua distribuição.",
+          "description": "Ativa a colorização para o ícone do centro de controlo, aplicando as cores do tema.",
-          "label": "Colorir logo da distribuição"
+          "label": "Ativar colorização"
+        },
+        "color-selection": {
+          "description": "Aplica as cores do tema aos ícones.",
+          "label": "Selecionar cor"
         },
         "icon": {
           "description": "Selecione um ícone da biblioteca ou um arquivo personalizado.",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "Opções de configuração adicionais.",
+          "description": "Crie seus próprios modelos",
-          "label": "Diversos",
+          "label": "Avançado",
           "user-templates": {
-            "description": "Ativa a configuração do Matugen definida pelo usuário. Um arquivo de modelo será criado em ~/.config/noctalia/user-templates.toml na primeira ativação",
+            "description": "Ative apenas se souber o que está fazendo, consulte nossa documentação online",
-            "label": "Modelos do usuário"
+            "label": "Ativar modelos do usuário"
           }
         },
         "programs": {

Assets/Translations/ru.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "Обзор файла",
         "browse-library": "Обзор библиотеки",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "Применить цвета темы к логотипу вашего дистрибутива.",
+          "description": "Включает окрашивание для значка центра управления, применяя цвета темы.",
-          "label": "Раскрасить логотип дистрибутива"
+          "label": "Включить окрашивание"
+        },
+        "color-selection": {
+          "description": "Применяет цвета темы к значкам.",
+          "label": "Выбор цвета"
         },
         "icon": {
           "description": "Выберите иконку из библиотеки или пользовательский файл.",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "Дополнительные параметры конфигурации.",
+          "description": "Создайте свои собственные шаблоны",
-          "label": "Разное",
+          "label": "Дополнительно",
           "user-templates": {
-            "description": "Включить пользовательскую конфигурацию Matugen. Файл шаблона будет создан в ~/.config/noctalia/user-templates.toml при первом включении.",
+            "description": "Включайте только если вы знаете, что делаете, обратитесь к нашей онлайн-документации",
-            "label": "Пользовательские шаблоны"
+            "label": "Включить пользовательские шаблоны"
           }
         },
         "programs": {

Assets/Translations/tr.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "Dosyaya Göz At",
         "browse-library": "Kütüphaneye Göz At",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "Dağıtım logonuza tema renklerini uygula.",
+          "description": "Kontrol merkezi simgesi için renklendirmeyi etkinleştirir, tema renklerini uygular.",
-          "label": "Dağıtım logosunu renklendir"
+          "label": "Renklendirmeyi Etkinleştir"
+        },
+        "color-selection": {
+          "description": "Simgeye tema renklerini uygular.",
+          "label": "Renk Seç"
         },
         "icon": {
           "description": "Kütüphaneden veya özel bir dosyadan bir ikon seçin.",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "Ek yapılandırma seçenekleri.",
+          "description": "Kendi şablonlarınızı oluşturun",
-          "label": "Çeşitli",
+          "label": "Gelişmiş",
           "user-templates": {
-            "description": "Kullanıcı tanımlı Matugen yapılandırmasını etkinleştir. İlk etkinleştirmede ~/.config/noctalia/user-templates.toml dosyası oluşturulacaktır",
+            "description": "Yalnızca ne yaptığınızı biliyorsanız etkinleştirin, çevrimiçi belgelerimize bakın",
-            "label": "Kullanıcı şablonları"
+            "label": "Kullanıcı şablonlarını etkinleştir"
           }
         },
         "programs": {

Assets/Translations/uk-UA.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "Огляд файлу",
         "browse-library": "Огляд бібліотеки",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "Застосувати кольори теми до логотипа вашого дистрибутива.",
+          "description": "Вмикає розфарбовування для іконки центру керування, застосовуючи кольори теми.",
-          "label": "Розфарбовувати логотип дистрибутива"
+          "label": "Увімкнути розфарбовування"
+        },
+        "color-selection": {
+          "description": "Застосовує кольори теми до іконок.",
+          "label": "Вибір кольору"
         },
         "icon": {
           "description": "Вибрати значок з бібліотеки або власний файл.",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "Додаткові параметри конфігурації.",
+          "description": "Створіть власні шаблони",
-          "label": "Різне",
+          "label": "Розширено",
           "user-templates": {
-            "description": "Увімкнути визначений користувачем конфіг Matugen. Файл шаблону буде створено за адресою ~/.config/noctalia/user-templates.toml при першому увімкненні",
+            "description": "Увімкніть лише якщо ви знаєте, що робите, зверніться до нашої онлайн-документації",
-            "label": "Користувацькі шаблони"
+            "label": "Увімкнути користувацькі шаблони"
           }
         },
         "programs": {

Assets/Translations/zh-CN.json

@@ -102,9 +102,13 @@
       "control-center": {
         "browse-file": "浏览文件",
         "browse-library": "浏览库",
-        "colorize-distro-logo": {
+        "enable-colorization": {
-          "description": "将主题颜色应用到您的发行版徽标。",
+          "description": "为控制中心图标启用着色，应用主题颜色。",
-          "label": "为发行版徽标着色"
+          "label": "启用着色"
+        },
+        "color-selection": {
+          "description": "将主题颜色应用于图标。",
+          "label": "选择颜色"
         },
         "icon": {
           "description": "从库中选择图标或自定义文件。",
@@ -1048,11 +1052,11 @@
           }
         },
         "misc": {
-          "description": "其他配置选项。",
+          "description": "创建您自己的模板",
-          "label": "杂项",
+          "label": "高级",
           "user-templates": {
-            "description": "启用用户定义的 Matugen 配置。首次启用时将在 ~/.config/noctalia/user-templates.toml 创建模板文件",
+            "description": "仅在您知道自己在做什么时启用，请参阅我们的在线文档",
-            "label": "用户模板"
+            "label": "启用用户模板"
           }
         },
         "programs": {

Modules/Bar/Widgets/ControlCenter.qml

@@ -34,13 +34,40 @@ NIconButton {
   readonly property string customIcon: widgetSettings.icon || widgetMetadata.icon
   readonly property bool useDistroLogo: (widgetSettings.useDistroLogo !== undefined) ? widgetSettings.useDistroLogo : widgetMetadata.useDistroLogo
   readonly property string customIconPath: widgetSettings.customIconPath || ""
-  readonly property bool colorizeDistroLogo: {
+  readonly property bool enableColorization: widgetSettings.enableColorization || false
-    if (widgetSettings.colorizeDistroLogo !== undefined)
+
-      return widgetSettings.colorizeDistroLogo;
+  readonly property string colorizeSystemIcon: {
-    return widgetMetadata.colorizeDistroLogo !== undefined ? widgetMetadata.colorizeDistroLogo : false;
+    if (widgetSettings.colorizeSystemIcon !== undefined)
+      return widgetSettings.colorizeSystemIcon;
+    return widgetMetadata.colorizeSystemIcon !== undefined ? widgetMetadata.colorizeSystemIcon : "none";
   }
 
-  // If we have a custom path or distro logo, don't use the theme icon.
+
+  readonly property bool isColorizing: enableColorization && colorizeSystemIcon !== "none"
+
+  readonly property color iconColor: {
+    if (!isColorizing) return Color.mOnSurface;
+    switch (colorizeSystemIcon) {
+      case "primary": return Color.mPrimary;
+      case "secondary": return Color.mSecondary;
+      case "tertiary": return Color.mTertiary;
+      case "error": return Color.mError;
+      default: return Color.mOnSurface;
+    }
+  }
+  readonly property color iconHoverColor: {
+    if (!isColorizing) return Color.mOnHover;
+    switch (colorizeSystemIcon) {
+      case "primary": return Qt.darker(Color.mPrimary, 1.2);
+      case "secondary": return Qt.darker(Color.mSecondary, 1.2);
+      case "tertiary": return Qt.darker(Color.mTertiary, 1.2);
+      case "error": return Qt.darker(Color.mError, 1.2);
+      default: return Color.mOnHover;
+    }
+  }
+
+  // If we have a custom path and not using distro logo, use the theme icon.
+  // If using distro logo, don't use theme icon.
   icon: (customIconPath === "" && !useDistroLogo) ? customIcon : ""
   tooltipText: I18n.tr("tooltips.open-control-center")
   tooltipDirection: BarService.getTooltipDirection()
@@ -48,8 +75,9 @@ NIconButton {
   applyUiScale: false
   density: Settings.data.bar.density
   colorBg: Style.capsuleColor
-  colorFg: Color.mOnSurface
+  colorFg: iconColor
   colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mHover
+  colorFgHover: iconHoverColor
   colorBorder: Color.transparent
   colorBorderHover: useDistroLogo ? Color.mHover : Color.transparent
 
@@ -115,18 +143,19 @@ NIconButton {
     width: root.width * 0.8
     height: width
     source: {
-      if (customIconPath !== "")
-        return customIconPath.startsWith("file://") ? customIconPath : "file://" + customIconPath;
       if (useDistroLogo)
         return HostService.osLogo;
+      if (customIconPath !== "")
+        return customIconPath.startsWith("file://") ? customIconPath : "file://" + customIconPath;
       return "";
     }
     visible: source !== ""
     smooth: true
     asynchronous: true
-    layer.enabled: useDistroLogo && colorizeDistroLogo
+    layer.enabled: isColorizing && (useDistroLogo || customIconPath !== "")
     layer.effect: ShaderEffect {
-      property color targetColor: Settings.data.colorSchemes.darkMode ? Color.mOnSurface : Color.mSurfaceVariant
+      property color targetColor: isColorizing ? iconColor :
+                    (Settings.data.colorSchemes.darkMode ? Color.mOnSurface : Color.mSurfaceVariant)
       property real colorizeMode: 2.0
 
       fragmentShader: Qt.resolvedUrl(Quickshell.shellDir + "/Shaders/qsb/appicon_colorize.frag.qsb")

Modules/Panels/Settings/Bar/WidgetSettings/ControlCenterSettings.qml

@@ -17,14 +17,16 @@ ColumnLayout {
   property string valueIcon: widgetData.icon !== undefined ? widgetData.icon : widgetMetadata.icon
   property bool valueUseDistroLogo: widgetData.useDistroLogo !== undefined ? widgetData.useDistroLogo : widgetMetadata.useDistroLogo
   property string valueCustomIconPath: widgetData.customIconPath !== undefined ? widgetData.customIconPath : ""
-  property bool valueColorizeDistroLogo: widgetData.colorizeDistroLogo !== undefined ? widgetData.colorizeDistroLogo : (widgetMetadata.colorizeDistroLogo !== undefined ? widgetMetadata.colorizeDistroLogo : false)
+  property bool valueEnableColorization: widgetData.enableColorization || false
+  property string valueColorizeSystemIcon: widgetData.colorizeSystemIcon !== undefined ? widgetData.colorizeSystemIcon : (widgetMetadata.colorizeSystemIcon !== undefined ? widgetMetadata.colorizeSystemIcon : "none")
 
   function saveSettings() {
     var settings = Object.assign({}, widgetData || {});
     settings.icon = valueIcon;
     settings.useDistroLogo = valueUseDistroLogo;
     settings.customIconPath = valueCustomIconPath;
-    settings.colorizeDistroLogo = valueColorizeDistroLogo;
+    settings.enableColorization = valueEnableColorization;
+    settings.colorizeSystemIcon = valueColorizeSystemIcon;
     return settings;
   }
 
@@ -34,20 +36,32 @@ ColumnLayout {
     checked: valueUseDistroLogo
     onToggled: function (checked) {
       valueUseDistroLogo = checked;
-      if (checked) {
-        valueCustomIconPath = "";
-        valueIcon = "";
-      }
     }
   }
 
   NToggle {
-    visible: valueUseDistroLogo
+    label: I18n.tr("bar.widget-settings.control-center.enable-colorization.label")
-    label: I18n.tr("bar.widget-settings.control-center.colorize-distro-logo.label")
+    description: I18n.tr("bar.widget-settings.control-center.enable-colorization.description")
-    description: I18n.tr("bar.widget-settings.control-center.colorize-distro-logo.description")
+    checked: valueEnableColorization
-    checked: valueColorizeDistroLogo
     onToggled: function (checked) {
-      valueColorizeDistroLogo = checked;
+      valueEnableColorization = checked;
+    }
+  }
+
+  NComboBox {
+    visible: valueEnableColorization
+    label: I18n.tr("bar.widget-settings.control-center.color-selection.label")
+    description: I18n.tr("bar.widget-settings.control-center.color-selection.description")
+    model: [
+      { "name": I18n.tr("options.colors.none"), "key": "none" },
+      { "name": I18n.tr("options.colors.primary"), "key": "primary" },
+      { "name": I18n.tr("options.colors.secondary"), "key": "secondary" },
+      { "name": I18n.tr("options.colors.tertiary"), "key": "tertiary" },
+      { "name": I18n.tr("options.colors.error"), "key": "error" }
+    ]
+    currentKey: valueColorizeSystemIcon
+    onSelected: function(key) {
+      valueColorizeSystemIcon = key;
     }
   }
 
@@ -65,14 +79,14 @@ ColumnLayout {
       Layout.alignment: Qt.AlignVCenter
       radius: width * 0.5
       imagePath: valueCustomIconPath
-      visible: valueCustomIconPath !== ""
+      visible: valueCustomIconPath !== "" && !valueUseDistroLogo
     }
 
     NIcon {
       Layout.alignment: Qt.AlignVCenter
       icon: valueIcon
       pointSize: Style.fontSizeXXL * 1.5
-      visible: valueIcon !== "" && valueCustomIconPath === ""
+      visible: valueIcon !== "" && valueCustomIconPath === "" && !valueUseDistroLogo
     }
   }
 

Services/UI/BarWidgetRegistry.qml

@@ -111,7 +111,8 @@ Singleton {
                                     "useDistroLogo": false,
                                     "icon": "noctalia",
                                     "customIconPath": "",
-                                    "colorizeDistroLogo": false
+                                    "colorizeDistroLogo": false,
+                                    "colorizeSystemIcon": "none"
                                   },
                                   "CustomButton": {
                                     "allowUserSettings": true,