Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/uitk-12-doc into lp:ubuntu-ui-toolkit/staging
- uitk-12-doc
- Merge into staging
Proposed by
Cris Dywan
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/uitk-12-doc | ||||
Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
Diff against target: |
4568 lines (+970/-507) 222 files modified
components.api (+9/-0) debian/control (+2/-0) documentation/css/base.css (+1/-1) documentation/docs.sh (+0/-2) documentation/overview.qdoc (+21/-12) 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 (+2/-2) documentation/snippets/statesaver/MultiplePropertySaver.qml (+2/-2) documentation/snippets/statesaver/PropertyGroupSaver.qml (+2/-2) documentation/snippets/statesaver/PropertyGroupSaver2.qml (+2/-2) documentation/ubuntu-components.qdoc (+1/-1) documentation/ubuntu-ui-toolkit-common.qdocconf (+2/-2) documentation/ubuntu-whatsnew.qdoc (+46/-0) examples/calculator/calculator.qml (+1/-1) examples/calculator/components/DefaultLayout.qml (+1/-1) examples/calculator/components/Functions.qml (+1/-1) examples/customtheme/main.qml (+1/-4) examples/customtheme/theme/Palette.qml (+1/-1) examples/jokes/jokes.qml (+1/-1) examples/locale/locale.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/Buttons.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/Colors.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/Dialog.qml (+3/-3) examples/ubuntu-ui-toolkit-gallery/ListItems.qml (+3/-3) examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/Styles.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+2/-2) examples/unit-converter/unit-converter.qml (+2/-2) modules/Ubuntu/Components/10/Button.qml (+2/-2) modules/Ubuntu/Components/10/UbuntuColors10.qml (+1/-1) modules/Ubuntu/Components/11/Button.qml (+2/-2) modules/Ubuntu/Components/11/Haptics.qml (+6/-6) modules/Ubuntu/Components/11/UbuntuColors.qml (+1/-1) modules/Ubuntu/Components/AbstractButton.qml (+2/-2) modules/Ubuntu/Components/ActionItem.qml (+2/-2) modules/Ubuntu/Components/ActionList.qml (+2/-2) modules/Ubuntu/Components/ActivityIndicator.qml (+1/-1) modules/Ubuntu/Components/AnimatedItem.qml (+1/-1) modules/Ubuntu/Components/AppHeader.qml (+2/-2) modules/Ubuntu/Components/Captions.qml (+150/-0) modules/Ubuntu/Components/CheckBox.qml (+1/-1) modules/Ubuntu/Components/ComboButton.qml (+15/-15) modules/Ubuntu/Components/CrossFadeImage.qdoc (+2/-2) modules/Ubuntu/Components/CrossFadeImage10.qml (+2/-2) modules/Ubuntu/Components/CrossFadeImage11.qml (+2/-2) modules/Ubuntu/Components/DraggingArea.qml (+1/-1) modules/Ubuntu/Components/Header.qml (+1/-1) modules/Ubuntu/Components/Icon10.qml (+1/-1) modules/Ubuntu/Components/Icon11.qml (+1/-1) modules/Ubuntu/Components/InputHandler.qml (+2/-2) modules/Ubuntu/Components/Label.qml (+1/-1) modules/Ubuntu/Components/ListItems/Base.qml (+3/-2) modules/Ubuntu/Components/ListItems/Caption.qml (+3/-2) modules/Ubuntu/Components/ListItems/Divider.qml (+3/-2) modules/Ubuntu/Components/ListItems/Empty.qml (+4/-3) modules/Ubuntu/Components/ListItems/Expandable.qml (+3/-3) modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml (+3/-3) modules/Ubuntu/Components/ListItems/Header.qml (+1/-1) modules/Ubuntu/Components/ListItems/IconVisual.qml (+2/-2) modules/Ubuntu/Components/ListItems/ImageWithFallback.qml (+1/-1) modules/Ubuntu/Components/ListItems/ItemSelector.qml (+2/-2) modules/Ubuntu/Components/ListItems/LabelVisual.qml (+2/-2) modules/Ubuntu/Components/ListItems/MultiValue.qml (+2/-1) modules/Ubuntu/Components/ListItems/ProgressionVisual.qml (+2/-2) modules/Ubuntu/Components/ListItems/SingleControl.qml (+4/-3) modules/Ubuntu/Components/ListItems/SingleValue.qml (+2/-1) modules/Ubuntu/Components/ListItems/Standard.qml (+4/-3) modules/Ubuntu/Components/ListItems/Subtitled.qml (+3/-2) modules/Ubuntu/Components/ListItems/ThinDivider.qml (+2/-2) modules/Ubuntu/Components/ListItems/ValueSelector.qml (+2/-2) modules/Ubuntu/Components/MainView.qdoc (+3/-3) modules/Ubuntu/Components/MainView.qml (+2/-2) modules/Ubuntu/Components/MainView12.qml (+1/-1) modules/Ubuntu/Components/MainViewBase.qml (+2/-2) 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 (+2/-2) modules/Ubuntu/Components/Page.qdoc (+4/-4) modules/Ubuntu/Components/Page10.qml (+2/-2) modules/Ubuntu/Components/Page11.qml (+1/-1) modules/Ubuntu/Components/PageHeadConfiguration.qml (+3/-3) modules/Ubuntu/Components/PageHeadSections.qml (+2/-2) modules/Ubuntu/Components/PageHeadState.qml (+3/-3) modules/Ubuntu/Components/PageStack.qml (+5/-5) modules/Ubuntu/Components/PageTreeNode.qml (+1/-1) modules/Ubuntu/Components/PageWrapper.qml (+1/-1) modules/Ubuntu/Components/Panel.qml (+8/-8) modules/Ubuntu/Components/Pickers/DatePicker.qml (+10/-10) modules/Ubuntu/Components/Pickers/DayModel.qml (+2/-2) modules/Ubuntu/Components/Pickers/Dialer.qml (+3/-3) modules/Ubuntu/Components/Pickers/DialerHand.qml (+2/-2) modules/Ubuntu/Components/Pickers/DialerHandGroup.qml (+2/-2) modules/Ubuntu/Components/Pickers/HoursModel.qml (+2/-2) modules/Ubuntu/Components/Pickers/MinutesModel.qml (+2/-2) modules/Ubuntu/Components/Pickers/MonthModel.qml (+2/-2) modules/Ubuntu/Components/Pickers/Picker.qml (+4/-4) modules/Ubuntu/Components/Pickers/PickerDelegate.qml (+2/-2) modules/Ubuntu/Components/Pickers/PickerModelBase.qml (+1/-1) modules/Ubuntu/Components/Pickers/PickerPanel.qml (+4/-4) modules/Ubuntu/Components/Pickers/PickerRow.qml (+2/-2) modules/Ubuntu/Components/Pickers/SecondsModel.qml (+2/-2) modules/Ubuntu/Components/Pickers/YearModel.qml (+2/-2) modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml (+2/-2) modules/Ubuntu/Components/Popups/ComposerSheet.qml (+3/-3) modules/Ubuntu/Components/Popups/DefaultSheet.qml (+3/-3) modules/Ubuntu/Components/Popups/Dialog.qml (+4/-4) modules/Ubuntu/Components/Popups/Popover.qml (+4/-4) modules/Ubuntu/Components/Popups/PopupBase.qml (+2/-2) modules/Ubuntu/Components/Popups/SheetBase.qml (+2/-2) modules/Ubuntu/Components/ProgressBar10.qml (+1/-1) modules/Ubuntu/Components/ProgressBar11.qml (+1/-1) modules/Ubuntu/Components/PullToRefresh.qml (+8/-8) modules/Ubuntu/Components/Scrollbar.qml (+1/-1) modules/Ubuntu/Components/Slider.qml (+1/-1) modules/Ubuntu/Components/StyledItem.qml (+2/-2) modules/Ubuntu/Components/Styles/ComboButtonStyle.qml (+1/-1) modules/Ubuntu/Components/Styles/PageHeadStyle.qml (+1/-1) modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml (+1/-1) modules/Ubuntu/Components/Switch.qml (+1/-1) modules/Ubuntu/Components/Tab.qml (+2/-2) modules/Ubuntu/Components/TabBar.qml (+1/-1) modules/Ubuntu/Components/Tabs.qml (+5/-5) modules/Ubuntu/Components/TextArea.qml (+2/-2) modules/Ubuntu/Components/TextCursor.qml (+2/-2) modules/Ubuntu/Components/TextField.qml (+4/-4) modules/Ubuntu/Components/TextInputPopover.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml (+3/-3) modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+3/-3) modules/Ubuntu/Components/Themes/Ambiance/Palette.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/PartialColorize.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/PartialColorizeUbuntuShape.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml (+3/-3) modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml (+2/-2) modules/Ubuntu/Components/Themes/Palette.qml (+1/-1) modules/Ubuntu/Components/Themes/PaletteValues.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruDark/Palette.qml (+2/-2) modules/Ubuntu/Components/Themes/SuruDark/TabBarStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruGradient/MainViewStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruGradient/Palette.qml (+1/-1) modules/Ubuntu/Components/Themes/SuruGradient/TabBarStyle.qml (+1/-1) modules/Ubuntu/Components/Toolbar.qml (+1/-1) modules/Ubuntu/Components/ToolbarButton.qml (+3/-3) modules/Ubuntu/Components/ToolbarItems.qml (+7/-7) modules/Ubuntu/Components/UbuntuListView.qml (+3/-3) modules/Ubuntu/Components/UbuntuListView11.qdoc (+2/-2) modules/Ubuntu/Components/UbuntuListView11.qml (+1/-1) modules/Ubuntu/Components/UbuntuNumberAnimation.qml (+4/-4) modules/Ubuntu/Components/plugin/i18n.cpp (+2/-2) modules/Ubuntu/Components/plugin/inversemouseareatype.cpp (+6/-6) modules/Ubuntu/Components/plugin/plugin.cpp (+10/-0) modules/Ubuntu/Components/plugin/plugin.pro (+4/-2) modules/Ubuntu/Components/plugin/sortfiltermodel.cpp (+2/-2) modules/Ubuntu/Components/plugin/ucalarm.cpp (+2/-2) modules/Ubuntu/Components/plugin/ucalarmmodel.cpp (+2/-2) modules/Ubuntu/Components/plugin/ucfontutils.cpp (+4/-4) modules/Ubuntu/Components/plugin/uclistitem.cpp (+1/-1) modules/Ubuntu/Components/plugin/uclistitemactions.cpp (+4/-4) modules/Ubuntu/Components/plugin/ucmousefilters.cpp (+15/-15) modules/Ubuntu/Components/plugin/ucnamespace.cpp (+48/-0) modules/Ubuntu/Components/plugin/ucnamespace.h (+36/-0) modules/Ubuntu/Components/plugin/ucserviceproperties.cpp (+2/-2) modules/Ubuntu/Components/plugin/ucstatesaver.cpp (+2/-2) modules/Ubuntu/Components/plugin/ucstyleditembase.cpp (+2/-2) modules/Ubuntu/Components/plugin/uctheme.cpp (+4/-4) modules/Ubuntu/Components/plugin/ucunits.cpp (+2/-2) modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp (+2/-2) modules/Ubuntu/Components/qmldir (+1/-0) modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp (+1/-1) modules/Ubuntu/PerformanceMetrics/BarGraph.qml (+2/-2) modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml (+1/-1) modules/Ubuntu/Test/UbuntuTestCase.qml (+2/-2) tests/resources/listitems/ListItemDragging.qml (+17/-13) tests/resources/listitems/ListItemTest.qml (+38/-18) tests/unit/tst_performance/ListItemList.qml (+2/-2) tests/unit/tst_performance/ListOfCaptions.qml (+35/-0) tests/unit/tst_performance/tst_performance.cpp (+1/-0) tests/unit_x11/tst_components/tst_captions.qml (+86/-0) |
||||
To merge this branch: | bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/uitk-12-doc | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu SDK team | Pending | ||
Review via email: mp+251613@code.launchpad.net |
This proposal has been superseded by a proposal from 2015-03-03.
Commit message
Final move to 1.2 release and doc fixes
Description of the change
To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'components.api' |
2 | --- components.api 2015-02-27 13:47:29 +0000 |
3 | +++ components.api 2015-03-03 15:01:13 +0000 |
4 | @@ -34,6 +34,11 @@ |
5 | property Gradient gradient |
6 | property font font |
7 | property string iconPosition |
8 | +Captions 1.2 |
9 | +ColumnLayout |
10 | + property int captionStyle |
11 | + property Label title |
12 | + property Label subtitle |
13 | CheckBox 0.1 1.0 |
14 | AbstractButton |
15 | property bool checked |
16 | @@ -1007,6 +1012,10 @@ |
17 | name: "exited" |
18 | Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } |
19 | Parameter { name: "host"; type: "QQuickItem"; isPointer: true } |
20 | + name: "UCNamespace" |
21 | + prototype: "QObject" |
22 | + exports: ["Ubuntu 1.2"] |
23 | + name: "CaptionsStyle" |
24 | name: "UCQQuickImageExtension" |
25 | prototype: "QQuickImageBase" |
26 | exports: ["QQuickImageBase 0.1", "QQuickImageBase 1.0"] |
27 | |
28 | === modified file 'debian/control' |
29 | --- debian/control 2015-02-25 14:25:59 +0000 |
30 | +++ debian/control 2015-03-03 15:01:13 +0000 |
31 | @@ -20,6 +20,7 @@ |
32 | qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin, |
33 | qml-module-qttest | qtdeclarative5-test-plugin, |
34 | qml-module-qtquick-window2 | qtdeclarative5-window-plugin, |
35 | + qml-module-qtquick-layouts, |
36 | qtdeclarative5-qtfeedback-plugin, |
37 | qtdeclarative5-unity-action-plugin (>= 1.1.0), |
38 | qml-module-qtquick-localstorage | qtdeclarative5-localstorage-plugin, |
39 | @@ -62,6 +63,7 @@ |
40 | libqt5svg5, |
41 | qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin, |
42 | qml-module-qtquick-window2 | qtdeclarative5-window-plugin, |
43 | + qml-module-qtquick-layouts, |
44 | qtdeclarative5-qtfeedback-plugin, |
45 | qtdeclarative5-unity-action-plugin (>= 1.1.0), |
46 | suru-icon-theme, |
47 | |
48 | === modified file 'documentation/css/base.css' |
49 | --- documentation/css/base.css 2012-12-20 08:38:03 +0000 |
50 | +++ documentation/css/base.css 2015-03-03 15:01:13 +0000 |
51 | @@ -37,7 +37,7 @@ |
52 | padding: 10px; |
53 | font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace; |
54 | background-color: #fdf6f2; |
55 | - display: block; |
56 | + display: inline-block; |
57 | margin-bottom: 10px; |
58 | -moz-border-radius: 4px; |
59 | -webkit-border-radius: 4px; |
60 | |
61 | === modified file 'documentation/docs.sh' |
62 | --- documentation/docs.sh 2014-11-25 16:28:04 +0000 |
63 | +++ documentation/docs.sh 2015-03-03 15:01:13 +0000 |
64 | @@ -45,8 +45,6 @@ |
65 | qdoc $SRC/ubuntu-ui-toolkit-online-indexes.qdocconf 2> /dev/null |
66 | echo docs: Cross-referenced done. |
67 | |
68 | -sed -r -i 's@("main-content">)@\1<ul class="breadcrumb">@g' $1/html/*.html |
69 | -sed -r -i 's@(<div class="toc">|<h1 class="title">)@</ul>\1@g' $1/html/*.html |
70 | sed -r -i 's@(</p>)<p/>@\1@g' $1/html/*.html |
71 | sed -r -i 's@(<a class="(next|prev)Page" href=".+">)(.+)(</a>)@<li>\1\3\4</li>@g' $1/html/*.html |
72 | sed -r -i 's@(href="qmlmodule-ubuntu-components0-ubuntu-components-0-1.html">Basic QML Types)@href="overview-ubuntu-sdk.html">Ubuntu User Interface Toolkit@g' $1/html/*.html |
73 | |
74 | === modified file 'documentation/overview.qdoc' |
75 | --- documentation/overview.qdoc 2014-09-15 12:59:16 +0000 |
76 | +++ documentation/overview.qdoc 2015-03-03 15:01:13 +0000 |
77 | @@ -20,6 +20,7 @@ |
78 | |
79 | \part General Topics |
80 | \list |
81 | + \li \l{ubuntu-whatsnew.html}{What's new in version 1.2?} |
82 | \li \l{ubuntu-layouts.html}{Layouts} describes a flexible layouting engine |
83 | to ease the development of responsive user interfaces. |
84 | \li \l {Resolution Independence} describes the facilities that should be |
85 | @@ -31,11 +32,24 @@ |
86 | \part Basic QML Types |
87 | Available through: |
88 | \code |
89 | - import Ubuntu.Components 1.1 |
90 | + import Ubuntu.Components 1.2 |
91 | \endcode |
92 | \annotatedlist ubuntu |
93 | |
94 | - \part List Items |
95 | + \part List views, list items |
96 | + Components with standardized view items, with conditional actions, multiselect |
97 | + and reordering support on scrollable views. Replaces the Ubuntu.Components.ListItems |
98 | + module components. |
99 | + |
100 | + Available through: |
101 | + \code |
102 | + import Ubuntu.Components 1.2 |
103 | + \endcode |
104 | + \annotatedlist ubuntu-listitem |
105 | + |
106 | + \part List Items module - deprecated |
107 | + This module contains the old set of list items. |
108 | + |
109 | Available through: |
110 | \code |
111 | import Ubuntu.Components.ListItems 1.0 |
112 | @@ -66,7 +80,7 @@ |
113 | \part Theming Elements |
114 | Available through: |
115 | \code |
116 | - import Ubuntu.Components 1.1 |
117 | + import Ubuntu.Components 1.2 |
118 | \endcode |
119 | \annotatedlist theming |
120 | |
121 | @@ -75,28 +89,28 @@ |
122 | Themes must make sure that these interfaces are all implemented. |
123 | Available through: |
124 | \code |
125 | - import Ubuntu.Components.Styles 1.1 |
126 | + import Ubuntu.Components.Styles 1.2 |
127 | \endcode |
128 | \annotatedlist style-api |
129 | |
130 | \part Resolution Independence Items |
131 | Available through: |
132 | \code |
133 | - import Ubuntu.Components 1.1 |
134 | + import Ubuntu.Components 1.2 |
135 | \endcode |
136 | \annotatedlist resolution-independence |
137 | |
138 | \part Parsing Command-Line Arguments |
139 | Available through: |
140 | \code |
141 | - import Ubuntu.Components 1.1 |
142 | + import Ubuntu.Components 1.2 |
143 | \endcode |
144 | \annotatedlist ubuntu-commandline |
145 | |
146 | \part Services |
147 | Available through: |
148 | \code |
149 | - import Ubuntu.Components 1.1 |
150 | + import Ubuntu.Components 1.2 |
151 | \endcode |
152 | \annotatedlist ubuntu-services |
153 | |
154 | @@ -113,9 +127,4 @@ |
155 | import Ubuntu Test 1.0 |
156 | \endcode |
157 | \annotatedlist ubuntu-test |
158 | - |
159 | - \part Unstable QML Types |
160 | - The following section lists components which will be part of future releases. |
161 | - Their interface is unstable and thus should not be used in production applications. |
162 | - \annotatedlist unstable-ubuntu-listitems |
163 | */ |
164 | |
165 | === modified file 'documentation/resolution-independence.qdoc' |
166 | --- documentation/resolution-independence.qdoc 2014-04-23 08:50:20 +0000 |
167 | +++ documentation/resolution-independence.qdoc 2015-03-03 15:01:13 +0000 |
168 | @@ -64,7 +64,7 @@ |
169 | |
170 | Example Usage: |
171 | \code |
172 | - import Ubuntu.Components 1.1 |
173 | + import Ubuntu.Components 1.2 |
174 | |
175 | Item { |
176 | width: units.gu(2) |
177 | @@ -79,7 +79,7 @@ |
178 | |
179 | Example Usage: |
180 | \code |
181 | - import Ubuntu.Components 1.1 |
182 | + import Ubuntu.Components 1.2 |
183 | |
184 | Rectangle { |
185 | height: units.dp(1) |
186 | @@ -143,7 +143,7 @@ |
187 | |
188 | Example Usage: |
189 | \code |
190 | - import Ubuntu.Components 1.1 |
191 | + import Ubuntu.Components 1.2 |
192 | |
193 | Label { |
194 | fontSize: "small" |
195 | |
196 | === modified file 'documentation/snippets/layouts/SimpleLayout.qml' |
197 | --- documentation/snippets/layouts/SimpleLayout.qml 2014-04-23 08:50:20 +0000 |
198 | +++ documentation/snippets/layouts/SimpleLayout.qml 2015-03-03 15:01:13 +0000 |
199 | @@ -14,8 +14,8 @@ |
200 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
201 | */ |
202 | |
203 | -import QtQuick 2.0 |
204 | -import Ubuntu.Components 1.1 |
205 | +import QtQuick 2.4 |
206 | +import Ubuntu.Components 1.2 |
207 | import Ubuntu.Layouts 1.0 |
208 | |
209 | Item { |
210 | |
211 | === modified file 'documentation/snippets/layouts/layout1.qml' |
212 | --- documentation/snippets/layouts/layout1.qml 2014-04-23 08:50:20 +0000 |
213 | +++ documentation/snippets/layouts/layout1.qml 2015-03-03 15:01:13 +0000 |
214 | @@ -15,8 +15,8 @@ |
215 | */ |
216 | |
217 | //![0] |
218 | -import QtQuick 2.0 |
219 | -import Ubuntu.Components 1.1 |
220 | +import QtQuick 2.4 |
221 | +import Ubuntu.Components 1.2 |
222 | import Ubuntu.Layouts 1.0 |
223 | |
224 | Item { |
225 | |
226 | === modified file 'documentation/snippets/layouts/layout2.qml' |
227 | --- documentation/snippets/layouts/layout2.qml 2014-04-23 08:50:20 +0000 |
228 | +++ documentation/snippets/layouts/layout2.qml 2015-03-03 15:01:13 +0000 |
229 | @@ -15,8 +15,8 @@ |
230 | */ |
231 | |
232 | //![0] |
233 | -import QtQuick 2.0 |
234 | -import Ubuntu.Components 1.1 |
235 | +import QtQuick 2.4 |
236 | +import Ubuntu.Components 1.2 |
237 | import Ubuntu.Layouts 1.0 |
238 | |
239 | Item { |
240 | |
241 | === modified file 'documentation/snippets/layouts/layout3.qml' |
242 | --- documentation/snippets/layouts/layout3.qml 2014-04-23 08:50:20 +0000 |
243 | +++ documentation/snippets/layouts/layout3.qml 2015-03-03 15:01:13 +0000 |
244 | @@ -15,8 +15,8 @@ |
245 | */ |
246 | |
247 | //![0] |
248 | -import QtQuick 2.0 |
249 | -import Ubuntu.Components 1.1 |
250 | +import QtQuick 2.4 |
251 | +import Ubuntu.Components 1.2 |
252 | import Ubuntu.Layouts 1.0 |
253 | |
254 | Item { |
255 | |
256 | === modified file 'documentation/snippets/layouts/layout6.qml' |
257 | --- documentation/snippets/layouts/layout6.qml 2014-04-23 08:50:20 +0000 |
258 | +++ documentation/snippets/layouts/layout6.qml 2015-03-03 15:01:13 +0000 |
259 | @@ -15,8 +15,8 @@ |
260 | */ |
261 | |
262 | //![0] |
263 | -import QtQuick 2.0 |
264 | -import Ubuntu.Components 1.1 |
265 | +import QtQuick 2.4 |
266 | +import Ubuntu.Components 1.2 |
267 | import Ubuntu.Layouts 1.0 |
268 | |
269 | Item { |
270 | |
271 | === modified file 'documentation/snippets/layouts/layout7.qml' |
272 | --- documentation/snippets/layouts/layout7.qml 2014-04-23 08:50:20 +0000 |
273 | +++ documentation/snippets/layouts/layout7.qml 2015-03-03 15:01:13 +0000 |
274 | @@ -15,8 +15,8 @@ |
275 | */ |
276 | |
277 | //![0] |
278 | -import QtQuick 2.0 |
279 | -import Ubuntu.Components 1.1 |
280 | +import QtQuick 2.4 |
281 | +import Ubuntu.Components 1.2 |
282 | import Ubuntu.Layouts 1.0 |
283 | |
284 | Item { |
285 | |
286 | === modified file 'documentation/snippets/statesaver/ColorChanger.qml' |
287 | --- documentation/snippets/statesaver/ColorChanger.qml 2014-04-23 08:50:20 +0000 |
288 | +++ documentation/snippets/statesaver/ColorChanger.qml 2015-03-03 15:01:13 +0000 |
289 | @@ -15,8 +15,8 @@ |
290 | */ |
291 | |
292 | //![color-saver] |
293 | -import QtQuick 2.0 |
294 | -import Ubuntu.Components 1.1 |
295 | +import QtQuick 2.4 |
296 | +import Ubuntu.Components 1.2 |
297 | |
298 | Rectangle { |
299 | id: root |
300 | |
301 | === modified file 'documentation/snippets/statesaver/MultiplePropertySaver.qml' |
302 | --- documentation/snippets/statesaver/MultiplePropertySaver.qml 2014-04-23 08:50:20 +0000 |
303 | +++ documentation/snippets/statesaver/MultiplePropertySaver.qml 2015-03-03 15:01:13 +0000 |
304 | @@ -15,8 +15,8 @@ |
305 | */ |
306 | |
307 | //![group-saver] |
308 | -import QtQuick 2.0 |
309 | -import Ubuntu.Components 1.1 |
310 | +import QtQuick 2.4 |
311 | +import Ubuntu.Components 1.2 |
312 | |
313 | Rectangle { |
314 | id: root |
315 | |
316 | === modified file 'documentation/snippets/statesaver/PropertyGroupSaver.qml' |
317 | --- documentation/snippets/statesaver/PropertyGroupSaver.qml 2014-04-23 08:50:20 +0000 |
318 | +++ documentation/snippets/statesaver/PropertyGroupSaver.qml 2015-03-03 15:01:13 +0000 |
319 | @@ -15,8 +15,8 @@ |
320 | */ |
321 | |
322 | //![property-group-saver] |
323 | -import QtQuick 2.0 |
324 | -import Ubuntu.Components 1.1 |
325 | +import QtQuick 2.4 |
326 | +import Ubuntu.Components 1.2 |
327 | |
328 | Rectangle { |
329 | id: root |
330 | |
331 | === modified file 'documentation/snippets/statesaver/PropertyGroupSaver2.qml' |
332 | --- documentation/snippets/statesaver/PropertyGroupSaver2.qml 2014-04-23 08:50:20 +0000 |
333 | +++ documentation/snippets/statesaver/PropertyGroupSaver2.qml 2015-03-03 15:01:13 +0000 |
334 | @@ -15,8 +15,8 @@ |
335 | */ |
336 | |
337 | //![property-group-saver] |
338 | -import QtQuick 2.0 |
339 | -import Ubuntu.Components 1.1 |
340 | +import QtQuick 2.4 |
341 | +import Ubuntu.Components 1.2 |
342 | |
343 | Rectangle { |
344 | id: root |
345 | |
346 | === modified file 'documentation/ubuntu-components.qdoc' |
347 | --- documentation/ubuntu-components.qdoc 2014-04-23 08:50:20 +0000 |
348 | +++ documentation/ubuntu-components.qdoc 2015-03-03 15:01:13 +0000 |
349 | @@ -15,7 +15,7 @@ |
350 | */ |
351 | |
352 | /*! |
353 | - \qmlmodule Ubuntu.Components 1.1 |
354 | + \qmlmodule Ubuntu.Components 1.2 |
355 | \title Basic QML Types |
356 | \nextpage {Ubuntu User Interface Toolkit} |
357 | */ |
358 | |
359 | === modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf' |
360 | --- documentation/ubuntu-ui-toolkit-common.qdocconf 2015-01-27 11:27:37 +0000 |
361 | +++ documentation/ubuntu-ui-toolkit-common.qdocconf 2015-03-03 15:01:13 +0000 |
362 | @@ -1,5 +1,5 @@ |
363 | project = UbuntuUserInterfaceToolkit |
364 | -url = http://developer.ubuntu.com/api/ubuntu-12.10/qml/mobile/ |
365 | +url = http://developer.ubuntu.com/api/ubuntu-15.04/qml/mobile/ |
366 | description = Ubuntu User Interface Toolkit Documentation |
367 | sourcedirs = ./ |
368 | sourcedirs += ../modules/Ubuntu/Components |
369 | @@ -19,7 +19,7 @@ |
370 | excludefiles = $BLD/../modules/Ubuntu/Components/MainView.qml |
371 | outputdir = $BLD/html |
372 | outputformats = HTML |
373 | -version = 1.1 |
374 | +version = 1.2 |
375 | syntaxhighlighting = true |
376 | sourceencoding = UTF-8 |
377 | outputencoding = UTF-8 |
378 | |
379 | === added file 'documentation/ubuntu-whatsnew.qdoc' |
380 | --- documentation/ubuntu-whatsnew.qdoc 1970-01-01 00:00:00 +0000 |
381 | +++ documentation/ubuntu-whatsnew.qdoc 2015-03-03 15:01:13 +0000 |
382 | @@ -0,0 +1,46 @@ |
383 | +/* |
384 | + * Copyright 2015 Canonical Ltd. |
385 | + * |
386 | + * This program is free software; you can redistribute it and/or modify |
387 | + * it under the terms of the GNU Lesser General Public License as published by |
388 | + * the Free Software Foundation; version 3. |
389 | + * |
390 | + * This program is distributed in the hope that it will be useful, |
391 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
392 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
393 | + * GNU Lesser General Public License for more details. |
394 | + * |
395 | + * You should have received a copy of the GNU Lesser General Public License |
396 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
397 | + */ |
398 | + |
399 | +/*! |
400 | + * \page ubuntu-whatsnew.html ubuntu-whatsnew |
401 | + * \title What's new in the version 1.2? |
402 | + * |
403 | + * Beside the pile of bug fixes we have two major changes in the UI Toolkit version 1.2, |
404 | + * as follows: |
405 | + * |
406 | + * \section3 MainView.useDeprecatedToolbar |
407 | + * MainView.useDeprecatedToolbar property \b {got removed} and the new header is always |
408 | + * enabled. If you need to use the old toolbar you can still do that by importing \b |
409 | + * Ubuntu.Components 1.1. |
410 | + * |
411 | + * \section3 A new performant ListItem component |
412 | + * As of 1.2, a new ListItem component and its attached components were added to the toolkit, |
413 | + * which gives more flexibility and performance when used with scrollable views like ListView |
414 | + * or Flickable. Its layout is free, meaning developers can, and have to implement their layout |
415 | + * themselves. The only helper the toolkit provides is the Captions component, which fulfills |
416 | + * the two typical use cases, for the two label column title captioning and for the summary |
417 | + * captions. |
418 | + * |
419 | + * \section3 Ubuntu.Components.ListItems module deprecated |
420 | + * The new ListItem also made the old list items module to be redundant, therefore we marked them |
421 | + * for deprecation. Which means that your application should migrate to the new ListItem as soon as |
422 | + * possible. There are few components which were not marked as deprecated, like ThinDivider, Header, |
423 | + * Expandable and ExpandableColumn were not deprecated. |
424 | + * |
425 | + * \section3 UbuntuShape facelift |
426 | + * There were few properties added and marked to be deprecated as well in UbuntuShape. Some most |
427 | + * wanted features were added, and optimized. |
428 | + */ |
429 | |
430 | === modified file 'examples/calculator/calculator.qml' |
431 | --- examples/calculator/calculator.qml 2014-05-13 15:15:57 +0000 |
432 | +++ examples/calculator/calculator.qml 2015-03-03 15:01:13 +0000 |
433 | @@ -17,7 +17,7 @@ |
434 | */ |
435 | |
436 | import QtQuick 2.0 |
437 | -import Ubuntu.Components 1.1 |
438 | +import Ubuntu.Components 1.2 |
439 | import Ubuntu.Layouts 1.0 |
440 | import "components" |
441 | import "components/calculator.js" as Calculator |
442 | |
443 | === modified file 'examples/calculator/components/DefaultLayout.qml' |
444 | --- examples/calculator/components/DefaultLayout.qml 2014-05-13 15:15:57 +0000 |
445 | +++ examples/calculator/components/DefaultLayout.qml 2015-03-03 15:01:13 +0000 |
446 | @@ -17,7 +17,7 @@ |
447 | */ |
448 | |
449 | import QtQuick 2.0 |
450 | -import Ubuntu.Components 1.1 |
451 | +import Ubuntu.Components 1.2 |
452 | import Ubuntu.Layouts 1.0 |
453 | |
454 | Item { |
455 | |
456 | === modified file 'examples/calculator/components/Functions.qml' |
457 | --- examples/calculator/components/Functions.qml 2014-05-13 15:15:57 +0000 |
458 | +++ examples/calculator/components/Functions.qml 2015-03-03 15:01:13 +0000 |
459 | @@ -17,7 +17,7 @@ |
460 | */ |
461 | |
462 | import QtQuick 2.0 |
463 | -import Ubuntu.Components 1.1 |
464 | +import Ubuntu.Components 1.2 |
465 | import Ubuntu.Layouts 1.0 |
466 | |
467 | Grid { |
468 | |
469 | === modified file 'examples/customtheme/main.qml' |
470 | --- examples/customtheme/main.qml 2014-12-04 07:18:58 +0000 |
471 | +++ examples/customtheme/main.qml 2015-03-03 15:01:13 +0000 |
472 | @@ -15,7 +15,7 @@ |
473 | */ |
474 | |
475 | import QtQuick 2.0 |
476 | -import Ubuntu.Components 1.1 |
477 | +import Ubuntu.Components 1.2 |
478 | |
479 | /*! |
480 | \brief MainView with a Label and Button elements. |
481 | @@ -35,9 +35,6 @@ |
482 | */ |
483 | //automaticOrientation: true |
484 | |
485 | - // Removes the old toolbar and enables new features of the new header. |
486 | - useDeprecatedToolbar: false |
487 | - |
488 | width: units.gu(100) |
489 | height: units.gu(75) |
490 | |
491 | |
492 | === modified file 'examples/customtheme/theme/Palette.qml' |
493 | --- examples/customtheme/theme/Palette.qml 2014-12-04 07:18:58 +0000 |
494 | +++ examples/customtheme/theme/Palette.qml 2015-03-03 15:01:13 +0000 |
495 | @@ -15,7 +15,7 @@ |
496 | */ |
497 | |
498 | import QtQuick 2.0 |
499 | -import Ubuntu.Components 1.1 |
500 | +import Ubuntu.Components 1.2 |
501 | import Ubuntu.Components.Themes.SuruDark 1.1 as Suru |
502 | |
503 | Suru.Palette { |
504 | |
505 | === modified file 'examples/jokes/jokes.qml' |
506 | --- examples/jokes/jokes.qml 2014-04-23 08:50:20 +0000 |
507 | +++ examples/jokes/jokes.qml 2015-03-03 15:01:13 +0000 |
508 | @@ -16,7 +16,7 @@ |
509 | */ |
510 | |
511 | import QtQuick 2.0 |
512 | -import Ubuntu.Components 1.1 |
513 | +import Ubuntu.Components 1.2 |
514 | import QtMultimedia 5.0 |
515 | |
516 | /*! |
517 | |
518 | === modified file 'examples/locale/locale.qml' |
519 | --- examples/locale/locale.qml 2014-04-23 08:50:20 +0000 |
520 | +++ examples/locale/locale.qml 2015-03-03 15:01:13 +0000 |
521 | @@ -16,7 +16,7 @@ |
522 | */ |
523 | |
524 | import QtQuick 2.0 |
525 | -import Ubuntu.Components 1.1 |
526 | +import Ubuntu.Components 1.2 |
527 | import Ubuntu.Components.ListItems 1.0 as ListItem |
528 | |
529 | /*! |
530 | |
531 | === modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml' |
532 | --- examples/ubuntu-ui-toolkit-gallery/Buttons.qml 2014-07-30 12:59:34 +0000 |
533 | +++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml 2015-03-03 15:01:13 +0000 |
534 | @@ -14,8 +14,8 @@ |
535 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
536 | */ |
537 | |
538 | -import QtQuick 2.0 |
539 | -import Ubuntu.Components 1.1 |
540 | +import QtQuick 2.4 |
541 | +import Ubuntu.Components 1.2 |
542 | import Ubuntu.Components.ListItems 1.0 |
543 | |
544 | Template { |
545 | |
546 | === modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml' |
547 | --- examples/ubuntu-ui-toolkit-gallery/Colors.qml 2014-07-02 11:41:18 +0000 |
548 | +++ examples/ubuntu-ui-toolkit-gallery/Colors.qml 2015-03-03 15:01:13 +0000 |
549 | @@ -14,8 +14,8 @@ |
550 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
551 | */ |
552 | |
553 | -import QtQuick 2.2 |
554 | -import Ubuntu.Components 1.1 |
555 | +import QtQuick 2.4 |
556 | +import Ubuntu.Components 1.2 |
557 | |
558 | Template { |
559 | objectName: "colorsTemplate" |
560 | |
561 | === modified file 'examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml' |
562 | --- examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml 2014-07-02 11:11:53 +0000 |
563 | +++ examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml 2015-03-03 15:01:13 +0000 |
564 | @@ -14,8 +14,8 @@ |
565 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
566 | */ |
567 | |
568 | -import QtQuick 2.0 |
569 | -import Ubuntu.Components 1.1 |
570 | +import QtQuick 2.4 |
571 | +import Ubuntu.Components 1.2 |
572 | |
573 | Template { |
574 | objectName: "crossFadeImagesTemplate" |
575 | |
576 | === modified file 'examples/ubuntu-ui-toolkit-gallery/Dialog.qml' |
577 | --- examples/ubuntu-ui-toolkit-gallery/Dialog.qml 2014-07-25 12:55:27 +0000 |
578 | +++ examples/ubuntu-ui-toolkit-gallery/Dialog.qml 2015-03-03 15:01:13 +0000 |
579 | @@ -14,9 +14,9 @@ |
580 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
581 | */ |
582 | |
583 | -import QtQuick 2.0 |
584 | -import Ubuntu.Components 1.1 |
585 | -import Ubuntu.Components.Popups 0.1 |
586 | +import QtQuick 2.4 |
587 | +import Ubuntu.Components 1.2 |
588 | +import Ubuntu.Components.Popups 1.0 |
589 | |
590 | Template { |
591 | objectName: "dialogsTemplate" |
592 | |
593 | === modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml' |
594 | --- examples/ubuntu-ui-toolkit-gallery/ListItems.qml 2014-07-18 12:12:05 +0000 |
595 | +++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml 2015-03-03 15:01:13 +0000 |
596 | @@ -14,9 +14,9 @@ |
597 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
598 | */ |
599 | |
600 | -import QtQuick 2.0 |
601 | -import Ubuntu.Components 1.1 as Toolkit |
602 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
603 | +import QtQuick 2.4 |
604 | +import Ubuntu.Components 1.2 as Toolkit |
605 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
606 | |
607 | Template { |
608 | objectName: "listItemsTemplate" |
609 | |
610 | === modified file 'examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml' |
611 | --- examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml 2014-06-17 13:04:52 +0000 |
612 | +++ examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml 2015-03-03 15:01:13 +0000 |
613 | @@ -14,8 +14,8 @@ |
614 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
615 | */ |
616 | |
617 | -import QtQuick 2.0 |
618 | -import Ubuntu.Components 1.1 |
619 | +import QtQuick 2.4 |
620 | +import Ubuntu.Components 1.2 |
621 | |
622 | Template { |
623 | objectName: "progressBarsTemplate" |
624 | |
625 | === modified file 'examples/ubuntu-ui-toolkit-gallery/Styles.qml' |
626 | --- examples/ubuntu-ui-toolkit-gallery/Styles.qml 2014-07-21 11:14:11 +0000 |
627 | +++ examples/ubuntu-ui-toolkit-gallery/Styles.qml 2015-03-03 15:01:13 +0000 |
628 | @@ -14,7 +14,7 @@ |
629 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
630 | */ |
631 | |
632 | -import QtQuick 2.0 |
633 | +import QtQuick 2.4 |
634 | import Ubuntu.Components 1.1 |
635 | |
636 | Template { |
637 | |
638 | === modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml' |
639 | --- examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml 2014-06-27 06:46:16 +0000 |
640 | +++ examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml 2015-03-03 15:01:13 +0000 |
641 | @@ -14,8 +14,8 @@ |
642 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
643 | */ |
644 | |
645 | -import QtQuick 2.2 |
646 | -import Ubuntu.Components 1.1 |
647 | +import QtQuick 2.4 |
648 | +import Ubuntu.Components 1.2 |
649 | import Ubuntu.Components.ListItems 1.0 as ListItem |
650 | |
651 | Template { |
652 | |
653 | === modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml' |
654 | --- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2015-02-25 20:02:36 +0000 |
655 | +++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2015-03-03 15:01:13 +0000 |
656 | @@ -14,8 +14,8 @@ |
657 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
658 | */ |
659 | |
660 | -import QtQuick 2.0 |
661 | -import Ubuntu.Components 1.1 |
662 | +import QtQuick 2.4 |
663 | +import Ubuntu.Components 1.1 // keep 1.1 till we remove the deprecated toolbar and toolbar in general |
664 | import Ubuntu.Components.ListItems 0.1 as ListItem |
665 | |
666 | MainView { |
667 | |
668 | === modified file 'examples/unit-converter/unit-converter.qml' |
669 | --- examples/unit-converter/unit-converter.qml 2014-04-23 08:50:20 +0000 |
670 | +++ examples/unit-converter/unit-converter.qml 2015-03-03 15:01:13 +0000 |
671 | @@ -14,8 +14,8 @@ |
672 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
673 | */ |
674 | |
675 | -import QtQuick 2.0 |
676 | -import Ubuntu.Components 1.1 |
677 | +import QtQuick 2.4 |
678 | +import Ubuntu.Components 1.2 |
679 | import "conversion.js" as Converter |
680 | |
681 | /*! |
682 | |
683 | === modified file 'modules/Ubuntu/Components/10/Button.qml' |
684 | --- modules/Ubuntu/Components/10/Button.qml 2014-07-29 14:42:56 +0000 |
685 | +++ modules/Ubuntu/Components/10/Button.qml 2015-03-03 15:01:13 +0000 |
686 | @@ -14,8 +14,8 @@ |
687 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
688 | */ |
689 | |
690 | -import QtQuick 2.0 |
691 | -import Ubuntu.Components 1.0 |
692 | +import QtQuick 2.4 |
693 | +import Ubuntu.Components 1.2 |
694 | |
695 | /*! |
696 | \internal |
697 | |
698 | === modified file 'modules/Ubuntu/Components/10/UbuntuColors10.qml' |
699 | --- modules/Ubuntu/Components/10/UbuntuColors10.qml 2014-09-03 08:17:24 +0000 |
700 | +++ modules/Ubuntu/Components/10/UbuntuColors10.qml 2015-03-03 15:01:13 +0000 |
701 | @@ -15,7 +15,7 @@ |
702 | */ |
703 | |
704 | pragma Singleton |
705 | -import QtQuick 2.2 |
706 | +import QtQuick 2.4 |
707 | |
708 | /*! |
709 | \internal |
710 | |
711 | === modified file 'modules/Ubuntu/Components/11/Button.qml' |
712 | --- modules/Ubuntu/Components/11/Button.qml 2014-07-28 19:27:17 +0000 |
713 | +++ modules/Ubuntu/Components/11/Button.qml 2015-03-03 15:01:13 +0000 |
714 | @@ -14,8 +14,8 @@ |
715 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
716 | */ |
717 | |
718 | -import QtQuick 2.2 |
719 | -import Ubuntu.Components 1.1 |
720 | +import QtQuick 2.4 |
721 | +import Ubuntu.Components 1.2 |
722 | |
723 | /*! |
724 | \qmltype Button |
725 | |
726 | === modified file 'modules/Ubuntu/Components/11/Haptics.qml' |
727 | --- modules/Ubuntu/Components/11/Haptics.qml 2015-01-29 06:18:22 +0000 |
728 | +++ modules/Ubuntu/Components/11/Haptics.qml 2015-03-03 15:01:13 +0000 |
729 | @@ -15,9 +15,9 @@ |
730 | */ |
731 | |
732 | pragma Singleton |
733 | -import QtQuick 2.0 |
734 | +import QtQuick 2.4 |
735 | import QtFeedback 5.0 |
736 | -import Ubuntu.Components 1.1 |
737 | +import Ubuntu.Components 1.2 |
738 | |
739 | /*! |
740 | \qmltype Haptics |
741 | @@ -32,8 +32,8 @@ |
742 | |
743 | Example of using Haptics: |
744 | \qml |
745 | - import QtQuick 2.3 |
746 | - import Ubuntu.Components 1.1 |
747 | + import QtQuick 2.4 |
748 | + import Ubuntu.Components 1.2 |
749 | |
750 | Item { |
751 | implicitWidth: units.gu(20) |
752 | @@ -54,8 +54,8 @@ |
753 | |
754 | Custom effects can be played as follows: |
755 | \qml |
756 | - import QtQuick 2.3 |
757 | - import Ubuntu.Components 1.1 |
758 | + import QtQuick 2.4 |
759 | + import Ubuntu.Components 1.2 |
760 | |
761 | Item { |
762 | implicitWidth: units.gu(20) |
763 | |
764 | === modified file 'modules/Ubuntu/Components/11/UbuntuColors.qml' |
765 | --- modules/Ubuntu/Components/11/UbuntuColors.qml 2014-09-03 08:17:24 +0000 |
766 | +++ modules/Ubuntu/Components/11/UbuntuColors.qml 2015-03-03 15:01:13 +0000 |
767 | @@ -15,7 +15,7 @@ |
768 | */ |
769 | |
770 | pragma Singleton |
771 | -import QtQuick 2.2 |
772 | +import QtQuick 2.4 |
773 | |
774 | /*! |
775 | \qmltype UbuntuColors |
776 | |
777 | === modified file 'modules/Ubuntu/Components/AbstractButton.qml' |
778 | --- modules/Ubuntu/Components/AbstractButton.qml 2015-02-10 16:47:59 +0000 |
779 | +++ modules/Ubuntu/Components/AbstractButton.qml 2015-03-03 15:01:13 +0000 |
780 | @@ -14,8 +14,8 @@ |
781 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
782 | */ |
783 | |
784 | -import QtQuick 2.0 |
785 | -import Ubuntu.Components 1.1 |
786 | +import QtQuick 2.4 |
787 | +import Ubuntu.Components 1.2 |
788 | |
789 | /*! |
790 | \qmlabstract AbstractButton |
791 | |
792 | === modified file 'modules/Ubuntu/Components/ActionItem.qml' |
793 | --- modules/Ubuntu/Components/ActionItem.qml 2014-08-31 19:24:19 +0000 |
794 | +++ modules/Ubuntu/Components/ActionItem.qml 2015-03-03 15:01:13 +0000 |
795 | @@ -14,8 +14,8 @@ |
796 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
797 | */ |
798 | |
799 | -import QtQuick 2.2 |
800 | -import Ubuntu.Components 1.1 |
801 | +import QtQuick 2.4 |
802 | +import Ubuntu.Components 1.2 |
803 | |
804 | /*! |
805 | \qmlabstract ActionItem |
806 | |
807 | === modified file 'modules/Ubuntu/Components/ActionList.qml' |
808 | --- modules/Ubuntu/Components/ActionList.qml 2014-08-31 19:24:19 +0000 |
809 | +++ modules/Ubuntu/Components/ActionList.qml 2015-03-03 15:01:13 +0000 |
810 | @@ -14,8 +14,8 @@ |
811 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
812 | */ |
813 | |
814 | -import QtQuick 2.2 |
815 | -import Ubuntu.Components 1.1 |
816 | +import QtQuick 2.4 |
817 | +import Ubuntu.Components 1.2 |
818 | |
819 | /*! |
820 | \qmltype ActionList |
821 | |
822 | === modified file 'modules/Ubuntu/Components/ActivityIndicator.qml' |
823 | --- modules/Ubuntu/Components/ActivityIndicator.qml 2014-11-18 11:38:59 +0000 |
824 | +++ modules/Ubuntu/Components/ActivityIndicator.qml 2015-03-03 15:01:13 +0000 |
825 | @@ -14,7 +14,7 @@ |
826 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
827 | */ |
828 | |
829 | -import QtQuick 2.0 |
830 | +import QtQuick 2.4 |
831 | |
832 | /*! |
833 | \qmltype ActivityIndicator |
834 | |
835 | === modified file 'modules/Ubuntu/Components/AnimatedItem.qml' |
836 | --- modules/Ubuntu/Components/AnimatedItem.qml 2014-11-18 12:02:55 +0000 |
837 | +++ modules/Ubuntu/Components/AnimatedItem.qml 2015-03-03 15:01:13 +0000 |
838 | @@ -24,7 +24,7 @@ |
839 | |
840 | */ |
841 | |
842 | -import QtQuick 2.0 |
843 | +import QtQuick 2.4 |
844 | |
845 | StyledItem { |
846 | id: root |
847 | |
848 | === modified file 'modules/Ubuntu/Components/AppHeader.qml' |
849 | --- modules/Ubuntu/Components/AppHeader.qml 2014-11-18 11:38:59 +0000 |
850 | +++ modules/Ubuntu/Components/AppHeader.qml 2015-03-03 15:01:13 +0000 |
851 | @@ -14,8 +14,8 @@ |
852 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
853 | */ |
854 | |
855 | -import QtQuick 2.0 |
856 | -import Ubuntu.Components 1.1 as Components |
857 | +import QtQuick 2.4 |
858 | +import Ubuntu.Components 1.2 as Components |
859 | |
860 | /*! |
861 | \internal |
862 | |
863 | === added file 'modules/Ubuntu/Components/Captions.qml' |
864 | --- modules/Ubuntu/Components/Captions.qml 1970-01-01 00:00:00 +0000 |
865 | +++ modules/Ubuntu/Components/Captions.qml 2015-03-03 15:01:13 +0000 |
866 | @@ -0,0 +1,150 @@ |
867 | +/* |
868 | + * Copyright 2015 Canonical Ltd. |
869 | + * |
870 | + * This program is free software; you can redistribute it and/or modify |
871 | + * it under the terms of the GNU Lesser General Public License as published by |
872 | + * the Free Software Foundation; version 3. |
873 | + * |
874 | + * This program is distributed in the hope that it will be useful, |
875 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
876 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
877 | + * GNU Lesser General Public License for more details. |
878 | + * |
879 | + * You should have received a copy of the GNU Lesser General Public License |
880 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
881 | + */ |
882 | + |
883 | +import QtQuick 2.4 |
884 | +import QtQuick.Layouts 1.1 |
885 | +import Ubuntu.Components 1.2 |
886 | + |
887 | +/*! |
888 | + \qmltype Captions |
889 | + \inqmlmodule Ubuntu.Components 1.2 |
890 | + \ingroup ubuntu-listitem |
891 | + \since Ubuntu.Components 1.2 |
892 | + \brief Container providing captionStyles for a twin-label column that can be used in |
893 | + RowLayout or GridLayout. |
894 | + |
895 | + The labels are placed in a column and can be accessed through \l title and |
896 | + \l subtitle properties. The default spacing between the labels is 0.5 grid units. |
897 | + |
898 | + The container only shows the labels which has its text property set to a valid |
899 | + string. The labels not having any text set are not occupying the space. When |
900 | + embedded in a positioner or in a RowLayout, the container is aligned vertically |
901 | + centered. It is recommended to be used in context with RowLayout or GridLayout, |
902 | + however can be used with any component. |
903 | + |
904 | + \qml |
905 | + import QtQuick 2.4 |
906 | + import Ubuntu.Components 1.2 |
907 | + |
908 | + ListItem { |
909 | + RowLayout { |
910 | + Captions { |
911 | + title.text: "Caption" |
912 | + subtitle.text: "Subtitle text" |
913 | + // attached properties of an Item type property |
914 | + // can be changed only with assignment |
915 | + Component.onCompleted: subtitle.Layout.alignment = Qt.AlignRight |
916 | + } |
917 | + Captions { |
918 | + captionStyle: Ubuntu.SummaryCaptionStyle |
919 | + title.text: "Text" |
920 | + subtitle.text: "Text" |
921 | + } |
922 | + } |
923 | + } |
924 | + \endqml |
925 | + |
926 | + Additional items can also be added to the layout after the two labels. |
927 | + \qml |
928 | + Captions { |
929 | + title.text: "Caption" |
930 | + subtitle.text: "Subtitle" |
931 | + Label { |
932 | + text: "third line" |
933 | + fontSize: "xx-small" |
934 | + } |
935 | + } |
936 | + \endqml |
937 | + */ |
938 | +ColumnLayout { |
939 | + id: captions |
940 | + |
941 | + /*! |
942 | + \qmlproperty enumeration captionStyle |
943 | + The property configures the arrangement and font sizes of the Labels in the |
944 | + component. It can take the following values: |
945 | + \list |
946 | + \li \b Ubuntu.TitleCaptionStyle - (default) typical configuration for a left aligned |
947 | + twin-label setup, where the text covers the remaining area on a list |
948 | + layout. |
949 | + \li \b Ubuntu.SummaryCaptionStyle - configuration for a right-aligned twin label setup, |
950 | + with 6 grid units width. |
951 | + \endlist |
952 | + */ |
953 | + property int captionStyle: Ubuntu.TitleCaptionStyle |
954 | + |
955 | + /*! |
956 | + \qmlproperty Label title |
957 | + \readonly |
958 | + Label occupying the top area of the container. |
959 | + */ |
960 | + property alias title: titleLabel |
961 | + |
962 | + /*! |
963 | + \qmlproperty Label subtitle |
964 | + \readonly |
965 | + Label occupying the bottom area of the container. |
966 | + */ |
967 | + property alias subtitle: subtitleLabel |
968 | + |
969 | + clip: true |
970 | + spacing: units.gu(0.5) |
971 | + Layout.fillWidth: (captionStyle == Ubuntu.TitleCaptionStyle) |
972 | + Layout.alignment: Qt.AlignVCenter | ((captionStyle == Ubuntu.SummaryCaptionStyle) ? Qt.AlignRight : Qt.AlignLeft) |
973 | + Layout.minimumWidth: 0 |
974 | + Layout.maximumWidth: (captionStyle == Ubuntu.SummaryCaptionStyle) ? units.gu(6) : parent.width |
975 | + Layout.preferredWidth: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Layout.maximumWidth : 0 |
976 | + Layout.minimumHeight: 0 |
977 | + Layout.maximumHeight: parent ? parent.height : childrenRect.height |
978 | + Layout.preferredHeight: childrenRect.height |
979 | + |
980 | + // handle visibility, do not override visible property! |
981 | + // 'hide' column if title and subtitle is an empty string and |
982 | + // there's no more children added |
983 | + states: State { |
984 | + name: "__q_invisible" |
985 | + when: (title.text === "" && subtitle.text === "") && (captions.children.length == 2) |
986 | + PropertyChanges { |
987 | + target: captions |
988 | + visible: false |
989 | + } |
990 | + } |
991 | + |
992 | + Label { |
993 | + id: titleLabel |
994 | + anchors { |
995 | + left: parent.left |
996 | + right: parent.right |
997 | + } |
998 | + fontSize: (captionStyle == Ubuntu.SummaryCaptionStyle) ? "small" : "medium" |
999 | + horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft |
1000 | + visible: text !== "" |
1001 | + elide: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.ElideRight : Text.ElideNone |
1002 | + } |
1003 | + Label { |
1004 | + id: subtitleLabel |
1005 | + anchors { |
1006 | + left: parent.left |
1007 | + right: parent.right |
1008 | + } |
1009 | + fontSize: "small" |
1010 | + horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft |
1011 | + visible: text !== "" |
1012 | + maximumLineCount: (captionStyle == Ubuntu.TitleCaptionStyle) ? 2 : 1 |
1013 | + wrapMode: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.Wrap : Text.NoWrap |
1014 | + elide: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.ElideRight : Text.ElideNone |
1015 | + } |
1016 | +} |
1017 | |
1018 | === modified file 'modules/Ubuntu/Components/CheckBox.qml' |
1019 | --- modules/Ubuntu/Components/CheckBox.qml 2014-11-18 11:38:59 +0000 |
1020 | +++ modules/Ubuntu/Components/CheckBox.qml 2015-03-03 15:01:13 +0000 |
1021 | @@ -14,7 +14,7 @@ |
1022 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1023 | */ |
1024 | |
1025 | -import QtQuick 2.0 |
1026 | +import QtQuick 2.4 |
1027 | |
1028 | /*! |
1029 | \qmltype CheckBox |
1030 | |
1031 | === modified file 'modules/Ubuntu/Components/ComboButton.qml' |
1032 | --- modules/Ubuntu/Components/ComboButton.qml 2014-08-18 16:02:33 +0000 |
1033 | +++ modules/Ubuntu/Components/ComboButton.qml 2015-03-03 15:01:13 +0000 |
1034 | @@ -14,7 +14,7 @@ |
1035 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1036 | */ |
1037 | |
1038 | -import QtQuick 2.0 |
1039 | +import QtQuick 2.4 |
1040 | import Ubuntu.Components.Popups 1.0 |
1041 | import "mathUtils.js" as MathUtils |
1042 | |
1043 | @@ -41,8 +41,8 @@ |
1044 | \li If the content height is smaller than the value of \l expandedHeight, the combo |
1045 | list will be expanded only to the height of the content. |
1046 | \qml |
1047 | - import QtQuick 2.0 |
1048 | - import Ubuntu.Components 1.1 |
1049 | + import QtQuick 2.4 |
1050 | + import Ubuntu.Components 1.2 |
1051 | ComboButton { |
1052 | text: "smaller content" |
1053 | Rectangle { |
1054 | @@ -57,8 +57,8 @@ |
1055 | GridView or PathView, the content scrolling will be provided by the content |
1056 | itself. |
1057 | \qml |
1058 | - import QtQuick 2.0 |
1059 | - import Ubuntu.Components 1.1 |
1060 | + import QtQuick 2.4 |
1061 | + import Ubuntu.Components 1.2 |
1062 | ComboButton { |
1063 | text: "long scrolled content" |
1064 | Column { |
1065 | @@ -76,8 +76,8 @@ |
1066 | \li In case the content is a single Flickable, ListView, GridView or PathView, |
1067 | the content will be filling the entire combo list area defined. |
1068 | \qml |
1069 | - import QtQuick 2.0 |
1070 | - import Ubuntu.Components 1.1 |
1071 | + import QtQuick 2.4 |
1072 | + import Ubuntu.Components 1.2 |
1073 | import Ubuntu.Components.ListItems 1.0 |
1074 | ComboButton { |
1075 | text: "listview" |
1076 | @@ -94,8 +94,8 @@ |
1077 | If the content wants to take the size of the entire combo list, it should |
1078 | bind its height to the \l comboListHeight property. |
1079 | \qml |
1080 | - import QtQuick 2.0 |
1081 | - import Ubuntu.Components 1.1 |
1082 | + import QtQuick 2.4 |
1083 | + import Ubuntu.Components 1.2 |
1084 | ComboButton { |
1085 | id: combo |
1086 | text: "smaller content" |
1087 | @@ -108,8 +108,8 @@ |
1088 | \li In case the expansion needs to be the size of the combo list content, the \l |
1089 | expandedHeight should be set to -1. |
1090 | \qml |
1091 | - import QtQuick 2.0 |
1092 | - import Ubuntu.Components 1.1 |
1093 | + import QtQuick 2.4 |
1094 | + import Ubuntu.Components 1.2 |
1095 | ComboButton { |
1096 | text: "auto-sized content" |
1097 | expandedHeight: -1 |
1098 | @@ -134,8 +134,8 @@ |
1099 | example illustrates a possible implementation. |
1100 | |
1101 | \qml |
1102 | - import QtQuick 2.0 |
1103 | - import Ubuntu.Components 1.1 |
1104 | + import QtQuick 2.4 |
1105 | + import Ubuntu.Components 1.2 |
1106 | |
1107 | ComboButton { |
1108 | id: combo |
1109 | @@ -201,8 +201,8 @@ |
1110 | \l expandedHeight and \l collapsedHeight values. It is a convenience property |
1111 | that can be used to size the combo list content. |
1112 | \qml |
1113 | - import QtQuick 2.0 |
1114 | - import Ubuntu.Components 1.1 |
1115 | + import QtQuick 2.4 |
1116 | + import Ubuntu.Components 1.2 |
1117 | import Ubuntu.Components.ListItems 0.1 |
1118 | ComboButton { |
1119 | id: combo |
1120 | |
1121 | === modified file 'modules/Ubuntu/Components/CrossFadeImage.qdoc' |
1122 | --- modules/Ubuntu/Components/CrossFadeImage.qdoc 2014-06-30 12:00:10 +0000 |
1123 | +++ modules/Ubuntu/Components/CrossFadeImage.qdoc 2015-03-03 15:01:13 +0000 |
1124 | @@ -4,8 +4,8 @@ |
1125 | \brief An Image like component which smoothly fades when its source is updated. |
1126 | |
1127 | \qml |
1128 | - import QtQuick 2.0 |
1129 | - import Ubuntu.Components 1.1 |
1130 | + import QtQuick 2.4 |
1131 | + import Ubuntu.Components 1.2 |
1132 | |
1133 | CrossFadeImage { |
1134 | width: units.gu(100) |
1135 | |
1136 | === modified file 'modules/Ubuntu/Components/CrossFadeImage10.qml' |
1137 | --- modules/Ubuntu/Components/CrossFadeImage10.qml 2014-07-01 10:56:08 +0000 |
1138 | +++ modules/Ubuntu/Components/CrossFadeImage10.qml 2015-03-03 15:01:13 +0000 |
1139 | @@ -14,12 +14,12 @@ |
1140 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1141 | */ |
1142 | |
1143 | -import QtQuick 2.0 |
1144 | +import QtQuick 2.4 |
1145 | // FIXME: When a module contains QML, C++ and JavaScript elements exported, |
1146 | // we need to use named imports otherwise namespace collision is reported |
1147 | // by the QML engine. As workaround, we use Ubuntu named import. |
1148 | // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645 |
1149 | -import Ubuntu.Components 1.1 as Ubuntu |
1150 | +import Ubuntu.Components 1.2 as Ubuntu |
1151 | |
1152 | /*! |
1153 | \internal |
1154 | |
1155 | === modified file 'modules/Ubuntu/Components/CrossFadeImage11.qml' |
1156 | --- modules/Ubuntu/Components/CrossFadeImage11.qml 2014-07-02 13:51:07 +0000 |
1157 | +++ modules/Ubuntu/Components/CrossFadeImage11.qml 2015-03-03 15:01:13 +0000 |
1158 | @@ -14,12 +14,12 @@ |
1159 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1160 | */ |
1161 | |
1162 | -import QtQuick 2.0 |
1163 | +import QtQuick 2.4 |
1164 | // FIXME: When a module contains QML, C++ and JavaScript elements exported, |
1165 | // we need to use named imports otherwise namespace collision is reported |
1166 | // by the QML engine. As workaround, we use Ubuntu named import. |
1167 | // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645 |
1168 | -import Ubuntu.Components 1.1 as Ubuntu |
1169 | +import Ubuntu.Components 1.2 as Ubuntu |
1170 | |
1171 | /*! |
1172 | \internal |
1173 | |
1174 | === modified file 'modules/Ubuntu/Components/DraggingArea.qml' |
1175 | --- modules/Ubuntu/Components/DraggingArea.qml 2013-02-26 10:30:04 +0000 |
1176 | +++ modules/Ubuntu/Components/DraggingArea.qml 2015-03-03 15:01:13 +0000 |
1177 | @@ -14,7 +14,7 @@ |
1178 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1179 | */ |
1180 | |
1181 | -import QtQuick 2.0 |
1182 | +import QtQuick 2.4 |
1183 | import "mathUtils.js" as MathLocal |
1184 | |
1185 | MouseArea { |
1186 | |
1187 | === modified file 'modules/Ubuntu/Components/Header.qml' |
1188 | --- modules/Ubuntu/Components/Header.qml 2014-06-25 11:38:23 +0000 |
1189 | +++ modules/Ubuntu/Components/Header.qml 2015-03-03 15:01:13 +0000 |
1190 | @@ -14,7 +14,7 @@ |
1191 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1192 | */ |
1193 | |
1194 | -import QtQuick 2.0 |
1195 | +import QtQuick 2.4 |
1196 | |
1197 | /*! |
1198 | \qmltype Header |
1199 | |
1200 | === modified file 'modules/Ubuntu/Components/Icon10.qml' |
1201 | --- modules/Ubuntu/Components/Icon10.qml 2014-10-20 12:05:33 +0000 |
1202 | +++ modules/Ubuntu/Components/Icon10.qml 2015-03-03 15:01:13 +0000 |
1203 | @@ -14,7 +14,7 @@ |
1204 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1205 | */ |
1206 | |
1207 | -import QtQuick 2.0 |
1208 | +import QtQuick 2.4 |
1209 | |
1210 | Item { |
1211 | id: icon |
1212 | |
1213 | === modified file 'modules/Ubuntu/Components/Icon11.qml' |
1214 | --- modules/Ubuntu/Components/Icon11.qml 2014-07-30 20:20:49 +0000 |
1215 | +++ modules/Ubuntu/Components/Icon11.qml 2015-03-03 15:01:13 +0000 |
1216 | @@ -14,7 +14,7 @@ |
1217 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1218 | */ |
1219 | |
1220 | -import QtQuick 2.0 |
1221 | +import QtQuick 2.4 |
1222 | |
1223 | Icon10 { |
1224 | property url source: name ? "image://theme/%1".arg(name) : "" |
1225 | |
1226 | === modified file 'modules/Ubuntu/Components/InputHandler.qml' |
1227 | --- modules/Ubuntu/Components/InputHandler.qml 2015-01-14 13:32:44 +0000 |
1228 | +++ modules/Ubuntu/Components/InputHandler.qml 2015-03-03 15:01:13 +0000 |
1229 | @@ -14,8 +14,8 @@ |
1230 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1231 | */ |
1232 | |
1233 | -import QtQuick 2.1 |
1234 | -import Ubuntu.Components 1.1 |
1235 | +import QtQuick 2.4 |
1236 | +import Ubuntu.Components 1.2 |
1237 | |
1238 | /* |
1239 | This component is a unified text selection and scrolling handler for both |
1240 | |
1241 | === modified file 'modules/Ubuntu/Components/Label.qml' |
1242 | --- modules/Ubuntu/Components/Label.qml 2014-08-07 10:28:01 +0000 |
1243 | +++ modules/Ubuntu/Components/Label.qml 2015-03-03 15:01:13 +0000 |
1244 | @@ -14,7 +14,7 @@ |
1245 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1246 | */ |
1247 | |
1248 | -import QtQuick 2.0 |
1249 | +import QtQuick 2.4 |
1250 | |
1251 | /*! |
1252 | \qmltype Label |
1253 | |
1254 | === modified file 'modules/Ubuntu/Components/ListItems/Base.qml' |
1255 | --- modules/Ubuntu/Components/ListItems/Base.qml 2014-11-18 11:56:17 +0000 |
1256 | +++ modules/Ubuntu/Components/ListItems/Base.qml 2015-03-03 15:01:13 +0000 |
1257 | @@ -14,8 +14,8 @@ |
1258 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1259 | */ |
1260 | |
1261 | -import QtQuick 2.0 |
1262 | -import Ubuntu.Components 1.1 |
1263 | +import QtQuick 2.4 |
1264 | +import Ubuntu.Components 1.2 |
1265 | |
1266 | /*! |
1267 | \qmltype Base |
1268 | @@ -23,6 +23,7 @@ |
1269 | \ingroup ubuntu-listitems |
1270 | \brief Parent class of various list item classes that can have |
1271 | an icon and a progression symbol. |
1272 | + \note \b{The component is deprecated. Use ListItem component instead.} |
1273 | |
1274 | Examples: See subclasses |
1275 | */ |
1276 | |
1277 | === modified file 'modules/Ubuntu/Components/ListItems/Caption.qml' |
1278 | --- modules/Ubuntu/Components/ListItems/Caption.qml 2014-11-18 11:56:17 +0000 |
1279 | +++ modules/Ubuntu/Components/ListItems/Caption.qml 2015-03-03 15:01:13 +0000 |
1280 | @@ -14,14 +14,15 @@ |
1281 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1282 | */ |
1283 | |
1284 | -import QtQuick 2.0 |
1285 | -import Ubuntu.Components 1.1 |
1286 | +import QtQuick 2.4 |
1287 | +import Ubuntu.Components 1.2 |
1288 | |
1289 | /*! |
1290 | \qmltype Caption |
1291 | \inqmlmodule Ubuntu.Components.ListItems 1.0 |
1292 | \ingroup ubuntu-listitems |
1293 | \brief List item that shows a piece of text. |
1294 | + \note \b{The component is deprecated. Use ListItem and Captiopns components instead.} |
1295 | |
1296 | Examples: |
1297 | \qml |
1298 | |
1299 | === modified file 'modules/Ubuntu/Components/ListItems/Divider.qml' |
1300 | --- modules/Ubuntu/Components/ListItems/Divider.qml 2014-11-18 11:57:19 +0000 |
1301 | +++ modules/Ubuntu/Components/ListItems/Divider.qml 2015-03-03 15:01:13 +0000 |
1302 | @@ -14,14 +14,15 @@ |
1303 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1304 | */ |
1305 | |
1306 | -import QtQuick 2.0 |
1307 | -import Ubuntu.Components 1.1 |
1308 | +import QtQuick 2.4 |
1309 | +import Ubuntu.Components 1.2 |
1310 | |
1311 | /*! |
1312 | \qmltype Divider |
1313 | \inqmlmodule Ubuntu.Components.ListItems 1.0 |
1314 | \ingroup ubuntu-listitems |
1315 | \brief Divider to break up list items into groups. |
1316 | + \note \b{The component is deprecated.} |
1317 | |
1318 | Examples: see \l Header |
1319 | */ |
1320 | |
1321 | === modified file 'modules/Ubuntu/Components/ListItems/Empty.qml' |
1322 | --- modules/Ubuntu/Components/ListItems/Empty.qml 2015-01-14 13:32:44 +0000 |
1323 | +++ modules/Ubuntu/Components/ListItems/Empty.qml 2015-03-03 15:01:13 +0000 |
1324 | @@ -14,14 +14,15 @@ |
1325 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1326 | */ |
1327 | |
1328 | -import QtQuick 2.0 |
1329 | -import Ubuntu.Components 1.1 |
1330 | +import QtQuick 2.4 |
1331 | +import Ubuntu.Components 1.2 |
1332 | |
1333 | /*! |
1334 | \qmltype Empty |
1335 | \inqmlmodule Ubuntu.Components.ListItems 1.0 |
1336 | \ingroup ubuntu-listitems |
1337 | \brief A list item with no contents. |
1338 | + \note \b{The component is deprecated. Use ListItem component instead.} |
1339 | The Empty class can be used for generic list items containing other |
1340 | components such as buttons. It is selectable and can take mouse clicks. |
1341 | It will attempt to detect if a thin dividing line at the bottom of the |
1342 | @@ -34,7 +35,7 @@ |
1343 | |
1344 | Examples: |
1345 | \qml |
1346 | - import Ubuntu.Components 1.1 |
1347 | + import Ubuntu.Components 1.2 |
1348 | import Ubuntu.Components.ListItems 1.0 as ListItem |
1349 | |
1350 | Item { |
1351 | |
1352 | === modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml' |
1353 | --- modules/Ubuntu/Components/ListItems/Expandable.qml 2014-11-18 11:57:19 +0000 |
1354 | +++ modules/Ubuntu/Components/ListItems/Expandable.qml 2015-03-03 15:01:13 +0000 |
1355 | @@ -13,8 +13,8 @@ |
1356 | * You should have received a copy of the GNU Lesser General Public License |
1357 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1358 | */ |
1359 | -import QtQuick 2.0 |
1360 | -import Ubuntu.Components 1.1 |
1361 | +import QtQuick 2.4 |
1362 | +import Ubuntu.Components 1.2 |
1363 | |
1364 | /*! |
1365 | \qmltype Expandable |
1366 | @@ -35,7 +35,7 @@ |
1367 | |
1368 | Examples: |
1369 | \qml |
1370 | - import Ubuntu.Components 1.1 |
1371 | + import Ubuntu.Components 1.2 |
1372 | import Ubuntu.Components.ListItems 1.0 as ListItem |
1373 | |
1374 | Item { |
1375 | |
1376 | === modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml' |
1377 | --- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml 2014-11-18 11:56:17 +0000 |
1378 | +++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml 2015-03-03 15:01:13 +0000 |
1379 | @@ -14,8 +14,8 @@ |
1380 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1381 | */ |
1382 | |
1383 | -import QtQuick 2.0 |
1384 | -import Ubuntu.Components 1.1 |
1385 | +import QtQuick 2.4 |
1386 | +import Ubuntu.Components 1.2 |
1387 | |
1388 | /*! |
1389 | \qmltype ExpandablesColumn |
1390 | @@ -29,7 +29,7 @@ |
1391 | |
1392 | Examples: |
1393 | \qml |
1394 | - import Ubuntu.Components 1.1 |
1395 | + import Ubuntu.Components 1.2 |
1396 | import Ubuntu.Components.ListItems 1.0 as ListItem |
1397 | |
1398 | ListItem.ExpandablesColumn { |
1399 | |
1400 | === modified file 'modules/Ubuntu/Components/ListItems/Header.qml' |
1401 | --- modules/Ubuntu/Components/ListItems/Header.qml 2015-01-14 13:32:44 +0000 |
1402 | +++ modules/Ubuntu/Components/ListItems/Header.qml 2015-03-03 15:01:13 +0000 |
1403 | @@ -14,7 +14,7 @@ |
1404 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1405 | */ |
1406 | |
1407 | -import QtQuick 2.0 |
1408 | +import QtQuick 2.4 |
1409 | |
1410 | /*! |
1411 | \qmltype Header |
1412 | |
1413 | === modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml' |
1414 | --- modules/Ubuntu/Components/ListItems/IconVisual.qml 2014-04-23 08:50:20 +0000 |
1415 | +++ modules/Ubuntu/Components/ListItems/IconVisual.qml 2015-03-03 15:01:13 +0000 |
1416 | @@ -14,8 +14,8 @@ |
1417 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1418 | */ |
1419 | |
1420 | -import QtQuick 2.0 |
1421 | -import Ubuntu.Components 1.1 |
1422 | +import QtQuick 2.4 |
1423 | +import Ubuntu.Components 1.2 |
1424 | |
1425 | // internal helper class to create the visuals |
1426 | // for the icon. |
1427 | |
1428 | === modified file 'modules/Ubuntu/Components/ListItems/ImageWithFallback.qml' |
1429 | --- modules/Ubuntu/Components/ListItems/ImageWithFallback.qml 2012-11-22 20:59:44 +0000 |
1430 | +++ modules/Ubuntu/Components/ListItems/ImageWithFallback.qml 2015-03-03 15:01:13 +0000 |
1431 | @@ -14,7 +14,7 @@ |
1432 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1433 | */ |
1434 | |
1435 | -import QtQuick 2.0 |
1436 | +import QtQuick 2.4 |
1437 | |
1438 | Image { |
1439 | id: image |
1440 | |
1441 | === modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml' |
1442 | --- modules/Ubuntu/Components/ListItems/ItemSelector.qml 2014-11-18 12:01:58 +0000 |
1443 | +++ modules/Ubuntu/Components/ListItems/ItemSelector.qml 2015-03-03 15:01:13 +0000 |
1444 | @@ -14,9 +14,9 @@ |
1445 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1446 | */ |
1447 | |
1448 | -import QtQuick 2.0 |
1449 | +import QtQuick 2.4 |
1450 | import "." as ListItem |
1451 | -import Ubuntu.Components 1.1 |
1452 | +import Ubuntu.Components 1.2 |
1453 | |
1454 | /*! |
1455 | \qmltype ItemSelector |
1456 | |
1457 | === modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml' |
1458 | --- modules/Ubuntu/Components/ListItems/LabelVisual.qml 2014-04-23 08:50:20 +0000 |
1459 | +++ modules/Ubuntu/Components/ListItems/LabelVisual.qml 2015-03-03 15:01:13 +0000 |
1460 | @@ -14,8 +14,8 @@ |
1461 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1462 | */ |
1463 | |
1464 | -import QtQuick 2.0 |
1465 | -import Ubuntu.Components 1.1 |
1466 | +import QtQuick 2.4 |
1467 | +import Ubuntu.Components 1.2 |
1468 | |
1469 | // internal helper class for text inside the list items. |
1470 | Label { |
1471 | |
1472 | === modified file 'modules/Ubuntu/Components/ListItems/MultiValue.qml' |
1473 | --- modules/Ubuntu/Components/ListItems/MultiValue.qml 2014-11-18 11:56:17 +0000 |
1474 | +++ modules/Ubuntu/Components/ListItems/MultiValue.qml 2015-03-03 15:01:13 +0000 |
1475 | @@ -14,13 +14,14 @@ |
1476 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1477 | */ |
1478 | |
1479 | -import QtQuick 2.0 |
1480 | +import QtQuick 2.4 |
1481 | |
1482 | /*! |
1483 | \qmltype MultiValue |
1484 | \inqmlmodule Ubuntu.Components.ListItems 1.0 |
1485 | \ingroup ubuntu-listitems |
1486 | \brief List item displaying multiple values. |
1487 | + \note \b{The component is deprecated. Use ListItem component instead.} |
1488 | |
1489 | Examples: |
1490 | \qml |
1491 | |
1492 | === modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml' |
1493 | --- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml 2014-04-23 08:50:20 +0000 |
1494 | +++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml 2015-03-03 15:01:13 +0000 |
1495 | @@ -14,8 +14,8 @@ |
1496 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1497 | */ |
1498 | |
1499 | -import QtQuick 2.0 |
1500 | -import Ubuntu.Components 1.1 |
1501 | +import QtQuick 2.4 |
1502 | +import Ubuntu.Components 1.2 |
1503 | |
1504 | // Internal helper class for the visuals of |
1505 | // the progression symbol. |
1506 | |
1507 | === modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml' |
1508 | --- modules/Ubuntu/Components/ListItems/SingleControl.qml 2014-11-18 11:56:17 +0000 |
1509 | +++ modules/Ubuntu/Components/ListItems/SingleControl.qml 2015-03-03 15:01:13 +0000 |
1510 | @@ -14,8 +14,8 @@ |
1511 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1512 | */ |
1513 | |
1514 | -import QtQuick 2.0 |
1515 | -import Ubuntu.Components 1.1 |
1516 | +import QtQuick 2.4 |
1517 | +import Ubuntu.Components 1.2 |
1518 | import Ubuntu.Components.ListItems 1.0 |
1519 | |
1520 | /*! |
1521 | @@ -23,10 +23,11 @@ |
1522 | \inqmlmodule Ubuntu.Components.ListItems 1.0 |
1523 | \ingroup ubuntu-listitems |
1524 | \brief A list item containing a single control |
1525 | + \note \b{The component is deprecated. Use ListItem component instead.} |
1526 | |
1527 | Examples: |
1528 | \qml |
1529 | - import Ubuntu.Components 1.1 |
1530 | + import Ubuntu.Components 1.2 |
1531 | import Ubuntu.Components.ListItems 1.0 as ListItem |
1532 | Column { |
1533 | ListItem.SingleControl { |
1534 | |
1535 | === modified file 'modules/Ubuntu/Components/ListItems/SingleValue.qml' |
1536 | --- modules/Ubuntu/Components/ListItems/SingleValue.qml 2014-11-18 11:56:17 +0000 |
1537 | +++ modules/Ubuntu/Components/ListItems/SingleValue.qml 2015-03-03 15:01:13 +0000 |
1538 | @@ -14,13 +14,14 @@ |
1539 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1540 | */ |
1541 | |
1542 | -import QtQuick 2.0 |
1543 | +import QtQuick 2.4 |
1544 | |
1545 | /*! |
1546 | \qmltype SingleValue |
1547 | \inqmlmodule Ubuntu.Components.ListItems 1.0 |
1548 | \ingroup ubuntu-listitems |
1549 | \brief A list item displaying a single value |
1550 | + \note \b{The component is deprecated. Use ListItem component instead.} |
1551 | |
1552 | Examples: |
1553 | \qml |
1554 | |
1555 | === modified file 'modules/Ubuntu/Components/ListItems/Standard.qml' |
1556 | --- modules/Ubuntu/Components/ListItems/Standard.qml 2014-12-01 13:19:32 +0000 |
1557 | +++ modules/Ubuntu/Components/ListItems/Standard.qml 2015-03-03 15:01:13 +0000 |
1558 | @@ -14,8 +14,8 @@ |
1559 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1560 | */ |
1561 | |
1562 | -import QtQuick 2.0 |
1563 | -import Ubuntu.Components 1.1 |
1564 | +import QtQuick 2.4 |
1565 | +import Ubuntu.Components 1.2 |
1566 | |
1567 | /*! |
1568 | \qmltype Standard |
1569 | @@ -25,12 +25,13 @@ |
1570 | with a label (text), and optionally an icon, a progression arrow, |
1571 | and it can have an embedded Item (\l control) that can be used |
1572 | for including Buttons, Switches etc. inside the list item. |
1573 | + \note \b{The component is deprecated. Use ListItem component instead.} |
1574 | |
1575 | \l {http://design.ubuntu.com/apps/building-blocks/list-items}{See also the Design Guidelines on List Items}. |
1576 | |
1577 | Examples: |
1578 | \qml |
1579 | - import Ubuntu.Components 1.1 |
1580 | + import Ubuntu.Components 1.2 |
1581 | import Ubuntu.Components.ListItems 1.0 as ListItem |
1582 | Column { |
1583 | ListItem.Standard { |
1584 | |
1585 | === modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml' |
1586 | --- modules/Ubuntu/Components/ListItems/Subtitled.qml 2014-11-18 11:56:17 +0000 |
1587 | +++ modules/Ubuntu/Components/ListItems/Subtitled.qml 2015-03-03 15:01:13 +0000 |
1588 | @@ -14,14 +14,15 @@ |
1589 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1590 | */ |
1591 | |
1592 | -import QtQuick 2.0 |
1593 | -import Ubuntu.Components 1.1 |
1594 | +import QtQuick 2.4 |
1595 | +import Ubuntu.Components 1.2 |
1596 | |
1597 | /*! |
1598 | \qmltype MultiValue |
1599 | \inqmlmodule Ubuntu.Components.ListItems 1.0 |
1600 | \ingroup ubuntu-listitems |
1601 | \brief List item displaying a second string under the main label. |
1602 | + \note \b{The component is deprecated. Use ListItem component instead.} |
1603 | |
1604 | Examples: |
1605 | \qml |
1606 | |
1607 | === modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml' |
1608 | --- modules/Ubuntu/Components/ListItems/ThinDivider.qml 2015-01-14 13:32:44 +0000 |
1609 | +++ modules/Ubuntu/Components/ListItems/ThinDivider.qml 2015-03-03 15:01:13 +0000 |
1610 | @@ -14,8 +14,8 @@ |
1611 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1612 | */ |
1613 | |
1614 | -import QtQuick 2.0 |
1615 | -import Ubuntu.Components 1.0 |
1616 | +import QtQuick 2.4 |
1617 | +import Ubuntu.Components 1.2 |
1618 | |
1619 | /*! |
1620 | \qmltype ThinDivider |
1621 | |
1622 | === modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml' |
1623 | --- modules/Ubuntu/Components/ListItems/ValueSelector.qml 2014-11-18 11:56:17 +0000 |
1624 | +++ modules/Ubuntu/Components/ListItems/ValueSelector.qml 2015-03-03 15:01:13 +0000 |
1625 | @@ -14,8 +14,8 @@ |
1626 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1627 | */ |
1628 | |
1629 | -import QtQuick 2.0 |
1630 | -import Ubuntu.Components 1.1 |
1631 | +import QtQuick 2.4 |
1632 | +import Ubuntu.Components 1.2 |
1633 | |
1634 | /*! |
1635 | ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.**** |
1636 | |
1637 | === modified file 'modules/Ubuntu/Components/MainView.qdoc' |
1638 | --- modules/Ubuntu/Components/MainView.qdoc 2015-02-27 07:55:51 +0000 |
1639 | +++ modules/Ubuntu/Components/MainView.qdoc 2015-03-03 15:01:13 +0000 |
1640 | @@ -25,7 +25,7 @@ |
1641 | The simplest way to use a MainView is to include a single \l Page object |
1642 | inside the MainView: |
1643 | \qml |
1644 | - import QtQuick 2.3 |
1645 | + import QtQuick 2.4 |
1646 | import Ubuntu.Components 1.2 |
1647 | |
1648 | MainView { |
1649 | @@ -55,7 +55,7 @@ |
1650 | If the \l Page inside the MainView includes a Flickable with enough contents for scrolling, |
1651 | the header will automatically hide and show when the user scrolls up or down: |
1652 | \qml |
1653 | - import QtQuick 2.3 |
1654 | + import QtQuick 2.4 |
1655 | import Ubuntu.Components 1.2 |
1656 | |
1657 | MainView { |
1658 | @@ -126,7 +126,7 @@ |
1659 | For example, in order for the MainView to draw a color gradient beneath |
1660 | the content: |
1661 | \qml |
1662 | - import QtQuick 2.3 |
1663 | + import QtQuick 2.4 |
1664 | import Ubuntu.Components 1.2 |
1665 | |
1666 | MainView { |
1667 | |
1668 | === modified file 'modules/Ubuntu/Components/MainView.qml' |
1669 | --- modules/Ubuntu/Components/MainView.qml 2015-02-24 18:51:47 +0000 |
1670 | +++ modules/Ubuntu/Components/MainView.qml 2015-03-03 15:01:13 +0000 |
1671 | @@ -14,8 +14,8 @@ |
1672 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1673 | */ |
1674 | |
1675 | -import QtQuick 2.2 |
1676 | -import Ubuntu.Components 1.1 as Toolkit |
1677 | +import QtQuick 2.4 |
1678 | +import Ubuntu.Components 1.2 as Toolkit |
1679 | import Ubuntu.PerformanceMetrics 1.0 |
1680 | import QtQuick.Window 2.0 |
1681 | |
1682 | |
1683 | === modified file 'modules/Ubuntu/Components/MainView12.qml' |
1684 | --- modules/Ubuntu/Components/MainView12.qml 2015-02-27 07:55:51 +0000 |
1685 | +++ modules/Ubuntu/Components/MainView12.qml 2015-03-03 15:01:13 +0000 |
1686 | @@ -14,7 +14,7 @@ |
1687 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1688 | */ |
1689 | |
1690 | -import QtQuick 2.3 |
1691 | +import QtQuick 2.4 |
1692 | import Ubuntu.Components 1.2 as Toolkit |
1693 | import Ubuntu.PerformanceMetrics 1.0 |
1694 | import QtQuick.Window 2.2 |
1695 | |
1696 | === modified file 'modules/Ubuntu/Components/MainViewBase.qml' |
1697 | --- modules/Ubuntu/Components/MainViewBase.qml 2015-02-12 11:19:57 +0000 |
1698 | +++ modules/Ubuntu/Components/MainViewBase.qml 2015-03-03 15:01:13 +0000 |
1699 | @@ -14,8 +14,8 @@ |
1700 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1701 | */ |
1702 | |
1703 | -import QtQuick 2.2 |
1704 | -import Ubuntu.Components 1.1 as Toolkit |
1705 | +import QtQuick 2.4 |
1706 | +import Ubuntu.Components 1.2 as Toolkit |
1707 | import Ubuntu.PerformanceMetrics 1.0 |
1708 | import QtQuick.Window 2.0 |
1709 | |
1710 | |
1711 | === modified file 'modules/Ubuntu/Components/Object.qml' |
1712 | --- modules/Ubuntu/Components/Object.qml 2014-04-23 08:50:20 +0000 |
1713 | +++ modules/Ubuntu/Components/Object.qml 2015-03-03 15:01:13 +0000 |
1714 | @@ -14,7 +14,7 @@ |
1715 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1716 | */ |
1717 | |
1718 | -import QtQuick 2.0 |
1719 | +import QtQuick 2.4 |
1720 | |
1721 | /*! |
1722 | \qmltype Object |
1723 | |
1724 | === modified file 'modules/Ubuntu/Components/OptionSelector.qml' |
1725 | --- modules/Ubuntu/Components/OptionSelector.qml 2014-11-18 12:01:58 +0000 |
1726 | +++ modules/Ubuntu/Components/OptionSelector.qml 2015-03-03 15:01:13 +0000 |
1727 | @@ -14,9 +14,9 @@ |
1728 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1729 | */ |
1730 | |
1731 | -import QtQuick 2.0 |
1732 | +import QtQuick 2.4 |
1733 | import "ListItems" as ListItem |
1734 | -import Ubuntu.Components 1.1 as Toolkit |
1735 | +import Ubuntu.Components 1.2 as Toolkit |
1736 | |
1737 | /*! |
1738 | \qmltype OptionSelector |
1739 | @@ -27,7 +27,7 @@ |
1740 | |
1741 | Examples: |
1742 | \qml |
1743 | - import Ubuntu.Components 1.1 |
1744 | + import Ubuntu.Components 1.2 |
1745 | Column { |
1746 | spacing: units.gu(3) |
1747 | |
1748 | |
1749 | === modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml' |
1750 | --- modules/Ubuntu/Components/OptionSelectorDelegate.qml 2014-11-18 12:01:58 +0000 |
1751 | +++ modules/Ubuntu/Components/OptionSelectorDelegate.qml 2015-03-03 15:01:13 +0000 |
1752 | @@ -22,7 +22,7 @@ |
1753 | |
1754 | Examples: |
1755 | \qml |
1756 | - import Ubuntu.Components 1.1 |
1757 | + import Ubuntu.Components 1.2 |
1758 | Column { |
1759 | width: 250 |
1760 | OptionSelector { |
1761 | @@ -41,9 +41,9 @@ |
1762 | \endqml |
1763 | */ |
1764 | |
1765 | -import QtQuick 2.0 |
1766 | +import QtQuick 2.4 |
1767 | import "ListItems" as ListItem |
1768 | -import Ubuntu.Components 1.1 as Toolkit |
1769 | +import Ubuntu.Components 1.2 as Toolkit |
1770 | |
1771 | ListItem.Empty { |
1772 | id: option |
1773 | |
1774 | === modified file 'modules/Ubuntu/Components/OrientationHelper.qml' |
1775 | --- modules/Ubuntu/Components/OrientationHelper.qml 2015-02-11 10:27:52 +0000 |
1776 | +++ modules/Ubuntu/Components/OrientationHelper.qml 2015-03-03 15:01:13 +0000 |
1777 | @@ -14,9 +14,9 @@ |
1778 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1779 | */ |
1780 | |
1781 | -import QtQuick 2.2 |
1782 | +import QtQuick 2.4 |
1783 | import QtQuick.Window 2.0 |
1784 | -import Ubuntu.Components 1.0 |
1785 | +import Ubuntu.Components 1.2 |
1786 | |
1787 | /*! |
1788 | \qmltype OrientationHelper |
1789 | |
1790 | === modified file 'modules/Ubuntu/Components/Page.qdoc' |
1791 | --- modules/Ubuntu/Components/Page.qdoc 2015-02-25 20:04:21 +0000 |
1792 | +++ modules/Ubuntu/Components/Page.qdoc 2015-03-03 15:01:13 +0000 |
1793 | @@ -28,8 +28,8 @@ |
1794 | and \l head properties of the page: |
1795 | |
1796 | \qml |
1797 | - import QtQuick 2.0 |
1798 | - import Ubuntu.Components 1.1 |
1799 | + import QtQuick 2.4 |
1800 | + import Ubuntu.Components 1.2 |
1801 | |
1802 | MainView { |
1803 | width: units.gu(48) |
1804 | @@ -92,8 +92,8 @@ |
1805 | is automatically set to the first child of the page that is Flickable |
1806 | and anchors to the top of the page or fills the page. For example: |
1807 | \qml |
1808 | - import QtQuick 2.0 |
1809 | - import Ubuntu.Components 1.1 |
1810 | + import QtQuick 2.4 |
1811 | + import Ubuntu.Components 1.2 |
1812 | |
1813 | MainView { |
1814 | width: units.gu(30) |
1815 | |
1816 | === modified file 'modules/Ubuntu/Components/Page10.qml' |
1817 | --- modules/Ubuntu/Components/Page10.qml 2015-02-27 07:55:51 +0000 |
1818 | +++ modules/Ubuntu/Components/Page10.qml 2015-03-03 15:01:13 +0000 |
1819 | @@ -14,8 +14,8 @@ |
1820 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1821 | */ |
1822 | |
1823 | -import QtQuick 2.2 |
1824 | -import Ubuntu.Components 1.1 as Toolkit |
1825 | +import QtQuick 2.4 |
1826 | +import Ubuntu.Components 1.2 as Toolkit |
1827 | |
1828 | /*! |
1829 | \internal |
1830 | |
1831 | === modified file 'modules/Ubuntu/Components/Page11.qml' |
1832 | --- modules/Ubuntu/Components/Page11.qml 2015-02-09 16:04:02 +0000 |
1833 | +++ modules/Ubuntu/Components/Page11.qml 2015-03-03 15:01:13 +0000 |
1834 | @@ -14,7 +14,7 @@ |
1835 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1836 | */ |
1837 | |
1838 | -import QtQuick 2.2 |
1839 | +import QtQuick 2.4 |
1840 | |
1841 | /*! \internal */ |
1842 | // Documentation in Page.qdoc |
1843 | |
1844 | === modified file 'modules/Ubuntu/Components/PageHeadConfiguration.qml' |
1845 | --- modules/Ubuntu/Components/PageHeadConfiguration.qml 2015-02-10 14:16:01 +0000 |
1846 | +++ modules/Ubuntu/Components/PageHeadConfiguration.qml 2015-03-03 15:01:13 +0000 |
1847 | @@ -14,8 +14,8 @@ |
1848 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1849 | */ |
1850 | |
1851 | -import QtQuick 2.2 |
1852 | -import Ubuntu.Components 1.1 |
1853 | +import QtQuick 2.4 |
1854 | +import Ubuntu.Components 1.2 |
1855 | |
1856 | /*! |
1857 | \qmltype PageHeadConfiguration |
1858 | @@ -121,7 +121,7 @@ |
1859 | |
1860 | Example: |
1861 | \qml |
1862 | - import QtQuick 2.3 |
1863 | + import QtQuick 2.4 |
1864 | import Ubuntu.Components 1.2 |
1865 | |
1866 | MainView { |
1867 | |
1868 | === modified file 'modules/Ubuntu/Components/PageHeadSections.qml' |
1869 | --- modules/Ubuntu/Components/PageHeadSections.qml 2015-02-10 14:16:01 +0000 |
1870 | +++ modules/Ubuntu/Components/PageHeadSections.qml 2015-03-03 15:01:13 +0000 |
1871 | @@ -14,7 +14,7 @@ |
1872 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1873 | */ |
1874 | |
1875 | -import QtQuick 2.2 |
1876 | +import QtQuick 2.4 |
1877 | |
1878 | /*! |
1879 | \qmltype PageHeadSections |
1880 | @@ -40,7 +40,7 @@ |
1881 | List of strings that represent section names. Example: |
1882 | \qml |
1883 | import Ubuntu.Components 1.2 |
1884 | - import QtQuick 2.3 |
1885 | + import QtQuick 2.4 |
1886 | |
1887 | MainView { |
1888 | width: units.gu(50) |
1889 | |
1890 | === modified file 'modules/Ubuntu/Components/PageHeadState.qml' |
1891 | --- modules/Ubuntu/Components/PageHeadState.qml 2015-02-10 14:16:01 +0000 |
1892 | +++ modules/Ubuntu/Components/PageHeadState.qml 2015-03-03 15:01:13 +0000 |
1893 | @@ -14,8 +14,8 @@ |
1894 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1895 | */ |
1896 | |
1897 | -import QtQuick 2.2 |
1898 | -import Ubuntu.Components 1.1 // for Action |
1899 | +import QtQuick 2.4 |
1900 | +import Ubuntu.Components 1.2 // for Action |
1901 | |
1902 | /*! |
1903 | \qmltype PageHeadState |
1904 | @@ -28,7 +28,7 @@ |
1905 | This example shows how to add an action to the header that |
1906 | enables the user to enter search/input mode: |
1907 | \qml |
1908 | - import QtQuick 2.2 |
1909 | + import QtQuick 2.4 |
1910 | import Ubuntu.Components 1.2 |
1911 | |
1912 | MainView { |
1913 | |
1914 | === modified file 'modules/Ubuntu/Components/PageStack.qml' |
1915 | --- modules/Ubuntu/Components/PageStack.qml 2015-02-27 07:55:51 +0000 |
1916 | +++ modules/Ubuntu/Components/PageStack.qml 2015-03-03 15:01:13 +0000 |
1917 | @@ -14,7 +14,7 @@ |
1918 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1919 | */ |
1920 | |
1921 | -import QtQuick 2.2 |
1922 | +import QtQuick 2.4 |
1923 | import "stack.js" as Stack |
1924 | |
1925 | /*! |
1926 | @@ -36,8 +36,8 @@ |
1927 | left/right/top/bottom anchors, explicitly set anchors.fill of the PageStack to |
1928 | undefined: |
1929 | \qml |
1930 | - import QtQuick 2.2 |
1931 | - import Ubuntu.Components 1.1 |
1932 | + import QtQuick 2.4 |
1933 | + import Ubuntu.Components 1.2 |
1934 | |
1935 | MainView { |
1936 | width: units.gu(40) |
1937 | @@ -75,8 +75,8 @@ |
1938 | |
1939 | Example: |
1940 | \qml |
1941 | - import QtQuick 2.0 |
1942 | - import Ubuntu.Components 1.1 |
1943 | + import QtQuick 2.4 |
1944 | + import Ubuntu.Components 1.2 |
1945 | import Ubuntu.Components.ListItems 1.0 as ListItem |
1946 | |
1947 | MainView { |
1948 | |
1949 | === modified file 'modules/Ubuntu/Components/PageTreeNode.qml' |
1950 | --- modules/Ubuntu/Components/PageTreeNode.qml 2015-02-24 18:51:47 +0000 |
1951 | +++ modules/Ubuntu/Components/PageTreeNode.qml 2015-03-03 15:01:13 +0000 |
1952 | @@ -14,7 +14,7 @@ |
1953 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1954 | */ |
1955 | |
1956 | -import QtQuick 2.0 |
1957 | +import QtQuick 2.4 |
1958 | |
1959 | /*! |
1960 | \internal |
1961 | |
1962 | === modified file 'modules/Ubuntu/Components/PageWrapper.qml' |
1963 | --- modules/Ubuntu/Components/PageWrapper.qml 2014-11-18 11:38:59 +0000 |
1964 | +++ modules/Ubuntu/Components/PageWrapper.qml 2015-03-03 15:01:13 +0000 |
1965 | @@ -14,7 +14,7 @@ |
1966 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1967 | */ |
1968 | |
1969 | -import QtQuick 2.0 |
1970 | +import QtQuick 2.4 |
1971 | import "PageWrapperUtils.js" as Utils |
1972 | |
1973 | /*! |
1974 | |
1975 | === modified file 'modules/Ubuntu/Components/Panel.qml' |
1976 | --- modules/Ubuntu/Components/Panel.qml 2014-07-17 13:58:56 +0000 |
1977 | +++ modules/Ubuntu/Components/Panel.qml 2015-03-03 15:01:13 +0000 |
1978 | @@ -14,8 +14,8 @@ |
1979 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1980 | */ |
1981 | |
1982 | -import QtQuick 2.0 |
1983 | -import Ubuntu.Components 1.1 as Toolkit |
1984 | +import QtQuick 2.4 |
1985 | +import Ubuntu.Components 1.2 as Toolkit |
1986 | |
1987 | /*! |
1988 | \qmltype Panel |
1989 | @@ -37,8 +37,8 @@ |
1990 | |
1991 | A black panel that can be swiped in from the lower-right of the window can be created like this: |
1992 | \qml |
1993 | - import QtQuick 2.0 |
1994 | - import Ubuntu.Components 1.1 |
1995 | + import QtQuick 2.4 |
1996 | + import Ubuntu.Components 1.2 |
1997 | |
1998 | Item { |
1999 | width: units.gu(80) |
2000 | @@ -68,8 +68,8 @@ |
2001 | |
2002 | A panel that looks like the standard (bottom-aligned) toolbar, but with custom contents, can be created like this: |
2003 | \qml |
2004 | - import QtQuick 2.0 |
2005 | - import Ubuntu.Components 1.1 |
2006 | + import QtQuick 2.4 |
2007 | + import Ubuntu.Components 1.2 |
2008 | |
2009 | Item { |
2010 | width: units.gu(80) |
2011 | @@ -105,8 +105,8 @@ |
2012 | start swiping on the buttons in the examples above in order to hide the panel. To remedy this, clicked() |
2013 | signals are forwarded from the panel by calling the child's trigger() function. Example: |
2014 | \qml |
2015 | - import QtQuick 2.0 |
2016 | - import Ubuntu.Components 1.1 |
2017 | + import QtQuick 2.4 |
2018 | + import Ubuntu.Components 1.2 |
2019 | |
2020 | Rectangle { |
2021 | color: Theme.palette.normal.background |
2022 | |
2023 | === modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml' |
2024 | --- modules/Ubuntu/Components/Pickers/DatePicker.qml 2014-10-08 09:09:29 +0000 |
2025 | +++ modules/Ubuntu/Components/Pickers/DatePicker.qml 2015-03-03 15:01:13 +0000 |
2026 | @@ -14,8 +14,8 @@ |
2027 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2028 | */ |
2029 | |
2030 | -import QtQuick 2.0 |
2031 | -import Ubuntu.Components 1.1 |
2032 | +import QtQuick 2.4 |
2033 | +import Ubuntu.Components 1.2 |
2034 | |
2035 | /*! |
2036 | \qmltype DatePicker |
2037 | @@ -35,8 +35,8 @@ |
2038 | only through the \l date property. |
2039 | |
2040 | \qml |
2041 | - import QtQuick 2.0 |
2042 | - import Ubuntu.Components 1.1 |
2043 | + import QtQuick 2.4 |
2044 | + import Ubuntu.Components 1.2 |
2045 | import Ubuntu.Components.Pickers 1.0 |
2046 | |
2047 | Column { |
2048 | @@ -55,8 +55,8 @@ |
2049 | \b Minutes and \b Seconds strings sepatared with '|' character. A DatePicker |
2050 | which shows only year and month date units would look as follows: |
2051 | \qml |
2052 | - import QtQuick 2.0 |
2053 | - import Ubuntu.Components 1.1 |
2054 | + import QtQuick 2.4 |
2055 | + import Ubuntu.Components 1.2 |
2056 | import Ubuntu.Components.Pickers 1.0 |
2057 | |
2058 | Column { |
2059 | @@ -74,8 +74,8 @@ |
2060 | is needed, the model should be set to contain the time specific mode flags. |
2061 | The following example demonstrates how to use DatePicker for time picking. |
2062 | \qml |
2063 | - import QtQuick 2.0 |
2064 | - import Ubuntu.Components 1.1 |
2065 | + import QtQuick 2.4 |
2066 | + import Ubuntu.Components 1.2 |
2067 | import Ubuntu.Components.Pickers 1.0 |
2068 | |
2069 | Column { |
2070 | @@ -111,8 +111,8 @@ |
2071 | hours picker presenting 24 hours. |
2072 | \endlist |
2073 | \qml |
2074 | - import QtQuick 2.0 |
2075 | - import Ubuntu.Components 1.1 |
2076 | + import QtQuick 2.4 |
2077 | + import Ubuntu.Components 1.2 |
2078 | import Ubuntu.Components.Pickers 1.0 |
2079 | |
2080 | Column { |
2081 | |
2082 | === modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml' |
2083 | --- modules/Ubuntu/Components/Pickers/DayModel.qml 2014-04-23 08:50:20 +0000 |
2084 | +++ modules/Ubuntu/Components/Pickers/DayModel.qml 2015-03-03 15:01:13 +0000 |
2085 | @@ -14,8 +14,8 @@ |
2086 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2087 | */ |
2088 | |
2089 | -import QtQuick 2.0 |
2090 | -import Ubuntu.Components 1.1 |
2091 | +import QtQuick 2.4 |
2092 | +import Ubuntu.Components 1.2 |
2093 | |
2094 | PickerModelBase { |
2095 | circular: true |
2096 | |
2097 | === modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml' |
2098 | --- modules/Ubuntu/Components/Pickers/Dialer.qml 2014-08-21 05:24:14 +0000 |
2099 | +++ modules/Ubuntu/Components/Pickers/Dialer.qml 2015-03-03 15:01:13 +0000 |
2100 | @@ -14,8 +14,8 @@ |
2101 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2102 | */ |
2103 | |
2104 | -import QtQuick 2.0 |
2105 | -import Ubuntu.Components 1.1 |
2106 | +import QtQuick 2.4 |
2107 | +import Ubuntu.Components 1.2 |
2108 | |
2109 | /*! |
2110 | \qmltype Dialer |
2111 | @@ -34,7 +34,7 @@ |
2112 | value between 0 and 50. |
2113 | |
2114 | \qml |
2115 | - import QtQuick 2.0 |
2116 | + import QtQuick 2.4 |
2117 | import Ubuntu.Components.Pickers 1.0 |
2118 | |
2119 | Dialer { |
2120 | |
2121 | === modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml' |
2122 | --- modules/Ubuntu/Components/Pickers/DialerHand.qml 2014-08-21 05:24:14 +0000 |
2123 | +++ modules/Ubuntu/Components/Pickers/DialerHand.qml 2015-03-03 15:01:13 +0000 |
2124 | @@ -14,8 +14,8 @@ |
2125 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2126 | */ |
2127 | |
2128 | -import QtQuick 2.0 |
2129 | -import Ubuntu.Components 1.1 |
2130 | +import QtQuick 2.4 |
2131 | +import Ubuntu.Components 1.2 |
2132 | |
2133 | /*! |
2134 | \qmltype DialerHand |
2135 | |
2136 | === modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml' |
2137 | --- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml 2014-04-25 12:53:58 +0000 |
2138 | +++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml 2015-03-03 15:01:13 +0000 |
2139 | @@ -13,8 +13,8 @@ |
2140 | * You should have received a copy of the GNU Lesser General Public License |
2141 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2142 | */ |
2143 | -import QtQuick 2.0 |
2144 | -import Ubuntu.Components 1.1 |
2145 | +import QtQuick 2.4 |
2146 | +import Ubuntu.Components 1.2 |
2147 | |
2148 | /*! |
2149 | \internal |
2150 | |
2151 | === modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml' |
2152 | --- modules/Ubuntu/Components/Pickers/HoursModel.qml 2014-04-23 08:50:20 +0000 |
2153 | +++ modules/Ubuntu/Components/Pickers/HoursModel.qml 2015-03-03 15:01:13 +0000 |
2154 | @@ -14,8 +14,8 @@ |
2155 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2156 | */ |
2157 | |
2158 | -import QtQuick 2.0 |
2159 | -import Ubuntu.Components 1.1 |
2160 | +import QtQuick 2.4 |
2161 | +import Ubuntu.Components 1.2 |
2162 | |
2163 | PickerModelBase { |
2164 | property int from |
2165 | |
2166 | === modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml' |
2167 | --- modules/Ubuntu/Components/Pickers/MinutesModel.qml 2014-04-23 08:50:20 +0000 |
2168 | +++ modules/Ubuntu/Components/Pickers/MinutesModel.qml 2015-03-03 15:01:13 +0000 |
2169 | @@ -14,8 +14,8 @@ |
2170 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2171 | */ |
2172 | |
2173 | -import QtQuick 2.0 |
2174 | -import Ubuntu.Components 1.1 |
2175 | +import QtQuick 2.4 |
2176 | +import Ubuntu.Components 1.2 |
2177 | |
2178 | PickerModelBase { |
2179 | property int from |
2180 | |
2181 | === modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml' |
2182 | --- modules/Ubuntu/Components/Pickers/MonthModel.qml 2014-04-23 08:50:20 +0000 |
2183 | +++ modules/Ubuntu/Components/Pickers/MonthModel.qml 2015-03-03 15:01:13 +0000 |
2184 | @@ -14,8 +14,8 @@ |
2185 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2186 | */ |
2187 | |
2188 | -import QtQuick 2.0 |
2189 | -import Ubuntu.Components 1.1 |
2190 | +import QtQuick 2.4 |
2191 | +import Ubuntu.Components 1.2 |
2192 | |
2193 | PickerModelBase { |
2194 | circular: (count >= 11) |
2195 | |
2196 | === modified file 'modules/Ubuntu/Components/Pickers/Picker.qml' |
2197 | --- modules/Ubuntu/Components/Pickers/Picker.qml 2014-09-02 05:52:32 +0000 |
2198 | +++ modules/Ubuntu/Components/Pickers/Picker.qml 2015-03-03 15:01:13 +0000 |
2199 | @@ -14,8 +14,8 @@ |
2200 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2201 | */ |
2202 | |
2203 | -import QtQuick 2.0 |
2204 | -import Ubuntu.Components 1.1 |
2205 | +import QtQuick 2.4 |
2206 | +import Ubuntu.Components 1.2 |
2207 | |
2208 | /*! |
2209 | \qmltype Picker |
2210 | @@ -34,8 +34,8 @@ |
2211 | |
2212 | Example: |
2213 | \qml |
2214 | - import QtQuick 2.0 |
2215 | - import Ubuntu.Components 1.1 |
2216 | + import QtQuick 2.4 |
2217 | + import Ubuntu.Components 1.2 |
2218 | import Ubuntu.Components.Pickers 1.0 |
2219 | |
2220 | Picker { |
2221 | |
2222 | === modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml' |
2223 | --- modules/Ubuntu/Components/Pickers/PickerDelegate.qml 2014-04-25 12:53:58 +0000 |
2224 | +++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml 2015-03-03 15:01:13 +0000 |
2225 | @@ -14,8 +14,8 @@ |
2226 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2227 | */ |
2228 | |
2229 | -import QtQuick 2.0 |
2230 | -import Ubuntu.Components 1.1 |
2231 | +import QtQuick 2.4 |
2232 | +import Ubuntu.Components 1.2 |
2233 | |
2234 | /*! |
2235 | \qmltype PickerDelegate |
2236 | |
2237 | === modified file 'modules/Ubuntu/Components/Pickers/PickerModelBase.qml' |
2238 | --- modules/Ubuntu/Components/Pickers/PickerModelBase.qml 2014-03-06 10:46:17 +0000 |
2239 | +++ modules/Ubuntu/Components/Pickers/PickerModelBase.qml 2015-03-03 15:01:13 +0000 |
2240 | @@ -14,7 +14,7 @@ |
2241 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2242 | */ |
2243 | |
2244 | -import QtQuick 2.0 |
2245 | +import QtQuick 2.4 |
2246 | |
2247 | /* |
2248 | Base model type for DatePicker |
2249 | |
2250 | === modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml' |
2251 | --- modules/Ubuntu/Components/Pickers/PickerPanel.qml 2014-09-03 08:17:24 +0000 |
2252 | +++ modules/Ubuntu/Components/Pickers/PickerPanel.qml 2015-03-03 15:01:13 +0000 |
2253 | @@ -15,9 +15,9 @@ |
2254 | */ |
2255 | |
2256 | pragma Singleton |
2257 | -import QtQuick 2.0 |
2258 | +import QtQuick 2.4 |
2259 | import QtQuick.Window 2.0 |
2260 | -import Ubuntu.Components 1.1 |
2261 | +import Ubuntu.Components 1.2 |
2262 | import Ubuntu.Components.ListItems 1.0 |
2263 | import Ubuntu.Components.Popups 1.0 |
2264 | |
2265 | @@ -32,8 +32,8 @@ |
2266 | area or in a Popover, depending on the form factor, following the design guides |
2267 | on date pickers. |
2268 | \qml |
2269 | - import QtQuick 2.0 |
2270 | - import Ubuntu.Components 1.1 |
2271 | + import QtQuick 2.4 |
2272 | + import Ubuntu.Components 1.2 |
2273 | |
2274 | MainWindow { |
2275 | width: units.gu(40) |
2276 | |
2277 | === modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml' |
2278 | --- modules/Ubuntu/Components/Pickers/PickerRow.qml 2014-05-07 10:42:31 +0000 |
2279 | +++ modules/Ubuntu/Components/Pickers/PickerRow.qml 2015-03-03 15:01:13 +0000 |
2280 | @@ -14,8 +14,8 @@ |
2281 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2282 | */ |
2283 | |
2284 | -import QtQuick 2.0 |
2285 | -import Ubuntu.Components 1.1 |
2286 | +import QtQuick 2.4 |
2287 | +import Ubuntu.Components 1.2 |
2288 | |
2289 | Row { |
2290 | id: row |
2291 | |
2292 | === modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml' |
2293 | --- modules/Ubuntu/Components/Pickers/SecondsModel.qml 2014-04-23 08:50:20 +0000 |
2294 | +++ modules/Ubuntu/Components/Pickers/SecondsModel.qml 2015-03-03 15:01:13 +0000 |
2295 | @@ -14,8 +14,8 @@ |
2296 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2297 | */ |
2298 | |
2299 | -import QtQuick 2.0 |
2300 | -import Ubuntu.Components 1.1 |
2301 | +import QtQuick 2.4 |
2302 | +import Ubuntu.Components 1.2 |
2303 | |
2304 | PickerModelBase { |
2305 | property int from |
2306 | |
2307 | === modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml' |
2308 | --- modules/Ubuntu/Components/Pickers/YearModel.qml 2014-04-23 08:50:20 +0000 |
2309 | +++ modules/Ubuntu/Components/Pickers/YearModel.qml 2015-03-03 15:01:13 +0000 |
2310 | @@ -14,8 +14,8 @@ |
2311 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2312 | */ |
2313 | |
2314 | -import QtQuick 2.0 |
2315 | -import Ubuntu.Components 1.1 |
2316 | +import QtQuick 2.4 |
2317 | +import Ubuntu.Components 1.2 |
2318 | |
2319 | PickerModelBase { |
2320 | // local properties |
2321 | |
2322 | === modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml' |
2323 | --- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml 2014-11-21 19:15:17 +0000 |
2324 | +++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml 2015-03-03 15:01:13 +0000 |
2325 | @@ -14,8 +14,8 @@ |
2326 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2327 | */ |
2328 | |
2329 | -import QtQuick 2.0 |
2330 | -import Ubuntu.Components 1.1 |
2331 | +import QtQuick 2.4 |
2332 | +import Ubuntu.Components 1.2 |
2333 | import Ubuntu.Components.ListItems 1.0 |
2334 | |
2335 | /*! |
2336 | |
2337 | === modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml' |
2338 | --- modules/Ubuntu/Components/Popups/ComposerSheet.qml 2014-11-18 11:59:47 +0000 |
2339 | +++ modules/Ubuntu/Components/Popups/ComposerSheet.qml 2015-03-03 15:01:13 +0000 |
2340 | @@ -14,8 +14,8 @@ |
2341 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2342 | */ |
2343 | |
2344 | -import QtQuick 2.0 |
2345 | -import Ubuntu.Components 1.1 |
2346 | +import QtQuick 2.4 |
2347 | +import Ubuntu.Components 1.2 |
2348 | /*! |
2349 | \qmltype ComposerSheet |
2350 | \inherits SheetBase |
2351 | @@ -32,7 +32,7 @@ |
2352 | |
2353 | Example: |
2354 | \qml |
2355 | - import Ubuntu.Components 1.1 |
2356 | + import Ubuntu.Components 1.2 |
2357 | import Ubuntu.Components.Popups 1.0 |
2358 | |
2359 | Item { |
2360 | |
2361 | === modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml' |
2362 | --- modules/Ubuntu/Components/Popups/DefaultSheet.qml 2014-11-18 11:59:47 +0000 |
2363 | +++ modules/Ubuntu/Components/Popups/DefaultSheet.qml 2015-03-03 15:01:13 +0000 |
2364 | @@ -14,8 +14,8 @@ |
2365 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2366 | */ |
2367 | |
2368 | -import QtQuick 2.0 |
2369 | -import Ubuntu.Components 1.1 |
2370 | +import QtQuick 2.4 |
2371 | +import Ubuntu.Components 1.2 |
2372 | |
2373 | /*! |
2374 | \qmltype DefaultSheet |
2375 | @@ -33,7 +33,7 @@ |
2376 | |
2377 | Example: |
2378 | \qml |
2379 | - import Ubuntu.Components 1.1 |
2380 | + import Ubuntu.Components 1.2 |
2381 | import Ubuntu.Components.Popups 1.0 |
2382 | |
2383 | Item { |
2384 | |
2385 | === modified file 'modules/Ubuntu/Components/Popups/Dialog.qml' |
2386 | --- modules/Ubuntu/Components/Popups/Dialog.qml 2015-01-14 13:32:44 +0000 |
2387 | +++ modules/Ubuntu/Components/Popups/Dialog.qml 2015-03-03 15:01:13 +0000 |
2388 | @@ -14,8 +14,8 @@ |
2389 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2390 | */ |
2391 | |
2392 | -import QtQuick 2.0 |
2393 | -import Ubuntu.Components 1.1 |
2394 | +import QtQuick 2.4 |
2395 | +import Ubuntu.Components 1.2 |
2396 | import "internalPopupUtils.js" as InternalPopupUtils |
2397 | |
2398 | /*! |
2399 | @@ -32,8 +32,8 @@ |
2400 | |
2401 | Example: |
2402 | \qml |
2403 | - import QtQuick 2.0 |
2404 | - import Ubuntu.Components 1.1 |
2405 | + import QtQuick 2.4 |
2406 | + import Ubuntu.Components 1.2 |
2407 | import Ubuntu.Components.Popups 1.0 |
2408 | |
2409 | Item { |
2410 | |
2411 | === modified file 'modules/Ubuntu/Components/Popups/Popover.qml' |
2412 | --- modules/Ubuntu/Components/Popups/Popover.qml 2015-02-26 15:31:15 +0000 |
2413 | +++ modules/Ubuntu/Components/Popups/Popover.qml 2015-03-03 15:01:13 +0000 |
2414 | @@ -14,9 +14,9 @@ |
2415 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2416 | */ |
2417 | |
2418 | -import QtQuick 2.0 |
2419 | +import QtQuick 2.4 |
2420 | import "internalPopupUtils.js" as InternalPopupUtils |
2421 | -import Ubuntu.Components 1.1 |
2422 | +import Ubuntu.Components 1.2 |
2423 | |
2424 | /*! |
2425 | \qmltype Popover |
2426 | @@ -31,8 +31,8 @@ |
2427 | |
2428 | Example: |
2429 | \qml |
2430 | - import QtQuick 2.0 |
2431 | - import Ubuntu.Components 1.1 |
2432 | + import QtQuick 2.4 |
2433 | + import Ubuntu.Components 1.2 |
2434 | import Ubuntu.Components.ListItems 1.0 as ListItem |
2435 | import Ubuntu.Components.Popups 1.0 |
2436 | |
2437 | |
2438 | === modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml' |
2439 | --- modules/Ubuntu/Components/Popups/PopupBase.qml 2015-01-29 15:46:10 +0000 |
2440 | +++ modules/Ubuntu/Components/Popups/PopupBase.qml 2015-03-03 15:01:13 +0000 |
2441 | @@ -14,8 +14,8 @@ |
2442 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2443 | */ |
2444 | |
2445 | -import QtQuick 2.0 |
2446 | -import Ubuntu.Components 1.1 |
2447 | +import QtQuick 2.4 |
2448 | +import Ubuntu.Components 1.2 |
2449 | |
2450 | /*! |
2451 | \qmltype PopupBase |
2452 | |
2453 | === modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml' |
2454 | --- modules/Ubuntu/Components/Popups/SheetBase.qml 2014-11-18 11:59:47 +0000 |
2455 | +++ modules/Ubuntu/Components/Popups/SheetBase.qml 2015-03-03 15:01:13 +0000 |
2456 | @@ -14,8 +14,8 @@ |
2457 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2458 | */ |
2459 | |
2460 | -import QtQuick 2.0 |
2461 | -import Ubuntu.Components 1.1 |
2462 | +import QtQuick 2.4 |
2463 | +import Ubuntu.Components 1.2 |
2464 | |
2465 | /*! |
2466 | \qmltype SheetBase |
2467 | |
2468 | === modified file 'modules/Ubuntu/Components/ProgressBar10.qml' |
2469 | --- modules/Ubuntu/Components/ProgressBar10.qml 2014-11-18 11:38:59 +0000 |
2470 | +++ modules/Ubuntu/Components/ProgressBar10.qml 2015-03-03 15:01:13 +0000 |
2471 | @@ -14,7 +14,7 @@ |
2472 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2473 | */ |
2474 | |
2475 | -import QtQuick 2.0 |
2476 | +import QtQuick 2.4 |
2477 | |
2478 | /*! |
2479 | \qmltype ProgressBar |
2480 | |
2481 | === modified file 'modules/Ubuntu/Components/ProgressBar11.qml' |
2482 | --- modules/Ubuntu/Components/ProgressBar11.qml 2014-06-23 12:52:52 +0000 |
2483 | +++ modules/Ubuntu/Components/ProgressBar11.qml 2015-03-03 15:01:13 +0000 |
2484 | @@ -14,7 +14,7 @@ |
2485 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2486 | */ |
2487 | |
2488 | -import QtQuick 2.0 |
2489 | +import QtQuick 2.4 |
2490 | |
2491 | ProgressBar { |
2492 | property bool showProgressPercentage: true |
2493 | |
2494 | === modified file 'modules/Ubuntu/Components/PullToRefresh.qml' |
2495 | --- modules/Ubuntu/Components/PullToRefresh.qml 2014-06-27 06:18:48 +0000 |
2496 | +++ modules/Ubuntu/Components/PullToRefresh.qml 2015-03-03 15:01:13 +0000 |
2497 | @@ -14,8 +14,8 @@ |
2498 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2499 | */ |
2500 | |
2501 | -import QtQuick 2.2 |
2502 | -import Ubuntu.Components 1.1 |
2503 | +import QtQuick 2.4 |
2504 | +import Ubuntu.Components 1.2 |
2505 | |
2506 | /*! |
2507 | \qmltype PullToRefresh |
2508 | @@ -32,9 +32,9 @@ |
2509 | component by defining the completion clause to the \l refreshing property. |
2510 | |
2511 | \qml |
2512 | - import QtQuick 2.2 |
2513 | + import QtQuick 2.4 |
2514 | import QtQuick.XmlListModel 2.0 |
2515 | - import Ubuntu.Components 1.1 |
2516 | + import Ubuntu.Components 1.2 |
2517 | import Ubuntu.Components.ListItems 1.0 |
2518 | |
2519 | MainView { |
2520 | @@ -82,9 +82,9 @@ |
2521 | to be shown by the component. Custom implementations can hold any component, |
2522 | which will be anchor filled to the component itself. |
2523 | \qml |
2524 | - import QtQuick 2.2 |
2525 | + import QtQuick 2.4 |
2526 | import QtQuick.XmlListModel 2.0 |
2527 | - import Ubuntu.Components 1.1 |
2528 | + import Ubuntu.Components 1.2 |
2529 | import Ubuntu.Components.ListItems 1.0 |
2530 | |
2531 | MainView { |
2532 | @@ -130,9 +130,9 @@ |
2533 | \note When declared as child of Flickable, set parent to the flickable explicitly |
2534 | so the component does not land in the \c content of Flickable. |
2535 | \qml |
2536 | - import QtQuick 2.2 |
2537 | + import QtQuick 2.4 |
2538 | import QtQuick.XmlListModel 2.0 |
2539 | - import Ubuntu.Components 1.1 |
2540 | + import Ubuntu.Components 1.2 |
2541 | import Ubuntu.Components.ListItems 1.0 |
2542 | |
2543 | MainView { |
2544 | |
2545 | === modified file 'modules/Ubuntu/Components/Scrollbar.qml' |
2546 | --- modules/Ubuntu/Components/Scrollbar.qml 2014-11-18 11:38:59 +0000 |
2547 | +++ modules/Ubuntu/Components/Scrollbar.qml 2015-03-03 15:01:13 +0000 |
2548 | @@ -14,7 +14,7 @@ |
2549 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2550 | */ |
2551 | |
2552 | -import QtQuick 2.0 |
2553 | +import QtQuick 2.4 |
2554 | |
2555 | /*! |
2556 | \qmltype ScrollBar |
2557 | |
2558 | === modified file 'modules/Ubuntu/Components/Slider.qml' |
2559 | --- modules/Ubuntu/Components/Slider.qml 2014-11-18 12:02:55 +0000 |
2560 | +++ modules/Ubuntu/Components/Slider.qml 2015-03-03 15:01:13 +0000 |
2561 | @@ -16,7 +16,7 @@ |
2562 | |
2563 | // FIXME(loicm) Add support for keyboard shortcuts (basically left/right). |
2564 | |
2565 | -import QtQuick 2.0 |
2566 | +import QtQuick 2.4 |
2567 | import "mathUtils.js" as MathUtils |
2568 | |
2569 | /*! |
2570 | |
2571 | === modified file 'modules/Ubuntu/Components/StyledItem.qml' |
2572 | --- modules/Ubuntu/Components/StyledItem.qml 2014-08-25 05:56:28 +0000 |
2573 | +++ modules/Ubuntu/Components/StyledItem.qml 2015-03-03 15:01:13 +0000 |
2574 | @@ -14,8 +14,8 @@ |
2575 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2576 | */ |
2577 | |
2578 | -import QtQuick 2.0 |
2579 | -import Ubuntu.Components 1.1 |
2580 | +import QtQuick 2.4 |
2581 | +import Ubuntu.Components 1.2 |
2582 | |
2583 | /*! |
2584 | \qmlabstract StyledItem |
2585 | |
2586 | === modified file 'modules/Ubuntu/Components/Styles/ComboButtonStyle.qml' |
2587 | --- modules/Ubuntu/Components/Styles/ComboButtonStyle.qml 2014-10-21 17:48:12 +0000 |
2588 | +++ modules/Ubuntu/Components/Styles/ComboButtonStyle.qml 2015-03-03 15:01:13 +0000 |
2589 | @@ -14,7 +14,7 @@ |
2590 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2591 | */ |
2592 | |
2593 | -import QtQuick 2.0 |
2594 | +import QtQuick 2.4 |
2595 | |
2596 | /*! |
2597 | \qmltype ComboButtonStyle |
2598 | |
2599 | === modified file 'modules/Ubuntu/Components/Styles/PageHeadStyle.qml' |
2600 | --- modules/Ubuntu/Components/Styles/PageHeadStyle.qml 2014-11-04 10:55:58 +0000 |
2601 | +++ modules/Ubuntu/Components/Styles/PageHeadStyle.qml 2015-03-03 15:01:13 +0000 |
2602 | @@ -13,7 +13,7 @@ |
2603 | * You should have received a copy of the GNU Lesser General Public License |
2604 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2605 | */ |
2606 | -import QtQuick 2.0 |
2607 | +import QtQuick 2.4 |
2608 | |
2609 | /*! |
2610 | \qmltype PageHeadStyle |
2611 | |
2612 | === modified file 'modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml' |
2613 | --- modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml 2014-10-21 17:48:12 +0000 |
2614 | +++ modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml 2015-03-03 15:01:13 +0000 |
2615 | @@ -14,7 +14,7 @@ |
2616 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2617 | */ |
2618 | |
2619 | -import QtQuick 2.2 |
2620 | +import QtQuick 2.4 |
2621 | |
2622 | /*! |
2623 | \qmltype PullToRefreshStyle |
2624 | |
2625 | === modified file 'modules/Ubuntu/Components/Switch.qml' |
2626 | --- modules/Ubuntu/Components/Switch.qml 2014-11-18 11:38:59 +0000 |
2627 | +++ modules/Ubuntu/Components/Switch.qml 2015-03-03 15:01:13 +0000 |
2628 | @@ -17,7 +17,7 @@ |
2629 | // FIXME(loicm) It would be nice to have a draggable thumb to toggle the switch, |
2630 | // that needs to be validated with designers though. |
2631 | |
2632 | -import QtQuick 2.0 |
2633 | +import QtQuick 2.4 |
2634 | |
2635 | /*! |
2636 | \qmltype Switch |
2637 | |
2638 | === modified file 'modules/Ubuntu/Components/Tab.qml' |
2639 | --- modules/Ubuntu/Components/Tab.qml 2015-02-27 07:55:51 +0000 |
2640 | +++ modules/Ubuntu/Components/Tab.qml 2015-03-03 15:01:13 +0000 |
2641 | @@ -14,7 +14,7 @@ |
2642 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2643 | */ |
2644 | |
2645 | -import QtQuick 2.0 |
2646 | +import QtQuick 2.4 |
2647 | |
2648 | /*! |
2649 | \qmltype Tab |
2650 | @@ -49,7 +49,7 @@ |
2651 | \l Page can control the height and prevent overlapping the header. |
2652 | Example: |
2653 | \qml |
2654 | - import QtQuick 2.3 |
2655 | + import QtQuick 2.4 |
2656 | import Ubuntu.Components 1.2 |
2657 | MainView { |
2658 | width: units.gu(40) |
2659 | |
2660 | === modified file 'modules/Ubuntu/Components/TabBar.qml' |
2661 | --- modules/Ubuntu/Components/TabBar.qml 2014-08-21 05:24:14 +0000 |
2662 | +++ modules/Ubuntu/Components/TabBar.qml 2015-03-03 15:01:13 +0000 |
2663 | @@ -14,7 +14,7 @@ |
2664 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2665 | */ |
2666 | |
2667 | -import QtQuick 2.0 |
2668 | +import QtQuick 2.4 |
2669 | |
2670 | /*! |
2671 | \qmltype TabBar |
2672 | |
2673 | === modified file 'modules/Ubuntu/Components/Tabs.qml' |
2674 | --- modules/Ubuntu/Components/Tabs.qml 2014-11-18 11:38:59 +0000 |
2675 | +++ modules/Ubuntu/Components/Tabs.qml 2015-03-03 15:01:13 +0000 |
2676 | @@ -14,7 +14,7 @@ |
2677 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2678 | */ |
2679 | |
2680 | -import QtQuick 2.0 |
2681 | +import QtQuick 2.4 |
2682 | |
2683 | /*! |
2684 | \qmltype Tabs |
2685 | @@ -32,8 +32,8 @@ |
2686 | |
2687 | Example: |
2688 | \qml |
2689 | - import QtQuick 2.0 |
2690 | - import Ubuntu.Components 1.1 |
2691 | + import QtQuick 2.4 |
2692 | + import Ubuntu.Components 1.2 |
2693 | import Ubuntu.Components.ListItems 1.0 as ListItem |
2694 | |
2695 | MainView { |
2696 | @@ -103,8 +103,8 @@ |
2697 | \l PageStack, and pushing other pages on top of that, as is shown in the following example: |
2698 | |
2699 | \qml |
2700 | - import QtQuick 2.0 |
2701 | - import Ubuntu.Components 1.1 |
2702 | + import QtQuick 2.4 |
2703 | + import Ubuntu.Components 1.2 |
2704 | |
2705 | MainView { |
2706 | id: mainView |
2707 | |
2708 | === modified file 'modules/Ubuntu/Components/TextArea.qml' |
2709 | --- modules/Ubuntu/Components/TextArea.qml 2014-12-03 15:46:20 +0000 |
2710 | +++ modules/Ubuntu/Components/TextArea.qml 2015-03-03 15:01:13 +0000 |
2711 | @@ -14,8 +14,8 @@ |
2712 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2713 | */ |
2714 | |
2715 | -import QtQuick 2.0 |
2716 | -import Ubuntu.Components 1.1 as Ubuntu |
2717 | +import QtQuick 2.4 |
2718 | +import Ubuntu.Components 1.2 as Ubuntu |
2719 | import Ubuntu.Components.Popups 1.0 |
2720 | import "mathUtils.js" as MathUtils |
2721 | |
2722 | |
2723 | === modified file 'modules/Ubuntu/Components/TextCursor.qml' |
2724 | --- modules/Ubuntu/Components/TextCursor.qml 2014-11-26 09:57:47 +0000 |
2725 | +++ modules/Ubuntu/Components/TextCursor.qml 2015-03-03 15:01:13 +0000 |
2726 | @@ -14,8 +14,8 @@ |
2727 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2728 | */ |
2729 | |
2730 | -import QtQuick 2.0 |
2731 | -import Ubuntu.Components 1.1 as Ubuntu |
2732 | +import QtQuick 2.4 |
2733 | +import Ubuntu.Components 1.2 as Ubuntu |
2734 | import Ubuntu.Components.Popups 1.0 |
2735 | |
2736 | Ubuntu.StyledItem { |
2737 | |
2738 | === modified file 'modules/Ubuntu/Components/TextField.qml' |
2739 | --- modules/Ubuntu/Components/TextField.qml 2014-12-03 15:46:20 +0000 |
2740 | +++ modules/Ubuntu/Components/TextField.qml 2015-03-03 15:01:13 +0000 |
2741 | @@ -14,8 +14,8 @@ |
2742 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2743 | */ |
2744 | |
2745 | -import QtQuick 2.0 |
2746 | -import Ubuntu.Components 1.1 as Ubuntu |
2747 | +import QtQuick 2.4 |
2748 | +import Ubuntu.Components 1.2 as Ubuntu |
2749 | import Ubuntu.Components.Popups 1.0 |
2750 | |
2751 | /*! |
2752 | @@ -526,8 +526,8 @@ |
2753 | between 11 and 31 into the text input: |
2754 | |
2755 | \qml |
2756 | - import QtQuick 2.0 |
2757 | - import Ubuntu.Components 1.1 |
2758 | + import QtQuick 2.4 |
2759 | + import Ubuntu.Components 1.2 |
2760 | TextField{ |
2761 | validator: IntValidator{bottom: 11; top: 31;} |
2762 | focus: true |
2763 | |
2764 | === modified file 'modules/Ubuntu/Components/TextInputPopover.qml' |
2765 | --- modules/Ubuntu/Components/TextInputPopover.qml 2014-11-12 03:51:45 +0000 |
2766 | +++ modules/Ubuntu/Components/TextInputPopover.qml 2015-03-03 15:01:13 +0000 |
2767 | @@ -14,8 +14,8 @@ |
2768 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2769 | */ |
2770 | |
2771 | -import QtQuick 2.0 |
2772 | -import Ubuntu.Components 1.1 |
2773 | +import QtQuick 2.4 |
2774 | +import Ubuntu.Components 1.2 |
2775 | import Ubuntu.Components.Popups 1.0 |
2776 | |
2777 | Popover { |
2778 | |
2779 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml' |
2780 | --- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml 2015-01-15 19:29:11 +0000 |
2781 | +++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml 2015-03-03 15:01:13 +0000 |
2782 | @@ -14,8 +14,8 @@ |
2783 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2784 | */ |
2785 | |
2786 | -import QtQuick 2.2 |
2787 | -import Ubuntu.Components 1.1 |
2788 | +import QtQuick 2.4 |
2789 | +import Ubuntu.Components 1.2 |
2790 | |
2791 | Image { |
2792 | id: container |
2793 | |
2794 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml' |
2795 | --- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml 2014-11-03 19:41:08 +0000 |
2796 | +++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml 2015-03-03 15:01:13 +0000 |
2797 | @@ -14,8 +14,8 @@ |
2798 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2799 | */ |
2800 | |
2801 | -import QtQuick 2.0 |
2802 | -import Ubuntu.Components 1.1 |
2803 | +import QtQuick 2.4 |
2804 | +import Ubuntu.Components 1.2 |
2805 | |
2806 | Item { |
2807 | id: bubbleShape |
2808 | |
2809 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml' |
2810 | --- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml 2014-04-23 08:50:20 +0000 |
2811 | +++ modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml 2015-03-03 15:01:13 +0000 |
2812 | @@ -16,8 +16,8 @@ |
2813 | * Author: Florian Boucault <florian.boucault@canonical.com> |
2814 | */ |
2815 | |
2816 | -import QtQuick 2.0 |
2817 | -import Ubuntu.Components 1.1 |
2818 | +import QtQuick 2.4 |
2819 | +import Ubuntu.Components 1.2 |
2820 | |
2821 | Item { |
2822 | id: buttonForeground |
2823 | |
2824 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml' |
2825 | --- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml 2014-08-26 14:12:52 +0000 |
2826 | +++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml 2015-03-03 15:01:13 +0000 |
2827 | @@ -16,8 +16,8 @@ |
2828 | * Author: Florian Boucault <florian.boucault@canonical.com> |
2829 | */ |
2830 | |
2831 | -import QtQuick 2.0 |
2832 | -import Ubuntu.Components 1.1 |
2833 | +import QtQuick 2.4 |
2834 | +import Ubuntu.Components 1.2 |
2835 | |
2836 | Item { |
2837 | id: buttonStyle |
2838 | |
2839 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml' |
2840 | --- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml 2014-11-07 15:45:22 +0000 |
2841 | +++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml 2015-03-03 15:01:13 +0000 |
2842 | @@ -14,8 +14,8 @@ |
2843 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2844 | */ |
2845 | |
2846 | -import QtQuick 2.0 |
2847 | -import Ubuntu.Components 1.1 |
2848 | +import QtQuick 2.4 |
2849 | +import Ubuntu.Components 1.2 |
2850 | |
2851 | Item { |
2852 | id: checkBoxStyle |
2853 | |
2854 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml' |
2855 | --- modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml 2014-04-29 06:27:42 +0000 |
2856 | +++ modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml 2015-03-03 15:01:13 +0000 |
2857 | @@ -14,9 +14,9 @@ |
2858 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2859 | */ |
2860 | |
2861 | -import QtQuick 2.0 |
2862 | -import Ubuntu.Components 1.1 |
2863 | -import Ubuntu.Components.Styles 1.1 as Style |
2864 | +import QtQuick 2.4 |
2865 | +import Ubuntu.Components 1.2 |
2866 | +import Ubuntu.Components.Styles 1.2 as Style |
2867 | |
2868 | Style.ComboButtonStyle { |
2869 | id: comboStyle |
2870 | |
2871 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml' |
2872 | --- modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml 2014-04-23 08:50:20 +0000 |
2873 | +++ modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml 2015-03-03 15:01:13 +0000 |
2874 | @@ -14,8 +14,8 @@ |
2875 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2876 | */ |
2877 | |
2878 | -import QtQuick 2.0 |
2879 | -import Ubuntu.Components 1.1 |
2880 | +import QtQuick 2.4 |
2881 | +import Ubuntu.Components 1.2 |
2882 | import Ubuntu.Components.ListItems 1.0 |
2883 | |
2884 | Item { |
2885 | |
2886 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml' |
2887 | --- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml 2014-04-23 08:50:20 +0000 |
2888 | +++ modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml 2015-03-03 15:01:13 +0000 |
2889 | @@ -14,8 +14,8 @@ |
2890 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2891 | */ |
2892 | |
2893 | -import QtQuick 2.0 |
2894 | -import Ubuntu.Components 1.1 |
2895 | +import QtQuick 2.4 |
2896 | +import Ubuntu.Components 1.2 |
2897 | |
2898 | Item { |
2899 | // style API |
2900 | |
2901 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml' |
2902 | --- modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml 2014-04-23 08:50:20 +0000 |
2903 | +++ modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml 2015-03-03 15:01:13 +0000 |
2904 | @@ -14,8 +14,8 @@ |
2905 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2906 | */ |
2907 | |
2908 | -import QtQuick 2.0 |
2909 | -import Ubuntu.Components 1.1 |
2910 | +import QtQuick 2.4 |
2911 | +import Ubuntu.Components 1.2 |
2912 | import QtGraphicalEffects 1.0 |
2913 | |
2914 | // FIXME: Replace this once UbuntuShape support for gradients and shading has landed |
2915 | |
2916 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml' |
2917 | --- modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml 2014-07-25 12:55:27 +0000 |
2918 | +++ modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml 2015-03-03 15:01:13 +0000 |
2919 | @@ -14,8 +14,8 @@ |
2920 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2921 | */ |
2922 | |
2923 | -import QtQuick 2.0 |
2924 | -import Ubuntu.Components 1.1 |
2925 | +import QtQuick 2.4 |
2926 | +import Ubuntu.Components 1.2 |
2927 | |
2928 | Item { |
2929 | id: dialogForegroundStyle |
2930 | |
2931 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml' |
2932 | --- modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml 2014-10-24 15:56:22 +0000 |
2933 | +++ modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml 2015-03-03 15:01:13 +0000 |
2934 | @@ -13,7 +13,7 @@ |
2935 | * You should have received a copy of the GNU Lesser General Public License |
2936 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2937 | */ |
2938 | -import QtQuick 2.2 |
2939 | +import QtQuick 2.4 |
2940 | |
2941 | Item { |
2942 | id: dividerStyle |
2943 | |
2944 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml' |
2945 | --- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml 2014-04-25 05:28:37 +0000 |
2946 | +++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml 2015-03-03 15:01:13 +0000 |
2947 | @@ -13,8 +13,8 @@ |
2948 | * You should have received a copy of the GNU Lesser General Public License |
2949 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2950 | */ |
2951 | -import QtQuick 2.0 |
2952 | -import Ubuntu.Components 1.1 |
2953 | +import QtQuick 2.4 |
2954 | +import Ubuntu.Components 1.2 |
2955 | |
2956 | Item { |
2957 | id: headerStyle |
2958 | |
2959 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml' |
2960 | --- modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml 2013-12-04 10:49:19 +0000 |
2961 | +++ modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml 2015-03-03 15:01:13 +0000 |
2962 | @@ -14,7 +14,7 @@ |
2963 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2964 | */ |
2965 | |
2966 | -import QtQuick 2.0 |
2967 | +import QtQuick 2.4 |
2968 | |
2969 | ShaderEffect { |
2970 | id: magnifier |
2971 | |
2972 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml' |
2973 | --- modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml 2014-08-26 14:12:52 +0000 |
2974 | +++ modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml 2015-03-03 15:01:13 +0000 |
2975 | @@ -15,8 +15,8 @@ |
2976 | * |
2977 | */ |
2978 | |
2979 | -import QtQuick 2.0 |
2980 | -import Ubuntu.Components 1.1 |
2981 | +import QtQuick 2.4 |
2982 | +import Ubuntu.Components 1.2 |
2983 | |
2984 | Item { |
2985 | id: ambianceStyle |
2986 | |
2987 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml' |
2988 | --- modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml 2015-02-27 14:20:28 +0000 |
2989 | +++ modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml 2015-03-03 15:01:13 +0000 |
2990 | @@ -14,7 +14,7 @@ |
2991 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2992 | */ |
2993 | |
2994 | -import QtQuick 2.3 |
2995 | +import QtQuick 2.4 |
2996 | import Ubuntu.Components.Styles 1.2 as Styles |
2997 | import Ubuntu.Components 1.2 |
2998 | |
2999 | |
3000 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml' |
3001 | --- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml 2014-12-04 07:18:58 +0000 |
3002 | +++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml 2015-03-03 15:01:13 +0000 |
3003 | @@ -13,8 +13,8 @@ |
3004 | * You should have received a copy of the GNU Lesser General Public License |
3005 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3006 | */ |
3007 | -import QtQuick 2.0 |
3008 | -import Ubuntu.Components 1.1 |
3009 | +import QtQuick 2.4 |
3010 | +import Ubuntu.Components 1.2 |
3011 | |
3012 | Item { |
3013 | // styling properties |
3014 | |
3015 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml' |
3016 | --- modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml 2014-08-26 14:12:52 +0000 |
3017 | +++ modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml 2015-03-03 15:01:13 +0000 |
3018 | @@ -15,8 +15,8 @@ |
3019 | * |
3020 | */ |
3021 | |
3022 | -import QtQuick 2.0 |
3023 | -import Ubuntu.Components 1.1 |
3024 | +import QtQuick 2.4 |
3025 | +import Ubuntu.Components 1.2 |
3026 | |
3027 | Item { |
3028 | id: ambianceStyle |
3029 | |
3030 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml' |
3031 | --- modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml 2014-07-16 11:16:44 +0000 |
3032 | +++ modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml 2015-03-03 15:01:13 +0000 |
3033 | @@ -14,7 +14,7 @@ |
3034 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3035 | */ |
3036 | |
3037 | -import QtQuick 2.0 |
3038 | +import QtQuick 2.4 |
3039 | import Ubuntu.Components.Popups 1.0 |
3040 | |
3041 | Popover { |
3042 | |
3043 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml' |
3044 | --- modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml 2014-10-01 21:09:53 +0000 |
3045 | +++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml 2015-03-03 15:01:13 +0000 |
3046 | @@ -14,8 +14,8 @@ |
3047 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3048 | */ |
3049 | |
3050 | -import QtQuick 2.2 |
3051 | -import Ubuntu.Components 1.1 |
3052 | +import QtQuick 2.4 |
3053 | +import Ubuntu.Components 1.2 |
3054 | |
3055 | AbstractButton { |
3056 | id: button |
3057 | |
3058 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml' |
3059 | --- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2015-01-13 15:52:29 +0000 |
3060 | +++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2015-03-03 15:01:13 +0000 |
3061 | @@ -13,11 +13,11 @@ |
3062 | * You should have received a copy of the GNU Lesser General Public License |
3063 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3064 | */ |
3065 | -import QtQuick 2.2 |
3066 | -import Ubuntu.Components 1.1 |
3067 | +import QtQuick 2.4 |
3068 | +import Ubuntu.Components 1.2 |
3069 | import Ubuntu.Components.Popups 1.0 |
3070 | import Ubuntu.Components.ListItems 1.0 as ListItem |
3071 | -import Ubuntu.Components.Styles 1.1 as Style |
3072 | +import Ubuntu.Components.Styles 1.2 as Style |
3073 | |
3074 | Style.PageHeadStyle { |
3075 | id: headerStyle |
3076 | |
3077 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/Palette.qml' |
3078 | --- modules/Ubuntu/Components/Themes/Ambiance/Palette.qml 2014-12-03 15:46:20 +0000 |
3079 | +++ modules/Ubuntu/Components/Themes/Ambiance/Palette.qml 2015-03-03 15:01:13 +0000 |
3080 | @@ -14,8 +14,8 @@ |
3081 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3082 | */ |
3083 | |
3084 | -import QtQuick 2.0 |
3085 | -import Ubuntu.Components 1.1 |
3086 | +import QtQuick 2.4 |
3087 | +import Ubuntu.Components 1.2 |
3088 | import Ubuntu.Components.Themes 0.1 |
3089 | |
3090 | Palette { |
3091 | |
3092 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PartialColorize.qml' |
3093 | --- modules/Ubuntu/Components/Themes/Ambiance/PartialColorize.qml 2014-01-08 16:32:38 +0000 |
3094 | +++ modules/Ubuntu/Components/Themes/Ambiance/PartialColorize.qml 2015-03-03 15:01:13 +0000 |
3095 | @@ -14,7 +14,7 @@ |
3096 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3097 | */ |
3098 | |
3099 | -import QtQuick 2.0 |
3100 | +import QtQuick 2.4 |
3101 | |
3102 | ShaderEffect { |
3103 | id: partialColorize |
3104 | |
3105 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PartialColorizeUbuntuShape.qml' |
3106 | --- modules/Ubuntu/Components/Themes/Ambiance/PartialColorizeUbuntuShape.qml 2014-01-08 16:32:38 +0000 |
3107 | +++ modules/Ubuntu/Components/Themes/Ambiance/PartialColorizeUbuntuShape.qml 2015-03-03 15:01:13 +0000 |
3108 | @@ -14,7 +14,7 @@ |
3109 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3110 | */ |
3111 | |
3112 | -import QtQuick 2.0 |
3113 | +import QtQuick 2.4 |
3114 | |
3115 | PartialColorize { |
3116 | fragmentShader: " |
3117 | |
3118 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml' |
3119 | --- modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml 2014-04-23 08:50:20 +0000 |
3120 | +++ modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml 2015-03-03 15:01:13 +0000 |
3121 | @@ -14,8 +14,8 @@ |
3122 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3123 | */ |
3124 | |
3125 | -import QtQuick 2.0 |
3126 | -import Ubuntu.Components 1.1 |
3127 | +import QtQuick 2.4 |
3128 | +import Ubuntu.Components 1.2 |
3129 | |
3130 | Item { |
3131 | property real minFade: 0.2 |
3132 | |
3133 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml' |
3134 | --- modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml 2014-04-23 08:50:20 +0000 |
3135 | +++ modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml 2015-03-03 15:01:13 +0000 |
3136 | @@ -14,8 +14,8 @@ |
3137 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3138 | */ |
3139 | |
3140 | -import QtQuick 2.0 |
3141 | -import Ubuntu.Components 1.1 |
3142 | +import QtQuick 2.4 |
3143 | +import Ubuntu.Components 1.2 |
3144 | import Ubuntu.Components.ListItems 1.0 |
3145 | |
3146 | Item { |
3147 | |
3148 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml' |
3149 | --- modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml 2014-07-16 06:31:50 +0000 |
3150 | +++ modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml 2015-03-03 15:01:13 +0000 |
3151 | @@ -14,7 +14,7 @@ |
3152 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3153 | */ |
3154 | |
3155 | -import QtQuick 2.0 |
3156 | +import QtQuick 2.4 |
3157 | |
3158 | BubbleShape { |
3159 | property alias contentItem: content |
3160 | |
3161 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml' |
3162 | --- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml 2015-02-27 13:47:29 +0000 |
3163 | +++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml 2015-03-03 15:01:13 +0000 |
3164 | @@ -14,8 +14,8 @@ |
3165 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3166 | */ |
3167 | |
3168 | -import QtQuick 2.0 |
3169 | -import Ubuntu.Components 1.1 |
3170 | +import QtQuick 2.4 |
3171 | +import Ubuntu.Components 1.2 |
3172 | |
3173 | Item { |
3174 | id: progressBarStyle |
3175 | |
3176 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml' |
3177 | --- modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml 2014-04-23 08:50:20 +0000 |
3178 | +++ modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml 2015-03-03 15:01:13 +0000 |
3179 | @@ -14,8 +14,8 @@ |
3180 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3181 | */ |
3182 | |
3183 | -import QtQuick 2.0 |
3184 | -import Ubuntu.Components 1.1 |
3185 | +import QtQuick 2.4 |
3186 | +import Ubuntu.Components 1.2 |
3187 | |
3188 | Item { |
3189 | id: progressionVisualStyle |
3190 | |
3191 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml' |
3192 | --- modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml 2014-06-26 15:59:10 +0000 |
3193 | +++ modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml 2015-03-03 15:01:13 +0000 |
3194 | @@ -14,9 +14,9 @@ |
3195 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3196 | */ |
3197 | |
3198 | -import QtQuick 2.2 |
3199 | -import Ubuntu.Components 1.1 |
3200 | -import Ubuntu.Components.Styles 1.1 as Style |
3201 | +import QtQuick 2.4 |
3202 | +import Ubuntu.Components 1.2 |
3203 | +import Ubuntu.Components.Styles 1.2 as Style |
3204 | |
3205 | Style.PullToRefreshStyle { |
3206 | id: style |
3207 | |
3208 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml' |
3209 | --- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml 2014-05-26 09:08:27 +0000 |
3210 | +++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml 2015-03-03 15:01:13 +0000 |
3211 | @@ -14,8 +14,8 @@ |
3212 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3213 | */ |
3214 | |
3215 | -import QtQuick 2.0 |
3216 | -import Ubuntu.Components 1.1 |
3217 | +import QtQuick 2.4 |
3218 | +import Ubuntu.Components 1.2 |
3219 | |
3220 | /* |
3221 | The visuals handle both active and passive modes. This behavior is driven yet by |
3222 | |
3223 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml' |
3224 | --- modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml 2014-04-23 08:50:20 +0000 |
3225 | +++ modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml 2015-03-03 15:01:13 +0000 |
3226 | @@ -14,8 +14,8 @@ |
3227 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3228 | */ |
3229 | |
3230 | -import QtQuick 2.0 |
3231 | -import Ubuntu.Components 1.1 |
3232 | +import QtQuick 2.4 |
3233 | +import Ubuntu.Components 1.2 |
3234 | |
3235 | EditorCursorStyle { |
3236 | id: cursor |
3237 | |
3238 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml' |
3239 | --- modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml 2014-09-02 13:17:59 +0000 |
3240 | +++ modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml 2015-03-03 15:01:13 +0000 |
3241 | @@ -14,8 +14,8 @@ |
3242 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3243 | */ |
3244 | |
3245 | -import QtQuick 2.0 |
3246 | -import Ubuntu.Components 1.1 |
3247 | +import QtQuick 2.4 |
3248 | +import Ubuntu.Components 1.2 |
3249 | |
3250 | Item { |
3251 | id: visuals |
3252 | |
3253 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml' |
3254 | --- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml 2014-10-23 19:57:31 +0000 |
3255 | +++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml 2015-03-03 15:01:13 +0000 |
3256 | @@ -14,8 +14,8 @@ |
3257 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3258 | */ |
3259 | |
3260 | -import QtQuick 2.0 |
3261 | -import Ubuntu.Components 1.1 |
3262 | +import QtQuick 2.4 |
3263 | +import Ubuntu.Components 1.2 |
3264 | |
3265 | /* |
3266 | The default slider style consists of a bar and a thumb shape. |
3267 | |
3268 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml' |
3269 | --- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml 2014-11-06 21:04:13 +0000 |
3270 | +++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml 2015-03-03 15:01:13 +0000 |
3271 | @@ -14,8 +14,8 @@ |
3272 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3273 | */ |
3274 | |
3275 | -import QtQuick 2.0 |
3276 | -import Ubuntu.Components 1.1 |
3277 | +import QtQuick 2.4 |
3278 | +import Ubuntu.Components 1.2 |
3279 | |
3280 | Item { |
3281 | id: switchStyle |
3282 | |
3283 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml' |
3284 | --- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml 2014-05-15 11:36:07 +0000 |
3285 | +++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml 2015-03-03 15:01:13 +0000 |
3286 | @@ -14,8 +14,8 @@ |
3287 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3288 | */ |
3289 | |
3290 | -import QtQuick 2.0 |
3291 | -import Ubuntu.Components 1.1 |
3292 | +import QtQuick 2.4 |
3293 | +import Ubuntu.Components 1.2 |
3294 | |
3295 | Item { |
3296 | id: tabBarStyle |
3297 | |
3298 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml' |
3299 | --- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml 2014-12-03 15:46:20 +0000 |
3300 | +++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml 2015-03-03 15:01:13 +0000 |
3301 | @@ -14,8 +14,8 @@ |
3302 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3303 | */ |
3304 | |
3305 | -import QtQuick 2.0 |
3306 | -import Ubuntu.Components 1.1 |
3307 | +import QtQuick 2.4 |
3308 | +import Ubuntu.Components 1.2 |
3309 | |
3310 | // frame |
3311 | // FIXME: stabilize API |
3312 | |
3313 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml' |
3314 | --- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml 2014-11-12 03:51:45 +0000 |
3315 | +++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml 2015-03-03 15:01:13 +0000 |
3316 | @@ -14,8 +14,8 @@ |
3317 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3318 | */ |
3319 | |
3320 | -import QtQuick 2.0 |
3321 | -import Ubuntu.Components 1.1 |
3322 | +import QtQuick 2.4 |
3323 | +import Ubuntu.Components 1.2 |
3324 | |
3325 | // FIXME : move the API into Ubuntu.Components.Style |
3326 | Item { |
3327 | |
3328 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml' |
3329 | --- modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml 2014-04-30 07:10:06 +0000 |
3330 | +++ modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml 2015-03-03 15:01:13 +0000 |
3331 | @@ -14,7 +14,7 @@ |
3332 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3333 | */ |
3334 | |
3335 | -import QtQuick 2.0 |
3336 | +import QtQuick 2.4 |
3337 | |
3338 | TextAreaStyle { |
3339 | objectName: "textfield_style" |
3340 | |
3341 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml' |
3342 | --- modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml 2014-08-11 12:44:43 +0000 |
3343 | +++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml 2015-03-03 15:01:13 +0000 |
3344 | @@ -14,8 +14,8 @@ |
3345 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3346 | */ |
3347 | |
3348 | -import QtQuick 2.0 |
3349 | -import Ubuntu.Components 1.1 |
3350 | +import QtQuick 2.4 |
3351 | +import Ubuntu.Components 1.2 |
3352 | |
3353 | Item { |
3354 | id: visuals |
3355 | |
3356 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml' |
3357 | --- modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml 2014-04-23 08:50:20 +0000 |
3358 | +++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml 2015-03-03 15:01:13 +0000 |
3359 | @@ -13,8 +13,8 @@ |
3360 | * You should have received a copy of the GNU Lesser General Public License |
3361 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3362 | */ |
3363 | -import QtQuick 2.0 |
3364 | -import Ubuntu.Components 1.1 |
3365 | +import QtQuick 2.4 |
3366 | +import Ubuntu.Components 1.2 |
3367 | |
3368 | Item { |
3369 | id: visuals |
3370 | |
3371 | === modified file 'modules/Ubuntu/Components/Themes/Palette.qml' |
3372 | --- modules/Ubuntu/Components/Themes/Palette.qml 2013-07-05 00:02:08 +0000 |
3373 | +++ modules/Ubuntu/Components/Themes/Palette.qml 2015-03-03 15:01:13 +0000 |
3374 | @@ -14,7 +14,7 @@ |
3375 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3376 | */ |
3377 | |
3378 | -import QtQuick 2.0 |
3379 | +import QtQuick 2.4 |
3380 | |
3381 | /*! |
3382 | \qmltype Palette |
3383 | |
3384 | === modified file 'modules/Ubuntu/Components/Themes/PaletteValues.qml' |
3385 | --- modules/Ubuntu/Components/Themes/PaletteValues.qml 2014-07-11 15:11:02 +0000 |
3386 | +++ modules/Ubuntu/Components/Themes/PaletteValues.qml 2015-03-03 15:01:13 +0000 |
3387 | @@ -14,7 +14,7 @@ |
3388 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3389 | */ |
3390 | |
3391 | -import QtQuick 2.0 |
3392 | +import QtQuick 2.4 |
3393 | |
3394 | /*! |
3395 | \qmltype PaletteValues |
3396 | |
3397 | === modified file 'modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml' |
3398 | --- modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml 2013-07-05 14:34:00 +0000 |
3399 | +++ modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml 2015-03-03 15:01:13 +0000 |
3400 | @@ -14,7 +14,7 @@ |
3401 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3402 | */ |
3403 | |
3404 | -import QtQuick 2.0 |
3405 | +import QtQuick 2.4 |
3406 | import Ubuntu.Components.Themes.Ambiance 0.1 |
3407 | |
3408 | MainViewStyle { |
3409 | |
3410 | === modified file 'modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml' |
3411 | --- modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml 2013-08-28 10:43:46 +0000 |
3412 | +++ modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml 2015-03-03 15:01:13 +0000 |
3413 | @@ -15,7 +15,7 @@ |
3414 | * |
3415 | */ |
3416 | |
3417 | -import QtQuick 2.0 |
3418 | +import QtQuick 2.4 |
3419 | import Ubuntu.Components.Themes.Ambiance 0.1 |
3420 | |
3421 | OptionSelectorStyle { |
3422 | |
3423 | === modified file 'modules/Ubuntu/Components/Themes/SuruDark/Palette.qml' |
3424 | --- modules/Ubuntu/Components/Themes/SuruDark/Palette.qml 2014-08-25 07:35:49 +0000 |
3425 | +++ modules/Ubuntu/Components/Themes/SuruDark/Palette.qml 2015-03-03 15:01:13 +0000 |
3426 | @@ -14,8 +14,8 @@ |
3427 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3428 | */ |
3429 | |
3430 | -import QtQuick 2.0 |
3431 | -import Ubuntu.Components 1.1 |
3432 | +import QtQuick 2.4 |
3433 | +import Ubuntu.Components 1.2 |
3434 | import Ubuntu.Components.Themes 0.1 |
3435 | |
3436 | Palette { |
3437 | |
3438 | === modified file 'modules/Ubuntu/Components/Themes/SuruDark/TabBarStyle.qml' |
3439 | --- modules/Ubuntu/Components/Themes/SuruDark/TabBarStyle.qml 2013-10-11 12:25:47 +0000 |
3440 | +++ modules/Ubuntu/Components/Themes/SuruDark/TabBarStyle.qml 2015-03-03 15:01:13 +0000 |
3441 | @@ -14,7 +14,7 @@ |
3442 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3443 | */ |
3444 | |
3445 | -import QtQuick 2.0 |
3446 | +import QtQuick 2.4 |
3447 | import Ubuntu.Components.Themes.Ambiance 0.1 as Ambiance |
3448 | |
3449 | Ambiance.TabBarStyle { |
3450 | |
3451 | === modified file 'modules/Ubuntu/Components/Themes/SuruGradient/MainViewStyle.qml' |
3452 | --- modules/Ubuntu/Components/Themes/SuruGradient/MainViewStyle.qml 2013-07-10 19:25:32 +0000 |
3453 | +++ modules/Ubuntu/Components/Themes/SuruGradient/MainViewStyle.qml 2015-03-03 15:01:13 +0000 |
3454 | @@ -14,7 +14,7 @@ |
3455 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3456 | */ |
3457 | |
3458 | -import QtQuick 2.0 |
3459 | +import QtQuick 2.4 |
3460 | import Ubuntu.Components.Themes.Ambiance 0.1 |
3461 | |
3462 | MainViewStyle { |
3463 | |
3464 | === modified file 'modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml' |
3465 | --- modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml 2014-08-26 14:12:52 +0000 |
3466 | +++ modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml 2015-03-03 15:01:13 +0000 |
3467 | @@ -15,7 +15,7 @@ |
3468 | * |
3469 | */ |
3470 | |
3471 | -import QtQuick 2.0 |
3472 | +import QtQuick 2.4 |
3473 | import Ubuntu.Components.Themes.Ambiance 0.1 |
3474 | |
3475 | OptionSelectorStyle { |
3476 | |
3477 | === modified file 'modules/Ubuntu/Components/Themes/SuruGradient/Palette.qml' |
3478 | --- modules/Ubuntu/Components/Themes/SuruGradient/Palette.qml 2014-08-25 07:35:49 +0000 |
3479 | +++ modules/Ubuntu/Components/Themes/SuruGradient/Palette.qml 2015-03-03 15:01:13 +0000 |
3480 | @@ -14,7 +14,7 @@ |
3481 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3482 | */ |
3483 | |
3484 | -import QtQuick 2.0 |
3485 | +import QtQuick 2.4 |
3486 | import Ubuntu.Components.Themes 0.1 |
3487 | |
3488 | Palette { |
3489 | |
3490 | === modified file 'modules/Ubuntu/Components/Themes/SuruGradient/TabBarStyle.qml' |
3491 | --- modules/Ubuntu/Components/Themes/SuruGradient/TabBarStyle.qml 2013-10-11 12:25:47 +0000 |
3492 | +++ modules/Ubuntu/Components/Themes/SuruGradient/TabBarStyle.qml 2015-03-03 15:01:13 +0000 |
3493 | @@ -14,7 +14,7 @@ |
3494 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3495 | */ |
3496 | |
3497 | -import QtQuick 2.0 |
3498 | +import QtQuick 2.4 |
3499 | import Ubuntu.Components.Themes.Ambiance 0.1 as Ambiance |
3500 | |
3501 | Ambiance.TabBarStyle { |
3502 | |
3503 | === modified file 'modules/Ubuntu/Components/Toolbar.qml' |
3504 | --- modules/Ubuntu/Components/Toolbar.qml 2014-11-18 12:02:55 +0000 |
3505 | +++ modules/Ubuntu/Components/Toolbar.qml 2015-03-03 15:01:13 +0000 |
3506 | @@ -14,7 +14,7 @@ |
3507 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3508 | */ |
3509 | |
3510 | -import QtQuick 2.0 |
3511 | +import QtQuick 2.4 |
3512 | |
3513 | /*! |
3514 | \internal |
3515 | |
3516 | === modified file 'modules/Ubuntu/Components/ToolbarButton.qml' |
3517 | --- modules/Ubuntu/Components/ToolbarButton.qml 2014-04-23 08:50:20 +0000 |
3518 | +++ modules/Ubuntu/Components/ToolbarButton.qml 2015-03-03 15:01:13 +0000 |
3519 | @@ -14,7 +14,7 @@ |
3520 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3521 | */ |
3522 | |
3523 | -import QtQuick 2.0 |
3524 | +import QtQuick 2.4 |
3525 | |
3526 | /*! |
3527 | \qmltype ToolbarButton |
3528 | @@ -27,8 +27,8 @@ |
3529 | |
3530 | Example of different ways to define the toolbar button: |
3531 | \qml |
3532 | - import QtQuick 2.0 |
3533 | - import Ubuntu.Components 1.1 |
3534 | + import QtQuick 2.4 |
3535 | + import Ubuntu.Components 1.2 |
3536 | |
3537 | MainView { |
3538 | width: units.gu(50) |
3539 | |
3540 | === modified file 'modules/Ubuntu/Components/ToolbarItems.qml' |
3541 | --- modules/Ubuntu/Components/ToolbarItems.qml 2014-11-13 15:33:22 +0000 |
3542 | +++ modules/Ubuntu/Components/ToolbarItems.qml 2015-03-03 15:01:13 +0000 |
3543 | @@ -14,7 +14,7 @@ |
3544 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3545 | */ |
3546 | |
3547 | -import QtQuick 2.0 |
3548 | +import QtQuick 2.4 |
3549 | |
3550 | /*! |
3551 | \qmltype ToolbarItems |
3552 | @@ -40,8 +40,8 @@ |
3553 | It is recommended to use \l ToolbarButton inside the ToolbarItems to define the buttons that will |
3554 | be visible to the user: |
3555 | \qml |
3556 | - import QtQuick 2.0 |
3557 | - import Ubuntu.Components 1.1 |
3558 | + import QtQuick 2.4 |
3559 | + import Ubuntu.Components 1.2 |
3560 | |
3561 | MainView { |
3562 | width: units.gu(50) |
3563 | @@ -72,8 +72,8 @@ |
3564 | ToolbarButtons and other Items (for example standard Buttons). ToolbarButtons automatically span |
3565 | the full height of the toolbar, and other Items you will probably want to center vertically: |
3566 | \qml |
3567 | - import QtQuick 2.0 |
3568 | - import Ubuntu.Components 1.1 |
3569 | + import QtQuick 2.4 |
3570 | + import Ubuntu.Components 1.2 |
3571 | |
3572 | MainView { |
3573 | width: units.gu(50) |
3574 | @@ -121,8 +121,8 @@ |
3575 | The following example shows how to have a classic cancel button that is always |
3576 | visible in the toolbar, instead of the default toolbar-styled back button: |
3577 | \qml |
3578 | - import QtQuick 2.0 |
3579 | - import Ubuntu.Components 1.1 |
3580 | + import QtQuick 2.4 |
3581 | + import Ubuntu.Components 1.2 |
3582 | |
3583 | MainView { |
3584 | width: units.gu(50) |
3585 | |
3586 | === modified file 'modules/Ubuntu/Components/UbuntuListView.qml' |
3587 | --- modules/Ubuntu/Components/UbuntuListView.qml 2015-02-25 14:14:05 +0000 |
3588 | +++ modules/Ubuntu/Components/UbuntuListView.qml 2015-03-03 15:01:13 +0000 |
3589 | @@ -14,8 +14,8 @@ |
3590 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3591 | */ |
3592 | |
3593 | -import QtQuick 2.0 |
3594 | -import Ubuntu.Components 1.1 as Toolkit |
3595 | +import QtQuick 2.4 |
3596 | +import Ubuntu.Components 1.2 as Toolkit |
3597 | |
3598 | /*! |
3599 | \qmltype UbuntuListView |
3600 | @@ -30,7 +30,7 @@ |
3601 | |
3602 | Examples: |
3603 | \qml |
3604 | - import Ubuntu.Components 1.1 |
3605 | + import Ubuntu.Components 1.2 |
3606 | import Ubuntu.Components.ListItems 1.0 as ListItem |
3607 | |
3608 | Item { |
3609 | |
3610 | === modified file 'modules/Ubuntu/Components/UbuntuListView11.qdoc' |
3611 | --- modules/Ubuntu/Components/UbuntuListView11.qdoc 2014-09-16 15:37:56 +0000 |
3612 | +++ modules/Ubuntu/Components/UbuntuListView11.qdoc 2015-03-03 15:01:13 +0000 |
3613 | @@ -7,8 +7,8 @@ |
3614 | by default. |
3615 | |
3616 | \qml |
3617 | - import QtQuick 2.2 |
3618 | - import Ubuntu.Components 1.1 |
3619 | + import QtQuick 2.4 |
3620 | + import Ubuntu.Components 1.2 |
3621 | import Ubuntu.Components.ListItems 1.0 |
3622 | |
3623 | UbuntuListView { |
3624 | |
3625 | === modified file 'modules/Ubuntu/Components/UbuntuListView11.qml' |
3626 | --- modules/Ubuntu/Components/UbuntuListView11.qml 2014-09-16 15:37:56 +0000 |
3627 | +++ modules/Ubuntu/Components/UbuntuListView11.qml 2015-03-03 15:01:13 +0000 |
3628 | @@ -14,7 +14,7 @@ |
3629 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3630 | */ |
3631 | |
3632 | -import QtQuick 2.2 |
3633 | +import QtQuick 2.4 |
3634 | |
3635 | // documentation in UbuntuListView11.qdoc |
3636 | UbuntuListView { |
3637 | |
3638 | === modified file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml' |
3639 | --- modules/Ubuntu/Components/UbuntuNumberAnimation.qml 2014-09-08 19:47:11 +0000 |
3640 | +++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml 2015-03-03 15:01:13 +0000 |
3641 | @@ -15,8 +15,8 @@ |
3642 | * |
3643 | */ |
3644 | |
3645 | -import QtQuick 2.0 |
3646 | -import Ubuntu.Components 1.0 |
3647 | +import QtQuick 2.4 |
3648 | +import Ubuntu.Components 1.2 |
3649 | |
3650 | /*! |
3651 | \qmltype UbuntuNumberAnimation |
3652 | @@ -28,8 +28,8 @@ |
3653 | Example of use: |
3654 | |
3655 | \qml |
3656 | - import QtQuick 2.0 |
3657 | - import Ubuntu.Components 1.1 |
3658 | + import QtQuick 2.4 |
3659 | + import Ubuntu.Components 1.2 |
3660 | |
3661 | Rectangle { |
3662 | width: 100; height: 100 |
3663 | |
3664 | === modified file 'modules/Ubuntu/Components/plugin/i18n.cpp' |
3665 | --- modules/Ubuntu/Components/plugin/i18n.cpp 2015-02-03 18:11:32 +0000 |
3666 | +++ modules/Ubuntu/Components/plugin/i18n.cpp 2015-03-03 15:01:13 +0000 |
3667 | @@ -39,7 +39,7 @@ |
3668 | * It is based on \l {https://www.gnu.org/software/gettext/} {gettext}, and thus the standard gettext tools can be used for translating |
3669 | * a project. Example: |
3670 | * \qml |
3671 | - * import QtQuick 2.0 |
3672 | + * import QtQuick 2.4 |
3673 | * import Ubunut.Components 0.1 |
3674 | * |
3675 | * Item { |
3676 | @@ -220,7 +220,7 @@ |
3677 | * to take the original string and pass it to dtr (or dgettext). |
3678 | * |
3679 | * \qml |
3680 | - * import QtQuick 2.0 |
3681 | + * import QtQuick 2.4 |
3682 | * import UserMetrics 0.1 |
3683 | * |
3684 | * Metric { |
3685 | |
3686 | === modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp' |
3687 | --- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp 2014-06-18 15:24:42 +0000 |
3688 | +++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp 2015-03-03 15:01:13 +0000 |
3689 | @@ -32,8 +32,8 @@ |
3690 | |
3691 | Popup.qml |
3692 | \qml |
3693 | - import QtQuick 2.0 |
3694 | - import Ubuntu.Components 1.1 |
3695 | + import QtQuick 2.4 |
3696 | + import Ubuntu.Components 1.2 |
3697 | |
3698 | Rectangle { |
3699 | anchors.centerIn: parent |
3700 | @@ -52,8 +52,8 @@ |
3701 | closing and destroying the popup. |
3702 | |
3703 | \qml |
3704 | - import QtQuick 2.0 |
3705 | - import Ubuntu.Components 1.1 |
3706 | + import QtQuick 2.4 |
3707 | + import Ubuntu.Components 1.2 |
3708 | |
3709 | Item { |
3710 | width: 640 |
3711 | @@ -76,8 +76,8 @@ |
3712 | however altered to a different area by setting the \l sensingArea property to |
3713 | a component which is either a parent of the mouse area or a sibling of it. |
3714 | \qml |
3715 | - import QtQuick 2.0 |
3716 | - import Ubuntu.Components 1.1 |
3717 | + import QtQuick 2.4 |
3718 | + import Ubuntu.Components 1.2 |
3719 | |
3720 | Item { |
3721 | width: units.gu(40) |
3722 | |
3723 | === modified file 'modules/Ubuntu/Components/plugin/plugin.cpp' |
3724 | --- modules/Ubuntu/Components/plugin/plugin.cpp 2015-02-27 13:47:29 +0000 |
3725 | +++ modules/Ubuntu/Components/plugin/plugin.cpp 2015-03-03 15:01:13 +0000 |
3726 | @@ -57,6 +57,7 @@ |
3727 | #include "uclistitemactions.h" |
3728 | #include "uclistitemstyle.h" |
3729 | #include "ucserviceproperties.h" |
3730 | +#include "ucnamespace.h" |
3731 | |
3732 | #include <sys/types.h> |
3733 | #include <unistd.h> |
3734 | @@ -95,6 +96,14 @@ |
3735 | return uriHandler; |
3736 | } |
3737 | |
3738 | +static QObject *registerUbuntuNamespace(QQmlEngine *engine, QJSEngine *scriptEngine) |
3739 | +{ |
3740 | + Q_UNUSED(engine) |
3741 | + Q_UNUSED(scriptEngine) |
3742 | + |
3743 | + return new UCNamespace(); |
3744 | +} |
3745 | + |
3746 | void UbuntuComponentsPlugin::registerWindowContextProperty() |
3747 | { |
3748 | setWindowContextProperty(QGuiApplication::focusWindow()); |
3749 | @@ -176,6 +185,7 @@ |
3750 | qmlRegisterUncreatableType<UCDragEvent>(uri, 1, 2, "ListItemDrag", "This is an event object"); |
3751 | qmlRegisterType<UCListItemActions>(uri, 1, 2, "ListItemActions"); |
3752 | qmlRegisterUncreatableType<UCViewItemsAttached>(uri, 1, 2, "ViewItems", "Not instantiable"); |
3753 | + qmlRegisterSingletonType<UCNamespace>(uri, 1, 2, "Ubuntu", registerUbuntuNamespace); |
3754 | qmlRegisterType<UCUbuntuShape, 1>(uri, 1, 2, "UbuntuShape"); |
3755 | } |
3756 | |
3757 | |
3758 | === modified file 'modules/Ubuntu/Components/plugin/plugin.pro' |
3759 | --- modules/Ubuntu/Components/plugin/plugin.pro 2015-02-27 13:47:29 +0000 |
3760 | +++ modules/Ubuntu/Components/plugin/plugin.pro 2015-03-03 15:01:13 +0000 |
3761 | @@ -77,7 +77,8 @@ |
3762 | ucserviceproperties.h \ |
3763 | ucserviceproperties_p.h \ |
3764 | privates/listitemdragarea.h \ |
3765 | - privates/listitemdraghandler.h |
3766 | + privates/listitemdraghandler.h \ |
3767 | + ucnamespace.h |
3768 | |
3769 | SOURCES += plugin.cpp \ |
3770 | uctheme.cpp \ |
3771 | @@ -122,7 +123,8 @@ |
3772 | ucviewitemsattached.cpp \ |
3773 | ucserviceproperties.cpp \ |
3774 | privates/listitemdragarea.cpp \ |
3775 | - privates/listitemdraghandler.cpp |
3776 | + privates/listitemdraghandler.cpp \ |
3777 | + ucnamespace.cpp |
3778 | |
3779 | # adapters |
3780 | SOURCES += adapters/alarmsadapter_organizer.cpp |
3781 | |
3782 | === modified file 'modules/Ubuntu/Components/plugin/sortfiltermodel.cpp' |
3783 | --- modules/Ubuntu/Components/plugin/sortfiltermodel.cpp 2014-11-28 12:40:09 +0000 |
3784 | +++ modules/Ubuntu/Components/plugin/sortfiltermodel.cpp 2015-03-03 15:01:13 +0000 |
3785 | @@ -35,8 +35,8 @@ |
3786 | * |
3787 | * Example usage: |
3788 | * \qml |
3789 | - * import QtQuick 2.0 |
3790 | - * import Ubuntu.Components 1.1 |
3791 | + * import QtQuick 2.4 |
3792 | + * import Ubuntu.Components 1.2 |
3793 | * import Ubuntu.Components.ListItems 1.1 |
3794 | * |
3795 | * MainView { |
3796 | |
3797 | === modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp' |
3798 | --- modules/Ubuntu/Components/plugin/ucalarm.cpp 2015-02-26 15:09:23 +0000 |
3799 | +++ modules/Ubuntu/Components/plugin/ucalarm.cpp 2015-03-03 15:01:13 +0000 |
3800 | @@ -224,8 +224,8 @@ |
3801 | * |
3802 | * Example usage: |
3803 | * \qml |
3804 | - * import QtQuick 2.0 |
3805 | - * import Ubuntu.Components 1.1 |
3806 | + * import QtQuick 2.4 |
3807 | + * import Ubuntu.Components 1.2 |
3808 | * |
3809 | * Rectangle { |
3810 | * width: units.gu(40) |
3811 | |
3812 | === modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.cpp' |
3813 | --- modules/Ubuntu/Components/plugin/ucalarmmodel.cpp 2015-02-26 15:09:23 +0000 |
3814 | +++ modules/Ubuntu/Components/plugin/ucalarmmodel.cpp 2015-03-03 15:01:13 +0000 |
3815 | @@ -39,8 +39,8 @@ |
3816 | * |
3817 | * Example usage: |
3818 | * \qml |
3819 | - * import QtQuick 2.0 |
3820 | - * import Ubuntu.Components 1.1 |
3821 | + * import QtQuick 2.4 |
3822 | + * import Ubuntu.Components 1.2 |
3823 | * import Ubuntu.Components.ListItems 1.0 |
3824 | * ListView { |
3825 | * model: AlarmModel {} |
3826 | |
3827 | === modified file 'modules/Ubuntu/Components/plugin/ucfontutils.cpp' |
3828 | --- modules/Ubuntu/Components/plugin/ucfontutils.cpp 2014-07-21 13:43:02 +0000 |
3829 | +++ modules/Ubuntu/Components/plugin/ucfontutils.cpp 2015-03-03 15:01:13 +0000 |
3830 | @@ -33,8 +33,8 @@ |
3831 | * Example of a Label implementation which uses the default base scale for the font |
3832 | * size: |
3833 | * \qml |
3834 | - * import QtQuick 2.0 |
3835 | - * import Ubuntu.Components 1.1 |
3836 | + * import QtQuick 2.4 |
3837 | + * import Ubuntu.Components 1.2 |
3838 | * |
3839 | * Text { |
3840 | * property string fontSize: "medium" |
3841 | @@ -45,8 +45,8 @@ |
3842 | * Another example of a custom text input component exposing a fontSize property and a base |
3843 | * font unit size to scale its font: |
3844 | * \qml |
3845 | - * import QtQuick 2.0 |
3846 | - * import Ubuntu.Components 1.1 |
3847 | + * import QtQuick 2.4 |
3848 | + * import Ubuntu.Components 1.2 |
3849 | * |
3850 | * TextInput { |
3851 | * property string fontSize: "small" |
3852 | |
3853 | === modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp' |
3854 | --- modules/Ubuntu/Components/plugin/uclistitem.cpp 2015-02-25 16:07:56 +0000 |
3855 | +++ modules/Ubuntu/Components/plugin/uclistitem.cpp 2015-03-03 15:01:13 +0000 |
3856 | @@ -618,7 +618,7 @@ |
3857 | * \qmltype ListItem |
3858 | * \instantiates UCListItem |
3859 | * \inqmlmodule Ubuntu.Components 1.2 |
3860 | - * \ingroup unstable-ubuntu-listitems |
3861 | + * \ingroup ubuntu-listitem |
3862 | * \since Ubuntu.Components 1.2 |
3863 | * \brief The ListItem element provides Ubuntu design standards for list or grid |
3864 | * views. |
3865 | |
3866 | === modified file 'modules/Ubuntu/Components/plugin/uclistitemactions.cpp' |
3867 | --- modules/Ubuntu/Components/plugin/uclistitemactions.cpp 2015-02-12 07:31:08 +0000 |
3868 | +++ modules/Ubuntu/Components/plugin/uclistitemactions.cpp 2015-03-03 15:01:13 +0000 |
3869 | @@ -40,7 +40,7 @@ |
3870 | * \inherits QtQObject |
3871 | * \inqmlmodule Ubuntu.Components 1.2 |
3872 | * \since Ubuntu.Components 1.2 |
3873 | - * \ingroup unstable-ubuntu-listitems |
3874 | + * \ingroup ubuntu-listitem |
3875 | * \brief Provides configuration for actions to be added to a ListItem. |
3876 | * |
3877 | * ListItem accepts actions that can be configured to appear when swiped to left |
3878 | @@ -62,7 +62,7 @@ |
3879 | * The examples below illustrate the worst and best practice when used in a ListView. |
3880 | * The worst case: |
3881 | * \qml |
3882 | - * import QtQuick 2.2 |
3883 | + * import QtQuick 2.4 |
3884 | * import Ubuntu.Components 1.2 |
3885 | * MainView { |
3886 | * width: units.gu(40) |
3887 | @@ -99,7 +99,7 @@ |
3888 | * |
3889 | * This example can be optimized by sharing the action arrays between the items: |
3890 | * \qml |
3891 | - * import QtQuick 2.2 |
3892 | + * import QtQuick 2.4 |
3893 | * import Ubuntu.Components 1.2 |
3894 | * MainView { |
3895 | * width: units.gu(40) |
3896 | @@ -177,7 +177,7 @@ |
3897 | * be specified which will be clamped between height and the maximum width of the |
3898 | * list item divided by the number of actions in the list. |
3899 | * \qml |
3900 | - * import QtQuick 2.2 |
3901 | + * import QtQuick 2.4 |
3902 | * import Ubuntu.Components 1.2 |
3903 | * |
3904 | * MainView { |
3905 | |
3906 | === modified file 'modules/Ubuntu/Components/plugin/ucmousefilters.cpp' |
3907 | --- modules/Ubuntu/Components/plugin/ucmousefilters.cpp 2014-11-12 03:51:45 +0000 |
3908 | +++ modules/Ubuntu/Components/plugin/ucmousefilters.cpp 2015-03-03 15:01:13 +0000 |
3909 | @@ -71,7 +71,7 @@ |
3910 | MouseArea will no longer receive other mouse events. |
3911 | |
3912 | \qml |
3913 | - import QtQuick 2.0 |
3914 | + import QtQuick 2.4 |
3915 | |
3916 | TextInput { |
3917 | width: 100 |
3918 | @@ -96,8 +96,8 @@ |
3919 | The previous code sample using Mouse filter, which will print the pressed and |
3920 | released mouse buttons would look as follows: |
3921 | \qml |
3922 | - import QtQuick 2.0 |
3923 | - import Ubuntu.Components 1.1 |
3924 | + import QtQuick 2.4 |
3925 | + import Ubuntu.Components 1.2 |
3926 | |
3927 | TextInput { |
3928 | width: 100 |
3929 | @@ -118,8 +118,8 @@ |
3930 | |
3931 | Example of handling right button clicks over a TextInput: |
3932 | \qml |
3933 | - import QtQuick 2.0 |
3934 | - import Ubuntu.Components 1.1 |
3935 | + import QtQuick 2.4 |
3936 | + import Ubuntu.Components 1.2 |
3937 | |
3938 | TextInput { |
3939 | width: 100 |
3940 | @@ -140,8 +140,8 @@ |
3941 | add new functionality to the primitive. |
3942 | |
3943 | \qml |
3944 | - import QtQuick 2.0 |
3945 | - import Ubuntu.Components 1.1 |
3946 | + import QtQuick 2.4 |
3947 | + import Ubuntu.Components 1.2 |
3948 | |
3949 | TextInput { |
3950 | width: 100 |
3951 | @@ -200,8 +200,8 @@ |
3952 | to the items in the list. In the following example the mouse press in red rectangle |
3953 | will be printed as well as the proxied mouse press from the main item. |
3954 | \qml |
3955 | - import QtQuick 2.0 |
3956 | - import Ubuntu.Components 1.1 |
3957 | + import QtQuick 2.4 |
3958 | + import Ubuntu.Components 1.2 |
3959 | |
3960 | Item { |
3961 | id: main |
3962 | @@ -253,8 +253,8 @@ |
3963 | is only valid to press and release events, double-click or mouse position change |
3964 | will be blocked by the MouseArea still. |
3965 | \qml |
3966 | - import QtQuick 2.0 |
3967 | - import Ubuntu.Components 1.1 |
3968 | + import QtQuick 2.4 |
3969 | + import Ubuntu.Components 1.2 |
3970 | |
3971 | MouseArea { |
3972 | id: topArea |
3973 | @@ -288,8 +288,8 @@ |
3974 | can be controlled through the \l priority property. In the following example |
3975 | we make sure the TextInput always receives the events before the filter: |
3976 | \qml |
3977 | - import QtQuick 2.0 |
3978 | - import Ubuntu.Components 1.1 |
3979 | + import QtQuick 2.4 |
3980 | + import Ubuntu.Components 1.2 |
3981 | |
3982 | TextInput { |
3983 | id: input |
3984 | @@ -315,8 +315,8 @@ |
3985 | are emitted during a mouse move. |
3986 | |
3987 | \qml |
3988 | - import QtQuick 2.0 |
3989 | - import Ubuntu.Components 1.1 |
3990 | + import QtQuick 2.4 |
3991 | + import Ubuntu.Components 1.2 |
3992 | |
3993 | TextInput { |
3994 | width: units.gu(40) |
3995 | |
3996 | === added file 'modules/Ubuntu/Components/plugin/ucnamespace.cpp' |
3997 | --- modules/Ubuntu/Components/plugin/ucnamespace.cpp 1970-01-01 00:00:00 +0000 |
3998 | +++ modules/Ubuntu/Components/plugin/ucnamespace.cpp 2015-03-03 15:01:13 +0000 |
3999 | @@ -0,0 +1,48 @@ |
4000 | +/* |
4001 | + * Copyright 2015 Canonical Ltd. |
4002 | + * |
4003 | + * This program is free software; you can redistribute it and/or modify |
4004 | + * it under the terms of the GNU Lesser General Public License as published by |
4005 | + * the Free Software Foundation; version 3. |
4006 | + * |
4007 | + * This program is distributed in the hope that it will be useful, |
4008 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
4009 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4010 | + * GNU Lesser General Public License for more details. |
4011 | + * |
4012 | + * You should have received a copy of the GNU Lesser General Public License |
4013 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4014 | + * |
4015 | + */ |
4016 | + |
4017 | +#include "ucnamespace.h" |
4018 | + |
4019 | +/*! |
4020 | + * \qmltype Ubuntu |
4021 | + * \instantiates UCNamespace |
4022 | + * \inqmlmodule Ubuntu.Components 1.2 |
4023 | + * \ingroup ubuntu |
4024 | + * \since Ubuntu.Components 1.2 |
4025 | + * \brief Provides global object with different enums. |
4026 | + * |
4027 | + * \section2 Enums |
4028 | + * |
4029 | + * \section4 CaptionStyle enum |
4030 | + * The enumeration configures the Captions component style. |
4031 | + * \table |
4032 | + * \header |
4033 | + * \li Enum |
4034 | + * \li Description |
4035 | + * \row |
4036 | + * \li TitleCaptionStyle |
4037 | + * \li The Captions labels are configured to represent caption behavior. |
4038 | + * \row |
4039 | + * \li SummaryCaptionStyle |
4040 | + * \li The Captions labels are configured to represent a summary-like description. |
4041 | + * \endtable |
4042 | + */ |
4043 | +UCNamespace::UCNamespace(QObject *parent) : |
4044 | + QObject(parent) |
4045 | +{ |
4046 | +} |
4047 | + |
4048 | |
4049 | === added file 'modules/Ubuntu/Components/plugin/ucnamespace.h' |
4050 | --- modules/Ubuntu/Components/plugin/ucnamespace.h 1970-01-01 00:00:00 +0000 |
4051 | +++ modules/Ubuntu/Components/plugin/ucnamespace.h 2015-03-03 15:01:13 +0000 |
4052 | @@ -0,0 +1,36 @@ |
4053 | +/* |
4054 | + * Copyright 2015 Canonical Ltd. |
4055 | + * |
4056 | + * This program is free software; you can redistribute it and/or modify |
4057 | + * it under the terms of the GNU Lesser General Public License as published by |
4058 | + * the Free Software Foundation; version 3. |
4059 | + * |
4060 | + * This program is distributed in the hope that it will be useful, |
4061 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
4062 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4063 | + * GNU Lesser General Public License for more details. |
4064 | + * |
4065 | + * You should have received a copy of the GNU Lesser General Public License |
4066 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4067 | + * |
4068 | + */ |
4069 | + |
4070 | +#ifndef UCNAMESPACE_H |
4071 | +#define UCNAMESPACE_H |
4072 | + |
4073 | +#include <QObject> |
4074 | + |
4075 | +class UCNamespace : public QObject |
4076 | +{ |
4077 | + Q_OBJECT |
4078 | + Q_ENUMS(CaptionsStyle) |
4079 | +public: |
4080 | + enum CaptionsStyle { |
4081 | + TitleCaptionStyle = 5000, |
4082 | + SummaryCaptionStyle |
4083 | + }; |
4084 | + explicit UCNamespace(QObject *parent = 0); |
4085 | + |
4086 | +}; |
4087 | + |
4088 | +#endif // UCNAMESPACE_H |
4089 | |
4090 | === modified file 'modules/Ubuntu/Components/plugin/ucserviceproperties.cpp' |
4091 | --- modules/Ubuntu/Components/plugin/ucserviceproperties.cpp 2015-02-19 10:00:07 +0000 |
4092 | +++ modules/Ubuntu/Components/plugin/ucserviceproperties.cpp 2015-03-03 15:01:13 +0000 |
4093 | @@ -97,8 +97,8 @@ |
4094 | * those. When enumerating properties, each property will be checked twice, with |
4095 | * the case specified as well as with the first letter capitalized. |
4096 | * \qml |
4097 | - * import QtQuick 2.3 |
4098 | - * import Ubuntu.Components 1.1 |
4099 | + * import QtQuick 2.4 |
4100 | + * import Ubuntu.Components 1.2 |
4101 | * |
4102 | * ServiceProperties { |
4103 | * service: "org.freenode.AccountsService" |
4104 | |
4105 | === modified file 'modules/Ubuntu/Components/plugin/ucstatesaver.cpp' |
4106 | --- modules/Ubuntu/Components/plugin/ucstatesaver.cpp 2014-09-03 16:12:24 +0000 |
4107 | +++ modules/Ubuntu/Components/plugin/ucstatesaver.cpp 2015-03-03 15:01:13 +0000 |
4108 | @@ -160,8 +160,8 @@ |
4109 | * |
4110 | * Example: |
4111 | * \qml |
4112 | - * import QtQuick 2.0 |
4113 | - * import Ubuntu.Components 1.1 |
4114 | + * import QtQuick 2.4 |
4115 | + * import Ubuntu.Components 1.2 |
4116 | * |
4117 | * TextField { |
4118 | * id: input |
4119 | |
4120 | === modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.cpp' |
4121 | --- modules/Ubuntu/Components/plugin/ucstyleditembase.cpp 2014-12-09 07:27:07 +0000 |
4122 | +++ modules/Ubuntu/Components/plugin/ucstyleditembase.cpp 2015-03-03 15:01:13 +0000 |
4123 | @@ -115,8 +115,8 @@ |
4124 | * In the following example the TextField will stay focused when clicked on the |
4125 | * red rectangle. |
4126 | * \qml |
4127 | - * import QtQuick 2.2 |
4128 | - * import Ubuntu.Components 1.1 |
4129 | + * import QtQuick 2.4 |
4130 | + * import Ubuntu.Components 1.2 |
4131 | * |
4132 | * Column { |
4133 | * width: units.gu(50) |
4134 | |
4135 | === modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp' |
4136 | --- modules/Ubuntu/Components/plugin/uctheme.cpp 2014-12-04 07:18:58 +0000 |
4137 | +++ modules/Ubuntu/Components/plugin/uctheme.cpp 2015-03-03 15:01:13 +0000 |
4138 | @@ -50,8 +50,8 @@ |
4139 | Example changing the current theme: |
4140 | |
4141 | \qml |
4142 | - import QtQuick 2.0 |
4143 | - import Ubuntu.Components 1.1 |
4144 | + import QtQuick 2.4 |
4145 | + import Ubuntu.Components 1.2 |
4146 | |
4147 | Item { |
4148 | Button { |
4149 | @@ -63,8 +63,8 @@ |
4150 | Example creating a style component: |
4151 | |
4152 | \qml |
4153 | - import QtQuick 2.0 |
4154 | - import Ubuntu.Components 1.1 |
4155 | + import QtQuick 2.4 |
4156 | + import Ubuntu.Components 1.2 |
4157 | |
4158 | StyledItem { |
4159 | id: myItem |
4160 | |
4161 | === modified file 'modules/Ubuntu/Components/plugin/ucunits.cpp' |
4162 | --- modules/Ubuntu/Components/plugin/ucunits.cpp 2014-04-23 08:50:20 +0000 |
4163 | +++ modules/Ubuntu/Components/plugin/ucunits.cpp 2015-03-03 15:01:13 +0000 |
4164 | @@ -51,8 +51,8 @@ |
4165 | Example usage: |
4166 | |
4167 | \qml |
4168 | - import QtQuick 2.0 |
4169 | - import Ubuntu.Components 1.1 |
4170 | + import QtQuick 2.4 |
4171 | + import Ubuntu.Components 1.2 |
4172 | |
4173 | Item { |
4174 | width: units.gu(2) |
4175 | |
4176 | === modified file 'modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp' |
4177 | --- modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp 2015-02-27 07:17:37 +0000 |
4178 | +++ modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp 2015-03-03 15:01:13 +0000 |
4179 | @@ -33,7 +33,7 @@ |
4180 | /*! |
4181 | * \qmltype ListItemDrag |
4182 | * \inqmlmodule Ubuntu.Components 1.2 |
4183 | - * \ingroup unstable-ubuntu-listitems |
4184 | + * \ingroup ubuntu-listitem |
4185 | * \since Ubuntu.Components 1.2 |
4186 | * \brief Provides information about a ListItem drag event. |
4187 | * |
4188 | @@ -185,7 +185,7 @@ |
4189 | * \qmltype ViewItems |
4190 | * \instantiates UCViewItemsAttached |
4191 | * \inqmlmodule Ubuntu.Components 1.2 |
4192 | - * \ingroup unstable-ubuntu-listitems |
4193 | + * \ingroup ubuntu-listitem |
4194 | * \since Ubuntu.Components 1.2 |
4195 | * \brief A set of properties attached to the ListItem's parent item or ListView. |
4196 | * |
4197 | |
4198 | === modified file 'modules/Ubuntu/Components/qmldir' |
4199 | --- modules/Ubuntu/Components/qmldir 2015-02-18 12:37:47 +0000 |
4200 | +++ modules/Ubuntu/Components/qmldir 2015-03-03 15:01:13 +0000 |
4201 | @@ -110,3 +110,4 @@ |
4202 | |
4203 | #version 1.2 |
4204 | MainView 1.2 MainView12.qml |
4205 | +Captions 1.2 Captions.qml |
4206 | |
4207 | === modified file 'modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp' |
4208 | --- modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp 2014-04-20 19:25:12 +0000 |
4209 | +++ modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp 2015-03-03 15:01:13 +0000 |
4210 | @@ -34,7 +34,7 @@ |
4211 | * |
4212 | * Example: |
4213 | * \qml |
4214 | - * import QtQuick 2.0 |
4215 | + * import QtQuick 2.4 |
4216 | * import Ubuntu.Layouts 0.1 |
4217 | * |
4218 | * Layouts { |
4219 | |
4220 | === modified file 'modules/Ubuntu/PerformanceMetrics/BarGraph.qml' |
4221 | --- modules/Ubuntu/PerformanceMetrics/BarGraph.qml 2014-04-23 08:50:20 +0000 |
4222 | +++ modules/Ubuntu/PerformanceMetrics/BarGraph.qml 2015-03-03 15:01:13 +0000 |
4223 | @@ -14,8 +14,8 @@ |
4224 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4225 | */ |
4226 | |
4227 | -import QtQuick 2.0 |
4228 | -import Ubuntu.Components 1.1 |
4229 | +import QtQuick 2.4 |
4230 | +import Ubuntu.Components 1.2 |
4231 | import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics |
4232 | |
4233 | Item { |
4234 | |
4235 | === modified file 'modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml' |
4236 | --- modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml 2014-04-20 19:25:12 +0000 |
4237 | +++ modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml 2015-03-03 15:01:13 +0000 |
4238 | @@ -14,7 +14,7 @@ |
4239 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4240 | */ |
4241 | |
4242 | -import QtQuick 2.0 |
4243 | +import QtQuick 2.4 |
4244 | import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics |
4245 | |
4246 | /*! |
4247 | |
4248 | === modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml' |
4249 | --- modules/Ubuntu/Test/UbuntuTestCase.qml 2015-02-19 13:00:38 +0000 |
4250 | +++ modules/Ubuntu/Test/UbuntuTestCase.qml 2015-03-03 15:01:13 +0000 |
4251 | @@ -14,9 +14,9 @@ |
4252 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4253 | */ |
4254 | |
4255 | -import QtQuick 2.0 |
4256 | +import QtQuick 2.4 |
4257 | import QtTest 1.0 |
4258 | -import Ubuntu.Components 1.1 |
4259 | +import Ubuntu.Components 1.2 |
4260 | |
4261 | /*! |
4262 | \qmltype UbuntuTestCase |
4263 | |
4264 | === modified file 'tests/resources/listitems/ListItemDragging.qml' |
4265 | --- tests/resources/listitems/ListItemDragging.qml 2015-02-25 16:05:18 +0000 |
4266 | +++ tests/resources/listitems/ListItemDragging.qml 2015-03-03 15:01:13 +0000 |
4267 | @@ -16,6 +16,7 @@ |
4268 | |
4269 | import QtQuick 2.4 |
4270 | import Ubuntu.Components 1.2 |
4271 | +import QtQuick.Layouts 1.1 |
4272 | import Ubuntu.Components.ListItems 1.0 |
4273 | import QtQml.Models 2.1 |
4274 | |
4275 | @@ -133,19 +134,22 @@ |
4276 | actions: contextualActions |
4277 | } |
4278 | |
4279 | - Rectangle { |
4280 | - anchors.fill: parent |
4281 | - color: item.dragging ? UbuntuColors.blue : "#69aa69" |
4282 | - } |
4283 | - Column { |
4284 | - anchors.fill: parent |
4285 | - Label { |
4286 | - text: label + " from index #" + index |
4287 | - anchors.left: parent.left |
4288 | - } |
4289 | - Label { |
4290 | - text: "Click to turn LTR<->RTL" |
4291 | - anchors.right: parent.right |
4292 | + RowLayout { |
4293 | + anchors { |
4294 | + fill: parent |
4295 | + margins: units.gu(0.5) |
4296 | + leftMargin: anchors.rightMargin |
4297 | + rightMargin: units.gu(2) |
4298 | + } |
4299 | + Captions { |
4300 | + id: captions |
4301 | + title.text: label |
4302 | + subtitle.text: "from index #" + index |
4303 | + } |
4304 | + Captions { |
4305 | + captionStyle: Ubuntu.Summary |
4306 | + title.text: "LTR" |
4307 | + subtitle.text: "RTL" |
4308 | } |
4309 | } |
4310 | |
4311 | |
4312 | === modified file 'tests/resources/listitems/ListItemTest.qml' |
4313 | --- tests/resources/listitems/ListItemTest.qml 2015-02-19 11:56:56 +0000 |
4314 | +++ tests/resources/listitems/ListItemTest.qml 2015-03-03 15:01:13 +0000 |
4315 | @@ -1,5 +1,5 @@ |
4316 | /* |
4317 | - * Copyright 2014 Canonical Ltd. |
4318 | + * Copyright 2014-2015 Canonical Ltd. |
4319 | * |
4320 | * This program is free software; you can redistribute it and/or modify |
4321 | * it under the terms of the GNU Lesser General Public License as published by |
4322 | @@ -14,9 +14,10 @@ |
4323 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4324 | */ |
4325 | |
4326 | -import QtQuick 2.2 |
4327 | +import QtQuick 2.4 |
4328 | import Ubuntu.Components 1.2 |
4329 | import Ubuntu.Components.Styles 1.2 |
4330 | +import QtQuick.Layouts 1.1 |
4331 | |
4332 | MainView { |
4333 | id: main |
4334 | @@ -110,13 +111,23 @@ |
4335 | units.gridUnit += 2; |
4336 | } |
4337 | onPressAndHold: print("pressAndHold", objectName) |
4338 | - Label { |
4339 | - anchors.fill: parent |
4340 | - text: units.gridUnit + "PX/unit" |
4341 | - } |
4342 | - Button { |
4343 | - text: "Press me" |
4344 | - anchors.centerIn: parent |
4345 | + RowLayout { |
4346 | + anchors { |
4347 | + fill: parent |
4348 | + margins: units.gu(0.5) |
4349 | + leftMargin: anchors.rightMargin |
4350 | + rightMargin: units.gu(2) |
4351 | + } |
4352 | + Label { |
4353 | + anchors.fill: parent |
4354 | + text: units.gridUnit + "PX/unit" |
4355 | + Layout.preferredWidth: paintedWidth |
4356 | + } |
4357 | + Button { |
4358 | + text: "Press me" |
4359 | + anchors.centerIn: parent |
4360 | + onClicked: units.gridUnit -= 2 |
4361 | + } |
4362 | } |
4363 | |
4364 | leadingActions: ListItemActions { |
4365 | @@ -184,15 +195,20 @@ |
4366 | trailingActions: trailing |
4367 | contentItem.anchors.margins: units.gu(1) |
4368 | |
4369 | - Label { |
4370 | - anchors.fill: parent |
4371 | - verticalAlignment: Text.AlignVCenter |
4372 | - text: "This is one Label split in two lines.\n" + |
4373 | - "The second line - item #" + modelData |
4374 | - } |
4375 | - Button { |
4376 | - text: "Pressme..." |
4377 | - anchors.centerIn: parent |
4378 | + RowLayout { |
4379 | + anchors { |
4380 | + fill: parent |
4381 | + margins: units.gu(0.5) |
4382 | + leftMargin: anchors.rightMargin |
4383 | + rightMargin: units.gu(2) |
4384 | + } |
4385 | + Captions { |
4386 | + title.text: "This is one Label split in two lines.\n" + |
4387 | + "The second line - item #" + modelData |
4388 | + } |
4389 | + Button { |
4390 | + text: "Pressme..." |
4391 | + } |
4392 | } |
4393 | |
4394 | states: State { |
4395 | @@ -238,6 +254,10 @@ |
4396 | trailingActions: ListItemActions { |
4397 | actions: trailingArray |
4398 | } |
4399 | + contentItem.anchors { |
4400 | + leftMargin: units.gu(2) |
4401 | + rightMargin: units.gu(2) |
4402 | + } |
4403 | |
4404 | Label { |
4405 | text: modelData + " Flickable item" |
4406 | |
4407 | === modified file 'tests/unit/tst_performance/ListItemList.qml' |
4408 | --- tests/unit/tst_performance/ListItemList.qml 2014-09-15 17:33:35 +0000 |
4409 | +++ tests/unit/tst_performance/ListItemList.qml 2015-03-03 15:01:13 +0000 |
4410 | @@ -1,5 +1,5 @@ |
4411 | /* |
4412 | - * Copyright 2014 Canonical Ltd. |
4413 | + * Copyright 2015 Canonical Ltd. |
4414 | * |
4415 | * This program is free software; you can redistribute it and/or modify |
4416 | * it under the terms of the GNU Lesser General Public License as published by |
4417 | @@ -14,7 +14,7 @@ |
4418 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4419 | */ |
4420 | |
4421 | -import QtQuick 2.0 |
4422 | +import QtQuick 2.3 |
4423 | import Ubuntu.Components 1.2 |
4424 | |
4425 | Column { |
4426 | |
4427 | === added file 'tests/unit/tst_performance/ListOfCaptions.qml' |
4428 | --- tests/unit/tst_performance/ListOfCaptions.qml 1970-01-01 00:00:00 +0000 |
4429 | +++ tests/unit/tst_performance/ListOfCaptions.qml 2015-03-03 15:01:13 +0000 |
4430 | @@ -0,0 +1,35 @@ |
4431 | +/* |
4432 | + * Copyright 2015 Canonical Ltd. |
4433 | + * |
4434 | + * This program is free software; you can redistribute it and/or modify |
4435 | + * it under the terms of the GNU Lesser General Public License as published by |
4436 | + * the Free Software Foundation; version 3. |
4437 | + * |
4438 | + * This program is distributed in the hope that it will be useful, |
4439 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
4440 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4441 | + * GNU Lesser General Public License for more details. |
4442 | + * |
4443 | + * You should have received a copy of the GNU Lesser General Public License |
4444 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4445 | + */ |
4446 | + |
4447 | +import QtQuick 2.3 |
4448 | +import Ubuntu.Components 1.2 |
4449 | +import QtQuick.Layouts 1.1 |
4450 | + |
4451 | +Column { |
4452 | + width: 800 |
4453 | + height: 600 |
4454 | + Repeater { |
4455 | + id: repeater |
4456 | + model: 5000 |
4457 | + ListItem { |
4458 | + RowLayout { |
4459 | + anchors.fill: parent |
4460 | + Captions { |
4461 | + } |
4462 | + } |
4463 | + } |
4464 | + } |
4465 | +} |
4466 | |
4467 | === modified file 'tests/unit/tst_performance/tst_performance.cpp' |
4468 | --- tests/unit/tst_performance/tst_performance.cpp 2015-02-12 07:31:08 +0000 |
4469 | +++ tests/unit/tst_performance/tst_performance.cpp 2015-03-03 15:01:13 +0000 |
4470 | @@ -80,6 +80,7 @@ |
4471 | QTest::newRow("list with new ListItem") << "ListItemList.qml" << QUrl(); |
4472 | QTest::newRow("list with new ListItem with actions") << "ListItemWithActionsList.qml" << QUrl(); |
4473 | QTest::newRow("list with new ListItem with inline actions") << "ListItemWithInlineActionsList.qml" << QUrl(); |
4474 | + QTest::newRow("list with Captions, preset: caption") << "ListOfCaptions.qml" << QUrl(); |
4475 | QTest::newRow("list with ListItems.Empty (equivalent to the new ListItem") << "ListItemsEmptyList.qml" << QUrl(); |
4476 | // disable this test as it takes >20 seconds. Kept still for measurements to be done during development |
4477 | // QTest::newRow("list with ListItems.Base (one icon, one label and one chevron)") << "ListItemsBaseList.qml" << QUrl(); |
4478 | |
4479 | === added file 'tests/unit_x11/tst_components/tst_captions.qml' |
4480 | --- tests/unit_x11/tst_components/tst_captions.qml 1970-01-01 00:00:00 +0000 |
4481 | +++ tests/unit_x11/tst_components/tst_captions.qml 2015-03-03 15:01:13 +0000 |
4482 | @@ -0,0 +1,86 @@ |
4483 | +/* |
4484 | + * Copyright 2015 Canonical Ltd. |
4485 | + * |
4486 | + * This program is free software; you can redistribute it and/or modify |
4487 | + * it under the terms of the GNU Lesser General Public License as published by |
4488 | + * the Free Software Foundation; version 3. |
4489 | + * |
4490 | + * This program is distributed in the hope that it will be useful, |
4491 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
4492 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4493 | + * GNU Lesser General Public License for more details. |
4494 | + * |
4495 | + * You should have received a copy of the GNU Lesser General Public License |
4496 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4497 | + */ |
4498 | + |
4499 | +import QtQuick 2.4 |
4500 | +import QtTest 1.0 |
4501 | +import Ubuntu.Test 1.0 |
4502 | +import Ubuntu.Components 1.2 |
4503 | +import QtQuick.Layouts 1.1 |
4504 | + |
4505 | +Item { |
4506 | + width: units.gu(40) |
4507 | + height: units.gu(71) |
4508 | + |
4509 | + Column { |
4510 | + width: parent.width |
4511 | + ListItem { |
4512 | + RowLayout { |
4513 | + anchors.fill: parent |
4514 | + Captions { |
4515 | + id: defaults |
4516 | + } |
4517 | + } |
4518 | + } |
4519 | + ListItem { |
4520 | + RowLayout { |
4521 | + anchors.fill: parent |
4522 | + Captions { |
4523 | + id: testCaptions |
4524 | + } |
4525 | + } |
4526 | + } |
4527 | + } |
4528 | + |
4529 | + UbuntuTestCase { |
4530 | + name: "CaptionsAPI" |
4531 | + when: windowShown |
4532 | + |
4533 | + function test_0_defaults() { |
4534 | + compare(defaults.captionStyle, Ubuntu.TitleCaptionStyle, "Default preset is 'titles'"); |
4535 | + compare(defaults.height, 0, "default height is 0"); |
4536 | + compare(defaults.width, 0, "default width is 0") |
4537 | + compare(defaults.spacing, units.gu(0.5), "default spacing failure"); |
4538 | + compare(defaults.visible, false, "default should be invisible") |
4539 | + compare(defaults.Layout.alignment, Qt.AlignVCenter | Qt.AlignLeft, "center vertically and left horizontally by default"); |
4540 | + } |
4541 | + |
4542 | + function test_captions_data() { |
4543 | + return [ |
4544 | + {tag: "caption, title.fontSize", captionStyle: Ubuntu.TitleCaptionStyle, label: "title", property: "fontSize", value: "medium"}, |
4545 | + {tag: "caption, title.horizontalAlignment", captionStyle: Ubuntu.TitleCaptionStyle, label: "title", property: "horizontalAlignment", value: Text.AlignLeft}, |
4546 | + {tag: "caption, title.elide", captionStyle: Ubuntu.TitleCaptionStyle, label: "title", property: "elide", value: Text.ElideRight}, |
4547 | + {tag: "caption, subtitle.fontSize", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "fontSize", value: "small"}, |
4548 | + {tag: "caption, subtitle.horizontalAlignment", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "horizontalAlignment", value: Text.AlignLeft}, |
4549 | + {tag: "caption, subtitle.maximumLineCount", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "maximumLineCount", value: 2}, |
4550 | + {tag: "caption, subtitle.wrapMode", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "wrapMode", value: Text.Wrap}, |
4551 | + {tag: "caption, subtitle.elide", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "elide", value: Text.ElideRight}, |
4552 | + |
4553 | + {tag: "summary, title.fontSize", captionStyle: Ubuntu.SummaryCaptionStyle, label: "title", property: "fontSize", value: "small"}, |
4554 | + {tag: "summary, title.horizontalAlignment", captionStyle: Ubuntu.SummaryCaptionStyle, label: "title", property: "horizontalAlignment", value: Text.AlignRight}, |
4555 | + {tag: "summary, title.elide", captionStyle: Ubuntu.SummaryCaptionStyle, label: "title", property: "elide", value: Text.ElideNone}, |
4556 | + {tag: "summary, subtitle.fontSize", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "fontSize", value: "small"}, |
4557 | + {tag: "summary, subtitle.horizontalAlignment", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "horizontalAlignment", value: Text.AlignRight}, |
4558 | + {tag: "summary, subtitle.maximumLineCount", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "maximumLineCount", value: 1}, |
4559 | + {tag: "summary, subtitle.wrapMode", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "wrapMode", value: Text.NoWrap}, |
4560 | + {tag: "summary, subtitle.elide", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "elide", value: Text.ElideNone}, |
4561 | + ]; |
4562 | + } |
4563 | + function test_captions(data) { |
4564 | + testCaptions.captionStyle = data.captionStyle; |
4565 | + compare(testCaptions[data.label][data.property], data.value, data.tag + " values differ"); |
4566 | + } |
4567 | + } |
4568 | +} |
FAILED: Continuous integration, rev:1436 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1513/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 1629 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-amd64- ci/240 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-armhf- ci/243 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-armhf- ci/243/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-i386- ci/240 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 1444 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1627 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1627/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 18512
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1513/ rebuild
http://