lp:~zsombi/ubuntu-ui-toolkit/separate-uitk-versions
Created by
Zsombor Egri
and last modified
- Get this branch:
- bzr branch lp:~zsombi/ubuntu-ui-toolkit/separate-uitk-versions
Only
Zsombor Egri
can upload to this branch. If you are
Zsombor Egri
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- PS Jenkins bot: Needs Fixing (continuous-integration)
- Cris Dywan: Approve
-
Diff: 21182 lines (+18252/-1101)194 files modifiedcomponents.api (+918/-365)
debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install (+15/-10)
documentation/ubuntu-theming.qdoc (+1/-1)
documentation/ubuntu-ui-toolkit-common.qdocconf (+7/-1)
examples/1.3/1.3.pro (+0/-10)
examples/examples.pro (+7/-20)
examples/locale/locale.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Buttons.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Dialog.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Icons.qml (+2/-2)
examples/ubuntu-ui-toolkit-gallery/ListItems.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Pickers.qml (+12/-1)
examples/ubuntu-ui-toolkit-gallery/Popover.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Sheet.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+1/-1)
modules/Ubuntu/Components/1.0/1.0.pro (+2/-2)
modules/Ubuntu/Components/1.1/1.1.pro (+2/-2)
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 (+1/-1)
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/-5)
modules/Ubuntu/Components/1.2/Page11.qml (+2/-4)
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/AppHeader.qml (+1/-1)
modules/Ubuntu/Components/1.3/Button.qml (+126/-0)
modules/Ubuntu/Components/1.3/ComboButton.qml (+3/-4)
modules/Ubuntu/Components/1.3/DraggingArea.qml (+1/-2)
modules/Ubuntu/Components/1.3/MainView.qml (+1/-1)
modules/Ubuntu/Components/1.3/OptionSelector.qml (+1/-1)
modules/Ubuntu/Components/1.3/OptionSelectorDelegate.qml (+1/-1)
modules/Ubuntu/Components/1.3/Page.qml (+1/-1)
modules/Ubuntu/Components/1.3/PageHeadConfiguration.qml (+32/-3)
modules/Ubuntu/Components/1.3/PageStack.qml (+2/-2)
modules/Ubuntu/Components/1.3/PageTreeNode.qml (+2/-2)
modules/Ubuntu/Components/1.3/PageWrapper.qml (+2/-2)
modules/Ubuntu/Components/1.3/ProgressBar.qml (+56/-2)
modules/Ubuntu/Components/1.3/PullToRefresh.qml (+3/-3)
modules/Ubuntu/Components/1.3/Slider.qml (+1/-2)
modules/Ubuntu/Components/1.3/Tab.qml (+1/-1)
modules/Ubuntu/Components/1.3/Tabs.qml (+3/-2)
modules/Ubuntu/Components/1.3/TextArea.qml (+2/-3)
modules/Ubuntu/Components/1.3/TextCursor.qml (+1/-1)
modules/Ubuntu/Components/1.3/TextField.qml (+2/-2)
modules/Ubuntu/Components/1.3/TextInputPopover.qml (+1/-1)
modules/Ubuntu/Components/1.3/ToolbarItems.qml (+1/-1)
modules/Ubuntu/Components/1.3/UbuntuColors.qml (+132/-0)
modules/Ubuntu/Components/1.3/UbuntuListView.qml (+1/-1)
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/Caption.qml (+1/-1)
modules/Ubuntu/Components/ListItems/1.3/Divider.qml (+1/-1)
modules/Ubuntu/Components/ListItems/1.3/Empty.qml (+2/-2)
modules/Ubuntu/Components/ListItems/1.3/Expandable.qml (+1/-1)
modules/Ubuntu/Components/ListItems/1.3/ExpandablesColumn.qml (+1/-1)
modules/Ubuntu/Components/ListItems/1.3/Header.qml (+1/-1)
modules/Ubuntu/Components/ListItems/1.3/ItemSelector.qml (+1/-1)
modules/Ubuntu/Components/ListItems/1.3/MultiValue.qml (+1/-1)
modules/Ubuntu/Components/ListItems/1.3/SingleControl.qml (+2/-2)
modules/Ubuntu/Components/ListItems/1.3/SingleValue.qml (+1/-1)
modules/Ubuntu/Components/ListItems/1.3/Standard.qml (+1/-1)
modules/Ubuntu/Components/ListItems/1.3/Subtitled.qml (+1/-1)
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/PickerPanel.qml (+2/-2)
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 (+1/-1)
modules/Ubuntu/Components/Popups/1.3/DefaultSheet.qml (+1/-1)
modules/Ubuntu/Components/Popups/1.3/Dialog.qml (+1/-1)
modules/Ubuntu/Components/Popups/1.3/Popover.qml (+2/-2)
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/-69)
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/Ambiance/1.3/DatePickerStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+3/-3)
modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml (+1/-1)
modules/Ubuntu/Components/plugin/plugin.cpp (+9/-1)
modules/Ubuntu/Components/plugin/plugin.h (+1/-0)
modules/Ubuntu/Components/qmldir (+131/-103)
modules/Ubuntu/PerformanceMetrics/BarGraph.qml (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py (+2/-3)
tests/unit/runtest.sh (+1/-1)
tests/unit_x11/tst_components/tst_header_contents_width.qml (+2/-2)
tests/unit_x11/tst_components/tst_pagestack.new_header.qml (+1/-1)
Related bugs
Bug #1447113: Preview UITK version 1.3 conflicts released version 1.2 | Critical | Fix Released |
Related blueprints
Branch information
Recent revisions
- 1532. By Zsombor Egri
-
fix Tab, Tabs and PageTreeNode 1.2 to not to use deprecated AppHeader as property type
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu-ui-toolkit