git.iko.soy/unity8
on xenial help sign in
review comments
4451c08Nick Dedekind
qml/Panel/ActiveCallHint.qml+1−1
compare with xenial
unifiedsplit
@@ -50,7 +50,7 @@ Item {
50 telepathyHelper.registerChannelObserver("unity8");
50 telepathyHelper.registerChannelObserver("unity8");
51 }
51 }
52
52
53− function activate() {
53+ function showLiveCall() {
54 Qt.openUrlExternally("dialer:///?view=liveCall");
54 Qt.openUrlExternally("dialer:///?view=liveCall");
55 }
55 }
56
56
qml/Panel/Panel.qml+11−4
@@ -136,7 +136,7 @@ Item {
136 }
136 }
137 height: indicators.panelHeight
137 height: indicators.panelHeight
138 enabled: callHint.visible
138 enabled: callHint.visible
139− onClicked: callHint.activate()
139+ onClicked: callHint.showLiveCall()
140 }
140 }
141
141
142 Indicators {
142 Indicators {
@@ -164,7 +164,7 @@ Item {
164
164
165 onShowTapped: {
165 onShowTapped: {
166 if (callHint.active) {
166 if (callHint.active) {
167− callHint.activate();
167+ callHint.showLiveCall();
168 }
168 }
169 }
169 }
170 }
170 }
@@ -172,7 +172,7 @@ Item {
172 SearchIndicator {
172 SearchIndicator {
173 id: search
173 id: search
174 objectName: "search"
174 objectName: "search"
175− enabled: root.searchVisible && state == "visible"
175+ enabled: state == "visible"
176
176
177 state: {
177 state: {
178 if (callHint.visible) {
178 if (callHint.visible) {
@@ -227,11 +227,18 @@ Item {
227 State {
227 State {
228 name: "onscreen" //fully opaque and visible at top edge of screen
228 name: "onscreen" //fully opaque and visible at top edge of screen
229 when: !fullscreenMode
229 when: !fullscreenMode
230+ PropertyChanges {
231+ target: indicatorArea;
232+ anchors.topMargin: 0
233+ }
230 },
234 },
231 State {
235 State {
232 name: "offscreen" //pushed off screen
236 name: "offscreen" //pushed off screen
233 when: fullscreenMode
237 when: fullscreenMode
238+ PropertyChanges {
239+ target: indicatorArea;
234− PropertyChanges { target: indicatorArea; anchors.topMargin: indicators.state === "initial" ? -d.indicatorHeight : 0 }
240+ anchors.topMargin: indicators.state === "initial" ? -d.indicatorHeight : 0
241+ }
235 }
242 }
236 ]
243 ]
237}
244}
tests/qmltests/CMakeLists.txt+2−2
@@ -19,8 +19,8 @@ set(qmltest_DEFAULT_TARGETS qmluitests)
19set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
19set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
20set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
20set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
21
21
22−#add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
22+add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
23−# ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
23+ ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
24add_qml_test(Components Carousel)
24add_qml_test(Components Carousel)
25add_qml_test(Components DraggingArea)
25add_qml_test(Components DraggingArea)
26add_qml_test(Components EdgeDemoOverlay)
26add_qml_test(Components EdgeDemoOverlay)
tests/qmltests/Panel/tst_ActiveCallHint.qml+1−1
@@ -150,7 +150,7 @@ Item {
150 tryCompareFunction(function() { return timeLabel.text !== currentLabel }, true);
150 tryCompareFunction(function() { return timeLabel.text !== currentLabel }, true);
151 }
151 }
152
152
153− function test_tapToReturn() {
153+ function test_displayedLabelChangesOverTime() {
154 callManager.backgroundCall = call3;
154 callManager.backgroundCall = call3;
155
155
156 var labelPathView = findChild(callHint, "labelPathView");
156 var labelPathView = findChild(callHint, "labelPathView");
tests/qmltests/Panel/tst_Panel.qml+2
@@ -312,6 +312,8 @@ Item {
312 var searchIndicator = findChild(panel, "search");
312 var searchIndicator = findChild(panel, "search");
313 verify(searchIndicator !== null);
313 verify(searchIndicator !== null);
314
314
315+ tryCompare(searchIndicator, "enabled", true);
316+
315 tap(searchIndicator, 1, 1);
317 tap(searchIndicator, 1, 1);
316
318
317 compare(searchClicked, true,
319 compare(searchClicked, true,