Merge lp://staging/~zsombi/ubuntu-ui-toolkit/theming-engine-versioner into lp://staging/ubuntu-ui-toolkit/staging
Proposed by
Zsombor Egri
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Zoltan Balogh | ||||
| Approved revision: | 1516 | ||||
| Merged at revision: | 1498 | ||||
| Proposed branch: | lp://staging/~zsombi/ubuntu-ui-toolkit/theming-engine-versioner | ||||
| Merge into: | lp://staging/ubuntu-ui-toolkit/staging | ||||
| Diff against target: |
7437 lines (+5959/-135) 127 files modified
components.api (+33/-5) documentation/ubuntu-theming.qdoc (+76/-4) modules/Ubuntu/Components/10/Button.qml (+2/-2) modules/Ubuntu/Components/11/Button.qml (+1/-0) modules/Ubuntu/Components/AbstractButton.qml (+1/-1) modules/Ubuntu/Components/ActionItem.qml (+1/-1) modules/Ubuntu/Components/AnimatedItem.qml (+1/-0) modules/Ubuntu/Components/AppHeader.qml (+1/-0) modules/Ubuntu/Components/CheckBox.qml (+2/-1) modules/Ubuntu/Components/ListItems/ItemSelector.qml (+1/-0) modules/Ubuntu/Components/ListItems/ProgressionVisual.qml (+1/-0) modules/Ubuntu/Components/MainViewBase.qml (+1/-0) modules/Ubuntu/Components/OptionSelector.qml (+1/-0) modules/Ubuntu/Components/PageTreeNode.qml (+2/-0) modules/Ubuntu/Components/Pickers/DatePicker.qml (+1/-0) modules/Ubuntu/Components/Pickers/Dialer.qml (+1/-0) modules/Ubuntu/Components/Pickers/DialerHand.qml (+1/-0) modules/Ubuntu/Components/Pickers/Picker.qml (+1/-0) modules/Ubuntu/Components/Pickers/PickerDelegate.qml (+1/-0) modules/Ubuntu/Components/Popups/Dialog.qml (+1/-0) modules/Ubuntu/Components/Popups/Popover.qml (+1/-0) modules/Ubuntu/Components/Popups/SheetBase.qml (+1/-0) modules/Ubuntu/Components/ProgressBar10.qml (+1/-0) modules/Ubuntu/Components/PullToRefresh.qml (+1/-0) modules/Ubuntu/Components/Scrollbar.qml (+1/-0) modules/Ubuntu/Components/Slider.qml (+1/-0) modules/Ubuntu/Components/TabBar.qml (+1/-1) modules/Ubuntu/Components/TextArea.qml (+1/-0) modules/Ubuntu/Components/TextCursor.qml (+1/-0) modules/Ubuntu/Components/TextField.qml (+1/-0) modules/Ubuntu/Components/TextInputPopover.qml (+1/-0) modules/Ubuntu/Components/Themes/1.2/Palette.qml (+59/-0) modules/Ubuntu/Components/Themes/1.2/PaletteValues.qml (+76/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ActivityIndicatorStyle.qml (+38/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/BubbleShape.qml (+172/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ButtonForeground.qml (+117/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ButtonStyle.qml (+177/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/CheckBoxStyle.qml (+162/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ComboButtonStyle.qml (+197/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/DatePickerStyle.qml (+164/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/DialerHandStyle.qml (+63/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/DialerStyle.qml (+126/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/DialogForegroundStyle.qml (+28/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/HeadDividerStyle.qml (+53/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/HeaderStyle.qml (+124/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/HighlightMagnifier.qml (+56/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ListItemOptionSelectorStyle.qml (+27/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ListItemStyle.qml (+413/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/MainViewStyle.qml (+59/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/OptionSelectorStyle.qml (+37/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/OverflowPanel.qml (+22/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/PageHeadButton.qml (+70/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/PageHeadStyle.qml (+628/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/Palette.qml (+43/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/PartialColorize.qml (+51/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/PickerDelegateStyle.qml (+57/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/PickerStyle.qml (+136/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/PopoverForegroundStyle.qml (+40/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ProgressBarStyle.qml (+76/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml (+52/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/PullToRefreshStyle.qml (+251/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ScrollbarStyle.qml (+490/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/SheetForegroundStyle.qml (+104/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/SliderStyle.qml (+123/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/SwitchStyle.qml (+235/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/TabBarStyle.qml (+387/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/TextAreaStyle.qml (+66/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/TextCursorStyle.qml (+91/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/TextFieldStyle.qml (+22/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ToolbarButtonStyle.qml (+60/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/ToolbarStyle.qml (+45/-0) modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml (+3/-3) modules/Ubuntu/Components/Themes/Ambiance/1.3/HeaderStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml (+4/-4) modules/Ubuntu/Components/Themes/Ambiance/1.3/TabBarStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/qmldir (+74/-48) modules/Ubuntu/Components/Themes/SuruDark/1.2/MainViewStyle.qml (+22/-0) modules/Ubuntu/Components/Themes/SuruDark/1.2/OptionSelectorStyle.qml (+23/-0) modules/Ubuntu/Components/Themes/SuruDark/1.2/Palette.qml (+43/-0) modules/Ubuntu/Components/Themes/SuruDark/1.2/TabBarStyle.qml (+22/-0) modules/Ubuntu/Components/Themes/SuruDark/1.3/MainViewStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruDark/1.3/OptionSelectorStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruDark/1.3/TabBarStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro (+1/-1) modules/Ubuntu/Components/Themes/SuruDark/qmldir (+4/-1) modules/Ubuntu/Components/Themes/qmldir (+5/-5) modules/Ubuntu/Components/Toolbar.qml (+1/-0) modules/Ubuntu/Components/ToolbarButton.qml (+2/-0) modules/Ubuntu/Components/plugin/plugin.cpp (+9/-0) modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+8/-7) modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h (+1/-1) modules/Ubuntu/Components/plugin/ucnamespace.cpp (+35/-5) modules/Ubuntu/Components/plugin/ucnamespace.h (+43/-2) modules/Ubuntu/Components/plugin/uctheme.cpp (+57/-4) modules/Ubuntu/Components/plugin/uctheme.h (+7/-1) tests/unit/tst_components/tst_components.pro (+2/-1) tests/unit/tst_components/tst_ubuntu_namespace_v12.qml (+35/-0) tests/unit/tst_components/tst_ubuntu_namespace_v13.qml (+60/-0) tests/unit_x11/tst_components/AppTheme/Palette.qml (+2/-2) tests/unit_x11/tst_subtheming/ChangeDefaultPaletteInChildren.qml (+1/-1) tests/unit_x11/tst_subtheming/ChangePaletteValueWhenParentChanges.qml (+1/-1) tests/unit_x11/tst_subtheming/DynamicPalette.qml (+1/-1) tests/unit_x11/tst_subtheming/MultiplePaletteInstances.qml (+1/-1) tests/unit_x11/tst_subtheming/SameNamedPaletteSettings.qml (+1/-1) tests/unit_x11/tst_subtheming/StyledItemV12.qml (+24/-0) tests/unit_x11/tst_subtheming/StyledItemV13.qml (+24/-0) tests/unit_x11/tst_subtheming/themes/CustomTheme/1.3/TestStyle.qml (+21/-0) tests/unit_x11/tst_subtheming/themes/CustomTheme/Palette.qml (+1/-1) tests/unit_x11/tst_subtheming/themes/CustomTheme/TestStyle.qml (+0/-1) tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.3/TestStyle.qml (+21/-0) tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/TestStyle.qml (+0/-2) tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/parent_theme (+0/-1) tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir (+4/-1) tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+30/-0) tests/unit_x11/tst_subtheming/tst_subtheming.pro (+5/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~zsombi/ubuntu-ui-toolkit/theming-engine-versioner | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
Provide versioning for theme loading. Each toolkit must be released with a well defined system theme version, and theme modules must have the same version as the toolkit.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:1511
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://