Differential D9360 Diff 29171 src/activities/letter-in-word/LetterInWord.qml

Changeset View

Standalone View

View Options

src/activities/letter-in-word/LetterInWord.qml

Context not available.
64 id: items 64​ id: items
65 property Item main: activity.main 65​ property Item main: activity.main
66 property alias bar: bar 66​ property alias bar: bar
67​ property alias questionItem: questionItem
67 property alias background: background 68​ property alias background: background
68 property alias wordsModel: wordsModel 69​ property alias wordsModel: wordsModel
jjazeixUnsubmitted
Not Done

not a good variable name

jjazeix: not a good variable name
jjazeixUnsubmitted
Not Done

why don't you directly use the string value (not the text displayed, but a value associated to the combobox text)? It will be more explicit when used than the index

jjazeix: why don't you directly use the string value (not the text displayed, but a value associated to…
jjazeixUnsubmitted
Not Done

The default value should be the same as ApplicationSettings.fontCapitalization

jjazeix: The default value should be the same as ApplicationSettings.fontCapitalization
70​ property int currentLetterCase: ApplicationSettings.fontCapitalization
jjazeixUnsubmitted
Not Done

as it is only used in the combobox (and not in the js file), it is better to declare it in the combobox

jjazeix: as it is only used in the combobox (and not in the js file), it is better to declare it in the…
69 property int currentMode: normalModeWordCount 71​ property int currentMode: normalModeWordCount
70 readonly property int easyModeWordCount: 5 72​ readonly property int easyModeWordCount: 5
71 readonly property int normalModeWordCount: 11 73​ readonly property int normalModeWordCount: 11
Context not available.
107 property alias localeBox: localeBox 109​ property alias localeBox: localeBox
108 property alias easyModeConfig: easyModeConfig 110​ property alias easyModeConfig: easyModeConfig
109 property alias normalModeConfig: normalModeConfig 111​ property alias normalModeConfig: normalModeConfig
112​ property alias letterCaseBox: letterCaseBox
110 height: column.height 113​ height: column.height
111 114​
112 property alias availableLangs: langs.languages 115​ property alias availableLangs: langs.languages
116​
113 LanguageList { 117​ LanguageList {
114 id: langs 118​ id: langs
115 } 119​ }
jjazeixUnsubmitted
Not Done

We can have a combobox with the 3 possible values instead: lowercase, uppercase and mixed (we randomly choose if lower or upper) and we can be more precise telling it's only the letter to find that will be in lower/uppercase (the words won't be affected by this setting).

jjazeix: We can have a combobox with the 3 possible values instead: lowercase, uppercase and mixed (we…
Context not available.
140 spacing: 5 144​ spacing: 5
141 width: dialogActivityConfig.width 145​ width: dialogActivityConfig.width
142 GCComboBox { 146​ GCComboBox {
147​ id: letterCaseBox
148​ label: qsTr("Select case for letter to be searched")
149​ background: dialogActivityConfig
150​ model: [
151​ {"text": qsTr("Lower Case"), "value": 0},
152​ {"text": qsTr("Upper Case"), "value": 1},
jjazeixUnsubmitted
Not Done

you should only reload the level on onSaveData where you need to store the value

jjazeix: you should only reload the level on onSaveData where you need to store the value
jjazeixUnsubmitted
Not Done

If I put lowercase, leave the activity and return it is saved as mixed case. Same if I put mixed case, restart GCompris, it will be lowercase.

jjazeix: If I put lowercase, leave the activity and return it is saved as mixed case. Same if I put…
153​ {"text": qsTr("Mixed Case"), "value": 2}
154​ ]
155​ currentText: model[items.currentLetterCase].text
156​ currentIndex: items.currentLetterCase
157​ }
158​ }
159​
160​ Flow {
161​ spacing: 5
162​ width: dialogActivityConfig.width
163​ GCComboBox {
143 id: localeBox 164​ id: localeBox
144 model: langs.languages 165​ model: langs.languages
145 background: dialogActivityConfig 166​ background: dialogActivityConfig
Context not available.
156 items.currentMode = dataToSave["savedMode"] === "5" ? items.easyModeWordCount : items.normalModeWordCount 177​ items.currentMode = dataToSave["savedMode"] === "5" ? items.easyModeWordCount : items.normalModeWordCount
157 } 178​ }
158 179​
180​ if(dataToSave && dataToSave["savedLetterCase"]) {
181​ items.currentLetterCase = dataToSave["savedLetterCase"]
182​ }
183​
159 if(dataToSave && dataToSave["locale"]) { 184​ if(dataToSave && dataToSave["locale"]) {
160 background.locale = dataToSave["locale"]; 185​ background.locale = dataToSave["locale"];
161 } 186​ }
Context not available.
172 var oldMode = items.currentMode 197​ var oldMode = items.currentMode
173 items.currentMode = dialogActivityConfig.loader.item.easyModeConfig.checked ? items.easyModeWordCount : items.normalModeWordCount 198​ items.currentMode = dialogActivityConfig.loader.item.easyModeConfig.checked ? items.easyModeWordCount : items.normalModeWordCount
174 199​
175 dataToSave = {"locale": newLocale, "savedMode": items.currentMode} 200​ var oldLetterCase = items.currentLetterCase
201​ items.currentLetterCase = dialogActivityConfig.loader.item.letterCaseBox.model[dialogActivityConfig.loader.item.letterCaseBox.currentIndex].value
202​
203​ dataToSave = {"locale": newLocale, "savedMode": items.currentMode, "savedLetterCase": items.currentLetterCase}
176 204​
177 background.locale = newLocale; 205​ background.locale = newLocale;
178 206​
179 // Restart the activity with new information 207​ // Restart the activity with new information
180 if(oldLocale !== newLocale || oldMode !== items.currentMode) { 208​ if(oldLocale !== newLocale || oldMode !== items.currentMode || oldLetterCase !== items.currentLetterCase) {
181 background.stop(); 209​ background.stop();
182 background.start(); 210​ background.start();
183 } 211​ }
Context not available.
jjazeixUnsubmitted
Not Done

the dataset is fully on lowercase so you should keep the rand()%2 here in mixed case

jjazeix: the dataset is fully on lowercase so you should keep the rand()%2 here in mixed case
jjazeixUnsubmitted
Not Done

after testing, it does not work as expected for MixedCase.
Basically, it's only computed once when changing (so it will either always be uppercase or lowercase) and it won't change when changing level/sublevel.
To handle all the cases, the capitalization should be set on the initLevel function.

jjazeix: after testing, it does not work as expected for MixedCase. Basically, it's only computed once…