Skip to content

Commit 7fd06c7

Browse files
committed
qmlui: a few fixes to the fixture editor
1 parent 022d48a commit 7fd06c7

3 files changed

Lines changed: 16 additions & 5 deletions

File tree

qmlui/qml/fixtureeditor/EditorView.qml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,12 @@ Rectangle
160160
width: UISettings.bigItemHeight
161161
model: typeModel
162162
currValue: editorView ? editorView.productType : 0
163-
onValueChanged: if (editorView) editorView.productType = value
163+
onValueChanged:
164+
function(value)
165+
{
166+
if (editorView)
167+
editorView.productType = value
168+
}
164169
}
165170
}
166171

qmlui/qml/fixtureeditor/FixtureEditor.qml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Rectangle
108108
{
109109
if (editRef.fileName === "")
110110
{
111-
saveDialog.folder = fixtureEditor.workingPath
111+
saveDialog.currentFolder = fixtureEditor.workingPath
112112
//saveDialog.currentFile = "file:///" + editor.editorView.fileName
113113
saveDialog.open()
114114
}
@@ -195,7 +195,7 @@ Rectangle
195195
entryText: qsTr("Open definition")
196196
onClicked:
197197
{
198-
openDialog.folder = fixtureEditor.workingPath
198+
openDialog.currentFolder = fixtureEditor.workingPath
199199
openDialog.open()
200200
}
201201
autoExclusive: false
@@ -211,7 +211,7 @@ Rectangle
211211
{
212212
if (editor.editorView.fileName === "")
213213
{
214-
saveDialog.folder = fixtureEditor.workingPath
214+
saveDialog.currentFolder = fixtureEditor.workingPath
215215
//saveDialog.currentFile = "file:///" + editor.editorView.fileName
216216
saveDialog.open()
217217
}
@@ -229,7 +229,7 @@ Rectangle
229229
checkable: false
230230
onClicked:
231231
{
232-
saveDialog.folder = fixtureEditor.workingPath + "/" + editor.editorView.fileName
232+
saveDialog.currentFolder = fixtureEditor.workingPath + "/" + editor.editorView.fileName
233233
//saveDialog.currentFile = "file:///" + editor.editorView.fileName
234234
saveDialog.open()
235235
}

qmlui/qml/fixtureeditor/PhysicalProperties.qml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ GridLayout
6363

6464
editText: phy ? phy.bulbType : ""
6565
onEditTextChanged: if (phy) phy.bulbType = editText
66+
onValueChanged: if (phy) phy.bulbType = currentText
6667

6768
Rectangle
6869
{
@@ -121,6 +122,8 @@ GridLayout
121122

122123
editText: phy ? phy.lensType : ""
123124
onEditTextChanged: if (phy) phy.lensType = editText
125+
onValueChanged: if (phy) phy.lensType = currentText
126+
124127

125128
Rectangle
126129
{
@@ -181,6 +184,8 @@ GridLayout
181184

182185
editText: phy ? phy.focusType : ""
183186
onEditTextChanged: if (phy) phy.focusType = editText
187+
onValueChanged: if (phy) phy.focusType = currentText
188+
184189

185190
Rectangle
186191
{
@@ -348,6 +353,7 @@ GridLayout
348353

349354
editText: phy ? phy.dmxConnector : ""
350355
onEditTextChanged: if (phy) phy.dmxConnector = editText
356+
onValueChanged: if (phy) phy.dmxConnector = currentText
351357

352358
Rectangle
353359
{

0 commit comments

Comments
 (0)