Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/fix-timer-focus into lp:ubuntu-clock-app/saucy

  1. fix-timer-focus
  2. Merge into saucy
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 38
Merged at revision: 38
Proposed branch: lp:~nik90/ubuntu-clock-app/fix-timer-focus
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 90 lines (+15/-10)
2 files modified
timer/TimerPage.qml (+10/-8)
timer/TimerScript.js (+5/-2)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/fix-timer-focus
Reviewer Review Type Date Requested Status
Alessandro Pozzi (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Clock Developers Pending
Review via email: mp+159585@code.launchpad.net

Commit message

Fix the timer focus issue as described in bug #1170041 which is to give the seconds the default focus when landing on the timer page.

Description of the change

Fix the timer focus issue as described in bug #1170041 which is to give the seconds the default focus when landing on the timer page.

To post a comment you must log in.
lp:~nik90/ubuntu-clock-app/fix-timer-focus updated
38. By Nekhelesh Ramananthan

Merge from master

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:37
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/1/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-quantal-amd64-ci/1
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-raring-amd64-ci/1

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

review: Approve (continuous-integration)
Revision history for this message
Alessandro Pozzi (signor-hyde) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'timer/TimerPage.qml'
2--- timer/TimerPage.qml 2013-04-15 13:59:12 +0000
3+++ timer/TimerPage.qml 2013-04-18 20:08:29 +0000
4@@ -76,11 +76,11 @@
5
6 onReleased: {
7 if (yStart - mouseY > timerSwipeArea.swipeLength) {
8+ TScript.resetAll();
9 TScript.showTimerPage(false);
10 TScript.showAddPresetPage(false);
11 TScript.showViewPresetPage(true);
12- TScript.populatePreset();
13- TScript.resetAll();
14+ TScript.populatePreset();
15
16 addPreset.visible = true;
17 editPreset.visible = false;
18@@ -92,10 +92,10 @@
19 }
20
21 if (yStart - mouseY < -timerSwipeArea.swipeLength) {
22+ TScript.resetAll();
23 TScript.showAddPresetPage(false);
24 TScript.showViewPresetPage(false);
25- TScript.showTimerPage(true);
26- TScript.resetAll();
27+ TScript.showTimerPage(true);
28
29 addPreset.visible = true;
30 editPreset.visible = true;
31@@ -214,9 +214,9 @@
32 id: secondslabelTimer
33
34 // flag boolean variable to determine if the timer hand adjusts the minutes or not
35- property bool flag: false
36+ property bool flag: true
37
38- color: Constants.normalGrey
39+ color: Constants.ubuntuOrange;
40 fontSize: "x-large"
41
42 text: i18n.tr("00")
43@@ -500,11 +500,11 @@
44 onClicked: {
45 switch (text) {
46 case "Presets":
47+ TScript.resetAll();
48 TScript.showTimerPage(false);
49 TScript.showAddPresetPage(false);
50 TScript.showViewPresetPage(true);
51- TScript.populatePreset();
52- TScript.resetAll();
53+ TScript.populatePreset();
54
55 addPreset.visible = true;
56 editPreset.visible = false;
57@@ -692,6 +692,8 @@
58 TScript.populatePreset();
59 }
60 TScript.resetAll();
61+ TScript.showViewPresetPage(true);
62+
63 }
64 }
65
66
67=== modified file 'timer/TimerScript.js'
68--- timer/TimerScript.js 2013-04-11 19:07:05 +0000
69+++ timer/TimerScript.js 2013-04-18 20:08:29 +0000
70@@ -93,8 +93,8 @@
71 minuteslabelTimer.flag = false;
72
73 secondslabelTimer.text = "00";
74- secondslabelTimer.color = normalGrey;
75- secondslabelTimer.flag = false;
76+ secondslabelTimer.color = ubuntuOrange;
77+ secondslabelTimer.flag = true;
78
79 colonTimer1.color = normalGrey;
80 colonTimer2.color = normalGrey;
81@@ -145,6 +145,9 @@
82 function showViewPresetPage ( mode ) {
83 buttonTimerPreset.visible = mode;
84 listPreset.visible = mode;
85+ if (mode == true) {
86+ secondslabelTimer.color = normalGrey;
87+ }
88 }
89
90 // Call Workerscript to populate the preset list

Subscribers

People subscribed via source and target branches