Merge lp:~josharenson/unity8/fix-scope-managment-scrolling into lp:unity8
- fix-scope-managment-scrolling
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~josharenson/unity8/fix-scope-managment-scrolling |
Merge into: | lp:unity8 |
Prerequisite: | lp:~josharenson/unity8/fix-libpng-warnings |
Diff against target: |
833 lines (+258/-55) 13 files modified
qml/Components/Autoscroller.qml (+141/-0) qml/Dash/Dash.qml (+1/-1) qml/Dash/DashPageHeader.qml (+1/-0) qml/Dash/GenericScopeView.qml (+3/-1) qml/Dash/ScopesList.qml (+50/-37) qml/Dash/ScopesListCategory.qml (+1/-0) qml/Dash/ScopesListCategoryItem.qml (+22/-8) tests/mocks/Unity/fake_scope.cpp (+6/-1) tests/mocks/Unity/fake_scope.h (+2/-1) tests/mocks/Unity/fake_scopes.cpp (+7/-0) tests/qmltests/Dash/tst_Dash.qml (+13/-1) tests/qmltests/Dash/tst_DashContent.qml (+9/-3) tests/qmltests/Dash/tst_DashShell.qml (+2/-2) |
To merge this branch: | bzr merge lp:~josharenson/unity8/fix-scope-managment-scrolling |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Albert Astals Cid | Pending | ||
Review via email: mp+296478@code.launchpad.net |
This proposal supersedes a proposal from 2016-05-17.
This proposal has been superseded by a proposal from 2016-06-06.
Commit message
Enable the scopes management list to auto-scroll when dragging and dropping scopes
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* Did you make sure that your branch does not contain spurious tags?
Yes, clean
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
No, there probably should be on this...
Also fixes a bunch of warnings.
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2405
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal | # |
The progressiveScro
How possible it is to extract them and have only one so that possible bugs/fixes to either one ends up in the other?
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2406
https:/
Executed test runs:
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2407
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal | # |
Text conflict in tests/qmltests/
Text conflict in tests/qmltests/
Text conflict in tests/qmltests/
3 conflicts encountered.
Josh Arenson (josharenson) wrote : Posted in a previous version of this proposal | # |
This still needs some work as tests are failing, but the functionality is complete and using a genericized autoscroller.
Josh Arenson (josharenson) wrote : | # |
testDashShell fails sometimes because the new model, which adds 20 extra scopes, is really slowing things down (it takes upwards of 10 seconds to load the dash on my machine). I profiled this and there isn't really an easy solution to improve performance that I could see.
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:2449
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2446
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2447
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2442. By Albert Astals Cid
-
Mock: Only return categories for scopes that have been active
Makes the tests faster, it's also more close to what the real plugin does (the real plugin preloads also the active+1 but we don't really need that)
- 2443. By Albert Astals Cid
-
Adapt test to new mock behaviour
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2448
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 2444. By Josh Arenson
-
mostly fix bzr stuff
- 2445. By Josh Arenson
-
Merge prereq
- 2446. By Josh Arenson
-
Add license
- 2447. By Josh Arenson
-
Fix whitespace
- 2448. By Josh Arenson
-
Make if statement better
- 2449. By Josh Arenson
-
Make layout check more robust
- 2450. By Josh Arenson
-
Change maxStep to maximumStep
- 2451. By Josh Arenson
-
Fix review stuff
- 2452. By Josh Arenson
-
Update scope count
- 2453. By Josh Arenson
-
update test
- 2454. By Josh Arenson
-
Fix smoothing animation
- 2455. By Josh Arenson
-
Merge trunk
- 2456. By Josh Arenson
-
Disable clipping unless necessary
- 2457. By Josh Arenson
-
Merge trunk
- 2458. By Josh Arenson
-
Fix clipping/binding issue
- 2459. By Josh Arenson
-
Remove debug statement
- 2460. By Josh Arenson
-
Fix mouse dragging not working quite right.
Thanks to aacid for this patch
- 2461. By Josh Arenson
-
merge trunk
- 2462. By Josh Arenson
-
Hack before cleanup
- 2463. By Josh Arenson
-
Fix dash overscrolling
- 2464. By Josh Arenson
-
Merge trunk
- 2465. By Josh Arenson
-
Fix end of list jitter
- 2466. By Josh Arenson
-
Fix a small bug
- 2467. By Josh Arenson
-
Handle switching directions of the drag item w/o releasing
- 2468. By Josh Arenson
-
merge trunk
- 2469. By Josh Arenson
-
Change timer values to make a bit more sense
- 2470. By Josh Arenson
-
Merge trunk
- 2471. By Josh Arenson
-
Undo needless bug fix
Unmerged revisions
- 2471. By Josh Arenson
-
Undo needless bug fix
- 2470. By Josh Arenson
-
Merge trunk
- 2469. By Josh Arenson
-
Change timer values to make a bit more sense
- 2468. By Josh Arenson
-
merge trunk
- 2467. By Josh Arenson
-
Handle switching directions of the drag item w/o releasing
- 2466. By Josh Arenson
-
Fix a small bug
- 2465. By Josh Arenson
-
Fix end of list jitter
- 2464. By Josh Arenson
-
Merge trunk
- 2463. By Josh Arenson
-
Fix dash overscrolling
- 2462. By Josh Arenson
-
Hack before cleanup
Preview Diff
1 | === modified file 'data/unity8-dash.png' | |||
2 | 0 | Binary files data/unity8-dash.png 2016-06-06 16:03:16 +0000 and data/unity8-dash.png 2015-10-30 16:17:46 +0000 differ | 0 | Binary files data/unity8-dash.png 2016-06-06 16:03:16 +0000 and data/unity8-dash.png 2015-10-30 16:17:46 +0000 differ |
3 | === modified file 'plugins/Dash/graphics/music_progress_bg.png' | |||
4 | 1 | Binary files plugins/Dash/graphics/music_progress_bg.png 2016-06-06 16:03:16 +0000 and plugins/Dash/graphics/music_progress_bg.png 2015-05-15 12:57:48 +0000 differ | 1 | Binary files plugins/Dash/graphics/music_progress_bg.png 2016-06-06 16:03:16 +0000 and plugins/Dash/graphics/music_progress_bg.png 2015-05-15 12:57:48 +0000 differ |
5 | === added file 'qml/Components/Autoscroller.qml' | |||
6 | --- qml/Components/Autoscroller.qml 1970-01-01 00:00:00 +0000 | |||
7 | +++ qml/Components/Autoscroller.qml 2016-06-06 16:03:17 +0000 | |||
8 | @@ -0,0 +1,141 @@ | |||
9 | 1 | import QtQuick 2.4 | ||
10 | 2 | import Ubuntu.Components 1.3 | ||
11 | 3 | |||
12 | 4 | Item { | ||
13 | 5 | id: root | ||
14 | 6 | |||
15 | 7 | property bool enabled: false | ||
16 | 8 | property bool horizontal: false | ||
17 | 9 | property bool variableVelocity: true | ||
18 | 10 | property int delay: 2 // ms delay between scrolls | ||
19 | 11 | property real areaLength: units.gu(5) | ||
20 | 12 | property real maxStep: units.dp(2) | ||
21 | 13 | property Flickable flickable | ||
22 | 14 | |||
23 | 15 | function startScrolling(positiveDirection) { | ||
24 | 16 | progressiveScrollingTimer.scrollPositiveDirection = positiveDirection; | ||
25 | 17 | progressiveScrollingTimer.start(); | ||
26 | 18 | } | ||
27 | 19 | |||
28 | 20 | function stopScrolling() { | ||
29 | 21 | progressiveScrollingTimer.stop(); | ||
30 | 22 | } | ||
31 | 23 | |||
32 | 24 | /* If enabled, increase step size based on pointer location | ||
33 | 25 | * This makes scrolling change speed depending on how close the pointer | ||
34 | 26 | * is to the upper/lower limit | ||
35 | 27 | */ | ||
36 | 28 | function stepSize() { | ||
37 | 29 | if (!root.variableVelocity) return root.maxStep; | ||
38 | 30 | var delta; | ||
39 | 31 | var step; | ||
40 | 32 | if (!progressiveScrollingTimer.scrollPositiveDirection) { | ||
41 | 33 | delta = d.relevantMouseAxis - d.lowerLimit; | ||
42 | 34 | delta = delta / root.areaLength; | ||
43 | 35 | step = Math.abs(delta * root.maxStep); | ||
44 | 36 | } else { | ||
45 | 37 | delta = d.relevantMouseAxis - d.upperLimit; | ||
46 | 38 | delta = delta / root.areaLength | ||
47 | 39 | step = Math.abs(delta * root.maxStep) | ||
48 | 40 | } | ||
49 | 41 | |||
50 | 42 | return step; | ||
51 | 43 | } | ||
52 | 44 | |||
53 | 45 | QtObject { | ||
54 | 46 | id: d | ||
55 | 47 | |||
56 | 48 | readonly property bool atRelevantContentAxisBeginning: root.horizontal ? | ||
57 | 49 | root.flickable.atXBeginning : root.flickable.atYBeginning | ||
58 | 50 | |||
59 | 51 | readonly property bool atRelevantContentAxisEnd: root.horizontal ? | ||
60 | 52 | root.flickable.atXEnd : root.flickable.atYEnd | ||
61 | 53 | |||
62 | 54 | // lower and upper are in terms of raw coordinates and not top/bottom of a list | ||
63 | 55 | readonly property real lowerLimit: root.areaLength | ||
64 | 56 | readonly property real upperLimit: { | ||
65 | 57 | if (root.horizontal) { | ||
66 | 58 | return (root.flickable.visibleArea.widthRatio * | ||
67 | 59 | root.flickable.contentWidth) - root.areaLength; | ||
68 | 60 | } else { | ||
69 | 61 | return (root.flickable.visibleArea.heightRatio * | ||
70 | 62 | root.flickable.contentHeight) - root.areaLength; | ||
71 | 63 | } | ||
72 | 64 | } | ||
73 | 65 | |||
74 | 66 | property real relevantContentAxis | ||
75 | 67 | property real relevantMouseAxis | ||
76 | 68 | } | ||
77 | 69 | |||
78 | 70 | Timer { | ||
79 | 71 | id: progressiveScrollingTimer | ||
80 | 72 | |||
81 | 73 | property bool scrollPositiveDirection: true | ||
82 | 74 | readonly property real listEnd: { | ||
83 | 75 | if (root.horizontal) { | ||
84 | 76 | return (1 - root.flickable.visibleArea.widthRatio) * | ||
85 | 77 | root.flickable.contentWidth; | ||
86 | 78 | } else { | ||
87 | 79 | return (1 - root.flickable.visibleArea.heightRatio) * | ||
88 | 80 | root.flickable.contentHeight; | ||
89 | 81 | } | ||
90 | 82 | } | ||
91 | 83 | interval: root.delay | ||
92 | 84 | repeat: true | ||
93 | 85 | running: false | ||
94 | 86 | |||
95 | 87 | onTriggered: { | ||
96 | 88 | if (!scrollPositiveDirection && !d.atRelevantContentAxisBeginning) { | ||
97 | 89 | if (d.relevantContentAxis > root.stepSize()) { | ||
98 | 90 | d.relevantContentAxis -= root.stepSize(); | ||
99 | 91 | } else { | ||
100 | 92 | d.relevantContentAxis = 0; | ||
101 | 93 | stop(); | ||
102 | 94 | } | ||
103 | 95 | } else if (scrollPositiveDirection && !d.atRelevantContentAxisEnd) { | ||
104 | 96 | if (listEnd - d.relevantContentAxis > root.stepSize()) { | ||
105 | 97 | d.relevantContentAxis += root.stepSize(); | ||
106 | 98 | } else { | ||
107 | 99 | d.relevantContentAxis = listEnd; | ||
108 | 100 | stop(); | ||
109 | 101 | } | ||
110 | 102 | } | ||
111 | 103 | } | ||
112 | 104 | } | ||
113 | 105 | |||
114 | 106 | property alias animationProperty: d.relevantContentAxis | ||
115 | 107 | Behavior on animationProperty { UbuntuNumberAnimation{} } | ||
116 | 108 | |||
117 | 109 | Binding { | ||
118 | 110 | target: root.flickable | ||
119 | 111 | property: root.horizontal ? "contentX" : "contentY" | ||
120 | 112 | value: d.relevantContentAxis | ||
121 | 113 | } | ||
122 | 114 | |||
123 | 115 | Mouse.onPositionChanged: { | ||
124 | 116 | if (!root.enabled) return; | ||
125 | 117 | |||
126 | 118 | // This synchronizes the bindings as scrolling from the middle of the list | ||
127 | 119 | // can sometimes break | ||
128 | 120 | if (root.horizontal) d.relevantContentAxis = root.flickable.contentX | ||
129 | 121 | else d.relevantContentAxis = root.flickable.contentY | ||
130 | 122 | |||
131 | 123 | d.relevantMouseAxis = (root.horizontal ? mouse.x : mouse.y) | ||
132 | 124 | if (d.relevantMouseAxis < d.lowerLimit && !d.atRelevantContentAxisBeginning) { | ||
133 | 125 | startScrolling(false); | ||
134 | 126 | mouse.accepted = true; | ||
135 | 127 | } else if (d.relevantMouseAxis >= d.upperLimit && !d.atRelevantContentAxisEnd) { | ||
136 | 128 | startScrolling(true); | ||
137 | 129 | mouse.accepted = true; | ||
138 | 130 | } else { | ||
139 | 131 | stopScrolling(); | ||
140 | 132 | } | ||
141 | 133 | |||
142 | 134 | //mouse.accepted = root.enabled | ||
143 | 135 | } | ||
144 | 136 | |||
145 | 137 | Mouse.onReleased: { | ||
146 | 138 | stopScrolling(); | ||
147 | 139 | mouse.accepted = root.enabled | ||
148 | 140 | } | ||
149 | 141 | } | ||
150 | 0 | 142 | ||
151 | === modified file 'qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png' | |||
152 | 1 | Binary files qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png 2016-06-06 16:03:16 +0000 and qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png 2013-06-05 22:03:08 +0000 differ | 143 | Binary files qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png 2016-06-06 16:03:16 +0000 and qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png 2013-06-05 22:03:08 +0000 differ |
153 | === modified file 'qml/Components/graphics/close@20.png' | |||
154 | 2 | Binary files qml/Components/graphics/close@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/close@20.png 2013-09-24 23:20:12 +0000 differ | 144 | Binary files qml/Components/graphics/close@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/close@20.png 2013-09-24 23:20:12 +0000 differ |
155 | === modified file 'qml/Components/graphics/icon_star_empty@20.png' | |||
156 | 3 | Binary files qml/Components/graphics/icon_star_empty@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_empty@20.png 2014-02-13 17:00:06 +0000 differ | 145 | Binary files qml/Components/graphics/icon_star_empty@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_empty@20.png 2014-02-13 17:00:06 +0000 differ |
157 | === modified file 'qml/Components/graphics/icon_star_full@20.png' | |||
158 | 4 | Binary files qml/Components/graphics/icon_star_full@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_full@20.png 2014-02-13 17:00:06 +0000 differ | 146 | Binary files qml/Components/graphics/icon_star_full@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_full@20.png 2014-02-13 17:00:06 +0000 differ |
159 | === modified file 'qml/Components/graphics/icon_star_half@20.png' | |||
160 | 5 | Binary files qml/Components/graphics/icon_star_half@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_half@20.png 2014-02-13 17:00:06 +0000 differ | 147 | Binary files qml/Components/graphics/icon_star_half@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_half@20.png 2014-02-13 17:00:06 +0000 differ |
161 | === modified file 'qml/Components/graphics/icon_star_off@20.png' | |||
162 | 6 | Binary files qml/Components/graphics/icon_star_off@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_off@20.png 2014-02-14 10:14:55 +0000 differ | 148 | Binary files qml/Components/graphics/icon_star_off@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_off@20.png 2014-02-14 10:14:55 +0000 differ |
163 | === modified file 'qml/Components/graphics/icon_star_on@20.png' | |||
164 | 7 | Binary files qml/Components/graphics/icon_star_on@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_on@20.png 2014-02-14 10:14:55 +0000 differ | 149 | Binary files qml/Components/graphics/icon_star_on@20.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/icon_star_on@20.png 2014-02-14 10:14:55 +0000 differ |
165 | === modified file 'qml/Components/graphics/non-selected@18.png' | |||
166 | 8 | Binary files qml/Components/graphics/non-selected@18.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/non-selected@18.png 2013-06-20 13:42:39 +0000 differ | 150 | Binary files qml/Components/graphics/non-selected@18.png 2016-06-06 16:03:16 +0000 and qml/Components/graphics/non-selected@18.png 2013-06-20 13:42:39 +0000 differ |
167 | === modified file 'qml/Dash/Dash.qml' | |||
168 | --- qml/Dash/Dash.qml 2016-05-02 07:57:07 +0000 | |||
169 | +++ qml/Dash/Dash.qml 2016-06-06 16:03:17 +0000 | |||
170 | @@ -36,7 +36,7 @@ | |||
171 | 36 | } | 36 | } |
172 | 37 | } | 37 | } |
173 | 38 | 38 | ||
175 | 39 | property bool windowActive: window.active | 39 | property bool windowActive: typeof(window) !== "undefined" ? window.active : false |
176 | 40 | property bool showOverlayScope: false | 40 | property bool showOverlayScope: false |
177 | 41 | 41 | ||
178 | 42 | DashCommunicatorService { | 42 | DashCommunicatorService { |
179 | 43 | 43 | ||
180 | === modified file 'qml/Dash/DashPageHeader.qml' | |||
181 | --- qml/Dash/DashPageHeader.qml 2016-05-17 20:46:51 +0000 | |||
182 | +++ qml/Dash/DashPageHeader.qml 2016-06-06 16:03:17 +0000 | |||
183 | @@ -79,6 +79,7 @@ | |||
184 | 79 | } | 79 | } |
185 | 80 | 80 | ||
186 | 81 | function closePopup(keepFocus, keepSearch) { | 81 | function closePopup(keepFocus, keepSearch) { |
187 | 82 | if (!extraPanel) return; | ||
188 | 82 | if (extraPanel.visible) { | 83 | if (extraPanel.visible) { |
189 | 83 | extraPanel.visible = false; | 84 | extraPanel.visible = false; |
190 | 84 | } else if (!keepFocus) { | 85 | } else if (!keepFocus) { |
191 | 85 | 86 | ||
192 | === modified file 'qml/Dash/GenericScopeView.qml' | |||
193 | --- qml/Dash/GenericScopeView.qml 2016-05-27 13:52:20 +0000 | |||
194 | +++ qml/Dash/GenericScopeView.qml 2016-06-06 16:03:17 +0000 | |||
195 | @@ -349,7 +349,9 @@ | |||
196 | 349 | } else { | 349 | } else { |
197 | 350 | // Should be ubuntu store icon | 350 | // Should be ubuntu store icon |
198 | 351 | cardTool.artShapeStyle = "flat"; | 351 | cardTool.artShapeStyle = "flat"; |
200 | 352 | item.backgroundShapeStyle = "shadow"; | 352 | if (cardTool.categoryLayout == "grid") { |
201 | 353 | item.backgroundShapeStyle = "shadow"; | ||
202 | 354 | } | ||
203 | 353 | } | 355 | } |
204 | 354 | } | 356 | } |
205 | 355 | item.cardTool = cardTool; | 357 | item.cardTool = cardTool; |
206 | 356 | 358 | ||
207 | === modified file 'qml/Dash/ScopesList.qml' | |||
208 | --- qml/Dash/ScopesList.qml 2016-04-18 15:02:54 +0000 | |||
209 | +++ qml/Dash/ScopesList.qml 2016-06-06 16:03:17 +0000 | |||
210 | @@ -15,7 +15,9 @@ | |||
211 | 15 | */ | 15 | */ |
212 | 16 | 16 | ||
213 | 17 | import QtQuick 2.4 | 17 | import QtQuick 2.4 |
214 | 18 | import Ubuntu.Components 1.3 | ||
215 | 18 | import Dash 0.1 | 19 | import Dash 0.1 |
216 | 20 | import "../Components" | ||
217 | 19 | 21 | ||
218 | 20 | Item { | 22 | Item { |
219 | 21 | id: root | 23 | id: root |
220 | @@ -70,50 +72,61 @@ | |||
221 | 70 | onStoreClicked: root.storeClicked(); | 72 | onStoreClicked: root.storeClicked(); |
222 | 71 | z: 1 | 73 | z: 1 |
223 | 72 | } | 74 | } |
224 | 75 | Autoscroller { | ||
225 | 76 | id: autoscroller | ||
226 | 73 | 77 | ||
227 | 74 | Flickable { | ||
228 | 75 | anchors { | 78 | anchors { |
229 | 76 | top: header.bottom | ||
230 | 77 | bottom: parent.bottom | 79 | bottom: parent.bottom |
231 | 78 | left: parent.left | 80 | left: parent.left |
232 | 79 | right: parent.right | 81 | right: parent.right |
233 | 82 | top: header.bottom | ||
234 | 80 | } | 83 | } |
258 | 81 | clip: true | 84 | |
259 | 82 | contentWidth: root.width | 85 | enabled: root.state == "edit" |
260 | 83 | contentHeight: column.height | 86 | flickable: flickable |
261 | 84 | onContentHeightChanged: returnToBounds(); | 87 | |
262 | 85 | Column { | 88 | Flickable { |
263 | 86 | id: column | 89 | id: flickable |
264 | 87 | Repeater { | 90 | objectName: "scopesListFlickable" |
265 | 88 | model: scope ? scope.categories : null | 91 | |
266 | 89 | 92 | anchors.fill: parent | |
267 | 90 | delegate: Loader { | 93 | clip: true |
268 | 91 | asynchronous: true | 94 | contentWidth: root.width |
269 | 92 | width: root.width | 95 | contentHeight: column.height |
270 | 93 | active: results.count > 0 | 96 | onContentHeightChanged: returnToBounds(); |
271 | 94 | visible: active | 97 | Column { |
272 | 95 | sourceComponent: ScopesListCategory { | 98 | id: column |
273 | 96 | objectName: "scopesListCategory" + categoryId | 99 | Repeater { |
274 | 97 | 100 | model: scope ? scope.categories : null | |
275 | 98 | model: results | 101 | |
276 | 99 | 102 | delegate: Loader { | |
277 | 100 | title: { | 103 | asynchronous: true |
278 | 101 | if (isFavoritesFeed) return i18n.tr("Home"); | 104 | width: root.width |
279 | 102 | else if (isAlsoInstalled) return i18n.tr("Also installed"); | 105 | active: results.count > 0 |
280 | 103 | else return name; | 106 | visible: active |
281 | 107 | sourceComponent: ScopesListCategory { | ||
282 | 108 | objectName: "scopesListCategory" + categoryId | ||
283 | 109 | |||
284 | 110 | Mouse.forwardTo: [autoscroller] | ||
285 | 111 | model: results | ||
286 | 112 | title: { | ||
287 | 113 | if (isFavoritesFeed) return i18n.tr("Home"); | ||
288 | 114 | else if (isAlsoInstalled) return i18n.tr("Also installed"); | ||
289 | 115 | else return name; | ||
290 | 116 | } | ||
291 | 117 | |||
292 | 118 | editMode: root.state == "edit" | ||
293 | 119 | |||
294 | 120 | scopeStyle: root.scopeStyle | ||
295 | 121 | isFavoritesFeed: categoryId == "favorites" | ||
296 | 122 | isAlsoInstalled: categoryId == "other" | ||
297 | 123 | |||
298 | 124 | onRequestFavorite: root.requestFavorite(scopeId, favorite); | ||
299 | 125 | onRequestEditMode: root.state = "edit"; | ||
300 | 126 | onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index); | ||
301 | 127 | onRequestActivate: root.scope.activate(result, categoryId); | ||
302 | 128 | onRequestRestore: root.requestRestore(scopeId); | ||
303 | 104 | } | 129 | } |
304 | 105 | |||
305 | 106 | editMode: root.state == "edit" | ||
306 | 107 | |||
307 | 108 | scopeStyle: root.scopeStyle | ||
308 | 109 | isFavoritesFeed: categoryId == "favorites" | ||
309 | 110 | isAlsoInstalled: categoryId == "other" | ||
310 | 111 | |||
311 | 112 | onRequestFavorite: root.requestFavorite(scopeId, favorite); | ||
312 | 113 | onRequestEditMode: root.state = "edit"; | ||
313 | 114 | onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index); | ||
314 | 115 | onRequestActivate: root.scope.activate(result, categoryId); | ||
315 | 116 | onRequestRestore: root.requestRestore(scopeId); | ||
316 | 117 | } | 130 | } |
317 | 118 | } | 131 | } |
318 | 119 | } | 132 | } |
319 | 120 | 133 | ||
320 | === modified file 'qml/Dash/ScopesListCategory.qml' | |||
321 | --- qml/Dash/ScopesListCategory.qml 2015-07-15 15:07:19 +0000 | |||
322 | +++ qml/Dash/ScopesListCategory.qml 2016-06-06 16:03:17 +0000 | |||
323 | @@ -92,6 +92,7 @@ | |||
324 | 92 | 92 | ||
325 | 93 | hideChildren: dragItem.loaderToShrink == loader | 93 | hideChildren: dragItem.loaderToShrink == loader |
326 | 94 | 94 | ||
327 | 95 | Mouse.forwardTo: [root] | ||
328 | 95 | onClicked: { | 96 | onClicked: { |
329 | 96 | if (!editMode) { | 97 | if (!editMode) { |
330 | 97 | if (root.isFavoritesFeed) | 98 | if (root.isFavoritesFeed) |
331 | 98 | 99 | ||
332 | === modified file 'qml/Dash/ScopesListCategoryItem.qml' | |||
333 | --- qml/Dash/ScopesListCategoryItem.qml 2016-03-09 14:14:59 +0000 | |||
334 | +++ qml/Dash/ScopesListCategoryItem.qml 2016-06-06 16:03:17 +0000 | |||
335 | @@ -84,19 +84,33 @@ | |||
336 | 84 | visible: text != "" | 84 | visible: text != "" |
337 | 85 | } | 85 | } |
338 | 86 | } | 86 | } |
340 | 87 | AbstractButton { | 87 | Item { |
341 | 88 | id: starArea | 88 | id: starArea |
342 | 89 | objectName: "starArea" | 89 | objectName: "starArea" |
343 | 90 | height: parent.height | 90 | height: parent.height |
344 | 91 | width: height | 91 | width: height |
345 | 92 | anchors.right: parent.right | 92 | anchors.right: parent.right |
353 | 93 | onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite); | 93 | |
354 | 94 | onPressedChanged: { | 94 | MouseArea { |
355 | 95 | if (editMode) { | 95 | id: mouseArea |
356 | 96 | if (pressed) root.handlePressed(starArea.__mouseArea); | 96 | anchors.fill: parent |
357 | 97 | else root.handleReleased(starArea.__mouseArea); | 97 | Mouse.forwardTo:[starArea] |
358 | 98 | } | 98 | } |
359 | 99 | } | 99 | |
360 | 100 | Mouse.forwardTo: [root] | ||
361 | 101 | Mouse.onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite); | ||
362 | 102 | Mouse.onPressed: { | ||
363 | 103 | if (editMode) { | ||
364 | 104 | root.handlePressed(mouseArea); | ||
365 | 105 | } | ||
366 | 106 | } | ||
367 | 107 | |||
368 | 108 | Mouse.onReleased: { | ||
369 | 109 | if (editMode) { | ||
370 | 110 | root.handleReleased(mouseArea); | ||
371 | 111 | } | ||
372 | 112 | } | ||
373 | 113 | |||
374 | 100 | visible: editMode || showStar | 114 | visible: editMode || showStar |
375 | 101 | Icon { | 115 | Icon { |
376 | 102 | id: star | 116 | id: star |
377 | 103 | 117 | ||
378 | === modified file 'qml/Dash/graphics/dash_divider_top_darkgrad@27.png' | |||
379 | 104 | Binary files qml/Dash/graphics/dash_divider_top_darkgrad@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/dash_divider_top_darkgrad@27.png 2014-02-21 17:41:55 +0000 differ | 118 | Binary files qml/Dash/graphics/dash_divider_top_darkgrad@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/dash_divider_top_darkgrad@27.png 2014-02-21 17:41:55 +0000 differ |
380 | === modified file 'qml/Dash/graphics/dash_divider_top_lightgrad@27.png' | |||
381 | 105 | Binary files qml/Dash/graphics/dash_divider_top_lightgrad@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/dash_divider_top_lightgrad@27.png 2014-02-21 17:41:55 +0000 differ | 119 | Binary files qml/Dash/graphics/dash_divider_top_lightgrad@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/dash_divider_top_lightgrad@27.png 2014-02-21 17:41:55 +0000 differ |
382 | === modified file 'qml/Dash/graphics/header_handlearrow2@27.png' | |||
383 | 106 | Binary files qml/Dash/graphics/header_handlearrow2@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/header_handlearrow2@27.png 2014-02-21 15:05:18 +0000 differ | 120 | Binary files qml/Dash/graphics/header_handlearrow2@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/header_handlearrow2@27.png 2014-02-21 15:05:18 +0000 differ |
384 | === modified file 'qml/Dash/graphics/header_handlearrow@27.png' | |||
385 | 107 | Binary files qml/Dash/graphics/header_handlearrow@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/header_handlearrow@27.png 2014-02-21 15:05:18 +0000 differ | 121 | Binary files qml/Dash/graphics/header_handlearrow@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/header_handlearrow@27.png 2014-02-21 15:05:18 +0000 differ |
386 | === modified file 'qml/Dash/graphics/icon_clear@20.png' | |||
387 | 108 | Binary files qml/Dash/graphics/icon_clear@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/icon_clear@20.png 2013-06-20 13:42:39 +0000 differ | 122 | Binary files qml/Dash/graphics/icon_clear@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/icon_clear@20.png 2013-06-20 13:42:39 +0000 differ |
388 | === modified file 'qml/Dash/graphics/icon_search_active@20.png' | |||
389 | 109 | Binary files qml/Dash/graphics/icon_search_active@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/icon_search_active@20.png 2013-06-20 13:42:39 +0000 differ | 123 | Binary files qml/Dash/graphics/icon_search_active@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/icon_search_active@20.png 2013-06-20 13:42:39 +0000 differ |
390 | === modified file 'qml/Dash/graphics/icon_search_inactive@20.png' | |||
391 | 110 | Binary files qml/Dash/graphics/icon_search_inactive@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/icon_search_inactive@20.png 2013-06-20 13:42:39 +0000 differ | 124 | Binary files qml/Dash/graphics/icon_search_inactive@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/icon_search_inactive@20.png 2013-06-20 13:42:39 +0000 differ |
392 | === modified file 'qml/Dash/graphics/navigation_shadow@18.png' | |||
393 | 111 | Binary files qml/Dash/graphics/navigation_shadow@18.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/navigation_shadow@18.png 2014-08-14 12:02:29 +0000 differ | 125 | Binary files qml/Dash/graphics/navigation_shadow@18.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/navigation_shadow@18.png 2014-08-14 12:02:29 +0000 differ |
394 | === modified file 'qml/Dash/graphics/navigation_shadow_light@18.png' | |||
395 | 112 | Binary files qml/Dash/graphics/navigation_shadow_light@18.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/navigation_shadow_light@18.png 2014-08-14 12:03:28 +0000 differ | 126 | Binary files qml/Dash/graphics/navigation_shadow_light@18.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/navigation_shadow_light@18.png 2014-08-14 12:03:28 +0000 differ |
396 | === modified file 'qml/Dash/graphics/overview_hint@27.png' | |||
397 | 113 | Binary files qml/Dash/graphics/overview_hint@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/overview_hint@27.png 2014-08-08 08:47:36 +0000 differ | 127 | Binary files qml/Dash/graphics/overview_hint@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/overview_hint@27.png 2014-08-08 08:47:36 +0000 differ |
398 | === modified file 'qml/Dash/graphics/pagination_dot_off@30.png' | |||
399 | 114 | Binary files qml/Dash/graphics/pagination_dot_off@30.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/pagination_dot_off@30.png 2014-08-13 11:56:16 +0000 differ | 128 | Binary files qml/Dash/graphics/pagination_dot_off@30.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/pagination_dot_off@30.png 2014-08-13 11:56:16 +0000 differ |
400 | === modified file 'qml/Dash/graphics/pagination_dot_on@30.png' | |||
401 | 115 | Binary files qml/Dash/graphics/pagination_dot_on@30.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/pagination_dot_on@30.png 2014-08-13 11:56:16 +0000 differ | 129 | Binary files qml/Dash/graphics/pagination_dot_on@30.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/pagination_dot_on@30.png 2014-08-13 11:56:16 +0000 differ |
402 | === modified file 'qml/Dash/graphics/paper.png' | |||
403 | 116 | Binary files qml/Dash/graphics/paper.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/paper.png 2015-11-27 09:56:47 +0000 differ | 130 | Binary files qml/Dash/graphics/paper.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/paper.png 2015-11-27 09:56:47 +0000 differ |
404 | === modified file 'qml/Dash/graphics/pixel.png' | |||
405 | 117 | Binary files qml/Dash/graphics/pixel.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/pixel.png 2014-08-27 10:51:16 +0000 differ | 131 | Binary files qml/Dash/graphics/pixel.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/pixel.png 2014-08-27 10:51:16 +0000 differ |
406 | === modified file 'qml/Dash/graphics/play_button@18.png' | |||
407 | 118 | Binary files qml/Dash/graphics/play_button@18.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/play_button@18.png 2013-06-20 13:42:39 +0000 differ | 132 | Binary files qml/Dash/graphics/play_button@18.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/play_button@18.png 2013-06-20 13:42:39 +0000 differ |
408 | === modified file 'qml/Dash/graphics/play_button_active@18.png' | |||
409 | 119 | Binary files qml/Dash/graphics/play_button_active@18.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/play_button_active@18.png 2013-06-20 13:42:39 +0000 differ | 133 | Binary files qml/Dash/graphics/play_button_active@18.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/play_button_active@18.png 2013-06-20 13:42:39 +0000 differ |
410 | === modified file 'qml/Dash/graphics/play_button_active_big@20.png' | |||
411 | 120 | Binary files qml/Dash/graphics/play_button_active_big@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/play_button_active_big@20.png 2013-06-20 13:42:39 +0000 differ | 134 | Binary files qml/Dash/graphics/play_button_active_big@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/play_button_active_big@20.png 2013-06-20 13:42:39 +0000 differ |
412 | === modified file 'qml/Dash/graphics/play_button_big@20.png' | |||
413 | 121 | Binary files qml/Dash/graphics/play_button_big@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/play_button_big@20.png 2013-06-20 13:42:39 +0000 differ | 135 | Binary files qml/Dash/graphics/play_button_big@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/play_button_big@20.png 2013-06-20 13:42:39 +0000 differ |
414 | === modified file 'qml/Dash/graphics/tabbarchevron@27.png' | |||
415 | 122 | Binary files qml/Dash/graphics/tabbarchevron@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/tabbarchevron@27.png 2014-02-19 13:30:38 +0000 differ | 136 | Binary files qml/Dash/graphics/tabbarchevron@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/tabbarchevron@27.png 2014-02-19 13:30:38 +0000 differ |
416 | === modified file 'qml/Dash/graphics/tablet/icon_close_preview@20.png' | |||
417 | 123 | Binary files qml/Dash/graphics/tablet/icon_close_preview@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/tablet/icon_close_preview@20.png 2013-06-20 13:42:39 +0000 differ | 137 | Binary files qml/Dash/graphics/tablet/icon_close_preview@20.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/tablet/icon_close_preview@20.png 2013-06-20 13:42:39 +0000 differ |
418 | === modified file 'qml/Dash/graphics/tooltip_arrow@27.png' | |||
419 | 124 | Binary files qml/Dash/graphics/tooltip_arrow@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/tooltip_arrow@27.png 2013-09-30 12:17:20 +0000 differ | 138 | Binary files qml/Dash/graphics/tooltip_arrow@27.png 2016-06-06 16:03:16 +0000 and qml/Dash/graphics/tooltip_arrow@27.png 2013-09-30 12:17:20 +0000 differ |
420 | === modified file 'qml/Greeter/graphics/dot_empty.png' | |||
421 | 125 | Binary files qml/Greeter/graphics/dot_empty.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/dot_empty.png 2013-06-20 13:42:39 +0000 differ | 139 | Binary files qml/Greeter/graphics/dot_empty.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/dot_empty.png 2013-06-20 13:42:39 +0000 differ |
422 | === modified file 'qml/Greeter/graphics/dot_filled.png' | |||
423 | 126 | Binary files qml/Greeter/graphics/dot_filled.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/dot_filled.png 2013-06-20 13:42:39 +0000 differ | 140 | Binary files qml/Greeter/graphics/dot_filled.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/dot_filled.png 2013-06-20 13:42:39 +0000 differ |
424 | === modified file 'qml/Greeter/graphics/dot_pointer.png' | |||
425 | 127 | Binary files qml/Greeter/graphics/dot_pointer.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/dot_pointer.png 2013-06-20 13:42:39 +0000 differ | 141 | Binary files qml/Greeter/graphics/dot_pointer.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/dot_pointer.png 2013-06-20 13:42:39 +0000 differ |
426 | === modified file 'qml/Greeter/graphics/icon_arrow.png' | |||
427 | 128 | Binary files qml/Greeter/graphics/icon_arrow.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/icon_arrow.png 2013-06-05 22:03:08 +0000 differ | 142 | Binary files qml/Greeter/graphics/icon_arrow.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/icon_arrow.png 2013-06-05 22:03:08 +0000 differ |
428 | === modified file 'qml/Greeter/graphics/infographic_circle_back.png' | |||
429 | 129 | Binary files qml/Greeter/graphics/infographic_circle_back.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/infographic_circle_back.png 2013-09-03 14:39:25 +0000 differ | 143 | Binary files qml/Greeter/graphics/infographic_circle_back.png 2016-06-06 16:03:16 +0000 and qml/Greeter/graphics/infographic_circle_back.png 2013-09-03 14:39:25 +0000 differ |
430 | === modified file 'qml/Launcher/graphics/divider-line.png' | |||
431 | 130 | Binary files qml/Launcher/graphics/divider-line.png 2016-06-06 16:03:16 +0000 and qml/Launcher/graphics/divider-line.png 2014-06-23 11:31:14 +0000 differ | 144 | Binary files qml/Launcher/graphics/divider-line.png 2016-06-06 16:03:16 +0000 and qml/Launcher/graphics/divider-line.png 2014-06-23 11:31:14 +0000 differ |
432 | === modified file 'qml/Launcher/graphics/focused_app_arrow@30.png' | |||
433 | 131 | Binary files qml/Launcher/graphics/focused_app_arrow@30.png 2016-06-06 16:03:16 +0000 and qml/Launcher/graphics/focused_app_arrow@30.png 2013-09-04 20:40:11 +0000 differ | 145 | Binary files qml/Launcher/graphics/focused_app_arrow@30.png 2016-06-06 16:03:16 +0000 and qml/Launcher/graphics/focused_app_arrow@30.png 2013-09-04 20:40:11 +0000 differ |
434 | === modified file 'qml/Launcher/graphics/home@18.png' | |||
435 | 132 | Binary files qml/Launcher/graphics/home@18.png 2016-06-06 16:03:16 +0000 and qml/Launcher/graphics/home@18.png 2014-06-23 10:53:59 +0000 differ | 146 | Binary files qml/Launcher/graphics/home@18.png 2016-06-06 16:03:16 +0000 and qml/Launcher/graphics/home@18.png 2014-06-23 10:53:59 +0000 differ |
436 | === modified file 'qml/Launcher/graphics/quicklist_tooltip@30.png' | |||
437 | 133 | Binary files qml/Launcher/graphics/quicklist_tooltip@30.png 2016-06-06 16:03:16 +0000 and qml/Launcher/graphics/quicklist_tooltip@30.png 2016-03-24 14:22:05 +0000 differ | 147 | Binary files qml/Launcher/graphics/quicklist_tooltip@30.png 2016-06-06 16:03:16 +0000 and qml/Launcher/graphics/quicklist_tooltip@30.png 2016-03-24 14:22:05 +0000 differ |
438 | === modified file 'qml/Panel/graphics/rectangular_dropshadow@30.png' | |||
439 | 134 | Binary files qml/Panel/graphics/rectangular_dropshadow@30.png 2016-06-06 16:03:16 +0000 and qml/Panel/graphics/rectangular_dropshadow@30.png 2013-06-20 13:42:39 +0000 differ | 148 | Binary files qml/Panel/graphics/rectangular_dropshadow@30.png 2016-06-06 16:03:16 +0000 and qml/Panel/graphics/rectangular_dropshadow@30.png 2013-06-20 13:42:39 +0000 differ |
440 | === modified file 'qml/Stages/graphics/PageHeaderBaseDividerBottom@18.png' | |||
441 | 135 | Binary files qml/Stages/graphics/PageHeaderBaseDividerBottom@18.png 2016-06-06 16:03:16 +0000 and qml/Stages/graphics/PageHeaderBaseDividerBottom@18.png 2014-08-06 20:38:48 +0000 differ | 149 | Binary files qml/Stages/graphics/PageHeaderBaseDividerBottom@18.png 2016-06-06 16:03:16 +0000 and qml/Stages/graphics/PageHeaderBaseDividerBottom@18.png 2014-08-06 20:38:48 +0000 differ |
442 | === modified file 'qml/Stages/graphics/PageHeaderBaseDividerLight@18.png' | |||
443 | 136 | Binary files qml/Stages/graphics/PageHeaderBaseDividerLight@18.png 2016-06-06 16:03:16 +0000 and qml/Stages/graphics/PageHeaderBaseDividerLight@18.png 2014-08-06 20:38:48 +0000 differ | 150 | Binary files qml/Stages/graphics/PageHeaderBaseDividerLight@18.png 2016-06-06 16:03:16 +0000 and qml/Stages/graphics/PageHeaderBaseDividerLight@18.png 2014-08-06 20:38:48 +0000 differ |
444 | === modified file 'qml/Stages/graphics/dropshadow2gu@30.png' | |||
445 | 137 | Binary files qml/Stages/graphics/dropshadow2gu@30.png 2016-06-06 16:03:16 +0000 and qml/Stages/graphics/dropshadow2gu@30.png 2014-08-21 13:18:40 +0000 differ | 151 | Binary files qml/Stages/graphics/dropshadow2gu@30.png 2016-06-06 16:03:16 +0000 and qml/Stages/graphics/dropshadow2gu@30.png 2014-08-21 13:18:40 +0000 differ |
446 | === modified file 'qml/Stages/graphics/sidestage_handle@20.png' | |||
447 | 138 | Binary files qml/Stages/graphics/sidestage_handle@20.png 2016-06-06 16:03:16 +0000 and qml/Stages/graphics/sidestage_handle@20.png 2014-03-04 11:49:28 +0000 differ | 152 | Binary files qml/Stages/graphics/sidestage_handle@20.png 2016-06-06 16:03:16 +0000 and qml/Stages/graphics/sidestage_handle@20.png 2014-03-04 11:49:28 +0000 differ |
448 | === modified file 'qml/Tutorial/graphics/background1.png' | |||
449 | 139 | Binary files qml/Tutorial/graphics/background1.png 2016-06-06 16:03:16 +0000 and qml/Tutorial/graphics/background1.png 2015-09-23 20:49:15 +0000 differ | 153 | Binary files qml/Tutorial/graphics/background1.png 2016-06-06 16:03:16 +0000 and qml/Tutorial/graphics/background1.png 2015-09-23 20:49:15 +0000 differ |
450 | === modified file 'qml/Tutorial/graphics/background2.png' | |||
451 | 140 | Binary files qml/Tutorial/graphics/background2.png 2016-06-06 16:03:16 +0000 and qml/Tutorial/graphics/background2.png 2015-09-23 20:49:15 +0000 differ | 154 | Binary files qml/Tutorial/graphics/background2.png 2016-06-06 16:03:16 +0000 and qml/Tutorial/graphics/background2.png 2015-09-23 20:49:15 +0000 differ |
452 | === modified file 'qml/Wizard/Pages/data/Desktop_header_bkg.png' | |||
453 | 141 | Binary files qml/Wizard/Pages/data/Desktop_header_bkg.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Desktop_header_bkg.png 2016-02-15 12:02:38 +0000 differ | 155 | Binary files qml/Wizard/Pages/data/Desktop_header_bkg.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Desktop_header_bkg.png 2016-02-15 12:02:38 +0000 differ |
454 | === modified file 'qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png' | |||
455 | 142 | Binary files qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png 2016-02-15 12:02:38 +0000 differ | 156 | Binary files qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png 2016-02-15 12:02:38 +0000 differ |
456 | === modified file 'qml/Wizard/Pages/data/Phone_header_bkg.png' | |||
457 | 143 | Binary files qml/Wizard/Pages/data/Phone_header_bkg.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Phone_header_bkg.png 2015-12-09 21:12:04 +0000 differ | 157 | Binary files qml/Wizard/Pages/data/Phone_header_bkg.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Phone_header_bkg.png 2015-12-09 21:12:04 +0000 differ |
458 | === modified file 'qml/Wizard/Pages/data/Phone_splash_screen_bkg.png' | |||
459 | 144 | Binary files qml/Wizard/Pages/data/Phone_splash_screen_bkg.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Phone_splash_screen_bkg.png 2015-12-09 21:12:04 +0000 differ | 158 | Binary files qml/Wizard/Pages/data/Phone_splash_screen_bkg.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Phone_splash_screen_bkg.png 2015-12-09 21:12:04 +0000 differ |
460 | === modified file 'qml/Wizard/Pages/data/Tick@30.png' | |||
461 | 145 | Binary files qml/Wizard/Pages/data/Tick@30.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Tick@30.png 2015-07-01 15:25:53 +0000 differ | 159 | Binary files qml/Wizard/Pages/data/Tick@30.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/Tick@30.png 2015-07-01 15:25:53 +0000 differ |
462 | === modified file 'qml/Wizard/Pages/data/timezonemap/map.png' | |||
463 | 146 | Binary files qml/Wizard/Pages/data/timezonemap/map.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/map.png 2016-02-15 17:25:19 +0000 differ | 160 | Binary files qml/Wizard/Pages/data/timezonemap/map.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/map.png 2016-02-15 17:25:19 +0000 differ |
464 | === modified file 'qml/Wizard/Pages/data/timezonemap/pin.png' | |||
465 | 147 | Binary files qml/Wizard/Pages/data/timezonemap/pin.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/pin.png 2016-02-12 14:49:11 +0000 differ | 161 | Binary files qml/Wizard/Pages/data/timezonemap/pin.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/pin.png 2016-02-12 14:49:11 +0000 differ |
466 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-1.png' | |||
467 | 148 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-1.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-1.png 2016-02-15 17:25:19 +0000 differ | 162 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-1.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-1.png 2016-02-15 17:25:19 +0000 differ |
468 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-10.png' | |||
469 | 149 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-10.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-10.png 2016-02-15 17:25:19 +0000 differ | 163 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-10.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-10.png 2016-02-15 17:25:19 +0000 differ |
470 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-11.png' | |||
471 | 150 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-11.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-11.png 2016-02-15 17:25:19 +0000 differ | 164 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-11.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-11.png 2016-02-15 17:25:19 +0000 differ |
472 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-2.png' | |||
473 | 151 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-2.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-2.png 2016-02-15 17:25:19 +0000 differ | 165 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-2.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-2.png 2016-02-15 17:25:19 +0000 differ |
474 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png' | |||
475 | 152 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png 2016-02-15 17:25:19 +0000 differ | 166 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png 2016-02-15 17:25:19 +0000 differ |
476 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-3.png' | |||
477 | 153 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-3.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-3.png 2016-02-15 17:25:19 +0000 differ | 167 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-3.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-3.png 2016-02-15 17:25:19 +0000 differ |
478 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png' | |||
479 | 154 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png 2016-02-15 17:25:19 +0000 differ | 168 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png 2016-02-15 17:25:19 +0000 differ |
480 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-4.png' | |||
481 | 155 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-4.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-4.png 2016-02-15 17:25:19 +0000 differ | 169 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-4.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-4.png 2016-02-15 17:25:19 +0000 differ |
482 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-5.png' | |||
483 | 156 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-5.png 2016-02-15 17:25:19 +0000 differ | 170 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-5.png 2016-02-15 17:25:19 +0000 differ |
484 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-6.png' | |||
485 | 157 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-6.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-6.png 2016-02-15 17:25:19 +0000 differ | 171 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-6.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-6.png 2016-02-15 17:25:19 +0000 differ |
486 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-7.png' | |||
487 | 158 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-7.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-7.png 2016-02-15 17:25:19 +0000 differ | 172 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-7.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-7.png 2016-02-15 17:25:19 +0000 differ |
488 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-8.png' | |||
489 | 159 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-8.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-8.png 2016-02-16 13:46:54 +0000 differ | 173 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-8.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-8.png 2016-02-16 13:46:54 +0000 differ |
490 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png' | |||
491 | 160 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png 2016-02-15 17:25:19 +0000 differ | 174 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png 2016-02-15 17:25:19 +0000 differ |
492 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-9.png' | |||
493 | 161 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-9.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-9.png 2016-02-15 17:25:19 +0000 differ | 175 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_-9.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_-9.png 2016-02-15 17:25:19 +0000 differ |
494 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_0.png' | |||
495 | 162 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_0.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_0.png 2016-02-16 16:22:55 +0000 differ | 176 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_0.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_0.png 2016-02-16 16:22:55 +0000 differ |
496 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_1.png' | |||
497 | 163 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_1.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_1.png 2016-02-15 17:25:19 +0000 differ | 177 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_1.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_1.png 2016-02-15 17:25:19 +0000 differ |
498 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_10.5.png' | |||
499 | 164 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_10.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_10.5.png 2016-02-15 17:25:19 +0000 differ | 178 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_10.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_10.5.png 2016-02-15 17:25:19 +0000 differ |
500 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_10.png' | |||
501 | 165 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_10.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_10.png 2016-02-15 17:25:19 +0000 differ | 179 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_10.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_10.png 2016-02-15 17:25:19 +0000 differ |
502 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_11.png' | |||
503 | 166 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_11.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_11.png 2016-02-15 17:25:19 +0000 differ | 180 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_11.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_11.png 2016-02-15 17:25:19 +0000 differ |
504 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_12.75.png' | |||
505 | 167 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_12.75.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_12.75.png 2016-02-15 17:25:19 +0000 differ | 181 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_12.75.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_12.75.png 2016-02-15 17:25:19 +0000 differ |
506 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_12.png' | |||
507 | 168 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_12.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_12.png 2016-02-15 17:25:19 +0000 differ | 182 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_12.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_12.png 2016-02-15 17:25:19 +0000 differ |
508 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_13.png' | |||
509 | 169 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_13.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_13.png 2016-02-15 17:25:19 +0000 differ | 183 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_13.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_13.png 2016-02-15 17:25:19 +0000 differ |
510 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_2.png' | |||
511 | 170 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_2.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_2.png 2016-02-15 17:25:19 +0000 differ | 184 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_2.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_2.png 2016-02-15 17:25:19 +0000 differ |
512 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_3.5.png' | |||
513 | 171 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_3.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_3.5.png 2016-02-15 17:25:19 +0000 differ | 185 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_3.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_3.5.png 2016-02-15 17:25:19 +0000 differ |
514 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_3.png' | |||
515 | 172 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_3.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_3.png 2016-02-15 17:25:19 +0000 differ | 186 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_3.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_3.png 2016-02-15 17:25:19 +0000 differ |
516 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_4.5.png' | |||
517 | 173 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_4.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_4.5.png 2016-02-15 17:25:19 +0000 differ | 187 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_4.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_4.5.png 2016-02-15 17:25:19 +0000 differ |
518 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_4.png' | |||
519 | 174 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_4.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_4.png 2016-02-15 17:25:19 +0000 differ | 188 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_4.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_4.png 2016-02-15 17:25:19 +0000 differ |
520 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_5.5.png' | |||
521 | 175 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_5.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_5.5.png 2016-02-15 17:25:19 +0000 differ | 189 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_5.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_5.5.png 2016-02-15 17:25:19 +0000 differ |
522 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_5.75.png' | |||
523 | 176 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_5.75.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_5.75.png 2016-02-15 17:25:19 +0000 differ | 190 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_5.75.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_5.75.png 2016-02-15 17:25:19 +0000 differ |
524 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_5.png' | |||
525 | 177 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_5.png 2016-02-15 17:25:19 +0000 differ | 191 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_5.png 2016-02-15 17:25:19 +0000 differ |
526 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_6.5.png' | |||
527 | 178 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_6.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_6.5.png 2016-02-15 17:25:19 +0000 differ | 192 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_6.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_6.5.png 2016-02-15 17:25:19 +0000 differ |
528 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_6.png' | |||
529 | 179 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_6.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_6.png 2016-02-15 17:25:19 +0000 differ | 193 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_6.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_6.png 2016-02-15 17:25:19 +0000 differ |
530 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_7.png' | |||
531 | 180 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_7.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_7.png 2016-02-15 17:25:19 +0000 differ | 194 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_7.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_7.png 2016-02-15 17:25:19 +0000 differ |
532 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_8.5.png' | |||
533 | 181 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_8.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_8.5.png 2016-02-15 17:25:19 +0000 differ | 195 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_8.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_8.5.png 2016-02-15 17:25:19 +0000 differ |
534 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_8.png' | |||
535 | 182 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_8.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_8.png 2016-02-15 17:25:19 +0000 differ | 196 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_8.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_8.png 2016-02-15 17:25:19 +0000 differ |
536 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_9.5.png' | |||
537 | 183 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_9.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_9.5.png 2016-02-15 17:25:19 +0000 differ | 197 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_9.5.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_9.5.png 2016-02-15 17:25:19 +0000 differ |
538 | === modified file 'qml/Wizard/Pages/data/timezonemap/timezone_9.png' | |||
539 | 184 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_9.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_9.png 2016-02-15 17:25:19 +0000 differ | 198 | Binary files qml/Wizard/Pages/data/timezonemap/timezone_9.png 2016-06-06 16:03:16 +0000 and qml/Wizard/Pages/data/timezonemap/timezone_9.png 2016-02-15 17:25:19 +0000 differ |
540 | === modified file 'qml/graphics/dropshadow_left@20.png' | |||
541 | 185 | Binary files qml/graphics/dropshadow_left@20.png 2016-06-06 16:03:16 +0000 and qml/graphics/dropshadow_left@20.png 2014-03-19 17:44:11 +0000 differ | 199 | Binary files qml/graphics/dropshadow_left@20.png 2016-06-06 16:03:16 +0000 and qml/graphics/dropshadow_left@20.png 2014-03-19 17:44:11 +0000 differ |
542 | === modified file 'qml/graphics/dropshadow_right@20.png' | |||
543 | 186 | Binary files qml/graphics/dropshadow_right@20.png 2016-06-06 16:03:16 +0000 and qml/graphics/dropshadow_right@20.png 2014-03-19 17:38:03 +0000 differ | 200 | Binary files qml/graphics/dropshadow_right@20.png 2016-06-06 16:03:16 +0000 and qml/graphics/dropshadow_right@20.png 2014-03-19 17:38:03 +0000 differ |
544 | === modified file 'tests/data/unity/backgrounds/blue.png' | |||
545 | 187 | Binary files tests/data/unity/backgrounds/blue.png 2016-06-06 16:03:16 +0000 and tests/data/unity/backgrounds/blue.png 2013-08-12 13:05:38 +0000 differ | 201 | Binary files tests/data/unity/backgrounds/blue.png 2016-06-06 16:03:16 +0000 and tests/data/unity/backgrounds/blue.png 2013-08-12 13:05:38 +0000 differ |
546 | === modified file 'tests/data/unity/backgrounds/red.png' | |||
547 | 188 | Binary files tests/data/unity/backgrounds/red.png 2016-06-06 16:03:16 +0000 and tests/data/unity/backgrounds/red.png 2013-08-12 13:05:38 +0000 differ | 202 | Binary files tests/data/unity/backgrounds/red.png 2016-06-06 16:03:16 +0000 and tests/data/unity/backgrounds/red.png 2013-08-12 13:05:38 +0000 differ |
548 | === modified file 'tests/graphics/applicationIcons/browser@18.png' | |||
549 | 189 | Binary files tests/graphics/applicationIcons/browser@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/browser@18.png 2013-06-05 22:03:08 +0000 differ | 203 | Binary files tests/graphics/applicationIcons/browser@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/browser@18.png 2013-06-05 22:03:08 +0000 differ |
550 | === modified file 'tests/graphics/applicationIcons/calendar@18.png' | |||
551 | 190 | Binary files tests/graphics/applicationIcons/calendar@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/calendar@18.png 2013-06-05 22:03:08 +0000 differ | 204 | Binary files tests/graphics/applicationIcons/calendar@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/calendar@18.png 2013-06-05 22:03:08 +0000 differ |
552 | === modified file 'tests/graphics/applicationIcons/camera@18.png' | |||
553 | 191 | Binary files tests/graphics/applicationIcons/camera@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/camera@18.png 2013-06-20 13:42:39 +0000 differ | 205 | Binary files tests/graphics/applicationIcons/camera@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/camera@18.png 2013-06-20 13:42:39 +0000 differ |
554 | === modified file 'tests/graphics/applicationIcons/contacts-app@18.png' | |||
555 | 192 | Binary files tests/graphics/applicationIcons/contacts-app@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/contacts-app@18.png 2013-08-26 17:01:24 +0000 differ | 206 | Binary files tests/graphics/applicationIcons/contacts-app@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/contacts-app@18.png 2013-08-26 17:01:24 +0000 differ |
556 | === modified file 'tests/graphics/applicationIcons/dash.png' | |||
557 | 193 | Binary files tests/graphics/applicationIcons/dash.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/dash.png 2014-10-30 12:46:17 +0000 differ | 207 | Binary files tests/graphics/applicationIcons/dash.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/dash.png 2014-10-30 12:46:17 +0000 differ |
558 | === modified file 'tests/graphics/applicationIcons/dialer-app@18.png' | |||
559 | 194 | Binary files tests/graphics/applicationIcons/dialer-app@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/dialer-app@18.png 2014-07-11 16:01:44 +0000 differ | 208 | Binary files tests/graphics/applicationIcons/dialer-app@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/dialer-app@18.png 2014-07-11 16:01:44 +0000 differ |
560 | === modified file 'tests/graphics/applicationIcons/evernote@18.png' | |||
561 | 195 | Binary files tests/graphics/applicationIcons/evernote@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/evernote@18.png 2013-06-20 13:42:39 +0000 differ | 209 | Binary files tests/graphics/applicationIcons/evernote@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/evernote@18.png 2013-06-20 13:42:39 +0000 differ |
562 | === modified file 'tests/graphics/applicationIcons/facebook@18.png' | |||
563 | 196 | Binary files tests/graphics/applicationIcons/facebook@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/facebook@18.png 2013-06-05 22:03:08 +0000 differ | 210 | Binary files tests/graphics/applicationIcons/facebook@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/facebook@18.png 2013-06-05 22:03:08 +0000 differ |
564 | === modified file 'tests/graphics/applicationIcons/gallery@18.png' | |||
565 | 197 | Binary files tests/graphics/applicationIcons/gallery@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/gallery@18.png 2013-06-20 13:42:39 +0000 differ | 211 | Binary files tests/graphics/applicationIcons/gallery@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/gallery@18.png 2013-06-20 13:42:39 +0000 differ |
566 | === modified file 'tests/graphics/applicationIcons/gmail@18.png' | |||
567 | 198 | Binary files tests/graphics/applicationIcons/gmail@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/gmail@18.png 2013-06-05 22:03:08 +0000 differ | 212 | Binary files tests/graphics/applicationIcons/gmail@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/gmail@18.png 2013-06-05 22:03:08 +0000 differ |
568 | === modified file 'tests/graphics/applicationIcons/libreoffice@18.png' | |||
569 | 199 | Binary files tests/graphics/applicationIcons/libreoffice@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/libreoffice@18.png 2015-10-01 17:43:10 +0000 differ | 213 | Binary files tests/graphics/applicationIcons/libreoffice@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/libreoffice@18.png 2015-10-01 17:43:10 +0000 differ |
570 | === modified file 'tests/graphics/applicationIcons/map@18.png' | |||
571 | 200 | Binary files tests/graphics/applicationIcons/map@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/map@18.png 2013-06-20 13:42:39 +0000 differ | 214 | Binary files tests/graphics/applicationIcons/map@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/map@18.png 2013-06-20 13:42:39 +0000 differ |
572 | === modified file 'tests/graphics/applicationIcons/messages-app@18.png' | |||
573 | 201 | Binary files tests/graphics/applicationIcons/messages-app@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/messages-app@18.png 2013-08-26 17:01:24 +0000 differ | 215 | Binary files tests/graphics/applicationIcons/messages-app@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/messages-app@18.png 2013-08-26 17:01:24 +0000 differ |
574 | === modified file 'tests/graphics/applicationIcons/notepad@18.png' | |||
575 | 202 | Binary files tests/graphics/applicationIcons/notepad@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/notepad@18.png 2013-06-05 22:03:08 +0000 differ | 216 | Binary files tests/graphics/applicationIcons/notepad@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/notepad@18.png 2013-06-05 22:03:08 +0000 differ |
576 | === modified file 'tests/graphics/applicationIcons/pinterest@18.png' | |||
577 | 203 | Binary files tests/graphics/applicationIcons/pinterest@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/pinterest@18.png 2013-06-20 13:42:39 +0000 differ | 217 | Binary files tests/graphics/applicationIcons/pinterest@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/pinterest@18.png 2013-06-20 13:42:39 +0000 differ |
578 | === modified file 'tests/graphics/applicationIcons/soundcloud@18.png' | |||
579 | 204 | Binary files tests/graphics/applicationIcons/soundcloud@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/soundcloud@18.png 2013-06-05 22:03:08 +0000 differ | 218 | Binary files tests/graphics/applicationIcons/soundcloud@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/soundcloud@18.png 2013-06-05 22:03:08 +0000 differ |
580 | === modified file 'tests/graphics/applicationIcons/system-settings@18.png' | |||
581 | 205 | Binary files tests/graphics/applicationIcons/system-settings@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/system-settings@18.png 2013-08-26 17:01:24 +0000 differ | 219 | Binary files tests/graphics/applicationIcons/system-settings@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/system-settings@18.png 2013-08-26 17:01:24 +0000 differ |
582 | === modified file 'tests/graphics/applicationIcons/twitter@18.png' | |||
583 | 206 | Binary files tests/graphics/applicationIcons/twitter@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/twitter@18.png 2013-06-20 13:42:39 +0000 differ | 220 | Binary files tests/graphics/applicationIcons/twitter@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/twitter@18.png 2013-06-20 13:42:39 +0000 differ |
584 | === modified file 'tests/graphics/applicationIcons/weather@18.png' | |||
585 | 207 | Binary files tests/graphics/applicationIcons/weather@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/weather@18.png 2013-06-05 22:03:08 +0000 differ | 221 | Binary files tests/graphics/applicationIcons/weather@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/weather@18.png 2013-06-05 22:03:08 +0000 differ |
586 | === modified file 'tests/graphics/applicationIcons/wikipedia@18.png' | |||
587 | 208 | Binary files tests/graphics/applicationIcons/wikipedia@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/wikipedia@18.png 2013-06-05 22:03:08 +0000 differ | 222 | Binary files tests/graphics/applicationIcons/wikipedia@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/wikipedia@18.png 2013-06-05 22:03:08 +0000 differ |
588 | === modified file 'tests/graphics/applicationIcons/youtube@18.png' | |||
589 | 209 | Binary files tests/graphics/applicationIcons/youtube@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/youtube@18.png 2013-06-20 13:42:39 +0000 differ | 223 | Binary files tests/graphics/applicationIcons/youtube@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/applicationIcons/youtube@18.png 2013-06-20 13:42:39 +0000 differ |
590 | === modified file 'tests/graphics/avatars/amanda@12.png' | |||
591 | 210 | Binary files tests/graphics/avatars/amanda@12.png 2016-06-06 16:03:16 +0000 and tests/graphics/avatars/amanda@12.png 2013-06-20 13:42:39 +0000 differ | 224 | Binary files tests/graphics/avatars/amanda@12.png 2016-06-06 16:03:16 +0000 and tests/graphics/avatars/amanda@12.png 2013-06-20 13:42:39 +0000 differ |
592 | === modified file 'tests/graphics/avatars/anna_olsson@12.png' | |||
593 | 211 | Binary files tests/graphics/avatars/anna_olsson@12.png 2016-06-06 16:03:16 +0000 and tests/graphics/avatars/anna_olsson@12.png 2013-06-20 13:42:39 +0000 differ | 225 | Binary files tests/graphics/avatars/anna_olsson@12.png 2016-06-06 16:03:16 +0000 and tests/graphics/avatars/anna_olsson@12.png 2013-06-20 13:42:39 +0000 differ |
594 | === modified file 'tests/graphics/avatars/funky@12.png' | |||
595 | 212 | Binary files tests/graphics/avatars/funky@12.png 2016-06-06 16:03:16 +0000 and tests/graphics/avatars/funky@12.png 2013-06-20 13:42:39 +0000 differ | 226 | Binary files tests/graphics/avatars/funky@12.png 2016-06-06 16:03:16 +0000 and tests/graphics/avatars/funky@12.png 2013-06-20 13:42:39 +0000 differ |
596 | === modified file 'tests/graphics/clock@18.png' | |||
597 | 213 | Binary files tests/graphics/clock@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/clock@18.png 2015-11-23 15:41:34 +0000 differ | 227 | Binary files tests/graphics/clock@18.png 2016-06-06 16:03:16 +0000 and tests/graphics/clock@18.png 2015-11-23 15:41:34 +0000 differ |
598 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/browser@12.png' | |||
599 | 214 | Binary files tests/mocks/Unity/Application/resources/screenshots/browser@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/browser@12.png 2013-06-20 13:42:39 +0000 differ | 228 | Binary files tests/mocks/Unity/Application/resources/screenshots/browser@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/browser@12.png 2013-06-20 13:42:39 +0000 differ |
600 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/camera@12.png' | |||
601 | 215 | Binary files tests/mocks/Unity/Application/resources/screenshots/camera@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/camera@12.png 2013-06-20 13:42:39 +0000 differ | 229 | Binary files tests/mocks/Unity/Application/resources/screenshots/camera@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/camera@12.png 2013-06-20 13:42:39 +0000 differ |
602 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/dialer@12.png' | |||
603 | 216 | Binary files tests/mocks/Unity/Application/resources/screenshots/dialer@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/dialer@12.png 2014-07-11 16:01:44 +0000 differ | 230 | Binary files tests/mocks/Unity/Application/resources/screenshots/dialer@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/dialer@12.png 2014-07-11 16:01:44 +0000 differ |
604 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/facebook@12.png' | |||
605 | 217 | Binary files tests/mocks/Unity/Application/resources/screenshots/facebook@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/facebook@12.png 2013-06-20 13:42:39 +0000 differ | 231 | Binary files tests/mocks/Unity/Application/resources/screenshots/facebook@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/facebook@12.png 2013-06-20 13:42:39 +0000 differ |
606 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/gallery@12.png' | |||
607 | 218 | Binary files tests/mocks/Unity/Application/resources/screenshots/gallery@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/gallery@12.png 2013-06-20 13:42:39 +0000 differ | 232 | Binary files tests/mocks/Unity/Application/resources/screenshots/gallery@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/gallery@12.png 2013-06-20 13:42:39 +0000 differ |
608 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.png' | |||
609 | 219 | Binary files tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.png 2015-11-05 14:04:32 +0000 differ | 233 | Binary files tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.png 2015-11-05 14:04:32 +0000 differ |
610 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/map@12.png' | |||
611 | 220 | Binary files tests/mocks/Unity/Application/resources/screenshots/map@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/map@12.png 2013-06-20 13:42:39 +0000 differ | 234 | Binary files tests/mocks/Unity/Application/resources/screenshots/map@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/map@12.png 2013-06-20 13:42:39 +0000 differ |
612 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/music@12.png' | |||
613 | 221 | Binary files tests/mocks/Unity/Application/resources/screenshots/music@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/music@12.png 2013-06-20 13:42:39 +0000 differ | 235 | Binary files tests/mocks/Unity/Application/resources/screenshots/music@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/music@12.png 2013-06-20 13:42:39 +0000 differ |
614 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/twitter@12.png' | |||
615 | 222 | Binary files tests/mocks/Unity/Application/resources/screenshots/twitter@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/twitter@12.png 2013-06-20 13:42:39 +0000 differ | 236 | Binary files tests/mocks/Unity/Application/resources/screenshots/twitter@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/twitter@12.png 2013-06-20 13:42:39 +0000 differ |
616 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.png' | |||
617 | 223 | Binary files tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.png 2014-07-29 11:35:10 +0000 differ | 237 | Binary files tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.png 2014-07-29 11:35:10 +0000 differ |
618 | === modified file 'tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.png' | |||
619 | 224 | Binary files tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.png 2014-08-08 11:23:57 +0000 differ | 238 | Binary files tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.png 2014-08-08 11:23:57 +0000 differ |
620 | === modified file 'tests/mocks/Unity/Application/resources/vkb_portrait.png' | |||
621 | 225 | Binary files tests/mocks/Unity/Application/resources/vkb_portrait.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/vkb_portrait.png 2015-04-30 20:46:41 +0000 differ | 239 | Binary files tests/mocks/Unity/Application/resources/vkb_portrait.png 2016-06-06 16:03:16 +0000 and tests/mocks/Unity/Application/resources/vkb_portrait.png 2015-04-30 20:46:41 +0000 differ |
622 | === modified file 'tests/mocks/Unity/fake_scope.cpp' | |||
623 | --- tests/mocks/Unity/fake_scope.cpp 2016-05-09 20:25:06 +0000 | |||
624 | +++ tests/mocks/Unity/fake_scope.cpp 2016-06-06 16:03:17 +0000 | |||
625 | @@ -39,6 +39,7 @@ | |||
626 | 39 | , m_searching(false) | 39 | , m_searching(false) |
627 | 40 | , m_favorite(favorite) | 40 | , m_favorite(favorite) |
628 | 41 | , m_isActive(false) | 41 | , m_isActive(false) |
629 | 42 | , m_hasBeenActive(false) | ||
630 | 42 | , m_hasNavigation(true) | 43 | , m_hasNavigation(true) |
631 | 43 | , m_hasPrimaryFilter(true) | 44 | , m_hasPrimaryFilter(true) |
632 | 44 | , m_currentNavigationId("root") | 45 | , m_currentNavigationId("root") |
633 | @@ -108,7 +109,7 @@ | |||
634 | 108 | 109 | ||
635 | 109 | unity::shell::scopes::CategoriesInterface* Scope::categories() const | 110 | unity::shell::scopes::CategoriesInterface* Scope::categories() const |
636 | 110 | { | 111 | { |
638 | 111 | return m_categories; | 112 | return m_hasBeenActive ? m_categories : nullptr; |
639 | 112 | } | 113 | } |
640 | 113 | 114 | ||
641 | 114 | unity::shell::scopes::SettingsModelInterface* Scope::settings() const | 115 | unity::shell::scopes::SettingsModelInterface* Scope::settings() const |
642 | @@ -153,6 +154,10 @@ | |||
643 | 153 | m_isActive = active; | 154 | m_isActive = active; |
644 | 154 | Q_EMIT isActiveChanged(); | 155 | Q_EMIT isActiveChanged(); |
645 | 155 | } | 156 | } |
646 | 157 | if (active && !m_hasBeenActive) { | ||
647 | 158 | m_hasBeenActive = true; | ||
648 | 159 | Q_EMIT categoriesChanged(); | ||
649 | 160 | } | ||
650 | 156 | } | 161 | } |
651 | 157 | 162 | ||
652 | 158 | void Scope::setFavorite(const bool favorite) | 163 | void Scope::setFavorite(const bool favorite) |
653 | 159 | 164 | ||
654 | === modified file 'tests/mocks/Unity/fake_scope.h' | |||
655 | --- tests/mocks/Unity/fake_scope.h 2016-05-03 22:39:09 +0000 | |||
656 | +++ tests/mocks/Unity/fake_scope.h 2016-06-06 16:03:17 +0000 | |||
657 | @@ -109,13 +109,14 @@ | |||
658 | 109 | bool m_searching; | 109 | bool m_searching; |
659 | 110 | bool m_favorite; | 110 | bool m_favorite; |
660 | 111 | bool m_isActive; | 111 | bool m_isActive; |
661 | 112 | bool m_hasBeenActive; | ||
662 | 112 | bool m_hasNavigation; | 113 | bool m_hasNavigation; |
663 | 113 | bool m_hasPrimaryFilter; | 114 | bool m_hasPrimaryFilter; |
664 | 114 | QString m_currentNavigationId; | 115 | QString m_currentNavigationId; |
665 | 115 | 116 | ||
666 | 116 | QString m_previewRendererName; | 117 | QString m_previewRendererName; |
667 | 117 | 118 | ||
669 | 118 | unity::shell::scopes::CategoriesInterface* m_categories; | 119 | mutable unity::shell::scopes::CategoriesInterface* m_categories; |
670 | 119 | unity::shell::scopes::ScopeInterface* m_openScope; | 120 | unity::shell::scopes::ScopeInterface* m_openScope; |
671 | 120 | unity::shell::scopes::SettingsModelInterface* m_settings; | 121 | unity::shell::scopes::SettingsModelInterface* m_settings; |
672 | 121 | Filters* m_filters; | 122 | Filters* m_filters; |
673 | 122 | 123 | ||
674 | === modified file 'tests/mocks/Unity/fake_scopes.cpp' | |||
675 | --- tests/mocks/Unity/fake_scopes.cpp 2016-04-29 14:57:44 +0000 | |||
676 | +++ tests/mocks/Unity/fake_scopes.cpp 2016-06-06 16:03:17 +0000 | |||
677 | @@ -72,6 +72,13 @@ | |||
678 | 72 | addScope(longNavigationScope); | 72 | addScope(longNavigationScope); |
679 | 73 | 73 | ||
680 | 74 | addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true)); | 74 | addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true)); |
681 | 75 | |||
682 | 76 | // Add enough scopes to test autoscrolling on the scopes managment page | ||
683 | 77 | for (int i = 0; i < 20; i++) { | ||
684 | 78 | addScope(new Scope("UselessScope" + QString::number(i), | ||
685 | 79 | "US" + QString::number(i), true, this)); | ||
686 | 80 | } | ||
687 | 81 | |||
688 | 75 | m_scopesOverview = new ScopesOverview(this); | 82 | m_scopesOverview = new ScopesOverview(this); |
689 | 76 | 83 | ||
690 | 77 | if (!m_loaded) { | 84 | if (!m_loaded) { |
691 | 78 | 85 | ||
692 | === modified file 'tests/qmltests/Components/tst_LazyImage/portrait.png' | |||
693 | 79 | Binary files tests/qmltests/Components/tst_LazyImage/portrait.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Components/tst_LazyImage/portrait.png 2013-09-25 14:13:46 +0000 differ | 86 | Binary files tests/qmltests/Components/tst_LazyImage/portrait.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Components/tst_LazyImage/portrait.png 2013-09-25 14:13:46 +0000 differ |
694 | === modified file 'tests/qmltests/Components/tst_LazyImage/square.png' | |||
695 | 80 | Binary files tests/qmltests/Components/tst_LazyImage/square.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Components/tst_LazyImage/square.png 2013-09-25 14:13:46 +0000 differ | 87 | Binary files tests/qmltests/Components/tst_LazyImage/square.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Components/tst_LazyImage/square.png 2013-09-25 14:13:46 +0000 differ |
696 | === modified file 'tests/qmltests/Components/tst_LazyImage/wide.png' | |||
697 | 81 | Binary files tests/qmltests/Components/tst_LazyImage/wide.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Components/tst_LazyImage/wide.png 2013-09-25 14:13:46 +0000 differ | 88 | Binary files tests/qmltests/Components/tst_LazyImage/wide.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Components/tst_LazyImage/wide.png 2013-09-25 14:13:46 +0000 differ |
698 | === modified file 'tests/qmltests/Dash/artwork/avatar@12.png' | |||
699 | 82 | Binary files tests/qmltests/Dash/artwork/avatar@12.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/avatar@12.png 2014-09-18 08:45:55 +0000 differ | 89 | Binary files tests/qmltests/Dash/artwork/avatar@12.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/avatar@12.png 2014-09-18 08:45:55 +0000 differ |
700 | === modified file 'tests/qmltests/Dash/artwork/background.png' | |||
701 | 83 | Binary files tests/qmltests/Dash/artwork/background.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/background.png 2014-08-26 11:46:46 +0000 differ | 90 | Binary files tests/qmltests/Dash/artwork/background.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/background.png 2014-08-26 11:46:46 +0000 differ |
702 | === modified file 'tests/qmltests/Dash/artwork/checkers.png' | |||
703 | 84 | Binary files tests/qmltests/Dash/artwork/checkers.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/checkers.png 2014-02-18 16:41:29 +0000 differ | 91 | Binary files tests/qmltests/Dash/artwork/checkers.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/checkers.png 2014-02-18 16:41:29 +0000 differ |
704 | === modified file 'tests/qmltests/Dash/artwork/emblem.png' | |||
705 | 85 | Binary files tests/qmltests/Dash/artwork/emblem.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/emblem.png 2014-08-08 16:52:10 +0000 differ | 92 | Binary files tests/qmltests/Dash/artwork/emblem.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/emblem.png 2014-08-08 16:52:10 +0000 differ |
706 | === modified file 'tests/qmltests/Dash/artwork/music-player-design.png' | |||
707 | 86 | Binary files tests/qmltests/Dash/artwork/music-player-design.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/music-player-design.png 2014-01-10 14:29:14 +0000 differ | 93 | Binary files tests/qmltests/Dash/artwork/music-player-design.png 2016-06-06 16:03:16 +0000 and tests/qmltests/Dash/artwork/music-player-design.png 2014-01-10 14:29:14 +0000 differ |
708 | === modified file 'tests/qmltests/Dash/tst_Dash.qml' | |||
709 | --- tests/qmltests/Dash/tst_Dash.qml 2016-05-27 13:54:07 +0000 | |||
710 | +++ tests/qmltests/Dash/tst_Dash.qml 2016-06-06 16:03:17 +0000 | |||
711 | @@ -58,7 +58,7 @@ | |||
712 | 58 | tryCompare(dashContentList, "count", 0); | 58 | tryCompare(dashContentList, "count", 0); |
713 | 59 | scopes.load(); | 59 | scopes.load(); |
714 | 60 | tryCompare(dashContentList, "currentIndex", 0); | 60 | tryCompare(dashContentList, "currentIndex", 0); |
716 | 61 | tryCompare(dashContentList, "count", 7); | 61 | tryCompare(dashContentList, "count", 27); |
717 | 62 | tryCompare(scopes, "loaded", true); | 62 | tryCompare(scopes, "loaded", true); |
718 | 63 | tryCompareFunction(function() { | 63 | tryCompareFunction(function() { |
719 | 64 | var mockScope1Loader = findChild(dash, "scopeLoader0"); | 64 | var mockScope1Loader = findChild(dash, "scopeLoader0"); |
720 | @@ -250,6 +250,9 @@ | |||
721 | 250 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); | 250 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
722 | 251 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); | 251 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
723 | 252 | 252 | ||
724 | 253 | // Ensure non favorites are visible | ||
725 | 254 | flickToYEnd(findChild(dash,"scopesListFlickable")); | ||
726 | 255 | |||
727 | 253 | // Click on a non favorite scope | 256 | // Click on a non favorite scope |
728 | 254 | mouseClick(nonfavScopesListCategoryList.currentItem); | 257 | mouseClick(nonfavScopesListCategoryList.currentItem); |
729 | 255 | 258 | ||
730 | @@ -417,6 +420,7 @@ | |||
731 | 417 | touchFlick(dash, dash.width / 2, units.gu(2), dash.width / 5, units.gu(2)); | 420 | touchFlick(dash, dash.width / 2, units.gu(2), dash.width / 5, units.gu(2)); |
732 | 418 | tryCompare(dashContentList, "currentIndex", 1); | 421 | tryCompare(dashContentList, "currentIndex", 1); |
733 | 419 | compare(dashContentList.currentItem.scopeId, "MockScope1"); | 422 | compare(dashContentList.currentItem.scopeId, "MockScope1"); |
734 | 423 | |||
735 | 420 | } | 424 | } |
736 | 421 | 425 | ||
737 | 422 | function test_manage_dash_move_current_click_other() { | 426 | function test_manage_dash_move_current_click_other() { |
738 | @@ -512,6 +516,9 @@ | |||
739 | 512 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); | 516 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
740 | 513 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); | 517 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
741 | 514 | 518 | ||
742 | 519 | // Ensure non favorite scopes are visible | ||
743 | 520 | flickToYEnd(findChild(dash, "scopesListFlickable")); | ||
744 | 521 | |||
745 | 515 | // Click on a non favorite scope | 522 | // Click on a non favorite scope |
746 | 516 | mouseClick(nonfavScopesListCategoryList.currentItem); | 523 | mouseClick(nonfavScopesListCategoryList.currentItem); |
747 | 517 | 524 | ||
748 | @@ -603,6 +610,7 @@ | |||
749 | 603 | tryCompare(bottomEdgeController, "progress", 1); | 610 | tryCompare(bottomEdgeController, "progress", 1); |
750 | 604 | var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother"); | 611 | var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother"); |
751 | 605 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); | 612 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
752 | 613 | flickToYEnd(findChild(dash, "scopesListFlickable")); | ||
753 | 606 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); | 614 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
754 | 607 | mouseClick(nonfavScopesListCategoryList.currentItem); | 615 | mouseClick(nonfavScopesListCategoryList.currentItem); |
755 | 608 | var dashTempScopeItem = findChild(dash, "dashTempScopeItem"); | 616 | var dashTempScopeItem = findChild(dash, "dashTempScopeItem"); |
756 | @@ -645,7 +653,11 @@ | |||
757 | 645 | tryCompare(bottomEdgeController, "progress", 1); | 653 | tryCompare(bottomEdgeController, "progress", 1); |
758 | 646 | var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother"); | 654 | var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother"); |
759 | 647 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); | 655 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
760 | 656 | var scopesListFlickable = findChild(dash, "scopesListFlickable"); | ||
761 | 648 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); | 657 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
762 | 658 | |||
763 | 659 | // Ensure the non-favorites, located at the bottom, are visible | ||
764 | 660 | flickToYEnd(scopesListFlickable); | ||
765 | 649 | mouseClick(nonfavScopesListCategoryList.currentItem); | 661 | mouseClick(nonfavScopesListCategoryList.currentItem); |
766 | 650 | var dashTempScopeItem = findChild(dash, "dashTempScopeItem"); | 662 | var dashTempScopeItem = findChild(dash, "dashTempScopeItem"); |
767 | 651 | tryCompare(dashTempScopeItem, "x", 0); | 663 | tryCompare(dashTempScopeItem, "x", 0); |
768 | 652 | 664 | ||
769 | === modified file 'tests/qmltests/Dash/tst_DashContent.qml' | |||
770 | --- tests/qmltests/Dash/tst_DashContent.qml 2016-05-27 13:52:20 +0000 | |||
771 | +++ tests/qmltests/Dash/tst_DashContent.qml 2016-06-06 16:03:17 +0000 | |||
772 | @@ -70,7 +70,7 @@ | |||
773 | 70 | function loadScopes() { | 70 | function loadScopes() { |
774 | 71 | scopeLoadedSpy.clear(); | 71 | scopeLoadedSpy.clear(); |
775 | 72 | scopesModel.load(); | 72 | scopesModel.load(); |
777 | 73 | tryCompare(scopeLoadedSpy, "count", 6, 15000); | 73 | tryCompare(scopeLoadedSpy, "count", 7, 15000); |
778 | 74 | tryCompare(scopesModel, "loaded", true); | 74 | tryCompare(scopesModel, "loaded", true); |
779 | 75 | tryCompareFunction(function() { | 75 | tryCompareFunction(function() { |
780 | 76 | var mockScope1Loader = findChild(shell, "scopeLoader0"); | 76 | var mockScope1Loader = findChild(shell, "scopeLoader0"); |
781 | @@ -124,7 +124,7 @@ | |||
782 | 124 | 124 | ||
783 | 125 | loadScopes(); | 125 | loadScopes(); |
784 | 126 | 126 | ||
786 | 127 | compare(dashContentList.count, 7); | 127 | compare(dashContentList.count, 27); |
787 | 128 | verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count); | 128 | verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count); |
788 | 129 | } | 129 | } |
789 | 130 | 130 | ||
790 | @@ -181,7 +181,7 @@ | |||
791 | 181 | 181 | ||
792 | 182 | // test greater than scope count. | 182 | // test greater than scope count. |
793 | 183 | var currentScopeIndex = dashContent.currentIndex; | 183 | var currentScopeIndex = dashContent.currentIndex; |
795 | 184 | dashContent.setCurrentScopeAtIndex(18, true, false); | 184 | dashContent.setCurrentScopeAtIndex(scopesModel.count, true, false); |
796 | 185 | compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count"); | 185 | compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count"); |
797 | 186 | } | 186 | } |
798 | 187 | 187 | ||
799 | @@ -610,6 +610,12 @@ | |||
800 | 610 | } | 610 | } |
801 | 611 | 611 | ||
802 | 612 | function test_noDelegateCreationDestructionOnMove() { | 612 | function test_noDelegateCreationDestructionOnMove() { |
803 | 613 | // Go to scope 1 and back so that items are created | ||
804 | 614 | // and so this test makes sense | ||
805 | 615 | dashContent.setCurrentScopeAtIndex(1); | ||
806 | 616 | waitForRendering(dashContent); | ||
807 | 617 | dashContent.setCurrentScopeAtIndex(0); | ||
808 | 618 | |||
809 | 613 | // Our cards are of type AbstractButton as defined in CardCreator.js | 619 | // Our cards are of type AbstractButton as defined in CardCreator.js |
810 | 614 | // This gives also other things that are not cards but for our purpose it | 620 | // This gives also other things that are not cards but for our purpose it |
811 | 615 | // does not matter | 621 | // does not matter |
812 | 616 | 622 | ||
813 | === modified file 'tests/qmltests/Dash/tst_DashShell.qml' | |||
814 | --- tests/qmltests/Dash/tst_DashShell.qml 2016-05-03 22:39:09 +0000 | |||
815 | +++ tests/qmltests/Dash/tst_DashShell.qml 2016-06-06 16:03:17 +0000 | |||
816 | @@ -60,12 +60,12 @@ | |||
817 | 60 | tryCompare(dashContentList, "count", 0); | 60 | tryCompare(dashContentList, "count", 0); |
818 | 61 | scopes.load(); | 61 | scopes.load(); |
819 | 62 | tryCompare(dashContentList, "currentIndex", 0); | 62 | tryCompare(dashContentList, "currentIndex", 0); |
821 | 63 | tryCompare(dashContentList, "count", 7); | 63 | tryCompare(dashContentList, "count", 27); |
822 | 64 | tryCompare(scopes, "loaded", true); | 64 | tryCompare(scopes, "loaded", true); |
823 | 65 | tryCompareFunction(function() { | 65 | tryCompareFunction(function() { |
824 | 66 | var mockScope1Loader = findChild(dash, "scopeLoader0"); | 66 | var mockScope1Loader = findChild(dash, "scopeLoader0"); |
825 | 67 | return mockScope1Loader && mockScope1Loader.item != null; }, | 67 | return mockScope1Loader && mockScope1Loader.item != null; }, |
827 | 68 | true, 15000); | 68 | true, 150000); |
828 | 69 | tryCompareFunction(function() { | 69 | tryCompareFunction(function() { |
829 | 70 | var mockScope1Loader = findChild(dash, "scopeLoader0"); | 70 | var mockScope1Loader = findChild(dash, "scopeLoader0"); |
830 | 71 | return mockScope1Loader && mockScope1Loader.status === Loader.Ready; }, | 71 | return mockScope1Loader && mockScope1Loader.status === Loader.Ready; }, |
831 | 72 | 72 | ||
832 | === modified file 'tests/qmltests/UnityLogo.png' | |||
833 | 73 | Binary files tests/qmltests/UnityLogo.png 2016-06-06 16:03:16 +0000 and tests/qmltests/UnityLogo.png 2014-09-12 20:16:54 +0000 differ | 73 | Binary files tests/qmltests/UnityLogo.png 2016-06-06 16:03:16 +0000 and tests/qmltests/UnityLogo.png 2014-09-12 20:16:54 +0000 differ |
FAILED: Continuous integration, rev:2400 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1232/ /unity8- jenkins. ubuntu. com/job/ build-0- fetch/1658 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1609 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 1609 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1602/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1602/console
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1232/ rebuild
https:/