Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-07 05:55:37 -05:00
Code Packages Releases Activity

Merge branch 'master' of github.com:bbedward/dank-material-dark-shell

Browse Source
This commit is contained in:
bbedward
2025-08-02 12:13:31 -04:00
parent be301f829f 8fb8281988
commit 723a9b1824
6 changed files with 104 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Common/Prefs.qml
View File

@@ -497,7 +497,10 @@ Singleton {
function updateListModel(listModel, order) {
listModel.clear();
for (var i = 0; i < order.length; i++) {
listModel.append({"widgetId": order[i]});
// Handle both old string format and new object format
var widgetId = typeof order[i] === "string" ? order[i] : order[i].id;
var enabled = typeof order[i] === "string" ? true : order[i].enabled;
listModel.append({"widgetId": widgetId, "enabled": enabled});
}
}

14
Modules/Settings/AppearanceTab.qml
View File

@@ -108,16 +108,18 @@ ScrollView {
text: "Font Family"
description: "Select system font family"
currentValue: {
if (Prefs.fontFamily === Prefs.defaultFontFamily)
return "Default";
return Prefs.fontFamily || "Default";
// Always show the font name in parentheses for clarity
if (Prefs.fontFamily === Prefs.defaultFontFamily) {
return "Default (" + Prefs.defaultFontFamily + ")";
} else {
return Prefs.fontFamily || "Default (" + Prefs.defaultFontFamily + ")";
}
}
enableFuzzySearch: true
popupWidthOffset: 100
maxPopupHeight: 400
options: {
var fonts = ["Default"];
var fonts = ["Default (" + Prefs.defaultFontFamily + ")"];
var availableFonts = Qt.fontFamilies();
var rootFamilies = [];
var seenFamilies = new Set();
@@ -144,7 +146,7 @@ ScrollView {
return fonts.concat(rootFamilies.sort());
}
onValueChanged: (value) => {
if (value === "Default")
if (value.startsWith("Default ("))
Prefs.setFontFamily(Prefs.defaultFontFamily);
else
Prefs.setFontFamily(value);

167
Modules/Settings/WidgetsTab.qml
View File

@@ -110,10 +110,25 @@ ScrollView {
}
]
// Default widget configurations for each section
property var defaultLeftWidgets: ["launcherButton", "workspaceSwitcher", "focusedWindow"]
property var defaultCenterWidgets: ["music", "clock", "weather"]
property var defaultRightWidgets: ["systemTray", "clipboard", "systemResources", "notificationButton", "battery", "controlCenterButton"]
// Default widget configurations for each section (with enabled states)
property var defaultLeftWidgets: [
{id: "launcherButton", enabled: true},
{id: "workspaceSwitcher", enabled: true},
{id: "focusedWindow", enabled: true}
]
property var defaultCenterWidgets: [
{id: "music", enabled: true},
{id: "clock", enabled: true},
{id: "weather", enabled: true}
]
property var defaultRightWidgets: [
{id: "systemTray", enabled: true},
{id: "clipboard", enabled: true},
{id: "systemResources", enabled: true},
{id: "notificationButton", enabled: true},
{id: "battery", enabled: true},
{id: "controlCenterButton", enabled: true}
]
Component.onCompleted: {
// Initialize sections with defaults if they're empty
@@ -133,14 +148,17 @@ ScrollView {
var centerWidgets = Prefs.topBarCenterWidgets.slice()
var rightWidgets = Prefs.topBarRightWidgets.slice()
// Create widget object with enabled state
var widgetObj = {id: widgetId, enabled: true}
if (targetSection === "left") {
leftWidgets.push(widgetId)
leftWidgets.push(widgetObj)
Prefs.setTopBarLeftWidgets(leftWidgets)
} else if (targetSection === "center") {
centerWidgets.push(widgetId)
centerWidgets.push(widgetObj)
Prefs.setTopBarCenterWidgets(centerWidgets)
} else if (targetSection === "right") {
rightWidgets.push(widgetId)
rightWidgets.push(widgetObj)
Prefs.setTopBarRightWidgets(rightWidgets)
}
}
@@ -162,34 +180,44 @@ ScrollView {
}
}
function handleItemEnabledChanged(itemId, enabled) {
// Update the widget's enabled state in preferences
if (itemId === "focusedWindow") {
Prefs.setShowFocusedWindow(enabled)
} else if (itemId === "weather") {
Prefs.setShowWeather(enabled)
} else if (itemId === "music") {
Prefs.setShowMusic(enabled)
} else if (itemId === "clipboard") {
Prefs.setShowClipboard(enabled)
} else if (itemId === "systemResources") {
Prefs.setShowSystemResources(enabled)
} else if (itemId === "systemTray") {
Prefs.setShowSystemTray(enabled)
} else if (itemId === "clock") {
Prefs.setShowClock(enabled)
} else if (itemId === "notificationButton") {
Prefs.setShowNotificationButton(enabled)
} else if (itemId === "controlCenterButton") {
Prefs.setShowControlCenterButton(enabled)
} else if (itemId === "battery") {
Prefs.setShowBattery(enabled)
} else if (itemId === "launcherButton") {
Prefs.setShowLauncherButton(enabled)
} else if (itemId === "workspaceSwitcher") {
Prefs.setShowWorkspaceSwitcher(enabled)
function handleItemEnabledChanged(sectionId, itemId, enabled) {
// Update the specific widget instance's enabled state in the section
var widgets = []
if (sectionId === "left") {
widgets = Prefs.topBarLeftWidgets.slice()
} else if (sectionId === "center") {
widgets = Prefs.topBarCenterWidgets.slice()
} else if (sectionId === "right") {
widgets = Prefs.topBarRightWidgets.slice()
}
// Find and update the specific widget instance
for (var i = 0; i < widgets.length; i++) {
// Handle both old string format and new object format for backward compatibility
var widget = widgets[i]
var widgetId = typeof widget === "string" ? widget : widget.id
// Update the enabled state for this specific instance
if (widgetId === itemId) {
if (typeof widget === "string") {
// Convert old string format to object format
widgets[i] = {id: widget, enabled: enabled}
} else {
widgets[i] = {id: widget.id, enabled: enabled}
}
break
}
}
// Save the updated widgets array
if (sectionId === "left") {
Prefs.setTopBarLeftWidgets(widgets)
} else if (sectionId === "center") {
Prefs.setTopBarCenterWidgets(widgets)
} else if (sectionId === "right") {
Prefs.setTopBarRightWidgets(widgets)
}
// Note: spacer and separator don't need preference handling as they're always enabled
}
function handleItemOrderChanged(sectionId, newOrder) {
@@ -204,47 +232,26 @@ ScrollView {
function getItemsForSection(sectionId) {
var widgets = []
var widgetIds = []
var widgetData = []
if (sectionId === "left") {
widgetIds = Prefs.topBarLeftWidgets || []
widgetData = Prefs.topBarLeftWidgets || []
} else if (sectionId === "center") {
widgetIds = Prefs.topBarCenterWidgets || []
widgetData = Prefs.topBarCenterWidgets || []
} else if (sectionId === "right") {
widgetIds = Prefs.topBarRightWidgets || []
widgetData = Prefs.topBarRightWidgets || []
}
widgetIds.forEach(widgetId => {
widgetData.forEach(widget => {
// Handle both old string format and new object format for backward compatibility
var widgetId = typeof widget === "string" ? widget : widget.id
var widgetEnabled = typeof widget === "string" ? true : widget.enabled
var widgetDef = baseWidgetDefinitions.find(w => w.id === widgetId)
if (widgetDef) {
var item = Object.assign({}, widgetDef)
// Set enabled state based on preferences
if (widgetId === "focusedWindow") {
item.enabled = Prefs.showFocusedWindow
} else if (widgetId === "weather") {
item.enabled = Prefs.showWeather
} else if (widgetId === "music") {
item.enabled = Prefs.showMusic
} else if (widgetId === "clipboard") {
item.enabled = Prefs.showClipboard
} else if (widgetId === "systemResources") {
item.enabled = Prefs.showSystemResources
} else if (widgetId === "systemTray") {
item.enabled = Prefs.showSystemTray
} else if (widgetId === "clock") {
item.enabled = Prefs.showClock
} else if (widgetId === "notificationButton") {
item.enabled = Prefs.showNotificationButton
} else if (widgetId === "controlCenterButton") {
item.enabled = Prefs.showControlCenterButton
} else if (widgetId === "battery") {
item.enabled = Prefs.showBattery
} else if (widgetId === "launcherButton") {
item.enabled = Prefs.showLauncherButton
} else if (widgetId === "workspaceSwitcher") {
item.enabled = Prefs.showWorkspaceSwitcher
}
// spacer and separator are always enabled (no preference toggle needed)
// Use the per-instance enabled state
item.enabled = widgetEnabled
widgets.push(item)
}
})
@@ -320,24 +327,10 @@ ScrollView {
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: {
// Reset all sections to defaults
// Reset all sections to defaults (with per-instance enabled states)
Prefs.setTopBarLeftWidgets(defaultLeftWidgets)
Prefs.setTopBarCenterWidgets(defaultCenterWidgets)
Prefs.setTopBarRightWidgets(defaultRightWidgets)
// Reset all widget enabled states to defaults (all enabled)
Prefs.setShowFocusedWindow(true)
Prefs.setShowWeather(true)
Prefs.setShowMusic(true)
Prefs.setShowClipboard(true)
Prefs.setShowSystemResources(true)
Prefs.setShowSystemTray(true)
Prefs.setShowClock(true)
Prefs.setShowNotificationButton(true)
Prefs.setShowControlCenterButton(true)
Prefs.setShowBattery(true)
Prefs.setShowLauncherButton(true)
Prefs.setShowWorkspaceSwitcher(true)
}
}
@@ -393,8 +386,8 @@ ScrollView {
allWidgets: widgetsTab.baseWidgetDefinitions
items: widgetsTab.getItemsForSection("left")
onItemEnabledChanged: (itemId, enabled) => {
widgetsTab.handleItemEnabledChanged(itemId, enabled)
onItemEnabledChanged: (sectionId, itemId, enabled) => {
widgetsTab.handleItemEnabledChanged(sectionId, itemId, enabled)
}
onItemOrderChanged: (newOrder) => {
@@ -421,8 +414,8 @@ ScrollView {
allWidgets: widgetsTab.baseWidgetDefinitions
items: widgetsTab.getItemsForSection("center")
onItemEnabledChanged: (itemId, enabled) => {
widgetsTab.handleItemEnabledChanged(itemId, enabled)
onItemEnabledChanged: (sectionId, itemId, enabled) => {
widgetsTab.handleItemEnabledChanged(sectionId, itemId, enabled)
}
onItemOrderChanged: (newOrder) => {
@@ -449,8 +442,8 @@ ScrollView {
allWidgets: widgetsTab.baseWidgetDefinitions
items: widgetsTab.getItemsForSection("right")
onItemEnabledChanged: (itemId, enabled) => {
widgetsTab.handleItemEnabledChanged(itemId, enabled)
onItemEnabledChanged: (sectionId, itemId, enabled) => {
widgetsTab.handleItemEnabledChanged(sectionId, itemId, enabled)
}
onItemOrderChanged: (newOrder) => {

27
Modules/TopBar/TopBar.qml
View File

@@ -153,23 +153,10 @@ PanelWindow {
readonly property bool spacingTight: validLayout && (leftToMediaGap < 150 || clockToRightGap < 100)
readonly property bool overlapping: validLayout && (leftToMediaGap < 100 || clockToRightGap < 50)
// Helper functions
function getWidgetEnabled(widgetId) {
switch (widgetId) {
case "launcherButton": return Prefs.showLauncherButton
case "workspaceSwitcher": return Prefs.showWorkspaceSwitcher
case "focusedWindow": return Prefs.showFocusedWindow
case "clock": return Prefs.showClock
case "music": return Prefs.showMusic
case "weather": return Prefs.showWeather
case "systemTray": return Prefs.showSystemTray
case "clipboard": return Prefs.showClipboard
case "systemResources": return Prefs.showSystemResources
case "notificationButton": return Prefs.showNotificationButton
case "battery": return Prefs.showBattery
case "controlCenterButton": return Prefs.showControlCenterButton
default: return false
}
// Helper functions - now uses per-instance enabled state from model
function getWidgetEnabled(enabled) {
// Use the enabled state directly from the model
return enabled !== undefined ? enabled : true
}
function getWidgetVisible(widgetId) {
@@ -247,7 +234,7 @@ PanelWindow {
Loader {
anchors.verticalCenter: parent ? parent.verticalCenter : undefined
active: topBarContent.getWidgetEnabled(model.widgetId) && topBarContent.getWidgetVisible(model.widgetId)
active: topBarContent.getWidgetEnabled(model.enabled) && topBarContent.getWidgetVisible(model.widgetId)
sourceComponent: topBarContent.getWidgetComponent(model.widgetId)
property string widgetId: model.widgetId
@@ -272,7 +259,7 @@ PanelWindow {
Loader {
anchors.verticalCenter: parent ? parent.verticalCenter : undefined
active: topBarContent.getWidgetEnabled(model.widgetId) && topBarContent.getWidgetVisible(model.widgetId)
active: topBarContent.getWidgetEnabled(model.enabled) && topBarContent.getWidgetVisible(model.widgetId)
sourceComponent: topBarContent.getWidgetComponent(model.widgetId)
property string widgetId: model.widgetId
@@ -298,7 +285,7 @@ PanelWindow {
Loader {
anchors.verticalCenter: parent ? parent.verticalCenter : undefined
active: topBarContent.getWidgetEnabled(model.widgetId) && topBarContent.getWidgetVisible(model.widgetId)
active: topBarContent.getWidgetEnabled(model.enabled) && topBarContent.getWidgetVisible(model.widgetId)
sourceComponent: topBarContent.getWidgetComponent(model.widgetId)
property string widgetId: model.widgetId

4
Widgets/DankDropdown.qml
View File

@@ -214,7 +214,7 @@ Rectangle {
parent: Overlay.overlay
width: dropdown.width + root.popupWidthOffset
height: Math.min(root.maxPopupHeight, (root.enableFuzzySearch ? 48 : 0) + Math.min(filteredOptions.length, 10) * 36 + 16)
height: Math.min(root.maxPopupHeight, (root.enableFuzzySearch ? 54 : 0) + Math.min(filteredOptions.length, 10) * 36 + 16)
padding: 0
modal: true
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
@@ -245,7 +245,7 @@ Rectangle {
id: searchContainer
width: parent.width
height: 36
height: 42
visible: root.enableFuzzySearch
radius: Theme.cornerRadiusSmall
color: Theme.surfaceVariantAlpha

6
Widgets/DankSections.qml
View File

@@ -12,7 +12,7 @@ Column {
property string titleIcon: "widgets"
property string sectionId: ""
signal itemEnabledChanged(string itemId, bool enabled)
signal itemEnabledChanged(string sectionId, string itemId, bool enabled)
signal itemOrderChanged(var newOrder)
signal addWidget(string sectionId)
signal removeLastWidget(string sectionId)
@@ -142,7 +142,7 @@ Column {
hideText: true
checked: modelData.enabled
onToggled: (checked) => {
root.itemEnabledChanged(modelData.id, checked)
root.itemEnabledChanged(root.sectionId, modelData.id, checked)
}
}
@@ -183,7 +183,7 @@ Column {
var draggedItem = newItems.splice(index, 1)[0]
newItems.splice(newIndex, 0, draggedItem)
root.itemOrderChanged(newItems.map(item => item.id))
root.itemOrderChanged(newItems.map(item => ({id: item.id, enabled: item.enabled})))
}
}