GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 05:05:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename id to objectId to prevent issues with built-in property id

Browse Source
This commit is contained in:
Arjen Hiemstra 2015-03-23 15:30:14 +01:00
parent e6bd9f8cc6
commit 0c606c4d6f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Printer.qml
View File

@ -221,23 +221,23 @@ UM.MainWindow {
deleteSelection.onTriggered: UM.Controller.removeSelection(); deleteSelection.onTriggered: UM.Controller.removeSelection();
deleteObject.onTriggered: { deleteObject.onTriggered: {
if(objectContextMenu.id != 0) { if(objectContextMenu.objectId != 0) {
Printer.deleteObject(objectContextMenu.id); Printer.deleteObject(objectContextMenu.objectId);
objectContextMenu.id = 0; objectContextMenu.objectId = 0;
} }
} }
multiplyObject.onTriggered: { multiplyObject.onTriggered: {
if(objectContextMenu.id != 0) { if(objectContextMenu.objectId != 0) {
Printer.multiplyObject(objectContextMenu.id, 1); Printer.multiplyObject(objectContextMenu.objectId, 1);
objectContextMenu.id = 0; objectContextMenu.objectId = 0;
} }
} }
centerObject.onTriggered: { centerObject.onTriggered: {
if(objectContextMenu.id != 0) { if(objectContextMenu.objectId != 0) {
Printer.centerObject(objectContextMenu.id); Printer.centerObject(objectContextMenu.objectId);
objectContextMenu.id = 0; objectContextMenu.objectId = 0;
} }
} }
@ -255,7 +255,7 @@ UM.MainWindow {
Menu { Menu {
id: objectContextMenu; id: objectContextMenu;
property variant id: -1; property variant objectId: -1;
MenuItem { action: actions.centerObject; } MenuItem { action: actions.centerObject; }
MenuItem { action: actions.deleteObject; } MenuItem { action: actions.deleteObject; }
@ -280,10 +280,10 @@ UM.MainWindow {
Connections { Connections {
target: UM.Controller target: UM.Controller
onContextMenuRequested: { onContextMenuRequested: {
if(id == 0) { if(objectId == 0) {
contextMenu.popup(); contextMenu.popup();
} else { } else {
objectContextMenu.id = id; objectContextMenu.objectId = objectId;
objectContextMenu.popup(); objectContextMenu.popup();
} }
} }