on xenial help sign in
Rename signals properly.
5612cafMichał Sawicz
qml/Components/PhysicalKeysMapper.qml+11−11
@@ -36,10 +36,10 @@ import Powerd 0.1
36Item {
36Item {
37 id: root
37 id: root
38
38
39− signal powerKeyLongPress;
39+ signal powerKeyLongPressed;
40− signal volumeDownTrigger;
40+ signal volumeDownTriggered;
41− signal volumeUpTrigger;
41+ signal volumeUpTriggered;
42− signal screenshotTrigger;
42+ signal screenshotTriggered;
43
43
44 QtObject {
44 QtObject {
45 id: d
45 id: d
@@ -53,7 +53,7 @@ Item {
53 id: powerKeyLongPressTimer
53 id: powerKeyLongPressTimer
54
54
55 interval: 2000
55 interval: 2000
56− onTriggered: root.powerKeyLongPress();
56+ onTriggered: root.powerKeyLongPressed();
57 }
57 }
58
58
59
59
@@ -76,19 +76,19 @@ Item {
76 && !event.isAutoRepeat) {
76 && !event.isAutoRepeat) {
77 event.accepted = callManager.handleMediaKey(false);
77 event.accepted = callManager.handleMediaKey(false);
78 } else if (event.key == Qt.Key_VolumeDown) {
78 } else if (event.key == Qt.Key_VolumeDown) {
79− if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeDownTrigger();
79+ if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeDownTriggered();
80 else if (!event.isAutoRepeat) {
80 else if (!event.isAutoRepeat) {
81 if (d.volumeUpKeyPressed) {
81 if (d.volumeUpKeyPressed) {
82− if (Powerd.status === Powerd.On) root.screenshotTrigger();
82+ if (Powerd.status === Powerd.On) root.screenshotTriggered();
83 d.ignoreVolumeEvents = true;
83 d.ignoreVolumeEvents = true;
84 }
84 }
85 d.volumeDownKeyPressed = true;
85 d.volumeDownKeyPressed = true;
86 }
86 }
87 } else if (event.key == Qt.Key_VolumeUp) {
87 } else if (event.key == Qt.Key_VolumeUp) {
88− if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeUpTrigger();
88+ if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeUpTriggered();
89 else if (!event.isAutoRepeat) {
89 else if (!event.isAutoRepeat) {
90 if (d.volumeDownKeyPressed) {
90 if (d.volumeDownKeyPressed) {
91− if (Powerd.status === Powerd.On) root.screenshotTrigger();
91+ if (Powerd.status === Powerd.On) root.screenshotTriggered();
92 d.ignoreVolumeEvents = true;
92 d.ignoreVolumeEvents = true;
93 }
93 }
94 d.volumeUpKeyPressed = true;
94 d.volumeUpKeyPressed = true;
@@ -101,11 +101,11 @@ Item {
101 powerKeyLongPressTimer.stop();
101 powerKeyLongPressTimer.stop();
102 event.accepted = true;
102 event.accepted = true;
103 } else if (event.key == Qt.Key_VolumeDown) {
103 } else if (event.key == Qt.Key_VolumeDown) {
104− if (!d.ignoreVolumeEvents) root.volumeDownTrigger();
104+ if (!d.ignoreVolumeEvents) root.volumeDownTriggered();
105 d.volumeDownKeyPressed = false;
105 d.volumeDownKeyPressed = false;
106 if (!d.volumeUpKeyPressed) d.ignoreVolumeEvents = false;
106 if (!d.volumeUpKeyPressed) d.ignoreVolumeEvents = false;
107 } else if (event.key == Qt.Key_VolumeUp) {
107 } else if (event.key == Qt.Key_VolumeUp) {
108− if (!d.ignoreVolumeEvents) root.volumeUpTrigger();
108+ if (!d.ignoreVolumeEvents) root.volumeUpTriggered();
109 d.volumeUpKeyPressed = false;
109 d.volumeUpKeyPressed = false;
110 if (!d.volumeDownKeyPressed) d.ignoreVolumeEvents = false;
110 if (!d.volumeDownKeyPressed) d.ignoreVolumeEvents = false;
111 }
111 }
tests/qmltests/Components/tst_PhysicalKeysMapper.qml+4−4
@@ -32,25 +32,25 @@ TestCase {
32 SignalSpy {
32 SignalSpy {
33 id: powerSpy
33 id: powerSpy
34 target: loader.item
34 target: loader.item
35− signalName: "powerKeyLongPress"
35+ signalName: "powerKeyLongPressed"
36 }
36 }
37
37
38 SignalSpy {
38 SignalSpy {
39 id: volumeDownSpy
39 id: volumeDownSpy
40 target: loader.item
40 target: loader.item
41− signalName: "volumeDownTrigger"
41+ signalName: "volumeDownTriggered"
42 }
42 }
43
43
44 SignalSpy {
44 SignalSpy {
45 id: volumeUpSpy
45 id: volumeUpSpy
46 target: loader.item
46 target: loader.item
47− signalName: "volumeUpTrigger"
47+ signalName: "volumeUpTriggered"
48 }
48 }
49
49
50 SignalSpy {
50 SignalSpy {
51 id: screenshotSpy
51 id: screenshotSpy
52 target: loader.item
52 target: loader.item
53− signalName: "screenshotTrigger"
53+ signalName: "screenshotTriggered"
54 }
54 }
55
55
56 function init() {
56 function init() {