1
=== modified file 'Greeter/Clock.qml'
2
--- Greeter/Clock.qml	2013-06-05 22:03:08 +0000
3
+++ Greeter/Clock.qml	2013-10-11 12:16:27 +0000
4
@@ -16,6 +16,7 @@
5
16
16
6
17
import QtQuick 2.0
17
import QtQuick 2.0
7
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
8
19
import Unity.Indicators 0.1 as Indicators
9
19
20
10
20
Item {
21
Item {
11
21
    id: clock
22
    id: clock
12
@@ -23,17 +24,35 @@
13
23
    implicitWidth: childrenRect.width
24
    implicitWidth: childrenRect.width
14
24
    implicitHeight: childrenRect.height
25
    implicitHeight: childrenRect.height
15
25
26
27
26
    property date __date
27
    // Allows to set the current Date. Will be overwritten if active
28
27
    property alias __timerInterval: timer.interval
28
    property date currentDate
29
28
    readonly property bool __timerRunning: timer.running
29
30
29
30
    // If active, time will be updated through the indicators service
31
30
    Timer {
31
    property bool active: clock.enabled && clock.visible
32
31
        id: timer
32
33
32
        interval: 1000 * 60
33
    Component.onCompleted: {
34
33
        running: clock.enabled && clock.visible && clock.opacity != 0
34
        if (active) {
35
34
        repeat: true
35
            currentDate = new Date()
36
35
        triggeredOnStart: true
36
        }
37
36
        onTriggered: __date = new Date
37
    }
38
38
39
39
    Indicators.CachedUnityMenuModel {
40
40
        id: timeModel
41
41
        objectName: "timeModel"
42
42
43
43
        busName: "com.canonical.indicator.datetime"
44
44
        actionsObjectPath: "/com/canonical/indicator/datetime"
45
45
        menuObjectPath: clock.active ? "/com/canonical/indicator/datetime/phone" : ""
46
46
47
47
        Indicators.RootActionState {
48
48
            menu: timeModel.model
49
49
            onUpdated: {
50
50
                if (timeLabel.text != rightLabel) {
51
51
                    timeLabel.text = rightLabel;
52
52
                    clock.currentDate = new Date();
53
53
                }
54
54
            }
55
55
        }
56
37
    }
56
    }
57
38
57
58
39
    Column {
58
    Column {
59
@@ -47,7 +66,7 @@
60
47
            font.pixelSize: units.gu(7.5)
66
            font.pixelSize: units.gu(7.5)
61
48
            color: "white"
67
            color: "white"
62
49
            opacity: 0.5
68
            opacity: 0.5
64
50
            text: Qt.formatTime(__date)
69
            text: Qt.formatTime(clock.currentDate)
65
51
            font.weight: Font.Light
70
            font.weight: Font.Light
66
52
        }
71
        }
67
53
72
68
@@ -59,7 +78,7 @@
69
59
            fontSize: "medium"
78
            fontSize: "medium"
70
60
            color: "white"
79
            color: "white"
71
61
            opacity: 0.5
80
            opacity: 0.5
73
62
            text: Qt.formatDate(__date, Qt.DefaultLocaleLongDate)
81
            text: Qt.formatDate(clock.currentDate, Qt.DefaultLocaleLongDate)
74
63
            font.weight: Font.Light
82
            font.weight: Font.Light
75
64
        }
83
        }
76
65
    }
84
    }
77
66
85
78
=== modified file 'tests/qmltests/CMakeLists.txt'
79
--- tests/qmltests/CMakeLists.txt	2013-10-08 12:50:52 +0000
80
+++ tests/qmltests/CMakeLists.txt	2013-10-11 12:16:27 +0000
81
@@ -17,7 +17,7 @@
82
17
add_qml_test(Components OpenEffect)
17
add_qml_test(Components OpenEffect)
83
18
add_qml_test(Components RatingStars)
18
add_qml_test(Components RatingStars)
84
19
add_qml_test(Components TimeLocal)
19
add_qml_test(Components TimeLocal)
86
20
add_qml_test(Greeter Clock)
20
add_qml_test(Greeter Clock IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
87
21
add_qml_test(Panel IndicatorItem)
21
add_qml_test(Panel IndicatorItem)
88
22
add_qml_test(utils/Unity/Test UnityTest)
22
add_qml_test(utils/Unity/Test UnityTest)
89
23
23
90
24
24
91
=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
92
--- tests/qmltests/Greeter/tst_Clock.qml	2013-08-21 09:29:44 +0000
93
+++ tests/qmltests/Greeter/tst_Clock.qml	2013-10-11 12:16:27 +0000
94
@@ -43,8 +43,7 @@
95
43
            var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)
43
            var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)
96
44
            var timeString = Qt.formatTime(dateObj)
44
            var timeString = Qt.formatTime(dateObj)
97
45
45
100
46
            clock.__timerInterval = 60000
46
            clock.currentDate = dateObj
99
47
            clock.__date = dateObj
101
48
            var dateLabel = findChild(clock, "dateLabel")
47
            var dateLabel = findChild(clock, "dateLabel")
102
49
            compare(dateLabel.text, dateString, "Not the expected date")
48
            compare(dateLabel.text, dateString, "Not the expected date")
103
50
            var timeLabel = findChild(clock, "timeLabel")
49
            var timeLabel = findChild(clock, "timeLabel")
104
@@ -57,33 +56,20 @@
105
57
            var timeString = Qt.formatTime(dateObj)
56
            var timeString = Qt.formatTime(dateObj)
106
58
57
107
59
            clock.enabled = false
58
            clock.enabled = false
112
60
            compare(clock.__timerRunning, false, "Timer should not be running")
59
            var timeModel = findInvisibleChild(clock, "timeModel")
113
61
            clock.__date = dateObj
60
114
62
            clock.__timerInterval = 5
61
            compare(timeModel.menuObjectPath, "", "Clock shouldn't be connected to Indicators when not active.")
115
63
            wait(5) // spin event loop (only that would trigger the timer and reveal eventual bugs)
62
116
63
            clock.currentDate = dateObj
117
64
118
64
            var dateLabel = findChild(clock, "dateLabel")
65
            var dateLabel = findChild(clock, "dateLabel")
119
65
            compare(dateLabel.text, dateString, "Not the expected date")
66
            compare(dateLabel.text, dateString, "Not the expected date")
120
66
            var timeLabel = findChild(clock, "timeLabel")
67
            var timeLabel = findChild(clock, "timeLabel")
121
67
            compare(timeLabel.text, timeString, "Not the expected time")
68
            compare(timeLabel.text, timeString, "Not the expected time")
122
68
69
123
69
            clock.enabled = true
70
            clock.enabled = true
124
70
            compare(clock.__timerRunning, true, "Timer should be running")
125
71
            wait(0) // spin event loop to trigger the timer
126
72
            verify(dateLabel.text !== dateString)
127
73
            if (timeLabel.text.indexOf("11:13") != -1) wait(60000) // next test will fail at 11:13, wait 1 minute
128
74
            verify(timeLabel.text !== timeString)
129
75
        }
130
76
71
141
77
        function test_timerRunning() {
72
            verify(timeModel.menuObjectPath != "", "Should be connected to Indicators.")
132
78
            // tests for clock.enabled property are already in test_dateUpdate()
133
79
            clock.opacity = 0.0
134
80
            compare(clock.__timerRunning, false, "Timer should not be running")
135
81
            clock.opacity = 1.0
136
82
            compare(clock.__timerRunning, true, "Timer should be running")
137
83
            clock.visible = false
138
84
            compare(clock.__timerRunning, false, "Timer should not be running")
139
85
            clock.visible = true
140
86
            compare(clock.__timerRunning, true, "Timer should be running")
142
87
        }
73
        }
143
88
    }
74
    }
144
89
}
75
}
Reviewer	Review Type	Date Requested	Status
Mirco Müller (community)		2013-10-11	Approve on 2013-10-11
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2013-10-11
Review via email: mp+190636@code.launchpad.net
1	=== modified file 'Greeter/Clock.qml'
2	--- Greeter/Clock.qml 2013-06-05 22:03:08 +0000
3	+++ Greeter/Clock.qml 2013-10-11 12:16:27 +0000
4	@@ -16,6 +16,7 @@
5	16		16
6	17	import QtQuick 2.0	17	import QtQuick 2.0
7	18	import Ubuntu.Components 0.1	18	import Ubuntu.Components 0.1
8			19	import Unity.Indicators 0.1 as Indicators
9	19		20
10	20	Item {	21	Item {
11	21	id: clock	22	id: clock
12	@@ -23,17 +24,35 @@
13	23	implicitWidth: childrenRect.width	24	implicitWidth: childrenRect.width
14	24	implicitHeight: childrenRect.height	25	implicitHeight: childrenRect.height
15	25		26
27	26	property date __date	27	// Allows to set the current Date. Will be overwritten if active
28	27	property alias __timerInterval: timer.interval	28	property date currentDate
29	28	readonly property bool __timerRunning: timer.running	29
30	29		30	// If active, time will be updated through the indicators service
31	30	Timer {	31	property bool active: clock.enabled && clock.visible
32	31	id: timer	32
33	32	interval: 1000 * 60	33	Component.onCompleted: {
34	33	running: clock.enabled && clock.visible && clock.opacity != 0	34	if (active) {
35	34	repeat: true	35	currentDate = new Date()
36	35	triggeredOnStart: true	36	}
37	36	onTriggered: __date = new Date	37	}
38			38
39			39	Indicators.CachedUnityMenuModel {
40			40	id: timeModel
41			41	objectName: "timeModel"
42			42
43			43	busName: "com.canonical.indicator.datetime"
44			44	actionsObjectPath: "/com/canonical/indicator/datetime"
45			45	menuObjectPath: clock.active ? "/com/canonical/indicator/datetime/phone" : ""
46			46
47			47	Indicators.RootActionState {
48			48	menu: timeModel.model
49			49	onUpdated: {
50			50	if (timeLabel.text != rightLabel) {
51			51	timeLabel.text = rightLabel;
52			52	clock.currentDate = new Date();
53			53	}
54			54	}
55			55	}
56	37	}	56	}
57	38		57
58	39	Column {	58	Column {
59	@@ -47,7 +66,7 @@
60	47	font.pixelSize: units.gu(7.5)	66	font.pixelSize: units.gu(7.5)
61	48	color: "white"	67	color: "white"
62	49	opacity: 0.5	68	opacity: 0.5
64	50	text: Qt.formatTime(__date)	69	text: Qt.formatTime(clock.currentDate)
65	51	font.weight: Font.Light	70	font.weight: Font.Light
66	52	}	71	}
67	53		72
68	@@ -59,7 +78,7 @@
69	59	fontSize: "medium"	78	fontSize: "medium"
70	60	color: "white"	79	color: "white"
71	61	opacity: 0.5	80	opacity: 0.5
73	62	text: Qt.formatDate(__date, Qt.DefaultLocaleLongDate)	81	text: Qt.formatDate(clock.currentDate, Qt.DefaultLocaleLongDate)
74	63	font.weight: Font.Light	82	font.weight: Font.Light
75	64	}	83	}
76	65	}	84	}
77	66		85
78	=== modified file 'tests/qmltests/CMakeLists.txt'
79	--- tests/qmltests/CMakeLists.txt 2013-10-08 12:50:52 +0000
80	+++ tests/qmltests/CMakeLists.txt 2013-10-11 12:16:27 +0000
81	@@ -17,7 +17,7 @@
82	17	add_qml_test(Components OpenEffect)	17	add_qml_test(Components OpenEffect)
83	18	add_qml_test(Components RatingStars)	18	add_qml_test(Components RatingStars)
84	19	add_qml_test(Components TimeLocal)	19	add_qml_test(Components TimeLocal)
86	20	add_qml_test(Greeter Clock)	20	add_qml_test(Greeter Clock IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
87	21	add_qml_test(Panel IndicatorItem)	21	add_qml_test(Panel IndicatorItem)
88	22	add_qml_test(utils/Unity/Test UnityTest)	22	add_qml_test(utils/Unity/Test UnityTest)
89	23		23
90	24		24
91	=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
92	--- tests/qmltests/Greeter/tst_Clock.qml 2013-08-21 09:29:44 +0000
93	+++ tests/qmltests/Greeter/tst_Clock.qml 2013-10-11 12:16:27 +0000
94	@@ -43,8 +43,7 @@
95	43	var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)	43	var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)
96	44	var timeString = Qt.formatTime(dateObj)	44	var timeString = Qt.formatTime(dateObj)
97	45		45
100	46	clock.__timerInterval = 60000	46	clock.currentDate = dateObj
99	47	clock.__date = dateObj
101	48	var dateLabel = findChild(clock, "dateLabel")	47	var dateLabel = findChild(clock, "dateLabel")
102	49	compare(dateLabel.text, dateString, "Not the expected date")	48	compare(dateLabel.text, dateString, "Not the expected date")
103	50	var timeLabel = findChild(clock, "timeLabel")	49	var timeLabel = findChild(clock, "timeLabel")
104	@@ -57,33 +56,20 @@
105	57	var timeString = Qt.formatTime(dateObj)	56	var timeString = Qt.formatTime(dateObj)
106	58		57
107	59	clock.enabled = false	58	clock.enabled = false
112	60	compare(clock.__timerRunning, false, "Timer should not be running")	59	var timeModel = findInvisibleChild(clock, "timeModel")
113	61	clock.__date = dateObj	60
114	62	clock.__timerInterval = 5	61	compare(timeModel.menuObjectPath, "", "Clock shouldn't be connected to Indicators when not active.")
115	63	wait(5) // spin event loop (only that would trigger the timer and reveal eventual bugs)	62
116			63	clock.currentDate = dateObj
117			64
118	64	var dateLabel = findChild(clock, "dateLabel")	65	var dateLabel = findChild(clock, "dateLabel")
119	65	compare(dateLabel.text, dateString, "Not the expected date")	66	compare(dateLabel.text, dateString, "Not the expected date")
120	66	var timeLabel = findChild(clock, "timeLabel")	67	var timeLabel = findChild(clock, "timeLabel")
121	67	compare(timeLabel.text, timeString, "Not the expected time")	68	compare(timeLabel.text, timeString, "Not the expected time")
122	68		69
123	69	clock.enabled = true	70	clock.enabled = true
124	70	compare(clock.__timerRunning, true, "Timer should be running")
125	71	wait(0) // spin event loop to trigger the timer
126	72	verify(dateLabel.text !== dateString)
127	73	if (timeLabel.text.indexOf("11:13") != -1) wait(60000) // next test will fail at 11:13, wait 1 minute
128	74	verify(timeLabel.text !== timeString)
129	75	}
130	76		71
141	77	function test_timerRunning() {	72	verify(timeModel.menuObjectPath != "", "Should be connected to Indicators.")
132	78	// tests for clock.enabled property are already in test_dateUpdate()
133	79	clock.opacity = 0.0
134	80	compare(clock.__timerRunning, false, "Timer should not be running")
135	81	clock.opacity = 1.0
136	82	compare(clock.__timerRunning, true, "Timer should be running")
137	83	clock.visible = false
138	84	compare(clock.__timerRunning, false, "Timer should not be running")
139	85	clock.visible = true
140	86	compare(clock.__timerRunning, true, "Timer should be running")
142	87	}	73	}
143	88	}	74	}
144	89	}	75	}