Unity 8

Merge lp://qastaging/~cimi/unity8/use-PageHeader into lp://qastaging/unity8

  1. use-PageHeader
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Rejected
Rejected by: Andrea Cimitan
Proposed branch: lp://qastaging/~cimi/unity8/use-PageHeader
Merge into: lp://qastaging/unity8
Prerequisite: lp://qastaging/~tpeeters/unity8/fixBlackHeader
Diff against target: 29726 lines (+34/-20179)
156 files modified
CMakeLists.txt (+0/-7)
debian/changelog (+0/-146)
debian/control (+0/-29)
plugins/AccountsService/AccountsService.cpp (+0/-367)
plugins/AccountsService/AccountsService.h (+0/-15)
plugins/Dash/CardCreator.js (+0/-73)
plugins/Dash/CardCreatorCache.qml (+0/-4)
plugins/IntegratedLightDM/liblightdm/CMakeLists.txt (+0/-4)
plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp (+0/-32)
plugins/Utils/CMakeLists.txt (+0/-4)
plugins/Utils/plugin.cpp (+0/-8)
po/aa.po (+0/-670)
po/am.po (+0/-182)
po/ar.po (+0/-196)
po/ast.po (+0/-264)
po/az.po (+0/-175)
po/be.po (+0/-197)
po/bg.po (+0/-175)
po/bn.po (+0/-185)
po/br.po (+0/-269)
po/bs.po (+0/-196)
po/ca.po (+0/-265)
po/ca@valencia.po (+0/-196)
po/ce.po (+0/-175)
po/ckb.po (+0/-175)
po/cs.po (+0/-194)
po/cy.po (+0/-194)
po/da.po (+0/-196)
po/de.po (+0/-189)
po/el.po (+0/-201)
po/en_AU.po (+0/-203)
po/en_GB.po (+0/-198)
po/eo.po (+0/-205)
po/es.po (+0/-198)
po/eu.po (+0/-195)
po/fa.po (+0/-197)
po/fi.po (+0/-197)
po/fo.po (+0/-175)
po/fr.po (+0/-206)
po/ga.po (+0/-333)
po/gd.po (+0/-207)
po/gl.po (+0/-194)
po/gv.po (+0/-175)
po/he.po (+0/-184)
po/hi.po (+0/-175)
po/hr.po (+0/-201)
po/hu.po (+0/-198)
po/hy.po (+0/-175)
po/ia.po (+0/-198)
po/id.po (+0/-175)
po/is.po (+0/-175)
po/it.po (+0/-200)
po/ja.po (+0/-175)
po/km.po (+0/-186)
po/kn.po (+0/-175)
po/ko.po (+0/-259)
po/ku.po (+0/-175)
po/ky.po (+0/-175)
po/lo.po (+0/-175)
po/lt.po (+0/-175)
po/lv.po (+0/-194)
po/ml.po (+0/-175)
po/mr.po (+0/-175)
po/ms.po (+0/-196)
po/my.po (+0/-175)
po/nb.po (+0/-196)
po/ne.po (+0/-175)
po/nl.po (+0/-194)
po/nn.po (+0/-175)
po/oc.po (+0/-184)
po/or.po (+0/-175)
po/pa.po (+0/-194)
po/pl.po (+0/-200)
po/pt.po (+0/-196)
po/pt_BR.po (+0/-196)
po/ro.po (+0/-198)
po/ru.po (+0/-197)
po/shn.po (+0/-175)
po/si.po (+0/-175)
po/sk.po (+0/-186)
po/sl.po (+0/-238)
po/sq.po (+0/-189)
po/sr.po (+0/-203)
po/sv.po (+0/-272)
po/sw.po (+0/-184)
po/ta.po (+0/-175)
po/te.po (+0/-175)
po/th.po (+0/-175)
po/tr.po (+0/-197)
po/ug.po (+0/-193)
po/uk.po (+0/-200)
po/unity8.pot (+0/-170)
po/ur.po (+0/-175)
po/uz.po (+0/-175)
po/vi.po (+0/-175)
po/wo.po (+0/-194)
po/xh.po (+0/-175)
po/zh_CN.po (+0/-179)
po/zh_HK.po (+0/-175)
po/zh_TW.po (+0/-189)
qml/Components/Header.qml (+0/-28)
qml/Components/InputMethod.qml (+0/-4)
qml/Components/PhysicalKeysMapper.qml (+0/-12)
qml/Dash/CardGrid.qml (+0/-4)
qml/Dash/CardHorizontalList.qml (+0/-4)
qml/Dash/CardTool.qml (+0/-4)
qml/Dash/CardVerticalJournal.qml (+0/-4)
qml/Dash/DashPageHeader.qml (+26/-32)
qml/Dash/GenericScopeView.qml (+0/-20)
qml/DisabledScreenNotice.qml (+0/-84)
qml/Launcher/Launcher.qml (+0/-23)
qml/OrientedShell.qml (+0/-37)
qml/Panel/Handle.qml (+0/-8)
qml/Panel/IndicatorsMenu.qml (+0/-5)
qml/Shell.qml (+1/-28)
qml/Stages/AbstractStage.qml (+0/-7)
qml/Stages/ApplicationWindow.qml (+0/-10)
qml/Stages/DesktopStage.qml (+0/-47)
qml/Stages/PhoneStage.qml (+0/-9)
qml/Stages/Splash.qml (+7/-19)
qml/Stages/SurfaceContainer.qml (+0/-65)
qml/Stages/TabletStage.qml (+0/-7)
qml/Stages/WindowResizeArea.qml (+0/-18)
qml/Wizard/Pages/10-welcome.qml (+0/-50)
qml/Wizard/Pages/70-passwd-type.qml (+0/-13)
qml/Wizard/Pages/80-finished.qml (+0/-20)
tests/mocks/Unity/Application/ApplicationInfo.cpp (+0/-16)
tests/mocks/Unity/Application/ApplicationInfo.h (+0/-24)
tests/mocks/Unity/Application/ApplicationTestInterface.cpp.OTHER (+0/-117)
tests/mocks/Unity/Application/ApplicationTestInterface.h.OTHER (+0/-45)
tests/mocks/Unity/Application/MirSurface.cpp (+0/-51)
tests/mocks/Unity/Application/MirSurface.h (+0/-30)
tests/mocks/Unity/Application/MirSurfaceItem.h (+0/-5)
tests/mocks/Unity/Application/SurfaceManager.h (+0/-29)
tests/mocks/Unity/Indicators/ModelActionRootState.qml (+0/-16)
tests/mocks/Utils/CMakeLists.txt (+0/-4)
tests/mocks/Utils/plugin.cpp (+0/-8)
tests/plugins/Dash/cardcreator/1.res (+0/-11)
tests/plugins/Dash/cardcreator/10.res (+0/-144)
tests/plugins/Dash/cardcreator/11.res (+0/-219)
tests/plugins/Dash/cardcreator/3.res (+0/-11)
tests/plugins/Dash/cardcreator/5.res (+0/-11)
tests/plugins/Dash/cardcreator/9.res (+0/-5)
tests/plugins/Dash/cardcreatortest.cpp (+0/-31)
tests/plugins/Unity/Launcher/launchermodeltest.cpp (+0/-5)
tests/plugins/Utils/CMakeLists.txt (+0/-4)
tests/qmltests/Components/tst_PhysicalKeysMapper.qml (+0/-8)
tests/qmltests/Dash/tst_GenericScopeView.qml (+0/-34)
tests/qmltests/Panel/tst_Panel.qml (+0/-2)
tests/qmltests/Stages/RecursingChildSessionControl.qml (+0/-41)
tests/qmltests/Stages/tst_DesktopStage.qml (+0/-39)
tests/qmltests/Stages/tst_SurfaceContainer.qml (+0/-107)
tests/qmltests/Wizard/tst_Wizard.qml (+0/-4)
tests/qmltests/tst_DisabledScreenNotice.qml (+0/-20)
tests/qmltests/tst_OrientedShell.qml (+0/-119)
tests/qmltests/tst_Shell.qml (+0/-76)
To merge this branch: bzr merge lp://qastaging/~cimi/unity8/use-PageHeader
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Disapprove
Unity8 CI Bot continuous-integration Needs Fixing
Albert Astals Cid (community) Needs Fixing
Tim Peeters (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+284942@code.qastaging.launchpad.net

Commit message

Use PageHeader instead Ambiance's PageHeadStyle

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * 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?
n/a

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2148
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/269/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2148
http://jenkins.qa.ubuntu.com/job/unity8-ci/7210/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6319/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/625/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1915/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/618/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1810/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1810/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/617/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/616/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6330/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/623/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7210/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Not sure if it's because your branch or because of Tim's but the splash header is blue for some reason, can you investigate why?

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

Nice! Thanks for switching to PageHeader.

The blue text in the header looks like a separate issue to me, independent from header changes, but related to the new palette that we are using in the UITK now.

lp://qastaging/~cimi/unity8/use-PageHeader updated
2149. By Andrea Cimitan

merged trunk

Revision history for this message
Andrea Cimitan (cimi) wrote :

> Not sure if it's because your branch or because of Tim's but the splash header
> is blue for some reason, can you investigate why?
https://code.launchpad.net/~cimi/unity8/selected-to-normal-backgroundText/+merge/287452

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

Looks good to me, nice clean up :)

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

Probably headerContainer.height can also be set to header.height instead of header.implicitHeight.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2149
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/522/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/687/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/710
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/728
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/728
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/724/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/724/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Code looks good, waiting on silo to be available to do testing.

Revision history for this message
Albert Astals Cid (aacid) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
No because it needs new SDK, running them locally, will approve if all is good

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

The tests fail, at least Dash and DashContent have failing tests, please fix.

review: Needs Fixing
lp://qastaging/~cimi/unity8/use-PageHeader updated
2150. By Andrea Cimitan

merged tpeeters branch

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2150
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/554/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/743
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/761
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/761
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/756/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/756/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Seems there's some weird cris-cross, can you merge master?

review: Needs Fixing
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
Text conflict in qml/Stages/Splash.qml
2 conflicts encountered.

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

FAILED: Continuous integration, rev:2150
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/851/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1104/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Text conflict in debian/control
Text conflict in qml/Dash/DashPageHeader.qml
Text conflict in qml/Stages/Splash.qml
3 conflicts encountered.

lp://qastaging/~cimi/unity8/use-PageHeader updated
2151. By Andrea Cimitan

merged trunk

Revision history for this message
Andrea Cimitan (cimi) wrote :

oooh the merge went so bad!

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2151
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1082/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/631
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/631
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/631/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1453
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1419
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1419
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1419/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1419
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1419/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

new branch https://code.launchpad.net/~cimi/unity8/uitkPageHeader/+merge/293608

review: Disapprove

Unmerged revisions

2151. By Andrea Cimitan

merged trunk

2150. By Andrea Cimitan

merged tpeeters branch

2149. By Andrea Cimitan

merged trunk

2148. By Andrea Cimitan

Use new PageHeader

2147. By Andrea Cimitan

merged and removed Header.qml from Components, unused

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches