Merge lp:~nik90/ubuntu-clock-app/engine-fixes into lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix

[Nekhelesh Ramananthan]

- Replace QML Timer with QTimer
- Move StopwatchEngine to StopwatchPage.qml

[lp:~nik90/ubuntu-clock-app/engine-fixes]

390. By Nekhelesh Ramananthan on 2015-09-11

Set interval once

[Bartosz Kosiorek (gang65)]

We should delete m_timer pointer in destructor.

review: Needs Fixing

[lp:~nik90/ubuntu-clock-app/engine-fixes]

391. By Nekhelesh Ramananthan on 2015-09-11

Proper use of Q_INVOKABLE and public slots

392. By Nekhelesh Ramananthan on 2015-09-11

fixed conflicts

393. By Nekhelesh Ramananthan on 2015-09-11

Replaced pointer with regular variable

[Nekhelesh Ramananthan (nik90)]

Replaced pointer with regular variable. That should prevent any memory leaks or crashes.

=== modified file 'app/MainPage.qml'
--- app/MainPage.qml	2015-09-11 13:13:17 +0000
+++ app/MainPage.qml	2015-09-11 13:37:52 +0000
@@ -19,7 +19,6 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.2
 import QtSystemInfo 5.0
-import Stopwatch 1.0
 import Qt.labs.settings 1.0
 import "upstreamcomponents"
 import "alarm"
@@ -56,13 +55,9 @@
         id: alarmUtils
     }
 
-    StopwatchEngine {
-        id: stopwatchEngine
-    }
-
     ScreenSaver {
         // Disable screen dimming/off when stopwatch is running
-        screenSaverEnabled: !stopwatchEngine.running
+        screenSaverEnabled: !stopwatchPage.isRunning
     }
 
     VisualItemModel {
@@ -95,6 +90,13 @@
     ListView {
         id: listview
 
+        // Show the stopwatch page on app startup if it is running
+        Component.onCompleted: {
+            if (stopwatchPage.isRunning) {
+                positionViewAtIndex(1, ListView.SnapPosition)
+            }
+        }
+
         anchors {
             top: headerRow.bottom
             left: parent.left
@@ -108,12 +110,5 @@
         interactive: false
         highlightMoveDuration: UbuntuAnimation.BriskDuration
         highlightRangeMode: ListView.StrictlyEnforceRange
-
-        // Show the stopwatch page on app startup if it is running
-        Component.onCompleted: {
-            if (stopwatchEngine.running) {
-                positionViewAtIndex(1, ListView.SnapPosition)
-            }
-        }
     }
 }

=== modified file 'app/stopwatch/StopwatchPage.qml'
--- app/stopwatch/StopwatchPage.qml	2015-09-10 20:38:50 +0000
+++ app/stopwatch/StopwatchPage.qml	2015-09-11 13:37:52 +0000
@@ -17,24 +17,21 @@
  */
 
 import QtQuick 2.4
+import Stopwatch 1.0
 import Ubuntu.Components 1.2
 
 Item {
     id: _stopwatchPage
     objectName: "stopwatchPage"
 
+    property alias isRunning: stopwatchEngine.running
+
     Component.onCompleted: {
         console.log("[LOG]: Stopwatch Page Loaded")
     }
 
-    Timer {
-        id: refreshTimer
-        interval: 45
-        repeat: true
-        running: stopwatchEngine.running
-        onTriggered: {
-             stopwatchEngine.updateStopwatch();
-        }
+    StopwatchEngine {
+        id: stopwatchEngine
     }
 
     StopwatchFace {

=== modified file 'backend/modules/Stopwatch/engine.cpp'
--- backend/modules/Stopwatch/engine.cpp	2015-09-10 22:58:10 +0000
+++ backend/modules/Stopwatch/engine.cpp	2015-09-11 13:37:52 +0000
@@ -33,6 +33,10 @@
     m_totalTimeInmsecs(0)
 {
     qDebug() << "[LOG] Loading laps from " << m_settings.fileName();
+
+    m_timer.setInterval(45);
+    connect(&m_timer, &QTimer::timeout, this, &StopwatchEngine::updateStopwatch);
+
     QDateTime startTime = m_settings.value("Stopwatch/startDateTime").toDateTime();
     if(startTime.isValid())
     {
@@ -45,6 +49,11 @@
     if(m_previousTimeInmsecs != 0) {
         setTotalTimeOfStopwatch(m_previousTimeInmsecs);
     }
+
+    if(m_isStopwatchRunning == true)
+    {
+        m_timer.start();
+    }
 }
 
 int StopwatchEngine::rowCount(const QModelIndex &parent) const
@@ -114,6 +123,7 @@
 {
     setStopwatchStartDateTime();
     setRunning(true);
+    m_timer.start();
 }
 
 void StopwatchEngine::updateStopwatch()
@@ -126,6 +136,7 @@
     setPreviousTimeOfStopwatch(m_previousTimeInmsecs + m_stopwatchStartDateTime.msecsTo(QDateTime::currentDateTimeUtc()));
     setTotalTimeOfStopwatch(m_previousTimeInmsecs);
     setRunning(false);
+    m_timer.stop();
 }
 
 void StopwatchEngine::clearStopwatch()

=== modified file 'backend/modules/Stopwatch/engine.h'
--- backend/modules/Stopwatch/engine.h	2015-09-10 22:45:38 +0000
+++ backend/modules/Stopwatch/engine.h	2015-09-11 13:37:52 +0000
@@ -20,6 +20,7 @@
 #define ENGINE_H
 
 #include <QAbstractListModel>
+#include <QTimer>
 #include <QSettings>
 #include <QDateTime>
 
@@ -70,20 +71,21 @@
     */
     QHash<int, QByteArray> roleNames() const override;
 
-public slots:
-    void addLap();
-    void removeLap(int lapIndex);
-
-    void startStopwatch();
-    void pauseStopwatch();
-    void clearStopwatch();
-    void updateStopwatch();
-
     // Getter functions for the properties
     bool running() const;
     int totalTimeOfStopwatch() const;
     int previousTimeOfStopwatch() const;
 
+    Q_INVOKABLE void addLap();
+    Q_INVOKABLE void removeLap(int lapIndex);
+
+    Q_INVOKABLE void startStopwatch();
+    Q_INVOKABLE void pauseStopwatch();
+    Q_INVOKABLE void clearStopwatch();
+
+private slots:
+    void updateStopwatch();    
+
 private:
     void setStopwatchStartDateTime();
 
@@ -94,6 +96,7 @@
     QSettings m_settings;
 
     QDateTime m_stopwatchStartDateTime;
+    QTimer m_timer;
 
     bool m_isStopwatchRunning;
     int m_previousTimeInmsecs;