Ubuntu UI Toolkit

Merge lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming into lp://staging/ubuntu-ui-toolkit

simple_theming
Merge into trunk

Proposed by Florian Boucault on 2013-06-26

Status:

Merged

Approved by:

Zsombor Egri on 2013-07-02

Approved revision:

596

Merged at revision:

572

Proposed branch:

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming

Merge into:

lp://staging/ubuntu-ui-toolkit

Diff against target:

11905 lines (+945/-8385)

168 files modified

CHANGES (+2/-0)
components.api (+12/-19)
debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install (+9/-1)
debian/ubuntu-ui-toolkit-theme.install (+1/-1)
examples/examples.pro (+1/-1)
examples/jokes/jokes.pro (+1/-1)
examples/locale/locale.pro (+1/-1)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro (+1/-1)
examples/unit-converter/unit-converter.pro (+1/-1)
export_modules_dir.sh (+1/-1)
modules/Ubuntu/Components/ActionItem.qml (+1/-1)
modules/Ubuntu/Components/ActivityIndicator.qml (+1/-7)
modules/Ubuntu/Components/AnimatedItem.qml (+1/-1)
modules/Ubuntu/Components/Button.qml (+2/-7)
modules/Ubuntu/Components/CheckBox.qml (+2/-10)
modules/Ubuntu/Components/Components.pro (+1/-1)
modules/Ubuntu/Components/Header.qml (+6/-7)
modules/Ubuntu/Components/Label.qml (+1/-11)
modules/Ubuntu/Components/MainView.qml (+3/-8)
modules/Ubuntu/Components/PageTreeNode.qml (+1/-1)
modules/Ubuntu/Components/Panel.qml (+0/-1)
modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml (+0/-1)
modules/Ubuntu/Components/Popups/Dialog.qml (+16/-18)
modules/Ubuntu/Components/Popups/Pointer.qml (+6/-9)
modules/Ubuntu/Components/Popups/Popover.qml (+9/-12)
modules/Ubuntu/Components/Popups/PopupBase.qml (+2/-7)
modules/Ubuntu/Components/Popups/SheetBase.qml (+5/-19)
modules/Ubuntu/Components/Scrollbar.qml (+4/-10)
modules/Ubuntu/Components/Slider.qml (+10/-15)
modules/Ubuntu/Components/StyledItem.qml (+70/-0)
modules/Ubuntu/Components/Switch.qml (+2/-7)
modules/Ubuntu/Components/Tabs.qml (+6/-11)
modules/Ubuntu/Components/TextArea.qml (+13/-26)
modules/Ubuntu/Components/TextCursor.qml (+5/-3)
modules/Ubuntu/Components/TextField.qml (+13/-12)
modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml (+3/-2)
modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+23/-0)
modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml (+7/-7)
modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml (+10/-6)
modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml (+3/-2)
modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml (+22/-33)
modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml (+5/-5)
modules/Ubuntu/Components/Themes/Ambiance/PointerStyle.qml (+5/-1)
modules/Ubuntu/Components/Themes/Ambiance/PointerStyleShader.qml (+3/-3)
modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml (+40/-40)
modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml (+8/-7)
modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml (+13/-13)
modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml (+13/-11)
modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml (+25/-18)
modules/Ubuntu/Components/Themes/Ambiance/TabsStyle.qml (+30/-31)
modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+16/-20)
modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+8/-8)
modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml (+20/-0)
modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml (+8/-6)
modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml (+3/-4)
modules/Ubuntu/Components/Themes/Ambiance/TransparentButtonStyle.qml (+8/-8)
modules/Ubuntu/Components/Themes/Ambiance/qmldir (+21/-31)
modules/Ubuntu/Components/Themes/Themes.pro (+1/-25)
modules/Ubuntu/Components/Toolbar.qml (+4/-8)
modules/Ubuntu/Components/ToolbarActions.qml (+1/-1)
modules/Ubuntu/Components/ToolbarButton.qml (+2/-6)
modules/Ubuntu/Components/ToolbarItems.qml (+0/-5)
modules/Ubuntu/Components/overview.qdoc (+0/-2)
modules/Ubuntu/Components/plugin/itemstyleattached.cpp (+0/-715)
modules/Ubuntu/Components/plugin/itemstyleattached.h (+0/-76)
modules/Ubuntu/Components/plugin/itemstyleattached_p.h (+0/-75)
modules/Ubuntu/Components/plugin/plugin.cpp (+3/-7)
modules/Ubuntu/Components/plugin/plugin.pro (+4/-17)
modules/Ubuntu/Components/plugin/qmlthemeloader.cpp (+0/-777)
modules/Ubuntu/Components/plugin/qmlthemeloader_p.h (+0/-95)
modules/Ubuntu/Components/plugin/selector.cpp (+0/-339)
modules/Ubuntu/Components/plugin/selector_p.h (+0/-107)
modules/Ubuntu/Components/plugin/stylecache.cpp (+0/-318)
modules/Ubuntu/Components/plugin/stylecache_p.h (+0/-80)
modules/Ubuntu/Components/plugin/themeengine_p.h (+0/-95)
modules/Ubuntu/Components/plugin/themeloader_p.h (+0/-34)
modules/Ubuntu/Components/plugin/ucstyle.cpp (+0/-268)
modules/Ubuntu/Components/plugin/ucstyle.h (+0/-111)
modules/Ubuntu/Components/plugin/uctheme.cpp (+174/-318)
modules/Ubuntu/Components/plugin/uctheme.h (+34/-39)
modules/Ubuntu/Components/plugin/ucthemesettings.cpp (+53/-90)
modules/Ubuntu/Components/plugin/ucthemesettings.h (+19/-16)
modules/Ubuntu/Components/qmldir (+1/-0)
modules/Ubuntu/Components/scrollbarUtils.js (+2/-2)
modules/Ubuntu/Components/ubuntu-components-theming.qdoc (+0/-638)
tests/resources/base.qmltheme (+0/-21)
tests/resources/benchmark.qmltheme (+0/-324)
tests/resources/block.qmltheme (+0/-3)
tests/resources/components.qmltheme (+0/-6)
tests/resources/inheritance.qmltheme (+0/-30)
tests/resources/test.qmltheme (+0/-28)
tests/resources/theme-engine-test.qrc (+0/-6)
tests/resources/toolbar/panels.qml (+0/-1)
tests/resources/urlmacro.qmltheme (+0/-21)
tests/unit/README (+1/-1)
tests/unit/add_makecheck.pri (+1/-1)
tests/unit/runtest.sh (+1/-1)
tests/unit/tst_components/tst_scrollbar.qml (+0/-3)
tests/unit/tst_inversemousearea/tst_inversemouseareatest.cpp (+1/-18)
tests/unit/tst_performance/ButtonGrid.qml (+1/-1)
tests/unit/tst_performance/ButtonStyleGrid.qml (+4/-2)
tests/unit/tst_performance/ButtonsWithStyledGrid.qml (+0/-32)
tests/unit/tst_performance/CheckBoxGrid.qml (+1/-1)
tests/unit/tst_performance/CheckBoxStyleGrid.qml (+4/-2)
tests/unit/tst_performance/CustomTheme.qmltheme (+0/-5)
tests/unit/tst_performance/SliderGrid.qml (+1/-1)
tests/unit/tst_performance/SliderStyleGrid.qml (+6/-4)
tests/unit/tst_performance/SwitchGrid.qml (+1/-1)
tests/unit/tst_performance/SwitchStyleGrid.qml (+4/-2)
tests/unit/tst_performance/tst_performance.cpp (+8/-19)
tests/unit/tst_performance/tst_performance.pro (+4/-6)
tests/unit/tst_theme_engine/BlockPropertyTest.qml (+0/-23)
tests/unit/tst_theme_engine/CustomStyles.qml (+0/-44)
tests/unit/tst_theme_engine/InheritanceTest.qml (+0/-45)
tests/unit/tst_theme_engine/MemoryCleanup.qml (+0/-26)
tests/unit/tst_theme_engine/Parent.qml (+20/-0)
tests/unit/tst_theme_engine/ReparentingTest.qml (+0/-34)
tests/unit/tst_theme_engine/SelectorTest.qml (+0/-37)
tests/unit/tst_theme_engine/StyleLookupCrash.qml (+0/-26)
tests/unit/tst_theme_engine/StyleLookupCrash.qmltheme (+0/-1)
tests/unit/tst_theme_engine/TestModule/TestTheme/TestStyle.qml (+20/-0)
tests/unit/tst_theme_engine/tst_theme_engine.pro (+3/-12)
tests/unit/tst_theme_engine/tst_theme_enginetest.cpp (+59/-356)
tests/unit/tst_theme_engine_private/tst_theme_engine_private.pro (+0/-5)
tests/unit/tst_theme_engine_private/tst_theme_engine_privatetest.cpp (+0/-393)
tests/unit/tst_theme_engine_selector/DescendantSelector.qml (+0/-28)
tests/unit/tst_theme_engine_selector/DescendantSelectorWithName.qml (+0/-29)
tests/unit/tst_theme_engine_selector/DescendantSelectorWithNamedParent.qml (+0/-29)
tests/unit/tst_theme_engine_selector/DirectChildSelector.qml (+0/-26)
tests/unit/tst_theme_engine_selector/DirectChildSelectorWithName.qml (+0/-27)
tests/unit/tst_theme_engine_selector/DirectChildSelectorWithNamedParent.qml (+0/-27)
tests/unit/tst_theme_engine_selector/SimpleSelector.qml (+0/-23)
tests/unit/tst_theme_engine_selector/SimpleSelectorWithName.qml (+0/-24)
tests/unit/tst_theme_engine_selector/TestTheme.qmltheme (+0/-7)
tests/unit/tst_theme_engine_selector/tst_theme_engine_selector.pro (+0/-14)
tests/unit/tst_theme_engine_selector/tst_theme_engine_selectortest.cpp (+0/-399)
tests/unit/tst_theme_engine_style/BindingTest.qml (+0/-37)
tests/unit/tst_theme_engine_style/CustomDelegateComponent.qml (+0/-30)
tests/unit/tst_theme_engine_style/CustomDelegateObject.qml (+0/-26)
tests/unit/tst_theme_engine_style/CustomStyleObject.qml (+0/-26)
tests/unit/tst_theme_engine_style/FontThemeDoNotOverrideUserValue.qml (+0/-23)
tests/unit/tst_theme_engine_style/FontThemeDoNotOverrideUserValue.qmltheme (+0/-3)
tests/unit/tst_theme_engine_style/FontThemeDoNotOverrideUserValueText.qml (+0/-23)
tests/unit/tst_theme_engine_style/FontThemeNoOverride.qml (+0/-22)
tests/unit/tst_theme_engine_style/FontThemeNoOverride.qmltheme (+0/-3)
tests/unit/tst_theme_engine_style/FontThemeNoOverrideText.qml (+0/-22)
tests/unit/tst_theme_engine_style/FontThemeNoOverrideUserBinding.qml (+0/-24)
tests/unit/tst_theme_engine_style/FontThemeNoOverrideUserBinding.qmltheme (+0/-3)
tests/unit/tst_theme_engine_style/FontThemeNoOverrideUserBindingText.qml (+0/-22)
tests/unit/tst_theme_engine_style/FontThemeNoOverrideWithBinding.qml (+0/-22)
tests/unit/tst_theme_engine_style/FontThemeNoOverrideWithBinding.qmltheme (+0/-3)
tests/unit/tst_theme_engine_style/FontThemeNoOverrideWithBindingText.qml (+0/-24)
tests/unit/tst_theme_engine_style/FontThemeOverrideDefaultValue.qml (+0/-22)
tests/unit/tst_theme_engine_style/FontThemeOverrideDefaultValue.qmltheme (+0/-3)
tests/unit/tst_theme_engine_style/FontThemeOverrideDefaultValueText.qml (+0/-23)
tests/unit/tst_theme_engine_style/FontThemeWithOtherDefaultValue.qml (+0/-22)
tests/unit/tst_theme_engine_style/FontThemeWithOtherDefaultValue.qmltheme (+0/-3)
tests/unit/tst_theme_engine_style/FontThemeWithOtherDefaultValueText.qml (+0/-23)
tests/unit/tst_theme_engine_style/StyledItem.qml (+0/-22)
tests/unit/tst_theme_engine_style/TestDocument.qml (+0/-35)
tests/unit/tst_theme_engine_style/tst_theme_engine_style.pro (+0/-13)
tests/unit/tst_theme_engine_style/tst_theme_engine_styletest.cpp (+0/-395)
tests/unit/tst_theme_engine_stylecache/tst_theme_engine_stylecache.pro (+0/-3)
tests/unit/tst_theme_engine_stylecache/tst_theme_engine_stylecachetest.cpp (+0/-220)
tests/unit/unit.pro (+0/-4)
themes/Ambiance/qmltheme/default.qmltheme (+0/-354)
ubuntu-sdk.pro (+1/-1)

To merge this branch:

bzr merge lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming

Related bugs:

Bug #1081038: ItemStyle.path is (null) on start, gets reevaluated on theme change	High	Fix Released
Bug #1137210: Improve theme error handling	Medium	Fix Released
Bug #1152154: [Theming] positioning & stacking of delegates is mostly undefined behaviour	High	Fix Released
Bug #1152158: [Theming] remove "name" property from ItemStyle	Medium	Fix Released
Bug #1152160: [Theming] define a convention file name for application custom theme so that it’s automatically loaded	Medium	Fix Released
Bug #1152161: [Theming] replace @qml-mapping with inline setting of style and delegate	Medium	Fix Released
Bug #1152162: [Theming] Provide @-rule macro to load the current theme	Medium	Fix Released
Bug #1167998: [Theming] grouped properties are not styled	Medium	Fix Released
Bug #1185950: [theme] Loading a custom theme that inherits from the default one breaks the text size of toolbar buttons	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Zsombor Egri		2013-06-27	Needs Fixing on 2013-07-02
PS Jenkins bot	continuous-integration		Approve on 2013-07-01
Florian Boucault (community)			Needs Fixing on 2013-06-27
Review via email: mp+171645@code.staging.launchpad.net

Commit message

Simplified theming infrastructure.

There are no stylesheets anymore (.qmltheme file), only delegates remain. A theme is a QML module containing delegates whose names are standardized.
The default theme is called 'Ambiance' and available from QML through 'import Ubuntu.Components.Themes.Ambiance 0.1'.
The name of the current theme is set in ~/.config/ubuntu-ui-toolkit/theme.ini

Writing a new theme is done by creating a QML module and adding it in the Ubuntu/Components/Themes folder.
A theme inherits from another theme by containing a text file name 'parent_theme' whose first and only line is the name of the parent theme.

* Moved themes/ directory to Ubuntu/Components/Themes so that themes are importable.
* Simplified ThemeEngine and ThemeSettings class, removed the rest of the theming infrastructure (ItemStyle, Style, QmlThemeLoader, Selector, StyleCache).
* Adapted all widgets to use the simplified theming technique:
- new StyledItem class that has a 'style' Component property representing the delegate
- all widgets that have delegates inherit from StyledItem
- all widgets set the 'style' property to the corresponding delegate in the current theme by using Theme.createStyleComponent()
- Ambiance's stylesheet property/values have been moved to where they are used (mostly to the delegates)
- TextAreaDelegate: exposed background as Component property
- Added a delegate specific to TextField: TextFieldDelegate
- Renamed delegates so that they match their widget's name (e.g. EditorCursorDelegate.qml renamed to TextCursorDelegate.qml since it's the delegate of TextCursor.qml)
* Renamed UITK_THEME_PATH into UBUNTU_UI_TOOLKIT_THEMES_PATH.

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-26

565. By Florian Boucault on 2013-06-26: Moved themes under Ubuntu/Components/Themes*
566. By Florian Boucault on 2013-06-26: Removed useless debug.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-26:

FAILED: Continuous integration, rev:564
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/216/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/73/console
FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/73/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-26

567. By Florian Boucault on 2013-06-26: Removed references to qmltheme.
568. By Florian Boucault on 2013-06-26: Updated components.api and CHANGES
569. By Florian Boucault on 2013-06-26: Removed outdated theming documentation.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-26:

FAILED: Continuous integration, rev:568
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/217/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/74/console
FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/74/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-26:

PASSED: Continuous integration, rev:569
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/218/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/75/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2013-06-27:

Before reviewing/merging, the following needs to be done:
- documenting ThemeEngine and StyledItem
- testing on the phone
- adding unit tests for ThemeEngine
- proposing merge requests to fix the following apps that are using ItemStyle:
  * camera-app
  * mediaplayer-app
  * ubuntu-calculator-app
  * phone-app
  * notes-app
  * ubuntu-facebook-app

Optionally we may also want to:
- rename all *Delegate.qml into *Style.qml
- find a better name for the property StyledItem.delegate

review: Needs Fixing

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-27

570. By Florian Boucault on 2013-06-27: tst_performance: set styledItem on delegates.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

PASSED: Continuous integration, rev:570
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/78/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-27

571. By Florian Boucault on 2013-06-27: Documented StyledItem.
572. By Florian Boucault on 2013-06-27: StyledItem: renamed internal delegateLoader into styleLoader.
573. By Florian Boucault on 2013-06-27: Recommend the use of the Style suffix.
574. By Florian Boucault on 2013-06-27: Added documentation for ThemeEngine.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

PASSED: Continuous integration, rev:573
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/222/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/79
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/79/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

PASSED: Continuous integration, rev:574
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/223/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/80/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2013-06-27:

> - find a better name for the property StyledItem.delegate

QtQuick Controls call it as "panel", how about us calling in the same way? they have it as internal, perhaps we should also keep it as such...

Revision history for this message

Zsombor Egri (zsombi) wrote on 2013-06-27:

As we do a major rework of theming, perhaps we should also rename the class name from ThemeEngine to UCTheme

review: Needs Fixing

Revision history for this message

Zsombor Egri (zsombi) wrote on 2013-06-27:

901 + \qmlabstract StyledItem
902 + \inqmlmodule Ubuntu.Components 0.1
903 + \ingroup ubuntu

I think documentation wise StyledItem should belong to theming group.

review: Needs Fixing

Revision history for this message

Zsombor Egri (zsombi) wrote on 2013-06-27:

In StyledItem.qml

944 + Loader {
945 + id: styleLoader
946 + anchors.fill: parent
947 + sourceComponent: style
948 + property Item styledItem: styledItem
949 + }

Shouldn't we display error message if the style loading fails?

review: Needs Fixing

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-27

575. By Florian Boucault on 2013-06-27: Theme.setName should not override the system wide theme.

Revision history for this message

Zsombor Egri (zsombi) wrote on 2013-06-27:

QtQuick Controls style shave "panel" component in styles, so they separate style properties from visuals. In this way you can change the style properties separately from the visuals. What do you think, shouldn't we also have this feature?

On the other hand we have the delegates specifying the styling properties as public properties, so a theme which is based on an other one can simply override the previous theme delegate and change these properties only...

review: Needs Information

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-27

576. By Florian Boucault on 2013-06-27: Renamed StyledItem.delegate into StyledItem.__styleInstance
577. By Florian Boucault on 2013-06-27: Merged trunk

Revision history for this message

Zsombor Egri (zsombi) wrote on 2013-06-27:

Do we really need separate delegate for TextField and TextArea? Those should look the same.. or you wanted to have separate delegate for each styled item in case a theme wants to have different look?

review: Needs Information

Revision history for this message

Zsombor Egri (zsombi) wrote on 2013-06-27:

So far looks good :) Waiting for the rest...

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

FAILED: Continuous integration, rev:575
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/229/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/86/console
FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/86/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-27

578. By Florian Boucault on 2013-06-27: Renamed all theme Delegates into Styles
579. By Florian Boucault on 2013-06-27: Merged trunk
580. By Florian Boucault on 2013-06-27: Fixed components.api
581. By Florian Boucault on 2013-06-27: Renamed ThemeEngine into UCTheme.
Renamed ThemeSettings into UCThemeSettings.
582. By Florian Boucault on 2013-06-27: Moved StyledItem into theming documentation group.

Revision history for this message

Florian Boucault (fboucault) wrote on 2013-06-27:

> As we do a major rework of theming, perhaps we should also rename the class
> name from ThemeEngine to UCTheme

Done.

Revision history for this message

Florian Boucault (fboucault) wrote on 2013-06-27:

> 901 + \qmlabstract StyledItem
> 902 + \inqmlmodule Ubuntu.Components 0.1
> 903 + \ingroup ubuntu
>
> I think documentation wise StyledItem should belong to theming group.

Done.

Revision history for this message

Florian Boucault (fboucault) wrote on 2013-06-27:

> In StyledItem.qml
>
> 944 + Loader {
> 945 + id: styleLoader
> 946 + anchors.fill: parent
> 947 + sourceComponent: style
> 948 + property Item styledItem: styledItem
> 949 + }
>
> Shouldn't we display error message if the style loading fails?

I believe Loader does that already.

Revision history for this message

Florian Boucault (fboucault) wrote on 2013-06-27:

> QtQuick Controls style shave "panel" component in styles, so they separate
> style properties from visuals. In this way you can change the style properties
> separately from the visuals. What do you think, shouldn't we also have this
> feature?
>

I have not found that we need to do that to get the same benefits.

> On the other hand we have the delegates specifying the styling properties as
> public properties, so a theme which is based on an other one can simply
> override the previous theme delegate and change these properties only...

Exactly.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

PASSED: Continuous integration, rev:580
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/231/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/88/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

FAILED: Continuous integration, rev:582
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/232/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/89/console
FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/89/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-27

583. By Florian Boucault on 2013-06-27: Merged trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

PASSED: Continuous integration, rev:583
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/90/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-27

584. By Florian Boucault on 2013-06-27: qtdeclarative5-ubuntu-ui-toolkit-plugin should not install the Themes directory.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

PASSED: Continuous integration, rev:584
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/234/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/91/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-27

585. By Florian Boucault on 2013-06-27: Missing backslash preventing sci files from being installed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

PASSED: Continuous integration, rev:585
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/235/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/92/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-27

586. By Florian Boucault on 2013-06-27: Header height is set by its delegate.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-27:

PASSED: Continuous integration, rev:586
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/236/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/93/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-06-30

587. By Florian Boucault on 2013-06-30: Merged trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-06-30:

PASSED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/245/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/102/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-07-01

588. By Florian Boucault on 2013-06-30: UCTheme: renamed styleUrlForTheme to styleUrl and made it public in prevision for future use in the QQmlExtensionPlugin.
589. By Florian Boucault on 2013-06-30: Removed deprecated documentation.
590. By Florian Boucault on 2013-07-01: Made styleUrl private again. Moved UCTheme registration into the class itself.
591. By Florian Boucault on 2013-07-01: Only expose TextAreaStyle and TextFieldStyle as we are not ready to commit to the APIs of all the Styles.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-01:

PASSED: Continuous integration, rev:588
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/246/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/103/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-07-01

592. By Florian Boucault on 2013-07-01: Added failing test cases.
593. By Florian Boucault on 2013-07-01: Fixed failing tests.
594. By Florian Boucault on 2013-07-01: Removed rogue references to ItemStyle.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-01:

PASSED: Continuous integration, rev:591
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/251/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/108/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-01:

FAILED: Continuous integration, rev:594
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/252/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/109
FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/109/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-07-01

595. By Florian Boucault on 2013-07-01: Merged from trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-01:

PASSED: Continuous integration, rev:595
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/110/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp://staging/~fboucault/ubuntu-ui-toolkit/simple_theming updated on 2013-07-01

596. By Florian Boucault on 2013-07-01: Merged with trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-01:

PASSED: Continuous integration, rev:596
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/254/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/111
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/111/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2013-07-02:

Everything is ready to go.

All apps that need adaptation have MRs ready to land:

* mediaplayer-app https://code.launchpad.net/~fboucault/mediaplayer-app/new_theming/+merge/171887
* camera-app https://code.launchpad.net/~fboucault/camera-app/new_theming/+merge/171886
* notes-app https://code.launchpad.net/~fboucault/notes-app/new_theming/+merge/171885
* phone-app https://code.launchpad.net/~boiko/phone-app/new_theming/+merge/172431

Revision history for this message

Zsombor Egri (zsombi) wrote on 2013-07-02:

Two small things to be fixed still:
- UCTheme::setName(), ::createStyleComponent(), ::styleUrl() and ::parentThemeName() can take const QString& as parameter.
- because of common.pri removal we have two warnings in Layouts.pro and Layouts\plugin.pro. I think we should fix those, either here or in a separate MR.

review: Needs Fixing

Revision history for this message

Zsombor Egri (zsombi) wrote on 2013-07-02:

Not sure whether it has bee brought in by this MR, but we have these errors displayed when opening a Dialog or Popover:
> When launching the toolkit gallery and activating Dialog or Popover (not on
> the Sheet), the following error is printed:
> (kernel/qobject.cpp:2571, QObject::connect) - QObject::connect: Cannot connect
> QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
>
> Would this be an error in Shape?

review: Needs Fixing

Revision history for this message

Florian Boucault (fboucault) wrote on 2013-07-02:

> Not sure whether it has bee brought in by this MR, but we have these errors
> displayed when opening a Dialog or Popover:
> > When launching the toolkit gallery and activating Dialog or Popover (not on
> > the Sheet), the following error is printed:
> > (kernel/qobject.cpp:2571, QObject::connect) - QObject::connect: Cannot
> connect
> > QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
> >
> > Would this be an error in Shape?

Also happens in trunk.

Revision history for this message

Florian Boucault (fboucault) wrote on 2013-07-02:

> Two small things to be fixed still:
> - UCTheme::setName(), ::createStyleComponent(), ::styleUrl() and
> ::parentThemeName() can take const QString& as parameter.

We only have a short window to merge this and the 4 other apps so that the build does not break. Can we avoid this detail? (also note that QStrings are shared implicity therefore no copy is occuring when passing by value)

> - because of common.pri removal we have two warnings in Layouts.pro and
> Layouts\plugin.pro. I think we should fix those, either here or in a separate
> MR.

Why here? the removal of common.pri was done in trunk.