Merge lp:~paolorotolo/ubuntu-clock-app/fix-for-1200410 into lp:ubuntu-clock-app/saucy

[Paolo Rotolo]

Added a small pause before searching cities online (LP: #1200410).

Clock: added a small pause before searching cities online.
Please see: https://bugs.launchpad.net/ubuntu-clock-app/+bug/1200410

[Nekhelesh Ramananthan (nik90)]

Nice works as expected. Can you perhaps try some range of interval values between 1000-1500. On the phone, I expect the user to type slower, and hence the interval can slightly be increased.

[lp:~paolorotolo/ubuntu-clock-app/fix-for-1200410]

181. By Paolo Rotolo on 2013-09-04

* Setted timer interval to 1300;
* Added search_timer.restart to restart the timer for each letter;
* Added comment in the code to explain the function of the timer.

[Nekhelesh Ramananthan (nik90)]

Looking at the docs here at http://harmattan-dev.nokia.com/docs/library/html/qt4/qml-timer.html#restart-method, it seems that restart() alone will do the job. If the timer has not started, restart will start it. If the timer is running, it will stop, reset and then start the timer. Hence I think you can remove the start().

Also can you reduce the interval to 1100. 1300 seems to be a bit slow. Again this is a sensitive variable. Hence we can fine tune it at a later stage as well.

A small nitpick, can you align the comment code to the Timer {} and not the row.

review: Needs Fixing

[lp:~paolorotolo/ubuntu-clock-app/fix-for-1200410]

182. By Paolo Rotolo on 2013-09-04

Reduced timer interval to 1100, fixed comment position.

[Nekhelesh Ramananthan (nik90)]

You missed the restart() part I mentioned earlier.

"Looking at the docs here at http://harmattan-dev.nokia.com/docs/library/html/qt4/qml-timer.html#restart-method, it seems that restart() alone will do the job. If the timer has not started, restart will start it. If the timer is running, it will stop, reset and then start the timer. Hence I think you can remove the start()."

review: Needs Fixing

[lp:~paolorotolo/ubuntu-clock-app/fix-for-1200410]

183. By Paolo Rotolo on 2013-09-05

Removed search_timer.start.

[Paolo Rotolo (paolorotolo)]

Thanks nik. I don't know why but yesterday I totally forgot it...

[Nekhelesh Ramananthan (nik90)]

Thanks Paolo. I am at work atm, so I will try to merge this in at the end of the day after testing it again on my machine to confirm it one final time.

[Nekhelesh Ramananthan (nik90)]

lgtm!

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'clock/WorldClock.qml'
--- clock/WorldClock.qml	2013-07-23 17:57:17 +0000
+++ clock/WorldClock.qml	2013-09-05 07:31:21 +0000
@@ -72,25 +72,36 @@
         height: childrenRect.height;
 
         TextField {
-            id: searchLabel
-
-            hasClearButton: true
-            placeholderText: i18n.tr("Search");
-            primaryItem: Image {
-                height: parent.height/1.4
-                width: parent.height/1.45
-                source: Qt.resolvedUrl("../images/search_icon.png")
-            }
-
-            onTextChanged: {
-                if (searchLabel.text != "") {
-                    search_string = searchLabel.text;
-                    searchCityModel.source = searchCityUrl(search_string);
-                } else {
-                    searchCityModel.source = localCityUrl()
+                    id: searchLabel
+
+                    hasClearButton: true
+                    placeholderText: i18n.tr("Search");
+                    primaryItem: Image {
+                        height: parent.height/1.4
+                        width: parent.height/1.45
+                        source: Qt.resolvedUrl("../images/search_icon.png")
+                    }
+
+                    // Provide a small pause before going online to search
+                    Timer {
+                        id: search_timer
+
+                        interval: 1100
+                        repeat: false
+                        onTriggered: {
+                            if (searchLabel.text != "") {
+                                search_string = searchLabel.text;
+                                searchCityModel.source = searchCityUrl(search_string);
+                            } else {
+                                searchCityModel.source = localCityUrl()
+                            }
+                        }
+                    }
+
+                    onTextChanged: {
+                        search_timer.restart()
+                    }
                 }
-            }
-        }
 
         Button {
             id: searchButton;