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

[Bartosz Kosiorek]

Rewrote stopwatch engine in c++ which should improve performance and fix all timezone issues.

Fix stopwatch issue appearing during changing timezone during runtime (LP: #1493358)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

371. By Bartosz Kosiorek on 2015-09-08

Update changelog

372. By Bartosz Kosiorek on 2015-09-08

Remove not needed code

373. By Bartosz Kosiorek on 2015-09-08

Merge with trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:373
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/828/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/173

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/828/rebuild

review: Approve (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

374. By Bartosz Kosiorek on 2015-09-08

Fixing resume and stoping stopwatch

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:374
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/829/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/174

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/829/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

I haven't had the time to do a full code review yet, but I see it is missing manual tests for this bug 1493358 and bug 1491024. Please fix that. It should at most another 10 mins.

review: Needs Fixing

[Victor Thompson (vthompson)]

Please also at least fix the spelling error for "appering" in the commit message.

[Victor Thompson (vthompson)]

Please also at least fix the spelling error for "appering" in the commit message.

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

A couple minor points,

1. Please rename, startStopwatch() function to something like setStopwatchStartTime() since that's essentially what that function does. May be updateStopwatch() could also be renamed to getCurrentUTCTime().

2. I think we could move "running", "previousLapTime", "lapsTime" properties and even start(), update(), stop() into the c++ class and just use Stopwatch.qml for managing the UI alone. I mention this because all other stuff seems to have already been moved into the c++ class.

review: Needs Fixing

[Bartosz Kosiorek (gang65)]

Thanks for comments guys.
I will apply them soon.

Have you tested stopwatch itself? Is it working for you correctly?

review: Needs Information

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

375. By Bartosz Kosiorek on 2015-09-09

Refactor class and variable names

376. By Bartosz Kosiorek on 2015-09-09

Rename clear method to clearLaps

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:376
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/830/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/175

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/830/rebuild

review: Approve (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

377. By Bartosz Kosiorek on 2015-09-09

Rename file names

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:377
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/831/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/176

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/831/rebuild

review: Approve (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

378. By Bartosz Kosiorek on 2015-09-09

Migrate engine to C++

379. By Bartosz Kosiorek on 2015-09-10

Fix small issues with C++ code

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:379
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/832/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/177/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/832/rebuild

review: Needs Fixing (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

380. By Bartosz Kosiorek on 2015-09-10

Minor changes

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:380
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/833/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/178

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/833/rebuild

review: Approve (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

381. By Bartosz Kosiorek on 2015-09-10

Switch automatically to stopwatch when stopwatch is running

382. By Bartosz Kosiorek on 2015-09-10

Update manual tests

383. By Bartosz Kosiorek on 2015-09-10

Small dim fix

384. By Bartosz Kosiorek on 2015-09-10

Make set methods as private

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:384
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/834/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/179/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/834/rebuild

review: Needs Fixing (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

385. By Bartosz Kosiorek on 2015-09-11

Engines fixes which include,
- Ensure get() functions only return the variable value and nothing else
- Renamed property isRunning to Running to match upstream Qt property naming
- Added a updateStopwatch() public slot

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:385
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/836/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/181/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/836/rebuild

review: Needs Fixing (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

386. By Bartosz Kosiorek on 2015-09-11

Merge with trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:386
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/837/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/182

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/837/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Added some inline comments to improve manual test wordings.

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

I also think we should move the initialization of the StopwatchEngine{} to the StopwatchPage.qml and just expose the running property to the mainPage.qml.

review: Needs Fixing

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

387. By Bartosz Kosiorek on 2015-09-11

Update manual tests

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:387
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/838/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/183

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/838/rebuild

review: Approve (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

388. By Bartosz Kosiorek on 2015-09-11

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:388
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/840/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/185

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/840/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

I am going to test the new engine tonight. I would like Michael Zanetti to quickly glance through the c++ code and check if everything is good.

review: Abstain

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

389. By Bartosz Kosiorek on 2015-09-12

Merge with trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:389
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/841/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/186

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/841/rebuild

review: Approve (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix]

390. By Bartosz Kosiorek on 2015-09-12

Increase default number of jobs to 3 in README files

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:390
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/842/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/187

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/842/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Did manual testing for about 12 hrs, and tried stuff like changing timezones, closing app and reopening it...and what not. It works really well. Also did a code review and looks good. Approving.

review: Approve (testing and code review.)

[Bartosz Kosiorek (gang65)]

review: Approve

=== modified file 'README.autopilot'
--- README.autopilot	2015-08-12 19:04:13 +0000
+++ README.autopilot	2015-09-12 11:55:48 +0000
@@ -32,7 +32,7 @@
 
 *  Build the clock app,
     $ mkdir builddir && cd builddir
-    $ cmake .. && make
+    $ cmake .. && cmake --build . -- -j 3
     $ cd ..
 
 *  Navigate to the tests/autopilot directory.

=== modified file 'README.developers'
--- README.developers	2015-08-12 19:04:13 +0000
+++ README.developers	2015-09-12 11:55:48 +0000
@@ -7,7 +7,7 @@
    $ bzr branch lp:ubuntu-clock-app branch-name
    $ cd branch-name
    $ mkdir builddir && cd builddir
-   $ cmake .. && cmake --build .
+   $ cmake .. && cmake --build . -- -j 3
    $ qmlscene ../app/ubuntu-clock-app.qml -I backend/
 
 Submitting a patch upstream
@@ -56,7 +56,7 @@
 
    $ cd branch-name
    $ mkdir builddir && cd builddir
-   $ cmake -DCMAKE_BUILD_TYPE=Debug .. && cmake --build .
+   $ cmake -DCMAKE_BUILD_TYPE=Debug .. && cmake --build . -- -j 3
 
 To run GDB:
 

=== modified file 'README.unittest'
--- README.unittest	2015-08-12 19:04:13 +0000
+++ README.unittest	2015-09-12 11:55:48 +0000
@@ -10,11 +10,11 @@
 merge request.
 
 * Branch the clock app code, 
-   $ bzr branch lp:ubuntu-clock-app/reboot
-   
+   $ bzr branch lp:ubuntu-clock-app
+
 * Build the clock app,
    $ mkdir builddir && cd builddir
-   $ cmake ..  && make
+   $ cmake ..  && cmake --build . -- -j 3
    
 Running all unit test at once
 =============================

=== modified file 'app/MainPage.qml'
--- app/MainPage.qml	2015-08-20 16:03:35 +0000
+++ app/MainPage.qml	2015-09-12 11:55:48 +0000
@@ -57,15 +57,7 @@
 
     ScreenSaver {
         // Disable screen dimming/off when stopwatch is running
-        screenSaverEnabled: !stopwatchPage.running
-    }
-
-    Settings {
-        id: stopwatchState
-        category: "Stopwatch"
-        property alias startTime: stopwatchPage.startTime
-        property alias running: stopwatchPage.running
-        property alias oldDiff: stopwatchPage.oldDiff
+        screenSaverEnabled: !stopwatchPage.isRunning
     }
 
     VisualItemModel {
@@ -100,8 +92,9 @@
 
         // Show the stopwatch page on app startup if it is running
         Component.onCompleted: {
-            if (stopwatchState.running)
+            if (stopwatchPage.isRunning) {
                 positionViewAtIndex(1, ListView.SnapPosition)
+            }
         }
 
         anchors {

=== modified file 'app/components/HeaderNavigation.qml'
--- app/components/HeaderNavigation.qml	2015-08-17 12:25:22 +0000
+++ app/components/HeaderNavigation.qml	2015-09-12 11:55:48 +0000
@@ -58,7 +58,7 @@
         
         Rectangle {
             height: parent.height
-            x: listview.currentIndex == 0 ? 0 : parent.width-width
+            x: listview.currentIndex == 0 ? 0 : parent.width - width
             width: units.gu(5.5)
             color: UbuntuColors.orange
             Behavior on x {

=== modified file 'app/stopwatch/LapListView.qml'
--- app/stopwatch/LapListView.qml	2015-08-26 22:41:34 +0000
+++ app/stopwatch/LapListView.qml	2015-09-12 11:55:48 +0000
@@ -82,7 +82,7 @@
                 Action {
                     iconName: "delete"
                     onTriggered: {
-                        lapHistory.removeLap(index)
+                        stopwatchEngine.removeLap(index)
                     }
                 }
             ]

=== modified file 'app/stopwatch/StopwatchPage.qml'
--- app/stopwatch/StopwatchPage.qml	2015-09-02 13:15:50 +0000
+++ app/stopwatch/StopwatchPage.qml	2015-09-12 11:55:48 +0000
@@ -24,69 +24,21 @@
     id: _stopwatchPage
     objectName: "stopwatchPage"
 
-    property date startTime: getUTCDate()
-    property date snapshot: startTime
-    property bool running: false
-
-    property int timeDiff: snapshot - startTime
-    property int oldDiff: 0
-
-    property int totalTimeDiff: timeDiff + oldDiff
+    property alias isRunning: stopwatchEngine.running
 
     Component.onCompleted: {
         console.log("[LOG]: Stopwatch Page Loaded")
     }
 
-    function getUTCDate() {
-        var localDate = new Date()
-        return new Date(localDate.getUTCFullYear(),
-                        localDate.getUTCMonth(),
-                        localDate.getUTCDate(),
-                        localDate.getUTCHours(),
-                        localDate.getUTCMinutes(),
-                        localDate.getUTCSeconds(),
-                        localDate.getUTCMilliseconds())
-    }
-
-    function start() {
-        startTime = getUTCDate()
-        snapshot = startTime
-        running = true
-    }
-
-    function stop() {
-        oldDiff += timeDiff
-        startTime = getUTCDate()
-        snapshot = startTime
-        running = false
-    }
-
-    function update() {
-        snapshot = getUTCDate()
-    }
-
-    function clear() {
-        oldDiff = 0
-        startTime = getUTCDate()
-        snapshot = startTime
-        lapHistory.clear()
-    }
-
-    Timer {
-        id: refreshTimer
-        interval: 45
-        repeat: true
-        running: _stopwatchPage.running
-        onTriggered: {
-            _stopwatchPage.update()
-        }
+    StopwatchEngine {
+        id: stopwatchEngine
     }
 
     StopwatchFace {
         id: stopwatch
         objectName: "stopwatch"
 
-        milliseconds: _stopwatchPage.totalTimeDiff
+        milliseconds: stopwatchEngine.totalTimeOfStopwatch
 
         anchors {
             top: parent.top
@@ -109,14 +61,14 @@
 
         Button {
             id: stopButton
-            width: oldDiff !== 0 || running ? (parent.width - parent.spacing) / 2 : parent.width
-            color: !_stopwatchPage.running ? UbuntuColors.green : UbuntuColors.red
-            text: _stopwatchPage.running ? i18n.tr("Stop") : (oldDiff === 0 ? i18n.tr("Start") : i18n.tr("Resume"))
+            width: stopwatchEngine.previousTimeOfStopwatch !== 0 || stopwatchEngine.running ? (parent.width - parent.spacing) / 2 : parent.width
+            color: !stopwatchEngine.running ? UbuntuColors.green : UbuntuColors.red
+            text: stopwatchEngine.running ? i18n.tr("Stop") : (stopwatchEngine.previousTimeOfStopwatch === 0 ? i18n.tr("Start") : i18n.tr("Resume"))
             onClicked: {
-                if (_stopwatchPage.running) {
-                    _stopwatchPage.stop()
+                if (stopwatchEngine.running) {
+                    stopwatchEngine.pauseStopwatch();
                 } else {
-                    _stopwatchPage.start()
+                    stopwatchEngine.startStopwatch();
                 }
             }
             Behavior on width {
@@ -128,16 +80,15 @@
 
         Button {
             id: lapButton
-            text: _stopwatchPage.running ? i18n.tr("Lap") : i18n.tr("Clear")
-            width: oldDiff !== 0 || running ? (parent.width - parent.spacing) / 2 : 0
+            text: stopwatchEngine.running ? i18n.tr("Lap") : i18n.tr("Clear")
+            width:  stopwatchEngine.previousTimeOfStopwatch !== 0 || stopwatchEngine.running ? (parent.width - parent.spacing) / 2 : 0
             strokeColor: UbuntuColors.lightGrey
-            visible: oldDiff !== 0 || running
+            visible:  stopwatchEngine.previousTimeOfStopwatch !== 0 || stopwatchEngine.running
             onClicked: {
-                if (_stopwatchPage.running) {
-                    _stopwatchPage.update()
-                    lapHistory.addLap(_stopwatchPage.totalTimeDiff)
+                if (stopwatchEngine.running) {
+                    stopwatchEngine.addLap()
                 } else {
-                    _stopwatchPage.clear()
+                    stopwatchEngine.clearStopwatch()
                 }
             }
             Behavior on width {
@@ -162,19 +113,15 @@
         Loader {
             id: lapListViewLoader
             anchors.fill: parent
-            sourceComponent: !_stopwatchPage.running && _stopwatchPage.totalTimeDiff == 0 ? undefined : lapListViewComponent
+            sourceComponent: !stopwatchEngine.running && stopwatchEngine.totalTimeOfStopwatch === 0 ? undefined : lapListViewComponent
         }
     }
 
-    LapHistory {
-        id: lapHistory
-    }
-
     Component {
         id: lapListViewComponent
         LapListView {
             id: lapListView
-            model: lapHistory
+            model: stopwatchEngine
         }
     }
 }

=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2015-08-26 23:37:06 +0000
+++ backend/CMakeLists.txt	2015-09-12 11:55:48 +0000
@@ -28,7 +28,7 @@
 set(
     stopwatch_SRCS
     modules/Stopwatch/backend.cpp
-    modules/Stopwatch/history.cpp
+    modules/Stopwatch/engine.cpp
     modules/Stopwatch/formattime.cpp
 )
 

=== modified file 'backend/modules/Stopwatch/backend.cpp'
--- backend/modules/Stopwatch/backend.cpp	2015-08-26 22:41:34 +0000
+++ backend/modules/Stopwatch/backend.cpp	2015-09-12 11:55:48 +0000
@@ -19,14 +19,14 @@
 #include <QtQml>
 #include <QtQml/QQmlContext>
 #include "backend.h"
-#include "history.h"
+#include "engine.h"
 #include "formattime.h"
 
 void BackendPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Stopwatch"));
 
-    qmlRegisterType<LapHistory>(uri, 1, 0, "LapHistory");
+    qmlRegisterType<StopwatchEngine>(uri, 1, 0, "StopwatchEngine");
     qmlRegisterType<FormatTime>(uri, 1, 0, "StopwatchFormatTime");
 }
 

=== renamed file 'backend/modules/Stopwatch/history.cpp' => 'backend/modules/Stopwatch/engine.cpp'
--- backend/modules/Stopwatch/history.cpp	2015-08-24 23:37:28 +0000
+++ backend/modules/Stopwatch/engine.cpp	2015-09-12 11:55:48 +0000
@@ -16,24 +16,47 @@
  *                                                                           *
  ****************************************************************************/
 
-#include "history.h"
+#include "engine.h"
 
 #include <QStandardPaths>
 #include <QDebug>
 
-LapHistory::LapHistory(QObject *parent) :
+StopwatchEngine::StopwatchEngine(QObject *parent) :
     QAbstractListModel(parent),
     /*
      #FIXME: Change QStandardPaths::ConfigLocation to QStandardPaths::AppConfigLocation
      when Ubuntu Touch moves over to Qt 5.5. AppConfigLocation will directly return
      /home/phablet/.config/com.ubuntu.clock path.
     */
-    m_settings(QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/com.ubuntu.clock/com.ubuntu.clock.conf", QSettings::IniFormat)
+    m_settings(QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/com.ubuntu.clock/com.ubuntu.clock.conf", QSettings::IniFormat),
+    m_previousTimeInmsecs(0),
+    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())
+    {
+        m_stopwatchStartDateTime = startTime;
+    }
+
+    m_isStopwatchRunning = m_settings.value("Stopwatch/isStopwatchRunning").toBool();
+    m_previousTimeInmsecs = m_settings.value("Stopwatch/previousTimeInmsecs").toInt();
+
+    if(m_previousTimeInmsecs != 0) {
+        setTotalTimeOfStopwatch(m_previousTimeInmsecs);
+    }
+
+    if(m_isStopwatchRunning == true)
+    {
+        m_timer.start();
+    }
 }
 
-int LapHistory::rowCount(const QModelIndex &parent) const
+int StopwatchEngine::rowCount(const QModelIndex &parent) const
 {
     /*
      QT's models also handle tables and tree views, so the index is not just a
@@ -46,7 +69,7 @@
     return m_settings.value("Stopwatch/laps").toList().count();
 }
 
-QVariant LapHistory::data(const QModelIndex &index, int role) const
+QVariant StopwatchEngine::data(const QModelIndex &index, int role) const
 {
     switch (role) {
     case RoleTotalTime:
@@ -63,7 +86,7 @@
     return QVariant();
 }
 
-QHash<int, QByteArray> LapHistory::roleNames() const
+QHash<int, QByteArray> StopwatchEngine::roleNames() const
 {
     QHash< int, QByteArray> roles;
     roles.insert(RoleTotalTime, "totaltime");
@@ -71,16 +94,17 @@
     return roles;
 }
 
-void LapHistory::addLap(int timeDiff)
+void StopwatchEngine::addLap()
 {
     QVariantList laps = m_settings.value("Stopwatch/laps").toList();
     beginInsertRows(QModelIndex(), 0, 0);
+    int timeDiff = m_totalTimeInmsecs;
     laps.prepend(timeDiff);
     m_settings.setValue("Stopwatch/laps", laps);
     endInsertRows();
 }
 
-void LapHistory::removeLap(int lapIndex)
+void StopwatchEngine::removeLap(int lapIndex)
 {
     QVariantList laps = m_settings.value("Stopwatch/laps").toList();
     beginRemoveRows(QModelIndex(), lapIndex, lapIndex);
@@ -89,9 +113,88 @@
     endRemoveRows();
 }
 
-void LapHistory::clear()
-{
+void StopwatchEngine::setStopwatchStartDateTime()
+{
+    m_stopwatchStartDateTime = QDateTime::currentDateTimeUtc();
+    m_settings.setValue("Stopwatch/startDateTime", m_stopwatchStartDateTime);
+}
+
+void StopwatchEngine::startStopwatch()
+{
+    setStopwatchStartDateTime();
+    setRunning(true);
+    m_timer.start();
+}
+
+void StopwatchEngine::updateStopwatch()
+{
+    setTotalTimeOfStopwatch(m_previousTimeInmsecs + m_stopwatchStartDateTime.msecsTo(QDateTime::currentDateTimeUtc()));
+}
+
+void StopwatchEngine::pauseStopwatch()
+{
+    setPreviousTimeOfStopwatch(m_previousTimeInmsecs + m_stopwatchStartDateTime.msecsTo(QDateTime::currentDateTimeUtc()));
+    setTotalTimeOfStopwatch(m_previousTimeInmsecs);
+    setRunning(false);
+    m_timer.stop();
+}
+
+void StopwatchEngine::clearStopwatch()
+{
+    setPreviousTimeOfStopwatch(0);
+    setTotalTimeOfStopwatch(0);
+
     beginResetModel();
     m_settings.setValue("Stopwatch/laps", QVariantList());
     endResetModel();
 }
+
+bool StopwatchEngine::running() const
+{
+    return m_isStopwatchRunning;
+}
+
+int StopwatchEngine::previousTimeOfStopwatch() const
+{
+    return m_previousTimeInmsecs;
+}
+
+int StopwatchEngine::totalTimeOfStopwatch() const
+{
+    return m_totalTimeInmsecs;
+}
+
+void StopwatchEngine::setRunning(bool value)
+{
+    if(value == m_isStopwatchRunning)
+    {
+        return;
+    }
+
+    m_isStopwatchRunning = value;
+    m_settings.setValue("Stopwatch/isStopwatchRunning", m_isStopwatchRunning);
+    emit runningChanged();
+}
+
+void StopwatchEngine::setPreviousTimeOfStopwatch(int value)
+{
+    if(value == m_previousTimeInmsecs)
+    {
+        return;
+    }
+
+    m_previousTimeInmsecs = value;
+    m_settings.setValue("Stopwatch/previousTimeInmsecs", m_previousTimeInmsecs);
+    emit previousTimeOfStopwatchChanged();
+}
+
+void StopwatchEngine::setTotalTimeOfStopwatch(int value)
+{
+    if(value == m_totalTimeInmsecs)
+    {
+        return;
+    }
+
+    m_totalTimeInmsecs = value;
+    emit totalTimeOfStopwatchChanged();
+}

=== renamed file 'backend/modules/Stopwatch/history.h' => 'backend/modules/Stopwatch/engine.h'
--- backend/modules/Stopwatch/history.h	2015-08-24 23:37:28 +0000
+++ backend/modules/Stopwatch/engine.h	2015-09-12 11:55:48 +0000
@@ -16,23 +16,47 @@
  *                                                                           *
  ****************************************************************************/
 
-#ifndef HISTORY_H
-#define HISTORY_H
+#ifndef ENGINE_H
+#define ENGINE_H
 
 #include <QAbstractListModel>
+#include <QTimer>
 #include <QSettings>
+#include <QDateTime>
 
-class LapHistory : public QAbstractListModel
+class StopwatchEngine : public QAbstractListModel
 {
     Q_OBJECT
 
+    Q_PROPERTY( bool running
+                READ running
+                NOTIFY runningChanged)
+
+    Q_PROPERTY( int totalTimeOfStopwatch
+                READ totalTimeOfStopwatch
+                NOTIFY totalTimeOfStopwatchChanged)
+
+    Q_PROPERTY( int previousTimeOfStopwatch
+                READ previousTimeOfStopwatch
+                NOTIFY previousTimeOfStopwatchChanged)
+
+signals:
+    // Signal to notify the running status change to QML
+    void runningChanged();
+
+    // Signal to notify the total time change to QML
+    void totalTimeOfStopwatchChanged();
+
+    // Signal to notify the total time change to QML
+    void previousTimeOfStopwatchChanged();
+
 public:
     enum Role {
         RoleTotalTime,
         RoleDiffToPrevious
     };
 
-    explicit LapHistory(QObject *parent = 0);
+    explicit StopwatchEngine(QObject *parent = 0);
 
     /*
      Let's override the pure virtual functions (the ones marked as
@@ -47,18 +71,36 @@
     */
     QHash<int, QByteArray> roleNames() const override;
 
-public slots:
-    // Function to add a stopwatch lap
-    void addLap(int timeDiff);
-
-    // Function to remove a stopwatch lap
-    void removeLap(int lapIndex);
-
-    // Function to clear all stopwatch laps
-    void clear();
+    // 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();
+
+    void setRunning(bool value);
+    void setTotalTimeOfStopwatch(int value);
+    void setPreviousTimeOfStopwatch(int value);
+
     QSettings m_settings;
+
+    QDateTime m_stopwatchStartDateTime;
+    QTimer m_timer;
+
+    bool m_isStopwatchRunning;
+    int m_previousTimeInmsecs;
+    int m_totalTimeInmsecs;
 };
 
-#endif // HISTORY_H
+#endif // ENGINE_H

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-11 14:01:47 +0000
+++ debian/changelog	2015-09-12 11:55:48 +0000
@@ -12,6 +12,7 @@
   * Fix wrong time after changing timezone, when stopwatch is running (LP: #1491024)
   * Reduce size of images (with tinypng.com) to decrease click image size (LP: #1492057)
   * Fix Czech Republic country name (LP: #1494004) 
+  * Fix stopwatch issue appering during changing timezone during runtime (LP: #1493358)
 
  -- Bartosz Kosiorek <[e-mail]>  Wed, 02 Sep 2015 15:16:29 +0200
 

=== added file 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/stopwatch.pxu'
--- tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/stopwatch.pxu	1970-01-01 00:00:00 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/stopwatch.pxu	2015-09-12 11:55:48 +0000
@@ -0,0 +1,21 @@
+id: stopwatch/language-change
+plugin: manual
+_summary: Test to check if stopwatch is working properly after timezone change, without closing Stopwatch
+estimated_duration: 600
+_description:
+    Test to check if stopwatch is working properly after timezone change, without closing Stopwatch
+    1. Launch the clock app.
+        Clock app opens showing the current local time.
+    2. Press the Stopwatch icon on the top of the screen.
+        Stopwatch is visible and is not running. The Stopwatch main display shows 00:00:00 000.
+    3. Press the Start button.
+        The main display starts counting time. The Start button disappears and the buttons Stop and Lap appear.
+    4. Press the Lap button.
+        New lap row appears together with the lap header.    
+    5. Switch to the system settings app. Navigate to Date & Time.
+        The field with current timezone should be visible. Remember current timezone setting.
+    6. Press the current timezone field and change system timezone to something different.
+        The timezone field now shows the newly selected timezone.
+    7. Switch to clock app.
+        The stopwatch hours has not changed. The stopwatch should have incremented by just a few seconds (at most a minute).
+

=== added file 'tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-stopwatch.whitelist'
--- tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-stopwatch.whitelist	1970-01-01 00:00:00 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/whitelists/clock-app-stopwatch.whitelist	2015-09-12 11:55:48 +0000
@@ -0,0 +1,1 @@
+stopwatch/.*