Differential D12004 Diff 31538 src/activities/digital_electricity/DigitalElectricity.qml

Changeset View

Standalone View

View Options

src/activities/digital_electricity/DigitalElectricity.qml

Context not available.
53 } 53​ }
54 54​
55 Keys.onPressed: { 55​ Keys.onPressed: {
56​ if((event.key == Qt.Key_Return || event.key == Qt.Key_Enter) && okButton.enabled) {
57​ Activity.checkAnswer()
58​ }
56 if (event.key == Qt.Key_Plus) { 59​ if (event.key == Qt.Key_Plus) {
57 Activity.zoomIn() 60​ Activity.zoomIn()
58 } 61​ }
Context not available.
178 horizontalAlignment: Text.AlignHLeft 181​ horizontalAlignment: Text.AlignHLeft
179 width: Math.min(implicitWidth, 0.90 * parent.width) 182​ width: Math.min(implicitWidth, 0.90 * parent.width)
180 height: inputOutputTxt.visible == false ? Math.min(implicitHeight, 0.7 * parent.height) : 183​ height: inputOutputTxt.visible == false ? Math.min(implicitHeight, 0.7 * parent.height) :
181 Math.min(implicitHeight, (inputOutputTxt.inputs > 2 ? 0.3 : 0.4) * parent.height) 184​ Math.min(implicitHeight, (inputOutputTxt.inputs > 2 ? 0.3 : 0.4) * parent.height)
182 wrapMode: TextEdit.WordWrap 185​ wrapMode: TextEdit.WordWrap
183 visible: false 186​ visible: false
184 z: 4 187​ z: 4
Context not available.
294 id: blueSquare 297​ id: blueSquare
295 Rectangle { 298​ Rectangle {
296 width: ((index % truthTable.columns) / (truthTablesModel.inputs - 1)) <= 1 ? 299​ width: ((index % truthTable.columns) / (truthTablesModel.inputs - 1)) <= 1 ?
297 (inputOutputTxt.inputs > 1 ? inputOutputTxt.maxWidth : inputOutputTxt.minSize) : 300​ (inputOutputTxt.inputs > 1 ? inputOutputTxt.maxWidth : inputOutputTxt.minSize) :
298 (inputOutputTxt.outputs > 1 ? inputOutputTxt.maxWidth : inputOutputTxt.minSize) 301​ (inputOutputTxt.outputs > 1 ? inputOutputTxt.maxWidth : inputOutputTxt.minSize)
299 height: inputOutputTxt.cellSize 302​ height: inputOutputTxt.cellSize
300 border.color: "#373737" 303​ border.color: "#373737"
301 border.width: 1 304​ border.width: 1
Context not available.
307 return ((index % truthTable.columns) / (truthTablesModel.inputs - 1)) <= 1 ? "#A7D9F9" : "#A7F9DD" 310​ return ((index % truthTable.columns) / (truthTablesModel.inputs - 1)) <= 1 ? "#A7D9F9" : "#A7F9DD"
308 } 311​ }
309 } 312​ }
310 313​
311 GCText { 314​ GCText {
312 id: truthTableValue 315​ id: truthTableValue
313 anchors.centerIn: parent 316​ anchors.centerIn: parent
Context not available.
335 width: background.hori ? 338​ width: background.hori ?
336 background.width * 4 - items.toolsMargin : background.width * 4 339​ background.width * 4 - items.toolsMargin : background.width * 4
337 height: background.hori ? 340​ height: background.hori ?
338 background.height * 4 - (bar.height * 1.1) : 341​ background.height * 4 - (bar.height * 1.1) :
jjazeixUnsubmitted
Not Done

should be the same indent as above (or above should be the same indent as here)

jjazeix: should be the same indent as above (or above should be the same indent as here)
339 background.height * 4 - (bar.height * 1.1) - items.toolsMargin 342​ background.height * 4 - (bar.height * 1.1) - items.toolsMargin
340 343​
341 PinchArea { 344​ PinchArea {
342 id: pinchZoom 345​ id: pinchZoom
Context not available.
498 } 501​ }
499 source: "qrc:/gcompris/src/core/resource/bar_ok.svg" 502​ source: "qrc:/gcompris/src/core/resource/bar_ok.svg"
500 sourceSize.width: 60 * ApplicationInfo.ratio 503​ sourceSize.width: 60 * ApplicationInfo.ratio
501 504​ enabled: !tutorialInstruction.visible
502 onClicked: Activity.checkAnswer() 505​ onClicked: Activity.checkAnswer()
503 } 506​ }
504 507​
Context not available.