Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-29 16:02:51 -05:00
Code Packages Releases Activity

fix bindings in Theme & Colors settings pane

Browse Source
This commit is contained in:
bbedward
2025-10-13 22:12:32 -04:00
parent 13a81eda6f
commit 381df1e949
4 changed files with 76 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/DankDash/Overview/CalendarOverviewCard.qml
View File

@@ -399,7 +399,7 @@ Rectangle {
width: parent.width width: parent.width
text: { text: {
if (!modelData || modelData.allDay) { if (!modelData || modelData.allDay) {
return "All day" return I18n.tr("All day")
} else if (modelData.start && modelData.end) { } else if (modelData.start && modelData.end) {
const timeFormat = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP" const timeFormat = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP"
const startTime = Qt.formatTime(modelData.start, timeFormat) const startTime = Qt.formatTime(modelData.start, timeFormat)

12
Modules/Settings/ThemeColorsTab.qml
View File

@@ -14,6 +14,8 @@ Item {
property var cachedFontFamilies: [] property var cachedFontFamilies: []
property var cachedMonoFamilies: [] property var cachedMonoFamilies: []
property var cachedIconThemes: []
property var cachedMatugenSchemes: []
property bool fontsEnumerated: false property bool fontsEnumerated: false
function enumerateFonts() { function enumerateFonts() {
@@ -55,6 +57,9 @@ Item {
enumerateFonts() enumerateFonts()
fontsEnumerated = true fontsEnumerated = true
} }
SettingsData.detectAvailableIconThemes()
cachedIconThemes = SettingsData.availableIconThemes
cachedMatugenSchemes = Theme.availableMatugenSchemes.map(function (option) { return option.label })
} }
DankFlickable { DankFlickable {
@@ -623,7 +628,7 @@ Item {
id: matugenPaletteDropdown id: matugenPaletteDropdown
text: I18n.tr("Matugen Palette") text: I18n.tr("Matugen Palette")
description: "Select the palette algorithm used for wallpaper-based colors" description: "Select the palette algorithm used for wallpaper-based colors"
options: Theme.availableMatugenSchemes.map(function (option) { return option.label }) options: cachedMatugenSchemes
currentValue: Theme.getMatugenScheme(SettingsData.matugenScheme).label currentValue: Theme.getMatugenScheme(SettingsData.matugenScheme).label
enabled: Theme.matugenAvailable enabled: Theme.matugenAvailable
opacity: enabled ? 1 : 0.4 opacity: enabled ? 1 : 0.4
@@ -1202,10 +1207,7 @@ Item {
enableFuzzySearch: true enableFuzzySearch: true
popupWidthOffset: 100 popupWidthOffset: 100
maxPopupHeight: 236 maxPopupHeight: 236
options: { options: cachedIconThemes
SettingsData.detectAvailableIconThemes()
return SettingsData.availableIconThemes
}
onValueChanged: value => { onValueChanged: value => {
SettingsData.setIconTheme(value) SettingsData.setIconTheme(value)
if (Quickshell.env("QT_QPA_PLATFORMTHEME") != "gtk3" && if (Quickshell.env("QT_QPA_PLATFORMTHEME") != "gtk3" &&

76
translations/en.json
View File

@@ -29,6 +29,12 @@
"reference": "Modules/Settings/AboutTab.qml:440", "reference": "Modules/Settings/AboutTab.qml:440",
"comment": "" "comment": ""
}, },
{
"term": "1 event",
"context": "1 event",
"reference": "Modules/DankDash/Overview/CalendarOverviewCard.qml:136",
"comment": ""
},
{ {
"term": "24-Hour Format", "term": "24-Hour Format",
"context": "24-Hour Format", "context": "24-Hour Format",
@@ -119,6 +125,12 @@
"reference": "Services/AppSearchService.qml:217, Services/AppSearchService.qml:233, Modals/Spotlight/SpotlightModal.qml:39, Modules/AppDrawer/CategorySelector.qml:11, Modules/AppDrawer/AppLauncher.qml:12, Modules/AppDrawer/AppLauncher.qml:23, Modules/AppDrawer/AppLauncher.qml:24, Modules/AppDrawer/AppLauncher.qml:41, Modules/AppDrawer/AppLauncher.qml:42, Modules/AppDrawer/AppLauncher.qml:69, Modules/AppDrawer/AppDrawerPopout.qml:45", "reference": "Services/AppSearchService.qml:217, Services/AppSearchService.qml:233, Modals/Spotlight/SpotlightModal.qml:39, Modules/AppDrawer/CategorySelector.qml:11, Modules/AppDrawer/AppLauncher.qml:12, Modules/AppDrawer/AppLauncher.qml:23, Modules/AppDrawer/AppLauncher.qml:24, Modules/AppDrawer/AppLauncher.qml:41, Modules/AppDrawer/AppLauncher.qml:42, Modules/AppDrawer/AppLauncher.qml:69, Modules/AppDrawer/AppDrawerPopout.qml:45",
"comment": "" "comment": ""
}, },
{
"term": "All day",
"context": "All day",
"reference": "Modules/DankDash/Overview/CalendarOverviewCard.qml:402",
"comment": ""
},
{ {
"term": "All displays", "term": "All displays",
"context": "All displays", "context": "All displays",
@@ -164,13 +176,13 @@
{ {
"term": "Apply GTK Colors", "term": "Apply GTK Colors",
"context": "Apply GTK Colors", "context": "Apply GTK Colors",
"reference": "Modules/Settings/ThemeColorsTab.qml:1284", "reference": "Modules/Settings/ThemeColorsTab.qml:1286",
"comment": "" "comment": ""
}, },
{ {
"term": "Apply Qt Colors", "term": "Apply Qt Colors",
"context": "Apply Qt Colors", "context": "Apply Qt Colors",
"reference": "Modules/Settings/ThemeColorsTab.qml:1320", "reference": "Modules/Settings/ThemeColorsTab.qml:1322",
"comment": "" "comment": ""
}, },
{ {
@@ -668,7 +680,7 @@
{ {
"term": "Corner Radius (0 = square corners)", "term": "Corner Radius (0 = square corners)",
"context": "Corner Radius (0 = square corners)", "context": "Corner Radius (0 = square corners)",
"reference": "Modules/Settings/ThemeColorsTab.qml:877", "reference": "Modules/Settings/ThemeColorsTab.qml:882",
"comment": "" "comment": ""
}, },
{ {
@@ -740,7 +752,7 @@
{ {
"term": "DEMO MODE - Click anywhere to exit", "term": "DEMO MODE - Click anywhere to exit",
"context": "DEMO MODE - Click anywhere to exit", "context": "DEMO MODE - Click anywhere to exit",
"reference": "Modules/Lock/LockScreenContent.qml:601", "reference": "Modules/Lock/LockScreenContent.qml:602",
"comment": "" "comment": ""
}, },
{ {
@@ -776,13 +788,13 @@
{ {
"term": "Dank Bar Transparency", "term": "Dank Bar Transparency",
"context": "Dank Bar Transparency", "context": "Dank Bar Transparency",
"reference": "Modules/Settings/ThemeColorsTab.qml:742", "reference": "Modules/Settings/ThemeColorsTab.qml:747",
"comment": "" "comment": ""
}, },
{ {
"term": "Dank Bar Widget Transparency", "term": "Dank Bar Widget Transparency",
"context": "Dank Bar Widget Transparency", "context": "Dank Bar Widget Transparency",
"reference": "Modules/Settings/ThemeColorsTab.qml:776", "reference": "Modules/Settings/ThemeColorsTab.qml:781",
"comment": "" "comment": ""
}, },
{ {
@@ -1046,19 +1058,19 @@
{ {
"term": "Font Family", "term": "Font Family",
"context": "Font Family", "context": "Font Family",
"reference": "Modules/Notepad/NotepadSettings.qml:220, Modules/Settings/ThemeColorsTab.qml:939", "reference": "Modules/Notepad/NotepadSettings.qml:220, Modules/Settings/ThemeColorsTab.qml:944",
"comment": "" "comment": ""
}, },
{ {
"term": "Font Scale", "term": "Font Scale",
"context": "Font Scale", "context": "Font Scale",
"reference": "Modules/Settings/ThemeColorsTab.qml:1059", "reference": "Modules/Settings/ThemeColorsTab.qml:1064",
"comment": "" "comment": ""
}, },
{ {
"term": "Font Settings", "term": "Font Settings",
"context": "Font Settings", "context": "Font Settings",
"reference": "Modules/Settings/ThemeColorsTab.qml:930", "reference": "Modules/Settings/ThemeColorsTab.qml:935",
"comment": "" "comment": ""
}, },
{ {
@@ -1070,7 +1082,7 @@
{ {
"term": "Font Weight", "term": "Font Weight",
"context": "Font Weight", "context": "Font Weight",
"reference": "Modules/Settings/ThemeColorsTab.qml:960", "reference": "Modules/Settings/ThemeColorsTab.qml:965",
"comment": "" "comment": ""
}, },
{ {
@@ -1196,7 +1208,7 @@
{ {
"term": "Hibernate", "term": "Hibernate",
"context": "Hibernate", "context": "Hibernate",
"reference": "Modals/PowerMenuModal.qml:43, Modals/PowerMenuModal.qml:311, Modules/Lock/LockPowerMenu.qml:310", "reference": "Modals/PowerMenuModal.qml:43, Modals/PowerMenuModal.qml:311, Modules/Lock/LockPowerMenu.qml:312",
"comment": "" "comment": ""
}, },
{ {
@@ -1238,7 +1250,7 @@
{ {
"term": "Icon Theme", "term": "Icon Theme",
"context": "Icon Theme", "context": "Icon Theme",
"reference": "Modules/Settings/ThemeColorsTab.qml:1199", "reference": "Modules/Settings/ThemeColorsTab.qml:1204",
"comment": "" "comment": ""
}, },
{ {
@@ -1406,7 +1418,7 @@
{ {
"term": "Log Out", "term": "Log Out",
"context": "Log Out", "context": "Log Out",
"reference": "Modals/PowerMenuModal.qml:35, Modals/PowerMenuModal.qml:204, Modules/Lock/LockPowerMenu.qml:207, Modules/ControlCenter/PowerMenu.qml:14", "reference": "Modals/PowerMenuModal.qml:35, Modals/PowerMenuModal.qml:204, Modules/Lock/LockPowerMenu.qml:209, Modules/ControlCenter/PowerMenu.qml:14",
"comment": "" "comment": ""
}, },
{ {
@@ -1460,7 +1472,7 @@
{ {
"term": "Matugen Palette", "term": "Matugen Palette",
"context": "Matugen Palette", "context": "Matugen Palette",
"reference": "Modules/Settings/ThemeColorsTab.qml:624, Modules/Settings/PersonalizationTab.qml:1049", "reference": "Modules/Settings/ThemeColorsTab.qml:629, Modules/Settings/PersonalizationTab.qml:1049",
"comment": "" "comment": ""
}, },
{ {
@@ -1544,7 +1556,7 @@
{ {
"term": "Monospace Font", "term": "Monospace Font",
"context": "Monospace Font", "context": "Monospace Font",
"reference": "Modules/Settings/ThemeColorsTab.qml:1026", "reference": "Modules/Settings/ThemeColorsTab.qml:1031",
"comment": "" "comment": ""
}, },
{ {
@@ -1706,7 +1718,7 @@
{ {
"term": "Notepad", "term": "Notepad",
"context": "Notepad", "context": "Notepad",
"reference": "DMSShell.qml:412, Modules/Settings/DankBarTab.qml:175", "reference": "DMSShell.qml:394, Modules/Settings/DankBarTab.qml:175",
"comment": "" "comment": ""
}, },
{ {
@@ -1898,7 +1910,7 @@
{ {
"term": "Popup Transparency", "term": "Popup Transparency",
"context": "Popup Transparency", "context": "Popup Transparency",
"reference": "Modules/Settings/ThemeColorsTab.qml:840", "reference": "Modules/Settings/ThemeColorsTab.qml:845",
"comment": "" "comment": ""
}, },
{ {
@@ -1910,13 +1922,13 @@
{ {
"term": "Power Off", "term": "Power Off",
"context": "Power Off", "context": "Power Off",
"reference": "Modals/PowerMenuModal.qml:51, Modals/PowerMenuModal.qml:419, Modules/Lock/LockPowerMenu.qml:430, Modules/ControlCenter/PowerMenu.qml:17", "reference": "Modals/PowerMenuModal.qml:51, Modals/PowerMenuModal.qml:419, Modules/Lock/LockPowerMenu.qml:432, Modules/ControlCenter/PowerMenu.qml:17",
"comment": "" "comment": ""
}, },
{ {
"term": "Power Options", "term": "Power Options",
"context": "Power Options", "context": "Power Options",
"reference": "Modals/PowerMenuModal.qml:147, Modules/Lock/LockPowerMenu.qml:152, Modules/ControlCenter/PowerMenu.qml:13", "reference": "Modals/PowerMenuModal.qml:147, Modules/Lock/LockPowerMenu.qml:154, Modules/ControlCenter/PowerMenu.qml:13",
"comment": "" "comment": ""
}, },
{ {
@@ -1988,7 +2000,7 @@
{ {
"term": "Reboot", "term": "Reboot",
"context": "Reboot", "context": "Reboot",
"reference": "Modals/PowerMenuModal.qml:47, Modals/PowerMenuModal.qml:365, Modules/Lock/LockPowerMenu.qml:370, Modules/ControlCenter/PowerMenu.qml:16", "reference": "Modals/PowerMenuModal.qml:47, Modals/PowerMenuModal.qml:365, Modules/Lock/LockPowerMenu.qml:372, Modules/ControlCenter/PowerMenu.qml:16",
"comment": "" "comment": ""
}, },
{ {
@@ -2072,7 +2084,7 @@
{ {
"term": "Scale all font sizes", "term": "Scale all font sizes",
"context": "Scale all font sizes", "context": "Scale all font sizes",
"reference": "Modules/Settings/ThemeColorsTab.qml:1066", "reference": "Modules/Settings/ThemeColorsTab.qml:1071",
"comment": "" "comment": ""
}, },
{ {
@@ -2132,7 +2144,7 @@
{ {
"term": "Select font weight", "term": "Select font weight",
"context": "Select font weight", "context": "Select font weight",
"reference": "Modules/Settings/ThemeColorsTab.qml:961", "reference": "Modules/Settings/ThemeColorsTab.qml:966",
"comment": "" "comment": ""
}, },
{ {
@@ -2144,13 +2156,13 @@
{ {
"term": "Select monospace font for process list and technical displays", "term": "Select monospace font for process list and technical displays",
"context": "Select monospace font for process list and technical displays", "context": "Select monospace font for process list and technical displays",
"reference": "Modules/Settings/ThemeColorsTab.qml:1027", "reference": "Modules/Settings/ThemeColorsTab.qml:1032",
"comment": "" "comment": ""
}, },
{ {
"term": "Select system font family", "term": "Select system font family",
"context": "Select system font family", "context": "Select system font family",
"reference": "Modules/Settings/ThemeColorsTab.qml:940", "reference": "Modules/Settings/ThemeColorsTab.qml:945",
"comment": "" "comment": ""
}, },
{ {
@@ -2324,7 +2336,7 @@
{ {
"term": "Suspend", "term": "Suspend",
"context": "Suspend", "context": "Suspend",
"reference": "Modals/PowerMenuModal.qml:39, Modals/PowerMenuModal.qml:257, Modules/Lock/LockPowerMenu.qml:258, Modules/ControlCenter/PowerMenu.qml:15", "reference": "Modals/PowerMenuModal.qml:39, Modals/PowerMenuModal.qml:257, Modules/Lock/LockPowerMenu.qml:260, Modules/ControlCenter/PowerMenu.qml:15",
"comment": "" "comment": ""
}, },
{ {
@@ -2354,7 +2366,7 @@
{ {
"term": "System App Theming", "term": "System App Theming",
"context": "System App Theming", "context": "System App Theming",
"reference": "Modules/Settings/ThemeColorsTab.qml:1252", "reference": "Modules/Settings/ThemeColorsTab.qml:1254",
"comment": "" "comment": ""
}, },
{ {
@@ -2450,7 +2462,7 @@
{ {
"term": "The below settings will modify your GTK and Qt settings. If you wish to preserve your current configurations, please back them up (qt5ct.conf|qt6ct.conf and ~/.config/gtk-3.0|gtk-4.0).", "term": "The below settings will modify your GTK and Qt settings. If you wish to preserve your current configurations, please back them up (qt5ct.conf|qt6ct.conf and ~/.config/gtk-3.0|gtk-4.0).",
"context": "The below settings will modify your GTK and Qt settings. If you wish to preserve your current configurations, please back them up (qt5ct.conf|qt6ct.conf and ~/.config/gtk-3.0|gtk-4.0).", "context": "The below settings will modify your GTK and Qt settings. If you wish to preserve your current configurations, please back them up (qt5ct.conf|qt6ct.conf and ~/.config/gtk-3.0|gtk-4.0).",
"reference": "Modules/Settings/ThemeColorsTab.qml:1160", "reference": "Modules/Settings/ThemeColorsTab.qml:1165",
"comment": "" "comment": ""
}, },
{ {
@@ -2462,7 +2474,7 @@
{ {
"term": "Theme Color", "term": "Theme Color",
"context": "Theme Color", "context": "Theme Color",
"reference": "Modules/Settings/ThemeColorsTab.qml:103", "reference": "Modules/Settings/ThemeColorsTab.qml:108",
"comment": "" "comment": ""
}, },
{ {
@@ -2714,7 +2726,7 @@
{ {
"term": "Widget Styling", "term": "Widget Styling",
"context": "Widget Styling", "context": "Widget Styling",
"reference": "Modules/Settings/ThemeColorsTab.qml:729", "reference": "Modules/Settings/ThemeColorsTab.qml:734",
"comment": "" "comment": ""
}, },
{ {
@@ -2783,6 +2795,12 @@
"reference": "Modules/Notepad/Notepad.qml:396", "reference": "Modules/Notepad/Notepad.qml:396",
"comment": "" "comment": ""
}, },
{
"term": "events",
"context": "events",
"reference": "Modules/DankDash/Overview/CalendarOverviewCard.qml:136",
"comment": ""
},
{ {
"term": "loginctl not available - lock integration requires DMS socket connection", "term": "loginctl not available - lock integration requires DMS socket connection",
"context": "loginctl not available - lock integration requires DMS socket connection", "context": "loginctl not available - lock integration requires DMS socket connection",

21
translations/template.json
View File

@@ -34,6 +34,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "1 event",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "24-Hour Format", "term": "24-Hour Format",
"translation": "", "translation": "",
@@ -139,6 +146,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "All day",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "All displays", "term": "All displays",
"translation": "", "translation": "",
@@ -3247,6 +3261,13 @@
"reference": "", "reference": "",
"comment": "" "comment": ""
}, },
{
"term": "events",
"translation": "",
"context": "",
"reference": "",
"comment": ""
},
{ {
"term": "loginctl not available - lock integration requires DMS socket connection", "term": "loginctl not available - lock integration requires DMS socket connection",
"translation": "", "translation": "",