fix-import-versions : Code : Ubuntu UI Toolkit

Get this branch:: bzr branch lp:~zsombi/ubuntu-ui-toolkit/fix-import-versions

Only Zsombor Egri can upload to this branch. If you are Zsombor Egri please log in for upload directions.

Branch merges

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1500

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-05-04

Cris Dywan: Approve on 2015-05-04

Zoltan Balogh: Pending requested 2015-04-25

Diff: 2647 lines (+575/-254)

135 files modified

components.api (+1/-1)
debian/ubuntu-ui-toolkit-theme.install (+17/-1)
documentation/ubuntu-ui-toolkit-common.qdocconf (+1/-1)
examples/1.3/1.3.pro (+10/-0)
examples/1.3/calculator/calculator.qml (+1/-1)
examples/1.3/calculator/components/DefaultLayout.qml (+1/-1)
examples/1.3/calculator/components/Functions.qml (+1/-1)
examples/1.3/jokes/jokes.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/AnimationCircle.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Animations.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Buttons.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Colors.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Dialog.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Icons.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Label.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/ListItemsSection.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Navigation.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/NewListItems.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/OptionSelectors.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Popover.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/ProgressBars.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Sheet.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Sliders.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Template.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TemplateFlow.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TemplateRow.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSection.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TextInputs.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Toggles.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/WebLink.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+1/-6)
examples/1.3/unit-converter/unit-converter.qml (+7/-8)
examples/examples.pro (+1/-5)
modules/Ubuntu/Components/ActionList.qml (+1/-1)
modules/Ubuntu/Components/Captions.qml (+2/-2)
modules/Ubuntu/Components/ComboButton.qml (+7/-7)
modules/Ubuntu/Components/CrossFadeImage10.qml (+1/-1)
modules/Ubuntu/Components/CrossFadeImage11.qml (+1/-1)
modules/Ubuntu/Components/InputHandler.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Base.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Divider.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Empty.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Expandable.qml (+2/-2)
modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml (+2/-2)
modules/Ubuntu/Components/ListItems/IconVisual.qml (+1/-1)
modules/Ubuntu/Components/ListItems/SingleControl.qml (+2/-2)
modules/Ubuntu/Components/ListItems/Standard.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Subtitled.qml (+1/-1)
modules/Ubuntu/Components/MainView.qml (+3/-4)
modules/Ubuntu/Components/MainView12.qml (+1/-1)
modules/Ubuntu/Components/OptionSelector.qml (+1/-1)
modules/Ubuntu/Components/OptionSelectorDelegate.qml (+2/-2)
modules/Ubuntu/Components/OrientationHelper.qml (+1/-1)
modules/Ubuntu/Components/Page10.qml (+1/-0)
modules/Ubuntu/Components/Page11.qml (+2/-2)
modules/Ubuntu/Components/PageHeadConfiguration13.qml (+1/-1)
modules/Ubuntu/Components/PageHeadSections.qml (+1/-1)
modules/Ubuntu/Components/PageHeadState.qml (+2/-2)
modules/Ubuntu/Components/PageStack.qml (+2/-2)
modules/Ubuntu/Components/Panel.qml (+3/-3)
modules/Ubuntu/Components/Pickers/DatePicker.qml (+4/-4)
modules/Ubuntu/Components/Pickers/DayModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/DialerHandGroup.qml (+1/-1)
modules/Ubuntu/Components/Pickers/HoursModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/MinutesModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/MonthModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/Picker.qml (+1/-1)
modules/Ubuntu/Components/Pickers/PickerPanel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/PickerRow.qml (+1/-1)
modules/Ubuntu/Components/Pickers/SecondsModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/YearModel.qml (+1/-1)
modules/Ubuntu/Components/Popups/ComposerSheet.qml (+2/-2)
modules/Ubuntu/Components/Popups/DefaultSheet.qml (+2/-2)
modules/Ubuntu/Components/Popups/Dialog.qml (+1/-1)
modules/Ubuntu/Components/Popups/Popover.qml (+1/-1)
modules/Ubuntu/Components/Popups/PopupBase.qml (+1/-1)
modules/Ubuntu/Components/PullToRefresh.qml (+3/-3)
modules/Ubuntu/Components/Tab.qml (+1/-1)
modules/Ubuntu/Components/Tabs.qml (+2/-2)
modules/Ubuntu/Components/TextField.qml (+1/-1)
modules/Ubuntu/Components/Themes/1.2/1.2.pro (+16/-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.3/1.3.pro (+14/-0)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml (+1/-1)
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/ListItemOptionSelectorStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.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/SuruDark/1.2/1.2.pro (+14/-0)
modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro (+14/-0)
modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro (+30/-27)
modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro (+22/-0)
modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro (+5/-1)
modules/Ubuntu/Components/Themes/Themes.pro (+3/-0)
modules/Ubuntu/Components/ToolbarButton.qml (+1/-1)
modules/Ubuntu/Components/ToolbarItems.qml (+3/-3)
modules/Ubuntu/Components/UbuntuListView.qml (+2/-2)
modules/Ubuntu/Components/UbuntuNumberAnimation.qml (+2/-2)
modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp (+1/-1)
modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+1/-1)
modules/Ubuntu/Components/plugin/uctheme.cpp (+54/-22)
modules/Ubuntu/Components/plugin/uctheme.h (+21/-3)
modules/Ubuntu/Components/qmldir (+0/-1)
tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py (+3/-2)
tests/unit/tst_components/tst_CrossFadeImage.qml (+6/-6)
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/DeprecatedTheme.qml (+25/-0)
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 (+1/-1)
tests/unit_x11/tst_subtheming/StyledItemV13.qml (+1/-1)
tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir (+1/-1)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+43/-9)
tests/unit_x11/tst_subtheming/tst_subtheming.pro (+7/-2)

Critical

Fix Released

Link a bug report

Related blueprints

Branch information

Owner:: Zsombor Egri

Project:: Ubuntu UI Toolkit

Status:: Merged

Recent revisions

1522. By Zsombor Egri on 2015-05-02: styleUrl() refactored, more tests added
1521. By Zsombor Egri on 2015-05-02: fixing app theme handing, removing debug logs
1520. By Zsombor Egri on 2015-05-02: fixing SuruGradient artwork folder
1519. By Zsombor Egri on 2015-05-01: fixing version paths in themes
1518. By Zsombor Egri on 2015-05-01: fixing packaging, adding deprecated SuruGradient theme and handle deprecated themes
1517. By Zsombor Egri on 2015-04-30: proper presentation of versioned theme subfolders
1516. By Zsombor Egri on 2015-04-30: more debug code
1515. By Zsombor Egri on 2015-04-30: enable traces for failures
1514. By Zsombor Egri on 2015-04-30: CI kick
1513. By Zsombor Egri on 2015-04-29: API fixes

»

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

Ubuntu UI Toolkit

lp:~zsombi/ubuntu-ui-toolkit/fix-import-versions

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Subscribers

Ubuntu UI Toolkit

lp:~zsombi/ubuntu-ui-toolkit/fix-import-versions

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers