never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced all NWidgets callback by proper signals

Browse source
This commit is contained in:
quadbyte 2025-08-12 13:22:15 -04:00
parent 1a7a0dbb16
commit a7d4e0ec1d
27 changed files with 93 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/Bar/Bar.qml
View file

@ -109,7 +109,7 @@ Variants {
sizeMultiplier: 0.8 sizeMultiplier: 0.8
showBorder: false showBorder: false
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
onClicked: function () { onClicked: {
demoPanel.isLoaded = !demoPanel.isLoaded demoPanel.isLoaded = !demoPanel.isLoaded
} }
} }
@ -121,7 +121,7 @@ Variants {
sizeMultiplier: 0.8 sizeMultiplier: 0.8
showBorder: false showBorder: false
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
onClicked: function () { onClicked: {
// Map this button's center to the screen and open the side panel below it // Map this button's center to the screen and open the side panel below it
const localCenterX = width / 2 const localCenterX = width / 2
const localCenterY = height / 2 const localCenterY = height / 2

6
Modules/Bar/Clock.qml
View file

@ -12,15 +12,15 @@ NClock {
target: root target: root
} }
onEntered: function () { onEntered: {
if (!calendar.isLoaded) { if (!calendar.isLoaded) {
tooltip.show() tooltip.show()
} }
} }
onExited: function () { onExited: {
tooltip.hide() tooltip.hide()
} }
onClicked: function () { onClicked: {
tooltip.hide() tooltip.hide()
calendar.isLoaded = !calendar.isLoaded calendar.isLoaded = !calendar.isLoaded
} }

2
Modules/Bar/Volume.qml
View file

@ -70,7 +70,7 @@ Item {
Audio.volumeDecrement() Audio.volumeDecrement()
} }
} }
onClicked: function () { onClicked: {
audioDeviceSelector.isLoaded = !audioDeviceSelector.isLoaded audioDeviceSelector.isLoaded = !audioDeviceSelector.isLoaded
} }
} }

2
Modules/Bar/WiFi.qml
View file

@ -24,7 +24,7 @@ NIconButton {
return connected ? network.signalIcon(parent.currentSignal) : "wifi_off" return connected ? network.signalIcon(parent.currentSignal) : "wifi_off"
} }
tooltipText: "WiFi Networks" tooltipText: "WiFi Networks"
onClicked: function () { onClicked: {
if (!wifiMenuLoader.active) { if (!wifiMenuLoader.active) {
wifiMenuLoader.isLoaded = true wifiMenuLoader.isLoaded = true
} }

4
Modules/Bar/WiFiMenu.qml
View file

@ -78,7 +78,7 @@ NLoader {
NIconButton { NIconButton {
icon: "refresh" icon: "refresh"
sizeMultiplier: 0.8 sizeMultiplier: 0.8
onClicked: function () { onClicked: {
network.refreshNetworks() network.refreshNetworks()
} }
} }
@ -86,7 +86,7 @@ NLoader {
NIconButton { NIconButton {
icon: "close" icon: "close"
sizeMultiplier: 0.8 sizeMultiplier: 0.8
onClicked: function () { onClicked: {
wifiPanel.visible = false wifiPanel.visible = false
network.onMenuClosed() network.onMenuClosed()
} }

4
Modules/Calendar/Calendar.qml
View file

@ -47,7 +47,7 @@ NLoader {
NIconButton { NIconButton {
icon: "chevron_left" icon: "chevron_left"
onClicked: function () { onClicked: {
let newDate = new Date(grid.year, grid.month - 1, 1) let newDate = new Date(grid.year, grid.month - 1, 1)
grid.year = newDate.getFullYear() grid.year = newDate.getFullYear()
grid.month = newDate.getMonth() grid.month = newDate.getMonth()
@ -65,7 +65,7 @@ NLoader {
NIconButton { NIconButton {
icon: "chevron_right" icon: "chevron_right"
onClicked: function () { onClicked: {
let newDate = new Date(grid.year, grid.month + 1, 1) let newDate = new Date(grid.year, grid.month + 1, 1)
grid.year = newDate.getFullYear() grid.year = newDate.getFullYear()
grid.month = newDate.getMonth() grid.month = newDate.getMonth()

9
Modules/DemoPanel/DemoPanel.qml
View file

@ -73,17 +73,17 @@ NLoader {
stepSize: 0.01 stepSize: 0.01
value: Scaling.overrideScale value: Scaling.overrideScale
implicitWidth: bgRect.width * 0.75 implicitWidth: bgRect.width * 0.75
onMoved: function () { onMoved: {
Scaling.overrideScale = value Scaling.overrideScale = value
} }
onPressedChanged: function () { onPressedChanged: {
Scaling.overrideEnabled = true Scaling.overrideEnabled = true
} }
} }
NIconButton { NIconButton {
icon: "refresh" icon: "refresh"
fontPointSize: Style.fontSizeXL * scaling fontPointSize: Style.fontSizeXL * scaling
onClicked: function () { onClicked: {
Scaling.overrideEnabled = false Scaling.overrideEnabled = false
Scaling.overrideScale = 1.0 Scaling.overrideScale = 1.0
} }
@ -171,8 +171,9 @@ NLoader {
NTextInput { NTextInput {
text: "Type anything" text: "Type anything"
Layout.fillWidth: true Layout.fillWidth: true
onEditingFinished: function () {} onEditingFinished: {
}
NDivider { NDivider {
Layout.fillWidth: true Layout.fillWidth: true
} }

2
Modules/Notification/Notification.qml
View file

@ -191,7 +191,7 @@ PanelWindow {
anchors.right: parent.right anchors.right: parent.right
anchors.margins: Style.marginSmall * scaling anchors.margins: Style.marginSmall * scaling
icon: "close" icon: "close"
onClicked: function () { onClicked: {
animateOut() animateOut()
} }
} }

4
Modules/Settings/SettingsWindow.qml
View file

@ -60,7 +60,7 @@ NLoader {
"source": "Tabs/About.qml" "source": "Tabs/About.qml"
}] }]
onVisibleChanged: function () { onVisibleChanged: {
if (visible) if (visible)
currentTabIndex = 0 currentTabIndex = 0
} }
@ -188,7 +188,7 @@ NLoader {
icon: "close" icon: "close"
tooltipText: "Close settings panel" tooltipText: "Close settings panel"
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
onClicked: function () { onClicked: {
settingsWindow.isLoaded = !settingsWindow.isLoaded settingsWindow.isLoaded = !settingsWindow.isLoaded
} }
} }

2
Modules/Settings/Tabs/General.qml
View file

@ -84,7 +84,7 @@ ColumnLayout {
text: Settings.data.general.avatarImage text: Settings.data.general.avatarImage
placeholderText: "/home/user/.face" placeholderText: "/home/user/.face"
Layout.fillWidth: true Layout.fillWidth: true
onEditingFinished: function () { onEditingFinished: {
Settings.data.general.avatarImage = text Settings.data.general.avatarImage = text
} }
} }

2
Modules/Settings/Tabs/ScreenRecorder.qml
View file

@ -65,7 +65,7 @@ ColumnLayout {
NTextInput { NTextInput {
text: Settings.data.screenRecorder.directory text: Settings.data.screenRecorder.directory
Layout.fillWidth: true Layout.fillWidth: true
onEditingFinished: function () { onEditingFinished: {
Settings.data.screenRecorder.directory = text Settings.data.screenRecorder.directory = text
} }
} }

2
Modules/Settings/Tabs/TimeWeather.qml
View file

@ -58,7 +58,7 @@ ColumnLayout {
text: Settings.data.location.name text: Settings.data.location.name
placeholderText: "Enter city name" placeholderText: "Enter city name"
Layout.fillWidth: true Layout.fillWidth: true
onEditingFinished: function () { onEditingFinished: {
Settings.data.location.name = text Settings.data.location.name = text
} }
} }

2
Modules/Settings/Tabs/Wallpaper.qml
View file

@ -70,7 +70,7 @@ ColumnLayout {
NTextInput { NTextInput {
text: Settings.data.wallpaper.directory text: Settings.data.wallpaper.directory
Layout.fillWidth: true Layout.fillWidth: true
onEditingFinished: function () { onEditingFinished: {
Settings.data.wallpaper.directory = text Settings.data.wallpaper.directory = text
} }
} }

19
Modules/Settings/Tabs/WallpaperSelector.qml
View file

@ -83,9 +83,8 @@ Item {
} }
NText { NText {
text: Settings.data.wallpaper.swww.enabled ? text: Settings.data.wallpaper.swww.enabled ? "Wallpapers will change with " + Settings.data.wallpaper.swww.transitionType
"Wallpapers will change with " + Settings.data.wallpaper.swww.transitionType + " transition" : + " transition" : "Wallpapers will change instantly"
"Wallpapers will change instantly"
color: Colors.textSecondary color: Colors.textSecondary
font.pointSize: Style.fontSizeSmall * scaling font.pointSize: Style.fontSizeSmall * scaling
visible: Settings.data.wallpaper.swww.enabled visible: Settings.data.wallpaper.swww.enabled
@ -128,13 +127,13 @@ Item {
anchors.fill: parent anchors.fill: parent
clip: true clip: true
model: folderModel model: folderModel
// Fixed 5 items per row - more aggressive sizing // Fixed 5 items per row - more aggressive sizing
property int itemSize: Math.floor((width - leftMargin - rightMargin - (4 * Style.marginSmall * scaling)) / 5) property int itemSize: Math.floor((width - leftMargin - rightMargin - (4 * Style.marginSmall * scaling)) / 5)
cellWidth: Math.floor((width - leftMargin - rightMargin) / 5) cellWidth: Math.floor((width - leftMargin - rightMargin) / 5)
cellHeight: Math.floor(itemSize * 0.67) + Style.marginSmall * scaling cellHeight: Math.floor(itemSize * 0.67) + Style.marginSmall * scaling
leftMargin: Style.marginSmall * scaling leftMargin: Style.marginSmall * scaling
rightMargin: Style.marginSmall * scaling rightMargin: Style.marginSmall * scaling
topMargin: Style.marginSmall * scaling topMargin: Style.marginSmall * scaling
@ -191,9 +190,11 @@ Item {
color: Colors.textPrimary color: Colors.textPrimary
opacity: mouseArea.containsMouse ? 0.1 : 0 opacity: mouseArea.containsMouse ? 0.1 : 0
radius: parent.radius radius: parent.radius
Behavior on opacity { Behavior on opacity {
NumberAnimation { duration: 150 } NumberAnimation {
duration: 150
}
} }
} }
@ -249,4 +250,4 @@ Item {
} }
} }
} }
} }

12
Modules/SidePanel/Cards/PowerProfilesCard.qml
View file

@ -21,17 +21,23 @@ NBox {
// Performance // Performance
NIconButton { NIconButton {
icon: "speed" icon: "speed"
onClicked: function () {/* TODO: hook to power profile */ } onClicked: {
/* TODO: hook to power profile */ }
} }
// Balanced // Balanced
NIconButton { NIconButton {
icon: "balance" icon: "balance"
onClicked: function () {/* TODO: hook to power profile */ } onClicked: {
/* TODO: hook to power profile */ }
} }
// Eco // Eco
NIconButton { NIconButton {
icon: "eco" icon: "eco"
onClicked: function () {/* TODO: hook to power profile */ } onClicked: {
/* TODO: hook to power profile */ }
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true

2
Modules/SidePanel/Cards/ProfileCard.qml
View file

@ -59,7 +59,7 @@ NBox {
} }
NIconButton { NIconButton {
icon: "settings" icon: "settings"
onClicked: function () { onClicked: {
if (!root.settingsWindow) { if (!root.settingsWindow) {
const comp = Qt.createComponent("../../Settings/SettingsWindow.qml") const comp = Qt.createComponent("../../Settings/SettingsWindow.qml")
if (comp.status === Component.Ready) { if (comp.status === Component.Ready) {

4
Services/Github.qml
View file

@ -23,10 +23,10 @@ Singleton {
watchChanges: true watchChanges: true
onFileChanged: reload() onFileChanged: reload()
onAdapterUpdated: writeAdapter() onAdapterUpdated: writeAdapter()
Component.onCompleted: function () { Component.onCompleted: {
reload() reload()
} }
onLoaded: function () { onLoaded: {
loadFromCache() loadFromCache()
} }
onLoadFailed: function (error) { onLoadFailed: function (error) {

2
Services/Location.qml
View file

@ -16,7 +16,7 @@ Singleton {
FileView { FileView {
path: locationFile path: locationFile
onAdapterUpdated: writeAdapter() onAdapterUpdated: writeAdapter()
onLoaded: function () { onLoaded: {
updateWeather() updateWeather()
} }
onLoadFailed: function (error) { onLoadFailed: function (error) {

4
Services/Settings.qml
View file

@ -47,10 +47,10 @@ Singleton {
watchChanges: true watchChanges: true
onFileChanged: reload() onFileChanged: reload()
onAdapterUpdated: writeAdapter() onAdapterUpdated: writeAdapter()
Component.onCompleted: function () { Component.onCompleted: {
reload() reload()
} }
onLoaded: function () { onLoaded: {
Qt.callLater(function () { Qt.callLater(function () {
if (adapter.wallpaper.current !== "") { if (adapter.wallpaper.current !== "") {
console.log("Settings: Initializing wallpaper to:", adapter.wallpaper.current) console.log("Settings: Initializing wallpaper to:", adapter.wallpaper.current)

13
Widgets/NClock.qml
View file

@ -6,9 +6,10 @@ Rectangle {
id: root id: root
readonly property real scaling: Scaling.scale(screen) readonly property real scaling: Scaling.scale(screen)
property var onEntered: function () {}
property var onExited: function () {} signal entered
property var onClicked: function () {} signal exited
signal clicked
width: textItem.paintedWidth width: textItem.paintedWidth
height: textItem.paintedHeight height: textItem.paintedHeight
@ -26,8 +27,8 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
hoverEnabled: true hoverEnabled: true
onEntered: root.onEntered() onEntered: root.entered()
onExited: root.onExited() onExited: root.exited()
onClicked: root.onClicked() onClicked: root.clicked()
} }
} }

5
Widgets/NComboBox.qml
View file

@ -13,7 +13,8 @@ ComboBox {
property list<string> optionsKeys: [] property list<string> optionsKeys: []
property list<string> optionsLabels: [] property list<string> optionsLabels: []
property string currentKey: '' property string currentKey: ''
property var onSelected: function (string) {}
signal selected(string key)
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: height Layout.preferredHeight: height
@ -21,7 +22,7 @@ ComboBox {
model: optionsKeys model: optionsKeys
currentIndex: model.indexOf(currentKey) currentIndex: model.indexOf(currentKey)
onActivated: { onActivated: {
root.onSelected(model[currentIndex]) root.selected(model[currentIndex])
} }
// Rounded background // Rounded background

13
Widgets/NIconButton.qml
View file

@ -15,12 +15,13 @@ Rectangle {
property bool showBorder: true property bool showBorder: true
property bool enabled: true property bool enabled: true
property bool hovering: false property bool hovering: false
property var onEntered: function () {}
property var onExited: function () {}
property var onClicked: function () {}
property real fontPointSize: Style.fontSizeMedium property real fontPointSize: Style.fontSizeMedium
property string fontFamily: "Material Symbols Outlined" property string fontFamily: "Material Symbols Outlined"
signal entered
signal exited
signal clicked
implicitWidth: size implicitWidth: size
implicitHeight: size implicitHeight: size
@ -62,20 +63,20 @@ Rectangle {
if (tooltipText) { if (tooltipText) {
tooltip.show() tooltip.show()
} }
root.onEntered() root.entered()
} }
onExited: { onExited: {
hovering = false hovering = false
if (tooltipText) { if (tooltipText) {
tooltip.hide() tooltip.hide()
} }
root.onExited() root.exited()
} }
onClicked: { onClicked: {
if (tooltipText) { if (tooltipText) {
tooltip.hide() tooltip.hide()
} }
root.onClicked() root.clicked()
} }
} }
} }

17
Widgets/NPanel.qml
View file

@ -4,26 +4,27 @@ import Quickshell.Wayland
import qs.Services import qs.Services
PanelWindow { PanelWindow {
id: outerPanel id: root
readonly property real scaling: Scaling.scale(screen) readonly property real scaling: Scaling.scale(screen)
property bool showOverlay: Settings.data.general.dimDesktop property bool showOverlay: Settings.data.general.dimDesktop
property int topMargin: Style.barHeight * scaling property int topMargin: Style.barHeight * scaling
property color overlayColor: showOverlay ? Colors.overlay : "transparent" property color overlayColor: showOverlay ? Colors.overlay : "transparent"
signal dismissed signal dismissed
function hide() { function hide() {
//visible = false //visible = false
dismissed() root.dismissed()
} }
function show() { function show() {
// Ensure only one panel is visible at a time using Settings as ephemeral store // Ensure only one panel is visible at a time using Settings as ephemeral store
try { try {
if (Settings.openPanel && Settings.openPanel !== outerPanel && Settings.openPanel.hide) { if (Settings.openPanel && Settings.openPanel !== root && Settings.openPanel.hide) {
Settings.openPanel.hide() Settings.openPanel.hide()
} }
Settings.openPanel = outerPanel Settings.openPanel = root
} catch (e) { } catch (e) {
// ignore // ignore
@ -45,7 +46,7 @@ PanelWindow {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: outerPanel.hide() onClicked: root.hide()
} }
Behavior on color { Behavior on color {
@ -57,16 +58,16 @@ PanelWindow {
Component.onDestruction: { Component.onDestruction: {
try { try {
if (visible && Settings.openPanel === outerPanel) if (visible && Settings.openPanel === root)
Settings.openPanel = null Settings.openPanel = null
} catch (e) { } catch (e) {
} }
} }
onVisibleChanged: function () { onVisibleChanged: {
try { try {
if (!visible && Settings.openPanel === outerPanel) if (!visible && Settings.openPanel === root)
Settings.openPanel = null Settings.openPanel = null
} catch (e) { } catch (e) {

26
Widgets/NPill.qml
View file

@ -18,10 +18,12 @@ Item {
property real sizeMultiplier: 0.8 property real sizeMultiplier: 0.8
property bool autoHide: false property bool autoHide: false
property var onEntered: function () {} signal shown
property var onExited: function () {} signal hidden
property var onClicked: function () {} signal entered
property var onWheel: function (delta) {} signal exited
signal clicked
signal wheel(int delta)
// Internal state // Internal state
property bool showPill: false property bool showPill: false
@ -34,10 +36,6 @@ Item {
readonly property int pillOverlap: iconSize * 0.5 readonly property int pillOverlap: iconSize * 0.5
readonly property int maxPillWidth: Math.max(1, textItem.implicitWidth + pillPaddingHorizontal * 2 + pillOverlap) readonly property int maxPillWidth: Math.max(1, textItem.implicitWidth + pillPaddingHorizontal * 2 + pillOverlap)
// TBC, do we use those ?
signal shown
signal hidden
width: iconSize + (showPill ? maxPillWidth - pillOverlap : 0) width: iconSize + (showPill ? maxPillWidth - pillOverlap : 0)
height: pillHeight height: pillHeight
@ -127,7 +125,7 @@ Item {
} }
onStopped: { onStopped: {
delayedHideAnim.start() delayedHideAnim.start()
shown() root.shown()
} }
} }
@ -166,7 +164,7 @@ Item {
onStopped: { onStopped: {
showPill = false showPill = false
shouldAnimateHide = false shouldAnimateHide = false
hidden() root.hidden()
} }
} }
@ -194,18 +192,18 @@ Item {
onEntered: { onEntered: {
showDelayed() showDelayed()
tooltip.show() tooltip.show()
root.onEntered() root.entered()
} }
onExited: { onExited: {
hide() hide()
tooltip.hide() tooltip.hide()
root.onExited() root.exited()
} }
onClicked: { onClicked: {
root.onClicked() root.clicked()
} }
onWheel: wheel => { onWheel: wheel => {
root.onWheel(wheel.angleDelta.y) root.wheel(wheel.angleDelta.y)
} }
} }

9
Widgets/NSlider.qml
View file

@ -35,14 +35,6 @@ Slider {
height: parent.height height: parent.height
color: Colors.accentPrimary color: Colors.accentPrimary
radius: parent.radius radius: parent.radius
// Feels more responsive without animation
// Behavior on width {
// NumberAnimation {
// duration: 50
// easing.type: Easing.OutQuad
// }
// }
} }
// Circular cutout // Circular cutout
@ -84,6 +76,7 @@ Slider {
color: root.pressed ? Colors.surfaceVariant : Colors.surface color: root.pressed ? Colors.surfaceVariant : Colors.surface
border.color: Colors.accentPrimary border.color: Colors.accentPrimary
border.width: Math.max(1, Style.borderThick * scaling) border.width: Math.max(1, Style.borderThick * scaling)
// Press feedback halo (using accent color, low opacity) // Press feedback halo (using accent color, low opacity)
Rectangle { Rectangle {
anchors.centerIn: parent anchors.centerIn: parent

5
Widgets/NTextInput.qml
View file

@ -13,7 +13,8 @@ Item {
property alias placeholderText: input.placeholderText property alias placeholderText: input.placeholderText
property bool readOnly: false property bool readOnly: false
property bool enabled: true property bool enabled: true
property var onEditingFinished: function () {}
signal editingFinished
// Sizing // Sizing
implicitHeight: Style.baseWidgetSize * 1.25 * scaling implicitHeight: Style.baseWidgetSize * 1.25 * scaling
@ -55,7 +56,7 @@ Item {
placeholderTextColor: Colors.textSecondary placeholderTextColor: Colors.textSecondary
background: null background: null
font.pointSize: Style.fontSizeSmall * scaling font.pointSize: Style.fontSizeSmall * scaling
onEditingFinished: root.onEditingFinished() onEditingFinished: root.editingFinished()
// Text changes are observable via the aliased 'text' property (root.text) and its 'textChanged' signal. // Text changes are observable via the aliased 'text' property (root.text) and its 'textChanged' signal.
// No additional callback is invoked here to avoid conflicts with QML's onTextChanged handler semantics. // No additional callback is invoked here to avoid conflicts with QML's onTextChanged handler semantics.
} }

5
Widgets/NToggle.qml
View file

@ -12,7 +12,8 @@ RowLayout {
property bool value: false property bool value: false
property bool hovering: false property bool hovering: false
property int baseSize: Style.baseWidgetSize property int baseSize: Style.baseWidgetSize
property var onToggled: function (value) {}
signal toggled(bool balue)
Layout.fillWidth: true Layout.fillWidth: true
@ -72,7 +73,7 @@ RowLayout {
onExited: hovering = false onExited: hovering = false
onClicked: { onClicked: {
value = !value value = !value
root.onToggled(value) root.toggled(value)
} }
} }
} }