diff --git a/Assets/settings-search-index.json b/Assets/settings-search-index.json index a5cc9ed26..a51a9b0cd 100644 --- a/Assets/settings-search-index.json +++ b/Assets/settings-search-index.json @@ -681,15 +681,6 @@ "subTab": 0, "subTabLabel": "common.appearance" }, - { - "labelKey": "panels.dock.appearance-indicator-color-label", - "descriptionKey": "panels.dock.appearance-indicator-color-description", - "widget": "NColorChoice", - "tab": 5, - "tabLabel": "panels.dock.title", - "subTab": 0, - "subTabLabel": "common.appearance" - }, { "labelKey": "panels.dock.appearance-indicator-opacity-label", "descriptionKey": "panels.dock.appearance-indicator-opacity-description", diff --git a/Modules/Bar/Widgets/CustomButton.qml b/Modules/Bar/Widgets/CustomButton.qml index 811dc8ecf..e742fcc50 100644 --- a/Modules/Bar/Widgets/CustomButton.qml +++ b/Modules/Bar/Widgets/CustomButton.qml @@ -522,7 +522,8 @@ Item { if (rightClickExec) { Quickshell.execDetached(["sh", "-lc", rightClickExec]); Logger.i("CustomButton", `Executing command: ${rightClickExec}`); - } if (!rightClickUpdateText) { + } + if (!rightClickUpdateText) { BarService.openWidgetSettings(screen, section, sectionWidgetIndex, widgetId, widgetSettings); } if (!textStream && rightClickUpdateText) { @@ -534,7 +535,8 @@ Item { if (middleClickExec) { Quickshell.execDetached(["sh", "-lc", middleClickExec]); Logger.i("CustomButton", `Executing command: ${middleClickExec}`); - } if (!middleClickUpdateText) { + } + if (!middleClickUpdateText) { BarService.openWidgetSettings(screen, section, sectionWidgetIndex, widgetId, widgetSettings); } if (!textStream && middleClickUpdateText) { diff --git a/Services/Location/Calendar/Khal.qml b/Services/Location/Calendar/Khal.qml index a073db81c..2e14e233a 100644 --- a/Services/Location/Calendar/Khal.qml +++ b/Services/Location/Calendar/Khal.qml @@ -141,28 +141,27 @@ Singleton { if (event["repeat-pattern"] !== "") { // if there is a repeat pattern, the event must be included each time result.push({ - uid: event.uid, - calendar: event.calendar, - summary: event.title, - start: parseTimestamp(event["start-long-full"]), - end: parseTimestamp(event["end-long-full"]), - location: event.location, - description: event.description + uid: event.uid, + calendar: event.calendar, + summary: event.title, + start: parseTimestamp(event["start-long-full"]), + end: parseTimestamp(event["end-long-full"]), + location: event.location, + description: event.description }); - } - else if (!duplicates.has(event.uid) ) { + } else if (!duplicates.has(event.uid)) { // in any other cases, we must remove duplicates using the uid of the event result.push({ - uid: event.uid, - calendar: event.calendar, - summary: event.title, - start: parseTimestamp(event["start-long-full"]), - end: parseTimestamp(event["end-long-full"]), - location: event.location, - description: event.description + uid: event.uid, + calendar: event.calendar, + summary: event.title, + start: parseTimestamp(event["start-long-full"]), + end: parseTimestamp(event["end-long-full"]), + location: event.location, + description: event.description }); - duplicates.add(event.uid) - } + duplicates.add(event.uid); + } } }