Merge lp://staging/~zsombi/ubuntu-ui-toolkit/app-theming into lp://staging/ubuntu-ui-toolkit/rtm
Proposed by
Zsombor Egri
| Status: | Rejected |
|---|---|
| Rejected by: | Zoltan Balogh |
| Proposed branch: | lp://staging/~zsombi/ubuntu-ui-toolkit/app-theming |
| Merge into: | lp://staging/ubuntu-ui-toolkit/rtm |
| Diff against target: |
529 lines (+370/-21) 16 files modified
examples/customtheme/customtheme.apparmor (+8/-0) examples/customtheme/customtheme.desktop (+8/-0) examples/customtheme/customtheme.qmlproject (+59/-0) examples/customtheme/main.qml (+103/-0) examples/customtheme/manifest.json (+15/-0) examples/customtheme/theme/Palette.qml (+24/-0) examples/customtheme/theme/parent_theme (+1/-0) modules/Ubuntu/Components/MainView.qml (+16/-0) modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml (+0/-17) modules/Ubuntu/Components/plugin/uctheme.cpp (+4/-2) tests/unit_x11/tst_components/tst_theming.qml (+60/-0) tests/unit_x11/tst_theme_engine/AppTheme/Palette.qml (+24/-0) tests/unit_x11/tst_theme_engine/AppTheme/parent_theme (+1/-0) tests/unit_x11/tst_theme_engine/TestApp.qml (+29/-0) tests/unit_x11/tst_theme_engine/tst_theme_engine.pro (+3/-1) tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp (+15/-1) |
| To merge this branch: | bzr merge lp://staging/~zsombi/ubuntu-ui-toolkit/app-theming |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Peeters | quick look | Approve | |
| Cris Dywan | Approve | ||
|
Review via email:
|
|||
Commit message
Fixing application theming discarded due to auto-theming from MainViewStyle.
Auto-theming moved into MainView and it is applied only on system themes.
Binding loops caused by the auto-theming fixed.
Support for the deprecated SuruGradient theme removed. SuruDark or Ambiance should be used in all appropriate cases.
To post a comment you must log in.
Unmerged revisions
- 1134. By Zsombor Egri
-
roll back unnecessary change on theme not found warning
- 1133. By Zsombor Egri
-
more tests added
- 1132. By Zsombor Egri
-
fixing application theme loading; automatic theme change from style transferred to MainView and made system theme dependent, fixed binding loops and ones detected by Valgrind, also causing application themes to be discarded.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I like it. Not only is the binding loop gone, the colors are also applied consistently on start-up as well as later at runtime.
One thing: the example like that won't be easily importable into QtCreator. But no reason to block on that, to be honest we're not having much of a policy with regard to that anyway and it'll need more discussion.