Differential D12310 Diff 32489 src/activities/lightsoff/Lightsoff.qml

Changeset View

Standalone View

View Options

src/activities/lightsoff/Lightsoff.qml

Context not available.
39 signal start 39​ signal start
40 signal stop 40​ signal stop
41 41​
42​ property bool keyNavigationVisible: false
43​
42 Component.onCompleted: { 44​ Component.onCompleted: {
43 activity.start.connect(start) 45​ activity.start.connect(start)
44 activity.stop.connect(stop) 46​ activity.stop.connect(stop)
Context not available.
53 property alias bonus: bonus 55​ property alias bonus: bonus
54 property alias skyColor: background.color 56​ property alias skyColor: background.color
55 property alias modelTable: modelTable 57​ property alias modelTable: modelTable
58​ property bool blockClicks: false
amankumarguptaUnsubmitted
Not Done

As everything is done with items.blockClicks only, this can directly be set to false and blockClicks variable in background can be removed.

amankumargupta: As everything is done with items.blockClicks only, this can directly be set to false and…
56 property int nbCell: 5 59​ property int nbCell: 5
57 property int cellSize: Math.min( 60​ property int cellSize: Math.min(
58 (parent.height - 200) / items.nbCell, 61​ (parent.height - 200) / items.nbCell,
Context not available.
67 Activity.stop() 70​ Activity.stop()
68 } 71​ }
69 72​
73​ Keys.enabled: !items.blockClicks
74​ Keys.onPressed: {
75​ background.keyNavigationVisible = true
76​ if (event.key === Qt.Key_Left)
77​ grid.moveCurrentIndexLeft()
78​ if (event.key === Qt.Key_Right)
79​ grid.moveCurrentIndexRight()
80​ if (event.key === Qt.Key_Down)
81​ grid.moveCurrentIndexDown()
82​ if (event.key === Qt.Key_Up)
83​ grid.moveCurrentIndexUp()
84​ if (event.key === Qt.Key_Space || event.key === Qt.Key_Enter || event.key === Qt.Key_Return)
85​ Activity.windowPressed(grid.currentIndex)
86​ }
87​
70 /* The background picture */ 88​ /* The background picture */
71 Image { 89​ Image {
72 source: Activity.url + "back.svg" 90​ source: Activity.url + "back.svg"
Context not available.
138 z: 4 156​ z: 4
139 } 157​ }
140 158​
141 Grid { 159​ GridView {
142 id: grid 160​ id: grid
143 anchors.top: parent.top 161​ anchors.top: parent.top
144 anchors.topMargin: (parent.height - height) / 2 162​ anchors.topMargin: (parent.height - height) / 6
145 anchors.horizontalCenter: parent.horizontalCenter 163​ anchors.horizontalCenter: parent.horizontalCenter
146 rows: items.nbCell 164​ width: items.nbCell * items.cellSize
147 columns: items.nbCell 165​ height: width
148 spacing: items.cellSize / 10 166​ cellWidth: items.cellSize
167​ cellHeight: items.cellSize
149 z: 5 168​ z: 5
150 169​
151 ListModel { 170​ ListModel {
152 id: modelTable 171​ id: modelTable
153 } 172​ }
154 173​
155 Repeater { 174​ model: modelTable
156 model: modelTable 175​
157 Rectangle { 176​ delegate: Rectangle {
158 color: "transparent" 177​ color: "transparent"
159 height: items.cellSize 178​ height: items.cellSize
160 width: items.cellSize 179​ width: items.cellSize
161 border { 180​ border {
162 color: soluce === 1 ? "red" : "transparent" 181​ color: soluce === 1 ? "red" : "transparent"
163 width: items.cellSize / 40 182​ width: items.cellSize / 40
164 } 183​ }
165 radius: items.cellSize / 10 184​ radius: items.cellSize / 10
166 185​
167 BarButton { 186​ BarButton {
168 anchors.fill: parent 187​ anchors.fill: parent
169 fillMode: Image.PreserveAspectFit 188​ fillMode: Image.PreserveAspectFit
170 source: Activity.url + "on.svg" 189​ source: Activity.url + "on.svg"
171 opacity: lighton === 1 ? 1 : 0 190​ opacity: lighton === 1 ? 1 : 0
172 z: lighton === 1 ? 11 : 10 191​ z: lighton === 1 ? 11 : 10
173 sourceSize.height: items.cellSize 192​ sourceSize.height: items.cellSize
174 onClicked: { 193​ mouseArea.hoverEnabled: !items.blockClicks
175 activity.audioEffects.play('qrc:/gcompris/src/core/resource/sounds/scroll.wav') 194​ mouseArea.enabled: !items.blockClicks
176 Activity.switchLight(index) 195​ Behavior on opacity {
177 } 196​ PropertyAnimation {
178 Behavior on opacity { 197​ duration: 200
179 PropertyAnimation { ​
180 duration: 200 ​
181 } ​
182 } 198​ }
183 visible: true ​
184 } 199​ }
200​ onClicked: Activity.windowPressed(index)
201​ visible: true
202​ }
185 203​
186 BarButton { 204​ BarButton {
amankumarguptaUnsubmitted
Not Done

Can these two BarButton be refactored into one?

amankumargupta: Can these two BarButton be refactored into one?
187 anchors.fill: parent 205​ anchors.fill: parent
188 fillMode: Image.PreserveAspectFit 206​ fillMode: Image.PreserveAspectFit
189 source: Activity.url + "off.svg" 207​ source: Activity.url + "off.svg"
190 opacity: lighton === 1 ? 0 : 1 208​ opacity: lighton === 1 ? 0 : 1
191 z: lighton === 1 ? 10 : 11 209​ z: lighton === 1 ? 10 : 11
192 sourceSize.height: items.cellSize 210​ sourceSize.height: items.cellSize
193 onClicked: { 211​ mouseArea.hoverEnabled: !items.blockClicks
194 activity.audioEffects.play('qrc:/gcompris/src/core/resource/sounds/scroll.wav') 212​ mouseArea.enabled: !items.blockClicks
195 Activity.switchLight(index) 213​ Behavior on opacity {
214​ PropertyAnimation {
215​ duration: 200
196 } 216​ }
197 Behavior on opacity { ​
198 PropertyAnimation { ​
199 duration: 200 ​
200 } ​
201 } ​
202 visible: true ​
203 } 217​ }
218​ onClicked: Activity.windowPressed(index)
219​ visible: true
204 } 220​ }
205 } 221​ }
222​ interactive: false
223​ keyNavigationWraps: true
224​ highlightFollowsCurrentItem: true
225​ highlight: Rectangle {
226​ width: items.cellSize
227​ height: items.cellSize
228​ color: "#AAFFFFFF"
229​ radius: items.cellSize / 10
230​ visible: background.keyNavigationVisible
231​ Behavior on x { SpringAnimation { spring: 2; damping: 0.2 } }
232​ Behavior on y { SpringAnimation { spring: 2; damping: 0.2 } }
233​ }
206 } 234​ }
207 235​
208 DialogHelp { 236​ DialogHelp {
Context not available.
226 254​
227 Bonus { 255​ Bonus {
228 id: bonus 256​ id: bonus
257​ onStop: items.blockClicks = false
229 Component.onCompleted: win.connect(Activity.nextLevel) 258​ Component.onCompleted: win.connect(Activity.nextLevel)
230 } 259​ }
231 } 260​ }
Context not available.