From f3afd95a7d93a21f05c87d246985f9f4f103c7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Giet?= Date: Sat, 29 Feb 2020 22:35:36 +0100 Subject: [PATCH] algebra, gletters, smallnumbers, wordsgame, some cleaning in Options --- src/activities/algebra_by/ActivityConfig.qml | 18 +++++-------- src/activities/algebra_div/ActivityConfig.qml | 18 +++++-------- .../algebra_minus/ActivityConfig.qml | 18 +++++-------- .../algebra_plus/ActivityConfig.qml | 18 +++++-------- src/activities/gletters/ActivityConfig.qml | 22 +++++---------- .../smallnumbers/ActivityConfig.qml | 18 +++++-------- .../smallnumbers2/ActivityConfig.qml | 27 ++++++++++--------- src/activities/wordsgame/ActivityConfig.qml | 21 +++++---------- 8 files changed, 56 insertions(+), 104 deletions(-) diff --git a/src/activities/algebra_by/ActivityConfig.qml b/src/activities/algebra_by/ActivityConfig.qml index b32ceadbe..da5252166 100644 --- a/src/activities/algebra_by/ActivityConfig.qml +++ b/src/activities/algebra_by/ActivityConfig.qml @@ -56,21 +56,15 @@ Item { property var dataToSave function setDefaultValues() { speedSlider.value = Qt.binding(function() {return activityConfiguration.speedSetting;}) - activityConfiguration.speedSetting = dataToSave.speedSetting + if(dataToSave.speedSetting) { + activityConfiguration.speedSetting = dataToSave.speedSetting + } + else { + activityConfiguration.speedSetting = 5 + } } function saveValues() { - var configHasChanged = false - var oldSpeed = activityConfiguration.speedSetting speedSetting = speedSlider.value dataToSave = {"speedSetting": speedSetting} - if (oldSpeed !== speedSetting) { - configHasChanged = true - } - - // Restart the activity with new information - if(configHasChanged) { - background.stop(); - background.start(); - } } } diff --git a/src/activities/algebra_div/ActivityConfig.qml b/src/activities/algebra_div/ActivityConfig.qml index b32ceadbe..da5252166 100644 --- a/src/activities/algebra_div/ActivityConfig.qml +++ b/src/activities/algebra_div/ActivityConfig.qml @@ -56,21 +56,15 @@ Item { property var dataToSave function setDefaultValues() { speedSlider.value = Qt.binding(function() {return activityConfiguration.speedSetting;}) - activityConfiguration.speedSetting = dataToSave.speedSetting + if(dataToSave.speedSetting) { + activityConfiguration.speedSetting = dataToSave.speedSetting + } + else { + activityConfiguration.speedSetting = 5 + } } function saveValues() { - var configHasChanged = false - var oldSpeed = activityConfiguration.speedSetting speedSetting = speedSlider.value dataToSave = {"speedSetting": speedSetting} - if (oldSpeed !== speedSetting) { - configHasChanged = true - } - - // Restart the activity with new information - if(configHasChanged) { - background.stop(); - background.start(); - } } } diff --git a/src/activities/algebra_minus/ActivityConfig.qml b/src/activities/algebra_minus/ActivityConfig.qml index 99f9e9f5c..1525d8d20 100644 --- a/src/activities/algebra_minus/ActivityConfig.qml +++ b/src/activities/algebra_minus/ActivityConfig.qml @@ -57,21 +57,15 @@ Item { property var dataToSave function setDefaultValues() { speedSlider.value = Qt.binding(function() {return activityConfiguration.speedSetting;}) - activityConfiguration.speedSetting = dataToSave.speedSetting + if(dataToSave.speedSetting) { + activityConfiguration.speedSetting = dataToSave.speedSetting + } + else { + activityConfiguration.speedSetting = 5 + } } function saveValues() { - var configHasChanged = false - var oldSpeed = activityConfiguration.speedSetting speedSetting = speedSlider.value dataToSave = {"speedSetting": speedSetting} - if (oldSpeed !== speedSetting) { - configHasChanged = true - } - - // Restart the activity with new information - if(configHasChanged) { - background.stop(); - background.start(); - } } } diff --git a/src/activities/algebra_plus/ActivityConfig.qml b/src/activities/algebra_plus/ActivityConfig.qml index 99f9e9f5c..1525d8d20 100644 --- a/src/activities/algebra_plus/ActivityConfig.qml +++ b/src/activities/algebra_plus/ActivityConfig.qml @@ -57,21 +57,15 @@ Item { property var dataToSave function setDefaultValues() { speedSlider.value = Qt.binding(function() {return activityConfiguration.speedSetting;}) - activityConfiguration.speedSetting = dataToSave.speedSetting + if(dataToSave.speedSetting) { + activityConfiguration.speedSetting = dataToSave.speedSetting + } + else { + activityConfiguration.speedSetting = 5 + } } function saveValues() { - var configHasChanged = false - var oldSpeed = activityConfiguration.speedSetting speedSetting = speedSlider.value dataToSave = {"speedSetting": speedSetting} - if (oldSpeed !== speedSetting) { - configHasChanged = true - } - - // Restart the activity with new information - if(configHasChanged) { - background.stop(); - background.start(); - } } } diff --git a/src/activities/gletters/ActivityConfig.qml b/src/activities/gletters/ActivityConfig.qml index de2c72f65..2b3619bf3 100644 --- a/src/activities/gletters/ActivityConfig.qml +++ b/src/activities/gletters/ActivityConfig.qml @@ -77,7 +77,6 @@ Item { } property var dataToSave - function setDefaultValues() { // Recreate the binding uppercaseBox.checked = Qt.binding(function(){return activityConfiguration.uppercaseOnly;}) @@ -96,35 +95,26 @@ Item { } activityConfiguration.locale = localeUtf8 activityConfiguration.uppercaseOnly = (dataToSave.uppercaseMode === "true") - activityConfiguration.speedSetting = dataToSave.speedSetting + if(dataToSave.speedSetting) { + activityConfiguration.speedSetting = dataToSave.speedSetting + } + else { + activityConfiguration.speedSetting = 10 + } } function saveValues() { - var configHasChanged = false - var oldLocale = activityConfiguration.locale; var newLocale = activityConfiguration.availableLangs[activityConfiguration.localeBox.currentIndex].locale; // Remove .UTF-8 if(newLocale.indexOf('.') != -1) { newLocale = newLocale.substring(0, newLocale.indexOf('.')) } - var oldUppercaseMode = activityConfiguration.uppercaseOnly activityConfiguration.uppercaseOnly = activityConfiguration.uppercaseBox.checked - var oldSpeed = activityConfiguration.speedSetting speedSetting = speedSlider.value dataToSave = {"locale": newLocale, "uppercaseMode": "" + activityConfiguration.uppercaseOnly, "speedSetting": speedSetting} activityConfiguration.locale = newLocale; - - if(oldLocale !== newLocale || oldUppercaseMode !== activityConfiguration.uppercaseOnly || oldSpeed !== speedSetting) { - configHasChanged = true; - } - - // Restart the activity with new information - if(configHasChanged) { - background.stop(); - background.start(); - } } } diff --git a/src/activities/smallnumbers/ActivityConfig.qml b/src/activities/smallnumbers/ActivityConfig.qml index 7337ca461..13a0cbc0e 100644 --- a/src/activities/smallnumbers/ActivityConfig.qml +++ b/src/activities/smallnumbers/ActivityConfig.qml @@ -57,21 +57,15 @@ Item { property var dataToSave function setDefaultValues() { speedSlider.value = Qt.binding(function() {return activityConfiguration.speedSetting;}) - activityConfiguration.speedSetting = dataToSave.speedSetting + if(dataToSave.speedSetting) { + activityConfiguration.speedSetting = dataToSave.speedSetting + } + else { + activityConfiguration.speedSetting = 10 + } } function saveValues() { - var configHasChanged = false - var oldSpeed = activityConfiguration.speedSetting speedSetting = speedSlider.value dataToSave = {"speedSetting": speedSetting} - if (oldSpeed !== speedSetting) { - configHasChanged = true - } - - // Restart the activity with new information - if(configHasChanged) { - background.stop(); - background.start(); - } } } diff --git a/src/activities/smallnumbers2/ActivityConfig.qml b/src/activities/smallnumbers2/ActivityConfig.qml index 24136de9f..59f712bc6 100644 --- a/src/activities/smallnumbers2/ActivityConfig.qml +++ b/src/activities/smallnumbers2/ActivityConfig.qml @@ -75,21 +75,22 @@ Item { property var dataToSave function setDefaultValues() { speedSlider.value = Qt.binding(function() {return activityConfiguration.speedSetting;}) - activityConfiguration.speedSetting = dataToSave.speedSetting + for(var i = 0 ; i < availableModes.length ; i++) { + if(availableModes[i].value === dataToSave["mode"]) { + modeBox.currentIndex = i; + break; + } + } + if(dataToSave.speedSetting) { + activityConfiguration.speedSetting = dataToSave.speedSetting + } + else { + activityConfiguration.speedSetting = 10 + } } function saveValues() { - var configHasChanged = false - var oldSpeed = activityConfiguration.speedSetting + var newMode = availableModes[modeBox.currentIndex].value; speedSetting = speedSlider.value - dataToSave = {"speedSetting": speedSetting} - if (oldSpeed !== speedSetting) { - configHasChanged = true - } - - // Restart the activity with new information - if(configHasChanged) { - background.stop(); - background.start(); - } + dataToSave = {"mode": newMode, "speedSetting": speedSetting} } } diff --git a/src/activities/wordsgame/ActivityConfig.qml b/src/activities/wordsgame/ActivityConfig.qml index e6a43587e..15caa46e1 100644 --- a/src/activities/wordsgame/ActivityConfig.qml +++ b/src/activities/wordsgame/ActivityConfig.qml @@ -95,35 +95,26 @@ Item { } activityConfiguration.locale = localeUtf8 activityConfiguration.uppercaseOnly = (dataToSave.uppercaseMode === "true") - activityConfiguration.speedSetting = dataToSave.speedSetting + if(dataToSave.speedSetting) { + activityConfiguration.speedSetting = dataToSave.speedSetting + } + else { + activityConfiguration.speedSetting = 10 + } } function saveValues() { - var configHasChanged = false - var oldLocale = activityConfiguration.locale; var newLocale = activityConfiguration.availableLangs[activityConfiguration.localeBox.currentIndex].locale; // Remove .UTF-8 if(newLocale.indexOf('.') != -1) { newLocale = newLocale.substring(0, newLocale.indexOf('.')) } - var oldUppercaseMode = activityConfiguration.uppercaseOnly activityConfiguration.uppercaseOnly = activityConfiguration.uppercaseBox.checked - var oldSpeed = activityConfiguration.speedSetting speedSetting = speedSlider.value dataToSave = {"locale": newLocale, "uppercaseMode": "" + activityConfiguration.uppercaseOnly, "speedSetting": speedSetting} activityConfiguration.locale = newLocale; - - if(oldLocale !== newLocale || oldUppercaseMode !== activityConfiguration.uppercaseOnly || oldSpeed !== speedSetting) { - configHasChanged = true; - } - - // Restart the activity with new information - if(configHasChanged) { - background.stop(); - background.start(); - } } } -- GitLab