algebra, gletters, smallnumbers, wordsgame, some cleaning in Options

src/activities/algebra_by/ActivityConfig.qml

@@ -56,21 +56,15 @@ Item {
     property var dataToSave
     function setDefaultValues() {
         speedSlider.value = Qt.binding(function() {return activityConfiguration.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();
-        }
     }
 }

src/activities/algebra_div/ActivityConfig.qml

@@ -56,21 +56,15 @@ Item {
     property var dataToSave
     function setDefaultValues() {
         speedSlider.value = Qt.binding(function() {return activityConfiguration.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();
-        }
     }
 }

src/activities/algebra_minus/ActivityConfig.qml

@@ -57,21 +57,15 @@ Item {
     property var dataToSave
     function setDefaultValues() {
         speedSlider.value = Qt.binding(function() {return activityConfiguration.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();
-        }
     }
 }

src/activities/algebra_plus/ActivityConfig.qml

@@ -57,21 +57,15 @@ Item {
     property var dataToSave
     function setDefaultValues() {
         speedSlider.value = Qt.binding(function() {return activityConfiguration.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();
-        }
     }
 }

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")
+        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();
-        }
     }
 }

src/activities/smallnumbers/ActivityConfig.qml

@@ -57,21 +57,15 @@ Item {
     property var dataToSave
     function setDefaultValues() {
         speedSlider.value = Qt.binding(function() {return activityConfiguration.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();
-        }
     }
 }

src/activities/smallnumbers2/ActivityConfig.qml

@@ -75,21 +75,22 @@ Item {
     property var dataToSave
     function setDefaultValues() {
         speedSlider.value = Qt.binding(function() {return activityConfiguration.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
         }
-    function saveValues() {
-        var configHasChanged = false
-        var oldSpeed = activityConfiguration.speedSetting
-        speedSetting = speedSlider.value
-        dataToSave = {"speedSetting": speedSetting}
-        if (oldSpeed !== speedSetting) {
-            configHasChanged = true
+        else {
+            activityConfiguration.speedSetting = 10
         }
-
-        // Restart the activity with new information
-        if(configHasChanged) {
-            background.stop();
-            background.start();
     }
+    function saveValues() {
+        var newMode = availableModes[modeBox.currentIndex].value;
+        speedSetting = speedSlider.value
+        dataToSave = {"mode": newMode, "speedSetting": speedSetting}
     }
 }

src/activities/wordsgame/ActivityConfig.qml

@@ -95,35 +95,26 @@ Item {
         }
         activityConfiguration.locale = localeUtf8
         activityConfiguration.uppercaseOnly = (dataToSave.uppercaseMode === "true")
+        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();
-        }
     }
 }