Merge lp:~zsombi/ubuntu-ui-toolkit/toolkit-version into lp:ubuntu-ui-toolkit/staging
- toolkit-version
- Merge into staging
Status: | Merged |
---|---|
Approved by: | Tim Peeters |
Approved revision: | 1014 |
Merged at revision: | 1013 |
Proposed branch: | lp:~zsombi/ubuntu-ui-toolkit/toolkit-version |
Merge into: | lp:ubuntu-ui-toolkit/staging |
Diff against target: |
8019 lines (+1798/-1116) 381 files modified
CHANGES (+1/-0) components.api (+1054/-485) documentation/overview.qdoc (+10/-10) documentation/resolution-independence.qdoc (+3/-3) documentation/snippets/layouts/SimpleLayout.qml (+2/-2) documentation/snippets/layouts/layout1.qml (+2/-2) documentation/snippets/layouts/layout2.qml (+2/-2) documentation/snippets/layouts/layout3.qml (+2/-2) documentation/snippets/layouts/layout6.qml (+2/-2) documentation/snippets/layouts/layout7.qml (+2/-2) documentation/snippets/statesaver/ColorChanger.qml (+1/-1) documentation/snippets/statesaver/MultiplePropertySaver.qml (+1/-1) documentation/snippets/statesaver/PropertyGroupSaver.qml (+1/-1) documentation/snippets/statesaver/PropertyGroupSaver2.qml (+1/-1) documentation/ubuntu-components-listitems.qdoc (+1/-1) documentation/ubuntu-components-pickers.qdoc (+1/-1) documentation/ubuntu-components-popups.qdoc (+1/-1) documentation/ubuntu-components.qdoc (+1/-1) documentation/ubuntu-layouts.qdoc (+6/-1) examples/calculator/calculator.qml (+2/-2) examples/calculator/components/DefaultLayout.qml (+2/-2) examples/calculator/components/Functions.qml (+2/-2) examples/jokes/jokes.qml (+1/-1) examples/locale/locale.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/Label.qml (+1/-1) examples/unit-converter/unit-converter.qml (+1/-1) manual-tests/button.qml (+1/-1) modules/Ubuntu/Components/AbstractButton.qml (+1/-1) modules/Ubuntu/Components/Action.qml (+1/-1) modules/Ubuntu/Components/ActionItem.qml (+1/-1) modules/Ubuntu/Components/ActionList.qml (+1/-1) modules/Ubuntu/Components/ActivityIndicator.qml (+1/-1) modules/Ubuntu/Components/AnimatedItem.qml (+1/-1) modules/Ubuntu/Components/Button.qml (+1/-1) modules/Ubuntu/Components/CheckBox.qml (+1/-1) modules/Ubuntu/Components/CrossFadeImage.qml (+2/-2) modules/Ubuntu/Components/Header.qml (+3/-7) modules/Ubuntu/Components/Icon.qml (+1/-1) modules/Ubuntu/Components/Label.qml (+1/-1) modules/Ubuntu/Components/ListItems/Base.qml (+2/-2) modules/Ubuntu/Components/ListItems/Caption.qml (+3/-3) modules/Ubuntu/Components/ListItems/Divider.qml (+1/-1) modules/Ubuntu/Components/ListItems/Empty.qml (+4/-4) modules/Ubuntu/Components/ListItems/Expandable.qml (+4/-4) modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml (+4/-4) modules/Ubuntu/Components/ListItems/Header.qml (+2/-2) modules/Ubuntu/Components/ListItems/IconVisual.qml (+1/-1) modules/Ubuntu/Components/ListItems/ItemSelector.qml (+3/-3) modules/Ubuntu/Components/ListItems/LabelVisual.qml (+1/-1) modules/Ubuntu/Components/ListItems/MultiValue.qml (+2/-2) modules/Ubuntu/Components/ListItems/ProgressionVisual.qml (+1/-1) modules/Ubuntu/Components/ListItems/SingleControl.qml (+5/-5) modules/Ubuntu/Components/ListItems/SingleValue.qml (+2/-2) modules/Ubuntu/Components/ListItems/Standard.qml (+4/-4) modules/Ubuntu/Components/ListItems/Subtitled.qml (+3/-3) modules/Ubuntu/Components/ListItems/ThinDivider.qml (+2/-2) modules/Ubuntu/Components/ListItems/ValueSelector.qml (+3/-3) modules/Ubuntu/Components/ListItems/qmldir (+18/-0) modules/Ubuntu/Components/MainView.qml (+6/-6) modules/Ubuntu/Components/Object.qml (+1/-1) modules/Ubuntu/Components/OptionSelector.qml (+3/-3) modules/Ubuntu/Components/OptionSelectorDelegate.qml (+3/-3) modules/Ubuntu/Components/OrientationHelper.qml (+4/-4) modules/Ubuntu/Components/Page.qml (+3/-3) modules/Ubuntu/Components/PageStack.qml (+3/-3) modules/Ubuntu/Components/PageTreeNode.qml (+1/-1) modules/Ubuntu/Components/PageWrapper.qml (+1/-1) modules/Ubuntu/Components/Panel.qml (+5/-5) modules/Ubuntu/Components/Pickers/DatePicker.qml (+10/-10) modules/Ubuntu/Components/Pickers/DayModel.qml (+1/-1) modules/Ubuntu/Components/Pickers/Dialer.qml (+3/-3) modules/Ubuntu/Components/Pickers/DialerHand.qml (+2/-2) 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 (+4/-4) modules/Ubuntu/Components/Pickers/PickerDelegate.qml (+2/-2) modules/Ubuntu/Components/Pickers/PickerPanel.qml (+5/-5) 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/Pickers/qmldir (+7/-0) modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml (+3/-3) modules/Ubuntu/Components/Popups/ComposerSheet.qml (+4/-4) modules/Ubuntu/Components/Popups/DefaultSheet.qml (+4/-4) modules/Ubuntu/Components/Popups/Dialog.qml (+4/-4) modules/Ubuntu/Components/Popups/Popover.qml (+5/-5) modules/Ubuntu/Components/Popups/PopupBase.qml (+2/-2) modules/Ubuntu/Components/Popups/SheetBase.qml (+2/-2) modules/Ubuntu/Components/Popups/qmldir (+11/-0) modules/Ubuntu/Components/ProgressBar.qml (+1/-1) modules/Ubuntu/Components/Scrollbar.qml (+1/-1) modules/Ubuntu/Components/Slider.qml (+1/-1) modules/Ubuntu/Components/StyledItem.qml (+1/-1) modules/Ubuntu/Components/Switch.qml (+1/-1) modules/Ubuntu/Components/Tab.qml (+1/-1) modules/Ubuntu/Components/TabBar.qml (+1/-1) modules/Ubuntu/Components/Tabs.qml (+4/-4) modules/Ubuntu/Components/TextArea.qml (+1/-1) modules/Ubuntu/Components/TextField.qml (+2/-2) modules/Ubuntu/Components/TextInputPopover.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml (+1/-1) modules/Ubuntu/Components/Toolbar.qml (+1/-1) modules/Ubuntu/Components/ToolbarButton.qml (+2/-2) modules/Ubuntu/Components/ToolbarItems.qml (+4/-4) modules/Ubuntu/Components/UbuntuListView.qml (+4/-4) modules/Ubuntu/Components/UbuntuNumberAnimation.qml (+5/-5) modules/Ubuntu/Components/UbuntuShape.qml (+5/-5) modules/Ubuntu/Components/plugin/i18n.cpp (+1/-1) modules/Ubuntu/Components/plugin/inversemouseareatype.cpp (+4/-4) modules/Ubuntu/Components/plugin/plugin.cpp (+28/-21) modules/Ubuntu/Components/plugin/plugin.h (+3/-0) modules/Ubuntu/Components/plugin/qquickclipboard.cpp (+1/-1) modules/Ubuntu/Components/plugin/qquickmimedata.cpp (+1/-1) modules/Ubuntu/Components/plugin/ucalarm.cpp (+2/-2) modules/Ubuntu/Components/plugin/ucalarmmodel.cpp (+3/-3) modules/Ubuntu/Components/plugin/ucapplication.cpp (+1/-1) modules/Ubuntu/Components/plugin/ucargument.cpp (+1/-1) modules/Ubuntu/Components/plugin/ucarguments.cpp (+1/-1) modules/Ubuntu/Components/plugin/ucfontutils.cpp (+3/-3) modules/Ubuntu/Components/plugin/ucmousefilters.cpp (+9/-9) modules/Ubuntu/Components/plugin/ucstatesaver.cpp (+2/-2) modules/Ubuntu/Components/plugin/uctheme.cpp (+3/-3) modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp (+1/-1) modules/Ubuntu/Components/plugin/ucunits.cpp (+2/-2) modules/Ubuntu/Components/plugin/ucurihandler.cpp (+1/-1) modules/Ubuntu/Components/qmldir (+41/-0) modules/Ubuntu/Layouts/plugin/ulconditionallayout.cpp (+1/-1) modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp (+1/-1) modules/Ubuntu/Layouts/plugin/ullayouts.cpp (+1/-1) modules/Ubuntu/Layouts/plugin/ulplugin.cpp (+9/-3) modules/Ubuntu/Layouts/plugin/ulplugin.h (+2/-0) modules/Ubuntu/PerformanceMetrics/BarGraph.qml (+2/-2) modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml (+1/-1) modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.cpp (+10/-5) modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.h (+2/-0) modules/Ubuntu/PerformanceMetrics/qmldir (+3/-0) modules/Ubuntu/Test/UbuntuTestCase.qml (+1/-1) modules/Ubuntu/Test/qmldir (+4/-0) run_tests.sh (+4/-2) tests/autopilot/ubuntuuitoolkit/fixture_setup.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py (+21/-21) tests/resources/alarm/AlarmDays.qml (+3/-3) tests/resources/alarm/Alarms.qml (+3/-3) tests/resources/filters/MouseFilters.qml (+1/-1) tests/resources/navigation/MyCustomPage.qml (+1/-1) tests/resources/navigation/PageStack.qml (+2/-2) tests/resources/navigation/RepeaterTabs.qml (+1/-1) tests/resources/navigation/SimpleTabs.qml (+1/-1) tests/resources/navigation/StackWithTabs.qml (+1/-1) tests/resources/navigation/TabView.qml (+1/-1) tests/resources/navigation/Tabs.qml (+2/-2) tests/resources/pickers/DatePickerTest.qml (+2/-2) tests/resources/pickers/PanelTest.qml (+2/-2) tests/resources/pickers/PickerTest.qml (+2/-2) tests/resources/popover/PopoverTest.qml (+3/-3) tests/resources/statesaver/StateSaver.qml (+1/-1) tests/resources/toolbar/LockedToolbar.qml (+1/-1) tests/resources/toolbar/oldToolbarWithActions.qml (+1/-1) tests/resources/toolbar/panels.qml (+1/-1) tests/resources/toolbar/toolbar.qml (+1/-1) tests/resources/urihandler/UriHandlerTest.qml (+1/-1) tests/unit/tst_components/tst_CrossFadeImage.qml (+1/-1) tests/unit/tst_components/tst_abstractbutton.qml (+1/-1) tests/unit/tst_components/tst_action.qml (+1/-1) tests/unit/tst_components/tst_actionitem.qml (+1/-1) tests/unit/tst_components/tst_activityindicator.qml (+1/-1) tests/unit/tst_components/tst_button.qml (+1/-1) tests/unit/tst_components/tst_checkbox.qml (+1/-1) tests/unit/tst_components/tst_clipboard.qml (+1/-1) tests/unit/tst_components/tst_dateutils.qml (+2/-2) tests/unit/tst_components/tst_fontutils.qml (+1/-1) tests/unit/tst_components/tst_label.qml (+1/-1) tests/unit/tst_components/tst_listitems_base.qml (+1/-1) tests/unit/tst_components/tst_listitems_caption.qml (+1/-1) tests/unit/tst_components/tst_listitems_divider.qml (+1/-1) tests/unit/tst_components/tst_listitems_empty.qml (+1/-1) tests/unit/tst_components/tst_listitems_header.qml (+1/-1) tests/unit/tst_components/tst_listitems_multivalue.qml (+1/-1) tests/unit/tst_components/tst_listitems_singlecontrol.qml (+2/-2) tests/unit/tst_components/tst_listitems_singlevalue.qml (+1/-1) tests/unit/tst_components/tst_listitems_subtitled.qml (+1/-1) tests/unit/tst_components/tst_listitems_thindivider.qml (+1/-1) tests/unit/tst_components/tst_listitems_valueselector.qml (+1/-1) tests/unit/tst_components/tst_mainview.qml (+1/-1) tests/unit/tst_components/tst_page.qml (+1/-1) tests/unit/tst_components/tst_pagestack.qml (+1/-1) tests/unit/tst_components/tst_plugin_ucunits.qml (+1/-1) tests/unit/tst_components/tst_popups_actionselectionpopover.qml (+2/-2) tests/unit/tst_components/tst_popups_composersheet.qml (+2/-2) tests/unit/tst_components/tst_popups_defaultsheet.qml (+2/-2) tests/unit/tst_components/tst_popups_dialog.qml (+2/-2) tests/unit/tst_components/tst_popups_popover.qml (+2/-2) tests/unit/tst_components/tst_progressbar.qml (+1/-1) tests/unit/tst_components/tst_quickutils.qml (+2/-2) tests/unit/tst_components/tst_scrollbar.qml (+1/-1) tests/unit/tst_components/tst_slider.qml (+1/-1) tests/unit/tst_components/tst_switch.qml (+1/-1) tests/unit/tst_components/tst_tab.qml (+1/-1) tests/unit/tst_components/tst_toolbaritems.qml (+1/-1) tests/unit/tst_components/tst_ubuntushape.qml (+1/-1) tests/unit/tst_i18n/src/LocalizedApp.qml (+1/-1) tests/unit/tst_mainview/AppName.qml (+1/-1) tests/unit/tst_mainview/LocalStorage.qml (+1/-1) tests/unit/tst_mainview/PageStack.qml (+1/-1) tests/unit/tst_mainview/PageTitle.qml (+1/-1) tests/unit/tst_mainview/TabsTitle.qml (+1/-1) tests/unit/tst_page/AnchorToPage.qml (+1/-1) tests/unit/tst_performance/ButtonGrid.qml (+1/-1) tests/unit/tst_performance/ButtonStyleGrid.qml (+1/-1) tests/unit/tst_performance/CheckBoxGrid.qml (+1/-1) tests/unit/tst_performance/CheckBoxStyleGrid.qml (+1/-1) tests/unit/tst_performance/LabelGrid.qml (+1/-1) tests/unit/tst_performance/PairOfUbuntuShapeGrid.qml (+1/-1) tests/unit/tst_performance/SliderGrid.qml (+1/-1) tests/unit/tst_performance/SliderStyleGrid.qml (+1/-1) tests/unit/tst_performance/SwitchGrid.qml (+1/-1) tests/unit/tst_performance/SwitchStyleGrid.qml (+1/-1) tests/unit/tst_performance/TextWithImport.qml (+1/-1) tests/unit/tst_performance/TextWithImportPopups.qml (+1/-1) tests/unit/tst_performance/UbuntuShapeGrid.qml (+1/-1) tests/unit/tst_qmltemplate/tst_example_benchmark.qml (+1/-1) tests/unit/tst_qmltemplate/tst_example_checks.qml (+1/-1) tests/unit/tst_qmltemplate/tst_example_keyboard.qml (+1/-1) tests/unit/tst_qmltemplate/tst_example_mouse.qml (+1/-1) tests/unit/tst_qmltemplate/tst_example_property.qml (+1/-1) tests/unit/tst_qmltemplate/tst_example_signals.qml (+2/-2) tests/unit/tst_theme/tst_popoverforegroundstyle.qml (+2/-2) tests/unit/tst_ubuntu_shape/no_distortion.qml (+1/-1) tests/unit_x11/tst_components/tst_alarms.qml (+2/-2) tests/unit_x11/tst_components/tst_datepicker.qml (+3/-3) tests/unit_x11/tst_components/tst_dialer.qml (+3/-3) tests/unit_x11/tst_components/tst_expandable.qml (+3/-3) tests/unit_x11/tst_components/tst_expandablescolumn.qml (+3/-3) tests/unit_x11/tst_components/tst_header.qml (+1/-1) tests/unit_x11/tst_components/tst_hide_chrome.qml (+1/-1) tests/unit_x11/tst_components/tst_listitems_itemselector.qml (+3/-3) tests/unit_x11/tst_components/tst_listitems_standard.qml (+2/-2) tests/unit_x11/tst_components/tst_optionselector.qml (+2/-2) tests/unit_x11/tst_components/tst_panel.qml (+1/-1) tests/unit_x11/tst_components/tst_picker.qml (+3/-3) tests/unit_x11/tst_components/tst_pickerpanel.qml (+3/-3) tests/unit_x11/tst_components/tst_tabbar.qml (+1/-1) tests/unit_x11/tst_components/tst_tabs.qml (+1/-1) tests/unit_x11/tst_components/tst_textarea.qml (+2/-2) tests/unit_x11/tst_components/tst_textarea_in_flickable.qml (+1/-1) tests/unit_x11/tst_components/tst_textfield.qml (+1/-1) tests/unit_x11/tst_components/tst_toolbar.qml (+1/-1) tests/unit_x11/tst_components/tst_ubuntulistview.qml (+3/-3) tests/unit_x11/tst_inversemousearea/Defaults.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaClip.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaDoNotPropagateEvents.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaInFlickable.qml (+2/-2) tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml (+2/-2) tests/unit_x11/tst_inversemousearea/InverseMouseAreaInPage.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaNormalEventStack.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTop.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTopNoAccept.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaParentClipped.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaPropagateEvents.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaSensingArea.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaSignals.qml (+1/-1) tests/unit_x11/tst_inversemousearea/InverseMouseAreaTopmostItem.qml (+1/-1) tests/unit_x11/tst_inversemousearea/OverlappedMouseArea.qml (+1/-1) tests/unit_x11/tst_inversemousearea/SensingAreaError.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorAll.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorBottom.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorCenterWithOffset.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorCenteredInDefault.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorFilledMargins.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorFilledReparenting.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorFilledSeparateMargins.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorHorizontalCenter.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorHorizontalCenterOffset.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorLeft.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorRight.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorTop.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorVerticalCenter.qml (+1/-1) tests/unit_x11/tst_layouts/AnchorVerticalCenterOffset.qml (+1/-1) tests/unit_x11/tst_layouts/CurrentLayoutChange.qml (+1/-1) tests/unit_x11/tst_layouts/DefaultLayout.qml (+2/-2) tests/unit_x11/tst_layouts/DialerCrash.qml (+3/-3) tests/unit_x11/tst_layouts/ExcludedItemDeleted.qml (+2/-2) tests/unit_x11/tst_layouts/ExternalLayouts.qml (+2/-2) tests/unit_x11/tst_layouts/ItemInstanceAsProperty.qml (+2/-2) tests/unit_x11/tst_layouts/LaidOutItemsOutsideOfLayout.qml (+1/-1) tests/unit_x11/tst_layouts/LargeLayout.qml (+2/-2) tests/unit_x11/tst_layouts/MediumLayout.qml (+2/-2) tests/unit_x11/tst_layouts/NestedLayouts.qml (+2/-2) tests/unit_x11/tst_layouts/NoLayouts.qml (+2/-2) tests/unit_x11/tst_layouts/OverlaidInItemLayout.qml (+1/-1) tests/unit_x11/tst_layouts/OverlappingCondition.qml (+2/-2) tests/unit_x11/tst_layouts/PositioningOnLayoutChange.qml (+1/-1) tests/unit_x11/tst_layouts/ResizingContainers.qml (+2/-2) tests/unit_x11/tst_layouts/SimpleLayouts.qml (+2/-2) tests/unit_x11/tst_layouts/SizedDefaultLayout.qml (+2/-2) tests/unit_x11/tst_layouts/SmallLayout.qml (+2/-2) tests/unit_x11/tst_mousefilters/AttachedToItem.qml (+1/-1) tests/unit_x11/tst_mousefilters/DoubleClicked.qml (+1/-1) tests/unit_x11/tst_mousefilters/FilterFlickable.qml (+1/-1) tests/unit_x11/tst_mousefilters/FilterFlickableAfter.qml (+1/-1) tests/unit_x11/tst_mousefilters/FilterInverseTextInput.qml (+1/-1) tests/unit_x11/tst_mousefilters/FilterInverseTextInputAfter.qml (+1/-1) tests/unit_x11/tst_mousefilters/FilterInverseTextInputOSKExcluded.qml (+1/-1) tests/unit_x11/tst_mousefilters/FilterInverseTextInputTolerance.qml (+1/-1) tests/unit_x11/tst_mousefilters/FilterTextInput.qml (+1/-1) tests/unit_x11/tst_mousefilters/FilterTextInputAfter.qml (+1/-1) tests/unit_x11/tst_mousefilters/FilterTextInputTolerance.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardComposedEvents.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardDblClickToTransparentMouseArea.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardEventChained.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardToInverseMouseArea.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardToMouseArea.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardToTransparentMouseArea.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardedEventsStoppedInForwards.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardedEventsToTargetBlocked.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardedMouseEvents.qml (+1/-1) tests/unit_x11/tst_mousefilters/ForwardedMouseEventsStopped.qml (+1/-1) tests/unit_x11/tst_mousefilters/Hover.qml (+1/-1) tests/unit_x11/tst_mousefilters/HoverEvent.qml (+1/-1) tests/unit_x11/tst_mousefilters/InverseAttachedToItem.qml (+1/-1) tests/unit_x11/tst_mousefilters/InverseHover.qml (+1/-1) tests/unit_x11/tst_mousefilters/InverseMouseFilterAttachedToNonItem.qml (+1/-1) tests/unit_x11/tst_mousefilters/MouseFilterAttachedToNonItem.qml (+1/-1) tests/unit_x11/tst_mousefilters/PressAndHoldAcceptedEatsClick.qml (+1/-1) tests/unit_x11/tst_mousefilters/PressAndHoldAndClicked.qml (+1/-1) tests/unit_x11/tst_orientation/Defaults.qml (+1/-1) tests/unit_x11/tst_orientation/ManualAngle.qml (+1/-1) tests/unit_x11/tst_recreateview/SimpleApp.qml (+1/-1) tests/unit_x11/tst_statesaver/ComponentsWithStateSavers.qml (+1/-1) tests/unit_x11/tst_statesaver/ComponentsWithStateSaversNoId.qml (+1/-1) tests/unit_x11/tst_statesaver/CustomControl.qml (+1/-1) tests/unit_x11/tst_statesaver/DisabledStateSaver.qml (+1/-1) tests/unit_x11/tst_statesaver/Dynamic.qml (+1/-1) tests/unit_x11/tst_statesaver/FirstComponent.qml (+1/-1) tests/unit_x11/tst_statesaver/GridViewItems.qml (+1/-1) tests/unit_x11/tst_statesaver/InvalidGroupProperty.qml (+1/-1) tests/unit_x11/tst_statesaver/InvalidUID.qml (+1/-1) tests/unit_x11/tst_statesaver/ListViewItems.qml (+1/-1) tests/unit_x11/tst_statesaver/NestedDynamics.qml (+1/-1) tests/unit_x11/tst_statesaver/NormalAppClose.qml (+1/-1) tests/unit_x11/tst_statesaver/RepeaterStates.qml (+1/-1) tests/unit_x11/tst_statesaver/SameIdsInDifferentComponents.qml (+1/-1) tests/unit_x11/tst_statesaver/SaveArrays.qml (+1/-1) tests/unit_x11/tst_statesaver/SaveObject.qml (+1/-1) tests/unit_x11/tst_statesaver/SavePropertyGroups.qml (+1/-1) tests/unit_x11/tst_statesaver/SaveSupportedTypes.qml (+1/-1) tests/unit_x11/tst_statesaver/SecondComponent.qml (+1/-1) tests/unit_x11/tst_statesaver/SimpleApp.qml (+1/-1) tests/unit_x11/tst_statesaver/TwoDynamics.qml (+1/-1) tests/unit_x11/tst_statesaver/ValidGroupProperty.qml (+1/-1) tests/unit_x11/tst_statesaver/ValidUID.qml (+1/-1) tests/unit_x11/tst_test/tst_ubuntutestcase.qml (+1/-1) |
To merge this branch: | bzr merge lp:~zsombi/ubuntu-ui-toolkit/toolkit-version |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Tim Peeters | Approve | ||
Review via email: mp+216763@code.launchpad.net |
Commit message
Moving to import version 1.0, which is the same as version 0.1.
Description of the change
- 1012. By Zsombor Egri
-
CHANGES file updated
- 1013. By Zsombor Egri
-
named import removed as 1.0 version does not have problems with QTBUG-27645
- 1014. By Zsombor Egri
-
gallery rolled back to import 0.1 to make sure we do not break anything
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1011
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1014
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === modified file 'CHANGES' |
2 | --- CHANGES 2014-04-16 11:51:47 +0000 |
3 | +++ CHANGES 2014-04-23 09:21:19 +0000 |
4 | @@ -9,6 +9,7 @@ |
5 | |
6 | API Changes |
7 | *********** |
8 | +* ADDED IN: all modules exported as 0.1 as well as 1.0 version |
9 | * ADDED IN: PickerDelegate: readonly property Picker picker |
10 | * CHANGED IN: OptionSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded |
11 | * CHANGED IN: ItemSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded |
12 | |
13 | === modified file 'components.api' |
14 | --- components.api 2014-04-16 11:51:47 +0000 |
15 | +++ components.api 2014-04-23 09:21:19 +0000 |
16 | @@ -6,32 +6,69 @@ |
17 | property bool hovered |
18 | property bool __acceptEvents |
19 | property internal __mouseArea |
20 | -modules/Ubuntu/Components/Action.qml |
21 | -UnityActions.Action |
22 | - property url iconSource |
23 | - property string iconName |
24 | - property bool visible |
25 | - property Component itemHint |
26 | -modules/Ubuntu/Components/ActionItem.qml |
27 | -StyledItem |
28 | - property Action action |
29 | - property string text |
30 | - property url iconSource |
31 | - property string iconName |
32 | - signal triggered(var value) |
33 | - function trigger(value) |
34 | -modules/Ubuntu/Components/ActionList.qml |
35 | -QtObject |
36 | - default property list<Action> children |
37 | - property list<Action> actions |
38 | -modules/Ubuntu/Components/ActivityIndicator.qml |
39 | -AnimatedItem |
40 | - property bool running |
41 | -modules/Ubuntu/Components/Button.qml |
42 | -AbstractButton |
43 | - property color color |
44 | - property Gradient gradient |
45 | - property string iconPosition |
46 | +modules/Ubuntu/Components/AbstractButton.qml |
47 | +ActionItem |
48 | + signal clicked() |
49 | + signal pressAndHold() |
50 | + property bool pressed |
51 | + property bool hovered |
52 | + property bool __acceptEvents |
53 | + property internal __mouseArea |
54 | +modules/Ubuntu/Components/Action.qml |
55 | +UnityActions.Action |
56 | + property url iconSource |
57 | + property string iconName |
58 | + property bool visible |
59 | + property Component itemHint |
60 | +modules/Ubuntu/Components/Action.qml |
61 | +UnityActions.Action |
62 | + property url iconSource |
63 | + property string iconName |
64 | + property bool visible |
65 | + property Component itemHint |
66 | +modules/Ubuntu/Components/ActionItem.qml |
67 | +StyledItem |
68 | + property Action action |
69 | + property string text |
70 | + property url iconSource |
71 | + property string iconName |
72 | + signal triggered(var value) |
73 | + function trigger(value) |
74 | +modules/Ubuntu/Components/ActionItem.qml |
75 | +StyledItem |
76 | + property Action action |
77 | + property string text |
78 | + property url iconSource |
79 | + property string iconName |
80 | + signal triggered(var value) |
81 | + function trigger(value) |
82 | +modules/Ubuntu/Components/ActionList.qml |
83 | +QtObject |
84 | + default property list<Action> children |
85 | + property list<Action> actions |
86 | +modules/Ubuntu/Components/ActionList.qml |
87 | +QtObject |
88 | + default property list<Action> children |
89 | + property list<Action> actions |
90 | +modules/Ubuntu/Components/ActivityIndicator.qml |
91 | +AnimatedItem |
92 | + property bool running |
93 | +modules/Ubuntu/Components/ActivityIndicator.qml |
94 | +AnimatedItem |
95 | + property bool running |
96 | +modules/Ubuntu/Components/Button.qml |
97 | +AbstractButton |
98 | + property color color |
99 | + property Gradient gradient |
100 | + property string iconPosition |
101 | +modules/Ubuntu/Components/Button.qml |
102 | +AbstractButton |
103 | + property color color |
104 | + property Gradient gradient |
105 | + property string iconPosition |
106 | +modules/Ubuntu/Components/CheckBox.qml |
107 | +AbstractButton |
108 | + property bool checked |
109 | modules/Ubuntu/Components/CheckBox.qml |
110 | AbstractButton |
111 | property bool checked |
112 | @@ -53,255 +90,515 @@ |
113 | readonly property bool running |
114 | property size sourceSize |
115 | readonly property int status |
116 | -modules/Ubuntu/Components/Header.qml |
117 | -StyledItem |
118 | - property bool animate |
119 | - function show() |
120 | - function hide() |
121 | - property string title |
122 | - property Item contents |
123 | - property Flickable flickable |
124 | -modules/Ubuntu/Components/Icon.qml |
125 | -Item |
126 | - property string name |
127 | - property color color |
128 | - property color keyColor |
129 | -modules/Ubuntu/Components/Label.qml |
130 | -Text |
131 | - property string fontSize |
132 | -modules/Ubuntu/Components/ListItems/Base.qml |
133 | -Empty |
134 | - property variant icon |
135 | - property url iconSource |
136 | - property string iconName |
137 | - property url fallbackIconSource |
138 | - property string fallbackIconName |
139 | - property bool progression |
140 | - property bool iconFrame |
141 | - property real __iconWidth |
142 | - property real __iconHeight |
143 | - property real __leftIconMargin |
144 | - property real __rightIconMargin |
145 | - property bool __iconIsItem |
146 | - property internal children |
147 | -modules/Ubuntu/Components/ListItems/Caption.qml |
148 | -Item |
149 | - property string text |
150 | -modules/Ubuntu/Components/ListItems/Divider.qml |
151 | -Image |
152 | -modules/Ubuntu/Components/ListItems/Empty.qml |
153 | -AbstractButton |
154 | - property bool selected |
155 | - property bool highlightWhenPressed |
156 | - property bool removable |
157 | - property bool confirmRemoval |
158 | - readonly property string swipingState |
159 | - readonly property bool waitingConfirmationForRemoval |
160 | - signal itemRemoved |
161 | - property int __height |
162 | - property bool showDivider |
163 | - default property internal children |
164 | - property internal __contents |
165 | - property list<Item> backgroundIndicator |
166 | - property ThinDivider divider |
167 | - property real __contentsMargins |
168 | - function cancelItemRemoval() |
169 | -modules/Ubuntu/Components/ListItems/Expandable.qml |
170 | -Empty |
171 | - property bool expanded |
172 | - property real collapsedHeight |
173 | - property real expandedHeight |
174 | - property bool collapseOnClick |
175 | - default property QtObject children |
176 | -modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml |
177 | -Flickable |
178 | - readonly property Item expandedItem |
179 | - function expandItem(item) |
180 | - function collapse() |
181 | - default property QtObject children |
182 | -modules/Ubuntu/Components/ListItems/Header.qml |
183 | -Item |
184 | - property string text |
185 | - property internal __foregroundColor |
186 | -modules/Ubuntu/Components/ListItems/ItemSelector.qml |
187 | -ListItem.Empty |
188 | - property var model |
189 | - property bool expanded |
190 | - property bool multiSelection |
191 | - property bool colourImage |
192 | - property real containerHeight |
193 | - property int selectedIndex |
194 | - property bool currentlyExpanded |
195 | - readonly property real itemHeight |
196 | - signal delegateClicked(int index) |
197 | - signal expansionCompleted() |
198 | -modules/Ubuntu/Components/ListItems/MultiValue.qml |
199 | -Base |
200 | - property variant values |
201 | -modules/Ubuntu/Components/ListItems/SingleControl.qml |
202 | -Empty |
203 | - property Item control |
204 | - function __updateControl() |
205 | -modules/Ubuntu/Components/ListItems/SingleValue.qml |
206 | -Base |
207 | - property string value |
208 | -modules/Ubuntu/Components/ListItems/Standard.qml |
209 | -Empty |
210 | - property variant icon |
211 | - property url iconSource |
212 | - property string iconName |
213 | - property url fallbackIconSource |
214 | - property string fallbackIconName |
215 | - property bool progression |
216 | - property real __iconWidth |
217 | - property real __iconHeight |
218 | - property real __leftIconMargin |
219 | - property real __rightIconMargin |
220 | - property Item control |
221 | - property bool iconFrame |
222 | - property bool __controlAreaPressed |
223 | - property bool __iconIsItem |
224 | - property internal __foregroundColor |
225 | -modules/Ubuntu/Components/ListItems/Subtitled.qml |
226 | -Base |
227 | - property string text |
228 | - property string subText |
229 | -modules/Ubuntu/Components/ListItems/ThinDivider.qml |
230 | -Image |
231 | -modules/Ubuntu/Components/ListItems/ValueSelector.qml |
232 | -Empty |
233 | - property variant icon |
234 | - property url iconSource |
235 | - property string iconName |
236 | - property url fallbackIconSource |
237 | - property string fallbackIconName |
238 | - property real __iconWidth |
239 | - property real __iconHeight |
240 | - property real __leftIconMargin |
241 | - property real __rightIconMargin |
242 | - property bool iconFrame |
243 | - property variant values |
244 | - property int selectedIndex |
245 | - property bool expanded |
246 | -modules/Ubuntu/Components/MainView.qml |
247 | -PageTreeNode |
248 | - property string applicationName |
249 | - property bool anchorToKeyboard |
250 | - property color headerColor |
251 | - property color backgroundColor |
252 | - property color footerColor |
253 | - property bool automaticOrientation |
254 | - property bool useDeprecatedToolbar |
255 | - default property internal contentsItem |
256 | - property list<Action> actions |
257 | - property UnityActions.ActionManager actionManager |
258 | -modules/Ubuntu/Components/Object.qml |
259 | -QtObject |
260 | - default property internal children |
261 | -modules/Ubuntu/Components/OptionSelector.qml |
262 | -ListItem.Empty |
263 | - property var model |
264 | - property bool expanded |
265 | - property bool multiSelection |
266 | - property bool colourImage |
267 | - property real containerHeight |
268 | - property int selectedIndex |
269 | - property bool currentlyExpanded |
270 | - readonly property real itemHeight |
271 | - signal delegateClicked(int index) |
272 | - signal expansionCompleted() |
273 | -modules/Ubuntu/Components/OptionSelectorDelegate.qml |
274 | -ListItem.Standard |
275 | - property string text |
276 | - property string subText |
277 | - property url icon |
278 | - property url iconSource |
279 | - property string iconName |
280 | - property bool constrainImage |
281 | - property bool colourImage |
282 | - property color assetColour |
283 | - readonly property ListView listView |
284 | - readonly property string fragColourShader |
285 | -modules/Ubuntu/Components/OrientationHelper.qml |
286 | -Item |
287 | - property bool automaticOrientation |
288 | - property bool transitionEnabled |
289 | - property alias rotating |
290 | - property int __orientationAngle |
291 | - property int orientationAngle |
292 | -modules/Ubuntu/Components/Page.qml |
293 | -PageTreeNode |
294 | - property string title |
295 | - property Flickable flickable |
296 | - property list<Action> actions |
297 | -modules/Ubuntu/Components/PageStack.qml |
298 | -PageTreeNode |
299 | - property bool __showHeader |
300 | - property int depth |
301 | - property Item currentPage |
302 | - function push(page, properties) |
303 | - function pop() |
304 | - function clear() |
305 | -modules/Ubuntu/Components/Panel.qml |
306 | -Item |
307 | - default property list<Object> contents |
308 | - property int align |
309 | - property bool opened |
310 | - function open() |
311 | - function close() |
312 | - property int hideTimeout |
313 | - property bool locked |
314 | - property real hintSize |
315 | - property real triggerSize |
316 | - readonly property real position |
317 | - property bool animate |
318 | - readonly property bool animating |
319 | - property bool __closeOnContentsClicks |
320 | - property bool __openOnHover |
321 | - property bool pressed |
322 | -modules/Ubuntu/Components/Pickers/DatePicker.qml |
323 | -StyledItem |
324 | - property string mode |
325 | - property date date |
326 | - property date minimum |
327 | - property date maximum |
328 | - readonly property int year |
329 | - readonly property int month |
330 | - readonly property int day |
331 | - readonly property int week |
332 | - readonly property int hours |
333 | - readonly property int minutes |
334 | - readonly property int seconds |
335 | - property var locale |
336 | - readonly property bool moving |
337 | -modules/Ubuntu/Components/Pickers/Dialer.qml |
338 | -StyledItem |
339 | - property real minimumValue |
340 | - property real maximumValue |
341 | - property real size |
342 | - property real handSpace |
343 | - readonly property Item centerItem |
344 | - property list<var> centerContent |
345 | - readonly property list<DialerHands> hands |
346 | - signal handUpdated(var hand) |
347 | -modules/Ubuntu/Components/Pickers/DialerHand.qml |
348 | -StyledItem |
349 | - property real value |
350 | - property DialerHandGroup hand |
351 | - readonly property Dialer dialer |
352 | - default property list<QtObject> overlay |
353 | - readonly property int index |
354 | - property internal __grabber |
355 | -modules/Ubuntu/Components/Pickers/Picker.qml |
356 | -StyledItem |
357 | - property bool circular |
358 | - property var model |
359 | - property Component delegate |
360 | - property int selectedIndex |
361 | - property bool live |
362 | - readonly property bool moving |
363 | - function positionViewAtIndex(index) |
364 | - property int __clickedIndex |
365 | +modules/Ubuntu/Components/CrossFadeImage.qml |
366 | +Item |
367 | + property url source |
368 | + property int fillMode |
369 | + property int fadeDuration |
370 | + readonly property bool running |
371 | + property size sourceSize |
372 | + readonly property int status |
373 | +modules/Ubuntu/Components/Header.qml |
374 | +StyledItem |
375 | + property bool animate |
376 | + function show() |
377 | + function hide() |
378 | + property string title |
379 | + property Item contents |
380 | + property Flickable flickable |
381 | +modules/Ubuntu/Components/Header.qml |
382 | +StyledItem |
383 | + property bool animate |
384 | + function show() |
385 | + function hide() |
386 | + property string title |
387 | + property Item contents |
388 | + property Flickable flickable |
389 | +modules/Ubuntu/Components/Icon.qml |
390 | +Item |
391 | + property string name |
392 | + property color color |
393 | + property color keyColor |
394 | +modules/Ubuntu/Components/Icon.qml |
395 | +Item |
396 | + property string name |
397 | + property color color |
398 | + property color keyColor |
399 | +modules/Ubuntu/Components/Label.qml |
400 | +Text |
401 | + property string fontSize |
402 | +modules/Ubuntu/Components/Label.qml |
403 | +Text |
404 | + property string fontSize |
405 | +modules/Ubuntu/Components/ListItems/Base.qml |
406 | +Empty |
407 | + property variant icon |
408 | + property url iconSource |
409 | + property string iconName |
410 | + property url fallbackIconSource |
411 | + property string fallbackIconName |
412 | + property bool progression |
413 | + property bool iconFrame |
414 | + property real __iconWidth |
415 | + property real __iconHeight |
416 | + property real __leftIconMargin |
417 | + property real __rightIconMargin |
418 | + property bool __iconIsItem |
419 | + property internal children |
420 | +modules/Ubuntu/Components/ListItems/Base.qml |
421 | +Empty |
422 | + property variant icon |
423 | + property url iconSource |
424 | + property string iconName |
425 | + property url fallbackIconSource |
426 | + property string fallbackIconName |
427 | + property bool progression |
428 | + property bool iconFrame |
429 | + property real __iconWidth |
430 | + property real __iconHeight |
431 | + property real __leftIconMargin |
432 | + property real __rightIconMargin |
433 | + property bool __iconIsItem |
434 | + property internal children |
435 | +modules/Ubuntu/Components/ListItems/Caption.qml |
436 | +Item |
437 | + property string text |
438 | +modules/Ubuntu/Components/ListItems/Caption.qml |
439 | +Item |
440 | + property string text |
441 | +modules/Ubuntu/Components/ListItems/Divider.qml |
442 | +Image |
443 | +modules/Ubuntu/Components/ListItems/Divider.qml |
444 | +Image |
445 | +modules/Ubuntu/Components/ListItems/Empty.qml |
446 | +AbstractButton |
447 | + property bool selected |
448 | + property bool highlightWhenPressed |
449 | + property bool removable |
450 | + property bool confirmRemoval |
451 | + readonly property string swipingState |
452 | + readonly property bool waitingConfirmationForRemoval |
453 | + signal itemRemoved |
454 | + property int __height |
455 | + property bool showDivider |
456 | + default property internal children |
457 | + property internal __contents |
458 | + property list<Item> backgroundIndicator |
459 | + property ThinDivider divider |
460 | + property real __contentsMargins |
461 | + function cancelItemRemoval() |
462 | +modules/Ubuntu/Components/ListItems/Empty.qml |
463 | +AbstractButton |
464 | + property bool selected |
465 | + property bool highlightWhenPressed |
466 | + property bool removable |
467 | + property bool confirmRemoval |
468 | + readonly property string swipingState |
469 | + readonly property bool waitingConfirmationForRemoval |
470 | + signal itemRemoved |
471 | + property int __height |
472 | + property bool showDivider |
473 | + default property internal children |
474 | + property internal __contents |
475 | + property list<Item> backgroundIndicator |
476 | + property ThinDivider divider |
477 | + property real __contentsMargins |
478 | + function cancelItemRemoval() |
479 | +modules/Ubuntu/Components/ListItems/Expandable.qml |
480 | +Empty |
481 | + property bool expanded |
482 | + property real collapsedHeight |
483 | + property real expandedHeight |
484 | + property bool collapseOnClick |
485 | + default property QtObject children |
486 | +modules/Ubuntu/Components/ListItems/Expandable.qml |
487 | +Empty |
488 | + property bool expanded |
489 | + property real collapsedHeight |
490 | + property real expandedHeight |
491 | + property bool collapseOnClick |
492 | + default property QtObject children |
493 | +modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml |
494 | +Flickable |
495 | + readonly property Item expandedItem |
496 | + function expandItem(item) |
497 | + function collapse() |
498 | + default property QtObject children |
499 | +modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml |
500 | +Flickable |
501 | + readonly property Item expandedItem |
502 | + function expandItem(item) |
503 | + function collapse() |
504 | + default property QtObject children |
505 | +modules/Ubuntu/Components/ListItems/Header.qml |
506 | +Item |
507 | + property string text |
508 | + property internal __foregroundColor |
509 | +modules/Ubuntu/Components/ListItems/Header.qml |
510 | +Item |
511 | + property string text |
512 | + property internal __foregroundColor |
513 | +modules/Ubuntu/Components/ListItems/ItemSelector.qml |
514 | +ListItem.Empty |
515 | + property var model |
516 | + property bool expanded |
517 | + property bool multiSelection |
518 | + property bool colourImage |
519 | + property real containerHeight |
520 | + property int selectedIndex |
521 | + property bool currentlyExpanded |
522 | + readonly property real itemHeight |
523 | + signal delegateClicked(int index) |
524 | + signal expansionCompleted() |
525 | +modules/Ubuntu/Components/ListItems/ItemSelector.qml |
526 | +ListItem.Empty |
527 | + property var model |
528 | + property bool expanded |
529 | + property bool multiSelection |
530 | + property bool colourImage |
531 | + property real containerHeight |
532 | + property int selectedIndex |
533 | + property bool currentlyExpanded |
534 | + readonly property real itemHeight |
535 | + signal delegateClicked(int index) |
536 | + signal expansionCompleted() |
537 | +modules/Ubuntu/Components/ListItems/MultiValue.qml |
538 | +Base |
539 | + property variant values |
540 | +modules/Ubuntu/Components/ListItems/MultiValue.qml |
541 | +Base |
542 | + property variant values |
543 | +modules/Ubuntu/Components/ListItems/SingleControl.qml |
544 | +Empty |
545 | + property Item control |
546 | + function __updateControl() |
547 | +modules/Ubuntu/Components/ListItems/SingleControl.qml |
548 | +Empty |
549 | + property Item control |
550 | + function __updateControl() |
551 | +modules/Ubuntu/Components/ListItems/SingleValue.qml |
552 | +Base |
553 | + property string value |
554 | +modules/Ubuntu/Components/ListItems/SingleValue.qml |
555 | +Base |
556 | + property string value |
557 | +modules/Ubuntu/Components/ListItems/Standard.qml |
558 | +Empty |
559 | + property variant icon |
560 | + property url iconSource |
561 | + property string iconName |
562 | + property url fallbackIconSource |
563 | + property string fallbackIconName |
564 | + property bool progression |
565 | + property real __iconWidth |
566 | + property real __iconHeight |
567 | + property real __leftIconMargin |
568 | + property real __rightIconMargin |
569 | + property Item control |
570 | + property bool iconFrame |
571 | + property bool __controlAreaPressed |
572 | + property bool __iconIsItem |
573 | + property internal __foregroundColor |
574 | +modules/Ubuntu/Components/ListItems/Standard.qml |
575 | +Empty |
576 | + property variant icon |
577 | + property url iconSource |
578 | + property string iconName |
579 | + property url fallbackIconSource |
580 | + property string fallbackIconName |
581 | + property bool progression |
582 | + property real __iconWidth |
583 | + property real __iconHeight |
584 | + property real __leftIconMargin |
585 | + property real __rightIconMargin |
586 | + property Item control |
587 | + property bool iconFrame |
588 | + property bool __controlAreaPressed |
589 | + property bool __iconIsItem |
590 | + property internal __foregroundColor |
591 | +modules/Ubuntu/Components/ListItems/Subtitled.qml |
592 | +Base |
593 | + property string text |
594 | + property string subText |
595 | +modules/Ubuntu/Components/ListItems/Subtitled.qml |
596 | +Base |
597 | + property string text |
598 | + property string subText |
599 | +modules/Ubuntu/Components/ListItems/ThinDivider.qml |
600 | +Image |
601 | +modules/Ubuntu/Components/ListItems/ThinDivider.qml |
602 | +Image |
603 | +modules/Ubuntu/Components/ListItems/ValueSelector.qml |
604 | +Empty |
605 | + property variant icon |
606 | + property url iconSource |
607 | + property string iconName |
608 | + property url fallbackIconSource |
609 | + property string fallbackIconName |
610 | + property real __iconWidth |
611 | + property real __iconHeight |
612 | + property real __leftIconMargin |
613 | + property real __rightIconMargin |
614 | + property bool iconFrame |
615 | + property variant values |
616 | + property int selectedIndex |
617 | + property bool expanded |
618 | +modules/Ubuntu/Components/ListItems/ValueSelector.qml |
619 | +Empty |
620 | + property variant icon |
621 | + property url iconSource |
622 | + property string iconName |
623 | + property url fallbackIconSource |
624 | + property string fallbackIconName |
625 | + property real __iconWidth |
626 | + property real __iconHeight |
627 | + property real __leftIconMargin |
628 | + property real __rightIconMargin |
629 | + property bool iconFrame |
630 | + property variant values |
631 | + property int selectedIndex |
632 | + property bool expanded |
633 | +modules/Ubuntu/Components/MainView.qml |
634 | +PageTreeNode |
635 | + property string applicationName |
636 | + property bool anchorToKeyboard |
637 | + property color headerColor |
638 | + property color backgroundColor |
639 | + property color footerColor |
640 | + property bool automaticOrientation |
641 | + property bool useDeprecatedToolbar |
642 | + default property internal contentsItem |
643 | + property list<Action> actions |
644 | + property UnityActions.ActionManager actionManager |
645 | +modules/Ubuntu/Components/MainView.qml |
646 | +PageTreeNode |
647 | + property string applicationName |
648 | + property bool anchorToKeyboard |
649 | + property color headerColor |
650 | + property color backgroundColor |
651 | + property color footerColor |
652 | + property bool automaticOrientation |
653 | + property bool useDeprecatedToolbar |
654 | + default property internal contentsItem |
655 | + property list<Action> actions |
656 | + property UnityActions.ActionManager actionManager |
657 | +modules/Ubuntu/Components/Object.qml |
658 | +QtObject |
659 | + default property internal children |
660 | +modules/Ubuntu/Components/Object.qml |
661 | +QtObject |
662 | + default property internal children |
663 | +modules/Ubuntu/Components/OptionSelector.qml |
664 | +ListItem.Empty |
665 | + property var model |
666 | + property bool expanded |
667 | + property bool multiSelection |
668 | + property bool colourImage |
669 | + property real containerHeight |
670 | + property int selectedIndex |
671 | + property bool currentlyExpanded |
672 | + readonly property real itemHeight |
673 | + signal delegateClicked(int index) |
674 | + signal expansionCompleted() |
675 | +modules/Ubuntu/Components/OptionSelector.qml |
676 | +ListItem.Empty |
677 | + property var model |
678 | + property bool expanded |
679 | + property bool multiSelection |
680 | + property bool colourImage |
681 | + property real containerHeight |
682 | + property int selectedIndex |
683 | + property bool currentlyExpanded |
684 | + readonly property real itemHeight |
685 | + signal delegateClicked(int index) |
686 | + signal expansionCompleted() |
687 | +modules/Ubuntu/Components/OptionSelectorDelegate.qml |
688 | +ListItem.Standard |
689 | + property string text |
690 | + property string subText |
691 | + property url icon |
692 | + property url iconSource |
693 | + property string iconName |
694 | + property bool constrainImage |
695 | + property bool colourImage |
696 | + property color assetColour |
697 | + readonly property ListView listView |
698 | + readonly property string fragColourShader |
699 | +modules/Ubuntu/Components/OptionSelectorDelegate.qml |
700 | +ListItem.Standard |
701 | + property string text |
702 | + property string subText |
703 | + property url icon |
704 | + property url iconSource |
705 | + property string iconName |
706 | + property bool constrainImage |
707 | + property bool colourImage |
708 | + property color assetColour |
709 | + readonly property ListView listView |
710 | + readonly property string fragColourShader |
711 | +modules/Ubuntu/Components/OrientationHelper.qml |
712 | +Item |
713 | + property bool automaticOrientation |
714 | + property bool transitionEnabled |
715 | + property alias rotating |
716 | + property int __orientationAngle |
717 | + property int orientationAngle |
718 | +modules/Ubuntu/Components/OrientationHelper.qml |
719 | +Item |
720 | + property bool automaticOrientation |
721 | + property bool transitionEnabled |
722 | + property alias rotating |
723 | + property int __orientationAngle |
724 | + property int orientationAngle |
725 | +modules/Ubuntu/Components/Page.qml |
726 | +PageTreeNode |
727 | + property string title |
728 | + property Flickable flickable |
729 | + property list<Action> actions |
730 | +modules/Ubuntu/Components/Page.qml |
731 | +PageTreeNode |
732 | + property string title |
733 | + property Flickable flickable |
734 | + property list<Action> actions |
735 | +modules/Ubuntu/Components/PageStack.qml |
736 | +PageTreeNode |
737 | + property bool __showHeader |
738 | + property int depth |
739 | + property Item currentPage |
740 | + function push(page, properties) |
741 | + function pop() |
742 | + function clear() |
743 | +modules/Ubuntu/Components/PageStack.qml |
744 | +PageTreeNode |
745 | + property bool __showHeader |
746 | + property int depth |
747 | + property Item currentPage |
748 | + function push(page, properties) |
749 | + function pop() |
750 | + function clear() |
751 | +modules/Ubuntu/Components/Panel.qml |
752 | +Item |
753 | + default property list<Object> contents |
754 | + property int align |
755 | + property bool opened |
756 | + function open() |
757 | + function close() |
758 | + property int hideTimeout |
759 | + property bool locked |
760 | + property real hintSize |
761 | + property real triggerSize |
762 | + readonly property real position |
763 | + property bool animate |
764 | + readonly property bool animating |
765 | + property bool __closeOnContentsClicks |
766 | + property bool __openOnHover |
767 | + property bool pressed |
768 | +modules/Ubuntu/Components/Panel.qml |
769 | +Item |
770 | + default property list<Object> contents |
771 | + property int align |
772 | + property bool opened |
773 | + function open() |
774 | + function close() |
775 | + property int hideTimeout |
776 | + property bool locked |
777 | + property real hintSize |
778 | + property real triggerSize |
779 | + readonly property real position |
780 | + property bool animate |
781 | + readonly property bool animating |
782 | + property bool __closeOnContentsClicks |
783 | + property bool __openOnHover |
784 | + property bool pressed |
785 | +modules/Ubuntu/Components/Pickers/DatePicker.qml |
786 | +StyledItem |
787 | + property string mode |
788 | + property date date |
789 | + property date minimum |
790 | + property date maximum |
791 | + readonly property int year |
792 | + readonly property int month |
793 | + readonly property int day |
794 | + readonly property int week |
795 | + readonly property int hours |
796 | + readonly property int minutes |
797 | + readonly property int seconds |
798 | + property var locale |
799 | + readonly property bool moving |
800 | +modules/Ubuntu/Components/Pickers/DatePicker.qml |
801 | +StyledItem |
802 | + property string mode |
803 | + property date date |
804 | + property date minimum |
805 | + property date maximum |
806 | + readonly property int year |
807 | + readonly property int month |
808 | + readonly property int day |
809 | + readonly property int week |
810 | + readonly property int hours |
811 | + readonly property int minutes |
812 | + readonly property int seconds |
813 | + property var locale |
814 | + readonly property bool moving |
815 | +modules/Ubuntu/Components/Pickers/Dialer.qml |
816 | +StyledItem |
817 | + property real minimumValue |
818 | + property real maximumValue |
819 | + property real size |
820 | + property real handSpace |
821 | + readonly property Item centerItem |
822 | + property list<var> centerContent |
823 | + readonly property list<DialerHands> hands |
824 | + signal handUpdated(var hand) |
825 | +modules/Ubuntu/Components/Pickers/Dialer.qml |
826 | +StyledItem |
827 | + property real minimumValue |
828 | + property real maximumValue |
829 | + property real size |
830 | + property real handSpace |
831 | + readonly property Item centerItem |
832 | + property list<var> centerContent |
833 | + readonly property list<DialerHands> hands |
834 | + signal handUpdated(var hand) |
835 | +modules/Ubuntu/Components/Pickers/DialerHand.qml |
836 | +StyledItem |
837 | + property real value |
838 | + property DialerHandGroup hand |
839 | + readonly property Dialer dialer |
840 | + default property list<QtObject> overlay |
841 | + readonly property int index |
842 | + property internal __grabber |
843 | +modules/Ubuntu/Components/Pickers/DialerHand.qml |
844 | +StyledItem |
845 | + property real value |
846 | + property DialerHandGroup hand |
847 | + readonly property Dialer dialer |
848 | + default property list<QtObject> overlay |
849 | + readonly property int index |
850 | + property internal __grabber |
851 | +modules/Ubuntu/Components/Pickers/Picker.qml |
852 | +StyledItem |
853 | + property bool circular |
854 | + property var model |
855 | + property Component delegate |
856 | + property int selectedIndex |
857 | + property bool live |
858 | + readonly property bool moving |
859 | + function positionViewAtIndex(index) |
860 | + property int __clickedIndex |
861 | +modules/Ubuntu/Components/Pickers/Picker.qml |
862 | +StyledItem |
863 | + property bool circular |
864 | + property var model |
865 | + property Component delegate |
866 | + property int selectedIndex |
867 | + property bool live |
868 | + readonly property bool moving |
869 | + function positionViewAtIndex(index) |
870 | + property int __clickedIndex |
871 | +modules/Ubuntu/Components/Pickers/PickerDelegate.qml |
872 | +AbstractButton |
873 | + readonly property Picker picker |
874 | modules/Ubuntu/Components/Pickers/PickerDelegate.qml |
875 | AbstractButton |
876 | readonly property Picker picker |
877 | @@ -313,174 +610,414 @@ |
878 | property Item target |
879 | property var actions |
880 | property Component delegate |
881 | -modules/Ubuntu/Components/Popups/ComposerSheet.qml |
882 | -SheetBase |
883 | - signal cancelClicked |
884 | - signal confirmClicked |
885 | -modules/Ubuntu/Components/Popups/DefaultSheet.qml |
886 | -SheetBase |
887 | - property bool doneButton |
888 | - signal closeClicked |
889 | - signal doneClicked |
890 | -modules/Ubuntu/Components/Popups/Dialog.qml |
891 | -PopupBase |
892 | - default property list<Object> contents |
893 | - property string title |
894 | - property string text |
895 | - property Item caller |
896 | - property Item pointerTarget |
897 | - property real edgeMargins |
898 | - property real callerMargin |
899 | - property bool modal |
900 | -modules/Ubuntu/Components/Popups/Popover.qml |
901 | -PopupBase |
902 | - default property list<Object> container |
903 | - property real contentWidth |
904 | - property real contentHeight |
905 | - property Item caller |
906 | - property Item pointerTarget |
907 | - property real edgeMargins |
908 | - property real callerMargin |
909 | - property bool autoClose |
910 | - property Component foregroundStyle |
911 | - function show() |
912 | - function hide() |
913 | - function __makeInvisible() |
914 | -modules/Ubuntu/Components/Popups/PopupBase.qml |
915 | -OrientationHelper |
916 | - property Item dismissArea |
917 | - property bool grabDismissAreaEvents |
918 | - function show() |
919 | - function hide() |
920 | - function __closeIfHidden() |
921 | - function __closePopup() |
922 | - property Item __foreground |
923 | - property bool __closeOnDismissAreaPress |
924 | - property internal __dimBackground |
925 | - property internal __eventGrabber |
926 | -modules/Ubuntu/Components/Popups/SheetBase.qml |
927 | -PopupBase |
928 | - default property list<Object> container |
929 | - property real contentsWidth |
930 | - property real contentsHeight |
931 | - property string title |
932 | - property bool modal |
933 | - property internal __leftButton |
934 | - property internal __rightButton |
935 | -modules/Ubuntu/Components/ProgressBar.qml |
936 | -AnimatedItem |
937 | - property bool indeterminate |
938 | - property real minimumValue |
939 | - property real maximumValue |
940 | - property real value |
941 | -modules/Ubuntu/Components/Scrollbar.qml |
942 | -StyledItem |
943 | - property Flickable flickableItem |
944 | - property int align |
945 | - property bool __interactive |
946 | - property internal __private |
947 | -modules/Ubuntu/Components/Slider.qml |
948 | -StyledItem |
949 | - property real minimumValue |
950 | - property real maximumValue |
951 | - property real value |
952 | - property bool live |
953 | - property bool pressed |
954 | - signal touched(bool onThumb) |
955 | - function formatValue(v) |
956 | - property internal __internals |
957 | -modules/Ubuntu/Components/StyledItem.qml |
958 | -FocusScope |
959 | - property Component style |
960 | - readonly property Item __styleInstance |
961 | -modules/Ubuntu/Components/Switch.qml |
962 | -CheckBox |
963 | -modules/Ubuntu/Components/Tab.qml |
964 | -PageTreeNode |
965 | - property string title |
966 | - property url iconSource |
967 | - property Item page |
968 | - readonly property int index |
969 | - property internal __protected |
970 | -modules/Ubuntu/Components/TabBar.qml |
971 | -StyledItem |
972 | - property Item tabsItem |
973 | - property var model |
974 | - readonly property bool pressed |
975 | - property bool selectionMode |
976 | - property int selectedIndex |
977 | - property bool alwaysSelectionMode |
978 | - property bool animate |
979 | -modules/Ubuntu/Components/Tabs.qml |
980 | -PageTreeNode |
981 | - property int selectedTabIndex |
982 | - readonly property Tab selectedTab |
983 | - readonly property Item currentPage |
984 | - property TabBar tabBar |
985 | - default property list<Item> tabChildren |
986 | - readonly property int count |
987 | - signal modelChanged() |
988 | -modules/Ubuntu/Components/TextArea.qml |
989 | -StyledItem |
990 | - property bool highlighted |
991 | - property string placeholderText |
992 | - readonly property string displayText |
993 | - property bool selectByMouse |
994 | - property bool autoExpand |
995 | - property bool autoSize |
996 | - property int maximumLineCount |
997 | - property real contentWidth |
998 | - property real contentHeight |
999 | - property var popover |
1000 | - property bool activeFocusOnPress |
1001 | - property url baseUrl |
1002 | - property bool canPaste |
1003 | - property bool canRedo |
1004 | - property bool canUndo |
1005 | - property color color |
1006 | - property Component cursorDelegate |
1007 | - property int cursorPosition |
1008 | - property rectangle cursorRectangle |
1009 | - property bool cursorVisible |
1010 | - property enumeration effectiveHorizontalAlignment |
1011 | - property font font |
1012 | - property enumeration horizontalAlignment |
1013 | - property bool inputMethodComposing |
1014 | - property enumeration inputMethodHints |
1015 | - property int length |
1016 | - property int lineCount |
1017 | - property enumeration mouseSelectionMode |
1018 | - property enumeration persistentSelection |
1019 | - property bool readOnly |
1020 | - property enumeration renderType |
1021 | - property string selectedText |
1022 | - property color selectedTextColor |
1023 | - property color selectionColor |
1024 | - property int selectionEnd |
1025 | - property int selectionStart |
1026 | - property string text |
1027 | - property enumeration textFormat |
1028 | - property enumeration verticalAlignment |
1029 | - property enumeration wrapMode |
1030 | - signal linkActivated(string link) |
1031 | - function copy() |
1032 | - function cut() |
1033 | - function deselect() |
1034 | - function insert(position, text) |
1035 | - function positionAt(x, y) |
1036 | - function isRightToLeft(start, end) |
1037 | - function moveCursorSelection(position, mode) |
1038 | - function paste(data) |
1039 | - function positionToRectangle(position) |
1040 | - function redo() |
1041 | - function select(start, end) |
1042 | - function selectAll() |
1043 | - function selectWord() |
1044 | - function getFormattedText(start, end) |
1045 | - function getText(start, end) |
1046 | - function remove(start, end) |
1047 | - function undo() |
1048 | - function forceActiveFocus() |
1049 | +modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml |
1050 | +Popover |
1051 | + property Item target |
1052 | + property var actions |
1053 | + property Component delegate |
1054 | +modules/Ubuntu/Components/Popups/ComposerSheet.qml |
1055 | +SheetBase |
1056 | + signal cancelClicked |
1057 | + signal confirmClicked |
1058 | +modules/Ubuntu/Components/Popups/ComposerSheet.qml |
1059 | +SheetBase |
1060 | + signal cancelClicked |
1061 | + signal confirmClicked |
1062 | +modules/Ubuntu/Components/Popups/DefaultSheet.qml |
1063 | +SheetBase |
1064 | + property bool doneButton |
1065 | + signal closeClicked |
1066 | + signal doneClicked |
1067 | +modules/Ubuntu/Components/Popups/DefaultSheet.qml |
1068 | +SheetBase |
1069 | + property bool doneButton |
1070 | + signal closeClicked |
1071 | + signal doneClicked |
1072 | +modules/Ubuntu/Components/Popups/Dialog.qml |
1073 | +PopupBase |
1074 | + default property list<Object> contents |
1075 | + property string title |
1076 | + property string text |
1077 | + property Item caller |
1078 | + property Item pointerTarget |
1079 | + property real edgeMargins |
1080 | + property real callerMargin |
1081 | + property bool modal |
1082 | +modules/Ubuntu/Components/Popups/Dialog.qml |
1083 | +PopupBase |
1084 | + default property list<Object> contents |
1085 | + property string title |
1086 | + property string text |
1087 | + property Item caller |
1088 | + property Item pointerTarget |
1089 | + property real edgeMargins |
1090 | + property real callerMargin |
1091 | + property bool modal |
1092 | +modules/Ubuntu/Components/Popups/Popover.qml |
1093 | +PopupBase |
1094 | + default property list<Object> container |
1095 | + property real contentWidth |
1096 | + property real contentHeight |
1097 | + property Item caller |
1098 | + property Item pointerTarget |
1099 | + property real edgeMargins |
1100 | + property real callerMargin |
1101 | + property bool autoClose |
1102 | + property Component foregroundStyle |
1103 | + function show() |
1104 | + function hide() |
1105 | + function __makeInvisible() |
1106 | +modules/Ubuntu/Components/Popups/Popover.qml |
1107 | +PopupBase |
1108 | + default property list<Object> container |
1109 | + property real contentWidth |
1110 | + property real contentHeight |
1111 | + property Item caller |
1112 | + property Item pointerTarget |
1113 | + property real edgeMargins |
1114 | + property real callerMargin |
1115 | + property bool autoClose |
1116 | + property Component foregroundStyle |
1117 | + function show() |
1118 | + function hide() |
1119 | + function __makeInvisible() |
1120 | +modules/Ubuntu/Components/Popups/PopupBase.qml |
1121 | +OrientationHelper |
1122 | + property Item dismissArea |
1123 | + property bool grabDismissAreaEvents |
1124 | + function show() |
1125 | + function hide() |
1126 | + function __closeIfHidden() |
1127 | + function __closePopup() |
1128 | + property Item __foreground |
1129 | + property bool __closeOnDismissAreaPress |
1130 | + property internal __dimBackground |
1131 | + property internal __eventGrabber |
1132 | +modules/Ubuntu/Components/Popups/PopupBase.qml |
1133 | +OrientationHelper |
1134 | + property Item dismissArea |
1135 | + property bool grabDismissAreaEvents |
1136 | + function show() |
1137 | + function hide() |
1138 | + function __closeIfHidden() |
1139 | + function __closePopup() |
1140 | + property Item __foreground |
1141 | + property bool __closeOnDismissAreaPress |
1142 | + property internal __dimBackground |
1143 | + property internal __eventGrabber |
1144 | +modules/Ubuntu/Components/Popups/SheetBase.qml |
1145 | +PopupBase |
1146 | + default property list<Object> container |
1147 | + property real contentsWidth |
1148 | + property real contentsHeight |
1149 | + property string title |
1150 | + property bool modal |
1151 | + property internal __leftButton |
1152 | + property internal __rightButton |
1153 | +modules/Ubuntu/Components/Popups/SheetBase.qml |
1154 | +PopupBase |
1155 | + default property list<Object> container |
1156 | + property real contentsWidth |
1157 | + property real contentsHeight |
1158 | + property string title |
1159 | + property bool modal |
1160 | + property internal __leftButton |
1161 | + property internal __rightButton |
1162 | +modules/Ubuntu/Components/ProgressBar.qml |
1163 | +AnimatedItem |
1164 | + property bool indeterminate |
1165 | + property real minimumValue |
1166 | + property real maximumValue |
1167 | + property real value |
1168 | +modules/Ubuntu/Components/ProgressBar.qml |
1169 | +AnimatedItem |
1170 | + property bool indeterminate |
1171 | + property real minimumValue |
1172 | + property real maximumValue |
1173 | + property real value |
1174 | +modules/Ubuntu/Components/Scrollbar.qml |
1175 | +StyledItem |
1176 | + property Flickable flickableItem |
1177 | + property int align |
1178 | + property bool __interactive |
1179 | + property internal __private |
1180 | +modules/Ubuntu/Components/Scrollbar.qml |
1181 | +StyledItem |
1182 | + property Flickable flickableItem |
1183 | + property int align |
1184 | + property bool __interactive |
1185 | + property internal __private |
1186 | +modules/Ubuntu/Components/Slider.qml |
1187 | +StyledItem |
1188 | + property real minimumValue |
1189 | + property real maximumValue |
1190 | + property real value |
1191 | + property bool live |
1192 | + property bool pressed |
1193 | + signal touched(bool onThumb) |
1194 | + function formatValue(v) |
1195 | + property internal __internals |
1196 | +modules/Ubuntu/Components/Slider.qml |
1197 | +StyledItem |
1198 | + property real minimumValue |
1199 | + property real maximumValue |
1200 | + property real value |
1201 | + property bool live |
1202 | + property bool pressed |
1203 | + signal touched(bool onThumb) |
1204 | + function formatValue(v) |
1205 | + property internal __internals |
1206 | +modules/Ubuntu/Components/StyledItem.qml |
1207 | +FocusScope |
1208 | + property Component style |
1209 | + readonly property Item __styleInstance |
1210 | +modules/Ubuntu/Components/StyledItem.qml |
1211 | +FocusScope |
1212 | + property Component style |
1213 | + readonly property Item __styleInstance |
1214 | +modules/Ubuntu/Components/Switch.qml |
1215 | +CheckBox |
1216 | +modules/Ubuntu/Components/Switch.qml |
1217 | +CheckBox |
1218 | +modules/Ubuntu/Components/Tab.qml |
1219 | +PageTreeNode |
1220 | + property string title |
1221 | + property url iconSource |
1222 | + property Item page |
1223 | + readonly property int index |
1224 | + property internal __protected |
1225 | +modules/Ubuntu/Components/Tab.qml |
1226 | +PageTreeNode |
1227 | + property string title |
1228 | + property url iconSource |
1229 | + property Item page |
1230 | + readonly property int index |
1231 | + property internal __protected |
1232 | +modules/Ubuntu/Components/TabBar.qml |
1233 | +StyledItem |
1234 | + property Item tabsItem |
1235 | + property var model |
1236 | + readonly property bool pressed |
1237 | + property bool selectionMode |
1238 | + property int selectedIndex |
1239 | + property bool alwaysSelectionMode |
1240 | + property bool animate |
1241 | +modules/Ubuntu/Components/TabBar.qml |
1242 | +StyledItem |
1243 | + property Item tabsItem |
1244 | + property var model |
1245 | + readonly property bool pressed |
1246 | + property bool selectionMode |
1247 | + property int selectedIndex |
1248 | + property bool alwaysSelectionMode |
1249 | + property bool animate |
1250 | +modules/Ubuntu/Components/Tabs.qml |
1251 | +PageTreeNode |
1252 | + property int selectedTabIndex |
1253 | + readonly property Tab selectedTab |
1254 | + readonly property Item currentPage |
1255 | + property TabBar tabBar |
1256 | + default property list<Item> tabChildren |
1257 | + readonly property int count |
1258 | + signal modelChanged() |
1259 | +modules/Ubuntu/Components/Tabs.qml |
1260 | +PageTreeNode |
1261 | + property int selectedTabIndex |
1262 | + readonly property Tab selectedTab |
1263 | + readonly property Item currentPage |
1264 | + property TabBar tabBar |
1265 | + default property list<Item> tabChildren |
1266 | + readonly property int count |
1267 | + signal modelChanged() |
1268 | +modules/Ubuntu/Components/TextArea.qml |
1269 | +StyledItem |
1270 | + property bool highlighted |
1271 | + property string placeholderText |
1272 | + readonly property string displayText |
1273 | + property bool selectByMouse |
1274 | + property bool autoExpand |
1275 | + property bool autoSize |
1276 | + property int maximumLineCount |
1277 | + property real contentWidth |
1278 | + property real contentHeight |
1279 | + property var popover |
1280 | + property bool activeFocusOnPress |
1281 | + property url baseUrl |
1282 | + property bool canPaste |
1283 | + property bool canRedo |
1284 | + property bool canUndo |
1285 | + property color color |
1286 | + property Component cursorDelegate |
1287 | + property int cursorPosition |
1288 | + property rectangle cursorRectangle |
1289 | + property bool cursorVisible |
1290 | + property enumeration effectiveHorizontalAlignment |
1291 | + property font font |
1292 | + property enumeration horizontalAlignment |
1293 | + property bool inputMethodComposing |
1294 | + property enumeration inputMethodHints |
1295 | + property int length |
1296 | + property int lineCount |
1297 | + property enumeration mouseSelectionMode |
1298 | + property enumeration persistentSelection |
1299 | + property bool readOnly |
1300 | + property enumeration renderType |
1301 | + property string selectedText |
1302 | + property color selectedTextColor |
1303 | + property color selectionColor |
1304 | + property int selectionEnd |
1305 | + property int selectionStart |
1306 | + property string text |
1307 | + property enumeration textFormat |
1308 | + property enumeration verticalAlignment |
1309 | + property enumeration wrapMode |
1310 | + signal linkActivated(string link) |
1311 | + function copy() |
1312 | + function cut() |
1313 | + function deselect() |
1314 | + function insert(position, text) |
1315 | + function positionAt(x, y) |
1316 | + function isRightToLeft(start, end) |
1317 | + function moveCursorSelection(position, mode) |
1318 | + function paste(data) |
1319 | + function positionToRectangle(position) |
1320 | + function redo() |
1321 | + function select(start, end) |
1322 | + function selectAll() |
1323 | + function selectWord() |
1324 | + function getFormattedText(start, end) |
1325 | + function getText(start, end) |
1326 | + function remove(start, end) |
1327 | + function undo() |
1328 | + function forceActiveFocus() |
1329 | + property internal __internal |
1330 | +modules/Ubuntu/Components/TextArea.qml |
1331 | +StyledItem |
1332 | + property bool highlighted |
1333 | + property string placeholderText |
1334 | + readonly property string displayText |
1335 | + property bool selectByMouse |
1336 | + property bool autoExpand |
1337 | + property bool autoSize |
1338 | + property int maximumLineCount |
1339 | + property real contentWidth |
1340 | + property real contentHeight |
1341 | + property var popover |
1342 | + property bool activeFocusOnPress |
1343 | + property url baseUrl |
1344 | + property bool canPaste |
1345 | + property bool canRedo |
1346 | + property bool canUndo |
1347 | + property color color |
1348 | + property Component cursorDelegate |
1349 | + property int cursorPosition |
1350 | + property rectangle cursorRectangle |
1351 | + property bool cursorVisible |
1352 | + property enumeration effectiveHorizontalAlignment |
1353 | + property font font |
1354 | + property enumeration horizontalAlignment |
1355 | + property bool inputMethodComposing |
1356 | + property enumeration inputMethodHints |
1357 | + property int length |
1358 | + property int lineCount |
1359 | + property enumeration mouseSelectionMode |
1360 | + property enumeration persistentSelection |
1361 | + property bool readOnly |
1362 | + property enumeration renderType |
1363 | + property string selectedText |
1364 | + property color selectedTextColor |
1365 | + property color selectionColor |
1366 | + property int selectionEnd |
1367 | + property int selectionStart |
1368 | + property string text |
1369 | + property enumeration textFormat |
1370 | + property enumeration verticalAlignment |
1371 | + property enumeration wrapMode |
1372 | + signal linkActivated(string link) |
1373 | + function copy() |
1374 | + function cut() |
1375 | + function deselect() |
1376 | + function insert(position, text) |
1377 | + function positionAt(x, y) |
1378 | + function isRightToLeft(start, end) |
1379 | + function moveCursorSelection(position, mode) |
1380 | + function paste(data) |
1381 | + function positionToRectangle(position) |
1382 | + function redo() |
1383 | + function select(start, end) |
1384 | + function selectAll() |
1385 | + function selectWord() |
1386 | + function getFormattedText(start, end) |
1387 | + function getText(start, end) |
1388 | + function remove(start, end) |
1389 | + function undo() |
1390 | + function forceActiveFocus() |
1391 | + property internal __internal |
1392 | +modules/Ubuntu/Components/TextField.qml |
1393 | +ActionItem |
1394 | + property bool highlighted |
1395 | + property string placeholderText |
1396 | + property bool hasClearButton |
1397 | + property Component customSoftwareInputPanel |
1398 | + property var popover |
1399 | + property list<Object> primaryItem |
1400 | + property list<Object> secondaryItem |
1401 | + property bool errorHighlight |
1402 | + property bool acceptableInput |
1403 | + property bool activeFocusOnPress |
1404 | + property bool autoScroll |
1405 | + property bool canPaste |
1406 | + property bool canRedo |
1407 | + property bool canUndo |
1408 | + property color color |
1409 | + property real contentHeight |
1410 | + property real contentWidth |
1411 | + property Component cursorDelegate |
1412 | + property int cursorPosition |
1413 | + property rectangle cursorRectangle |
1414 | + property bool cursorVisible |
1415 | + property string displayText |
1416 | + property enumeration echoMode |
1417 | + property font font |
1418 | + property string inputMask |
1419 | + property bool inputMethodComposing |
1420 | + property enumeration inputMethodHints |
1421 | + property int length |
1422 | + property int maximumLength |
1423 | + property enumeration mouseSelectionMode |
1424 | + property bool persistentSelection |
1425 | + property bool readOnly |
1426 | + property enumeration renderType |
1427 | + property bool selectByMouse |
1428 | + readonly property string selectedText |
1429 | + property int selectionStart |
1430 | + property int selectionEnd |
1431 | + property string text |
1432 | + property Validator validator |
1433 | + property enumeration horizontalAlignment |
1434 | + property enumeration effectiveHorizontalAlignment |
1435 | + property enumeration verticalAlignment |
1436 | + property string passwordCharacter |
1437 | + property color selectionColor |
1438 | + property color selectedTextColor |
1439 | + signal accepted() |
1440 | + function copy() |
1441 | + function cut() |
1442 | + function paste(data) |
1443 | + function deselect() |
1444 | + function insert(position, text) |
1445 | + function positionAt(x, position) |
1446 | + function positionToRectangle(pos) |
1447 | + function select(start, end) |
1448 | + function selectAll() |
1449 | + function selectWord() |
1450 | + function forceActiveFocus() |
1451 | + function isRightToLeft(start, end) |
1452 | + function moveCursorSelection(position, mode) |
1453 | + function redo() |
1454 | + function undo() |
1455 | + function remove(start, end) |
1456 | + function getText(start, end) |
1457 | property internal __internal |
1458 | modules/Ubuntu/Components/TextField.qml |
1459 | ActionItem |
1460 | @@ -566,28 +1103,60 @@ |
1461 | property color fieldText |
1462 | modules/Ubuntu/Components/ToolbarButton.qml |
1463 | ActionItem |
1464 | -modules/Ubuntu/Components/ToolbarItems.qml |
1465 | -Item |
1466 | - default property list<Object> contents |
1467 | - property Item back |
1468 | - property Item pageStack |
1469 | - property bool opened |
1470 | - property bool locked |
1471 | -modules/Ubuntu/Components/UbuntuListView.qml |
1472 | -ListView |
1473 | - property int expandedIndex |
1474 | -modules/Ubuntu/Components/UbuntuNumberAnimation.qml |
1475 | -NumberAnimation |
1476 | -modules/Ubuntu/Components/UbuntuShape.qml |
1477 | -Item |
1478 | - property color color |
1479 | - property color gradientColor |
1480 | - property string radius |
1481 | - property Item image |
1482 | - property url borderSource |
1483 | -modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml |
1484 | -Item |
1485 | - property bool active |
1486 | +modules/Ubuntu/Components/ToolbarButton.qml |
1487 | +ActionItem |
1488 | +modules/Ubuntu/Components/ToolbarItems.qml |
1489 | +Item |
1490 | + default property list<Object> contents |
1491 | + property Item back |
1492 | + property Item pageStack |
1493 | + property bool opened |
1494 | + property bool locked |
1495 | +modules/Ubuntu/Components/ToolbarItems.qml |
1496 | +Item |
1497 | + default property list<Object> contents |
1498 | + property Item back |
1499 | + property Item pageStack |
1500 | + property bool opened |
1501 | + property bool locked |
1502 | +modules/Ubuntu/Components/UbuntuListView.qml |
1503 | +ListView |
1504 | + property int expandedIndex |
1505 | +modules/Ubuntu/Components/UbuntuListView.qml |
1506 | +ListView |
1507 | + property int expandedIndex |
1508 | +modules/Ubuntu/Components/UbuntuNumberAnimation.qml |
1509 | +NumberAnimation |
1510 | +modules/Ubuntu/Components/UbuntuNumberAnimation.qml |
1511 | +NumberAnimation |
1512 | +modules/Ubuntu/Components/UbuntuShape.qml |
1513 | +Item |
1514 | + property color color |
1515 | + property color gradientColor |
1516 | + property string radius |
1517 | + property Item image |
1518 | + property url borderSource |
1519 | +modules/Ubuntu/Components/UbuntuShape.qml |
1520 | +Item |
1521 | + property color color |
1522 | + property color gradientColor |
1523 | + property string radius |
1524 | + property Item image |
1525 | + property url borderSource |
1526 | +modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml |
1527 | +Item |
1528 | + property bool active |
1529 | +modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml |
1530 | +Item |
1531 | + property bool active |
1532 | +modules/Ubuntu/Test/UbuntuTestCase.qml |
1533 | +TestCase |
1534 | + function findChild(obj,objectName) |
1535 | + function findInvisibleChild(obj,objectName) |
1536 | + function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay) |
1537 | + function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay) |
1538 | + function mouseLongPress(item, x, y, button, modifiers, delay) |
1539 | + function tryCompareFunction(func, expectedResult, timeout) |
1540 | modules/Ubuntu/Test/UbuntuTestCase.qml |
1541 | TestCase |
1542 | function findChild(obj,objectName) |
1543 | @@ -599,7 +1168,7 @@ |
1544 | plugins.qmltypes |
1545 | name: "InverseMouseAreaType" |
1546 | prototype: "QQuickMouseArea" |
1547 | - exports: ["InverseMouseArea 0.1"] |
1548 | + exports: ["InverseMouseArea 0.1", "InverseMouseArea 1.0"] |
1549 | Property { name: "sensingArea"; type: "QQuickItem"; isPointer: true } |
1550 | Property { name: "topmostItem"; type: "bool" } |
1551 | Method { |
1552 | @@ -607,7 +1176,7 @@ |
1553 | Parameter { name: "point"; type: "QPointF" } |
1554 | name: "ShapeItem" |
1555 | prototype: "QQuickItem" |
1556 | - exports: ["Shape 0.1"] |
1557 | + exports: ["Shape 0.1", "Shape 1.0"] |
1558 | name: "HAlignment" |
1559 | name: "VAlignment" |
1560 | Property { name: "color"; type: "QColor" } |
1561 | @@ -622,7 +1191,7 @@ |
1562 | Method { name: "gridUnitChanged" } |
1563 | name: "UCAlarm" |
1564 | prototype: "QObject" |
1565 | - exports: ["Alarm 0.1"] |
1566 | + exports: ["Alarm 0.1", "Alarm 1.0"] |
1567 | name: "Status" |
1568 | name: "Operation" |
1569 | name: "Error" |
1570 | @@ -645,14 +1214,14 @@ |
1571 | Method { name: "reset" } |
1572 | name: "UCAlarmModel" |
1573 | prototype: "QAbstractListModel" |
1574 | - exports: ["AlarmModel 0.1"] |
1575 | + exports: ["AlarmModel 0.1", "AlarmModel 1.0"] |
1576 | Property { name: "count"; type: "int"; isReadonly: true } |
1577 | Method { |
1578 | name: "get" |
1579 | Parameter { name: "index"; type: "int" } |
1580 | name: "UCArgument" |
1581 | prototype: "QObject" |
1582 | - exports: ["Argument 0.1"] |
1583 | + exports: ["Argument 0.1", "Argument 1.0"] |
1584 | Property { name: "name"; type: "string" } |
1585 | Property { name: "help"; type: "string" } |
1586 | Property { name: "required"; type: "bool" } |
1587 | @@ -662,7 +1231,7 @@ |
1588 | Parameter { name: "i"; type: "int" } |
1589 | name: "UCArguments" |
1590 | prototype: "QObject" |
1591 | - exports: ["Arguments 0.1"] |
1592 | + exports: ["Arguments 0.1", "Arguments 1.0"] |
1593 | Property { name: "defaultArgument"; type: "UCArgument"; isPointer: true } |
1594 | Property { name: "arguments"; type: "UCArgument"; isList: true; isReadonly: true } |
1595 | Property { name: "values"; type: "QQmlPropertyMap"; isReadonly: true; isPointer: true } |
1596 | @@ -675,10 +1244,10 @@ |
1597 | Method { name: "quitWithError" } |
1598 | name: "UCInverseMouse" |
1599 | prototype: "UCMouse" |
1600 | - exports: ["InverseMouse 0.1"] |
1601 | + exports: ["InverseMouse 0.1", "InverseMouse 1.0"] |
1602 | name: "UCMouse" |
1603 | prototype: "QObject" |
1604 | - exports: ["Mouse 0.1"] |
1605 | + exports: ["Mouse 0.1", "Mouse 1.0"] |
1606 | name: "Priority" |
1607 | Property { name: "enabled"; type: "bool" } |
1608 | Property { name: "acceptedButtons"; type: "Qt::MouseButtons"; isReadonly: true } |
1609 | @@ -720,7 +1289,7 @@ |
1610 | Parameter { name: "host"; type: "QQuickItem"; isPointer: true } |
1611 | name: "UCQQuickImageExtension" |
1612 | prototype: "QQuickImageBase" |
1613 | - exports: ["QQuickImageBase 0.1"] |
1614 | + exports: ["QQuickImageBase 0.1", "QQuickImageBase 1.0"] |
1615 | Property { name: "source"; type: "QUrl" } |
1616 | Signal { |
1617 | name: "sourceChanged" |
1618 | @@ -730,14 +1299,14 @@ |
1619 | Parameter { type: "QUrl" } |
1620 | name: "UCStateSaver" |
1621 | prototype: "QObject" |
1622 | - exports: ["StateSaver 0.1"] |
1623 | + exports: ["StateSaver 0.1", "StateSaver 1.0"] |
1624 | name: "UCStateSaverAttached" |
1625 | prototype: "QObject" |
1626 | Property { name: "enabled"; type: "bool" } |
1627 | Property { name: "properties"; type: "string" } |
1628 | name: "UCUbuntuAnimation" |
1629 | prototype: "QObject" |
1630 | - exports: ["UbuntuAnimation 0.1"] |
1631 | + exports: ["UbuntuAnimation 0.1", "UbuntuAnimation 1.0"] |
1632 | Property { name: "SnapDuration"; type: "int"; isReadonly: true } |
1633 | Property { name: "FastDuration"; type: "int"; isReadonly: true } |
1634 | Property { name: "BriskDuration"; type: "int"; isReadonly: true } |
1635 | @@ -747,7 +1316,7 @@ |
1636 | Property { name: "StandardEasingReverse"; type: "QEasingCurve"; isReadonly: true } |
1637 | name: "UCUnits" |
1638 | prototype: "QObject" |
1639 | - exports: ["UCUnits 0.1"] |
1640 | + exports: ["UCUnits 0.1", "UCUnits 1.0"] |
1641 | Property { name: "gridUnit"; type: "float" } |
1642 | Method { |
1643 | name: "dp" |
1644 | @@ -757,13 +1326,13 @@ |
1645 | Parameter { name: "value"; type: "float" } |
1646 | name: "UCUriHandler" |
1647 | prototype: "QObject" |
1648 | - exports: ["UriHandler 0.1"] |
1649 | + exports: ["UriHandler 0.1", "UriHandler 1.0"] |
1650 | Signal { |
1651 | name: "opened" |
1652 | Parameter { name: "uris"; type: "QStringList" } |
1653 | name: "UbuntuI18n" |
1654 | prototype: "QObject" |
1655 | - exports: ["i18n 0.1"] |
1656 | + exports: ["i18n 0.1", "i18n 1.0"] |
1657 | Property { name: "domain"; type: "string" } |
1658 | Property { name: "language"; type: "string" } |
1659 | Method { |
1660 | @@ -790,17 +1359,17 @@ |
1661 | Parameter { name: "n"; type: "int" } |
1662 | name: "ULConditionalLayout" |
1663 | prototype: "QObject" |
1664 | - exports: ["ConditionalLayout 0.1"] |
1665 | + exports: ["ConditionalLayout 0.1", "ConditionalLayout 1.0"] |
1666 | Property { name: "name"; type: "string" } |
1667 | Property { name: "when"; type: "QQmlBinding"; isPointer: true } |
1668 | Property { name: "layout"; type: "QQmlComponent"; isPointer: true } |
1669 | name: "ULItemLayout" |
1670 | prototype: "QQuickItem" |
1671 | - exports: ["ItemLayout 0.1"] |
1672 | + exports: ["ItemLayout 0.1", "ItemLayout 1.0"] |
1673 | Property { name: "item"; type: "string" } |
1674 | name: "ULLayouts" |
1675 | prototype: "QQuickItem" |
1676 | - exports: ["Layouts 0.1"] |
1677 | + exports: ["Layouts 0.1", "Layouts 1.0"] |
1678 | Property { name: "currentLayout"; type: "string"; isReadonly: true } |
1679 | Property { name: "layouts"; type: "ULConditionalLayout"; isList: true; isReadonly: true } |
1680 | name: "ULLayoutsAttached" |
1681 | @@ -808,7 +1377,7 @@ |
1682 | Property { name: "item"; type: "string" } |
1683 | name: "UPMCpuUsage" |
1684 | prototype: "QQuickItem" |
1685 | - exports: ["CpuUsage 0.1"] |
1686 | + exports: ["CpuUsage 0.1", "CpuUsage 1.0"] |
1687 | Property { name: "graphModel"; type: "UPMGraphModel"; isReadonly: true; isPointer: true } |
1688 | Property { name: "period"; type: "int" } |
1689 | Property { name: "samplingInterval"; type: "int" } |
1690 | @@ -820,7 +1389,7 @@ |
1691 | Property { name: "currentValue"; type: "int"; isReadonly: true } |
1692 | name: "UPMRenderingTimes" |
1693 | prototype: "QQuickItem" |
1694 | - exports: ["RenderingTimes 0.1"] |
1695 | + exports: ["RenderingTimes 0.1", "RenderingTimes 1.0"] |
1696 | Property { name: "period"; type: "int" } |
1697 | Property { name: "samples"; type: "int" } |
1698 | Property { name: "graphModel"; type: "UPMGraphModel"; isReadonly: true; isPointer: true } |
1699 | @@ -830,5 +1399,5 @@ |
1700 | Parameter { name: "renderTime"; type: "qlonglong" } |
1701 | name: "UPMTextureFromImage" |
1702 | prototype: "QQuickItem" |
1703 | - exports: ["TextureFromImage 0.1"] |
1704 | + exports: ["TextureFromImage 0.1", "TextureFromImage 1.0"] |
1705 | Property { name: "image"; type: "QImage" } |
1706 | |
1707 | === modified file 'documentation/overview.qdoc' |
1708 | --- documentation/overview.qdoc 2014-01-23 17:13:24 +0000 |
1709 | +++ documentation/overview.qdoc 2014-04-23 09:21:19 +0000 |
1710 | @@ -31,70 +31,70 @@ |
1711 | \part Basic QML Types |
1712 | Available through: |
1713 | \code |
1714 | - import Ubuntu.Components 0.1 |
1715 | + import Ubuntu.Components 1.0 |
1716 | \endcode |
1717 | \annotatedlist ubuntu |
1718 | |
1719 | \part List Items |
1720 | Available through: |
1721 | \code |
1722 | - import Ubuntu.Components.ListItems 0.1 |
1723 | + import Ubuntu.Components.ListItems 1.0 |
1724 | \endcode |
1725 | \annotatedlist ubuntu-listitems |
1726 | |
1727 | \part Pickers |
1728 | Available through: |
1729 | \code |
1730 | - import Ubuntu.Components.Pickers 0.1 |
1731 | + import Ubuntu.Components.Pickers 1.0 |
1732 | \endcode |
1733 | \annotatedlist ubuntu-pickers |
1734 | |
1735 | \part Popovers, Sheets and Dialogs |
1736 | Available through: |
1737 | \code |
1738 | - import Ubuntu.Components.Popups 0.1 |
1739 | + import Ubuntu.Components.Popups 1.0 |
1740 | \endcode |
1741 | \annotatedlist ubuntu-popups |
1742 | |
1743 | \part Layouting |
1744 | Available through: |
1745 | \code |
1746 | - import Ubuntu.Layouts 0.1 |
1747 | + import Ubuntu.Layouts 1.0 |
1748 | \endcode |
1749 | \annotatedlist ubuntu-layouts |
1750 | |
1751 | \part Theming Elements |
1752 | Available through: |
1753 | \code |
1754 | - import Ubuntu.Components 0.1 |
1755 | + import Ubuntu.Components 1.0 |
1756 | \endcode |
1757 | \annotatedlist theming |
1758 | |
1759 | \part Resolution Independence Items |
1760 | Available through: |
1761 | \code |
1762 | - import Ubuntu.Components 0.1 |
1763 | + import Ubuntu.Components 1.0 |
1764 | \endcode |
1765 | \annotatedlist resolution-independence |
1766 | |
1767 | \part Parsing Command-Line Arguments |
1768 | Available through: |
1769 | \code |
1770 | - import Ubuntu.Components 0.1 |
1771 | + import Ubuntu.Components 1.0 |
1772 | \endcode |
1773 | \annotatedlist ubuntu-commandline |
1774 | |
1775 | \part Services |
1776 | Available through: |
1777 | \code |
1778 | - import Ubuntu.Components 0.1 |
1779 | + import Ubuntu.Components 1.0 |
1780 | \endcode |
1781 | \annotatedlist ubuntu-services |
1782 | |
1783 | \part Performance Metrics |
1784 | Available through: |
1785 | \code |
1786 | - import Ubuntu.PerformanceMetrics 0.1 |
1787 | + import Ubuntu.PerformanceMetrics 1.0 |
1788 | \endcode |
1789 | \annotatedlist ubuntu-performance-metrics |
1790 | */ |
1791 | |
1792 | === modified file 'documentation/resolution-independence.qdoc' |
1793 | --- documentation/resolution-independence.qdoc 2013-09-25 15:29:26 +0000 |
1794 | +++ documentation/resolution-independence.qdoc 2014-04-23 09:21:19 +0000 |
1795 | @@ -64,7 +64,7 @@ |
1796 | |
1797 | Example Usage: |
1798 | \code |
1799 | - import Ubuntu.Components 0.1 |
1800 | + import Ubuntu.Components 1.0 |
1801 | |
1802 | Item { |
1803 | width: units.gu(2) |
1804 | @@ -79,7 +79,7 @@ |
1805 | |
1806 | Example Usage: |
1807 | \code |
1808 | - import Ubuntu.Components 0.1 |
1809 | + import Ubuntu.Components 1.0 |
1810 | |
1811 | Rectangle { |
1812 | height: units.dp(1) |
1813 | @@ -143,7 +143,7 @@ |
1814 | |
1815 | Example Usage: |
1816 | \code |
1817 | - import Ubuntu.Components 0.1 |
1818 | + import Ubuntu.Components 1.0 |
1819 | |
1820 | Label { |
1821 | fontSize: "small" |
1822 | |
1823 | === modified file 'documentation/snippets/layouts/SimpleLayout.qml' |
1824 | --- documentation/snippets/layouts/SimpleLayout.qml 2013-06-25 14:25:43 +0000 |
1825 | +++ documentation/snippets/layouts/SimpleLayout.qml 2014-04-23 09:21:19 +0000 |
1826 | @@ -15,8 +15,8 @@ |
1827 | */ |
1828 | |
1829 | import QtQuick 2.0 |
1830 | -import Ubuntu.Components 0.1 |
1831 | -import Ubuntu.Layouts 0.1 |
1832 | +import Ubuntu.Components 1.0 |
1833 | +import Ubuntu.Layouts 1.0 |
1834 | |
1835 | Item { |
1836 | id: root |
1837 | |
1838 | === modified file 'documentation/snippets/layouts/layout1.qml' |
1839 | --- documentation/snippets/layouts/layout1.qml 2013-06-25 14:19:12 +0000 |
1840 | +++ documentation/snippets/layouts/layout1.qml 2014-04-23 09:21:19 +0000 |
1841 | @@ -16,8 +16,8 @@ |
1842 | |
1843 | //![0] |
1844 | import QtQuick 2.0 |
1845 | -import Ubuntu.Components 0.1 |
1846 | -import Ubuntu.Layouts 0.1 |
1847 | +import Ubuntu.Components 1.0 |
1848 | +import Ubuntu.Layouts 1.0 |
1849 | |
1850 | Item { |
1851 | id: root |
1852 | |
1853 | === modified file 'documentation/snippets/layouts/layout2.qml' |
1854 | --- documentation/snippets/layouts/layout2.qml 2013-06-25 14:19:12 +0000 |
1855 | +++ documentation/snippets/layouts/layout2.qml 2014-04-23 09:21:19 +0000 |
1856 | @@ -16,8 +16,8 @@ |
1857 | |
1858 | //![0] |
1859 | import QtQuick 2.0 |
1860 | -import Ubuntu.Components 0.1 |
1861 | -import Ubuntu.Layouts 0.1 |
1862 | +import Ubuntu.Components 1.0 |
1863 | +import Ubuntu.Layouts 1.0 |
1864 | |
1865 | Item { |
1866 | id: root |
1867 | |
1868 | === modified file 'documentation/snippets/layouts/layout3.qml' |
1869 | --- documentation/snippets/layouts/layout3.qml 2013-06-25 14:19:12 +0000 |
1870 | +++ documentation/snippets/layouts/layout3.qml 2014-04-23 09:21:19 +0000 |
1871 | @@ -16,8 +16,8 @@ |
1872 | |
1873 | //![0] |
1874 | import QtQuick 2.0 |
1875 | -import Ubuntu.Components 0.1 |
1876 | -import Ubuntu.Layouts 0.1 |
1877 | +import Ubuntu.Components 1.0 |
1878 | +import Ubuntu.Layouts 1.0 |
1879 | |
1880 | Item { |
1881 | id: root |
1882 | |
1883 | === modified file 'documentation/snippets/layouts/layout6.qml' |
1884 | --- documentation/snippets/layouts/layout6.qml 2013-06-25 14:19:12 +0000 |
1885 | +++ documentation/snippets/layouts/layout6.qml 2014-04-23 09:21:19 +0000 |
1886 | @@ -16,8 +16,8 @@ |
1887 | |
1888 | //![0] |
1889 | import QtQuick 2.0 |
1890 | -import Ubuntu.Components 0.1 |
1891 | -import Ubuntu.Layouts 0.1 |
1892 | +import Ubuntu.Components 1.0 |
1893 | +import Ubuntu.Layouts 1.0 |
1894 | |
1895 | Item { |
1896 | id: root |
1897 | |
1898 | === modified file 'documentation/snippets/layouts/layout7.qml' |
1899 | --- documentation/snippets/layouts/layout7.qml 2013-06-25 14:19:12 +0000 |
1900 | +++ documentation/snippets/layouts/layout7.qml 2014-04-23 09:21:19 +0000 |
1901 | @@ -16,8 +16,8 @@ |
1902 | |
1903 | //![0] |
1904 | import QtQuick 2.0 |
1905 | -import Ubuntu.Components 0.1 |
1906 | -import Ubuntu.Layouts 0.1 |
1907 | +import Ubuntu.Components 1.0 |
1908 | +import Ubuntu.Layouts 1.0 |
1909 | |
1910 | Item { |
1911 | id: root |
1912 | |
1913 | === modified file 'documentation/snippets/statesaver/ColorChanger.qml' |
1914 | --- documentation/snippets/statesaver/ColorChanger.qml 2013-09-24 06:20:26 +0000 |
1915 | +++ documentation/snippets/statesaver/ColorChanger.qml 2014-04-23 09:21:19 +0000 |
1916 | @@ -16,7 +16,7 @@ |
1917 | |
1918 | //![color-saver] |
1919 | import QtQuick 2.0 |
1920 | -import Ubuntu.Components 0.1 |
1921 | +import Ubuntu.Components 1.0 |
1922 | |
1923 | Rectangle { |
1924 | id: root |
1925 | |
1926 | === modified file 'documentation/snippets/statesaver/MultiplePropertySaver.qml' |
1927 | --- documentation/snippets/statesaver/MultiplePropertySaver.qml 2013-09-24 06:20:26 +0000 |
1928 | +++ documentation/snippets/statesaver/MultiplePropertySaver.qml 2014-04-23 09:21:19 +0000 |
1929 | @@ -16,7 +16,7 @@ |
1930 | |
1931 | //![group-saver] |
1932 | import QtQuick 2.0 |
1933 | -import Ubuntu.Components 0.1 |
1934 | +import Ubuntu.Components 1.0 |
1935 | |
1936 | Rectangle { |
1937 | id: root |
1938 | |
1939 | === modified file 'documentation/snippets/statesaver/PropertyGroupSaver.qml' |
1940 | --- documentation/snippets/statesaver/PropertyGroupSaver.qml 2013-09-24 06:20:26 +0000 |
1941 | +++ documentation/snippets/statesaver/PropertyGroupSaver.qml 2014-04-23 09:21:19 +0000 |
1942 | @@ -16,7 +16,7 @@ |
1943 | |
1944 | //![property-group-saver] |
1945 | import QtQuick 2.0 |
1946 | -import Ubuntu.Components 0.1 |
1947 | +import Ubuntu.Components 1.0 |
1948 | |
1949 | Rectangle { |
1950 | id: root |
1951 | |
1952 | === modified file 'documentation/snippets/statesaver/PropertyGroupSaver2.qml' |
1953 | --- documentation/snippets/statesaver/PropertyGroupSaver2.qml 2013-09-24 06:20:26 +0000 |
1954 | +++ documentation/snippets/statesaver/PropertyGroupSaver2.qml 2014-04-23 09:21:19 +0000 |
1955 | @@ -16,7 +16,7 @@ |
1956 | |
1957 | //![property-group-saver] |
1958 | import QtQuick 2.0 |
1959 | -import Ubuntu.Components 0.1 |
1960 | +import Ubuntu.Components 1.0 |
1961 | |
1962 | Rectangle { |
1963 | id: root |
1964 | |
1965 | === modified file 'documentation/ubuntu-components-listitems.qdoc' |
1966 | --- documentation/ubuntu-components-listitems.qdoc 2013-09-25 15:29:26 +0000 |
1967 | +++ documentation/ubuntu-components-listitems.qdoc 2014-04-23 09:21:19 +0000 |
1968 | @@ -15,6 +15,6 @@ |
1969 | */ |
1970 | |
1971 | /*! |
1972 | - \qmlmodule Ubuntu.Components.ListItems 0.1 |
1973 | + \qmlmodule Ubuntu.Components.ListItems 1.0 |
1974 | \title List Items |
1975 | */ |
1976 | |
1977 | === modified file 'documentation/ubuntu-components-pickers.qdoc' |
1978 | --- documentation/ubuntu-components-pickers.qdoc 2013-09-25 15:29:26 +0000 |
1979 | +++ documentation/ubuntu-components-pickers.qdoc 2014-04-23 09:21:19 +0000 |
1980 | @@ -15,6 +15,6 @@ |
1981 | */ |
1982 | |
1983 | /*! |
1984 | - \qmlmodule Ubuntu.Components.Pickers 0.1 |
1985 | + \qmlmodule Ubuntu.Components.Pickers 1.0 |
1986 | \title Pickers |
1987 | */ |
1988 | |
1989 | === modified file 'documentation/ubuntu-components-popups.qdoc' |
1990 | --- documentation/ubuntu-components-popups.qdoc 2013-09-25 15:29:26 +0000 |
1991 | +++ documentation/ubuntu-components-popups.qdoc 2014-04-23 09:21:19 +0000 |
1992 | @@ -15,6 +15,6 @@ |
1993 | */ |
1994 | |
1995 | /*! |
1996 | - \qmlmodule Ubuntu.Components.Popups 0.1 |
1997 | + \qmlmodule Ubuntu.Components.Popups 1.0 |
1998 | \title Popovers, Sheets and Dialogs |
1999 | */ |
2000 | |
2001 | === modified file 'documentation/ubuntu-components.qdoc' |
2002 | --- documentation/ubuntu-components.qdoc 2013-09-25 15:29:26 +0000 |
2003 | +++ documentation/ubuntu-components.qdoc 2014-04-23 09:21:19 +0000 |
2004 | @@ -15,7 +15,7 @@ |
2005 | */ |
2006 | |
2007 | /*! |
2008 | - \qmlmodule Ubuntu.Components 0.1 |
2009 | + \qmlmodule Ubuntu.Components 1.0 |
2010 | \title Basic QML Types |
2011 | \nextpage {Ubuntu User Interface Toolkit} |
2012 | */ |
2013 | |
2014 | === modified file 'documentation/ubuntu-layouts.qdoc' |
2015 | --- documentation/ubuntu-layouts.qdoc 2013-09-25 15:29:26 +0000 |
2016 | +++ documentation/ubuntu-layouts.qdoc 2014-04-23 09:21:19 +0000 |
2017 | @@ -15,6 +15,11 @@ |
2018 | */ |
2019 | |
2020 | /*! |
2021 | + \qmlmodule Ubuntu.Layouts 1.0 |
2022 | + \title Layouts |
2023 | +*/ |
2024 | + |
2025 | +/*! |
2026 | \page ubuntu-layouts.html |
2027 | \title Layouts - Introduction |
2028 | \nextpage Layouts - Terminology |
2029 | @@ -177,7 +182,7 @@ |
2030 | \section2 Import |
2031 | First of all, in order to use the layouting abilities, you need to import Ubuntu.Layouts. |
2032 | \code |
2033 | - import Ubuntu.Layouts 0.1 |
2034 | + import Ubuntu.Layouts 1.0 |
2035 | \endcode |
2036 | |
2037 | This layout will have the red button anchored to the parent's left, top and bottom, having |
2038 | |
2039 | === modified file 'examples/calculator/calculator.qml' |
2040 | --- examples/calculator/calculator.qml 2013-07-03 06:41:54 +0000 |
2041 | +++ examples/calculator/calculator.qml 2014-04-23 09:21:19 +0000 |
2042 | @@ -17,8 +17,8 @@ |
2043 | */ |
2044 | |
2045 | import QtQuick 2.0 |
2046 | -import Ubuntu.Components 0.1 |
2047 | -import Ubuntu.Layouts 0.1 |
2048 | +import Ubuntu.Components 1.0 |
2049 | +import Ubuntu.Layouts 1.0 |
2050 | import "components" |
2051 | import "components/calculator.js" as Calculator |
2052 | |
2053 | |
2054 | === modified file 'examples/calculator/components/DefaultLayout.qml' |
2055 | --- examples/calculator/components/DefaultLayout.qml 2013-07-02 14:42:23 +0000 |
2056 | +++ examples/calculator/components/DefaultLayout.qml 2014-04-23 09:21:19 +0000 |
2057 | @@ -17,8 +17,8 @@ |
2058 | */ |
2059 | |
2060 | import QtQuick 2.0 |
2061 | -import Ubuntu.Components 0.1 |
2062 | -import Ubuntu.Layouts 0.1 |
2063 | +import Ubuntu.Components 1.0 |
2064 | +import Ubuntu.Layouts 1.0 |
2065 | |
2066 | Item { |
2067 | id: buttonGrid |
2068 | |
2069 | === modified file 'examples/calculator/components/Functions.qml' |
2070 | --- examples/calculator/components/Functions.qml 2013-07-02 14:42:23 +0000 |
2071 | +++ examples/calculator/components/Functions.qml 2014-04-23 09:21:19 +0000 |
2072 | @@ -17,8 +17,8 @@ |
2073 | */ |
2074 | |
2075 | import QtQuick 2.0 |
2076 | -import Ubuntu.Components 0.1 |
2077 | -import Ubuntu.Layouts 0.1 |
2078 | +import Ubuntu.Components 1.0 |
2079 | +import Ubuntu.Layouts 1.0 |
2080 | |
2081 | Grid { |
2082 | id: buttonGrid |
2083 | |
2084 | === modified file 'examples/jokes/jokes.qml' |
2085 | --- examples/jokes/jokes.qml 2013-07-04 21:36:23 +0000 |
2086 | +++ examples/jokes/jokes.qml 2014-04-23 09:21:19 +0000 |
2087 | @@ -16,7 +16,7 @@ |
2088 | */ |
2089 | |
2090 | import QtQuick 2.0 |
2091 | -import Ubuntu.Components 0.1 |
2092 | +import Ubuntu.Components 1.0 |
2093 | import QtMultimedia 5.0 |
2094 | |
2095 | /*! |
2096 | |
2097 | === modified file 'examples/locale/locale.qml' |
2098 | --- examples/locale/locale.qml 2013-07-04 21:36:23 +0000 |
2099 | +++ examples/locale/locale.qml 2014-04-23 09:21:19 +0000 |
2100 | @@ -16,8 +16,8 @@ |
2101 | */ |
2102 | |
2103 | import QtQuick 2.0 |
2104 | -import Ubuntu.Components 0.1 |
2105 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
2106 | +import Ubuntu.Components 1.0 |
2107 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
2108 | |
2109 | /*! |
2110 | \brief An application to test locales on the device |
2111 | |
2112 | === modified file 'examples/ubuntu-ui-toolkit-gallery/Label.qml' |
2113 | --- examples/ubuntu-ui-toolkit-gallery/Label.qml 2013-11-28 11:11:55 +0000 |
2114 | +++ examples/ubuntu-ui-toolkit-gallery/Label.qml 2014-04-23 09:21:19 +0000 |
2115 | @@ -15,7 +15,7 @@ |
2116 | */ |
2117 | |
2118 | import QtQuick 2.0 |
2119 | -import Ubuntu.Components 0.1 |
2120 | +import Ubuntu.Components 1.0 |
2121 | |
2122 | Template { |
2123 | objectName: "labelsTemplate" |
2124 | |
2125 | === modified file 'examples/unit-converter/unit-converter.qml' |
2126 | --- examples/unit-converter/unit-converter.qml 2013-05-06 16:24:50 +0000 |
2127 | +++ examples/unit-converter/unit-converter.qml 2014-04-23 09:21:19 +0000 |
2128 | @@ -15,7 +15,7 @@ |
2129 | */ |
2130 | |
2131 | import QtQuick 2.0 |
2132 | -import Ubuntu.Components 0.1 |
2133 | +import Ubuntu.Components 1.0 |
2134 | import "conversion.js" as Converter |
2135 | |
2136 | /*! |
2137 | |
2138 | === modified file 'manual-tests/button.qml' |
2139 | --- manual-tests/button.qml 2012-11-14 07:40:05 +0000 |
2140 | +++ manual-tests/button.qml 2014-04-23 09:21:19 +0000 |
2141 | @@ -15,7 +15,7 @@ |
2142 | */ |
2143 | |
2144 | import QtQuick 2.0 |
2145 | -import Ubuntu.Components 0.1 |
2146 | +import Ubuntu.Components 1.0 |
2147 | |
2148 | Button { |
2149 | id: button |
2150 | |
2151 | === modified file 'modules/Ubuntu/Components/AbstractButton.qml' |
2152 | --- modules/Ubuntu/Components/AbstractButton.qml 2013-11-06 22:52:15 +0000 |
2153 | +++ modules/Ubuntu/Components/AbstractButton.qml 2014-04-23 09:21:19 +0000 |
2154 | @@ -19,7 +19,7 @@ |
2155 | |
2156 | /*! |
2157 | \qmlabstract AbstractButton |
2158 | - \inqmlmodule Ubuntu.Components 0.1 |
2159 | + \inqmlmodule Ubuntu.Components 1.0 |
2160 | \ingroup ubuntu |
2161 | \brief The AbstractButton class defines the behavior of the button. |
2162 | |
2163 | |
2164 | === modified file 'modules/Ubuntu/Components/Action.qml' |
2165 | --- modules/Ubuntu/Components/Action.qml 2014-02-24 18:24:59 +0000 |
2166 | +++ modules/Ubuntu/Components/Action.qml 2014-04-23 09:21:19 +0000 |
2167 | @@ -19,7 +19,7 @@ |
2168 | |
2169 | /*! |
2170 | \qmltype Action |
2171 | - \inqmlmodule Ubuntu.Components 0.1 |
2172 | + \inqmlmodule Ubuntu.Components 1.0 |
2173 | \ingroup ubuntu |
2174 | \brief Describe an action that can be re-used in, for example a \l Button |
2175 | |
2176 | |
2177 | === modified file 'modules/Ubuntu/Components/ActionItem.qml' |
2178 | --- modules/Ubuntu/Components/ActionItem.qml 2014-02-24 18:24:59 +0000 |
2179 | +++ modules/Ubuntu/Components/ActionItem.qml 2014-04-23 09:21:19 +0000 |
2180 | @@ -18,7 +18,7 @@ |
2181 | |
2182 | /*! |
2183 | \qmlabstract ActionItem |
2184 | - \inqmlmodule Ubuntu.Components 0.1 |
2185 | + \inqmlmodule Ubuntu.Components 1.0 |
2186 | \ingroup ubuntu |
2187 | \brief A visual representation of an Action. The API of ActionItem is a |
2188 | copy of the API of \l Action, with additional properties to define |
2189 | |
2190 | === modified file 'modules/Ubuntu/Components/ActionList.qml' |
2191 | --- modules/Ubuntu/Components/ActionList.qml 2013-08-28 10:41:42 +0000 |
2192 | +++ modules/Ubuntu/Components/ActionList.qml 2014-04-23 09:21:19 +0000 |
2193 | @@ -18,7 +18,7 @@ |
2194 | |
2195 | /*! |
2196 | \qmltype ActionList |
2197 | - \inqmlmodule Ubuntu.Components 0.1 |
2198 | + \inqmlmodule Ubuntu.Components 1.0 |
2199 | \ingroup ubuntu |
2200 | \brief List of \l Action items |
2201 | */ |
2202 | |
2203 | === modified file 'modules/Ubuntu/Components/ActivityIndicator.qml' |
2204 | --- modules/Ubuntu/Components/ActivityIndicator.qml 2013-06-27 15:20:12 +0000 |
2205 | +++ modules/Ubuntu/Components/ActivityIndicator.qml 2014-04-23 09:21:19 +0000 |
2206 | @@ -18,7 +18,7 @@ |
2207 | |
2208 | /*! |
2209 | \qmltype ActivityIndicator |
2210 | - \inqmlmodule Ubuntu.Components 0.1 |
2211 | + \inqmlmodule Ubuntu.Components 1.0 |
2212 | \ingroup ubuntu |
2213 | \brief The ActivityIndicator component visually indicates that a task of |
2214 | unknown duration is in progress, e.g. busy indication, connection in progress |
2215 | |
2216 | === modified file 'modules/Ubuntu/Components/AnimatedItem.qml' |
2217 | --- modules/Ubuntu/Components/AnimatedItem.qml 2013-06-26 19:25:09 +0000 |
2218 | +++ modules/Ubuntu/Components/AnimatedItem.qml 2014-04-23 09:21:19 +0000 |
2219 | @@ -16,7 +16,7 @@ |
2220 | |
2221 | /*! |
2222 | \qmltype AnimatedItem |
2223 | - \inqmlmodule Ubuntu.Components 0.1 |
2224 | + \inqmlmodule Ubuntu.Components 1.0 |
2225 | \ingroup ubuntu |
2226 | \brief The AnimatedItem drives the animated components behavior inside a Flickable. |
2227 | Reports whether the component whos parent is a Flickable is in the visible area or not, |
2228 | |
2229 | === modified file 'modules/Ubuntu/Components/Button.qml' |
2230 | --- modules/Ubuntu/Components/Button.qml 2013-11-06 22:52:15 +0000 |
2231 | +++ modules/Ubuntu/Components/Button.qml 2014-04-23 09:21:19 +0000 |
2232 | @@ -18,7 +18,7 @@ |
2233 | |
2234 | /*! |
2235 | \qmltype Button |
2236 | - \inqmlmodule Ubuntu.Components 0.1 |
2237 | + \inqmlmodule Ubuntu.Components 1.0 |
2238 | \ingroup ubuntu |
2239 | \brief Standard Ubuntu button. |
2240 | |
2241 | |
2242 | === modified file 'modules/Ubuntu/Components/CheckBox.qml' |
2243 | --- modules/Ubuntu/Components/CheckBox.qml 2013-10-01 14:46:11 +0000 |
2244 | +++ modules/Ubuntu/Components/CheckBox.qml 2014-04-23 09:21:19 +0000 |
2245 | @@ -18,7 +18,7 @@ |
2246 | |
2247 | /*! |
2248 | \qmltype CheckBox |
2249 | - \inqmlmodule Ubuntu.Components 0.1 |
2250 | + \inqmlmodule Ubuntu.Components 1.0 |
2251 | \ingroup ubuntu |
2252 | \brief CheckBox is a component with two states, checked or unchecked. It can |
2253 | be used to set boolean options. The behavior is the same as \l Switch, the |
2254 | |
2255 | === modified file 'modules/Ubuntu/Components/CrossFadeImage.qml' |
2256 | --- modules/Ubuntu/Components/CrossFadeImage.qml 2013-10-08 20:10:59 +0000 |
2257 | +++ modules/Ubuntu/Components/CrossFadeImage.qml 2014-04-23 09:21:19 +0000 |
2258 | @@ -19,7 +19,7 @@ |
2259 | // we need to use named imports otherwise namespace collision is reported |
2260 | // by the QML engine. As workaround, we use Ubuntu named import. |
2261 | // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645 |
2262 | -import Ubuntu.Components 0.1 as Ubuntu |
2263 | +import Ubuntu.Components 1.0 as Ubuntu |
2264 | |
2265 | /*! |
2266 | \qmltype CrossFadeImage |
2267 | @@ -28,7 +28,7 @@ |
2268 | |
2269 | \qml |
2270 | import QtQuick 2.0 |
2271 | - import Ubuntu.Components 0.1 |
2272 | + import Ubuntu.Components 1.0 |
2273 | |
2274 | CrossFadeImage { |
2275 | width: units.gu(100) |
2276 | |
2277 | === modified file 'modules/Ubuntu/Components/Header.qml' |
2278 | --- modules/Ubuntu/Components/Header.qml 2014-03-12 09:36:00 +0000 |
2279 | +++ modules/Ubuntu/Components/Header.qml 2014-04-23 09:21:19 +0000 |
2280 | @@ -15,16 +15,12 @@ |
2281 | */ |
2282 | |
2283 | import QtQuick 2.0 |
2284 | -// FIXME: When a module contains QML, C++ and JavaScript elements exported, |
2285 | -// we need to use named imports otherwise namespace collision is reported |
2286 | -// by the QML engine. As workaround, we use Ubuntu named import. |
2287 | -// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645 |
2288 | -import Ubuntu.Components 0.1 as Ubuntu |
2289 | +import Ubuntu.Components 1.0 |
2290 | |
2291 | /*! |
2292 | \internal |
2293 | \qmltype Header |
2294 | - \inqmlmodule Ubuntu.Components 0.1 |
2295 | + \inqmlmodule Ubuntu.Components 1.0 |
2296 | \ingroup ubuntu |
2297 | */ |
2298 | StyledItem { |
2299 | @@ -44,7 +40,7 @@ |
2300 | Behavior on y { |
2301 | enabled: animate && !(header.flickable && header.flickable.moving) |
2302 | SmoothedAnimation { |
2303 | - duration: Ubuntu.UbuntuAnimation.BriskDuration |
2304 | + duration: UbuntuAnimation.BriskDuration |
2305 | } |
2306 | } |
2307 | |
2308 | |
2309 | === modified file 'modules/Ubuntu/Components/Icon.qml' |
2310 | --- modules/Ubuntu/Components/Icon.qml 2013-11-06 22:52:15 +0000 |
2311 | +++ modules/Ubuntu/Components/Icon.qml 2014-04-23 09:21:19 +0000 |
2312 | @@ -18,7 +18,7 @@ |
2313 | |
2314 | /*! |
2315 | \qmltype Icon |
2316 | - \inqmlmodule Ubuntu.Components 0.1 |
2317 | + \inqmlmodule Ubuntu.Components 1.0 |
2318 | \ingroup ubuntu |
2319 | \brief The Icon component displays an icon from the icon theme. |
2320 | |
2321 | |
2322 | === modified file 'modules/Ubuntu/Components/Label.qml' |
2323 | --- modules/Ubuntu/Components/Label.qml 2014-01-23 19:01:47 +0000 |
2324 | +++ modules/Ubuntu/Components/Label.qml 2014-04-23 09:21:19 +0000 |
2325 | @@ -18,7 +18,7 @@ |
2326 | |
2327 | /*! |
2328 | \qmltype Label |
2329 | - \inqmlmodule Ubuntu.Components 0.1 |
2330 | + \inqmlmodule Ubuntu.Components 1.0 |
2331 | \ingroup ubuntu |
2332 | \brief Text with Ubuntu styling. |
2333 | |
2334 | |
2335 | === modified file 'modules/Ubuntu/Components/ListItems/Base.qml' |
2336 | --- modules/Ubuntu/Components/ListItems/Base.qml 2014-02-13 10:27:14 +0000 |
2337 | +++ modules/Ubuntu/Components/ListItems/Base.qml 2014-04-23 09:21:19 +0000 |
2338 | @@ -15,11 +15,11 @@ |
2339 | */ |
2340 | |
2341 | import QtQuick 2.0 |
2342 | -import Ubuntu.Components 0.1 |
2343 | +import Ubuntu.Components 1.0 |
2344 | |
2345 | /*! |
2346 | \qmltype Base |
2347 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2348 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2349 | \ingroup ubuntu-listitems |
2350 | \brief Parent class of various list item classes that can have |
2351 | an icon and a progression symbol. |
2352 | |
2353 | === modified file 'modules/Ubuntu/Components/ListItems/Caption.qml' |
2354 | --- modules/Ubuntu/Components/ListItems/Caption.qml 2013-07-04 22:12:37 +0000 |
2355 | +++ modules/Ubuntu/Components/ListItems/Caption.qml 2014-04-23 09:21:19 +0000 |
2356 | @@ -15,17 +15,17 @@ |
2357 | */ |
2358 | |
2359 | import QtQuick 2.0 |
2360 | -import Ubuntu.Components 0.1 |
2361 | +import Ubuntu.Components 1.0 |
2362 | |
2363 | /*! |
2364 | \qmltype Caption |
2365 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2366 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2367 | \ingroup ubuntu-listitems |
2368 | \brief List item that shows a piece of text. |
2369 | |
2370 | Examples: |
2371 | \qml |
2372 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2373 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2374 | Column { |
2375 | ListItem.Standard { |
2376 | text: "Default list item." |
2377 | |
2378 | === modified file 'modules/Ubuntu/Components/ListItems/Divider.qml' |
2379 | --- modules/Ubuntu/Components/ListItems/Divider.qml 2012-10-19 01:09:07 +0000 |
2380 | +++ modules/Ubuntu/Components/ListItems/Divider.qml 2014-04-23 09:21:19 +0000 |
2381 | @@ -18,7 +18,7 @@ |
2382 | |
2383 | /*! |
2384 | \qmltype Divider |
2385 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2386 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2387 | \ingroup ubuntu-listitems |
2388 | \brief Divider to break up list items into groups. |
2389 | |
2390 | |
2391 | === modified file 'modules/Ubuntu/Components/ListItems/Empty.qml' |
2392 | --- modules/Ubuntu/Components/ListItems/Empty.qml 2014-02-04 14:39:53 +0000 |
2393 | +++ modules/Ubuntu/Components/ListItems/Empty.qml 2014-04-23 09:21:19 +0000 |
2394 | @@ -15,11 +15,11 @@ |
2395 | */ |
2396 | |
2397 | import QtQuick 2.0 |
2398 | -import Ubuntu.Components 0.1 |
2399 | +import Ubuntu.Components 1.0 |
2400 | |
2401 | /*! |
2402 | \qmltype Empty |
2403 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2404 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2405 | \ingroup ubuntu-listitems |
2406 | \brief A list item with no contents. |
2407 | The Empty class can be used for generic list items containing other |
2408 | @@ -34,8 +34,8 @@ |
2409 | |
2410 | Examples: |
2411 | \qml |
2412 | - import Ubuntu.Components 0.1 |
2413 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2414 | + import Ubuntu.Components 1.0 |
2415 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2416 | |
2417 | Item { |
2418 | Model { |
2419 | |
2420 | === modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml' |
2421 | --- modules/Ubuntu/Components/ListItems/Expandable.qml 2014-03-17 16:35:27 +0000 |
2422 | +++ modules/Ubuntu/Components/ListItems/Expandable.qml 2014-04-23 09:21:19 +0000 |
2423 | @@ -14,11 +14,11 @@ |
2424 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2425 | */ |
2426 | import QtQuick 2.0 |
2427 | -import Ubuntu.Components 0.1 |
2428 | +import Ubuntu.Components 1.0 |
2429 | |
2430 | /*! |
2431 | \qmltype Expandable |
2432 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2433 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2434 | \ingroup ubuntu-listitems |
2435 | \brief An expandable list item with no contents. |
2436 | The Expandable class can be used for generic list items containing other |
2437 | @@ -35,8 +35,8 @@ |
2438 | |
2439 | Examples: |
2440 | \qml |
2441 | - import Ubuntu.Components 0.1 |
2442 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2443 | + import Ubuntu.Components 1.0 |
2444 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2445 | |
2446 | Item { |
2447 | ListModel { |
2448 | |
2449 | === modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml' |
2450 | --- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml 2014-02-26 09:46:30 +0000 |
2451 | +++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml 2014-04-23 09:21:19 +0000 |
2452 | @@ -15,11 +15,11 @@ |
2453 | */ |
2454 | |
2455 | import QtQuick 2.0 |
2456 | -import Ubuntu.Components 0.1 |
2457 | +import Ubuntu.Components 1.0 |
2458 | |
2459 | /*! |
2460 | \qmltype ExpandablesColumn |
2461 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2462 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2463 | \ingroup ubuntu-listitems |
2464 | \brief A column to be used together with the \l Expandable item. |
2465 | This lays out its content just like a regular Column inside a Flickable but |
2466 | @@ -29,8 +29,8 @@ |
2467 | |
2468 | Examples: |
2469 | \qml |
2470 | - import Ubuntu.Components 0.1 |
2471 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2472 | + import Ubuntu.Components 1.0 |
2473 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2474 | |
2475 | ListItem.ExpandablesColumn { |
2476 | anchors { left: parent.left; right: parent.right } |
2477 | |
2478 | === modified file 'modules/Ubuntu/Components/ListItems/Header.qml' |
2479 | --- modules/Ubuntu/Components/ListItems/Header.qml 2013-02-06 11:40:31 +0000 |
2480 | +++ modules/Ubuntu/Components/ListItems/Header.qml 2014-04-23 09:21:19 +0000 |
2481 | @@ -18,13 +18,13 @@ |
2482 | |
2483 | /*! |
2484 | \qmltype Header |
2485 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2486 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2487 | \ingroup ubuntu-listitems |
2488 | \brief Header for grouping list items together |
2489 | |
2490 | Examples: |
2491 | \qml |
2492 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2493 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2494 | Column { |
2495 | ListItem.Header { text: "Title" } |
2496 | ListItem.Standard { text: "Item one" } |
2497 | |
2498 | === modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml' |
2499 | --- modules/Ubuntu/Components/ListItems/IconVisual.qml 2013-11-06 22:52:15 +0000 |
2500 | +++ modules/Ubuntu/Components/ListItems/IconVisual.qml 2014-04-23 09:21:19 +0000 |
2501 | @@ -15,7 +15,7 @@ |
2502 | */ |
2503 | |
2504 | import QtQuick 2.0 |
2505 | -import Ubuntu.Components 0.1 |
2506 | +import Ubuntu.Components 1.0 |
2507 | |
2508 | // internal helper class to create the visuals |
2509 | // for the icon. |
2510 | |
2511 | === modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml' |
2512 | --- modules/Ubuntu/Components/ListItems/ItemSelector.qml 2014-02-18 14:23:57 +0000 |
2513 | +++ modules/Ubuntu/Components/ListItems/ItemSelector.qml 2014-04-23 09:21:19 +0000 |
2514 | @@ -16,11 +16,11 @@ |
2515 | |
2516 | import QtQuick 2.0 |
2517 | import "." as ListItem |
2518 | -import Ubuntu.Components 0.1 |
2519 | +import Ubuntu.Components 1.0 |
2520 | |
2521 | /*! |
2522 | \qmltype ItemSelector |
2523 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2524 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2525 | \ingroup ubuntu-listitems |
2526 | \brief ListItem displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a |
2527 | listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically. |
2528 | @@ -29,7 +29,7 @@ |
2529 | |
2530 | Examples: |
2531 | \qml |
2532 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2533 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2534 | Column { |
2535 | anchors.left: parent.left |
2536 | anchors.right: parent.right |
2537 | |
2538 | === modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml' |
2539 | --- modules/Ubuntu/Components/ListItems/LabelVisual.qml 2013-08-29 18:47:30 +0000 |
2540 | +++ modules/Ubuntu/Components/ListItems/LabelVisual.qml 2014-04-23 09:21:19 +0000 |
2541 | @@ -15,7 +15,7 @@ |
2542 | */ |
2543 | |
2544 | import QtQuick 2.0 |
2545 | -import Ubuntu.Components 0.1 |
2546 | +import Ubuntu.Components 1.0 |
2547 | |
2548 | // internal helper class for text inside the list items. |
2549 | Label { |
2550 | |
2551 | === modified file 'modules/Ubuntu/Components/ListItems/MultiValue.qml' |
2552 | --- modules/Ubuntu/Components/ListItems/MultiValue.qml 2013-11-06 22:52:15 +0000 |
2553 | +++ modules/Ubuntu/Components/ListItems/MultiValue.qml 2014-04-23 09:21:19 +0000 |
2554 | @@ -18,14 +18,14 @@ |
2555 | |
2556 | /*! |
2557 | \qmltype MultiValue |
2558 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2559 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2560 | \ingroup ubuntu-listitems |
2561 | \brief List item displaying multiple values. |
2562 | \b{This component is under heavy development.} |
2563 | |
2564 | Examples: |
2565 | \qml |
2566 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2567 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2568 | Column { |
2569 | ListItem.MultiValue { |
2570 | text: "Label" |
2571 | |
2572 | === modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml' |
2573 | --- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml 2013-12-09 12:23:15 +0000 |
2574 | +++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml 2014-04-23 09:21:19 +0000 |
2575 | @@ -15,7 +15,7 @@ |
2576 | */ |
2577 | |
2578 | import QtQuick 2.0 |
2579 | -import Ubuntu.Components 0.1 |
2580 | +import Ubuntu.Components 1.0 |
2581 | |
2582 | // Internal helper class for the visuals of |
2583 | // the progression symbol. |
2584 | |
2585 | === modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml' |
2586 | --- modules/Ubuntu/Components/ListItems/SingleControl.qml 2013-07-14 20:18:08 +0000 |
2587 | +++ modules/Ubuntu/Components/ListItems/SingleControl.qml 2014-04-23 09:21:19 +0000 |
2588 | @@ -15,19 +15,19 @@ |
2589 | */ |
2590 | |
2591 | import QtQuick 2.0 |
2592 | -import Ubuntu.Components 0.1 |
2593 | -import Ubuntu.Components.ListItems 0.1 |
2594 | +import Ubuntu.Components 1.0 |
2595 | +import Ubuntu.Components.ListItems 1.0 |
2596 | |
2597 | /*! |
2598 | \qmltype SingleControl |
2599 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2600 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2601 | \ingroup ubuntu-listitems |
2602 | \brief A list item containing a single control |
2603 | |
2604 | Examples: |
2605 | \qml |
2606 | - import Ubuntu.Components 0.1 |
2607 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2608 | + import Ubuntu.Components 1.0 |
2609 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2610 | Column { |
2611 | ListItem.SingleControl { |
2612 | control: Button { |
2613 | |
2614 | === modified file 'modules/Ubuntu/Components/ListItems/SingleValue.qml' |
2615 | --- modules/Ubuntu/Components/ListItems/SingleValue.qml 2013-11-06 22:52:15 +0000 |
2616 | +++ modules/Ubuntu/Components/ListItems/SingleValue.qml 2014-04-23 09:21:19 +0000 |
2617 | @@ -18,13 +18,13 @@ |
2618 | |
2619 | /*! |
2620 | \qmltype SingleValue |
2621 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2622 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2623 | \ingroup ubuntu-listitems |
2624 | \brief A list item displaying a single value |
2625 | |
2626 | Examples: |
2627 | \qml |
2628 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2629 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2630 | Column { |
2631 | ListItem.SingleValue { |
2632 | text: "Label" |
2633 | |
2634 | === modified file 'modules/Ubuntu/Components/ListItems/Standard.qml' |
2635 | --- modules/Ubuntu/Components/ListItems/Standard.qml 2013-11-07 19:45:58 +0000 |
2636 | +++ modules/Ubuntu/Components/ListItems/Standard.qml 2014-04-23 09:21:19 +0000 |
2637 | @@ -15,11 +15,11 @@ |
2638 | */ |
2639 | |
2640 | import QtQuick 2.0 |
2641 | -import Ubuntu.Components 0.1 |
2642 | +import Ubuntu.Components 1.0 |
2643 | |
2644 | /*! |
2645 | \qmltype Standard |
2646 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2647 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2648 | \ingroup ubuntu-listitems |
2649 | \brief The standard list item class. It shows a basic list item |
2650 | with a label (text), and optionally an icon, a progression arrow, |
2651 | @@ -30,8 +30,8 @@ |
2652 | |
2653 | Examples: |
2654 | \qml |
2655 | - import Ubuntu.Components 0.1 |
2656 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2657 | + import Ubuntu.Components 1.0 |
2658 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2659 | Column { |
2660 | ListItem.Standard { |
2661 | text: "Selectable standard list item" |
2662 | |
2663 | === modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml' |
2664 | --- modules/Ubuntu/Components/ListItems/Subtitled.qml 2013-11-06 22:52:15 +0000 |
2665 | +++ modules/Ubuntu/Components/ListItems/Subtitled.qml 2014-04-23 09:21:19 +0000 |
2666 | @@ -15,18 +15,18 @@ |
2667 | */ |
2668 | |
2669 | import QtQuick 2.0 |
2670 | -import Ubuntu.Components 0.1 |
2671 | +import Ubuntu.Components 1.0 |
2672 | |
2673 | /*! |
2674 | \qmltype MultiValue |
2675 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2676 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2677 | \ingroup ubuntu-listitems |
2678 | \brief List item displaying a second string under the main label. |
2679 | \b{This component is under heavy development.} |
2680 | |
2681 | Examples: |
2682 | \qml |
2683 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2684 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2685 | Column { |
2686 | ListItem.Subtitled { |
2687 | text: "Idle" |
2688 | |
2689 | === modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml' |
2690 | --- modules/Ubuntu/Components/ListItems/ThinDivider.qml 2013-11-19 08:51:02 +0000 |
2691 | +++ modules/Ubuntu/Components/ListItems/ThinDivider.qml 2014-04-23 09:21:19 +0000 |
2692 | @@ -18,7 +18,7 @@ |
2693 | |
2694 | /*! |
2695 | \qmltype ThinDivider |
2696 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2697 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2698 | \ingroup ubuntu-listitems |
2699 | \brief Narrow line used as a divider between ListItems. |
2700 | |
2701 | @@ -29,7 +29,7 @@ |
2702 | |
2703 | Examples: |
2704 | \qml |
2705 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2706 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2707 | Column { |
2708 | width: 250 |
2709 | ListItem.ThinDivider {} //can be used as header for list |
2710 | |
2711 | === modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml' |
2712 | --- modules/Ubuntu/Components/ListItems/ValueSelector.qml 2013-11-06 22:52:15 +0000 |
2713 | +++ modules/Ubuntu/Components/ListItems/ValueSelector.qml 2014-04-23 09:21:19 +0000 |
2714 | @@ -15,13 +15,13 @@ |
2715 | */ |
2716 | |
2717 | import QtQuick 2.0 |
2718 | -import Ubuntu.Components 0.1 |
2719 | +import Ubuntu.Components 1.0 |
2720 | |
2721 | /*! |
2722 | ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.**** |
2723 | |
2724 | \qmltype ValueSelector |
2725 | - \inqmlmodule Ubuntu.Components.ListItems 0.1 |
2726 | + \inqmlmodule Ubuntu.Components.ListItems 1.0 |
2727 | \ingroup ubuntu-listitems |
2728 | \brief List item displaying single selected value when not expanded, |
2729 | where expanding it opens a listing of all the possible values for selection. |
2730 | @@ -30,7 +30,7 @@ |
2731 | |
2732 | Examples: |
2733 | \qml |
2734 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2735 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2736 | Column { |
2737 | width: 250 |
2738 | ListItem.ValueSelector { |
2739 | |
2740 | === modified file 'modules/Ubuntu/Components/ListItems/qmldir' |
2741 | --- modules/Ubuntu/Components/ListItems/qmldir 2014-02-13 11:33:09 +0000 |
2742 | +++ modules/Ubuntu/Components/ListItems/qmldir 2014-04-23 09:21:19 +0000 |
2743 | @@ -1,3 +1,4 @@ |
2744 | +module Ubuntu.Components.ListItems |
2745 | Empty 0.1 Empty.qml |
2746 | Base 0.1 Base.qml |
2747 | Caption 0.1 Caption.qml |
2748 | @@ -16,3 +17,20 @@ |
2749 | ThinDivider 0.1 ThinDivider.qml |
2750 | Expandable 0.1 Expandable.qml |
2751 | ExpandablesColumn 0.1 ExpandablesColumn.qml |
2752 | + |
2753 | +#version 1.0 |
2754 | +Empty 1.0 Empty.qml |
2755 | +Base 1.0 Base.qml |
2756 | +Caption 1.0 Caption.qml |
2757 | +Divider 1.0 Divider.qml |
2758 | +Header 1.0 Header.qml |
2759 | +MultiValue 1.0 MultiValue.qml |
2760 | +ItemSelector 1.0 ItemSelector.qml |
2761 | +ValueSelector 1.0 ValueSelector.qml |
2762 | +SingleValue 1.0 SingleValue.qml |
2763 | +Standard 1.0 Standard.qml |
2764 | +Subtitled 1.0 Subtitled.qml |
2765 | +SingleControl 1.0 SingleControl.qml |
2766 | +ThinDivider 1.0 ThinDivider.qml |
2767 | +Expandable 1.0 Expandable.qml |
2768 | +ExpandablesColumn 1.0 ExpandablesColumn.qml |
2769 | |
2770 | === modified file 'modules/Ubuntu/Components/MainView.qml' |
2771 | --- modules/Ubuntu/Components/MainView.qml 2014-04-04 11:03:45 +0000 |
2772 | +++ modules/Ubuntu/Components/MainView.qml 2014-04-23 09:21:19 +0000 |
2773 | @@ -16,12 +16,12 @@ |
2774 | |
2775 | import QtQuick 2.0 |
2776 | import Ubuntu.Unity.Action 1.1 as UnityActions |
2777 | -import Ubuntu.PerformanceMetrics 0.1 |
2778 | +import Ubuntu.PerformanceMetrics 1.0 |
2779 | import QtQuick.Window 2.0 |
2780 | |
2781 | /*! |
2782 | \qmltype MainView |
2783 | - \inqmlmodule Ubuntu.Components 0.1 |
2784 | + \inqmlmodule Ubuntu.Components 1.0 |
2785 | \ingroup ubuntu |
2786 | \brief MainView is the root Item that should be used for all applications. |
2787 | It automatically adds a header and toolbar for its contents and can |
2788 | @@ -30,7 +30,7 @@ |
2789 | The simplest way to use a MainView is to include a \l Page object inside the MainView: |
2790 | \qml |
2791 | import QtQuick 2.0 |
2792 | - import Ubuntu.Components 0.1 |
2793 | + import Ubuntu.Components 1.0 |
2794 | |
2795 | MainView { |
2796 | width: units.gu(48) |
2797 | @@ -57,7 +57,7 @@ |
2798 | will automatically hide and show when the user scrolls up or down: |
2799 | \qml |
2800 | import QtQuick 2.0 |
2801 | - import Ubuntu.Components 0.1 |
2802 | + import Ubuntu.Components 1.0 |
2803 | |
2804 | MainView { |
2805 | width: units.gu(48) |
2806 | @@ -89,7 +89,7 @@ |
2807 | A toolbar can be added to the application by setting the tools property of the \l Page: |
2808 | \qml |
2809 | import QtQuick 2.0 |
2810 | - import Ubuntu.Components 0.1 |
2811 | + import Ubuntu.Components 1.0 |
2812 | |
2813 | MainView { |
2814 | width: units.gu(48) |
2815 | @@ -169,7 +169,7 @@ |
2816 | the content: |
2817 | \qml |
2818 | import QtQuick 2.0 |
2819 | - import Ubuntu.Components 0.1 |
2820 | + import Ubuntu.Components 1.0 |
2821 | |
2822 | MainView { |
2823 | width: units.gu(40) |
2824 | |
2825 | === modified file 'modules/Ubuntu/Components/Object.qml' |
2826 | --- modules/Ubuntu/Components/Object.qml 2012-11-14 11:01:37 +0000 |
2827 | +++ modules/Ubuntu/Components/Object.qml 2014-04-23 09:21:19 +0000 |
2828 | @@ -19,7 +19,7 @@ |
2829 | /*! |
2830 | \qmltype Object |
2831 | \internal |
2832 | - \inqmlmodule Ubuntu.Components 0.1 |
2833 | + \inqmlmodule Ubuntu.Components 1.0 |
2834 | \ingroup ubuntu |
2835 | \brief Internal type used for lightweight objects that can have children. |
2836 | */ |
2837 | |
2838 | === modified file 'modules/Ubuntu/Components/OptionSelector.qml' |
2839 | --- modules/Ubuntu/Components/OptionSelector.qml 2013-12-13 15:50:35 +0000 |
2840 | +++ modules/Ubuntu/Components/OptionSelector.qml 2014-04-23 09:21:19 +0000 |
2841 | @@ -16,11 +16,11 @@ |
2842 | |
2843 | import QtQuick 2.0 |
2844 | import "ListItems" as ListItem |
2845 | -import Ubuntu.Components 0.1 as Toolkit |
2846 | +import Ubuntu.Components 1.0 as Toolkit |
2847 | |
2848 | /*! |
2849 | \qmltype OptionSelector |
2850 | - \inqmlmodule Ubuntu.Components 0.1 |
2851 | + \inqmlmodule Ubuntu.Components 1.0 |
2852 | \ingroup ubuntu-components |
2853 | \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a |
2854 | listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically. |
2855 | @@ -29,7 +29,7 @@ |
2856 | |
2857 | Examples: |
2858 | \qml |
2859 | - import Ubuntu.Components 0.1 |
2860 | + import Ubuntu.Components 1.0 |
2861 | Column { |
2862 | spacing: units.gu(3) |
2863 | |
2864 | |
2865 | === modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml' |
2866 | --- modules/Ubuntu/Components/OptionSelectorDelegate.qml 2014-03-04 12:16:38 +0000 |
2867 | +++ modules/Ubuntu/Components/OptionSelectorDelegate.qml 2014-04-23 09:21:19 +0000 |
2868 | @@ -16,7 +16,7 @@ |
2869 | |
2870 | /*! |
2871 | \qmltype OptionSelectorDelegate |
2872 | - \inqmlmodule Ubuntu.Components 0.1 |
2873 | + \inqmlmodule Ubuntu.Components 1.0 |
2874 | \ingroup ubuntu-components |
2875 | \brief OptionSelector delegate which can display text, subtext and an image from a custom model. |
2876 | |
2877 | @@ -24,7 +24,7 @@ |
2878 | |
2879 | Examples: |
2880 | \qml |
2881 | - import Ubuntu.Components 0.1 |
2882 | + import Ubuntu.Components 1.0 |
2883 | Column { |
2884 | width: 250 |
2885 | OptionSelector { |
2886 | @@ -45,7 +45,7 @@ |
2887 | |
2888 | import QtQuick 2.0 |
2889 | import "ListItems" as ListItem |
2890 | -import Ubuntu.Components 0.1 as Toolkit |
2891 | +import Ubuntu.Components 1.0 as Toolkit |
2892 | |
2893 | ListItem.Standard { |
2894 | id: option |
2895 | |
2896 | === modified file 'modules/Ubuntu/Components/OrientationHelper.qml' |
2897 | --- modules/Ubuntu/Components/OrientationHelper.qml 2013-11-27 11:15:17 +0000 |
2898 | +++ modules/Ubuntu/Components/OrientationHelper.qml 2014-04-23 09:21:19 +0000 |
2899 | @@ -16,11 +16,11 @@ |
2900 | |
2901 | import QtQuick 2.0 |
2902 | import QtQuick.Window 2.0 |
2903 | -import Ubuntu.Components 0.1 as Ubuntu |
2904 | +import Ubuntu.Components 1.0 |
2905 | |
2906 | /*! |
2907 | \qmltype OrientationHelper |
2908 | - \inqmlmodule Ubuntu.Components 0.1 |
2909 | + \inqmlmodule Ubuntu.Components 1.0 |
2910 | \ingroup ubuntu |
2911 | \brief The OrientationHelper automatically rotates its children following the |
2912 | orientation of the device. |
2913 | @@ -188,8 +188,8 @@ |
2914 | RotationAnimation { |
2915 | target: orientationHelper |
2916 | properties: "rotation" |
2917 | - duration: Ubuntu.UbuntuAnimation.FastDuration |
2918 | - easing: Ubuntu.UbuntuAnimation.StandardEasing |
2919 | + duration: UbuntuAnimation.FastDuration |
2920 | + easing: UbuntuAnimation.StandardEasing |
2921 | direction: RotationAnimation.Shortest |
2922 | } |
2923 | } |
2924 | |
2925 | === modified file 'modules/Ubuntu/Components/Page.qml' |
2926 | --- modules/Ubuntu/Components/Page.qml 2014-04-07 10:03:39 +0000 |
2927 | +++ modules/Ubuntu/Components/Page.qml 2014-04-23 09:21:19 +0000 |
2928 | @@ -19,7 +19,7 @@ |
2929 | |
2930 | /*! |
2931 | \qmltype Page |
2932 | - \inqmlmodule Ubuntu.Components 0.1 |
2933 | + \inqmlmodule Ubuntu.Components 1.0 |
2934 | \ingroup ubuntu |
2935 | \brief A page is the basic Item that must be used inside the \l MainView, |
2936 | \l PageStack and \l Tabs. |
2937 | @@ -33,7 +33,7 @@ |
2938 | |
2939 | \qml |
2940 | import QtQuick 2.0 |
2941 | - import Ubuntu.Components 0.1 |
2942 | + import Ubuntu.Components 1.0 |
2943 | |
2944 | MainView { |
2945 | width: units.gu(48) |
2946 | @@ -94,7 +94,7 @@ |
2947 | and anchors to the top of the page or fills the page. For example: |
2948 | \qml |
2949 | import QtQuick 2.0 |
2950 | - import Ubuntu.Components 0.1 |
2951 | + import Ubuntu.Components 1.0 |
2952 | |
2953 | MainView { |
2954 | width: units.gu(30) |
2955 | |
2956 | === modified file 'modules/Ubuntu/Components/PageStack.qml' |
2957 | --- modules/Ubuntu/Components/PageStack.qml 2013-08-22 17:15:35 +0000 |
2958 | +++ modules/Ubuntu/Components/PageStack.qml 2014-04-23 09:21:19 +0000 |
2959 | @@ -19,7 +19,7 @@ |
2960 | |
2961 | /*! |
2962 | \qmltype PageStack |
2963 | - \inqmlmodule Ubuntu.Components 0.1 |
2964 | + \inqmlmodule Ubuntu.Components 1.0 |
2965 | \ingroup ubuntu |
2966 | \brief A stack of \l Page items that is used for inter-Page navigation. |
2967 | Pages on the stack can be popped, and new Pages can be pushed. |
2968 | @@ -39,8 +39,8 @@ |
2969 | Example: |
2970 | \qml |
2971 | import QtQuick 2.0 |
2972 | - import Ubuntu.Components 0.1 |
2973 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
2974 | + import Ubuntu.Components 1.0 |
2975 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
2976 | |
2977 | MainView { |
2978 | width: units.gu(48) |
2979 | |
2980 | === modified file 'modules/Ubuntu/Components/PageTreeNode.qml' |
2981 | --- modules/Ubuntu/Components/PageTreeNode.qml 2013-07-18 16:42:06 +0000 |
2982 | +++ modules/Ubuntu/Components/PageTreeNode.qml 2014-04-23 09:21:19 +0000 |
2983 | @@ -19,7 +19,7 @@ |
2984 | /*! |
2985 | \internal |
2986 | \qmltype PageTreeNode |
2987 | - \inqmlmodule Ubuntu.Components 0.1 |
2988 | + \inqmlmodule Ubuntu.Components 1.0 |
2989 | \ingroup ubuntu |
2990 | \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs. |
2991 | |
2992 | |
2993 | === modified file 'modules/Ubuntu/Components/PageWrapper.qml' |
2994 | --- modules/Ubuntu/Components/PageWrapper.qml 2013-03-11 16:20:14 +0000 |
2995 | +++ modules/Ubuntu/Components/PageWrapper.qml 2014-04-23 09:21:19 +0000 |
2996 | @@ -20,7 +20,7 @@ |
2997 | /*! |
2998 | \internal |
2999 | \qmltype PageWrapper |
3000 | - \inqmlmodule Ubuntu.Components 0.1 |
3001 | + \inqmlmodule Ubuntu.Components 1.0 |
3002 | \ingroup ubuntu |
3003 | \brief Internal class used by \l PageStack |
3004 | |
3005 | |
3006 | === modified file 'modules/Ubuntu/Components/Panel.qml' |
3007 | --- modules/Ubuntu/Components/Panel.qml 2014-04-02 09:47:42 +0000 |
3008 | +++ modules/Ubuntu/Components/Panel.qml 2014-04-23 09:21:19 +0000 |
3009 | @@ -15,11 +15,11 @@ |
3010 | */ |
3011 | |
3012 | import QtQuick 2.0 |
3013 | -import Ubuntu.Components 0.1 as Toolkit |
3014 | +import Ubuntu.Components 1.0 as Toolkit |
3015 | |
3016 | /*! |
3017 | \qmltype Panel |
3018 | - \inqmlmodule Ubuntu.Components 0.1 |
3019 | + \inqmlmodule Ubuntu.Components 1.0 |
3020 | \ingroup ubuntu |
3021 | \brief A panel that can be swiped in and out from an edge of the window by the user. |
3022 | For most applications, it is highly recommended to use the \l MainView instead which includes |
3023 | @@ -38,7 +38,7 @@ |
3024 | A black panel that can be swiped in from the lower-right of the window can be created like this: |
3025 | \qml |
3026 | import QtQuick 2.0 |
3027 | - import Ubuntu.Components 0.1 |
3028 | + import Ubuntu.Components 1.0 |
3029 | |
3030 | Item { |
3031 | width: units.gu(80) |
3032 | @@ -69,7 +69,7 @@ |
3033 | A panel that looks like the standard (bottom-aligned) toolbar, but with custom contents, can be created like this: |
3034 | \qml |
3035 | import QtQuick 2.0 |
3036 | - import Ubuntu.Components 0.1 |
3037 | + import Ubuntu.Components 1.0 |
3038 | |
3039 | Item { |
3040 | width: units.gu(80) |
3041 | @@ -106,7 +106,7 @@ |
3042 | signals are forwarded from the panel by calling the child's trigger() function. Example: |
3043 | \qml |
3044 | import QtQuick 2.0 |
3045 | - import Ubuntu.Components 0.1 |
3046 | + import Ubuntu.Components 1.0 |
3047 | |
3048 | Rectangle { |
3049 | color: Theme.palette.normal.background |
3050 | |
3051 | === modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml' |
3052 | --- modules/Ubuntu/Components/Pickers/DatePicker.qml 2014-03-06 10:46:17 +0000 |
3053 | +++ modules/Ubuntu/Components/Pickers/DatePicker.qml 2014-04-23 09:21:19 +0000 |
3054 | @@ -15,11 +15,11 @@ |
3055 | */ |
3056 | |
3057 | import QtQuick 2.0 |
3058 | -import Ubuntu.Components 0.1 |
3059 | +import Ubuntu.Components 1.0 |
3060 | |
3061 | /*! |
3062 | \qmltype DatePicker |
3063 | - \inqmlmodule Ubuntu.Components.Pickers 0.1 |
3064 | + \inqmlmodule Ubuntu.Components.Pickers 1.0 |
3065 | \ingroup ubuntu-pickers |
3066 | \brief DatePicker component provides date and time value picking functionality. |
3067 | |
3068 | @@ -36,8 +36,8 @@ |
3069 | |
3070 | \qml |
3071 | import QtQuick 2.0 |
3072 | - import Ubuntu.Components 0.1 |
3073 | - import Ubuntu.Components.Pickers 0.1 |
3074 | + import Ubuntu.Components 1.0 |
3075 | + import Ubuntu.Components.Pickers 1.0 |
3076 | |
3077 | Column { |
3078 | Label { |
3079 | @@ -56,8 +56,8 @@ |
3080 | which shows only year and month date units would look as follows: |
3081 | \qml |
3082 | import QtQuick 2.0 |
3083 | - import Ubuntu.Components 0.1 |
3084 | - import Ubuntu.Components.Pickers 0.1 |
3085 | + import Ubuntu.Components 1.0 |
3086 | + import Ubuntu.Components.Pickers 1.0 |
3087 | |
3088 | Column { |
3089 | Label { |
3090 | @@ -75,8 +75,8 @@ |
3091 | The following example demonstrates how to use DatePicker for time picking. |
3092 | \qml |
3093 | import QtQuick 2.0 |
3094 | - import Ubuntu.Components 0.1 |
3095 | - import Ubuntu.Components.Pickers 0.1 |
3096 | + import Ubuntu.Components 1.0 |
3097 | + import Ubuntu.Components.Pickers 1.0 |
3098 | |
3099 | Column { |
3100 | Label { |
3101 | @@ -112,8 +112,8 @@ |
3102 | \endlist |
3103 | \qml |
3104 | import QtQuick 2.0 |
3105 | - import Ubuntu.Components 0.1 |
3106 | - import Ubuntu.Components.Pickers 0.1 |
3107 | + import Ubuntu.Components 1.0 |
3108 | + import Ubuntu.Components.Pickers 1.0 |
3109 | |
3110 | Column { |
3111 | Label { |
3112 | |
3113 | === modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml' |
3114 | --- modules/Ubuntu/Components/Pickers/DayModel.qml 2013-12-10 16:52:07 +0000 |
3115 | +++ modules/Ubuntu/Components/Pickers/DayModel.qml 2014-04-23 09:21:19 +0000 |
3116 | @@ -15,7 +15,7 @@ |
3117 | */ |
3118 | |
3119 | import QtQuick 2.0 |
3120 | -import Ubuntu.Components 0.1 |
3121 | +import Ubuntu.Components 1.0 |
3122 | |
3123 | PickerModelBase { |
3124 | circular: true |
3125 | |
3126 | === modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml' |
3127 | --- modules/Ubuntu/Components/Pickers/Dialer.qml 2013-09-24 10:42:52 +0000 |
3128 | +++ modules/Ubuntu/Components/Pickers/Dialer.qml 2014-04-23 09:21:19 +0000 |
3129 | @@ -15,11 +15,11 @@ |
3130 | */ |
3131 | |
3132 | import QtQuick 2.0 |
3133 | -import "../" 0.1 |
3134 | +import Ubuntu.Components 1.0 |
3135 | |
3136 | /*! |
3137 | \qmltype Dialer |
3138 | - \inqmlmodule Ubuntu.Components.Pickers 0.1 |
3139 | + \inqmlmodule Ubuntu.Components.Pickers 1.0 |
3140 | \ingroup ubuntu-pickers |
3141 | \brief Dialer is a phone dialer style picker component. |
3142 | |
3143 | @@ -35,7 +35,7 @@ |
3144 | |
3145 | \qml |
3146 | import QtQuick 2.0 |
3147 | - import Ubuntu.Components.Pickers 0.1 |
3148 | + import Ubuntu.Components.Pickers 1.0 |
3149 | |
3150 | Dialer { |
3151 | size: units.gu(20) |
3152 | |
3153 | === modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml' |
3154 | --- modules/Ubuntu/Components/Pickers/DialerHand.qml 2013-09-24 11:02:17 +0000 |
3155 | +++ modules/Ubuntu/Components/Pickers/DialerHand.qml 2014-04-23 09:21:19 +0000 |
3156 | @@ -15,11 +15,11 @@ |
3157 | */ |
3158 | |
3159 | import QtQuick 2.0 |
3160 | -import "../" 0.1 |
3161 | +import Ubuntu.Components 1.0 |
3162 | |
3163 | /*! |
3164 | \qmltype DialerHand |
3165 | - \inqmlmodule Ubuntu.Components.Pickers 0.1 |
3166 | + \inqmlmodule Ubuntu.Components.Pickers 1.0 |
3167 | \ingroup ubuntu-pickers |
3168 | \brief DialerHand represents a value selector on a Dialer. |
3169 | |
3170 | |
3171 | === modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml' |
3172 | --- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml 2013-09-12 09:19:28 +0000 |
3173 | +++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml 2014-04-23 09:21:19 +0000 |
3174 | @@ -14,7 +14,7 @@ |
3175 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3176 | */ |
3177 | import QtQuick 2.0 |
3178 | -import "../" 0.1 |
3179 | +import Ubuntu.Components 1.0 |
3180 | |
3181 | /*! |
3182 | \internal |
3183 | |
3184 | === modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml' |
3185 | --- modules/Ubuntu/Components/Pickers/HoursModel.qml 2013-12-16 13:01:41 +0000 |
3186 | +++ modules/Ubuntu/Components/Pickers/HoursModel.qml 2014-04-23 09:21:19 +0000 |
3187 | @@ -15,7 +15,7 @@ |
3188 | */ |
3189 | |
3190 | import QtQuick 2.0 |
3191 | -import Ubuntu.Components 0.1 |
3192 | +import Ubuntu.Components 1.0 |
3193 | |
3194 | PickerModelBase { |
3195 | property int from |
3196 | |
3197 | === modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml' |
3198 | --- modules/Ubuntu/Components/Pickers/MinutesModel.qml 2013-12-13 11:22:51 +0000 |
3199 | +++ modules/Ubuntu/Components/Pickers/MinutesModel.qml 2014-04-23 09:21:19 +0000 |
3200 | @@ -15,7 +15,7 @@ |
3201 | */ |
3202 | |
3203 | import QtQuick 2.0 |
3204 | -import Ubuntu.Components 0.1 |
3205 | +import Ubuntu.Components 1.0 |
3206 | |
3207 | PickerModelBase { |
3208 | property int from |
3209 | |
3210 | === modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml' |
3211 | --- modules/Ubuntu/Components/Pickers/MonthModel.qml 2013-12-13 11:22:51 +0000 |
3212 | +++ modules/Ubuntu/Components/Pickers/MonthModel.qml 2014-04-23 09:21:19 +0000 |
3213 | @@ -15,7 +15,7 @@ |
3214 | */ |
3215 | |
3216 | import QtQuick 2.0 |
3217 | -import Ubuntu.Components 0.1 |
3218 | +import Ubuntu.Components 1.0 |
3219 | |
3220 | PickerModelBase { |
3221 | circular: (count >= 11) |
3222 | |
3223 | === modified file 'modules/Ubuntu/Components/Pickers/Picker.qml' |
3224 | --- modules/Ubuntu/Components/Pickers/Picker.qml 2014-03-06 10:46:17 +0000 |
3225 | +++ modules/Ubuntu/Components/Pickers/Picker.qml 2014-04-23 09:21:19 +0000 |
3226 | @@ -15,11 +15,11 @@ |
3227 | */ |
3228 | |
3229 | import QtQuick 2.0 |
3230 | -import Ubuntu.Components 0.1 |
3231 | +import Ubuntu.Components 1.0 |
3232 | |
3233 | /*! |
3234 | \qmltype Picker |
3235 | - \inqmlmodule Ubuntu.Components.Pickers 0.1 |
3236 | + \inqmlmodule Ubuntu.Components.Pickers 1.0 |
3237 | \ingroup ubuntu-pickers |
3238 | \brief Picker is a slot-machine style value selection component. |
3239 | |
3240 | @@ -35,8 +35,8 @@ |
3241 | Example: |
3242 | \qml |
3243 | import QtQuick 2.0 |
3244 | - import Ubuntu.Components 0.1 |
3245 | - import Ubuntu.Components.Pickers 0.1 |
3246 | + import Ubuntu.Components 1.0 |
3247 | + import Ubuntu.Components.Pickers 1.0 |
3248 | |
3249 | Picker { |
3250 | model: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"] |
3251 | |
3252 | === modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml' |
3253 | --- modules/Ubuntu/Components/Pickers/PickerDelegate.qml 2014-03-06 10:46:17 +0000 |
3254 | +++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml 2014-04-23 09:21:19 +0000 |
3255 | @@ -15,11 +15,11 @@ |
3256 | */ |
3257 | |
3258 | import QtQuick 2.0 |
3259 | -import "../" 0.1 |
3260 | +import Ubuntu.Components 1.0 |
3261 | |
3262 | /*! |
3263 | \qmltype PickerDelegate |
3264 | - \inqmlmodule Ubuntu.Components.Pickers 0.1 |
3265 | + \inqmlmodule Ubuntu.Components.Pickers 1.0 |
3266 | \ingroup ubuntu-pickers |
3267 | \brief PickerDelegate component serves as base for Picker delegates. |
3268 | |
3269 | |
3270 | === modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml' |
3271 | --- modules/Ubuntu/Components/Pickers/PickerPanel.qml 2014-02-19 10:36:14 +0000 |
3272 | +++ modules/Ubuntu/Components/Pickers/PickerPanel.qml 2014-04-23 09:21:19 +0000 |
3273 | @@ -16,13 +16,13 @@ |
3274 | |
3275 | import QtQuick 2.0 |
3276 | import QtQuick.Window 2.0 |
3277 | -import Ubuntu.Components 0.1 |
3278 | -import Ubuntu.Components.ListItems 0.1 |
3279 | -import Ubuntu.Components.Popups 0.1 |
3280 | +import Ubuntu.Components 1.0 |
3281 | +import Ubuntu.Components.ListItems 1.0 |
3282 | +import Ubuntu.Components.Popups 1.0 |
3283 | |
3284 | /*! |
3285 | \qmltype PickerPanel |
3286 | - \inqmlmodule Ubuntu.Components 0.1 |
3287 | + \inqmlmodule Ubuntu.Components 1.0 |
3288 | \ingroup ubuntu-pickers |
3289 | \brief Provides a panel for opening a DatePicker in place of the input panel or |
3290 | as Popover, depending on the form factor. |
3291 | @@ -32,7 +32,7 @@ |
3292 | on date pickers. |
3293 | \qml |
3294 | import QtQuick 2.0 |
3295 | - import Ubuntu.Components 0.1 |
3296 | + import Ubuntu.Components 1.0 |
3297 | |
3298 | MainWindow { |
3299 | width: units.gu(40) |
3300 | |
3301 | === modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml' |
3302 | --- modules/Ubuntu/Components/Pickers/PickerRow.qml 2014-03-06 10:46:17 +0000 |
3303 | +++ modules/Ubuntu/Components/Pickers/PickerRow.qml 2014-04-23 09:21:19 +0000 |
3304 | @@ -15,7 +15,7 @@ |
3305 | */ |
3306 | |
3307 | import QtQuick 2.0 |
3308 | -import Ubuntu.Components 0.1 |
3309 | +import Ubuntu.Components 1.0 |
3310 | |
3311 | Row { |
3312 | id: row |
3313 | |
3314 | === modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml' |
3315 | --- modules/Ubuntu/Components/Pickers/SecondsModel.qml 2013-12-13 11:22:51 +0000 |
3316 | +++ modules/Ubuntu/Components/Pickers/SecondsModel.qml 2014-04-23 09:21:19 +0000 |
3317 | @@ -15,7 +15,7 @@ |
3318 | */ |
3319 | |
3320 | import QtQuick 2.0 |
3321 | -import Ubuntu.Components 0.1 |
3322 | +import Ubuntu.Components 1.0 |
3323 | |
3324 | PickerModelBase { |
3325 | property int from |
3326 | |
3327 | === modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml' |
3328 | --- modules/Ubuntu/Components/Pickers/YearModel.qml 2013-12-13 11:22:51 +0000 |
3329 | +++ modules/Ubuntu/Components/Pickers/YearModel.qml 2014-04-23 09:21:19 +0000 |
3330 | @@ -15,7 +15,7 @@ |
3331 | */ |
3332 | |
3333 | import QtQuick 2.0 |
3334 | -import Ubuntu.Components 0.1 |
3335 | +import Ubuntu.Components 1.0 |
3336 | |
3337 | PickerModelBase { |
3338 | // local properties |
3339 | |
3340 | === modified file 'modules/Ubuntu/Components/Pickers/qmldir' |
3341 | --- modules/Ubuntu/Components/Pickers/qmldir 2013-12-10 16:37:04 +0000 |
3342 | +++ modules/Ubuntu/Components/Pickers/qmldir 2014-04-23 09:21:19 +0000 |
3343 | @@ -8,3 +8,10 @@ |
3344 | internal MonthModel MonthModel.qml |
3345 | internal DayModel DayModel.qml |
3346 | internal PickerModelBase PickerModelBase.qml |
3347 | + |
3348 | +#version 1.0 |
3349 | +Picker 1.0 Picker.qml |
3350 | +PickerDelegate 1.0 PickerDelegate.qml |
3351 | +Dialer 1.0 Dialer.qml |
3352 | +DialerHand 1.0 DialerHand.qml |
3353 | +DatePicker 1.0 DatePicker.qml |
3354 | |
3355 | === modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml' |
3356 | --- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml 2013-08-07 12:50:35 +0000 |
3357 | +++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml 2014-04-23 09:21:19 +0000 |
3358 | @@ -15,13 +15,13 @@ |
3359 | */ |
3360 | |
3361 | import QtQuick 2.0 |
3362 | -import "../" 0.1 |
3363 | -import "../ListItems" 0.1 |
3364 | +import Ubuntu.Components 1.0 |
3365 | +import Ubuntu.Components.ListItems 1.0 |
3366 | |
3367 | /*! |
3368 | \qmltype ActionSelectionPopover |
3369 | \inherits Popover |
3370 | - \inqmlmodule Ubuntu.Components.Popups 0.1 |
3371 | + \inqmlmodule Ubuntu.Components.Popups 1.0 |
3372 | \ingroup ubuntu-popups |
3373 | \brief A special popover presenting actions to the user. The popover is closed |
3374 | automatically when the action is chosen. |
3375 | |
3376 | === modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml' |
3377 | --- modules/Ubuntu/Components/Popups/ComposerSheet.qml 2013-11-05 00:34:46 +0000 |
3378 | +++ modules/Ubuntu/Components/Popups/ComposerSheet.qml 2014-04-23 09:21:19 +0000 |
3379 | @@ -15,11 +15,11 @@ |
3380 | */ |
3381 | |
3382 | import QtQuick 2.0 |
3383 | -import Ubuntu.Components 0.1 |
3384 | +import Ubuntu.Components 1.0 |
3385 | /*! |
3386 | \qmltype ComposerSheet |
3387 | \inherits SheetBase |
3388 | - \inqmlmodule Ubuntu.Components.Popups 0.1 |
3389 | + \inqmlmodule Ubuntu.Components.Popups 1.0 |
3390 | \ingroup ubuntu-popups |
3391 | \brief Much like the \l DefaultSheet the Composer Sheet allows an application to insert a content |
3392 | view over the focused view without disrupting the navigation pattern. However the Composer Sheet |
3393 | @@ -31,8 +31,8 @@ |
3394 | |
3395 | Example: |
3396 | \qml |
3397 | - import Ubuntu.Components 0.1 |
3398 | - import Ubuntu.Components.Popups 0.1 |
3399 | + import Ubuntu.Components 1.0 |
3400 | + import Ubuntu.Components.Popups 1.0 |
3401 | |
3402 | Item { |
3403 | Component { |
3404 | |
3405 | === modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml' |
3406 | --- modules/Ubuntu/Components/Popups/DefaultSheet.qml 2013-07-01 05:54:33 +0000 |
3407 | +++ modules/Ubuntu/Components/Popups/DefaultSheet.qml 2014-04-23 09:21:19 +0000 |
3408 | @@ -15,12 +15,12 @@ |
3409 | */ |
3410 | |
3411 | import QtQuick 2.0 |
3412 | -import Ubuntu.Components 0.1 |
3413 | +import Ubuntu.Components 1.0 |
3414 | |
3415 | /*! |
3416 | \qmltype DefaultSheet |
3417 | \inherits SheetBase |
3418 | - \inqmlmodule Ubuntu.Components.Popups 0.1 |
3419 | + \inqmlmodule Ubuntu.Components.Popups 1.0 |
3420 | \ingroup ubuntu-popups |
3421 | \brief The Default Sheet allows an application to insert a content view over the focused view |
3422 | without disrupting the navigation pattern (tabs state or drill-down path are maintained. When |
3423 | @@ -32,8 +32,8 @@ |
3424 | |
3425 | Example: |
3426 | \qml |
3427 | - import Ubuntu.Components 0.1 |
3428 | - import Ubuntu.Components.Popups 0.1 |
3429 | + import Ubuntu.Components 1.0 |
3430 | + import Ubuntu.Components.Popups 1.0 |
3431 | |
3432 | Item { |
3433 | Component { |
3434 | |
3435 | === modified file 'modules/Ubuntu/Components/Popups/Dialog.qml' |
3436 | --- modules/Ubuntu/Components/Popups/Dialog.qml 2013-07-15 10:28:04 +0000 |
3437 | +++ modules/Ubuntu/Components/Popups/Dialog.qml 2014-04-23 09:21:19 +0000 |
3438 | @@ -15,13 +15,13 @@ |
3439 | */ |
3440 | |
3441 | import QtQuick 2.0 |
3442 | -import Ubuntu.Components 0.1 |
3443 | +import Ubuntu.Components 1.0 |
3444 | import "internalPopupUtils.js" as InternalPopupUtils |
3445 | |
3446 | /*! |
3447 | \qmltype Dialog |
3448 | \inherits PopupBase |
3449 | - \inqmlmodule Ubuntu.Components.Popups 0.1 |
3450 | + \inqmlmodule Ubuntu.Components.Popups 1.0 |
3451 | \ingroup ubuntu-popups |
3452 | \brief The Dialog caters for cases in which the application requires the user to determine |
3453 | between optional actions. The Dialog will interrupt the user flow and lock the view |
3454 | @@ -33,8 +33,8 @@ |
3455 | Example: |
3456 | \qml |
3457 | import QtQuick 2.0 |
3458 | - import Ubuntu.Components 0.1 |
3459 | - import Ubuntu.Components.Popups 0.1 |
3460 | + import Ubuntu.Components 1.0 |
3461 | + import Ubuntu.Components.Popups 1.0 |
3462 | |
3463 | Item { |
3464 | width: units.gu(80) |
3465 | |
3466 | === modified file 'modules/Ubuntu/Components/Popups/Popover.qml' |
3467 | --- modules/Ubuntu/Components/Popups/Popover.qml 2014-01-10 15:34:32 +0000 |
3468 | +++ modules/Ubuntu/Components/Popups/Popover.qml 2014-04-23 09:21:19 +0000 |
3469 | @@ -16,12 +16,12 @@ |
3470 | |
3471 | import QtQuick 2.0 |
3472 | import "internalPopupUtils.js" as InternalPopupUtils |
3473 | -import Ubuntu.Components 0.1 |
3474 | +import Ubuntu.Components 1.0 |
3475 | |
3476 | /*! |
3477 | \qmltype Popover |
3478 | \inherits PopupBase |
3479 | - \inqmlmodule Ubuntu.Components.Popups 0.1 |
3480 | + \inqmlmodule Ubuntu.Components.Popups 1.0 |
3481 | \ingroup ubuntu-popups |
3482 | \brief A popover allows an application to present additional content without changing the view. |
3483 | A popover has a fixed width and automatic height, depending on is contents. |
3484 | @@ -32,9 +32,9 @@ |
3485 | Example: |
3486 | \qml |
3487 | import QtQuick 2.0 |
3488 | - import Ubuntu.Components 0.1 |
3489 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
3490 | - import Ubuntu.Components.Popups 0.1 |
3491 | + import Ubuntu.Components 1.0 |
3492 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
3493 | + import Ubuntu.Components.Popups 1.0 |
3494 | |
3495 | Rectangle { |
3496 | color: Theme.palette.normal.background |
3497 | |
3498 | === modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml' |
3499 | --- modules/Ubuntu/Components/Popups/PopupBase.qml 2014-01-08 16:32:38 +0000 |
3500 | +++ modules/Ubuntu/Components/Popups/PopupBase.qml 2014-04-23 09:21:19 +0000 |
3501 | @@ -15,11 +15,11 @@ |
3502 | */ |
3503 | |
3504 | import QtQuick 2.0 |
3505 | -import Ubuntu.Components 0.1 |
3506 | +import Ubuntu.Components 1.0 |
3507 | |
3508 | /*! |
3509 | \qmltype PopupBase |
3510 | - \inqmlmodule Ubuntu.Components.Popups 0.1 |
3511 | + \inqmlmodule Ubuntu.Components.Popups 1.0 |
3512 | \ingroup ubuntu-popups |
3513 | \brief The base class for all dialogs, sheets and popovers. Do not use directly. |
3514 | |
3515 | |
3516 | === modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml' |
3517 | --- modules/Ubuntu/Components/Popups/SheetBase.qml 2013-06-27 15:20:12 +0000 |
3518 | +++ modules/Ubuntu/Components/Popups/SheetBase.qml 2014-04-23 09:21:19 +0000 |
3519 | @@ -15,11 +15,11 @@ |
3520 | */ |
3521 | |
3522 | import QtQuick 2.0 |
3523 | -import Ubuntu.Components 0.1 |
3524 | +import Ubuntu.Components 1.0 |
3525 | |
3526 | /*! |
3527 | \qmltype SheetBase |
3528 | - \inqmlmodule Ubuntu.Components.Popups 0.1 |
3529 | + \inqmlmodule Ubuntu.Components.Popups 1.0 |
3530 | \ingroup ubuntu-popups |
3531 | \brief Parent class of different types of sheets. Not to be used directly. |
3532 | |
3533 | |
3534 | === modified file 'modules/Ubuntu/Components/Popups/qmldir' |
3535 | --- modules/Ubuntu/Components/Popups/qmldir 2013-07-13 14:35:21 +0000 |
3536 | +++ modules/Ubuntu/Components/Popups/qmldir 2014-04-23 09:21:19 +0000 |
3537 | @@ -9,3 +9,14 @@ |
3538 | ActionSelectionPopover 0.1 ActionSelectionPopover.qml |
3539 | |
3540 | PopupUtils 0.1 popupUtils.js |
3541 | + |
3542 | +#version 1.0 |
3543 | +Dialog 1.0 Dialog.qml |
3544 | +PopupBase 1.0 PopupBase.qml |
3545 | +Popover 1.0 Popover.qml |
3546 | +SheetBase 1.0 SheetBase.qml |
3547 | +DefaultSheet 1.0 DefaultSheet.qml |
3548 | +ComposerSheet 1.0 ComposerSheet.qml |
3549 | +ActionSelectionPopover 1.0 ActionSelectionPopover.qml |
3550 | + |
3551 | +PopupUtils 1.0 popupUtils.js |
3552 | |
3553 | === modified file 'modules/Ubuntu/Components/ProgressBar.qml' |
3554 | --- modules/Ubuntu/Components/ProgressBar.qml 2013-08-01 14:06:36 +0000 |
3555 | +++ modules/Ubuntu/Components/ProgressBar.qml 2014-04-23 09:21:19 +0000 |
3556 | @@ -18,7 +18,7 @@ |
3557 | |
3558 | /*! |
3559 | \qmltype ProgressBar |
3560 | - \inqmlmodule Ubuntu.Components 0.1 |
3561 | + \inqmlmodule Ubuntu.Components 1.0 |
3562 | \ingroup ubuntu |
3563 | \brief The ProgressBar component visually indicates the progress of a process of |
3564 | determinate or indeterminate duration. |
3565 | |
3566 | === modified file 'modules/Ubuntu/Components/Scrollbar.qml' |
3567 | --- modules/Ubuntu/Components/Scrollbar.qml 2013-06-27 15:20:12 +0000 |
3568 | +++ modules/Ubuntu/Components/Scrollbar.qml 2014-04-23 09:21:19 +0000 |
3569 | @@ -18,7 +18,7 @@ |
3570 | |
3571 | /*! |
3572 | \qmltype ScrollBar |
3573 | - \inqmlmodule Ubuntu.Components 0.1 |
3574 | + \inqmlmodule Ubuntu.Components 1.0 |
3575 | \ingroup ubuntu |
3576 | \brief The ScrollBar component provides scrolling functionality for |
3577 | scrollable views (i.e. Flickable, ListView). |
3578 | |
3579 | === modified file 'modules/Ubuntu/Components/Slider.qml' |
3580 | --- modules/Ubuntu/Components/Slider.qml 2014-01-08 16:32:38 +0000 |
3581 | +++ modules/Ubuntu/Components/Slider.qml 2014-04-23 09:21:19 +0000 |
3582 | @@ -21,7 +21,7 @@ |
3583 | |
3584 | /*! |
3585 | \qmltype Slider |
3586 | - \inqmlmodule Ubuntu.Components 0.1 |
3587 | + \inqmlmodule Ubuntu.Components 1.0 |
3588 | \ingroup ubuntu |
3589 | \brief Slider is a component to select a value from a continuous range of |
3590 | values. |
3591 | |
3592 | === modified file 'modules/Ubuntu/Components/StyledItem.qml' |
3593 | --- modules/Ubuntu/Components/StyledItem.qml 2013-06-27 15:36:28 +0000 |
3594 | +++ modules/Ubuntu/Components/StyledItem.qml 2014-04-23 09:21:19 +0000 |
3595 | @@ -18,7 +18,7 @@ |
3596 | |
3597 | /*! |
3598 | \qmlabstract StyledItem |
3599 | - \inqmlmodule Ubuntu.Components 0.1 |
3600 | + \inqmlmodule Ubuntu.Components 1.0 |
3601 | \ingroup theming |
3602 | \brief The StyledItem class allows items to be styled by the theme. |
3603 | |
3604 | |
3605 | === modified file 'modules/Ubuntu/Components/Switch.qml' |
3606 | --- modules/Ubuntu/Components/Switch.qml 2013-06-27 15:20:12 +0000 |
3607 | +++ modules/Ubuntu/Components/Switch.qml 2014-04-23 09:21:19 +0000 |
3608 | @@ -21,7 +21,7 @@ |
3609 | |
3610 | /*! |
3611 | \qmltype Switch |
3612 | - \inqmlmodule Ubuntu.Components 0.1 |
3613 | + \inqmlmodule Ubuntu.Components 1.0 |
3614 | \ingroup ubuntu |
3615 | \brief Switch is a component with two states, checked or unchecked. It can |
3616 | be used to set boolean options. The behavior is the same as \l CheckBox, the |
3617 | |
3618 | === modified file 'modules/Ubuntu/Components/Tab.qml' |
3619 | --- modules/Ubuntu/Components/Tab.qml 2014-04-16 11:51:47 +0000 |
3620 | +++ modules/Ubuntu/Components/Tab.qml 2014-04-23 09:21:19 +0000 |
3621 | @@ -18,7 +18,7 @@ |
3622 | |
3623 | /*! |
3624 | \qmltype Tab |
3625 | - \inqmlmodule Ubuntu.Components 0.1 |
3626 | + \inqmlmodule Ubuntu.Components 1.0 |
3627 | \ingroup ubuntu |
3628 | \brief Component to represent a single tab in a \l Tabs environment. |
3629 | |
3630 | |
3631 | === modified file 'modules/Ubuntu/Components/TabBar.qml' |
3632 | --- modules/Ubuntu/Components/TabBar.qml 2014-04-08 12:38:35 +0000 |
3633 | +++ modules/Ubuntu/Components/TabBar.qml 2014-04-23 09:21:19 +0000 |
3634 | @@ -18,7 +18,7 @@ |
3635 | |
3636 | /*! |
3637 | \qmltype TabBar |
3638 | - \inqmlmodule Ubuntu.Components 0.1 |
3639 | + \inqmlmodule Ubuntu.Components 1.0 |
3640 | \ingroup ubuntu |
3641 | \brief Tab bar that will be shown in the header when \l Tabs is active. |
3642 | This component does not need to be instantiated by the developer, it is |
3643 | |
3644 | === modified file 'modules/Ubuntu/Components/Tabs.qml' |
3645 | --- modules/Ubuntu/Components/Tabs.qml 2014-04-16 11:51:47 +0000 |
3646 | +++ modules/Ubuntu/Components/Tabs.qml 2014-04-23 09:21:19 +0000 |
3647 | @@ -18,7 +18,7 @@ |
3648 | |
3649 | /*! |
3650 | \qmltype Tabs |
3651 | - \inqmlmodule Ubuntu.Components 0.1 |
3652 | + \inqmlmodule Ubuntu.Components 1.0 |
3653 | \ingroup ubuntu |
3654 | \brief The Tabs class provides an environment where multible \l Tab |
3655 | children can be added, and the user is presented with a tab |
3656 | @@ -33,8 +33,8 @@ |
3657 | Example: |
3658 | \qml |
3659 | import QtQuick 2.0 |
3660 | - import Ubuntu.Components 0.1 |
3661 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
3662 | + import Ubuntu.Components 1.0 |
3663 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
3664 | |
3665 | MainView { |
3666 | width: units.gu(48) |
3667 | @@ -104,7 +104,7 @@ |
3668 | |
3669 | \qml |
3670 | import QtQuick 2.0 |
3671 | - import Ubuntu.Components 0.1 |
3672 | + import Ubuntu.Components 1.0 |
3673 | |
3674 | MainView { |
3675 | id: mainView |
3676 | |
3677 | === modified file 'modules/Ubuntu/Components/TextArea.qml' |
3678 | --- modules/Ubuntu/Components/TextArea.qml 2014-01-08 16:32:38 +0000 |
3679 | +++ modules/Ubuntu/Components/TextArea.qml 2014-04-23 09:21:19 +0000 |
3680 | @@ -19,7 +19,7 @@ |
3681 | |
3682 | /*! |
3683 | \qmltype TextArea |
3684 | - \inqmlmodule Ubuntu.Components 0.1 |
3685 | + \inqmlmodule Ubuntu.Components 1.0 |
3686 | \ingroup ubuntu |
3687 | \brief The TextArea item displays a block of editable, scrollable, formatted |
3688 | text. |
3689 | |
3690 | === modified file 'modules/Ubuntu/Components/TextField.qml' |
3691 | --- modules/Ubuntu/Components/TextField.qml 2014-03-17 17:58:47 +0000 |
3692 | +++ modules/Ubuntu/Components/TextField.qml 2014-04-23 09:21:19 +0000 |
3693 | @@ -19,7 +19,7 @@ |
3694 | |
3695 | /*! |
3696 | \qmltype TextField |
3697 | - \inqmlmodule Ubuntu.Components 0.1 |
3698 | + \inqmlmodule Ubuntu.Components 1.0 |
3699 | \ingroup ubuntu |
3700 | \brief The TextField element displays a single line of editable plain text. |
3701 | Input constraints can be set through validator or inputMask. Setting echoMode |
3702 | @@ -504,7 +504,7 @@ |
3703 | |
3704 | \qml |
3705 | import QtQuick 2.0 |
3706 | - import Ubuntu.Components 0.1 |
3707 | + import Ubuntu.Components 1.0 |
3708 | TextField{ |
3709 | validator: IntValidator{bottom: 11; top: 31;} |
3710 | focus: true |
3711 | |
3712 | === modified file 'modules/Ubuntu/Components/TextInputPopover.qml' |
3713 | --- modules/Ubuntu/Components/TextInputPopover.qml 2014-03-17 18:17:23 +0000 |
3714 | +++ modules/Ubuntu/Components/TextInputPopover.qml 2014-04-23 09:21:19 +0000 |
3715 | @@ -15,7 +15,7 @@ |
3716 | */ |
3717 | |
3718 | import QtQuick 2.0 |
3719 | -import Ubuntu.Components 0.1 as Toolkit |
3720 | +import Ubuntu.Components 1.0 as Toolkit |
3721 | import "Popups" 0.1 |
3722 | |
3723 | ActionSelectionPopover { |
3724 | |
3725 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml' |
3726 | --- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml 2013-06-27 15:20:12 +0000 |
3727 | +++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml 2014-04-23 09:21:19 +0000 |
3728 | @@ -15,7 +15,7 @@ |
3729 | */ |
3730 | |
3731 | import QtQuick 2.0 |
3732 | -import Ubuntu.Components 0.1 |
3733 | +import Ubuntu.Components 1.0 |
3734 | |
3735 | Image { |
3736 | id: container |
3737 | |
3738 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml' |
3739 | --- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml 2013-08-21 15:35:56 +0000 |
3740 | +++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml 2014-04-23 09:21:19 +0000 |
3741 | @@ -15,7 +15,7 @@ |
3742 | */ |
3743 | |
3744 | import QtQuick 2.0 |
3745 | -import Ubuntu.Components 0.1 |
3746 | +import Ubuntu.Components 1.0 |
3747 | |
3748 | Item { |
3749 | id: bubbleShape |
3750 | |
3751 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml' |
3752 | --- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml 2013-07-01 22:26:49 +0000 |
3753 | +++ modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml 2014-04-23 09:21:19 +0000 |
3754 | @@ -17,7 +17,7 @@ |
3755 | */ |
3756 | |
3757 | import QtQuick 2.0 |
3758 | -import Ubuntu.Components 0.1 |
3759 | +import Ubuntu.Components 1.0 |
3760 | |
3761 | Item { |
3762 | id: buttonForeground |
3763 | |
3764 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml' |
3765 | --- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml 2014-02-04 22:07:10 +0000 |
3766 | +++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml 2014-04-23 09:21:19 +0000 |
3767 | @@ -17,7 +17,7 @@ |
3768 | */ |
3769 | |
3770 | import QtQuick 2.0 |
3771 | -import Ubuntu.Components 0.1 |
3772 | +import Ubuntu.Components 1.0 |
3773 | |
3774 | Item { |
3775 | id: buttonStyle |
3776 | |
3777 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml' |
3778 | --- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml 2014-02-05 19:59:43 +0000 |
3779 | +++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml 2014-04-23 09:21:19 +0000 |
3780 | @@ -15,7 +15,7 @@ |
3781 | */ |
3782 | |
3783 | import QtQuick 2.0 |
3784 | -import Ubuntu.Components 0.1 |
3785 | +import Ubuntu.Components 1.0 |
3786 | |
3787 | Item { |
3788 | id: checkBoxStyle |
3789 | |
3790 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml' |
3791 | --- modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml 2013-12-16 15:07:12 +0000 |
3792 | +++ modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml 2014-04-23 09:21:19 +0000 |
3793 | @@ -15,8 +15,8 @@ |
3794 | */ |
3795 | |
3796 | import QtQuick 2.0 |
3797 | -import Ubuntu.Components 0.1 |
3798 | -import Ubuntu.Components.ListItems 0.1 |
3799 | +import Ubuntu.Components 1.0 |
3800 | +import Ubuntu.Components.ListItems 1.0 |
3801 | |
3802 | Item { |
3803 | id: control |
3804 | |
3805 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml' |
3806 | --- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml 2013-09-12 09:17:11 +0000 |
3807 | +++ modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml 2014-04-23 09:21:19 +0000 |
3808 | @@ -15,7 +15,7 @@ |
3809 | */ |
3810 | |
3811 | import QtQuick 2.0 |
3812 | -import Ubuntu.Components 0.1 |
3813 | +import Ubuntu.Components 1.0 |
3814 | |
3815 | Item { |
3816 | // style API |
3817 | |
3818 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml' |
3819 | --- modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml 2013-09-24 14:22:16 +0000 |
3820 | +++ modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml 2014-04-23 09:21:19 +0000 |
3821 | @@ -15,7 +15,7 @@ |
3822 | */ |
3823 | |
3824 | import QtQuick 2.0 |
3825 | -import Ubuntu.Components 0.1 |
3826 | +import Ubuntu.Components 1.0 |
3827 | import QtGraphicalEffects 1.0 |
3828 | |
3829 | // FIXME: Replace this once UbuntuShape support for gradients and shading has landed |
3830 | |
3831 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml' |
3832 | --- modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml 2013-07-13 15:35:59 +0000 |
3833 | +++ modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml 2014-04-23 09:21:19 +0000 |
3834 | @@ -15,7 +15,7 @@ |
3835 | */ |
3836 | |
3837 | import QtQuick 2.0 |
3838 | -import Ubuntu.Components 0.1 |
3839 | +import Ubuntu.Components 1.0 |
3840 | |
3841 | Item { |
3842 | id: dialogForegroundStyle |
3843 | |
3844 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml' |
3845 | --- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml 2014-03-12 09:36:00 +0000 |
3846 | +++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml 2014-04-23 09:21:19 +0000 |
3847 | @@ -14,7 +14,7 @@ |
3848 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3849 | */ |
3850 | import QtQuick 2.0 |
3851 | -import Ubuntu.Components 0.1 |
3852 | +import Ubuntu.Components 1.0 |
3853 | |
3854 | Item { |
3855 | id: headerStyle |
3856 | |
3857 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml' |
3858 | --- modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml 2013-09-03 10:12:39 +0000 |
3859 | +++ modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml 2014-04-23 09:21:19 +0000 |
3860 | @@ -16,7 +16,7 @@ |
3861 | */ |
3862 | |
3863 | import QtQuick 2.0 |
3864 | -import Ubuntu.Components 0.1 |
3865 | +import Ubuntu.Components 1.0 |
3866 | |
3867 | Item { |
3868 | id: ambianceStyle |
3869 | |
3870 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml' |
3871 | --- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml 2014-02-07 16:13:47 +0000 |
3872 | +++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml 2014-04-23 09:21:19 +0000 |
3873 | @@ -14,7 +14,7 @@ |
3874 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3875 | */ |
3876 | import QtQuick 2.0 |
3877 | -import Ubuntu.Components 0.1 |
3878 | +import Ubuntu.Components 1.0 |
3879 | |
3880 | Item { |
3881 | // styling properties |
3882 | |
3883 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml' |
3884 | --- modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml 2013-08-28 10:43:46 +0000 |
3885 | +++ modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml 2014-04-23 09:21:19 +0000 |
3886 | @@ -16,7 +16,7 @@ |
3887 | */ |
3888 | |
3889 | import QtQuick 2.0 |
3890 | -import Ubuntu.Components 0.1 |
3891 | +import Ubuntu.Components 1.0 |
3892 | |
3893 | Item { |
3894 | id: ambianceStyle |
3895 | |
3896 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml' |
3897 | --- modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml 2014-03-06 10:46:17 +0000 |
3898 | +++ modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml 2014-04-23 09:21:19 +0000 |
3899 | @@ -15,7 +15,7 @@ |
3900 | */ |
3901 | |
3902 | import QtQuick 2.0 |
3903 | -import Ubuntu.Components 0.1 |
3904 | +import Ubuntu.Components 1.0 |
3905 | |
3906 | Item { |
3907 | property real minFade: 0.2 |
3908 | |
3909 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml' |
3910 | --- modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml 2013-12-12 14:10:17 +0000 |
3911 | +++ modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml 2014-04-23 09:21:19 +0000 |
3912 | @@ -15,8 +15,8 @@ |
3913 | */ |
3914 | |
3915 | import QtQuick 2.0 |
3916 | -import Ubuntu.Components 0.1 |
3917 | -import Ubuntu.Components.ListItems 0.1 |
3918 | +import Ubuntu.Components 1.0 |
3919 | +import Ubuntu.Components.ListItems 1.0 |
3920 | |
3921 | Item { |
3922 | id: control |
3923 | |
3924 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml' |
3925 | --- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml 2014-02-04 22:07:10 +0000 |
3926 | +++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml 2014-04-23 09:21:19 +0000 |
3927 | @@ -15,7 +15,7 @@ |
3928 | */ |
3929 | |
3930 | import QtQuick 2.0 |
3931 | -import Ubuntu.Components 0.1 |
3932 | +import Ubuntu.Components 1.0 |
3933 | |
3934 | Item { |
3935 | id: progressBarStyle |
3936 | |
3937 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml' |
3938 | --- modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml 2014-01-08 16:32:38 +0000 |
3939 | +++ modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml 2014-04-23 09:21:19 +0000 |
3940 | @@ -15,7 +15,7 @@ |
3941 | */ |
3942 | |
3943 | import QtQuick 2.0 |
3944 | -import Ubuntu.Components 0.1 |
3945 | +import Ubuntu.Components 1.0 |
3946 | |
3947 | Item { |
3948 | id: progressionVisualStyle |
3949 | |
3950 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml' |
3951 | --- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml 2014-02-06 14:07:33 +0000 |
3952 | +++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml 2014-04-23 09:21:19 +0000 |
3953 | @@ -15,7 +15,7 @@ |
3954 | */ |
3955 | |
3956 | import QtQuick 2.0 |
3957 | -import Ubuntu.Components 0.1 |
3958 | +import Ubuntu.Components 1.0 |
3959 | |
3960 | /* |
3961 | The visuals handle both active and passive modes. This behavior is driven yet by |
3962 | |
3963 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml' |
3964 | --- modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml 2013-06-27 15:20:12 +0000 |
3965 | +++ modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml 2014-04-23 09:21:19 +0000 |
3966 | @@ -15,7 +15,7 @@ |
3967 | */ |
3968 | |
3969 | import QtQuick 2.0 |
3970 | -import Ubuntu.Components 0.1 |
3971 | +import Ubuntu.Components 1.0 |
3972 | |
3973 | EditorCursorStyle { |
3974 | id: cursor |
3975 | |
3976 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml' |
3977 | --- modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml 2013-06-27 15:20:12 +0000 |
3978 | +++ modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml 2014-04-23 09:21:19 +0000 |
3979 | @@ -15,7 +15,7 @@ |
3980 | */ |
3981 | |
3982 | import QtQuick 2.0 |
3983 | -import Ubuntu.Components 0.1 |
3984 | +import Ubuntu.Components 1.0 |
3985 | |
3986 | Item { |
3987 | id: visuals |
3988 | |
3989 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml' |
3990 | --- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml 2014-02-04 22:07:10 +0000 |
3991 | +++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml 2014-04-23 09:21:19 +0000 |
3992 | @@ -15,7 +15,7 @@ |
3993 | */ |
3994 | |
3995 | import QtQuick 2.0 |
3996 | -import Ubuntu.Components 0.1 |
3997 | +import Ubuntu.Components 1.0 |
3998 | |
3999 | /* |
4000 | The default slider style consists of a bar and a thumb shape. |
4001 | |
4002 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml' |
4003 | --- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml 2014-02-04 22:07:10 +0000 |
4004 | +++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml 2014-04-23 09:21:19 +0000 |
4005 | @@ -15,7 +15,7 @@ |
4006 | */ |
4007 | |
4008 | import QtQuick 2.0 |
4009 | -import Ubuntu.Components 0.1 |
4010 | +import Ubuntu.Components 1.0 |
4011 | |
4012 | Item { |
4013 | id: switchStyle |
4014 | |
4015 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml' |
4016 | --- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml 2014-04-16 11:51:47 +0000 |
4017 | +++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml 2014-04-23 09:21:19 +0000 |
4018 | @@ -15,7 +15,7 @@ |
4019 | */ |
4020 | |
4021 | import QtQuick 2.0 |
4022 | -import Ubuntu.Components 0.1 |
4023 | +import Ubuntu.Components 1.0 |
4024 | |
4025 | Item { |
4026 | id: tabBarStyle |
4027 | |
4028 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml' |
4029 | --- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml 2013-07-04 21:54:54 +0000 |
4030 | +++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml 2014-04-23 09:21:19 +0000 |
4031 | @@ -15,7 +15,7 @@ |
4032 | */ |
4033 | |
4034 | import QtQuick 2.0 |
4035 | -import Ubuntu.Components 0.1 |
4036 | +import Ubuntu.Components 1.0 |
4037 | |
4038 | // frame |
4039 | Item { |
4040 | |
4041 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml' |
4042 | --- modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml 2013-07-04 21:36:23 +0000 |
4043 | +++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml 2014-04-23 09:21:19 +0000 |
4044 | @@ -15,7 +15,7 @@ |
4045 | */ |
4046 | |
4047 | import QtQuick 2.0 |
4048 | -import Ubuntu.Components 0.1 |
4049 | +import Ubuntu.Components 1.0 |
4050 | |
4051 | Item { |
4052 | id: visuals |
4053 | |
4054 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml' |
4055 | --- modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml 2013-07-04 21:36:23 +0000 |
4056 | +++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml 2014-04-23 09:21:19 +0000 |
4057 | @@ -14,7 +14,7 @@ |
4058 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4059 | */ |
4060 | import QtQuick 2.0 |
4061 | -import Ubuntu.Components 0.1 |
4062 | +import Ubuntu.Components 1.0 |
4063 | |
4064 | Item { |
4065 | id: visuals |
4066 | |
4067 | === modified file 'modules/Ubuntu/Components/Toolbar.qml' |
4068 | --- modules/Ubuntu/Components/Toolbar.qml 2014-04-01 12:47:51 +0000 |
4069 | +++ modules/Ubuntu/Components/Toolbar.qml 2014-04-23 09:21:19 +0000 |
4070 | @@ -19,7 +19,7 @@ |
4071 | /*! |
4072 | \internal |
4073 | \qmltype Toolbar |
4074 | - \inqmlmodule Ubuntu.Components 0.1 |
4075 | + \inqmlmodule Ubuntu.Components 1.0 |
4076 | \ingroup ubuntu |
4077 | \brief Application toolbar. This class is not exposed because it will |
4078 | be automatically added when a Page defines tools. |
4079 | |
4080 | === modified file 'modules/Ubuntu/Components/ToolbarButton.qml' |
4081 | --- modules/Ubuntu/Components/ToolbarButton.qml 2013-11-06 22:52:15 +0000 |
4082 | +++ modules/Ubuntu/Components/ToolbarButton.qml 2014-04-23 09:21:19 +0000 |
4083 | @@ -18,7 +18,7 @@ |
4084 | |
4085 | /*! |
4086 | \qmltype ToolbarButton |
4087 | - \inqmlmodule Ubuntu.Components 0.1 |
4088 | + \inqmlmodule Ubuntu.Components 1.0 |
4089 | \ingroup ubuntu |
4090 | \brief An \l ActionItem that represents a button in the toolbar. |
4091 | ToolbarButtons should be included in \l ToolbarItems to define the tools of a \l Page. |
4092 | @@ -28,7 +28,7 @@ |
4093 | Example of different ways to define the toolbar button: |
4094 | \qml |
4095 | import QtQuick 2.0 |
4096 | - import Ubuntu.Components 0.1 |
4097 | + import Ubuntu.Components 1.0 |
4098 | |
4099 | MainView { |
4100 | width: units.gu(50) |
4101 | |
4102 | === modified file 'modules/Ubuntu/Components/ToolbarItems.qml' |
4103 | --- modules/Ubuntu/Components/ToolbarItems.qml 2013-11-06 22:52:15 +0000 |
4104 | +++ modules/Ubuntu/Components/ToolbarItems.qml 2014-04-23 09:21:19 +0000 |
4105 | @@ -18,7 +18,7 @@ |
4106 | |
4107 | /*! |
4108 | \qmltype ToolbarItems |
4109 | - \inqmlmodule Ubuntu.Components 0.1 |
4110 | + \inqmlmodule Ubuntu.Components 1.0 |
4111 | \ingroup ubuntu |
4112 | \brief Row of Items to be placed in a toolbar. |
4113 | |
4114 | @@ -38,7 +38,7 @@ |
4115 | be visible to the user: |
4116 | \qml |
4117 | import QtQuick 2.0 |
4118 | - import Ubuntu.Components 0.1 |
4119 | + import Ubuntu.Components 1.0 |
4120 | |
4121 | MainView { |
4122 | width: units.gu(50) |
4123 | @@ -70,7 +70,7 @@ |
4124 | the full height of the toolbar, and other Items you will probably want to center vertically: |
4125 | \qml |
4126 | import QtQuick 2.0 |
4127 | - import Ubuntu.Components 0.1 |
4128 | + import Ubuntu.Components 1.0 |
4129 | |
4130 | MainView { |
4131 | width: units.gu(50) |
4132 | @@ -119,7 +119,7 @@ |
4133 | visible in the toolbar, instead of the default toolbar-styled back button: |
4134 | \qml |
4135 | import QtQuick 2.0 |
4136 | - import Ubuntu.Components 0.1 |
4137 | + import Ubuntu.Components 1.0 |
4138 | |
4139 | MainView { |
4140 | width: units.gu(50) |
4141 | |
4142 | === modified file 'modules/Ubuntu/Components/UbuntuListView.qml' |
4143 | --- modules/Ubuntu/Components/UbuntuListView.qml 2014-02-25 12:23:39 +0000 |
4144 | +++ modules/Ubuntu/Components/UbuntuListView.qml 2014-04-23 09:21:19 +0000 |
4145 | @@ -15,11 +15,11 @@ |
4146 | */ |
4147 | |
4148 | import QtQuick 2.0 |
4149 | -import Ubuntu.Components 0.1 as Toolkit |
4150 | +import Ubuntu.Components 1.0 as Toolkit |
4151 | |
4152 | /*! |
4153 | \qmltype UbuntuListView |
4154 | - \inqmlmodule Ubuntu.Components 0.1 |
4155 | + \inqmlmodule Ubuntu.Components 1.0 |
4156 | \ingroup ubuntu |
4157 | \brief A ListView with special features tailored for a look and feel fitting the |
4158 | Ubuntu Touch platform. |
4159 | @@ -30,8 +30,8 @@ |
4160 | |
4161 | Examples: |
4162 | \qml |
4163 | - import Ubuntu.Components 0.1 |
4164 | - import Ubuntu.Components.ListItems 0.1 as ListItem |
4165 | + import Ubuntu.Components 1.0 |
4166 | + import Ubuntu.Components.ListItems 1.0 as ListItem |
4167 | |
4168 | Item { |
4169 | ListModel { |
4170 | |
4171 | === modified file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml' |
4172 | --- modules/Ubuntu/Components/UbuntuNumberAnimation.qml 2013-07-09 15:42:50 +0000 |
4173 | +++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml 2014-04-23 09:21:19 +0000 |
4174 | @@ -16,11 +16,11 @@ |
4175 | */ |
4176 | |
4177 | import QtQuick 2.0 |
4178 | -import Ubuntu.Components 0.1 as Ubuntu |
4179 | +import Ubuntu.Components 1.0 |
4180 | |
4181 | /*! |
4182 | \qmltype UbuntuNumberAnimation |
4183 | - \inqmlmodule Ubuntu.Components 0.1 |
4184 | + \inqmlmodule Ubuntu.Components 1.0 |
4185 | \ingroup ubuntu |
4186 | \brief UbuntuNumberAnimation is a NumberAnimation that has predefined |
4187 | settings to ensure that Ubuntu applications are consistent in their animations. |
4188 | @@ -29,7 +29,7 @@ |
4189 | |
4190 | \qml |
4191 | import QtQuick 2.0 |
4192 | - import Ubuntu.Components 0.1 |
4193 | + import Ubuntu.Components 1.0 |
4194 | |
4195 | Rectangle { |
4196 | width: 100; height: 100 |
4197 | @@ -51,6 +51,6 @@ |
4198 | \l UbuntuAnimation manually in order to ensure consistency. |
4199 | */ |
4200 | NumberAnimation { |
4201 | - duration: Ubuntu.UbuntuAnimation.FastDuration |
4202 | - easing: Ubuntu.UbuntuAnimation.StandardEasing |
4203 | + duration: UbuntuAnimation.FastDuration |
4204 | + easing: UbuntuAnimation.StandardEasing |
4205 | } |
4206 | |
4207 | === modified file 'modules/Ubuntu/Components/UbuntuShape.qml' |
4208 | --- modules/Ubuntu/Components/UbuntuShape.qml 2013-07-05 07:14:36 +0000 |
4209 | +++ modules/Ubuntu/Components/UbuntuShape.qml 2014-04-23 09:21:19 +0000 |
4210 | @@ -15,11 +15,11 @@ |
4211 | */ |
4212 | |
4213 | import QtQuick 2.0 |
4214 | -import Ubuntu.Components 0.1 as Ubuntu |
4215 | +import Ubuntu.Components 1.0 |
4216 | |
4217 | /*! |
4218 | \qmltype UbuntuShape |
4219 | - \inqmlmodule Ubuntu.Components 0.1 |
4220 | + \inqmlmodule Ubuntu.Components 1.0 |
4221 | \ingroup ubuntu |
4222 | \brief The UbuntuShape item provides a standard Ubuntu shaped rounded rectangle. |
4223 | |
4224 | @@ -35,7 +35,7 @@ |
4225 | |
4226 | Examples: |
4227 | \qml |
4228 | - import Ubuntu.Components 0.1 |
4229 | + import Ubuntu.Components 1.0 |
4230 | |
4231 | UbuntuShape { |
4232 | color: "lightblue" |
4233 | @@ -44,7 +44,7 @@ |
4234 | \endqml |
4235 | |
4236 | \qml |
4237 | - import Ubuntu.Components 0.1 |
4238 | + import Ubuntu.Components 1.0 |
4239 | |
4240 | UbuntuShape { |
4241 | image: Image { |
4242 | @@ -100,7 +100,7 @@ |
4243 | implicitWidth: shape.implicitWidth |
4244 | implicitHeight: shape.implicitHeight |
4245 | |
4246 | - Ubuntu.Shape { |
4247 | + Shape { |
4248 | id: shape |
4249 | anchors.fill: parent |
4250 | /* FIXME: only set the ShapeItem::image property when the Image's source is loaded |
4251 | |
4252 | === modified file 'modules/Ubuntu/Components/plugin/i18n.cpp' |
4253 | --- modules/Ubuntu/Components/plugin/i18n.cpp 2014-02-24 10:36:27 +0000 |
4254 | +++ modules/Ubuntu/Components/plugin/i18n.cpp 2014-04-23 09:21:19 +0000 |
4255 | @@ -30,7 +30,7 @@ |
4256 | /*! |
4257 | * \qmltype i18n |
4258 | * \instantiates UbuntuI18n |
4259 | - * \inqmlmodule Ubuntu.Components 0.1 |
4260 | + * \inqmlmodule Ubuntu.Components 1.0 |
4261 | * \ingroup ubuntu |
4262 | * \brief i18n is a context property that provides internationalization support. |
4263 | * |
4264 | |
4265 | === modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp' |
4266 | --- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp 2014-03-24 19:12:32 +0000 |
4267 | +++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp 2014-04-23 09:21:19 +0000 |
4268 | @@ -21,7 +21,7 @@ |
4269 | /*! |
4270 | \qmltype InverseMouseArea |
4271 | \instantiates InverseMouseAreaType |
4272 | - \inqmlmodule Ubuntu.Components 0.1 |
4273 | + \inqmlmodule Ubuntu.Components 1.0 |
4274 | \ingroup ubuntu |
4275 | \brief The InverseMouseArea captures mouse events happening outside of a given |
4276 | area. |
4277 | @@ -33,7 +33,7 @@ |
4278 | Popup.qml |
4279 | \qml |
4280 | import QtQuick 2.0 |
4281 | - import Ubuntu.Components 0.1 |
4282 | + import Ubuntu.Components 1.0 |
4283 | |
4284 | Rectangle { |
4285 | anchors.centerIn: parent |
4286 | @@ -53,7 +53,7 @@ |
4287 | |
4288 | \qml |
4289 | import QtQuick 2.0 |
4290 | - import Ubuntu.Components 0.1 |
4291 | + import Ubuntu.Components 1.0 |
4292 | |
4293 | Item { |
4294 | width: 640 |
4295 | @@ -77,7 +77,7 @@ |
4296 | a component which is either a parent of the mouse area or a sibling of it. |
4297 | \qml |
4298 | import QtQuick 2.0 |
4299 | - import Ubuntu.Components 0.1 |
4300 | + import Ubuntu.Components 1.0 |
4301 | |
4302 | Item { |
4303 | width: units.gu(40) |
4304 | |
4305 | === modified file 'modules/Ubuntu/Components/plugin/plugin.cpp' |
4306 | --- modules/Ubuntu/Components/plugin/plugin.cpp 2014-04-14 15:59:29 +0000 |
4307 | +++ modules/Ubuntu/Components/plugin/plugin.cpp 2014-04-23 09:21:19 +0000 |
4308 | @@ -151,31 +151,38 @@ |
4309 | } |
4310 | } |
4311 | |
4312 | -void UbuntuComponentsPlugin::registerTypes(const char *uri) |
4313 | +void UbuntuComponentsPlugin::registerTypesToVersion(const char *uri, int major, int minor) |
4314 | { |
4315 | - Q_ASSERT(uri == QLatin1String("Ubuntu.Components")); |
4316 | - |
4317 | - qmlRegisterSingletonType<QObject>(uri, 0, 1, "UbuntuColors", registerUbuntuColors); |
4318 | - qmlRegisterUncreatableType<UbuntuI18n>(uri, 0, 1, "i18n", "Singleton object"); |
4319 | - qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, 0, 1, "QQuickImageBase"); |
4320 | - qmlRegisterUncreatableType<UCUnits>(uri, 0, 1, "UCUnits", "Not instantiable"); |
4321 | - qmlRegisterType<ShapeItem>(uri, 0, 1, "Shape"); |
4322 | - qmlRegisterType<InverseMouseAreaType>(uri, 0, 1, "InverseMouseArea"); |
4323 | - qmlRegisterType<QQuickMimeData>(uri, 0, 1, "MimeData"); |
4324 | - qmlRegisterSingletonType<QQuickClipboard>(uri, 0, 1, "Clipboard", registerClipboard); |
4325 | - qmlRegisterSingletonType<UCUbuntuAnimation>(uri, 0, 1, "UbuntuAnimation", registerUCUbuntuAnimation); |
4326 | - qmlRegisterType<UCArguments>(uri, 0, 1, "Arguments"); |
4327 | - qmlRegisterType<UCArgument>(uri, 0, 1, "Argument"); |
4328 | + qmlRegisterSingletonType<QObject>(uri, major, minor, "UbuntuColors", registerUbuntuColors); |
4329 | + qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object"); |
4330 | + qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase"); |
4331 | + qmlRegisterUncreatableType<UCUnits>(uri, major, minor, "UCUnits", "Not instantiable"); |
4332 | + qmlRegisterType<ShapeItem>(uri, major, minor, "Shape"); |
4333 | + qmlRegisterType<InverseMouseAreaType>(uri, major, minor, "InverseMouseArea"); |
4334 | + qmlRegisterType<QQuickMimeData>(uri, major, minor, "MimeData"); |
4335 | + qmlRegisterSingletonType<QQuickClipboard>(uri, major, minor, "Clipboard", registerClipboard); |
4336 | + qmlRegisterSingletonType<UCUbuntuAnimation>(uri, major, minor, "UbuntuAnimation", registerUCUbuntuAnimation); |
4337 | + qmlRegisterType<UCArguments>(uri, major, minor, "Arguments"); |
4338 | + qmlRegisterType<UCArgument>(uri, major, minor, "Argument"); |
4339 | qmlRegisterType<QQmlPropertyMap>(); |
4340 | - qmlRegisterType<UCAlarm>(uri, 0, 1, "Alarm"); |
4341 | - qmlRegisterType<UCAlarmModel>(uri, 0, 1, "AlarmModel"); |
4342 | - qmlRegisterType<UCStateSaver>(uri, 0, 1, "StateSaver"); |
4343 | + qmlRegisterType<UCAlarm>(uri, major, minor, "Alarm"); |
4344 | + qmlRegisterType<UCAlarmModel>(uri, major, minor, "AlarmModel"); |
4345 | + qmlRegisterType<UCStateSaver>(uri, major, minor, "StateSaver"); |
4346 | qmlRegisterType<UCStateSaverAttached>(); |
4347 | - qmlRegisterSingletonType<UCUriHandler>(uri, 0, 1, "UriHandler", registerUriHandler); |
4348 | - qmlRegisterType<UCMouse>(uri, 0, 1, "Mouse"); |
4349 | - qmlRegisterType<UCInverseMouse>(uri, 0, 1, "InverseMouse"); |
4350 | + qmlRegisterSingletonType<UCUriHandler>(uri, major, minor, "UriHandler", registerUriHandler); |
4351 | + qmlRegisterType<UCMouse>(uri, major, minor, "Mouse"); |
4352 | + qmlRegisterType<UCInverseMouse>(uri, major, minor, "InverseMouse"); |
4353 | // register QML singletons |
4354 | - qmlRegisterSingletonType<QObject>(uri, 0, 1, "PickerPanel", registerPickerPanel); |
4355 | + qmlRegisterSingletonType<QObject>(uri, major, minor, "PickerPanel", registerPickerPanel); |
4356 | +} |
4357 | + |
4358 | +void UbuntuComponentsPlugin::registerTypes(const char *uri) |
4359 | +{ |
4360 | + Q_ASSERT(uri == QLatin1String("Ubuntu.Components")); |
4361 | + |
4362 | + // register 0.1 for backward compatibility |
4363 | + registerTypesToVersion(uri, 0, 1); |
4364 | + registerTypesToVersion(uri, 1, 0); |
4365 | |
4366 | // register custom event |
4367 | ForwardedEvent::registerForwardedEvent(); |
4368 | |
4369 | === modified file 'modules/Ubuntu/Components/plugin/plugin.h' |
4370 | --- modules/Ubuntu/Components/plugin/plugin.h 2014-01-27 13:39:55 +0000 |
4371 | +++ modules/Ubuntu/Components/plugin/plugin.h 2014-04-23 09:21:19 +0000 |
4372 | @@ -38,6 +38,9 @@ |
4373 | private Q_SLOTS: |
4374 | void registerWindowContextProperty(); |
4375 | void setWindowContextProperty(QWindow* focusWindow); |
4376 | + |
4377 | +private: |
4378 | + void registerTypesToVersion(const char *uri, int major, int minor); |
4379 | }; |
4380 | #endif // UBUNTU_COMPONENTS_PLUGIN_H |
4381 | |
4382 | |
4383 | === modified file 'modules/Ubuntu/Components/plugin/qquickclipboard.cpp' |
4384 | --- modules/Ubuntu/Components/plugin/qquickclipboard.cpp 2013-01-28 17:59:39 +0000 |
4385 | +++ modules/Ubuntu/Components/plugin/qquickclipboard.cpp 2014-04-23 09:21:19 +0000 |
4386 | @@ -26,7 +26,7 @@ |
4387 | /*! |
4388 | * \qmltype Clipboard |
4389 | * \instantiates QQuickClipboard |
4390 | - * \inqmlmodule Ubuntu.Components 0.1 |
4391 | + * \inqmlmodule Ubuntu.Components 1.0 |
4392 | * \ingroup ubuntu |
4393 | * \brief This is a singleton type providing access to the system clipboard. |
4394 | * |
4395 | |
4396 | === modified file 'modules/Ubuntu/Components/plugin/qquickmimedata.cpp' |
4397 | --- modules/Ubuntu/Components/plugin/qquickmimedata.cpp 2013-10-18 08:56:39 +0000 |
4398 | +++ modules/Ubuntu/Components/plugin/qquickmimedata.cpp 2014-04-23 09:21:19 +0000 |
4399 | @@ -28,7 +28,7 @@ |
4400 | /*! |
4401 | * \qmltype MimeData |
4402 | * \instantiates QQuickMimeData |
4403 | - * \inqmlmodule Ubuntu.Components 0.1 |
4404 | + * \inqmlmodule Ubuntu.Components 1.0 |
4405 | * \ingroup ubuntu |
4406 | * \brief MimeData type provides interface to access and store data to the |
4407 | * Clipboard. |
4408 | |
4409 | === modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp' |
4410 | --- modules/Ubuntu/Components/plugin/ucalarm.cpp 2014-04-10 09:48:30 +0000 |
4411 | +++ modules/Ubuntu/Components/plugin/ucalarm.cpp 2014-04-23 09:21:19 +0000 |
4412 | @@ -219,7 +219,7 @@ |
4413 | /*! |
4414 | * \qmltype Alarm |
4415 | * \instantiates UCAlarm |
4416 | - * \inqmlmodule Ubuntu.Components 0.1 |
4417 | + * \inqmlmodule Ubuntu.Components 1.0 |
4418 | * \ingroup ubuntu-services |
4419 | * \brief Alarm component is a representation of an alarm event. |
4420 | * |
4421 | @@ -237,7 +237,7 @@ |
4422 | * Example usage: |
4423 | * \qml |
4424 | * import QtQuick 2.0 |
4425 | - * import Ubuntu.Components 0.1 |
4426 | + * import Ubuntu.Components 1.0 |
4427 | * |
4428 | * Rectangle { |
4429 | * width: units.gu(40) |
4430 | |
4431 | === modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.cpp' |
4432 | --- modules/Ubuntu/Components/plugin/ucalarmmodel.cpp 2013-10-18 08:56:39 +0000 |
4433 | +++ modules/Ubuntu/Components/plugin/ucalarmmodel.cpp 2014-04-23 09:21:19 +0000 |
4434 | @@ -25,7 +25,7 @@ |
4435 | /*! |
4436 | * \qmltype AlarmModel |
4437 | * \instantiates UCAlarmModel |
4438 | - * \inqmlmodule Ubuntu.Components 0.1 |
4439 | + * \inqmlmodule Ubuntu.Components 1.0 |
4440 | * \ingroup ubuntu-services |
4441 | * \brief AlarmModel holds the list of alarms defined. |
4442 | * |
4443 | @@ -39,8 +39,8 @@ |
4444 | * Example usage: |
4445 | * \qml |
4446 | * import QtQuick 2.0 |
4447 | - * import Ubuntu.Components 0.1 |
4448 | - * import Ubuntu.Components.ListItems 0.1 |
4449 | + * import Ubuntu.Components 1.0 |
4450 | + * import Ubuntu.Components.ListItems 1.0 |
4451 | * ListView { |
4452 | * model: AlarmModel {} |
4453 | * width: units.gu(80) |
4454 | |
4455 | === modified file 'modules/Ubuntu/Components/plugin/ucapplication.cpp' |
4456 | --- modules/Ubuntu/Components/plugin/ucapplication.cpp 2013-10-18 08:56:39 +0000 |
4457 | +++ modules/Ubuntu/Components/plugin/ucapplication.cpp 2014-04-23 09:21:19 +0000 |
4458 | @@ -27,7 +27,7 @@ |
4459 | /*! |
4460 | * \qmltype UbuntuApplication |
4461 | * \instantiates UCApplication |
4462 | - * \inqmlmodule Ubuntu.Components 0.1 |
4463 | + * \inqmlmodule Ubuntu.Components 1.0 |
4464 | * \ingroup ubuntu |
4465 | * \brief UbuntuApplication is a QML binding for a subset of QCoreApplication. |
4466 | * |
4467 | |
4468 | === modified file 'modules/Ubuntu/Components/plugin/ucargument.cpp' |
4469 | --- modules/Ubuntu/Components/plugin/ucargument.cpp 2013-10-18 08:56:39 +0000 |
4470 | +++ modules/Ubuntu/Components/plugin/ucargument.cpp 2014-04-23 09:21:19 +0000 |
4471 | @@ -21,7 +21,7 @@ |
4472 | /*! |
4473 | * \qmltype Argument |
4474 | * \instantiates UCArgument |
4475 | - * \inqmlmodule Ubuntu.Components 0.1 |
4476 | + * \inqmlmodule Ubuntu.Components 1.0 |
4477 | * \ingroup ubuntu-commandline |
4478 | * \brief The Argument class specifies what type a given command line parameter should be. |
4479 | * |
4480 | |
4481 | === modified file 'modules/Ubuntu/Components/plugin/ucarguments.cpp' |
4482 | --- modules/Ubuntu/Components/plugin/ucarguments.cpp 2013-10-18 08:56:39 +0000 |
4483 | +++ modules/Ubuntu/Components/plugin/ucarguments.cpp 2014-04-23 09:21:19 +0000 |
4484 | @@ -28,7 +28,7 @@ |
4485 | /*! |
4486 | * \qmltype Arguments |
4487 | * \instantiates UCArguments |
4488 | - * \inqmlmodule Ubuntu.Components 0.1 |
4489 | + * \inqmlmodule Ubuntu.Components 1.0 |
4490 | * \ingroup ubuntu-commandline |
4491 | * \brief The Arguments class provides a way to declare what command line |
4492 | * parameters are expected by the application. |
4493 | |
4494 | === modified file 'modules/Ubuntu/Components/plugin/ucfontutils.cpp' |
4495 | --- modules/Ubuntu/Components/plugin/ucfontutils.cpp 2014-02-04 22:07:10 +0000 |
4496 | +++ modules/Ubuntu/Components/plugin/ucfontutils.cpp 2014-04-23 09:21:19 +0000 |
4497 | @@ -21,7 +21,7 @@ |
4498 | /*! |
4499 | * \qmltype FontUtils |
4500 | * \instantiates UCFontUtils |
4501 | - * \inqmlmodule Ubuntu.Components 0.1 |
4502 | + * \inqmlmodule Ubuntu.Components 1.0 |
4503 | * \ingroup ubuntu |
4504 | * \brief FontUtils is a \l {http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#details} {context property}, |
4505 | * which provides utility functions for font manipulations. |
4506 | @@ -34,7 +34,7 @@ |
4507 | * size: |
4508 | * \qml |
4509 | * import QtQuick 2.0 |
4510 | - * import Ubuntu.Components 0.1 |
4511 | + * import Ubuntu.Components 1.0 |
4512 | * |
4513 | * Text { |
4514 | * property string fontSize: "medium" |
4515 | @@ -46,7 +46,7 @@ |
4516 | * font unit size to scale its font: |
4517 | * \qml |
4518 | * import QtQuick 2.0 |
4519 | - * import Ubuntu.Components 0.1 |
4520 | + * import Ubuntu.Components 1.0 |
4521 | * |
4522 | * TextInput { |
4523 | * property string fontSize: "small" |
4524 | |
4525 | === modified file 'modules/Ubuntu/Components/plugin/ucmousefilters.cpp' |
4526 | --- modules/Ubuntu/Components/plugin/ucmousefilters.cpp 2014-04-15 12:51:31 +0000 |
4527 | +++ modules/Ubuntu/Components/plugin/ucmousefilters.cpp 2014-04-23 09:21:19 +0000 |
4528 | @@ -59,7 +59,7 @@ |
4529 | /*! |
4530 | \qmltype Mouse |
4531 | \instantiates UCMouse |
4532 | - \inqmlmodule Ubuntu.Components 0.1 |
4533 | + \inqmlmodule Ubuntu.Components 1.0 |
4534 | \ingroup ubuntu |
4535 | \brief Attached property filtering mouse events occured inside the owner. |
4536 | |
4537 | @@ -97,7 +97,7 @@ |
4538 | released mouse buttons would look as follows: |
4539 | \qml |
4540 | import QtQuick 2.0 |
4541 | - import Ubuntu.Components 0.1 |
4542 | + import Ubuntu.Components 1.0 |
4543 | |
4544 | TextInput { |
4545 | width: 100 |
4546 | @@ -119,7 +119,7 @@ |
4547 | Example of handling right button clicks over a TextInput: |
4548 | \qml |
4549 | import QtQuick 2.0 |
4550 | - import Ubuntu.Components 0.1 |
4551 | + import Ubuntu.Components 1.0 |
4552 | |
4553 | TextInput { |
4554 | width: 100 |
4555 | @@ -141,7 +141,7 @@ |
4556 | |
4557 | \qml |
4558 | import QtQuick 2.0 |
4559 | - import Ubuntu.Components 0.1 |
4560 | + import Ubuntu.Components 1.0 |
4561 | |
4562 | TextInput { |
4563 | width: 100 |
4564 | @@ -201,7 +201,7 @@ |
4565 | will be printed as well as the proxied mouse press from the main item. |
4566 | \qml |
4567 | import QtQuick 2.0 |
4568 | - import Ubuntu.Components 0.1 |
4569 | + import Ubuntu.Components 1.0 |
4570 | |
4571 | Item { |
4572 | id: main |
4573 | @@ -254,7 +254,7 @@ |
4574 | will be blocked by the MouseArea still. |
4575 | \qml |
4576 | import QtQuick 2.0 |
4577 | - import Ubuntu.Components 0.1 |
4578 | + import Ubuntu.Components 1.0 |
4579 | |
4580 | MouseArea { |
4581 | id: topArea |
4582 | @@ -289,7 +289,7 @@ |
4583 | we make sure the TextInput always receives the events before the filter: |
4584 | \qml |
4585 | import QtQuick 2.0 |
4586 | - import Ubuntu.Components 0.1 |
4587 | + import Ubuntu.Components 1.0 |
4588 | |
4589 | TextInput { |
4590 | id: input |
4591 | @@ -316,7 +316,7 @@ |
4592 | |
4593 | \qml |
4594 | import QtQuick 2.0 |
4595 | - import Ubuntu.Components 0.1 |
4596 | + import Ubuntu.Components 1.0 |
4597 | |
4598 | TextInput { |
4599 | width: units.gu(40) |
4600 | @@ -954,7 +954,7 @@ |
4601 | /*! |
4602 | \qmltype InverseMouse |
4603 | \instantiates UCInverseMouse |
4604 | - \inqmlmodule Ubuntu.Components 0.1 |
4605 | + \inqmlmodule Ubuntu.Components 1.0 |
4606 | \ingroup ubuntu |
4607 | \brief Attached object filtering mouse events occured outside the owner. |
4608 | |
4609 | |
4610 | === modified file 'modules/Ubuntu/Components/plugin/ucstatesaver.cpp' |
4611 | --- modules/Ubuntu/Components/plugin/ucstatesaver.cpp 2014-02-05 19:23:35 +0000 |
4612 | +++ modules/Ubuntu/Components/plugin/ucstatesaver.cpp 2014-04-23 09:21:19 +0000 |
4613 | @@ -140,7 +140,7 @@ |
4614 | /*! |
4615 | * \qmltype StateSaver |
4616 | * \instantiates UCStateSaverAttached |
4617 | - * \inqmlmodule Ubuntu.Components 0.1 |
4618 | + * \inqmlmodule Ubuntu.Components 1.0 |
4619 | * \ingroup ubuntu-services |
4620 | * \brief Attached propertyes to save component property states. |
4621 | * |
4622 | @@ -158,7 +158,7 @@ |
4623 | * Example: |
4624 | * \qml |
4625 | * import QtQuick 2.0 |
4626 | - * import Ubuntu.Components 0.1 |
4627 | + * import Ubuntu.Components 1.0 |
4628 | * |
4629 | * TextField { |
4630 | * id: input |
4631 | |
4632 | === modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp' |
4633 | --- modules/Ubuntu/Components/plugin/uctheme.cpp 2014-01-27 09:14:31 +0000 |
4634 | +++ modules/Ubuntu/Components/plugin/uctheme.cpp 2014-04-23 09:21:19 +0000 |
4635 | @@ -36,7 +36,7 @@ |
4636 | /*! |
4637 | \qmltype Theme |
4638 | \instantiates UCTheme |
4639 | - \inqmlmodule Ubuntu.Components 0.1 |
4640 | + \inqmlmodule Ubuntu.Components 1.0 |
4641 | \ingroup theming |
4642 | \brief The Theme class provides facilities to interact with the current theme. |
4643 | |
4644 | @@ -48,7 +48,7 @@ |
4645 | |
4646 | \qml |
4647 | import QtQuick 2.0 |
4648 | - import Ubuntu.Components 0.1 |
4649 | + import Ubuntu.Components 1.0 |
4650 | |
4651 | Item { |
4652 | Button { |
4653 | @@ -61,7 +61,7 @@ |
4654 | |
4655 | \qml |
4656 | import QtQuick 2.0 |
4657 | - import Ubuntu.Components 0.1 |
4658 | + import Ubuntu.Components 1.0 |
4659 | |
4660 | StyledItem { |
4661 | id: myItem |
4662 | |
4663 | === modified file 'modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp' |
4664 | --- modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp 2013-07-11 15:14:38 +0000 |
4665 | +++ modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp 2014-04-23 09:21:19 +0000 |
4666 | @@ -21,7 +21,7 @@ |
4667 | /*! |
4668 | * \qmltype UbuntuAnimation |
4669 | * \instantiates UCUbuntuAnimation |
4670 | - * \inqmlmodule Ubuntu.Components 0.1 |
4671 | + * \inqmlmodule Ubuntu.Components 1.0 |
4672 | * \ingroup ubuntu |
4673 | * \brief Singleton defining standard Ubuntu durations and easing for animations |
4674 | * that should be used to ensure that Ubuntu applications are consistent |
4675 | |
4676 | === modified file 'modules/Ubuntu/Components/plugin/ucunits.cpp' |
4677 | --- modules/Ubuntu/Components/plugin/ucunits.cpp 2013-10-18 08:56:39 +0000 |
4678 | +++ modules/Ubuntu/Components/plugin/ucunits.cpp 2014-04-23 09:21:19 +0000 |
4679 | @@ -40,7 +40,7 @@ |
4680 | /*! |
4681 | \qmltype Units |
4682 | \instantiates UCUnits |
4683 | - \inqmlmodule Ubuntu.Components 0.1 |
4684 | + \inqmlmodule Ubuntu.Components 1.0 |
4685 | \ingroup resolution-independence |
4686 | \brief Units of measurement for sizes, spacing, margin, etc. |
4687 | |
4688 | @@ -52,7 +52,7 @@ |
4689 | |
4690 | \qml |
4691 | import QtQuick 2.0 |
4692 | - import Ubuntu.Components 0.1 |
4693 | + import Ubuntu.Components 1.0 |
4694 | |
4695 | Item { |
4696 | width: units.gu(2) |
4697 | |
4698 | === modified file 'modules/Ubuntu/Components/plugin/ucurihandler.cpp' |
4699 | --- modules/Ubuntu/Components/plugin/ucurihandler.cpp 2014-02-13 09:55:51 +0000 |
4700 | +++ modules/Ubuntu/Components/plugin/ucurihandler.cpp 2014-04-23 09:21:19 +0000 |
4701 | @@ -36,7 +36,7 @@ |
4702 | /*! |
4703 | * \qmltype UriHandler |
4704 | * \instantiates UCUriHandler |
4705 | - * \inqmlmodule Ubuntu.Components 0.1 |
4706 | + * \inqmlmodule Ubuntu.Components 1.0 |
4707 | * \ingroup ubuntu |
4708 | * \brief Singleton signalling for opened URIs. |
4709 | * |
4710 | |
4711 | === modified file 'modules/Ubuntu/Components/qmldir' |
4712 | --- modules/Ubuntu/Components/qmldir 2014-02-13 11:48:38 +0000 |
4713 | +++ modules/Ubuntu/Components/qmldir 2014-04-23 09:21:19 +0000 |
4714 | @@ -47,3 +47,44 @@ |
4715 | |
4716 | internal TextCursor TextCursor.qml |
4717 | internal TextInputPopover TextInputPopover.qml |
4718 | + |
4719 | +#version 1.0 |
4720 | +Action 1.0 Action.qml |
4721 | +ActionItem 1.0 ActionItem.qml |
4722 | +ActionList 1.0 ActionList.qml |
4723 | +ToolbarItems 1.0 ToolbarItems.qml |
4724 | +ToolbarButton 1.0 ToolbarButton.qml |
4725 | +MainView 1.0 MainView.qml |
4726 | +Button 1.0 Button.qml |
4727 | +Panel 1.0 Panel.qml |
4728 | +Tab 1.0 Tab.qml |
4729 | +TabBar 1.0 TabBar.qml |
4730 | +Tabs 1.0 Tabs.qml |
4731 | +Label 1.0 Label.qml |
4732 | +AbstractButton 1.0 AbstractButton.qml |
4733 | +ActivityIndicator 1.0 ActivityIndicator.qml |
4734 | +ProgressBar 1.0 ProgressBar.qml |
4735 | +TextField 1.0 TextField.qml |
4736 | +TextArea 1.0 TextArea.qml |
4737 | +Switch 1.0 Switch.qml |
4738 | +CheckBox 1.0 CheckBox.qml |
4739 | +Slider 1.0 Slider.qml |
4740 | +Scrollbar 1.0 Scrollbar.qml |
4741 | +Object 1.0 Object.qml |
4742 | +OptionSelector 1.0 OptionSelector.qml |
4743 | +OptionSelectorDelegate 1.0 OptionSelectorDelegate.qml |
4744 | +Page 1.0 Page.qml |
4745 | +PageStack 1.0 PageStack.qml |
4746 | +Header 1.0 Header.qml |
4747 | +UbuntuShape 1.0 UbuntuShape.qml |
4748 | +CrossFadeImage 1.0 CrossFadeImage.qml |
4749 | +Icon 1.0 Icon.qml |
4750 | +OrientationHelper 1.0 OrientationHelper.qml |
4751 | +MathUtils 1.0 mathUtils.js |
4752 | +SliderUtils 1.0 sliderUtils.js |
4753 | +ScrollbarUtils 1.0 scrollbarUtils.js |
4754 | +UbuntuNumberAnimation 1.0 UbuntuNumberAnimation.qml |
4755 | +StyledItem 1.0 StyledItem.qml |
4756 | +ColorUtils 1.0 colorUtils.js |
4757 | +DateUtils 1.0 dateUtils.js |
4758 | +UbuntuListView 1.0 UbuntuListView.qml |
4759 | |
4760 | === modified file 'modules/Ubuntu/Layouts/plugin/ulconditionallayout.cpp' |
4761 | --- modules/Ubuntu/Layouts/plugin/ulconditionallayout.cpp 2013-06-25 13:42:22 +0000 |
4762 | +++ modules/Ubuntu/Layouts/plugin/ulconditionallayout.cpp 2014-04-23 09:21:19 +0000 |
4763 | @@ -41,7 +41,7 @@ |
4764 | /*! |
4765 | * \qmltype ConditionalLayout |
4766 | * \instantiates ULConditionalLayout |
4767 | - * \inqmlmodule Ubuntu.Layouts 0.1 |
4768 | + * \inqmlmodule Ubuntu.Layouts 1.0 |
4769 | * \ingroup ubuntu-layouts |
4770 | * \brief ConditionalLayout defines the layout of a given form factor. |
4771 | * |
4772 | |
4773 | === modified file 'modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp' |
4774 | --- modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp 2013-06-25 13:42:22 +0000 |
4775 | +++ modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp 2014-04-23 09:21:19 +0000 |
4776 | @@ -21,7 +21,7 @@ |
4777 | /*! |
4778 | * \qmltype ItemLayout |
4779 | * \instantiates ULItemLayout |
4780 | - * \inqmlmodule Ubuntu.Layouts 0.1 |
4781 | + * \inqmlmodule Ubuntu.Layouts 1.0 |
4782 | * \ingroup ubuntu-layouts |
4783 | * \brief ItemLayout defines a new size & position of a single Item, for the purposes |
4784 | * of specifying layouts. This is to be used within a ConditionalLayout definition. |
4785 | |
4786 | === modified file 'modules/Ubuntu/Layouts/plugin/ullayouts.cpp' |
4787 | --- modules/Ubuntu/Layouts/plugin/ullayouts.cpp 2014-02-18 13:27:23 +0000 |
4788 | +++ modules/Ubuntu/Layouts/plugin/ullayouts.cpp 2014-04-23 09:21:19 +0000 |
4789 | @@ -379,7 +379,7 @@ |
4790 | /*! |
4791 | * \qmltype Layouts |
4792 | * \instantiates ULLayouts |
4793 | - * \inqmlmodule Ubuntu.Layouts 0.1 |
4794 | + * \inqmlmodule Ubuntu.Layouts 1.0 |
4795 | * \ingroup ubuntu-layouts |
4796 | * \brief The Layouts component allows one to specify multiple different layouts for a |
4797 | * fixed set of Items, and applies the desired layout to those Items. |
4798 | |
4799 | === modified file 'modules/Ubuntu/Layouts/plugin/ulplugin.cpp' |
4800 | --- modules/Ubuntu/Layouts/plugin/ulplugin.cpp 2013-06-06 16:00:10 +0000 |
4801 | +++ modules/Ubuntu/Layouts/plugin/ulplugin.cpp 2014-04-23 09:21:19 +0000 |
4802 | @@ -23,10 +23,16 @@ |
4803 | |
4804 | #include <qqml.h> |
4805 | |
4806 | +void PluginPlugin::registerTypeVersions(const char *uri, int major, int minor) |
4807 | +{ |
4808 | + qmlRegisterType<ULLayouts>(uri, major, minor, "Layouts"); |
4809 | + qmlRegisterType<ULConditionalLayout>(uri, major, minor, "ConditionalLayout"); |
4810 | + qmlRegisterType<ULItemLayout>(uri, major, minor, "ItemLayout"); |
4811 | +} |
4812 | + |
4813 | void PluginPlugin::registerTypes(const char *uri) |
4814 | { |
4815 | // @uri Ubuntu.Layouts |
4816 | - qmlRegisterType<ULLayouts>(uri, 0, 1, "Layouts"); |
4817 | - qmlRegisterType<ULConditionalLayout>(uri, 0, 1, "ConditionalLayout"); |
4818 | - qmlRegisterType<ULItemLayout>(uri, 0, 1, "ItemLayout"); |
4819 | + registerTypeVersions(uri, 0, 1); |
4820 | + registerTypeVersions(uri, 1, 0); |
4821 | } |
4822 | |
4823 | === modified file 'modules/Ubuntu/Layouts/plugin/ulplugin.h' |
4824 | --- modules/Ubuntu/Layouts/plugin/ulplugin.h 2013-05-29 09:41:20 +0000 |
4825 | +++ modules/Ubuntu/Layouts/plugin/ulplugin.h 2014-04-23 09:21:19 +0000 |
4826 | @@ -28,6 +28,8 @@ |
4827 | |
4828 | public: |
4829 | void registerTypes(const char *uri); |
4830 | +private: |
4831 | + void registerTypeVersions(const char *uri, int major, int minor); |
4832 | }; |
4833 | |
4834 | #endif // PLUGIN_PLUGIN_H |
4835 | |
4836 | === modified file 'modules/Ubuntu/PerformanceMetrics/BarGraph.qml' |
4837 | --- modules/Ubuntu/PerformanceMetrics/BarGraph.qml 2014-02-02 19:54:17 +0000 |
4838 | +++ modules/Ubuntu/PerformanceMetrics/BarGraph.qml 2014-04-23 09:21:19 +0000 |
4839 | @@ -15,8 +15,8 @@ |
4840 | */ |
4841 | |
4842 | import QtQuick 2.0 |
4843 | -import Ubuntu.Components 0.1 |
4844 | -import Ubuntu.PerformanceMetrics 0.1 as PerformanceMetrics |
4845 | +import Ubuntu.Components 1.0 |
4846 | +import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics |
4847 | |
4848 | Item { |
4849 | id: graph |
4850 | |
4851 | === modified file 'modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml' |
4852 | --- modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml 2014-02-12 17:38:29 +0000 |
4853 | +++ modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml 2014-04-23 09:21:19 +0000 |
4854 | @@ -15,7 +15,7 @@ |
4855 | */ |
4856 | |
4857 | import QtQuick 2.0 |
4858 | -import Ubuntu.PerformanceMetrics 0.1 as PerformanceMetrics |
4859 | +import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics |
4860 | |
4861 | /*! |
4862 | \qmltype PerformanceOverlay |
4863 | |
4864 | === modified file 'modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.cpp' |
4865 | --- modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.cpp 2014-02-11 17:40:02 +0000 |
4866 | +++ modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.cpp 2014-04-23 09:21:19 +0000 |
4867 | @@ -26,14 +26,19 @@ |
4868 | #include <QtQml/QQmlContext> |
4869 | #include "upmrenderingtimes.h" |
4870 | |
4871 | +void UbuntuPerformanceMetricsPlugin::registerTypeVersion(const char *uri, int major, int minor) |
4872 | +{ |
4873 | + qmlRegisterType<UPMRenderingTimes>(uri, major, minor, "RenderingTimes"); |
4874 | + qmlRegisterType<UPMCpuUsage>(uri, major, minor, "CpuUsage"); |
4875 | + qmlRegisterType<UPMTextureFromImage>(uri, major, minor, "TextureFromImage"); |
4876 | + qmlRegisterType<UPMGraphModel>(); |
4877 | +} |
4878 | + |
4879 | void UbuntuPerformanceMetricsPlugin::registerTypes(const char *uri) |
4880 | { |
4881 | Q_ASSERT(uri == QLatin1String("Ubuntu.PerformanceMetrics")); |
4882 | - |
4883 | - qmlRegisterType<UPMRenderingTimes>(uri, 0, 1, "RenderingTimes"); |
4884 | - qmlRegisterType<UPMCpuUsage>(uri, 0, 1, "CpuUsage"); |
4885 | - qmlRegisterType<UPMTextureFromImage>(uri, 0, 1, "TextureFromImage"); |
4886 | - qmlRegisterType<UPMGraphModel>(); |
4887 | + registerTypeVersion(uri, 0, 1); |
4888 | + registerTypeVersion(uri, 1, 0); |
4889 | } |
4890 | |
4891 | void UbuntuPerformanceMetricsPlugin::initializeEngine(QQmlEngine *engine, const char *uri) |
4892 | |
4893 | === modified file 'modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.h' |
4894 | --- modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.h 2014-02-11 13:23:46 +0000 |
4895 | +++ modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.h 2014-04-23 09:21:19 +0000 |
4896 | @@ -29,6 +29,8 @@ |
4897 | public: |
4898 | void registerTypes(const char *uri); |
4899 | void initializeEngine(QQmlEngine *engine, const char *uri); |
4900 | +private: |
4901 | + void registerTypeVersion(const char *uri, int major, int minor); |
4902 | }; |
4903 | |
4904 | #endif // UBUNTU_PERFORMANCE_METRICS_PLUGIN_H |
4905 | |
4906 | === modified file 'modules/Ubuntu/PerformanceMetrics/qmldir' |
4907 | --- modules/Ubuntu/PerformanceMetrics/qmldir 2014-01-21 18:27:23 +0000 |
4908 | +++ modules/Ubuntu/PerformanceMetrics/qmldir 2014-04-23 09:21:19 +0000 |
4909 | @@ -3,3 +3,6 @@ |
4910 | |
4911 | PerformanceOverlay 0.1 PerformanceOverlay.qml |
4912 | internal BarGraph BarGraph.qml |
4913 | + |
4914 | +#version 1.0 |
4915 | +PerformanceOverlay 1.0 PerformanceOverlay.qml |
4916 | |
4917 | === modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml' |
4918 | --- modules/Ubuntu/Test/UbuntuTestCase.qml 2014-04-09 12:37:19 +0000 |
4919 | +++ modules/Ubuntu/Test/UbuntuTestCase.qml 2014-04-23 09:21:19 +0000 |
4920 | @@ -16,7 +16,7 @@ |
4921 | |
4922 | import QtQuick 2.0 |
4923 | import QtTest 1.0 |
4924 | -import Ubuntu.Components 0.1 |
4925 | +import Ubuntu.Components 1.0 |
4926 | |
4927 | /*! |
4928 | \qmlabstract UbuntuTestCase |
4929 | |
4930 | === modified file 'modules/Ubuntu/Test/qmldir' |
4931 | --- modules/Ubuntu/Test/qmldir 2013-07-24 12:34:45 +0000 |
4932 | +++ modules/Ubuntu/Test/qmldir 2014-04-23 09:21:19 +0000 |
4933 | @@ -1,1 +1,5 @@ |
4934 | +module Ubuntu.Test |
4935 | UbuntuTestCase 0.1 UbuntuTestCase.qml |
4936 | + |
4937 | +#version 1.0 |
4938 | +UbuntuTestCase 1.0 UbuntuTestCase.qml |
4939 | |
4940 | === modified file 'run_tests.sh' |
4941 | --- run_tests.sh 2014-03-03 08:37:42 +0000 |
4942 | +++ run_tests.sh 2014-04-23 09:21:19 +0000 |
4943 | @@ -15,15 +15,17 @@ |
4944 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
4945 | # |
4946 | |
4947 | +source $PWD/export_modules_dir.sh |
4948 | + |
4949 | cd tests/autopilot |
4950 | |
4951 | echo running with arg: $1 |
4952 | |
4953 | UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE=1 |
4954 | if [ "$1" == "" ]; then |
4955 | - python3 -m autopilot.run run ubuntuuitoolkit |
4956 | + autopilot3 run ubuntuuitoolkit |
4957 | else |
4958 | - python3 -m autopilot.run run -o ../../$1 -f xml -r -rd ../../ ubuntuuitoolkit |
4959 | + autopilot3 run -o ../../$1 -f xml -r -rd ../../ $1 |
4960 | fi |
4961 | |
4962 | exit 0 |
4963 | |
4964 | === modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py' |
4965 | --- tests/autopilot/ubuntuuitoolkit/fixture_setup.py 2014-03-10 22:04:01 +0000 |
4966 | +++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py 2014-04-23 09:21:19 +0000 |
4967 | @@ -25,7 +25,7 @@ |
4968 | |
4969 | DEFAULT_QML_FILE_CONTENTS = (""" |
4970 | import QtQuick 2.0 |
4971 | -import Ubuntu.Components 0.1 |
4972 | +import Ubuntu.Components 1.0 |
4973 | |
4974 | MainView { |
4975 | width: units.gu(48) |
4976 | |
4977 | === modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py' |
4978 | --- tests/autopilot/ubuntuuitoolkit/tests/__init__.py 2014-02-12 09:20:43 +0000 |
4979 | +++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py 2014-04-23 09:21:19 +0000 |
4980 | @@ -65,7 +65,7 @@ |
4981 | |
4982 | test_qml = (""" |
4983 | import QtQuick 2.0 |
4984 | -import Ubuntu.Components 0.1 |
4985 | +import Ubuntu.Components 1.0 |
4986 | |
4987 | MainView { |
4988 | width: units.gu(48) |
4989 | |
4990 | === modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py' |
4991 | --- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py 2014-04-15 13:15:36 +0000 |
4992 | +++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py 2014-04-23 09:21:19 +0000 |
4993 | @@ -72,7 +72,7 @@ |
4994 | |
4995 | test_qml = (""" |
4996 | import QtQuick 2.0 |
4997 | -import Ubuntu.Components 0.1 |
4998 | +import Ubuntu.Components 1.0 |
4999 | |
5000 | MainView { |
looks good