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