Merge lp:~zsombi/ubuntu-ui-toolkit/theming-attached into lp:ubuntu-ui-toolkit/staging
Status: | Rejected |
---|---|
Rejected by: | Christian Dywan on 2015-10-08 |
Proposed branch: | lp:~zsombi/ubuntu-ui-toolkit/theming-attached |
Merge into: | lp:ubuntu-ui-toolkit/staging |
Diff against target: |
777 lines (+379/-209) 9 files modified
components.api (+2/-1) src/Ubuntu/Components/plugin/plugin.cpp (+2/-1) src/Ubuntu/Components/plugin/plugin.pri (+4/-2) src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+21/-184) src/Ubuntu/Components/plugin/ucstyleditembase.h (+1/-3) src/Ubuntu/Components/plugin/ucstyleditembase_p.h (+7/-14) src/Ubuntu/Components/plugin/uctheme.cpp (+4/-4) src/Ubuntu/Components/plugin/ucthemingattached.cpp (+257/-0) src/Ubuntu/Components/plugin/ucthemingattached.h (+81/-0) |
To merge this branch: | bzr merge lp:~zsombi/ubuntu-ui-toolkit/theming-attached |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing on 2015-08-06 | |
Christian Dywan | 2015-07-29 | Approve on 2015-07-30 | |
Review via email:
|
Commit message
Detaching theming management from StyledItem to be reused in other cpp types.
Zsombor Egri (zsombi) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1583
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
- 1584. By Zsombor Egri on 2015-07-30
-
segfault fixed
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1584
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
Christian Dywan (kalikiana) wrote : | # |
As discussed, there is no effective change in functionality in StyledItemBase so it's already covered by unit tests. We won't really know if it exposes the theming correctly until we have the first real word user of it, which is going to be the Label in C++ which can't currently inherit from StyledItemBase, so this should be the prerequisite branch.
- 1585. By Zsombor Egri on 2015-08-05
-
staging sync
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1585
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
- 1586. By Zsombor Egri on 2015-08-06
-
simplifying the use of theming
- 1587. By Zsombor Egri on 2015-08-06
-
staging sync
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1587
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
Unmerged revisions
- 1587. By Zsombor Egri on 2015-08-06
-
staging sync
- 1586. By Zsombor Egri on 2015-08-06
-
simplifying the use of theming
- 1585. By Zsombor Egri on 2015-08-05
-
staging sync
- 1584. By Zsombor Egri on 2015-07-30
-
segfault fixed
- 1583. By Zsombor Egri on 2015-07-30
-
renaming styling to theming
- 1582. By Zsombor Egri on 2015-07-30
-
API file fixed
- 1581. By Zsombor Egri on 2015-07-30
-
staging merge
- 1580. By Zsombor Egri on 2015-07-29
-
separation completed
- 1579. By Zsombor Egri on 2015-07-28
-
staging sync
StyledItem was registered twice with the revision 2, so the 1.3 appeared twice in the API file. I fixed that as well.