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:
|
|||
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 | 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 | 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 | +import QtQuick 2.4 |
| 10 | +import Ubuntu.Components 1.3 |
| 11 | + |
| 12 | +Item { |
| 13 | + id: root |
| 14 | + |
| 15 | + property bool enabled: false |
| 16 | + property bool horizontal: false |
| 17 | + property bool variableVelocity: true |
| 18 | + property int delay: 2 // ms delay between scrolls |
| 19 | + property real areaLength: units.gu(5) |
| 20 | + property real maxStep: units.dp(2) |
| 21 | + property Flickable flickable |
| 22 | + |
| 23 | + function startScrolling(positiveDirection) { |
| 24 | + progressiveScrollingTimer.scrollPositiveDirection = positiveDirection; |
| 25 | + progressiveScrollingTimer.start(); |
| 26 | + } |
| 27 | + |
| 28 | + function stopScrolling() { |
| 29 | + progressiveScrollingTimer.stop(); |
| 30 | + } |
| 31 | + |
| 32 | + /* If enabled, increase step size based on pointer location |
| 33 | + * This makes scrolling change speed depending on how close the pointer |
| 34 | + * is to the upper/lower limit |
| 35 | + */ |
| 36 | + function stepSize() { |
| 37 | + if (!root.variableVelocity) return root.maxStep; |
| 38 | + var delta; |
| 39 | + var step; |
| 40 | + if (!progressiveScrollingTimer.scrollPositiveDirection) { |
| 41 | + delta = d.relevantMouseAxis - d.lowerLimit; |
| 42 | + delta = delta / root.areaLength; |
| 43 | + step = Math.abs(delta * root.maxStep); |
| 44 | + } else { |
| 45 | + delta = d.relevantMouseAxis - d.upperLimit; |
| 46 | + delta = delta / root.areaLength |
| 47 | + step = Math.abs(delta * root.maxStep) |
| 48 | + } |
| 49 | + |
| 50 | + return step; |
| 51 | + } |
| 52 | + |
| 53 | + QtObject { |
| 54 | + id: d |
| 55 | + |
| 56 | + readonly property bool atRelevantContentAxisBeginning: root.horizontal ? |
| 57 | + root.flickable.atXBeginning : root.flickable.atYBeginning |
| 58 | + |
| 59 | + readonly property bool atRelevantContentAxisEnd: root.horizontal ? |
| 60 | + root.flickable.atXEnd : root.flickable.atYEnd |
| 61 | + |
| 62 | + // lower and upper are in terms of raw coordinates and not top/bottom of a list |
| 63 | + readonly property real lowerLimit: root.areaLength |
| 64 | + readonly property real upperLimit: { |
| 65 | + if (root.horizontal) { |
| 66 | + return (root.flickable.visibleArea.widthRatio * |
| 67 | + root.flickable.contentWidth) - root.areaLength; |
| 68 | + } else { |
| 69 | + return (root.flickable.visibleArea.heightRatio * |
| 70 | + root.flickable.contentHeight) - root.areaLength; |
| 71 | + } |
| 72 | + } |
| 73 | + |
| 74 | + property real relevantContentAxis |
| 75 | + property real relevantMouseAxis |
| 76 | + } |
| 77 | + |
| 78 | + Timer { |
| 79 | + id: progressiveScrollingTimer |
| 80 | + |
| 81 | + property bool scrollPositiveDirection: true |
| 82 | + readonly property real listEnd: { |
| 83 | + if (root.horizontal) { |
| 84 | + return (1 - root.flickable.visibleArea.widthRatio) * |
| 85 | + root.flickable.contentWidth; |
| 86 | + } else { |
| 87 | + return (1 - root.flickable.visibleArea.heightRatio) * |
| 88 | + root.flickable.contentHeight; |
| 89 | + } |
| 90 | + } |
| 91 | + interval: root.delay |
| 92 | + repeat: true |
| 93 | + running: false |
| 94 | + |
| 95 | + onTriggered: { |
| 96 | + if (!scrollPositiveDirection && !d.atRelevantContentAxisBeginning) { |
| 97 | + if (d.relevantContentAxis > root.stepSize()) { |
| 98 | + d.relevantContentAxis -= root.stepSize(); |
| 99 | + } else { |
| 100 | + d.relevantContentAxis = 0; |
| 101 | + stop(); |
| 102 | + } |
| 103 | + } else if (scrollPositiveDirection && !d.atRelevantContentAxisEnd) { |
| 104 | + if (listEnd - d.relevantContentAxis > root.stepSize()) { |
| 105 | + d.relevantContentAxis += root.stepSize(); |
| 106 | + } else { |
| 107 | + d.relevantContentAxis = listEnd; |
| 108 | + stop(); |
| 109 | + } |
| 110 | + } |
| 111 | + } |
| 112 | + } |
| 113 | + |
| 114 | + property alias animationProperty: d.relevantContentAxis |
| 115 | + Behavior on animationProperty { UbuntuNumberAnimation{} } |
| 116 | + |
| 117 | + Binding { |
| 118 | + target: root.flickable |
| 119 | + property: root.horizontal ? "contentX" : "contentY" |
| 120 | + value: d.relevantContentAxis |
| 121 | + } |
| 122 | + |
| 123 | + Mouse.onPositionChanged: { |
| 124 | + if (!root.enabled) return; |
| 125 | + |
| 126 | + // This synchronizes the bindings as scrolling from the middle of the list |
| 127 | + // can sometimes break |
| 128 | + if (root.horizontal) d.relevantContentAxis = root.flickable.contentX |
| 129 | + else d.relevantContentAxis = root.flickable.contentY |
| 130 | + |
| 131 | + d.relevantMouseAxis = (root.horizontal ? mouse.x : mouse.y) |
| 132 | + if (d.relevantMouseAxis < d.lowerLimit && !d.atRelevantContentAxisBeginning) { |
| 133 | + startScrolling(false); |
| 134 | + mouse.accepted = true; |
| 135 | + } else if (d.relevantMouseAxis >= d.upperLimit && !d.atRelevantContentAxisEnd) { |
| 136 | + startScrolling(true); |
| 137 | + mouse.accepted = true; |
| 138 | + } else { |
| 139 | + stopScrolling(); |
| 140 | + } |
| 141 | + |
| 142 | + //mouse.accepted = root.enabled |
| 143 | + } |
| 144 | + |
| 145 | + Mouse.onReleased: { |
| 146 | + stopScrolling(); |
| 147 | + mouse.accepted = root.enabled |
| 148 | + } |
| 149 | +} |
| 150 | |
| 151 | === modified file 'qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png' |
| 152 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | } |
| 172 | } |
| 173 | |
| 174 | - property bool windowActive: window.active |
| 175 | + property bool windowActive: typeof(window) !== "undefined" ? window.active : false |
| 176 | property bool showOverlayScope: false |
| 177 | |
| 178 | DashCommunicatorService { |
| 179 | |
| 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 | } |
| 185 | |
| 186 | function closePopup(keepFocus, keepSearch) { |
| 187 | + if (!extraPanel) return; |
| 188 | if (extraPanel.visible) { |
| 189 | extraPanel.visible = false; |
| 190 | } else if (!keepFocus) { |
| 191 | |
| 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 | } else { |
| 197 | // Should be ubuntu store icon |
| 198 | cardTool.artShapeStyle = "flat"; |
| 199 | - item.backgroundShapeStyle = "shadow"; |
| 200 | + if (cardTool.categoryLayout == "grid") { |
| 201 | + item.backgroundShapeStyle = "shadow"; |
| 202 | + } |
| 203 | } |
| 204 | } |
| 205 | item.cardTool = cardTool; |
| 206 | |
| 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 | */ |
| 212 | |
| 213 | import QtQuick 2.4 |
| 214 | +import Ubuntu.Components 1.3 |
| 215 | import Dash 0.1 |
| 216 | +import "../Components" |
| 217 | |
| 218 | Item { |
| 219 | id: root |
| 220 | @@ -70,50 +72,61 @@ |
| 221 | onStoreClicked: root.storeClicked(); |
| 222 | z: 1 |
| 223 | } |
| 224 | + Autoscroller { |
| 225 | + id: autoscroller |
| 226 | |
| 227 | - Flickable { |
| 228 | anchors { |
| 229 | - top: header.bottom |
| 230 | bottom: parent.bottom |
| 231 | left: parent.left |
| 232 | right: parent.right |
| 233 | + top: header.bottom |
| 234 | } |
| 235 | - clip: true |
| 236 | - contentWidth: root.width |
| 237 | - contentHeight: column.height |
| 238 | - onContentHeightChanged: returnToBounds(); |
| 239 | - Column { |
| 240 | - id: column |
| 241 | - Repeater { |
| 242 | - model: scope ? scope.categories : null |
| 243 | - |
| 244 | - delegate: Loader { |
| 245 | - asynchronous: true |
| 246 | - width: root.width |
| 247 | - active: results.count > 0 |
| 248 | - visible: active |
| 249 | - sourceComponent: ScopesListCategory { |
| 250 | - objectName: "scopesListCategory" + categoryId |
| 251 | - |
| 252 | - model: results |
| 253 | - |
| 254 | - title: { |
| 255 | - if (isFavoritesFeed) return i18n.tr("Home"); |
| 256 | - else if (isAlsoInstalled) return i18n.tr("Also installed"); |
| 257 | - else return name; |
| 258 | + |
| 259 | + enabled: root.state == "edit" |
| 260 | + flickable: flickable |
| 261 | + |
| 262 | + Flickable { |
| 263 | + id: flickable |
| 264 | + objectName: "scopesListFlickable" |
| 265 | + |
| 266 | + anchors.fill: parent |
| 267 | + clip: true |
| 268 | + contentWidth: root.width |
| 269 | + contentHeight: column.height |
| 270 | + onContentHeightChanged: returnToBounds(); |
| 271 | + Column { |
| 272 | + id: column |
| 273 | + Repeater { |
| 274 | + model: scope ? scope.categories : null |
| 275 | + |
| 276 | + delegate: Loader { |
| 277 | + asynchronous: true |
| 278 | + width: root.width |
| 279 | + active: results.count > 0 |
| 280 | + visible: active |
| 281 | + sourceComponent: ScopesListCategory { |
| 282 | + objectName: "scopesListCategory" + categoryId |
| 283 | + |
| 284 | + Mouse.forwardTo: [autoscroller] |
| 285 | + model: results |
| 286 | + title: { |
| 287 | + if (isFavoritesFeed) return i18n.tr("Home"); |
| 288 | + else if (isAlsoInstalled) return i18n.tr("Also installed"); |
| 289 | + else return name; |
| 290 | + } |
| 291 | + |
| 292 | + editMode: root.state == "edit" |
| 293 | + |
| 294 | + scopeStyle: root.scopeStyle |
| 295 | + isFavoritesFeed: categoryId == "favorites" |
| 296 | + isAlsoInstalled: categoryId == "other" |
| 297 | + |
| 298 | + onRequestFavorite: root.requestFavorite(scopeId, favorite); |
| 299 | + onRequestEditMode: root.state = "edit"; |
| 300 | + onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index); |
| 301 | + onRequestActivate: root.scope.activate(result, categoryId); |
| 302 | + onRequestRestore: root.requestRestore(scopeId); |
| 303 | } |
| 304 | - |
| 305 | - editMode: root.state == "edit" |
| 306 | - |
| 307 | - scopeStyle: root.scopeStyle |
| 308 | - isFavoritesFeed: categoryId == "favorites" |
| 309 | - isAlsoInstalled: categoryId == "other" |
| 310 | - |
| 311 | - onRequestFavorite: root.requestFavorite(scopeId, favorite); |
| 312 | - onRequestEditMode: root.state = "edit"; |
| 313 | - onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index); |
| 314 | - onRequestActivate: root.scope.activate(result, categoryId); |
| 315 | - onRequestRestore: root.requestRestore(scopeId); |
| 316 | } |
| 317 | } |
| 318 | } |
| 319 | |
| 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 | |
| 325 | hideChildren: dragItem.loaderToShrink == loader |
| 326 | |
| 327 | + Mouse.forwardTo: [root] |
| 328 | onClicked: { |
| 329 | if (!editMode) { |
| 330 | if (root.isFavoritesFeed) |
| 331 | |
| 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 | visible: text != "" |
| 337 | } |
| 338 | } |
| 339 | - AbstractButton { |
| 340 | + Item { |
| 341 | id: starArea |
| 342 | objectName: "starArea" |
| 343 | height: parent.height |
| 344 | width: height |
| 345 | anchors.right: parent.right |
| 346 | - onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite); |
| 347 | - onPressedChanged: { |
| 348 | - if (editMode) { |
| 349 | - if (pressed) root.handlePressed(starArea.__mouseArea); |
| 350 | - else root.handleReleased(starArea.__mouseArea); |
| 351 | - } |
| 352 | - } |
| 353 | + |
| 354 | + MouseArea { |
| 355 | + id: mouseArea |
| 356 | + anchors.fill: parent |
| 357 | + Mouse.forwardTo:[starArea] |
| 358 | + } |
| 359 | + |
| 360 | + Mouse.forwardTo: [root] |
| 361 | + Mouse.onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite); |
| 362 | + Mouse.onPressed: { |
| 363 | + if (editMode) { |
| 364 | + root.handlePressed(mouseArea); |
| 365 | + } |
| 366 | + } |
| 367 | + |
| 368 | + Mouse.onReleased: { |
| 369 | + if (editMode) { |
| 370 | + root.handleReleased(mouseArea); |
| 371 | + } |
| 372 | + } |
| 373 | + |
| 374 | visible: editMode || showStar |
| 375 | Icon { |
| 376 | id: star |
| 377 | |
| 378 | === modified file 'qml/Dash/graphics/dash_divider_top_darkgrad@27.png' |
| 379 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | , m_searching(false) |
| 627 | , m_favorite(favorite) |
| 628 | , m_isActive(false) |
| 629 | + , m_hasBeenActive(false) |
| 630 | , m_hasNavigation(true) |
| 631 | , m_hasPrimaryFilter(true) |
| 632 | , m_currentNavigationId("root") |
| 633 | @@ -108,7 +109,7 @@ |
| 634 | |
| 635 | unity::shell::scopes::CategoriesInterface* Scope::categories() const |
| 636 | { |
| 637 | - return m_categories; |
| 638 | + return m_hasBeenActive ? m_categories : nullptr; |
| 639 | } |
| 640 | |
| 641 | unity::shell::scopes::SettingsModelInterface* Scope::settings() const |
| 642 | @@ -153,6 +154,10 @@ |
| 643 | m_isActive = active; |
| 644 | Q_EMIT isActiveChanged(); |
| 645 | } |
| 646 | + if (active && !m_hasBeenActive) { |
| 647 | + m_hasBeenActive = true; |
| 648 | + Q_EMIT categoriesChanged(); |
| 649 | + } |
| 650 | } |
| 651 | |
| 652 | void Scope::setFavorite(const bool favorite) |
| 653 | |
| 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 | bool m_searching; |
| 659 | bool m_favorite; |
| 660 | bool m_isActive; |
| 661 | + bool m_hasBeenActive; |
| 662 | bool m_hasNavigation; |
| 663 | bool m_hasPrimaryFilter; |
| 664 | QString m_currentNavigationId; |
| 665 | |
| 666 | QString m_previewRendererName; |
| 667 | |
| 668 | - unity::shell::scopes::CategoriesInterface* m_categories; |
| 669 | + mutable unity::shell::scopes::CategoriesInterface* m_categories; |
| 670 | unity::shell::scopes::ScopeInterface* m_openScope; |
| 671 | unity::shell::scopes::SettingsModelInterface* m_settings; |
| 672 | Filters* m_filters; |
| 673 | |
| 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 | addScope(longNavigationScope); |
| 679 | |
| 680 | addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true)); |
| 681 | + |
| 682 | + // Add enough scopes to test autoscrolling on the scopes managment page |
| 683 | + for (int i = 0; i < 20; i++) { |
| 684 | + addScope(new Scope("UselessScope" + QString::number(i), |
| 685 | + "US" + QString::number(i), true, this)); |
| 686 | + } |
| 687 | + |
| 688 | m_scopesOverview = new ScopesOverview(this); |
| 689 | |
| 690 | if (!m_loaded) { |
| 691 | |
| 692 | === modified file 'tests/qmltests/Components/tst_LazyImage/portrait.png' |
| 693 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | tryCompare(dashContentList, "count", 0); |
| 713 | scopes.load(); |
| 714 | tryCompare(dashContentList, "currentIndex", 0); |
| 715 | - tryCompare(dashContentList, "count", 7); |
| 716 | + tryCompare(dashContentList, "count", 27); |
| 717 | tryCompare(scopes, "loaded", true); |
| 718 | tryCompareFunction(function() { |
| 719 | var mockScope1Loader = findChild(dash, "scopeLoader0"); |
| 720 | @@ -250,6 +250,9 @@ |
| 721 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
| 722 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
| 723 | |
| 724 | + // Ensure non favorites are visible |
| 725 | + flickToYEnd(findChild(dash,"scopesListFlickable")); |
| 726 | + |
| 727 | // Click on a non favorite scope |
| 728 | mouseClick(nonfavScopesListCategoryList.currentItem); |
| 729 | |
| 730 | @@ -417,6 +420,7 @@ |
| 731 | touchFlick(dash, dash.width / 2, units.gu(2), dash.width / 5, units.gu(2)); |
| 732 | tryCompare(dashContentList, "currentIndex", 1); |
| 733 | compare(dashContentList.currentItem.scopeId, "MockScope1"); |
| 734 | + |
| 735 | } |
| 736 | |
| 737 | function test_manage_dash_move_current_click_other() { |
| 738 | @@ -512,6 +516,9 @@ |
| 739 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
| 740 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
| 741 | |
| 742 | + // Ensure non favorite scopes are visible |
| 743 | + flickToYEnd(findChild(dash, "scopesListFlickable")); |
| 744 | + |
| 745 | // Click on a non favorite scope |
| 746 | mouseClick(nonfavScopesListCategoryList.currentItem); |
| 747 | |
| 748 | @@ -603,6 +610,7 @@ |
| 749 | tryCompare(bottomEdgeController, "progress", 1); |
| 750 | var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother"); |
| 751 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
| 752 | + flickToYEnd(findChild(dash, "scopesListFlickable")); |
| 753 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
| 754 | mouseClick(nonfavScopesListCategoryList.currentItem); |
| 755 | var dashTempScopeItem = findChild(dash, "dashTempScopeItem"); |
| 756 | @@ -645,7 +653,11 @@ |
| 757 | tryCompare(bottomEdgeController, "progress", 1); |
| 758 | var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother"); |
| 759 | var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList"); |
| 760 | + var scopesListFlickable = findChild(dash, "scopesListFlickable"); |
| 761 | tryCompare(nonfavScopesListCategoryList, "currentIndex", 0); |
| 762 | + |
| 763 | + // Ensure the non-favorites, located at the bottom, are visible |
| 764 | + flickToYEnd(scopesListFlickable); |
| 765 | mouseClick(nonfavScopesListCategoryList.currentItem); |
| 766 | var dashTempScopeItem = findChild(dash, "dashTempScopeItem"); |
| 767 | tryCompare(dashTempScopeItem, "x", 0); |
| 768 | |
| 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 | function loadScopes() { |
| 774 | scopeLoadedSpy.clear(); |
| 775 | scopesModel.load(); |
| 776 | - tryCompare(scopeLoadedSpy, "count", 6, 15000); |
| 777 | + tryCompare(scopeLoadedSpy, "count", 7, 15000); |
| 778 | tryCompare(scopesModel, "loaded", true); |
| 779 | tryCompareFunction(function() { |
| 780 | var mockScope1Loader = findChild(shell, "scopeLoader0"); |
| 781 | @@ -124,7 +124,7 @@ |
| 782 | |
| 783 | loadScopes(); |
| 784 | |
| 785 | - compare(dashContentList.count, 7); |
| 786 | + compare(dashContentList.count, 27); |
| 787 | verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count); |
| 788 | } |
| 789 | |
| 790 | @@ -181,7 +181,7 @@ |
| 791 | |
| 792 | // test greater than scope count. |
| 793 | var currentScopeIndex = dashContent.currentIndex; |
| 794 | - dashContent.setCurrentScopeAtIndex(18, true, false); |
| 795 | + dashContent.setCurrentScopeAtIndex(scopesModel.count, true, false); |
| 796 | compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count"); |
| 797 | } |
| 798 | |
| 799 | @@ -610,6 +610,12 @@ |
| 800 | } |
| 801 | |
| 802 | function test_noDelegateCreationDestructionOnMove() { |
| 803 | + // Go to scope 1 and back so that items are created |
| 804 | + // and so this test makes sense |
| 805 | + dashContent.setCurrentScopeAtIndex(1); |
| 806 | + waitForRendering(dashContent); |
| 807 | + dashContent.setCurrentScopeAtIndex(0); |
| 808 | + |
| 809 | // Our cards are of type AbstractButton as defined in CardCreator.js |
| 810 | // This gives also other things that are not cards but for our purpose it |
| 811 | // does not matter |
| 812 | |
| 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 | tryCompare(dashContentList, "count", 0); |
| 818 | scopes.load(); |
| 819 | tryCompare(dashContentList, "currentIndex", 0); |
| 820 | - tryCompare(dashContentList, "count", 7); |
| 821 | + tryCompare(dashContentList, "count", 27); |
| 822 | tryCompare(scopes, "loaded", true); |
| 823 | tryCompareFunction(function() { |
| 824 | var mockScope1Loader = findChild(dash, "scopeLoader0"); |
| 825 | return mockScope1Loader && mockScope1Loader.item != null; }, |
| 826 | - true, 15000); |
| 827 | + true, 150000); |
| 828 | tryCompareFunction(function() { |
| 829 | var mockScope1Loader = findChild(dash, "scopeLoader0"); |
| 830 | return mockScope1Loader && mockScope1Loader.status === Loader.Ready; }, |
| 831 | |
| 832 | === modified file 'tests/qmltests/UnityLogo.png' |
| 833 | 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
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:/