git.iko.soy/unity8
on xenial help sign in
drop Launcher.qmltypes and a old outdated test
e9cab37Michael Zanetti
plugins/Unity/Launcher/Launcher.qmltypesdeleted−182
compare with xenial
unifiedsplit
@@ -1,182 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "LauncherItem"
12− prototype: "unity::shell::launcher::LauncherItemInterface"
13− exports: ["Unity.Launcher/LauncherItem 0.1"]
14− isCreatable: false
15− exportMetaObjectRevisions: [0]
16− }
17− Component {
18− name: "LauncherModel"
19− prototype: "unity::shell::launcher::LauncherModelInterface"
20− exports: ["Unity.Launcher/LauncherModel 0.1"]
21− isCreatable: false
22− isSingleton: true
23− exportMetaObjectRevisions: [0]
24− Method {
25− name: "requestRemove"
26− Parameter { name: "appId"; type: "string" }
27− }
28− Method { name: "refresh" }
29− Method {
30− name: "get"
31− type: "unity::shell::launcher::LauncherItemInterface*"
32− Parameter { name: "index"; type: "int" }
33− }
34− Method {
35− name: "move"
36− Parameter { name: "oldIndex"; type: "int" }
37− Parameter { name: "newIndex"; type: "int" }
38− }
39− Method {
40− name: "pin"
41− Parameter { name: "appId"; type: "string" }
42− Parameter { name: "index"; type: "int" }
43− }
44− Method {
45− name: "pin"
46− Parameter { name: "appId"; type: "string" }
47− }
48− Method {
49− name: "quickListActionInvoked"
50− Parameter { name: "appId"; type: "string" }
51− Parameter { name: "actionIndex"; type: "int" }
52− }
53− Method {
54− name: "setUser"
55− Parameter { name: "username"; type: "string" }
56− }
57− Method {
58− name: "getUrlForAppId"
59− type: "string"
60− Parameter { name: "appId"; type: "string" }
61− }
62− }
63− Component {
64− name: "QuickListModel"
65− prototype: "unity::shell::launcher::QuickListModelInterface"
66− exports: ["Unity.Launcher/QuickListModel 0.1"]
67− isCreatable: false
68− exportMetaObjectRevisions: [0]
69− }
70− Component {
71− name: "unity::shell::launcher::LauncherItemInterface"
72− prototype: "QObject"
73− exports: ["Unity.Launcher/LauncherItemInterface 0.1"]
74− isCreatable: false
75− exportMetaObjectRevisions: [0]
76− Property { name: "appId"; type: "string"; isReadonly: true }
77− Property { name: "name"; type: "string"; isReadonly: true }
78− Property { name: "icon"; type: "string"; isReadonly: true }
79− Property { name: "pinned"; type: "bool"; isReadonly: true }
80− Property { name: "running"; type: "bool"; isReadonly: true }
81− Property { name: "recent"; type: "bool"; isReadonly: true }
82− Property { name: "progress"; type: "int"; isReadonly: true }
83− Property { name: "count"; type: "int"; isReadonly: true }
84− Property { name: "countVisible"; type: "bool"; isReadonly: true }
85− Property { name: "focused"; type: "bool"; isReadonly: true }
86− Property {
87− name: "quickList"
88− type: "unity::shell::launcher::QuickListModelInterface"
89− isReadonly: true
90− isPointer: true
91− }
92− Signal {
93− name: "nameChanged"
94− Parameter { name: "name"; type: "string" }
95− }
96− Signal {
97− name: "iconChanged"
98− Parameter { name: "icon"; type: "string" }
99− }
100− Signal {
101− name: "pinnedChanged"
102− Parameter { name: "pinned"; type: "bool" }
103− }
104− Signal {
105− name: "runningChanged"
106− Parameter { name: "running"; type: "bool" }
107− }
108− Signal {
109− name: "recentChanged"
110− Parameter { name: "running"; type: "bool" }
111− }
112− Signal {
113− name: "progressChanged"
114− Parameter { name: "progress"; type: "int" }
115− }
116− Signal {
117− name: "countChanged"
118− Parameter { name: "count"; type: "int" }
119− }
120− Signal {
121− name: "countVisibleChanged"
122− Parameter { name: "countVisible"; type: "bool" }
123− }
124− Signal {
125− name: "focusedChanged"
126− Parameter { name: "focused"; type: "bool" }
127− }
128− }
129− Component {
130− name: "unity::shell::launcher::LauncherModelInterface"
131− prototype: "QAbstractListModel"
132− exports: ["Unity.Launcher/LauncherModelInterface 0.1"]
133− isCreatable: false
134− exportMetaObjectRevisions: [0]
135− Property {
136− name: "applicationManager"
137− type: "unity::shell::application::ApplicationManagerInterface"
138− isPointer: true
139− }
140− Property { name: "onlyPinned"; type: "bool" }
141− Signal { name: "hint" }
142− Method {
143− name: "move"
144− Parameter { name: "oldIndex"; type: "int" }
145− Parameter { name: "newIndex"; type: "int" }
146− }
147− Method {
148− name: "get"
149− type: "unity::shell::launcher::LauncherItemInterface*"
150− Parameter { name: "index"; type: "int" }
151− }
152− Method {
153− name: "pin"
154− Parameter { name: "appId"; type: "string" }
155− Parameter { name: "index"; type: "int" }
156− }
157− Method {
158− name: "pin"
159− Parameter { name: "appId"; type: "string" }
160− }
161− Method {
162− name: "requestRemove"
163− Parameter { name: "appId"; type: "string" }
164− }
165− Method {
166− name: "quickListActionInvoked"
167− Parameter { name: "appId"; type: "string" }
168− Parameter { name: "actionIndex"; type: "int" }
169− }
170− Method {
171− name: "setUser"
172− Parameter { name: "username"; type: "string" }
173− }
174− }
175− Component {
176− name: "unity::shell::launcher::QuickListModelInterface"
177− prototype: "QAbstractListModel"
178− exports: ["Unity.Launcher/QuickListInterface 0.1"]
179− isCreatable: false
180− exportMetaObjectRevisions: [0]
181− }
182−}
tests/qmltests/Launcher/tst_Launcher.qml+10−9
@@ -478,25 +478,26 @@ Rectangle {
478 function test_progressOverlays() {
478 function test_progressOverlays() {
479 dragLauncherIntoView();
479 dragLauncherIntoView();
480 var launcherListView = findChild(launcher, "launcherListView");
480 var launcherListView = findChild(launcher, "launcherListView");
481+ var moveAnimation = findInvisibleChild(launcherListView, "moveAnimation")
481 for (var i = 0; i < launcherListView.count; ++i) {
482 for (var i = 0; i < launcherListView.count; ++i) {
482− var delegate = findChild(launcherListView, "launcherDelegate" + i)
483+ launcherListView.moveToIndex(i);
483− compare(findChild(delegate, "progressOverlay").visible, LauncherModel.get(i).progress >= 0)
484+ waitForRendering(launcherListView);
484− }
485+ tryCompare(moveAnimation, "running", false);
485− }
486
486
487− function test_runningHighlight() {
488− dragLauncherIntoView();
489− var launcherListView = findChild(launcher, "launcherListView");
490− for (var i = 0; i < launcherListView.count; ++i) {
491 var delegate = findChild(launcherListView, "launcherDelegate" + i)
487 var delegate = findChild(launcherListView, "launcherDelegate" + i)
492− compare(findChild(delegate, "runningHighlight0").visible, LauncherModel.get(i).running)
488+ compare(findChild(delegate, "progressOverlay").visible, LauncherModel.get(i).progress >= 0)
493 }
489 }
494 }
490 }
495
491
496 function test_focusedHighlight() {
492 function test_focusedHighlight() {
497 dragLauncherIntoView();
493 dragLauncherIntoView();
498 var launcherListView = findChild(launcher, "launcherListView");
494 var launcherListView = findChild(launcher, "launcherListView");
495+ var moveAnimation = findInvisibleChild(launcherListView, "moveAnimation")
496+
499 for (var i = 0; i < launcherListView.count; ++i) {
497 for (var i = 0; i < launcherListView.count; ++i) {
498+ launcherListView.moveToIndex(i);
499+ waitForRendering(launcherListView);
500+ tryCompare(moveAnimation, "running", false);
500 var delegate = findChild(launcherListView, "launcherDelegate" + i)
501 var delegate = findChild(launcherListView, "launcherDelegate" + i)
501 compare(findChild(delegate, "focusedHighlight").visible, LauncherModel.get(i).focused)
502 compare(findChild(delegate, "focusedHighlight").visible, LauncherModel.get(i).focused)
502 }
503 }