Changeset View
Changeset View
Standalone View
Standalone View
src/activities/memory/MemoryCommon.qml
| Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s) | 40 | pageComponent: Image { | |||
|---|---|---|---|---|---|
| 46 | 46 | | |||
| 47 | signal start | 47 | signal start | ||
| 48 | signal stop | 48 | signal stop | ||
| 49 | 49 | | |||
| 50 | property alias items: items | 50 | property alias items: items | ||
| 51 | property bool keyNavigationVisible: false | 51 | property bool keyNavigationVisible: false | ||
| 52 | 52 | | |||
| 53 | Component.onCompleted: { | 53 | Component.onCompleted: { | ||
| 54 | dialogActivityConfig.initialize() | ||||
| 54 | activity.start.connect(start) | 55 | activity.start.connect(start) | ||
| 55 | activity.stop.connect(stop) | 56 | activity.stop.connect(stop) | ||
| 56 | } | 57 | } | ||
| 57 | 58 | | |||
| 58 | QtObject { | 59 | QtObject { | ||
| 59 | id: items | 60 | id: items | ||
| 60 | property alias bar: bar | 61 | property alias bar: bar | ||
| 61 | property alias bonus: bonus | 62 | property alias bonus: bonus | ||
| 62 | property GCSfx audioEffects: activity.audioEffects | 63 | property GCSfx audioEffects: activity.audioEffects | ||
| 63 | property bool withTux: activity.withTux | 64 | property bool withTux: activity.withTux | ||
| 64 | property bool tuxTurn: false | 65 | property bool tuxTurn: false | ||
| 65 | property var playQueue | 66 | property var playQueue | ||
| 66 | property int selectionCount | 67 | property int selectionCount | ||
| 67 | property int tuxScore: tuxScore.text | 68 | property int tuxScore: tuxScore.text | ||
| 68 | property int playerScore: playerScore.text | 69 | property int playerScore: playerScore.text | ||
| 69 | property var dataset: activity.dataset | 70 | property var levels: activity.datasetLoader.data != 0 ? activity.datasetLoader.data : activity.dataset | ||
jjazeix: is there a reason to check a dataset against 0? | |||||
@jjazeix For all those activity which are not having multiple datasets needs to checked before loading the datasets. I have added this condition to check for all those memory activities which do not have any multiple datasets. dekumar: @jjazeix For all those activity which are not having multiple datasets needs to checked before… | |||||
| 70 | property alias containerModel: containerModel | 71 | property alias containerModel: containerModel | ||
| 71 | property alias grid: grid | 72 | property alias grid: grid | ||
| 72 | property bool blockClicks: false | 73 | property bool blockClicks: false | ||
| 73 | property int columns | 74 | property int columns | ||
| 74 | property int rows | 75 | property int rows | ||
| 75 | property int spacing: 5 * ApplicationInfo.ratio | 76 | property int spacing: 5 * ApplicationInfo.ratio | ||
| 76 | } | 77 | } | ||
| 77 | 78 | | |||
| ▲ Show 20 Lines • Show All 60 Lines • ▼ Show 20 Line(s) | 88 | GridView { | |||
| 138 | } | 139 | } | ||
| 139 | } | 140 | } | ||
| 140 | 141 | | |||
| 141 | DialogHelp { | 142 | DialogHelp { | ||
| 142 | id: dialogHelp | 143 | id: dialogHelp | ||
| 143 | onClose: home() | 144 | onClose: home() | ||
| 144 | } | 145 | } | ||
| 145 | 146 | | |||
| 147 | DialogChooseLevel { | ||||
| 148 | id: dialogActivityConfig | ||||
| 149 | currentActivity: activity.activityInfo | ||||
| 150 | | ||||
| 151 | onSaveData: { | ||||
| 152 | levelFolder = dialogActivityConfig.chosenLevels | ||||
| 153 | currentActivity.currentLevels = dialogActivityConfig.chosenLevels | ||||
| 154 | ApplicationSettings.setCurrentLevels(currentActivity.name, dialogActivityConfig.chosenLevels) | ||||
| 155 | } | ||||
| 156 | onClose: { | ||||
| 157 | home() | ||||
| 158 | } | ||||
| 159 | onStartActivity: { | ||||
| 160 | background.stop() | ||||
| 161 | background.start() | ||||
| 162 | } | ||||
| 163 | } | ||||
| 164 | | ||||
| 165 | | ||||
| 146 | Bar { | 166 | Bar { | ||
| 147 | id: bar | 167 | id: bar | ||
| 148 | content: BarEnumContent { value: help | home | level } | 168 | content: BarEnumContent { value: help | home | level | activityConfig } | ||
| 149 | onHelpClicked: { | 169 | onHelpClicked: { | ||
| 150 | displayDialog(dialogHelp) | 170 | displayDialog(dialogHelp) | ||
| 151 | } | 171 | } | ||
| 152 | onPreviousLevelClicked: Activity.previousLevel() | 172 | onPreviousLevelClicked: Activity.previousLevel() | ||
| 173 | onActivityConfigClicked: { | ||||
| 174 | displayDialog(dialogActivityConfig) | ||||
| 175 | } | ||||
| 153 | onNextLevelClicked: Activity.nextLevel() | 176 | onNextLevelClicked: Activity.nextLevel() | ||
| 154 | onHomeClicked: home() | 177 | onHomeClicked: home() | ||
| 155 | } | 178 | } | ||
| 156 | 179 | | |||
| 157 | Image { | 180 | Image { | ||
| 158 | id: player | 181 | id: player | ||
| 159 | source: 'qrc:/gcompris/src/activities/memory/resource/children.svg' | 182 | source: 'qrc:/gcompris/src/activities/memory/resource/children.svg' | ||
| 160 | anchors { | 183 | anchors { | ||
| ▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines | |||||
is there a reason to check a dataset against 0?