Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/mainview-bloop into lp:ubuntu-ui-toolkit

  1. mainview-bloop
  2. Merge into trunk
Proposed by Zsombor Egri
Status: Merged
Approved by: Tim Peeters
Approved revision: 937
Merged at revision: 986
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/mainview-bloop
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 31 lines (+10/-3)
1 file modified
modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml (+10/-3)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/mainview-bloop
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
Florian Boucault (community) Approve
Review via email: mp+205407@code.launchpad.net

Commit message

MainView binding loop fix when backgroundColor is changed runtime.

To post a comment you must log in.
Revision history for this message
Zsombor Egri (zsombi) wrote :

To test, add the following to any MainView:

backgroundColor: "brown"

Timer {
    running: true
    onTriggered: {
         gallery.backgroundColor = "white";
    }
}

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:934
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1700/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3026
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/648
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/648/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2662
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3028
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3028/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2758
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2758/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5175
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3765

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1700/rebuild

review: Approve (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

looks good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/592/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3031
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2760/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/195
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2666
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3033
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3033/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2761
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2761/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5177/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3769

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

LGTM, please merge with trunk

Revision history for this message
Florian Boucault (fboucault) :
review: Approve
lp:~zsombi/ubuntu-ui-toolkit/mainview-bloop updated
935. By Zsombor Egri

trunk merge

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:935
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1784/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3492/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3128
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/732/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/732
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/732/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3495/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3130
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5515
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4276

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1784/rebuild

review: Needs Fixing (continuous-integration)
lp:~zsombi/ubuntu-ui-toolkit/mainview-bloop updated
936. By Zsombor Egri

trunk merge

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:936
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1856/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3362
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/804
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/804/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3792
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3792/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3364
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3364/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5733
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4610

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1856/rebuild

review: Approve (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

Tests are running in CI@home for 4 hours already with lots of failures http://pastebin.ubuntu.com/7074800/
Maybe CI@home is broken.

Revision history for this message
Tim Peeters (tpeeters) wrote :

Code looks good, but we have to wait for qt 5.2 to land to fix some failures with android 4.4.

review: Approve
lp:~zsombi/ubuntu-ui-toolkit/mainview-bloop updated
937. By Zsombor Egri

trunk merge

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:937
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1933/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3761
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/881
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/881
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/881/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4244
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3763
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3763/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6062
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5119

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1933/rebuild

review: Approve (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

clock-app AP test OK (2 times)

Revision history for this message
Tim Peeters (tpeeters) wrote :

> clock-app AP test OK (2 times)

3 times 100% OK

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml'
2--- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml 2013-07-12 06:02:43 +0000
3+++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml 2014-03-24 12:20:10 +0000
4@@ -51,11 +51,17 @@
5
6 QtObject {
7 id: internals
8- property bool isLight: ColorUtils.luminance(styledItem.backgroundColor) >= 0.85
9 property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||
10 styledItem.backgroundColor != styledItem.footerColor
11- property string theme: isLight ? "Ambiance" :
12- (isGradient ? "SuruGradient" : "SuruDark")
13+ /*
14+ As we don't know the order the property bindings and onXXXChanged signals are evaluated
15+ we should rely only on one property when changing the theme to avoid intermediate
16+ theme changes due to properties being evaluated separately.
17+
18+ Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
19+ */
20+ property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" :
21+ (isGradient ? "SuruGradient" : "SuruDark")
22 }
23
24 // automatically select the appropriate theme depending on the background colors
25@@ -63,5 +69,6 @@
26 target: Theme
27 property: "name"
28 value: "Ubuntu.Components.Themes.%1".arg(internals.theme)
29+ when: internals.theme !== ""
30 }
31 }

Subscribers

People subscribed via source and target branches

to status/vote changes: