diff --git a/Assets/Translations/de.json b/Assets/Translations/de.json index ef4fc3d08..60865603e 100644 --- a/Assets/Translations/de.json +++ b/Assets/Translations/de.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Titelbreite zurücksetzen" }, "tray": { + "chevron-color-description": "Designfarben auf das Schubladen-Chevron-Symbol anwenden.", + "chevron-color-label": "Chevron-Farbe", "colorize-icons-description": "Theme-Farben auf Tray-Symbole anwenden.", "colorize-icons-label": "Symbole einfärben", "drawer-enabled-description": "Wenn aktiviert, werden nicht angeheftete Tray-Elemente in einem Drawer-Panel angezeigt.
Wenn deaktiviert, werden alle Tray-Elemente inline angezeigt.", diff --git a/Assets/Translations/en.json b/Assets/Translations/en.json index a545a57f5..01f402246 100644 --- a/Assets/Translations/en.json +++ b/Assets/Translations/en.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Reset title width" }, "tray": { + "chevron-color-description": "Apply theme colors to the drawer chevron icon.", + "chevron-color-label": "Chevron color", "colorize-icons-description": "Apply theme colors to tray icons.", "colorize-icons-label": "Colorize icons", "drawer-enabled-description": "When enabled, unpinned tray items are shown in a drawer panel.
When disabled, all tray items are shown inline.", diff --git a/Assets/Translations/es.json b/Assets/Translations/es.json index 8e576afe7..96ba97531 100644 --- a/Assets/Translations/es.json +++ b/Assets/Translations/es.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Restablecer ancho del título" }, "tray": { + "chevron-color-description": "Aplicar colores del tema al icono de chevron del cajón.", + "chevron-color-label": "Color del Chevrón", "colorize-icons-description": "Aplicar colores del tema a los iconos de la bandeja del sistema.", "colorize-icons-label": "Colorear iconos", "drawer-enabled-description": "Cuando está habilitado, los elementos de la bandeja no anclados se muestran en un panel cajón.
Cuando está deshabilitado, todos los elementos de la bandeja se muestran en línea.", diff --git a/Assets/Translations/fr.json b/Assets/Translations/fr.json index 36a07cb22..de17c83f8 100644 --- a/Assets/Translations/fr.json +++ b/Assets/Translations/fr.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Réinitialiser la largeur du titre" }, "tray": { + "chevron-color-description": "Appliquer les couleurs du thème à l'icône chevron du tiroir.", + "chevron-color-label": "Couleur du Chevron", "colorize-icons-description": "Appliquer les couleurs du thème aux icônes de la barre système.", "colorize-icons-label": "Coloriser les icônes", "drawer-enabled-description": "Lorsqu'elle est activée, les éléments de la barre système non épinglés sont affichés dans un panneau tiroir.
Lorsqu'elle est désactivée, tous les éléments de la barre système sont affichés en ligne.", diff --git a/Assets/Translations/hu.json b/Assets/Translations/hu.json index 6e58fa501..2bb5da44f 100644 --- a/Assets/Translations/hu.json +++ b/Assets/Translations/hu.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Cím szélességének alaphelyzetbe állítása" }, "tray": { + "chevron-color-description": "Téma színeinek alkalmazása a fiók nyíl ikonjára.", + "chevron-color-label": "Chevron Színe", "colorize-icons-description": "Témaszínek alkalmazása a tálcaikonokra.", "colorize-icons-label": "Ikonok színezése", "drawer-enabled-description": "Ha be van kapcsolva, a nem rögzített tálcaelemek egy fiókpanelen jelennek meg.
Kikapcsolva az összes tálcaelem sorban jelenik meg.", diff --git a/Assets/Translations/ja.json b/Assets/Translations/ja.json index 4f081410e..47e7dc528 100644 --- a/Assets/Translations/ja.json +++ b/Assets/Translations/ja.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "タイトルの幅をリセット" }, "tray": { + "chevron-color-description": "ドロワーのシェブロンアイコンにテーマの色を適用する。", + "chevron-color-label": "シェブロンの色", "colorize-icons-description": "トレイのアイコンにテーマカラーを適用します。", "colorize-icons-label": "テーマカラーの適用", "drawer-enabled-description": "有効にすると、ピン留めされていないトレイ項目をドロワーパネル内に表示します。
無効にすると、すべての項目をインラインで表示します。", diff --git a/Assets/Translations/ko-KR.json b/Assets/Translations/ko-KR.json index 2b2aa241b..8c6a2fb71 100644 --- a/Assets/Translations/ko-KR.json +++ b/Assets/Translations/ko-KR.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "제목 너비 초기화" }, "tray": { + "chevron-color-description": "서랍 셰브론 아이콘에 테마 색상 적용.", + "chevron-color-label": "셰브론 색상", "colorize-icons-description": "트레이 아이콘에 테마 색상을 적용합니다.", "colorize-icons-label": "아이콘 색상화", "drawer-enabled-description": "활성화하면 고정되지 않은 트레이 항목이 서랍 패널에 표시됩니다.
비활성화하면 모든 트레이 항목이 인라인으로 표시됩니다.", diff --git a/Assets/Translations/nl.json b/Assets/Translations/nl.json index 893d4650a..be7692fc0 100644 --- a/Assets/Translations/nl.json +++ b/Assets/Translations/nl.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Titelbreedte resetten" }, "tray": { + "chevron-color-description": "Themakleuren toepassen op het chevron-pictogram van de lade.", + "chevron-color-label": "Chevronkleur", "colorize-icons-description": "Pas themakleuren toe op systeemvakpictogrammen.", "colorize-icons-label": "Pictogrammen inkleuren", "drawer-enabled-description": "Indien ingeschakeld worden niet-vastgemaakte systeemvakitems in een lade weergegeven.
Indien uitgeschakeld worden alle items inline getoond.", diff --git a/Assets/Translations/pl.json b/Assets/Translations/pl.json index 4271065b8..1e60e060e 100644 --- a/Assets/Translations/pl.json +++ b/Assets/Translations/pl.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Resetuj szerokość tytułu" }, "tray": { + "chevron-color-description": "Zastosuj kolory motywu do ikony szewronu szuflady.", + "chevron-color-label": "Kolor Szewronu", "colorize-icons-description": "Zastosuj kolory motywu do ikon zasobnika.", "colorize-icons-label": "Koloryzuj ikony", "drawer-enabled-description": "Gdy włączone, nieprzypięte elementy zasobnika są pokazywane w panelu szuflady.
Gdy wyłączone, wszystkie elementy są pokazywane w linii.", diff --git a/Assets/Translations/pt.json b/Assets/Translations/pt.json index 2c385ad4d..3ba1016e1 100644 --- a/Assets/Translations/pt.json +++ b/Assets/Translations/pt.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Redefinir largura do título" }, "tray": { + "chevron-color-description": "Aplicar cores do tema ao ícone de divisa da gaveta.", + "chevron-color-label": "Cor do Chevron", "colorize-icons-description": "Aplicar cores do tema aos ícones da bandeja do sistema.", "colorize-icons-label": "Colorir ícones", "drawer-enabled-description": "Quando habilitado, os itens da bandeja não fixados são exibidos em um painel gaveta.
Quando desabilitado, todos os itens da bandeja são exibidos inline.", diff --git a/Assets/Translations/ru.json b/Assets/Translations/ru.json index 483631b0e..db1499e4c 100644 --- a/Assets/Translations/ru.json +++ b/Assets/Translations/ru.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Сбросить ширину заголовка" }, "tray": { + "chevron-color-description": "Применить цвета темы к значку шеврона выдвижной панели.", + "chevron-color-label": "Цвет Шеврона", "colorize-icons-description": "Применить цвета темы к иконкам трея.", "colorize-icons-label": "Раскрасить иконки", "drawer-enabled-description": "Если включено, незакрепленные элементы трея отображаются во всплывающей панели.
Если отключено, все элементы трея отображаются в строку.", diff --git a/Assets/Translations/sv.json b/Assets/Translations/sv.json index 56bb579c9..88ca81bc1 100644 --- a/Assets/Translations/sv.json +++ b/Assets/Translations/sv.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Återställ titelbredd" }, "tray": { + "chevron-color-description": "Tillämpa temafärger på lådans chevronikon.", + "chevron-color-label": "Chevronfärg", "colorize-icons-description": "Tillämpa temafärger på ikoner i aktivitetsfältet.", "colorize-icons-label": "Färglägg ikoner", "drawer-enabled-description": "När funktionen är aktiverad visas fackikoner som inte är fästa i en låda.
När funktionen är inaktiverad visas alla fackikoner i rad.", diff --git a/Assets/Translations/tr.json b/Assets/Translations/tr.json index d0be998a1..1256f25cc 100644 --- a/Assets/Translations/tr.json +++ b/Assets/Translations/tr.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Başlık genişliğini sıfırla" }, "tray": { + "chevron-color-description": "Tema renklerini çekmece ok simgesine uygula.", + "chevron-color-label": "Şevron Rengi", "colorize-icons-description": "Tepsi simgelerine tema renklerini uygula.", "colorize-icons-label": "Simgeleri renklendir", "drawer-enabled-description": "Etkinleştirildiğinde, sabitlenmemiş tepsi öğeleri bir çekmece panelinde gösterilir.
Devre dışı bırakıldığında, tüm tepsi öğeleri satır içi gösterilir.", diff --git a/Assets/Translations/uk-UA.json b/Assets/Translations/uk-UA.json index 513c0adaf..2e9e94355 100644 --- a/Assets/Translations/uk-UA.json +++ b/Assets/Translations/uk-UA.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "Скинути ширину заголовка" }, "tray": { + "chevron-color-description": "Застосувати кольори теми до значка шеврона висувної панелі.", + "chevron-color-label": "Колір Шеврона", "colorize-icons-description": "Застосувати кольори теми до значків трея.", "colorize-icons-label": "Розфарбувати значки", "drawer-enabled-description": "Коли увімкнено, не закріплені елементи трея відображаються на панелі ящика.
Коли вимкнено, всі елементи трея відображаються в рядку.", diff --git a/Assets/Translations/zh-CN.json b/Assets/Translations/zh-CN.json index 5d1238485..5f0446f97 100644 --- a/Assets/Translations/zh-CN.json +++ b/Assets/Translations/zh-CN.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "重置标题宽度" }, "tray": { + "chevron-color-description": "将主题颜色应用到抽屉的V形图标。", + "chevron-color-label": "V形颜色", "colorize-icons-description": "将主题颜色应用到系统托盘图标。", "colorize-icons-label": "着色图标", "drawer-enabled-description": "启用时,未固定的托盘项显示在抽屉面板中。
禁用时,所有托盘项都内联显示。", diff --git a/Assets/Translations/zh-TW.json b/Assets/Translations/zh-TW.json index ce8fed585..123c3fa14 100644 --- a/Assets/Translations/zh-TW.json +++ b/Assets/Translations/zh-TW.json @@ -251,6 +251,8 @@ "title-width-reset-tooltip": "重設標題寬度" }, "tray": { + "chevron-color-description": "將主題顏色套用至抽屜的V形圖示。", + "chevron-color-label": "V形顏色", "colorize-icons-description": "將系統夾圖示套用主題用色", "colorize-icons-label": "為圖示上色", "drawer-enabled-description": "當啟用時, 沒有釘選的系統匣圖示將會顯示在抽屜面板中
如果停用則所有的圖示都會在工具列裡顯示", diff --git a/Modules/Bar/Widgets/Tray.qml b/Modules/Bar/Widgets/Tray.qml index b41ba2f76..fd9d22088 100644 --- a/Modules/Bar/Widgets/Tray.qml +++ b/Modules/Bar/Widgets/Tray.qml @@ -66,6 +66,8 @@ Item { property var pinned: widgetSettings.pinned || widgetMetadata.pinned || [] // Pinned items (shown inline) property bool drawerEnabled: widgetSettings.drawerEnabled !== undefined ? widgetSettings.drawerEnabled : (widgetMetadata.drawerEnabled !== undefined ? widgetMetadata.drawerEnabled : true) // Enable drawer panel property bool hidePassive: widgetSettings.hidePassive !== undefined ? widgetSettings.hidePassive : true // Hide passive status items + readonly property string chevronColorKey: widgetSettings.chevronColor !== undefined ? widgetSettings.chevronColor : widgetMetadata.chevronColor + readonly property color chevronColor: Color.resolveColorKey(chevronColorKey) property var filteredItems: [] // Items to show inline (pinned) property var dropdownItems: [] // Items to show in drawer (unpinned) property int hoveredItemIndex: -1 // Track hovered item for dot indicator @@ -332,7 +334,7 @@ Item { applyUiScale: false customRadius: Style.radiusL colorBg: "transparent" - colorFg: Color.mOnSurface + colorFg: root.chevronColor colorBorder: "transparent" colorBorderHover: "transparent" icon: { @@ -528,7 +530,7 @@ Item { applyUiScale: false customRadius: Style.radiusL colorBg: "transparent" - colorFg: Color.mOnSurface + colorFg: root.chevronColor colorBorder: "transparent" colorBorderHover: "transparent" icon: { diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/TraySettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/TraySettings.qml index fa243ab78..17dcfdc82 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/TraySettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/TraySettings.qml @@ -15,6 +15,7 @@ ColumnLayout { // Local state property var localBlacklist: widgetData.blacklist || [] property bool valueColorizeIcons: widgetData.colorizeIcons !== undefined ? widgetData.colorizeIcons : widgetMetadata.colorizeIcons + property string valueChevronColor: widgetData.chevronColor !== undefined ? widgetData.chevronColor : widgetMetadata.chevronColor property bool valueDrawerEnabled: widgetData.drawerEnabled !== undefined ? widgetData.drawerEnabled : widgetMetadata.drawerEnabled property bool valueHidePassive: widgetData.hidePassive !== undefined ? widgetData.hidePassive : widgetMetadata.hidePassive @@ -33,17 +34,6 @@ ColumnLayout { spacing: Style.marginM - NToggle { - Layout.fillWidth: true - label: I18n.tr("bar.tray.colorize-icons-label") - description: I18n.tr("bar.tray.colorize-icons-description") - checked: root.valueColorizeIcons - onToggled: checked => { - root.valueColorizeIcons = checked; - settingsChanged(saveSettings()); - } - } - NToggle { Layout.fillWidth: true label: I18n.tr("bar.tray.drawer-enabled-label") @@ -55,6 +45,30 @@ ColumnLayout { } } + NComboBox { + label: I18n.tr("bar.tray.chevron-color-label") + description: I18n.tr("bar.tray.chevron-color-description") + model: Color.colorKeyModel + currentKey: root.valueChevronColor + onSelected: key => { + root.valueChevronColor = key; + settingsChanged(saveSettings()); + } + minimumWidth: 200 + visible: root.valueDrawerEnabled + } + + NToggle { + Layout.fillWidth: true + label: I18n.tr("bar.tray.colorize-icons-label") + description: I18n.tr("bar.tray.colorize-icons-description") + checked: root.valueColorizeIcons + onToggled: checked => { + root.valueColorizeIcons = checked; + settingsChanged(saveSettings()); + } + } + NToggle { Layout.fillWidth: true label: I18n.tr("bar.tray.hide-passive-label") @@ -170,6 +184,7 @@ ColumnLayout { var settings = Object.assign({}, widgetData || {}); settings.blacklist = newBlacklist; settings.colorizeIcons = root.valueColorizeIcons; + settings.chevronColor = root.valueChevronColor; settings.drawerEnabled = root.valueDrawerEnabled; settings.hidePassive = root.valueHidePassive; return settings; diff --git a/Services/UI/BarWidgetRegistry.qml b/Services/UI/BarWidgetRegistry.qml index 35e6f4278..c22aef3f4 100644 --- a/Services/UI/BarWidgetRegistry.qml +++ b/Services/UI/BarWidgetRegistry.qml @@ -249,6 +249,7 @@ Singleton { "Tray": { "blacklist": [], "colorizeIcons": false, + "chevronColor": "none", "pinned": [], "drawerEnabled": true, "hidePassive": false