Merge lp:~josharenson/unity8/fix-scope-managment-scrolling into lp:unity8

Proposed by Josh Arenson
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
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.

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

The progressiveScrollingTimer item seems to be inspired by LauncherPanel.qml progressiveScrollingTimer item.

How possible it is to extract them and have only one so that possible bugs/fixes to either one ends up in the other?

review: Needs Information
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2406
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1241/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/777
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/777
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1674
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1624
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1624
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1617
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1617
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1617
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1617
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1617
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1617
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1617/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1241/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2407
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1307/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1732
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/836
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/836
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/836
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1758
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1705
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1705
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1705
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1698/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1307/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

Text conflict in tests/qmltests/Dash/tst_Dash.qml
Text conflict in tests/qmltests/Dash/tst_DashContent.qml
Text conflict in tests/qmltests/Dash/tst_DashShell.qml
3 conflicts encountered.

review: Needs Fixing
Revision history for this message
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.

Revision history for this message
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.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2449
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1370/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1832
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/918
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/918
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/918
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1858
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1797
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1797
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1797
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1788
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1788/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1788
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1788/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1788
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1788/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1788
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1788/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1788
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1788/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1788
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1788/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1788
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1788/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1788
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1788/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1788
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1788/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1370/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2446
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1379/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1845
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/928
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/928
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/928
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1871
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1809
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1809
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1809
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1800
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1800/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1800
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1800/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1800
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1800/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1800
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1800/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1800
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1800/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1800
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1800/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1800
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1800/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1800
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1800/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1800
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1800/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1379/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2447
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1381/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1847
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/930
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/930
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/930
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1873
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1811
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1811
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1811
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1802
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1802/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1802
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1802/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1802
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1802/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1802
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1802/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1802
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1802/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1802
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1802/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1802
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1802/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1802
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1802/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1802
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1802/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1381/rebuild

review: Needs Fixing (continuous-integration)
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

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/unity8-dash.png'
0Binary files data/unity8-dash.png 2016-06-06 16:03:16 +0000 and data/unity8-dash.png 2015-10-30 16:17:46 +0000 differ0Binary 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
=== modified file 'plugins/Dash/graphics/music_progress_bg.png'
1Binary 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 differ1Binary 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
=== added file 'qml/Components/Autoscroller.qml'
--- qml/Components/Autoscroller.qml 1970-01-01 00:00:00 +0000
+++ qml/Components/Autoscroller.qml 2016-06-06 16:03:17 +0000
@@ -0,0 +1,141 @@
1import QtQuick 2.4
2import Ubuntu.Components 1.3
3
4Item {
5 id: root
6
7 property bool enabled: false
8 property bool horizontal: false
9 property bool variableVelocity: true
10 property int delay: 2 // ms delay between scrolls
11 property real areaLength: units.gu(5)
12 property real maxStep: units.dp(2)
13 property Flickable flickable
14
15 function startScrolling(positiveDirection) {
16 progressiveScrollingTimer.scrollPositiveDirection = positiveDirection;
17 progressiveScrollingTimer.start();
18 }
19
20 function stopScrolling() {
21 progressiveScrollingTimer.stop();
22 }
23
24 /* If enabled, increase step size based on pointer location
25 * This makes scrolling change speed depending on how close the pointer
26 * is to the upper/lower limit
27 */
28 function stepSize() {
29 if (!root.variableVelocity) return root.maxStep;
30 var delta;
31 var step;
32 if (!progressiveScrollingTimer.scrollPositiveDirection) {
33 delta = d.relevantMouseAxis - d.lowerLimit;
34 delta = delta / root.areaLength;
35 step = Math.abs(delta * root.maxStep);
36 } else {
37 delta = d.relevantMouseAxis - d.upperLimit;
38 delta = delta / root.areaLength
39 step = Math.abs(delta * root.maxStep)
40 }
41
42 return step;
43 }
44
45 QtObject {
46 id: d
47
48 readonly property bool atRelevantContentAxisBeginning: root.horizontal ?
49 root.flickable.atXBeginning : root.flickable.atYBeginning
50
51 readonly property bool atRelevantContentAxisEnd: root.horizontal ?
52 root.flickable.atXEnd : root.flickable.atYEnd
53
54 // lower and upper are in terms of raw coordinates and not top/bottom of a list
55 readonly property real lowerLimit: root.areaLength
56 readonly property real upperLimit: {
57 if (root.horizontal) {
58 return (root.flickable.visibleArea.widthRatio *
59 root.flickable.contentWidth) - root.areaLength;
60 } else {
61 return (root.flickable.visibleArea.heightRatio *
62 root.flickable.contentHeight) - root.areaLength;
63 }
64 }
65
66 property real relevantContentAxis
67 property real relevantMouseAxis
68 }
69
70 Timer {
71 id: progressiveScrollingTimer
72
73 property bool scrollPositiveDirection: true
74 readonly property real listEnd: {
75 if (root.horizontal) {
76 return (1 - root.flickable.visibleArea.widthRatio) *
77 root.flickable.contentWidth;
78 } else {
79 return (1 - root.flickable.visibleArea.heightRatio) *
80 root.flickable.contentHeight;
81 }
82 }
83 interval: root.delay
84 repeat: true
85 running: false
86
87 onTriggered: {
88 if (!scrollPositiveDirection && !d.atRelevantContentAxisBeginning) {
89 if (d.relevantContentAxis > root.stepSize()) {
90 d.relevantContentAxis -= root.stepSize();
91 } else {
92 d.relevantContentAxis = 0;
93 stop();
94 }
95 } else if (scrollPositiveDirection && !d.atRelevantContentAxisEnd) {
96 if (listEnd - d.relevantContentAxis > root.stepSize()) {
97 d.relevantContentAxis += root.stepSize();
98 } else {
99 d.relevantContentAxis = listEnd;
100 stop();
101 }
102 }
103 }
104 }
105
106 property alias animationProperty: d.relevantContentAxis
107 Behavior on animationProperty { UbuntuNumberAnimation{} }
108
109 Binding {
110 target: root.flickable
111 property: root.horizontal ? "contentX" : "contentY"
112 value: d.relevantContentAxis
113 }
114
115 Mouse.onPositionChanged: {
116 if (!root.enabled) return;
117
118 // This synchronizes the bindings as scrolling from the middle of the list
119 // can sometimes break
120 if (root.horizontal) d.relevantContentAxis = root.flickable.contentX
121 else d.relevantContentAxis = root.flickable.contentY
122
123 d.relevantMouseAxis = (root.horizontal ? mouse.x : mouse.y)
124 if (d.relevantMouseAxis < d.lowerLimit && !d.atRelevantContentAxisBeginning) {
125 startScrolling(false);
126 mouse.accepted = true;
127 } else if (d.relevantMouseAxis >= d.upperLimit && !d.atRelevantContentAxisEnd) {
128 startScrolling(true);
129 mouse.accepted = true;
130 } else {
131 stopScrolling();
132 }
133
134 //mouse.accepted = root.enabled
135 }
136
137 Mouse.onReleased: {
138 stopScrolling();
139 mouse.accepted = root.enabled
140 }
141}
0142
=== modified file 'qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png'
1Binary 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 differ143Binary 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
=== modified file 'qml/Components/graphics/close@20.png'
2Binary 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 differ144Binary 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
=== modified file 'qml/Components/graphics/icon_star_empty@20.png'
3Binary 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 differ145Binary 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
=== modified file 'qml/Components/graphics/icon_star_full@20.png'
4Binary 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 differ146Binary 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
=== modified file 'qml/Components/graphics/icon_star_half@20.png'
5Binary 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 differ147Binary 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
=== modified file 'qml/Components/graphics/icon_star_off@20.png'
6Binary 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 differ148Binary 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
=== modified file 'qml/Components/graphics/icon_star_on@20.png'
7Binary 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 differ149Binary 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
=== modified file 'qml/Components/graphics/non-selected@18.png'
8Binary 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 differ150Binary 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
=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml 2016-05-02 07:57:07 +0000
+++ qml/Dash/Dash.qml 2016-06-06 16:03:17 +0000
@@ -36,7 +36,7 @@
36 }36 }
37 }37 }
3838
39 property bool windowActive: window.active39 property bool windowActive: typeof(window) !== "undefined" ? window.active : false
40 property bool showOverlayScope: false40 property bool showOverlayScope: false
4141
42 DashCommunicatorService {42 DashCommunicatorService {
4343
=== modified file 'qml/Dash/DashPageHeader.qml'
--- qml/Dash/DashPageHeader.qml 2016-05-17 20:46:51 +0000
+++ qml/Dash/DashPageHeader.qml 2016-06-06 16:03:17 +0000
@@ -79,6 +79,7 @@
79 }79 }
8080
81 function closePopup(keepFocus, keepSearch) {81 function closePopup(keepFocus, keepSearch) {
82 if (!extraPanel) return;
82 if (extraPanel.visible) {83 if (extraPanel.visible) {
83 extraPanel.visible = false;84 extraPanel.visible = false;
84 } else if (!keepFocus) {85 } else if (!keepFocus) {
8586
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml 2016-05-27 13:52:20 +0000
+++ qml/Dash/GenericScopeView.qml 2016-06-06 16:03:17 +0000
@@ -349,7 +349,9 @@
349 } else {349 } else {
350 // Should be ubuntu store icon350 // Should be ubuntu store icon
351 cardTool.artShapeStyle = "flat";351 cardTool.artShapeStyle = "flat";
352 item.backgroundShapeStyle = "shadow";352 if (cardTool.categoryLayout == "grid") {
353 item.backgroundShapeStyle = "shadow";
354 }
353 }355 }
354 }356 }
355 item.cardTool = cardTool;357 item.cardTool = cardTool;
356358
=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml 2016-04-18 15:02:54 +0000
+++ qml/Dash/ScopesList.qml 2016-06-06 16:03:17 +0000
@@ -15,7 +15,9 @@
15 */15 */
1616
17import QtQuick 2.417import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Dash 0.119import Dash 0.1
20import "../Components"
1921
20Item {22Item {
21 id: root23 id: root
@@ -70,50 +72,61 @@
70 onStoreClicked: root.storeClicked();72 onStoreClicked: root.storeClicked();
71 z: 173 z: 1
72 }74 }
75 Autoscroller {
76 id: autoscroller
7377
74 Flickable {
75 anchors {78 anchors {
76 top: header.bottom
77 bottom: parent.bottom79 bottom: parent.bottom
78 left: parent.left80 left: parent.left
79 right: parent.right81 right: parent.right
82 top: header.bottom
80 }83 }
81 clip: true84
82 contentWidth: root.width85 enabled: root.state == "edit"
83 contentHeight: column.height86 flickable: flickable
84 onContentHeightChanged: returnToBounds();87
85 Column {88 Flickable {
86 id: column89 id: flickable
87 Repeater {90 objectName: "scopesListFlickable"
88 model: scope ? scope.categories : null91
8992 anchors.fill: parent
90 delegate: Loader {93 clip: true
91 asynchronous: true94 contentWidth: root.width
92 width: root.width95 contentHeight: column.height
93 active: results.count > 096 onContentHeightChanged: returnToBounds();
94 visible: active97 Column {
95 sourceComponent: ScopesListCategory {98 id: column
96 objectName: "scopesListCategory" + categoryId99 Repeater {
97100 model: scope ? scope.categories : null
98 model: results101
99102 delegate: Loader {
100 title: {103 asynchronous: true
101 if (isFavoritesFeed) return i18n.tr("Home");104 width: root.width
102 else if (isAlsoInstalled) return i18n.tr("Also installed");105 active: results.count > 0
103 else return name;106 visible: active
107 sourceComponent: ScopesListCategory {
108 objectName: "scopesListCategory" + categoryId
109
110 Mouse.forwardTo: [autoscroller]
111 model: results
112 title: {
113 if (isFavoritesFeed) return i18n.tr("Home");
114 else if (isAlsoInstalled) return i18n.tr("Also installed");
115 else return name;
116 }
117
118 editMode: root.state == "edit"
119
120 scopeStyle: root.scopeStyle
121 isFavoritesFeed: categoryId == "favorites"
122 isAlsoInstalled: categoryId == "other"
123
124 onRequestFavorite: root.requestFavorite(scopeId, favorite);
125 onRequestEditMode: root.state = "edit";
126 onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
127 onRequestActivate: root.scope.activate(result, categoryId);
128 onRequestRestore: root.requestRestore(scopeId);
104 }129 }
105
106 editMode: root.state == "edit"
107
108 scopeStyle: root.scopeStyle
109 isFavoritesFeed: categoryId == "favorites"
110 isAlsoInstalled: categoryId == "other"
111
112 onRequestFavorite: root.requestFavorite(scopeId, favorite);
113 onRequestEditMode: root.state = "edit";
114 onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
115 onRequestActivate: root.scope.activate(result, categoryId);
116 onRequestRestore: root.requestRestore(scopeId);
117 }130 }
118 }131 }
119 }132 }
120133
=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml 2015-07-15 15:07:19 +0000
+++ qml/Dash/ScopesListCategory.qml 2016-06-06 16:03:17 +0000
@@ -92,6 +92,7 @@
9292
93 hideChildren: dragItem.loaderToShrink == loader93 hideChildren: dragItem.loaderToShrink == loader
9494
95 Mouse.forwardTo: [root]
95 onClicked: {96 onClicked: {
96 if (!editMode) {97 if (!editMode) {
97 if (root.isFavoritesFeed)98 if (root.isFavoritesFeed)
9899
=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
--- qml/Dash/ScopesListCategoryItem.qml 2016-03-09 14:14:59 +0000
+++ qml/Dash/ScopesListCategoryItem.qml 2016-06-06 16:03:17 +0000
@@ -84,19 +84,33 @@
84 visible: text != ""84 visible: text != ""
85 }85 }
86 }86 }
87 AbstractButton {87 Item {
88 id: starArea88 id: starArea
89 objectName: "starArea"89 objectName: "starArea"
90 height: parent.height90 height: parent.height
91 width: height91 width: height
92 anchors.right: parent.right92 anchors.right: parent.right
93 onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite);93
94 onPressedChanged: {94 MouseArea {
95 if (editMode) {95 id: mouseArea
96 if (pressed) root.handlePressed(starArea.__mouseArea);96 anchors.fill: parent
97 else root.handleReleased(starArea.__mouseArea);97 Mouse.forwardTo:[starArea]
98 }98 }
99 }99
100 Mouse.forwardTo: [root]
101 Mouse.onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite);
102 Mouse.onPressed: {
103 if (editMode) {
104 root.handlePressed(mouseArea);
105 }
106 }
107
108 Mouse.onReleased: {
109 if (editMode) {
110 root.handleReleased(mouseArea);
111 }
112 }
113
100 visible: editMode || showStar114 visible: editMode || showStar
101 Icon {115 Icon {
102 id: star116 id: star
103117
=== modified file 'qml/Dash/graphics/dash_divider_top_darkgrad@27.png'
104Binary 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 differ118Binary 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
=== modified file 'qml/Dash/graphics/dash_divider_top_lightgrad@27.png'
105Binary 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 differ119Binary 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
=== modified file 'qml/Dash/graphics/header_handlearrow2@27.png'
106Binary 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 differ120Binary 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
=== modified file 'qml/Dash/graphics/header_handlearrow@27.png'
107Binary 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 differ121Binary 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
=== modified file 'qml/Dash/graphics/icon_clear@20.png'
108Binary 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 differ122Binary 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
=== modified file 'qml/Dash/graphics/icon_search_active@20.png'
109Binary 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 differ123Binary 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
=== modified file 'qml/Dash/graphics/icon_search_inactive@20.png'
110Binary 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 differ124Binary 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
=== modified file 'qml/Dash/graphics/navigation_shadow@18.png'
111Binary 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 differ125Binary 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
=== modified file 'qml/Dash/graphics/navigation_shadow_light@18.png'
112Binary 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 differ126Binary 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
=== modified file 'qml/Dash/graphics/overview_hint@27.png'
113Binary 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 differ127Binary 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
=== modified file 'qml/Dash/graphics/pagination_dot_off@30.png'
114Binary 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 differ128Binary 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
=== modified file 'qml/Dash/graphics/pagination_dot_on@30.png'
115Binary 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 differ129Binary 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
=== modified file 'qml/Dash/graphics/paper.png'
116Binary 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 differ130Binary 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
=== modified file 'qml/Dash/graphics/pixel.png'
117Binary 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 differ131Binary 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
=== modified file 'qml/Dash/graphics/play_button@18.png'
118Binary 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 differ132Binary 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
=== modified file 'qml/Dash/graphics/play_button_active@18.png'
119Binary 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 differ133Binary 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
=== modified file 'qml/Dash/graphics/play_button_active_big@20.png'
120Binary 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 differ134Binary 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
=== modified file 'qml/Dash/graphics/play_button_big@20.png'
121Binary 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 differ135Binary 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
=== modified file 'qml/Dash/graphics/tabbarchevron@27.png'
122Binary 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 differ136Binary 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
=== modified file 'qml/Dash/graphics/tablet/icon_close_preview@20.png'
123Binary 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 differ137Binary 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
=== modified file 'qml/Dash/graphics/tooltip_arrow@27.png'
124Binary 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 differ138Binary 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
=== modified file 'qml/Greeter/graphics/dot_empty.png'
125Binary 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 differ139Binary 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
=== modified file 'qml/Greeter/graphics/dot_filled.png'
126Binary 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 differ140Binary 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
=== modified file 'qml/Greeter/graphics/dot_pointer.png'
127Binary 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 differ141Binary 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
=== modified file 'qml/Greeter/graphics/icon_arrow.png'
128Binary 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 differ142Binary 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
=== modified file 'qml/Greeter/graphics/infographic_circle_back.png'
129Binary 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 differ143Binary 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
=== modified file 'qml/Launcher/graphics/divider-line.png'
130Binary 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 differ144Binary 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
=== modified file 'qml/Launcher/graphics/focused_app_arrow@30.png'
131Binary 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 differ145Binary 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
=== modified file 'qml/Launcher/graphics/home@18.png'
132Binary 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 differ146Binary 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
=== modified file 'qml/Launcher/graphics/quicklist_tooltip@30.png'
133Binary 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 differ147Binary 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
=== modified file 'qml/Panel/graphics/rectangular_dropshadow@30.png'
134Binary 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 differ148Binary 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
=== modified file 'qml/Stages/graphics/PageHeaderBaseDividerBottom@18.png'
135Binary 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 differ149Binary 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
=== modified file 'qml/Stages/graphics/PageHeaderBaseDividerLight@18.png'
136Binary 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 differ150Binary 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
=== modified file 'qml/Stages/graphics/dropshadow2gu@30.png'
137Binary 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 differ151Binary 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
=== modified file 'qml/Stages/graphics/sidestage_handle@20.png'
138Binary 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 differ152Binary 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
=== modified file 'qml/Tutorial/graphics/background1.png'
139Binary 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 differ153Binary 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
=== modified file 'qml/Tutorial/graphics/background2.png'
140Binary 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 differ154Binary 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
=== modified file 'qml/Wizard/Pages/data/Desktop_header_bkg.png'
141Binary 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 differ155Binary 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
=== modified file 'qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png'
142Binary 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 differ156Binary 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
=== modified file 'qml/Wizard/Pages/data/Phone_header_bkg.png'
143Binary 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 differ157Binary 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
=== modified file 'qml/Wizard/Pages/data/Phone_splash_screen_bkg.png'
144Binary 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 differ158Binary 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
=== modified file 'qml/Wizard/Pages/data/Tick@30.png'
145Binary 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 differ159Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/map.png'
146Binary 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 differ160Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/pin.png'
147Binary 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 differ161Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-1.png'
148Binary 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 differ162Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-10.png'
149Binary 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 differ163Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-11.png'
150Binary 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 differ164Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-2.png'
151Binary 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 differ165Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png'
152Binary 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 differ166Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-3.png'
153Binary 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 differ167Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png'
154Binary 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 differ168Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-4.png'
155Binary 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 differ169Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-5.png'
156Binary 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 differ170Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-6.png'
157Binary 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 differ171Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-7.png'
158Binary 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 differ172Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-8.png'
159Binary 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 differ173Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png'
160Binary 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 differ174Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_-9.png'
161Binary 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 differ175Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_0.png'
162Binary 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 differ176Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_1.png'
163Binary 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 differ177Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_10.5.png'
164Binary 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 differ178Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_10.png'
165Binary 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 differ179Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_11.png'
166Binary 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 differ180Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_12.75.png'
167Binary 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 differ181Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_12.png'
168Binary 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 differ182Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_13.png'
169Binary 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 differ183Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_2.png'
170Binary 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 differ184Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_3.5.png'
171Binary 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 differ185Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_3.png'
172Binary 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 differ186Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_4.5.png'
173Binary 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 differ187Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_4.png'
174Binary 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 differ188Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_5.5.png'
175Binary 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 differ189Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_5.75.png'
176Binary 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 differ190Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_5.png'
177Binary 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 differ191Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_6.5.png'
178Binary 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 differ192Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_6.png'
179Binary 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 differ193Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_7.png'
180Binary 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 differ194Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_8.5.png'
181Binary 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 differ195Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_8.png'
182Binary 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 differ196Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_9.5.png'
183Binary 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 differ197Binary 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
=== modified file 'qml/Wizard/Pages/data/timezonemap/timezone_9.png'
184Binary 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 differ198Binary 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
=== modified file 'qml/graphics/dropshadow_left@20.png'
185Binary 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 differ199Binary 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
=== modified file 'qml/graphics/dropshadow_right@20.png'
186Binary 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 differ200Binary 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
=== modified file 'tests/data/unity/backgrounds/blue.png'
187Binary 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 differ201Binary 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
=== modified file 'tests/data/unity/backgrounds/red.png'
188Binary 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 differ202Binary 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
=== modified file 'tests/graphics/applicationIcons/browser@18.png'
189Binary 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 differ203Binary 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
=== modified file 'tests/graphics/applicationIcons/calendar@18.png'
190Binary 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 differ204Binary 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
=== modified file 'tests/graphics/applicationIcons/camera@18.png'
191Binary 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 differ205Binary 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
=== modified file 'tests/graphics/applicationIcons/contacts-app@18.png'
192Binary 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 differ206Binary 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
=== modified file 'tests/graphics/applicationIcons/dash.png'
193Binary 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 differ207Binary 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
=== modified file 'tests/graphics/applicationIcons/dialer-app@18.png'
194Binary 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 differ208Binary 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
=== modified file 'tests/graphics/applicationIcons/evernote@18.png'
195Binary 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 differ209Binary 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
=== modified file 'tests/graphics/applicationIcons/facebook@18.png'
196Binary 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 differ210Binary 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
=== modified file 'tests/graphics/applicationIcons/gallery@18.png'
197Binary 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 differ211Binary 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
=== modified file 'tests/graphics/applicationIcons/gmail@18.png'
198Binary 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 differ212Binary 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
=== modified file 'tests/graphics/applicationIcons/libreoffice@18.png'
199Binary 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 differ213Binary 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
=== modified file 'tests/graphics/applicationIcons/map@18.png'
200Binary 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 differ214Binary 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
=== modified file 'tests/graphics/applicationIcons/messages-app@18.png'
201Binary 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 differ215Binary 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
=== modified file 'tests/graphics/applicationIcons/notepad@18.png'
202Binary 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 differ216Binary 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
=== modified file 'tests/graphics/applicationIcons/pinterest@18.png'
203Binary 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 differ217Binary 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
=== modified file 'tests/graphics/applicationIcons/soundcloud@18.png'
204Binary 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 differ218Binary 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
=== modified file 'tests/graphics/applicationIcons/system-settings@18.png'
205Binary 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 differ219Binary 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
=== modified file 'tests/graphics/applicationIcons/twitter@18.png'
206Binary 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 differ220Binary 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
=== modified file 'tests/graphics/applicationIcons/weather@18.png'
207Binary 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 differ221Binary 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
=== modified file 'tests/graphics/applicationIcons/wikipedia@18.png'
208Binary 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 differ222Binary 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
=== modified file 'tests/graphics/applicationIcons/youtube@18.png'
209Binary 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 differ223Binary 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
=== modified file 'tests/graphics/avatars/amanda@12.png'
210Binary 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 differ224Binary 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
=== modified file 'tests/graphics/avatars/anna_olsson@12.png'
211Binary 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 differ225Binary 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
=== modified file 'tests/graphics/avatars/funky@12.png'
212Binary 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 differ226Binary 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
=== modified file 'tests/graphics/clock@18.png'
213Binary 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 differ227Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/browser@12.png'
214Binary 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 differ228Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/camera@12.png'
215Binary 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 differ229Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/dialer@12.png'
216Binary 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 differ230Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/facebook@12.png'
217Binary 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 differ231Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/gallery@12.png'
218Binary 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 differ232Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.png'
219Binary 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 differ233Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/map@12.png'
220Binary 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 differ234Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/music@12.png'
221Binary 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 differ235Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/twitter@12.png'
222Binary 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 differ236Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.png'
223Binary 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 differ237Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.png'
224Binary 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 differ238Binary 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
=== modified file 'tests/mocks/Unity/Application/resources/vkb_portrait.png'
225Binary 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 differ239Binary 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
=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp 2016-05-09 20:25:06 +0000
+++ tests/mocks/Unity/fake_scope.cpp 2016-06-06 16:03:17 +0000
@@ -39,6 +39,7 @@
39 , m_searching(false)39 , m_searching(false)
40 , m_favorite(favorite)40 , m_favorite(favorite)
41 , m_isActive(false)41 , m_isActive(false)
42 , m_hasBeenActive(false)
42 , m_hasNavigation(true)43 , m_hasNavigation(true)
43 , m_hasPrimaryFilter(true)44 , m_hasPrimaryFilter(true)
44 , m_currentNavigationId("root")45 , m_currentNavigationId("root")
@@ -108,7 +109,7 @@
108109
109unity::shell::scopes::CategoriesInterface* Scope::categories() const110unity::shell::scopes::CategoriesInterface* Scope::categories() const
110{111{
111 return m_categories;112 return m_hasBeenActive ? m_categories : nullptr;
112}113}
113114
114unity::shell::scopes::SettingsModelInterface* Scope::settings() const115unity::shell::scopes::SettingsModelInterface* Scope::settings() const
@@ -153,6 +154,10 @@
153 m_isActive = active;154 m_isActive = active;
154 Q_EMIT isActiveChanged();155 Q_EMIT isActiveChanged();
155 }156 }
157 if (active && !m_hasBeenActive) {
158 m_hasBeenActive = true;
159 Q_EMIT categoriesChanged();
160 }
156}161}
157162
158void Scope::setFavorite(const bool favorite)163void Scope::setFavorite(const bool favorite)
159164
=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h 2016-05-03 22:39:09 +0000
+++ tests/mocks/Unity/fake_scope.h 2016-06-06 16:03:17 +0000
@@ -109,13 +109,14 @@
109 bool m_searching;109 bool m_searching;
110 bool m_favorite;110 bool m_favorite;
111 bool m_isActive;111 bool m_isActive;
112 bool m_hasBeenActive;
112 bool m_hasNavigation;113 bool m_hasNavigation;
113 bool m_hasPrimaryFilter;114 bool m_hasPrimaryFilter;
114 QString m_currentNavigationId;115 QString m_currentNavigationId;
115116
116 QString m_previewRendererName;117 QString m_previewRendererName;
117118
118 unity::shell::scopes::CategoriesInterface* m_categories;119 mutable unity::shell::scopes::CategoriesInterface* m_categories;
119 unity::shell::scopes::ScopeInterface* m_openScope;120 unity::shell::scopes::ScopeInterface* m_openScope;
120 unity::shell::scopes::SettingsModelInterface* m_settings;121 unity::shell::scopes::SettingsModelInterface* m_settings;
121 Filters* m_filters;122 Filters* m_filters;
122123
=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
--- tests/mocks/Unity/fake_scopes.cpp 2016-04-29 14:57:44 +0000
+++ tests/mocks/Unity/fake_scopes.cpp 2016-06-06 16:03:17 +0000
@@ -72,6 +72,13 @@
72 addScope(longNavigationScope);72 addScope(longNavigationScope);
7373
74 addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true));74 addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true));
75
76 // Add enough scopes to test autoscrolling on the scopes managment page
77 for (int i = 0; i < 20; i++) {
78 addScope(new Scope("UselessScope" + QString::number(i),
79 "US" + QString::number(i), true, this));
80 }
81
75 m_scopesOverview = new ScopesOverview(this);82 m_scopesOverview = new ScopesOverview(this);
7683
77 if (!m_loaded) {84 if (!m_loaded) {
7885
=== modified file 'tests/qmltests/Components/tst_LazyImage/portrait.png'
79Binary 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 differ86Binary 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
=== modified file 'tests/qmltests/Components/tst_LazyImage/square.png'
80Binary 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 differ87Binary 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
=== modified file 'tests/qmltests/Components/tst_LazyImage/wide.png'
81Binary 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 differ88Binary 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
=== modified file 'tests/qmltests/Dash/artwork/avatar@12.png'
82Binary 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 differ89Binary 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
=== modified file 'tests/qmltests/Dash/artwork/background.png'
83Binary 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 differ90Binary 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
=== modified file 'tests/qmltests/Dash/artwork/checkers.png'
84Binary 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 differ91Binary 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
=== modified file 'tests/qmltests/Dash/artwork/emblem.png'
85Binary 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 differ92Binary 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
=== modified file 'tests/qmltests/Dash/artwork/music-player-design.png'
86Binary 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 differ93Binary 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
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml 2016-05-27 13:54:07 +0000
+++ tests/qmltests/Dash/tst_Dash.qml 2016-06-06 16:03:17 +0000
@@ -58,7 +58,7 @@
58 tryCompare(dashContentList, "count", 0);58 tryCompare(dashContentList, "count", 0);
59 scopes.load();59 scopes.load();
60 tryCompare(dashContentList, "currentIndex", 0);60 tryCompare(dashContentList, "currentIndex", 0);
61 tryCompare(dashContentList, "count", 7);61 tryCompare(dashContentList, "count", 27);
62 tryCompare(scopes, "loaded", true);62 tryCompare(scopes, "loaded", true);
63 tryCompareFunction(function() {63 tryCompareFunction(function() {
64 var mockScope1Loader = findChild(dash, "scopeLoader0");64 var mockScope1Loader = findChild(dash, "scopeLoader0");
@@ -250,6 +250,9 @@
250 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");250 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
251 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);251 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
252252
253 // Ensure non favorites are visible
254 flickToYEnd(findChild(dash,"scopesListFlickable"));
255
253 // Click on a non favorite scope256 // Click on a non favorite scope
254 mouseClick(nonfavScopesListCategoryList.currentItem);257 mouseClick(nonfavScopesListCategoryList.currentItem);
255258
@@ -417,6 +420,7 @@
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));
418 tryCompare(dashContentList, "currentIndex", 1);421 tryCompare(dashContentList, "currentIndex", 1);
419 compare(dashContentList.currentItem.scopeId, "MockScope1");422 compare(dashContentList.currentItem.scopeId, "MockScope1");
423
420 }424 }
421425
422 function test_manage_dash_move_current_click_other() {426 function test_manage_dash_move_current_click_other() {
@@ -512,6 +516,9 @@
512 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");516 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
513 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);517 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
514518
519 // Ensure non favorite scopes are visible
520 flickToYEnd(findChild(dash, "scopesListFlickable"));
521
515 // Click on a non favorite scope522 // Click on a non favorite scope
516 mouseClick(nonfavScopesListCategoryList.currentItem);523 mouseClick(nonfavScopesListCategoryList.currentItem);
517524
@@ -603,6 +610,7 @@
603 tryCompare(bottomEdgeController, "progress", 1);610 tryCompare(bottomEdgeController, "progress", 1);
604 var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");611 var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
605 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");612 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
613 flickToYEnd(findChild(dash, "scopesListFlickable"));
606 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);614 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
607 mouseClick(nonfavScopesListCategoryList.currentItem);615 mouseClick(nonfavScopesListCategoryList.currentItem);
608 var dashTempScopeItem = findChild(dash, "dashTempScopeItem");616 var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
@@ -645,7 +653,11 @@
645 tryCompare(bottomEdgeController, "progress", 1);653 tryCompare(bottomEdgeController, "progress", 1);
646 var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");654 var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
647 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");655 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
656 var scopesListFlickable = findChild(dash, "scopesListFlickable");
648 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);657 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
658
659 // Ensure the non-favorites, located at the bottom, are visible
660 flickToYEnd(scopesListFlickable);
649 mouseClick(nonfavScopesListCategoryList.currentItem);661 mouseClick(nonfavScopesListCategoryList.currentItem);
650 var dashTempScopeItem = findChild(dash, "dashTempScopeItem");662 var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
651 tryCompare(dashTempScopeItem, "x", 0);663 tryCompare(dashTempScopeItem, "x", 0);
652664
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml 2016-05-27 13:52:20 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml 2016-06-06 16:03:17 +0000
@@ -70,7 +70,7 @@
70 function loadScopes() {70 function loadScopes() {
71 scopeLoadedSpy.clear();71 scopeLoadedSpy.clear();
72 scopesModel.load();72 scopesModel.load();
73 tryCompare(scopeLoadedSpy, "count", 6, 15000);73 tryCompare(scopeLoadedSpy, "count", 7, 15000);
74 tryCompare(scopesModel, "loaded", true);74 tryCompare(scopesModel, "loaded", true);
75 tryCompareFunction(function() {75 tryCompareFunction(function() {
76 var mockScope1Loader = findChild(shell, "scopeLoader0");76 var mockScope1Loader = findChild(shell, "scopeLoader0");
@@ -124,7 +124,7 @@
124124
125 loadScopes();125 loadScopes();
126126
127 compare(dashContentList.count, 7);127 compare(dashContentList.count, 27);
128 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);128 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
129 }129 }
130130
@@ -181,7 +181,7 @@
181181
182 // test greater than scope count.182 // test greater than scope count.
183 var currentScopeIndex = dashContent.currentIndex;183 var currentScopeIndex = dashContent.currentIndex;
184 dashContent.setCurrentScopeAtIndex(18, true, false);184 dashContent.setCurrentScopeAtIndex(scopesModel.count, true, false);
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");
186 }186 }
187187
@@ -610,6 +610,12 @@
610 }610 }
611611
612 function test_noDelegateCreationDestructionOnMove() {612 function test_noDelegateCreationDestructionOnMove() {
613 // Go to scope 1 and back so that items are created
614 // and so this test makes sense
615 dashContent.setCurrentScopeAtIndex(1);
616 waitForRendering(dashContent);
617 dashContent.setCurrentScopeAtIndex(0);
618
613 // Our cards are of type AbstractButton as defined in CardCreator.js619 // Our cards are of type AbstractButton as defined in CardCreator.js
614 // This gives also other things that are not cards but for our purpose it620 // This gives also other things that are not cards but for our purpose it
615 // does not matter621 // does not matter
616622
=== modified file 'tests/qmltests/Dash/tst_DashShell.qml'
--- tests/qmltests/Dash/tst_DashShell.qml 2016-05-03 22:39:09 +0000
+++ tests/qmltests/Dash/tst_DashShell.qml 2016-06-06 16:03:17 +0000
@@ -60,12 +60,12 @@
60 tryCompare(dashContentList, "count", 0);60 tryCompare(dashContentList, "count", 0);
61 scopes.load();61 scopes.load();
62 tryCompare(dashContentList, "currentIndex", 0);62 tryCompare(dashContentList, "currentIndex", 0);
63 tryCompare(dashContentList, "count", 7);63 tryCompare(dashContentList, "count", 27);
64 tryCompare(scopes, "loaded", true);64 tryCompare(scopes, "loaded", true);
65 tryCompareFunction(function() {65 tryCompareFunction(function() {
66 var mockScope1Loader = findChild(dash, "scopeLoader0");66 var mockScope1Loader = findChild(dash, "scopeLoader0");
67 return mockScope1Loader && mockScope1Loader.item != null; },67 return mockScope1Loader && mockScope1Loader.item != null; },
68 true, 15000);68 true, 150000);
69 tryCompareFunction(function() {69 tryCompareFunction(function() {
70 var mockScope1Loader = findChild(dash, "scopeLoader0");70 var mockScope1Loader = findChild(dash, "scopeLoader0");
71 return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },71 return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },
7272
=== modified file 'tests/qmltests/UnityLogo.png'
73Binary files tests/qmltests/UnityLogo.png 2016-06-06 16:03:16 +0000 and tests/qmltests/UnityLogo.png 2014-09-12 20:16:54 +0000 differ73Binary 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

Subscribers

People subscribed via source and target branches