git.iko.soy/unity8
on xenial help sign in
More debugging of the missing LauncherItem's state-change being recognized by the QML-side.
commitaf18ef9e540ad08674f267e74d47b9d1f60f9765 authorMirco Müller <mirco.mueller@ubuntu.com> dateTue 9 Jun 2015, 16:16 (11 years ago) parent9b59ecb
4 files changed+65−2
compare with xenial
unifiedsplit
qml/Launcher/LauncherDelegate.qml+5−1 tests/mocks/Unity/Launcher/MockLauncherItem.h+1−1 tests/mocks/Unity/Launcher/MockLauncherModel.cpp+2 tests/qmltests/Launcher/tst_Launcher.qml+57
qml/Launcher/LauncherDelegate.qml+5−1
@@ -42,7 +42,11 @@ Item {
4242 property real brightness: 0
4343
4444 onAlertingChanged: {
45− print("alerting changed for ", iconName)
45+ print("alerting changed for ", appId)
46+ }
47+
48+ onInvertedChanged: {
49+ print("inverted changed for ", appId)
4650 }
4751
4852 SequentialAnimation {
tests/mocks/Unity/Launcher/MockLauncherItem.h+1−1
@@ -44,7 +44,7 @@ public:
4444 int count() const override;
4545 bool countVisible() const override;
4646 bool focused() const;
47− bool alerting() const;
47+ bool alerting() const override;
4848
4949 unity::shell::launcher::QuickListModelInterface *quickList() const;
5050
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+2
@@ -28,10 +28,12 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa
2828 item->setProgress(0);
2929 item->setPinned(true);
3030 item->setFocused(true);
31+ item->setAlerting(true);
3132 m_list.append(item);
3233 item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);
3334 item->setProgress(10);
3435 item->setPinned(true);
36+ item->setAlerting(true);
3537 m_list.append(item);
3638 item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);
3739 item->setProgress(50);
tests/qmltests/Launcher/tst_Launcher.qml+57
@@ -94,6 +94,34 @@ Item {
9494 Layout.fillWidth: true
9595 }
9696
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+
97125 Row {
98126 spacing: units.gu(1)
99127
@@ -101,8 +129,23 @@ Item {
101129 text: "set alert"
102130 onClicked: {
103131 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+
104140 LauncherModel.alert(appIdEntry.displayText, true)
105141
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+
106149 }
107150 Layout.fillWidth: true
108151 }
@@ -120,7 +163,21 @@ Item {
120163 Button {
121164 text: "unset alert"
122165 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+
123173 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+
124181 }
125182 Layout.fillWidth: true
126183 }