From 51c303129a67d8c9692a4929b664cff249cea220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maksymilian=20=C5=81owczy=C5=84ski?= Date: Thu, 2 May 2024 02:15:25 +0200 Subject: [PATCH] make qml handlers functions consistent --- qmlui/qml/+qt5/ActionsMenu.qml | 2 +- qmlui/qml/ActionsMenu.qml | 2 +- qmlui/qml/CustomDoubleSpinBox.qml | 4 ++-- qmlui/qml/CustomSpinBox.qml | 4 ++-- qmlui/qml/FunctionDelegate.qml | 6 +++--- qmlui/qml/SimpleDesk.qml | 4 ++-- qmlui/qml/TreeNodeDelegate.qml | 4 ++-- qmlui/qml/fixturesfunctions/2DView.qml | 10 +++++----- qmlui/qml/fixturesfunctions/3DView/3DView.qml | 6 +++--- qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml | 4 ++-- qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml | 4 ++-- .../qml/fixturesfunctions/3DView/MultiBeams3DItem.qml | 2 +- qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml | 4 ++-- qmlui/qml/fixturesfunctions/3DView/StageBox.qml | 8 ++++---- qmlui/qml/fixturesfunctions/3DView/StageRock.qml | 2 +- qmlui/qml/fixturesfunctions/3DView/StageSimple.qml | 2 +- qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml | 2 +- qmlui/qml/fixturesfunctions/Fixture2DItem.qml | 2 +- qmlui/qml/fixturesfunctions/FixtureBrowser.qml | 4 ++-- qmlui/qml/fixturesfunctions/FixtureBrowserDelegate.qml | 8 ++++---- qmlui/qml/fixturesfunctions/LeftPanel.qml | 2 +- qmlui/qml/fixturesfunctions/RightPanel.qml | 2 +- qmlui/qml/fixturesfunctions/SceneEditor.qml | 2 +- qmlui/qml/popup/CustomPopupDialog.qml | 2 +- qmlui/qml/showmanager/HeaderAndCursor.qml | 2 +- qmlui/qml/showmanager/ShowManager.qml | 4 ++-- 26 files changed, 49 insertions(+), 49 deletions(-) diff --git a/qmlui/qml/+qt5/ActionsMenu.qml b/qmlui/qml/+qt5/ActionsMenu.qml index 0681651cdb..e5ff01d86b 100644 --- a/qmlui/qml/+qt5/ActionsMenu.qml +++ b/qmlui/qml/+qt5/ActionsMenu.qml @@ -115,7 +115,7 @@ Popup property string action: "" - onClicked: function (role) { + onClicked: (role) => { if (role === Dialog.Yes) { if (qlcplus.fileName()) diff --git a/qmlui/qml/ActionsMenu.qml b/qmlui/qml/ActionsMenu.qml index 78145db4b1..6af7702835 100644 --- a/qmlui/qml/ActionsMenu.qml +++ b/qmlui/qml/ActionsMenu.qml @@ -117,7 +117,7 @@ Popup property string action: "" - onClicked: function (role) { + onClicked: (role) => { if (role === Dialog.Yes) { if (qlcplus.fileName()) diff --git a/qmlui/qml/CustomDoubleSpinBox.qml b/qmlui/qml/CustomDoubleSpinBox.qml index f60fe2a02b..9dabe04f66 100644 --- a/qmlui/qml/CustomDoubleSpinBox.qml +++ b/qmlui/qml/CustomDoubleSpinBox.qml @@ -41,11 +41,11 @@ CustomSpinBox top: Math.max(controlRoot.from, controlRoot.to) } - textFromValue: function(value, locale) { + textFromValue: (value, locale) => { return Number(value / Math.pow(10, decimals)).toLocaleString(locale, 'f', decimals) + suffix } - valueFromText: function(text, locale) { + valueFromText: (text, locale) => { return Number.fromLocaleString(locale, text.replace(suffix, "")) * Math.pow(10, decimals) } diff --git a/qmlui/qml/CustomSpinBox.qml b/qmlui/qml/CustomSpinBox.qml index 79e61598f9..e57c13034c 100644 --- a/qmlui/qml/CustomSpinBox.qml +++ b/qmlui/qml/CustomSpinBox.qml @@ -49,11 +49,11 @@ SpinBox if (focus) contentItem.selectAll() } - textFromValue: function(value) { + textFromValue: (value) => { return value + suffix } - valueFromText: function(text) { + valueFromText: (text) => { return parseInt(text.replace(suffix, "")) } diff --git a/qmlui/qml/FunctionDelegate.qml b/qmlui/qml/FunctionDelegate.qml index 56c1688f73..ab73bdab26 100644 --- a/qmlui/qml/FunctionDelegate.qml +++ b/qmlui/qml/FunctionDelegate.qml @@ -103,13 +103,13 @@ Rectangle drag.target: dragItem - onPressed: function(mouse) { + onPressed: (mouse) => { funcDelegate.mouseEvent(App.Pressed, cRef.id, cRef.type, funcDelegate, mouse.modifiers) } - onClicked: function(mouse) { + onClicked: (mouse) => { funcDelegate.mouseEvent(App.Clicked, cRef.id, cRef.type, funcDelegate, mouse.modifiers) } - onDoubleClicked: function(mouse) { + onDoubleClicked: (mouse) => { funcDelegate.mouseEvent(App.DoubleClicked, cRef.id, cRef.type, funcDelegate, mouse.modifiers) } } diff --git a/qmlui/qml/SimpleDesk.qml b/qmlui/qml/SimpleDesk.qml index 520ce430ab..49ad68d7f8 100644 --- a/qmlui/qml/SimpleDesk.qml +++ b/qmlui/qml/SimpleDesk.qml @@ -39,7 +39,7 @@ Rectangle id: channelToolLoader z: 2 - onValueChanged: function (fixtureID, channelIndex, value) { + onValueChanged: (fixtureID, channelIndex, value) => { simpleDesk.setValue(fixtureID, channelIndex, value) } } @@ -87,7 +87,7 @@ Rectangle padding: 0 model: simpleDesk.universesListModel currValue: simpleDesk.universeFilter - onValueChanged: function (value) { + onValueChanged: (value) => { simpleDesk.universeFilter = value } } diff --git a/qmlui/qml/TreeNodeDelegate.qml b/qmlui/qml/TreeNodeDelegate.qml index 4bdfb4da5c..5b631633c5 100644 --- a/qmlui/qml/TreeNodeDelegate.qml +++ b/qmlui/qml/TreeNodeDelegate.qml @@ -125,11 +125,11 @@ Column drag.target: dragItem - onPressed: function (mouse) { + onPressed: (mouse) => { nodeContainer.mouseEvent(App.Pressed, cRef ? cRef.id : -1, nodeContainer.itemType, nodeContainer, mouse.modifiers) } - onClicked: function (mouse) { + onClicked: (mouse) => { nodeLabel.forceActiveFocus() nodeContainer.mouseEvent(App.Clicked, cRef ? cRef.id : -1, nodeContainer.itemType, nodeContainer, mouse.modifiers) diff --git a/qmlui/qml/fixturesfunctions/2DView.qml b/qmlui/qml/fixturesfunctions/2DView.qml index 7f4023007c..a064d7412d 100644 --- a/qmlui/qml/fixturesfunctions/2DView.qml +++ b/qmlui/qml/fixturesfunctions/2DView.qml @@ -222,7 +222,7 @@ Rectangle property int initialXPos property int initialYPos - onPressed: function (mouse) { + onPressed: (mouse) => { console.log("button: " + mouse.button + ", mods: " + mouse.modifiers) var itemID = View2D.itemIDAtPos(Qt.point(mouse.x, mouse.y)) @@ -255,7 +255,7 @@ Rectangle } } - onPositionChanged: function (mouse) { + onPositionChanged: (mouse) => { if (selectionRect.visible == true) { if (mouse.x !== initialXPos || mouse.y !== initialYPos) @@ -292,7 +292,7 @@ Rectangle } } - onReleased: function (mouse) { + onReleased: (mouse) => { if (selectionRect.visible === true && selectionRect.width && selectionRect.height) { var rx = selectionRect.x @@ -314,7 +314,7 @@ Rectangle } } - onWheel: function (wheel) { + onWheel: (wheel) => { //console.log("Wheel delta: " + wheel.angleDelta.y) if (wheel.angleDelta.y > 0) setZoom(0.5) @@ -349,7 +349,7 @@ Rectangle drag.threshold: 10 drag.target: parent - onReleased: function (mouse) { + onReleased: (mouse) => { if (drag.active) { var units = View2D.gridUnits === MonitorProperties.Meters ? 1000.0 : 304.8 diff --git a/qmlui/qml/fixturesfunctions/3DView/3DView.qml b/qmlui/qml/fixturesfunctions/3DView/3DView.qml index 23e070afb5..950e346e47 100644 --- a/qmlui/qml/fixturesfunctions/3DView/3DView.qml +++ b/qmlui/qml/fixturesfunctions/3DView/3DView.qml @@ -372,14 +372,14 @@ Rectangle property int selGenericCount: View3D.genericSelectedCount sourceDevice: mDevice - onPressed: function (mouse) { + onPressed: (mouse) => { directionCounter = 0 dx = 0 dy = 0 startPoint = Qt.point(mouse.x, mouse.y) } - onPositionChanged: function (mouse) { + onPositionChanged: (mouse) => { if (directionCounter < 3) { dx += (Math.abs(mouse.x - startPoint.x)) @@ -474,7 +474,7 @@ Rectangle startPoint = Qt.point(mouse.x, mouse.y) } - onWheel: function (wheel) { + onWheel: (wheel) => { if (wheel.angleDelta.y > 0) viewCamera.setZoom(-1) else diff --git a/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml index 728309af01..98dfcace22 100644 --- a/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml @@ -322,7 +322,7 @@ Entity { id: eSceneLoader - onStatusChanged: function (status) { + onStatusChanged: (status) => { if (status === SceneLoader.Ready) View3D.initializeFixture(itemID, fixtureEntity, eSceneLoader) } @@ -339,7 +339,7 @@ Entity property var lastPos - onClicked: function (pick) { + onClicked: (pick) => { console.log("3D item clicked") isSelected = !isSelected contextManager.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml index fce3f8d4c1..9fb8ff7e31 100644 --- a/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml @@ -41,7 +41,7 @@ Entity { id: eSceneLoader - onStatusChanged: function (status) { + onStatusChanged: (status) => { if (status === SceneLoader.Ready) View3D.initializeItem(itemID, genericEntity, eSceneLoader) } @@ -54,7 +54,7 @@ Entity id: eObjectPicker dragEnabled: true - onClicked: function (pick) { + onClicked: (pick) => { console.log("3D item clicked") isSelected = !isSelected View3D.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml index 36c407e691..e48a0f5da0 100644 --- a/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml @@ -274,7 +274,7 @@ Entity property var lastPos - onClicked: function (pick) { + onClicked: (pick) => { console.log("3D item clicked") isSelected = !isSelected contextManager.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml index 8f83045f45..7509400e09 100644 --- a/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml @@ -101,7 +101,7 @@ Entity id: headsRepeater //model: fixtureEntity.headsNumber - onObjectAdded: function (index, object) { + onObjectAdded: (index, object) => { console.log("Head " + index + " added ----------------") if (index == fixtureEntity.headsNumber - 1) View3D.initializeFixture(itemID, fixtureEntity, null) @@ -166,7 +166,7 @@ Entity property var lastPos - onClicked: function (pick) { + onClicked: (pick) => { console.log("3D item clicked") isSelected = !isSelected contextManager.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/StageBox.qml b/qmlui/qml/fixturesfunctions/3DView/StageBox.qml index 7bf04edc19..a4e4f38a7a 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageBox.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageBox.qml @@ -76,7 +76,7 @@ Entity ObjectPicker { id: groundPicker - onClicked: function(pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } @@ -100,7 +100,7 @@ Entity ObjectPicker { id: leftPicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } @@ -123,7 +123,7 @@ Entity ObjectPicker { id: rightPicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } @@ -146,7 +146,7 @@ Entity ObjectPicker { id: backPicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } diff --git a/qmlui/qml/fixturesfunctions/3DView/StageRock.qml b/qmlui/qml/fixturesfunctions/3DView/StageRock.qml index e04dfd7896..5243dd0de2 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageRock.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageRock.qml @@ -203,7 +203,7 @@ Entity ObjectPicker { id: stagePicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } diff --git a/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml b/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml index 3c027dad8a..97bcb70e61 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml @@ -56,7 +56,7 @@ Entity ObjectPicker { id: stagePicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } diff --git a/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml b/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml index 647763c02e..0af252d68f 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml @@ -167,7 +167,7 @@ Entity ObjectPicker { id: stagePicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } diff --git a/qmlui/qml/fixturesfunctions/Fixture2DItem.qml b/qmlui/qml/fixturesfunctions/Fixture2DItem.qml index ed5f7192a8..69c80ea5d4 100644 --- a/qmlui/qml/fixturesfunctions/Fixture2DItem.qml +++ b/qmlui/qml/fixturesfunctions/Fixture2DItem.qml @@ -301,7 +301,7 @@ Rectangle onEntered: fixtureLabel.visible = true onExited: showLabel ? fixtureLabel.visible = true : fixtureLabel.visible = false - onPressed: function (mouse) { + onPressed: (mouse) => { // do not accept this event to propagate it to the drag rectangle mouse.accepted = false } diff --git a/qmlui/qml/fixturesfunctions/FixtureBrowser.qml b/qmlui/qml/fixturesfunctions/FixtureBrowser.qml index 8a4a38f369..828ed7ca1b 100644 --- a/qmlui/qml/fixturesfunctions/FixtureBrowser.qml +++ b/qmlui/qml/fixturesfunctions/FixtureBrowser.qml @@ -132,7 +132,7 @@ Rectangle width: modelsList.width - (manufScroll.visible ? manufScroll.width : 0) isManufacturer: true textLabel: modelData - onMouseEvent: function (type, iID, iType, qItem, mouseMods) { + onMouseEvent: (type, iID, iType, qItem, mouseMods) => { if (type == App.Clicked) { mfText.label = modelData @@ -238,7 +238,7 @@ Rectangle manufacturer: fixtureBrowser.selectedManufacturer textLabel: modelData - onMouseEvent: function (type, iID, iType, qItem, mouseMods) { + onMouseEvent: (type, iID, iType, qItem, mouseMods) => { if (type == App.Clicked) { modelsList.currentIndex = index diff --git a/qmlui/qml/fixturesfunctions/FixtureBrowserDelegate.qml b/qmlui/qml/fixturesfunctions/FixtureBrowserDelegate.qml index 8142b8b9ce..cfb4027181 100644 --- a/qmlui/qml/fixturesfunctions/FixtureBrowserDelegate.qml +++ b/qmlui/qml/fixturesfunctions/FixtureBrowserDelegate.qml @@ -111,13 +111,13 @@ Item id: fxMouseArea anchors.fill: parent hoverEnabled: true - onClicked: function (mouse) { + onClicked: (mouse) => { fxDraggableItem.mouseEvent(App.Clicked, 0, 0, fxDraggableItem, mouse.modifiers) } drag.target: FixtureDragItem { } drag.threshold: 30 - onPressed: function (mouse) { + onPressed: (mouse) => { if (fxDraggableItem.isManufacturer == false) { fxDraggableItem.mouseEvent(App.Clicked, 0, 0, fxDraggableItem, mouse.modifiers) @@ -125,11 +125,11 @@ Item FxDragJS.initProperties() } } - onPositionChanged: function (mouse) { + onPositionChanged: (mouse) => { if (fxDraggableItem.isManufacturer == false && drag.active == true) FxDragJS.handleDrag(mouse) } - onReleased: function (mouse) { + onReleased: (mouse) => { if (fxDraggableItem.isManufacturer == false && drag.active == true) FxDragJS.endDrag(mouse) } diff --git a/qmlui/qml/fixturesfunctions/LeftPanel.qml b/qmlui/qml/fixturesfunctions/LeftPanel.qml index ae64cc6a07..6a83416883 100644 --- a/qmlui/qml/fixturesfunctions/LeftPanel.qml +++ b/qmlui/qml/fixturesfunctions/LeftPanel.qml @@ -31,7 +31,7 @@ SidePanel anchors.leftMargin: 0 panelAlignment: Qt.AlignLeft - onContentLoaded: function (item, ID) { + onContentLoaded: (item, ID) => { item.width = Qt.binding(function() { return leftSidePanel.width - collapseWidth }) item.height = Qt.binding(function() { return leftSidePanel.height }) } diff --git a/qmlui/qml/fixturesfunctions/RightPanel.qml b/qmlui/qml/fixturesfunctions/RightPanel.qml index 574658e530..206a1e1223 100644 --- a/qmlui/qml/fixturesfunctions/RightPanel.qml +++ b/qmlui/qml/fixturesfunctions/RightPanel.qml @@ -103,7 +103,7 @@ SidePanel animatePanel(true) } - onContentLoaded: function(item, ID) { + onContentLoaded: (item, ID) => { if (item.hasOwnProperty("functionID")) item.functionID = itemID } diff --git a/qmlui/qml/fixturesfunctions/SceneEditor.qml b/qmlui/qml/fixturesfunctions/SceneEditor.qml index 162c277f6f..b3b7dce25e 100644 --- a/qmlui/qml/fixturesfunctions/SceneEditor.qml +++ b/qmlui/qml/fixturesfunctions/SceneEditor.qml @@ -119,7 +119,7 @@ Rectangle id: toolbar visible: !boundToSequence text: sceneEditor ? sceneEditor.functionName : "" - onTextChanged: function(text) { + onTextChanged: (text) => { sceneEditor.functionName = text } diff --git a/qmlui/qml/popup/CustomPopupDialog.qml b/qmlui/qml/popup/CustomPopupDialog.qml index 6f552cabf8..c8d5eb3f73 100644 --- a/qmlui/qml/popup/CustomPopupDialog.qml +++ b/qmlui/qml/popup/CustomPopupDialog.qml @@ -95,7 +95,7 @@ Dialog contentItem.implicitHeight: UISettings.iconSizeDefault - onClicked: function (button) { + onClicked: (button) => { if (button === standardButton(Dialog.Yes)) control.clicked(Dialog.Yes) else if (button === standardButton(Dialog.No)) diff --git a/qmlui/qml/showmanager/HeaderAndCursor.qml b/qmlui/qml/showmanager/HeaderAndCursor.qml index 1642a8b6d5..f39f98cf09 100644 --- a/qmlui/qml/showmanager/HeaderAndCursor.qml +++ b/qmlui/qml/showmanager/HeaderAndCursor.qml @@ -212,7 +212,7 @@ Rectangle { enabled: showTimeMarkers anchors.fill: parent - onClicked: function (mouse) { + onClicked: (mouse) => { tlHeaderCursorLayer.clicked(mouse.x, mouse.y) } } diff --git a/qmlui/qml/showmanager/ShowManager.qml b/qmlui/qml/showmanager/ShowManager.qml index b8bedf9cd8..da4d0631f9 100644 --- a/qmlui/qml/showmanager/ShowManager.qml +++ b/qmlui/qml/showmanager/ShowManager.qml @@ -447,7 +447,7 @@ Rectangle headerHeight: showMgrContainer.headerHeight cursorHeight: showMgrContainer.height - topBar.height - (bottomPanel.visible ? bottomPanel.height : 0) duration: showManager.showDuration - onClicked: function (mouseX, mouseY) { + onClicked: (mouseX, mouseY) => { if (timeDivision === Show.Time) showManager.currentTime = TimeUtils.posToMs(mouseX, timeScale, tickSize) else @@ -541,7 +541,7 @@ Rectangle MouseArea { anchors.fill: parent - onClicked: function (mouse) { + onClicked: (mouse) => { showManager.currentTime = TimeUtils.posToMs(mouse.x, timeScale, tickSize) showManager.resetItemsSelection() }