Merge lp://staging/~canonical-platform-qa/ubuntu-ui-toolkit/systemd into lp://staging/ubuntu-ui-toolkit
Proposed by
Leo Arias
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~canonical-platform-qa/ubuntu-ui-toolkit/systemd |
Merge into: | lp://staging/ubuntu-ui-toolkit |
Diff against target: |
31373 lines (+25294/-1592) (has conflicts) 391 files modified
components.api (+964/-383) debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install (+15/-10) debian/ubuntu-ui-toolkit-theme.install (+17/-1) documentation/ubuntu-theming.qdoc (+77/-5) documentation/ubuntu-ui-toolkit-common.qdocconf (+6/-0) examples/calculator/calculator.qml (+1/-1) examples/calculator/components/DefaultLayout.qml (+1/-1) examples/calculator/components/Functions.qml (+1/-1) examples/examples.pro (+2/-19) examples/jokes/jokes.qml (+1/-1) examples/locale/locale.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/AnimationCircle.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/Animations.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/Buttons.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/Colors.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/Dialog.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/Icons.qml (+3/-3) examples/ubuntu-ui-toolkit-gallery/Label.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/ListItems.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/ListItemsSection.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/Navigation.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/Pickers.qml (+12/-1) examples/ubuntu-ui-toolkit-gallery/Popover.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/Sheet.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/Sliders.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/Template.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/TemplateFlow.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/TextInputs.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/Toggles.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/WebLink.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+2/-7) examples/unit-converter/unit-converter.qml (+7/-8) modules/Ubuntu/Components/1.0/1.0.pro (+2/-2) modules/Ubuntu/Components/1.0/Button.qml (+2/-2) modules/Ubuntu/Components/1.1/1.1.pro (+2/-2) modules/Ubuntu/Components/1.1/Button.qml (+1/-0) modules/Ubuntu/Components/1.1/Haptics.qml (+1/-1) modules/Ubuntu/Components/1.2/1.2.pro (+15/-0) modules/Ubuntu/Components/1.2/AbstractButton.qml (+109/-0) modules/Ubuntu/Components/1.2/ActionItem.qml (+96/-0) modules/Ubuntu/Components/1.2/ActionList.qml (+47/-0) modules/Ubuntu/Components/1.2/ActivityIndicator.qml (+59/-0) modules/Ubuntu/Components/1.2/AnimatedItem.qml (+37/-0) modules/Ubuntu/Components/1.2/AppHeader.qml (+258/-0) modules/Ubuntu/Components/1.2/Captions.qml (+150/-0) modules/Ubuntu/Components/1.2/CheckBox.qml (+53/-0) modules/Ubuntu/Components/1.2/ComboButton.qml (+367/-0) modules/Ubuntu/Components/1.2/CrossFadeImage10.qml (+173/-0) modules/Ubuntu/Components/1.2/CrossFadeImage11.qml (+192/-0) modules/Ubuntu/Components/1.2/DraggingArea.qml (+114/-0) modules/Ubuntu/Components/1.2/Header.qml (+39/-0) modules/Ubuntu/Components/1.2/InputHandler.qml (+518/-0) modules/Ubuntu/Components/1.2/Label.qml (+59/-0) modules/Ubuntu/Components/1.2/MainView.qml (+3/-4) modules/Ubuntu/Components/1.2/MainView12.qml (+163/-0) modules/Ubuntu/Components/1.2/MainViewBase.qml (+83/-0) modules/Ubuntu/Components/1.2/OptionSelector.qml (+297/-0) modules/Ubuntu/Components/1.2/OptionSelectorDelegate.qml (+365/-0) modules/Ubuntu/Components/1.2/OrientationHelper.qml (+205/-0) modules/Ubuntu/Components/1.2/Page10.qml (+32/-4) modules/Ubuntu/Components/1.2/Page11.qml (+3/-5) modules/Ubuntu/Components/1.2/PageHeadConfiguration.qml (+207/-0) modules/Ubuntu/Components/1.2/PageHeadSections.qml (+78/-0) modules/Ubuntu/Components/1.2/PageHeadState.qml (+113/-0) modules/Ubuntu/Components/1.2/PageStack.qml (+304/-0) modules/Ubuntu/Components/1.2/PageTreeNode.qml (+158/-0) modules/Ubuntu/Components/1.2/PageWrapper.qml (+99/-0) modules/Ubuntu/Components/1.2/Panel.qml (+646/-0) modules/Ubuntu/Components/1.2/ProgressBar10.qml (+68/-0) modules/Ubuntu/Components/1.2/ProgressBar11.qml (+21/-0) modules/Ubuntu/Components/1.2/PullToRefresh.qml (+242/-0) modules/Ubuntu/Components/1.2/Scrollbar.qml (+150/-0) modules/Ubuntu/Components/1.2/Slider.qml (+211/-0) modules/Ubuntu/Components/1.2/Switch.qml (+44/-0) modules/Ubuntu/Components/1.2/Tab.qml (+168/-0) modules/Ubuntu/Components/1.2/TabBar.qml (+167/-0) modules/Ubuntu/Components/1.2/Tabs.qml (+448/-0) modules/Ubuntu/Components/1.2/TextArea.qml (+877/-0) modules/Ubuntu/Components/1.2/TextCursor.qml (+318/-0) modules/Ubuntu/Components/1.2/TextField.qml (+1023/-0) modules/Ubuntu/Components/1.2/TextInputPopover.qml (+103/-0) modules/Ubuntu/Components/1.2/Toolbar.qml (+147/-0) modules/Ubuntu/Components/1.2/ToolbarButton.qml (+87/-0) modules/Ubuntu/Components/1.2/ToolbarItems.qml (+224/-0) modules/Ubuntu/Components/1.2/UbuntuListView.qml (+143/-0) modules/Ubuntu/Components/1.2/UbuntuListView11.qml (+33/-0) modules/Ubuntu/Components/1.2/UbuntuNumberAnimation.qml (+56/-0) modules/Ubuntu/Components/1.3/1.3.pro (+15/-0) modules/Ubuntu/Components/1.3/AbstractButton.qml (+1/-1) modules/Ubuntu/Components/1.3/ActionItem.qml (+1/-1) modules/Ubuntu/Components/1.3/ActionList.qml (+1/-1) modules/Ubuntu/Components/1.3/AnimatedItem.qml (+1/-0) modules/Ubuntu/Components/1.3/AppHeader.qml (+2/-1) modules/Ubuntu/Components/1.3/Button.qml (+126/-0) modules/Ubuntu/Components/1.3/Captions.qml (+2/-2) modules/Ubuntu/Components/1.3/CheckBox.qml (+2/-1) modules/Ubuntu/Components/1.3/ComboButton.qml (+10/-11) modules/Ubuntu/Components/1.3/CrossFadeImage.qml (+1/-1) modules/Ubuntu/Components/1.3/DraggingArea.qml (+1/-2) modules/Ubuntu/Components/1.3/InputHandler.qml (+1/-1) modules/Ubuntu/Components/1.3/MainView.qml (+2/-2) modules/Ubuntu/Components/1.3/MainViewBase.qml (+1/-0) modules/Ubuntu/Components/1.3/OptionSelector.qml (+3/-2) modules/Ubuntu/Components/1.3/OptionSelectorDelegate.qml (+3/-3) modules/Ubuntu/Components/1.3/OrientationHelper.qml (+1/-1) modules/Ubuntu/Components/1.3/Page.qml (+1/-1) modules/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc (+2/-2) modules/Ubuntu/Components/1.3/PageHeadConfiguration.qml (+32/-3) modules/Ubuntu/Components/1.3/PageHeadSections.qml (+1/-1) modules/Ubuntu/Components/1.3/PageHeadState.qml (+2/-2) modules/Ubuntu/Components/1.3/PageStack.qml (+4/-4) modules/Ubuntu/Components/1.3/PageTreeNode.qml (+4/-2) modules/Ubuntu/Components/1.3/PageWrapper.qml (+2/-2) modules/Ubuntu/Components/1.3/Panel.qml (+3/-3) modules/Ubuntu/Components/1.3/ProgressBar.qml (+56/-2) modules/Ubuntu/Components/1.3/PullToRefresh.qml (+7/-6) modules/Ubuntu/Components/1.3/Scrollbar.qml (+1/-0) modules/Ubuntu/Components/1.3/Slider.qml (+2/-2) modules/Ubuntu/Components/1.3/Tab.qml (+2/-2) modules/Ubuntu/Components/1.3/TabBar.qml (+1/-1) modules/Ubuntu/Components/1.3/Tabs.qml (+5/-4) modules/Ubuntu/Components/1.3/TextArea.qml (+3/-3) modules/Ubuntu/Components/1.3/TextCursor.qml (+2/-1) modules/Ubuntu/Components/1.3/TextField.qml (+4/-3) modules/Ubuntu/Components/1.3/TextInputPopover.qml (+2/-1) modules/Ubuntu/Components/1.3/Toolbar.qml (+1/-0) modules/Ubuntu/Components/1.3/ToolbarButton.qml (+3/-1) modules/Ubuntu/Components/1.3/ToolbarItems.qml (+4/-4) modules/Ubuntu/Components/1.3/UbuntuColors.qml (+132/-0) modules/Ubuntu/Components/1.3/UbuntuListView.qml (+3/-3) modules/Ubuntu/Components/1.3/UbuntuNumberAnimation.qml (+2/-2) modules/Ubuntu/Components/ComponentModule.pro (+1/-9) modules/Ubuntu/Components/Components.pro (+4/-2) modules/Ubuntu/Components/CrossFadeImage10.qml (+0/-173) modules/Ubuntu/Components/ListItems/1.2/1.2.pro (+15/-0) modules/Ubuntu/Components/ListItems/1.2/Base.qml (+183/-0) modules/Ubuntu/Components/ListItems/1.2/Caption.qml (+59/-0) modules/Ubuntu/Components/ListItems/1.2/Divider.qml (+36/-0) modules/Ubuntu/Components/ListItems/1.2/Empty.qml (+486/-0) modules/Ubuntu/Components/ListItems/1.2/Expandable.qml (+221/-0) modules/Ubuntu/Components/ListItems/1.2/ExpandablesColumn.qml (+131/-0) modules/Ubuntu/Components/ListItems/1.2/Header.qml (+77/-0) modules/Ubuntu/Components/ListItems/1.2/IconVisual.qml (+58/-0) modules/Ubuntu/Components/ListItems/1.2/ImageWithFallback.qml (+46/-0) modules/Ubuntu/Components/ListItems/1.2/ItemSelector.qml (+286/-0) modules/Ubuntu/Components/ListItems/1.2/LabelVisual.qml (+38/-0) modules/Ubuntu/Components/ListItems/1.2/MultiValue.qml (+95/-0) modules/Ubuntu/Components/ListItems/1.2/ProgressionVisual.qml (+29/-0) modules/Ubuntu/Components/ListItems/1.2/SingleControl.qml (+79/-0) modules/Ubuntu/Components/ListItems/1.2/SingleValue.qml (+81/-0) modules/Ubuntu/Components/ListItems/1.2/Standard.qml (+304/-0) modules/Ubuntu/Components/ListItems/1.2/Subtitled.qml (+112/-0) modules/Ubuntu/Components/ListItems/1.2/ThinDivider.qml (+64/-0) modules/Ubuntu/Components/ListItems/1.2/ValueSelector.qml (+297/-0) modules/Ubuntu/Components/ListItems/1.3/1.3.pro (+15/-0) modules/Ubuntu/Components/ListItems/1.3/Base.qml (+1/-1) modules/Ubuntu/Components/ListItems/1.3/Caption.qml (+1/-1) modules/Ubuntu/Components/ListItems/1.3/Divider.qml (+2/-2) modules/Ubuntu/Components/ListItems/1.3/Empty.qml (+3/-3) modules/Ubuntu/Components/ListItems/1.3/Expandable.qml (+3/-3) modules/Ubuntu/Components/ListItems/1.3/ExpandablesColumn.qml (+3/-3) modules/Ubuntu/Components/ListItems/1.3/Header.qml (+1/-1) modules/Ubuntu/Components/ListItems/1.3/IconVisual.qml (+1/-1) modules/Ubuntu/Components/ListItems/1.3/ItemSelector.qml (+2/-1) modules/Ubuntu/Components/ListItems/1.3/MultiValue.qml (+1/-1) modules/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml (+1/-0) modules/Ubuntu/Components/ListItems/1.3/SingleControl.qml (+4/-4) modules/Ubuntu/Components/ListItems/1.3/SingleValue.qml (+1/-1) modules/Ubuntu/Components/ListItems/1.3/Standard.qml (+2/-2) modules/Ubuntu/Components/ListItems/1.3/Subtitled.qml (+2/-2) modules/Ubuntu/Components/ListItems/1.3/ThinDivider.qml (+1/-1) modules/Ubuntu/Components/ListItems/1.3/ValueSelector.qml (+2/-2) modules/Ubuntu/Components/ListItems/ListItems.pro (+5/-25) modules/Ubuntu/Components/ListItems/ListItemsModule.pro (+13/-0) modules/Ubuntu/Components/ListItems/qmldir (+48/-30) modules/Ubuntu/Components/PageHeadConfiguration11.qml (+0/-55) modules/Ubuntu/Components/Pickers/1.2/1.2.pro (+15/-0) modules/Ubuntu/Components/Pickers/1.2/DatePicker.qml (+672/-0) modules/Ubuntu/Components/Pickers/1.2/DayModel.qml (+86/-0) modules/Ubuntu/Components/Pickers/1.2/Dialer.qml (+179/-0) modules/Ubuntu/Components/Pickers/1.2/DialerHand.qml (+224/-0) modules/Ubuntu/Components/Pickers/1.2/DialerHandGroup.qml (+29/-0) modules/Ubuntu/Components/Pickers/1.2/HoursModel.qml (+63/-0) modules/Ubuntu/Components/Pickers/1.2/MinutesModel.qml (+63/-0) modules/Ubuntu/Components/Pickers/1.2/MonthModel.qml (+98/-0) modules/Ubuntu/Components/Pickers/1.2/Picker.qml (+447/-0) modules/Ubuntu/Components/Pickers/1.2/PickerDelegate.qml (+58/-0) modules/Ubuntu/Components/Pickers/1.2/PickerModelBase.qml (+154/-0) modules/Ubuntu/Components/Pickers/1.2/PickerPanel.qml (+267/-0) modules/Ubuntu/Components/Pickers/1.2/PickerRow.qml (+137/-0) modules/Ubuntu/Components/Pickers/1.2/SecondsModel.qml (+63/-0) modules/Ubuntu/Components/Pickers/1.2/YearModel.qml (+69/-0) modules/Ubuntu/Components/Pickers/1.3/1.3.pro (+15/-0) modules/Ubuntu/Components/Pickers/1.3/DatePicker.qml (+5/-4) modules/Ubuntu/Components/Pickers/1.3/DayModel.qml (+1/-1) modules/Ubuntu/Components/Pickers/1.3/Dialer.qml (+1/-0) modules/Ubuntu/Components/Pickers/1.3/DialerHand.qml (+1/-0) modules/Ubuntu/Components/Pickers/1.3/DialerHandGroup.qml (+1/-1) modules/Ubuntu/Components/Pickers/1.3/HoursModel.qml (+1/-1) modules/Ubuntu/Components/Pickers/1.3/MinutesModel.qml (+1/-1) modules/Ubuntu/Components/Pickers/1.3/MonthModel.qml (+1/-1) modules/Ubuntu/Components/Pickers/1.3/Picker.qml (+2/-1) modules/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml (+1/-0) modules/Ubuntu/Components/Pickers/1.3/PickerPanel.qml (+3/-3) modules/Ubuntu/Components/Pickers/1.3/PickerRow.qml (+1/-1) modules/Ubuntu/Components/Pickers/1.3/SecondsModel.qml (+1/-1) modules/Ubuntu/Components/Pickers/1.3/YearModel.qml (+1/-1) modules/Ubuntu/Components/Pickers/Pickers.pro (+5/-25) modules/Ubuntu/Components/Pickers/PickersModule.pro (+14/-0) modules/Ubuntu/Components/Pickers/qmldir (+21/-16) modules/Ubuntu/Components/Popups/1.2/1.2.pro (+15/-0) modules/Ubuntu/Components/Popups/1.2/ActionSelectionPopover.qml (+165/-0) modules/Ubuntu/Components/Popups/1.2/ComposerSheet.qml (+97/-0) modules/Ubuntu/Components/Popups/1.2/DefaultSheet.qml (+104/-0) modules/Ubuntu/Components/Popups/1.2/Dialog.qml (+218/-0) modules/Ubuntu/Components/Popups/1.2/Popover.qml (+300/-0) modules/Ubuntu/Components/Popups/1.2/PopupBase.qml (+261/-0) modules/Ubuntu/Components/Popups/1.2/SheetBase.qml (+113/-0) modules/Ubuntu/Components/Popups/1.2/internalPopupUtils.js (+290/-0) modules/Ubuntu/Components/Popups/1.3/1.3.pro (+15/-0) modules/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml (+1/-1) modules/Ubuntu/Components/Popups/1.3/ComposerSheet.qml (+3/-3) modules/Ubuntu/Components/Popups/1.3/DefaultSheet.qml (+3/-3) modules/Ubuntu/Components/Popups/1.3/Dialog.qml (+3/-2) modules/Ubuntu/Components/Popups/1.3/Popover.qml (+4/-3) modules/Ubuntu/Components/Popups/1.3/PopupBase.qml (+1/-1) modules/Ubuntu/Components/Popups/1.3/SheetBase.qml (+1/-0) modules/Ubuntu/Components/Popups/1.3/internalPopupUtils.js (+5/-5) modules/Ubuntu/Components/Popups/PopupModule.pro (+14/-0) modules/Ubuntu/Components/Popups/Popups.pro (+5/-25) modules/Ubuntu/Components/Popups/qmldir (+27/-17) modules/Ubuntu/Components/ProgressBar10.qml (+0/-68) modules/Ubuntu/Components/ProgressBar11.qdoc (+0/-6) modules/Ubuntu/Components/Styles/1.2/1.2.pro (+11/-0) modules/Ubuntu/Components/Styles/Styles.pro (+4/-25) modules/Ubuntu/Components/Styles/StylesModule.pro (+25/-0) modules/Ubuntu/Components/Styles/qmldir (+5/-3) modules/Ubuntu/Components/Themes/1.2/1.2.pro (+16/-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/1.3/1.3.pro (+14/-0) modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro (+14/-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/1.3.pro (+14/-0) modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml (+4/-4) modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/HeaderStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml (+3/-3) modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml (+3/-3) modules/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml (+70/-79) modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+16/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+3/-3) modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml (+3/-3) modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml (+4/-4) modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/TabBarStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+5/-23) modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro (+20/-0) modules/Ubuntu/Components/Themes/Ambiance/qmldir (+74/-48) modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro (+14/-0) 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/1.3.pro (+14/-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 (+30/-27) modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro (+22/-0) modules/Ubuntu/Components/Themes/SuruDark/qmldir (+4/-1) modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro (+5/-1) modules/Ubuntu/Components/Themes/Themes.pro (+3/-0) modules/Ubuntu/Components/Themes/qmldir (+5/-5) modules/Ubuntu/Components/plugin/plugin.cpp (+18/-1) modules/Ubuntu/Components/plugin/plugin.h (+1/-0) modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp (+1/-1) modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+9/-8) 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/ucstyleditembase.cpp (+9/-6) modules/Ubuntu/Components/plugin/uctheme.cpp (+103/-18) modules/Ubuntu/Components/plugin/uctheme.h (+27/-3) modules/Ubuntu/Components/plugin/ucubuntushape.cpp (+14/-0) modules/Ubuntu/Components/plugin/ucubuntushape.h (+2/-0) modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp (+4/-0) modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h (+1/-0) modules/Ubuntu/Components/qmldir (+131/-104) modules/Ubuntu/PerformanceMetrics/BarGraph.qml (+1/-1) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+8/-4) tests/autopilot/ubuntuuitoolkit/environment.py (+15/-34) tests/autopilot/ubuntuuitoolkit/init_system/__init__.py (+42/-0) tests/autopilot/ubuntuuitoolkit/init_system/systemd.py (+76/-0) tests/autopilot/ubuntuuitoolkit/init_system/upstart.py (+68/-0) tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/test_environment.py (+17/-8) tests/resources/header/automaticColors.qml (+4/-0) tests/resources/ubuntushape/AnimatedShaderEffectSource.qml (+63/-0) tests/unit/runtest.sh (+1/-1) tests/unit/tst_components/tst_CrossFadeImage.qml (+6/-6) 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_components/tst_header_contents_width.qml (+2/-2) tests/unit_x11/tst_components/tst_header_sections.qml (+45/-5) tests/unit_x11/tst_components/tst_pagestack.new_header.qml (+1/-1) tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme (+0/-1) tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir (+1/-1) tests/unit_x11/tst_subtheming/ChangeDefaultPaletteInChildren.qml (+1/-1) tests/unit_x11/tst_subtheming/ChangePaletteValueWhenParentChanges.qml (+1/-1) tests/unit_x11/tst_subtheming/DeprecatedTheme.qml (+25/-0) tests/unit_x11/tst_subtheming/DynamicPalette.qml (+1/-1) tests/unit_x11/tst_subtheming/MultiplePaletteInstances.qml (+1/-1) tests/unit_x11/tst_subtheming/ReparentStyledItemFollowsNewPathOnly.qml (+39/-0) tests/unit_x11/tst_subtheming/SameNamedPaletteSettings.qml (+1/-1) tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml (+24/-0) tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml (+24/-0) tests/unit_x11/tst_subtheming/StyledItemFallback.qml (+24/-0) 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.2/TestStyle.qml (+0/-2) tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.3/TestStyle.qml (+21/-0) 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 (+121/-7) tests/unit_x11/tst_subtheming/tst_subtheming.pro (+12/-2) Text conflict in modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml |
To merge this branch: | bzr merge lp://staging/~canonical-platform-qa/ubuntu-ui-toolkit/systemd |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu SDK team | Pending | ||
Review via email: mp+259209@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2015-05-15.
To post a comment you must log in.