git.iko.soy/unity8
on xenial help sign in
More debugging of the missing LauncherItem's state-change being recognized by the QML-side.
af18ef9Mirco Müller
qml/Launcher/LauncherDelegate.qml+5−1
compare with xenial
unifiedsplit
@@ -42,7 +42,11 @@ Item {
42 property real brightness: 0
42 property real brightness: 0
43
43
44 onAlertingChanged: {
44 onAlertingChanged: {
45− print("alerting changed for ", iconName)
45+ print("alerting changed for ", appId)
46+ }
47+
48+ onInvertedChanged: {
49+ print("inverted changed for ", appId)
46 }
50 }
47
51
48 SequentialAnimation {
52 SequentialAnimation {
tests/mocks/Unity/Launcher/MockLauncherItem.h+1−1
@@ -44,7 +44,7 @@ public:
44 int count() const override;
44 int count() const override;
45 bool countVisible() const override;
45 bool countVisible() const override;
46 bool focused() const;
46 bool focused() const;
47− bool alerting() const;
47+ bool alerting() const override;
48
48
49 unity::shell::launcher::QuickListModelInterface *quickList() const;
49 unity::shell::launcher::QuickListModelInterface *quickList() const;
50
50
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+2
@@ -28,10 +28,12 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa
28 item->setProgress(0);
28 item->setProgress(0);
29 item->setPinned(true);
29 item->setPinned(true);
30 item->setFocused(true);
30 item->setFocused(true);
31+ item->setAlerting(true);
31 m_list.append(item);
32 m_list.append(item);
32 item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);
33 item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);
33 item->setProgress(10);
34 item->setProgress(10);
34 item->setPinned(true);
35 item->setPinned(true);
36+ item->setAlerting(true);
35 m_list.append(item);
37 m_list.append(item);
36 item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);
38 item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);
37 item->setProgress(50);
39 item->setProgress(50);
tests/qmltests/Launcher/tst_Launcher.qml+57
@@ -94,6 +94,34 @@ Item {
94 Layout.fillWidth: true
94 Layout.fillWidth: true
95 }
95 }
96
96
97+ Row {
98+ spacing: units.gu(1)
99+
100+ CheckBox {
101+ anchors.verticalCenter: parent.verticalCenter
102+ onClicked: {
103+ var panel = testCase.findChild(launcherLoader, "launcherPanel")
104+ panel.alertIndex = checked ? parseInt(iconIndex.displayText) : -1
105+ }
106+ Layout.fillWidth: true
107+ }
108+
109+ Label {
110+ anchors.verticalCenter: parent.verticalCenter
111+ text:"wiggle of icon"
112+ }
113+
114+ TextArea {
115+ id: iconIndex
116+ anchors.verticalCenter: parent.verticalCenter
117+ width: units.gu(4)
118+ height: units.gu(4)
119+ autoSize: true
120+ text: "2"
121+ maximumLineCount: 1
122+ }
123+ }
124+
97 Row {
125 Row {
98 spacing: units.gu(1)
126 spacing: units.gu(1)
99
127
@@ -101,8 +129,23 @@ Item {
101 text: "set alert"
129 text: "set alert"
102 onClicked: {
130 onClicked: {
103 print(appIdEntry.displayText)
131 print(appIdEntry.displayText)
132+
133+ var launcherListView = testCase.findChild(launcherLoader.item, "launcherListView")
134+ for (var i = 0; i < launcherListView.count; ++i) {
135+ if (LauncherModel.get(i).appId === appIdEntry.displayText) {
136+ print(LauncherModel.get(i).alerting)
137+ }
138+ }
139+
104 LauncherModel.alert(appIdEntry.displayText, true)
140 LauncherModel.alert(appIdEntry.displayText, true)
105
141
142+
143+ for (var i = 0; i < launcherListView.count; ++i) {
144+ if (LauncherModel.get(i).appId === appIdEntry.displayText) {
145+ print(LauncherModel.get(i).alerting)
146+ }
147+ }
148+
106 }
149 }
107 Layout.fillWidth: true
150 Layout.fillWidth: true
108 }
151 }
@@ -120,7 +163,21 @@ Item {
120 Button {
163 Button {
121 text: "unset alert"
164 text: "unset alert"
122 onClicked: {
165 onClicked: {
166+ var launcherListView = testCase.findChild(launcherLoader.item, "launcherListView")
167+ for (var i = 0; i < launcherListView.count; ++i) {
168+ if (LauncherModel.get(i).appId === appIdEntry.displayText) {
169+ print(LauncherModel.get(i).alerting)
170+ }
171+ }
172+
123 LauncherModel.alert(appIdEntry.displayText, false)
173 LauncherModel.alert(appIdEntry.displayText, false)
174+
175+ for (var i = 0; i < launcherListView.count; ++i) {
176+ if (LauncherModel.get(i).appId === appIdEntry.displayText) {
177+ print(LauncherModel.get(i).alerting)
178+ }
179+ }
180+
124 }
181 }
125 Layout.fillWidth: true
182 Layout.fillWidth: true
126 }
183 }