Reads the settings right

And saves Initial time with the correct key now...

diff --git a/classes/settings.cpp b/classes/settings.cpp
index 7e08287..38656e7 100644 (file)
--- a/classes/settings.cpp
+++ b/classes/settings.cpp
@@ -84,10 +84,21 @@ return groupString;
        if (timeControl == WrappedClocksWidget::HourGlass)
             defaultTime = hourGlassTime;
 
+//       if (isWhite)
+//           return settings.value("WhiteInitial",defaultTime).toTime();
+//        else
+//           return settings.value("BlackInitial",defaultTime).toTime();
+
+       QTime result;
+
        if (isWhite)
-           return settings.value("WhiteInitial",defaultTime).toTime();
+           result = settings.value("WhiteInitial",defaultTime).toTime();
         else
-           return settings.value("BlackInitial",defaultTime).toTime();
+           result = settings.value("BlackInitial",defaultTime).toTime();
+
+       qDebug() << "Initial time is: " << result;
+
+       return result;
    }
 
    QTime Settings::getAdditionalTime(int timeControl, bool isWhite)
@@ -96,10 +107,21 @@ return groupString;
        settings.beginGroup(getGroupName(timeControl));
 
        QTime defaultTime(0,0,30);
+
+
+//       if (isWhite)
+//           return settings.value("WhiteAddition",defaultTime).toTime();
+//       else
+//           return settings.value("BlackAddition",defaultTime).toTime();
+
+       QTime result;
        if (isWhite)
-           return settings.value("WhiteAddition",defaultTime).toTime();
+           result = settings.value("WhiteAddition",defaultTime).toTime();
        else
-           return settings.value("BlackAddition",defaultTime).toTime();
+           result = settings.value("BlackAddition",defaultTime).toTime();
+
+       qDebug() << "Additional time is: " << result;
+       return result;
    }
 
    bool Settings::isEqualTimes(int timeControl)
@@ -129,7 +151,7 @@ return groupString;
        if (isWhite)
            settings.setValue("WhiteInitial",time);
        else
-           settings.setValue("BlackItnitial",time);
+           settings.setValue("BlackInitial",time);
    }
 
    void Settings::setInitialTime(int timeControl, bool isWhite, int hours, int minutes, int seconds)

diff --git a/qml/NewGameDialogPage.qml b/qml/NewGameDialogPage.qml
index ebdd201..e56ff58 100644 (file)
--- a/qml/NewGameDialogPage.qml
+++ b/qml/NewGameDialogPage.qml
@@ -34,7 +34,12 @@ Page
     orientationLock: PageOrientation.LockLandscape
 
     property string name
-    property int timeControl //QML does not allow properties to be declared as enums...
+
+    //QML does not allow properties to be declared as enums...
+    //Initializing to invalid value to make sure picking *any* time control will trigger OnTimeControlChanged
+    property int timeControl: 1000
+
+
     property bool askAddition
     property bool askTurnsPerAddition
 
@@ -47,7 +52,7 @@ Page
     }
     onTimeControlChanged:
     {
-        equalTimesSwitch = settings.isEqualTimes(timeControl)
+        equalTimesSwitch.checked = settings.isEqualTimes(timeControl)
 
         var whiteInitial = settings.getInitialTime(timeControl,true)
         whiteInitialTime.hours = Qt.formatTime(whiteInitial,"h")
@@ -416,7 +421,7 @@ Page
 
 
                 //Save settings for white
-                settings.setInitialTime(timeControl,whiteInitialTime.hours,whiteInitialTime.minutes,whiteInitialTime.seconds)
+                settings.setInitialTime(timeControl,true,whiteInitialTime.hours,whiteInitialTime.minutes,whiteInitialTime.seconds)
                 settings.setAdditionalTime(timeControl,true,whiteAdditionalTime.hours,whiteAdditionalTime.minutes,whiteAdditionalTime.seconds)
                 settings.setTurnsPerAddition(timeControl,true,whiteTurnsPerAddition.text)