Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-06-01 into lp:ubuntu-ui-toolkit
- OTA12-2016-06-01
- Merge into trunk
Proposed by
Zoltan Balogh
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 1989 |
Merged at revision: | 1327 |
Proposed branch: | lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-06-01 |
Merge into: | lp:ubuntu-ui-toolkit |
Diff against target: |
1917 lines (+223/-140) 136 files modified
debian/changelog (+14/-0) documentation/ubuntu-components-listitems.qdoc (+1/-1) documentation/ubuntu-components-pickers.qdoc (+1/-1) documentation/ubuntu-components-popups.qdoc (+1/-1) documentation/ubuntu-components-styles.qdoc (+20/-0) documentation/ubuntu-components-themes.qdoc (+20/-0) src/Ubuntu/Components/1.0/ProgressBar.qml (+1/-1) src/Ubuntu/Components/1.1/Button.qml (+1/-1) src/Ubuntu/Components/1.1/UbuntuColors.qml (+1/-1) src/Ubuntu/Components/1.2/AbstractButton.qml (+1/-1) src/Ubuntu/Components/1.2/ActionList.qml (+1/-1) src/Ubuntu/Components/1.2/ActivityIndicator.qml (+1/-1) src/Ubuntu/Components/1.2/AnimatedItem.qml (+1/-1) src/Ubuntu/Components/1.2/AppHeader.qml (+1/-1) src/Ubuntu/Components/1.2/Captions.qml (+1/-1) src/Ubuntu/Components/1.2/CheckBox.qml (+1/-1) src/Ubuntu/Components/1.2/ComboButton.qml (+1/-1) src/Ubuntu/Components/1.2/Label.qml (+1/-1) src/Ubuntu/Components/1.2/Object.qml (+1/-1) src/Ubuntu/Components/1.2/OptionSelector.qml (+1/-1) src/Ubuntu/Components/1.2/OptionSelectorDelegate.qml (+1/-1) src/Ubuntu/Components/1.2/OrientationHelper.qml (+1/-1) src/Ubuntu/Components/1.2/PageHeadConfiguration.qml (+1/-1) src/Ubuntu/Components/1.2/PageHeadSections.qml (+1/-1) src/Ubuntu/Components/1.2/PageHeadState.qml (+1/-1) src/Ubuntu/Components/1.2/PageStack.qml (+1/-1) src/Ubuntu/Components/1.2/PageTreeNode.qml (+1/-1) src/Ubuntu/Components/1.2/PageWrapper.qml (+1/-1) src/Ubuntu/Components/1.2/Panel.qml (+1/-1) src/Ubuntu/Components/1.2/PullToRefresh.qml (+1/-1) src/Ubuntu/Components/1.2/Scrollbar.qml (+1/-1) src/Ubuntu/Components/1.2/Slider.qml (+1/-1) src/Ubuntu/Components/1.2/Switch.qml (+1/-1) src/Ubuntu/Components/1.2/Tab.qml (+1/-1) src/Ubuntu/Components/1.2/TabBar.qml (+1/-1) src/Ubuntu/Components/1.2/Tabs.qml (+1/-1) src/Ubuntu/Components/1.2/TextArea.qml (+1/-1) src/Ubuntu/Components/1.2/TextField.qml (+1/-1) src/Ubuntu/Components/1.2/Toolbar.qml (+1/-1) src/Ubuntu/Components/1.2/ToolbarButton.qml (+1/-1) src/Ubuntu/Components/1.2/ToolbarItems.qml (+1/-1) src/Ubuntu/Components/1.2/UbuntuListView.qml (+1/-1) src/Ubuntu/Components/1.2/UbuntuNumberAnimation.qml (+1/-1) src/Ubuntu/Components/1.3/ActionBar.qml (+1/-1) src/Ubuntu/Components/1.3/ActionList.qml (+1/-1) src/Ubuntu/Components/1.3/ActivityIndicator.qml (+1/-1) src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+1/-1) src/Ubuntu/Components/1.3/AnimatedItem.qml (+1/-1) src/Ubuntu/Components/1.3/AppHeader.qml (+1/-1) src/Ubuntu/Components/1.3/Button.qml (+1/-1) src/Ubuntu/Components/1.3/Captions.qml (+1/-1) src/Ubuntu/Components/1.3/CheckBox.qml (+1/-1) src/Ubuntu/Components/1.3/ComboButton.qml (+1/-1) src/Ubuntu/Components/1.3/Icon.qml (+1/-1) src/Ubuntu/Components/1.3/MainView.qml (+1/-1) src/Ubuntu/Components/1.3/OptionSelector.qml (+1/-1) src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml (+1/-1) src/Ubuntu/Components/1.3/OrientationHelper.qml (+1/-1) src/Ubuntu/Components/1.3/Page.qml (+1/-1) src/Ubuntu/Components/1.3/PageColumn.qml (+1/-1) src/Ubuntu/Components/1.3/PageColumnsLayout.qml (+1/-1) src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc (+1/-1) src/Ubuntu/Components/1.3/PageHeadSections.qml (+1/-1) src/Ubuntu/Components/1.3/PageHeadState.qml (+1/-1) src/Ubuntu/Components/1.3/PageHeader.qml (+1/-1) src/Ubuntu/Components/1.3/PageStack.qml (+1/-1) src/Ubuntu/Components/1.3/Panel.qml (+1/-1) src/Ubuntu/Components/1.3/ProgressBar.qml (+1/-1) src/Ubuntu/Components/1.3/ProgressionSlot.qml (+1/-1) src/Ubuntu/Components/1.3/PullToRefresh.qml (+1/-1) src/Ubuntu/Components/1.3/ScrollView.qml (+1/-1) src/Ubuntu/Components/1.3/Scrollbar.qml (+1/-1) src/Ubuntu/Components/1.3/Sections.qml (+1/-1) src/Ubuntu/Components/1.3/Slider.qml (+1/-1) src/Ubuntu/Components/1.3/Switch.qml (+1/-1) src/Ubuntu/Components/1.3/Tab.qml (+1/-1) src/Ubuntu/Components/1.3/TabBar.qml (+1/-1) src/Ubuntu/Components/1.3/Tabs.qml (+1/-1) src/Ubuntu/Components/1.3/TextArea.qml (+1/-1) src/Ubuntu/Components/1.3/TextField.qml (+1/-1) src/Ubuntu/Components/1.3/Toolbar.qml (+1/-1) src/Ubuntu/Components/1.3/ToolbarButton.qml (+1/-1) src/Ubuntu/Components/1.3/ToolbarItems.qml (+1/-1) src/Ubuntu/Components/1.3/UbuntuColors.qml (+1/-1) src/Ubuntu/Components/1.3/UbuntuListView.qml (+1/-1) src/Ubuntu/Components/1.3/UbuntuNumberAnimation.qml (+1/-1) src/Ubuntu/Components/1.3/dateUtils.js (+1/-1) src/Ubuntu/Components/1.3/pageUtils.js (+1/-1) src/Ubuntu/Components/Pickers/1.2/PickerPanel.qml (+1/-1) src/Ubuntu/Components/Pickers/1.3/PickerPanel.qml (+1/-1) src/Ubuntu/Components/plugin/i18n.cpp (+1/-1) src/Ubuntu/Components/plugin/inversemouseareatype.cpp (+1/-1) src/Ubuntu/Components/plugin/livetimer.cpp (+1/-1) src/Ubuntu/Components/plugin/privates/ucpagewrapper.cpp (+1/-1) src/Ubuntu/Components/plugin/qquickclipboard.cpp (+1/-1) src/Ubuntu/Components/plugin/qquickmimedata.cpp (+1/-1) src/Ubuntu/Components/plugin/sortfiltermodel.cpp (+1/-1) src/Ubuntu/Components/plugin/ucabstractbutton.cpp (+3/-2) src/Ubuntu/Components/plugin/ucaction.cpp (+1/-1) src/Ubuntu/Components/plugin/ucactioncontext.cpp (+2/-2) src/Ubuntu/Components/plugin/ucactionitem.cpp (+1/-1) src/Ubuntu/Components/plugin/ucactionmanager.cpp (+1/-1) src/Ubuntu/Components/plugin/ucalarm.cpp (+1/-1) src/Ubuntu/Components/plugin/ucalarmmodel.cpp (+1/-1) src/Ubuntu/Components/plugin/ucapplication.cpp (+1/-1) src/Ubuntu/Components/plugin/ucargument.cpp (+1/-1) src/Ubuntu/Components/plugin/ucarguments.cpp (+1/-1) src/Ubuntu/Components/plugin/ucbottomedge.cpp (+1/-1) src/Ubuntu/Components/plugin/ucbottomedgehint.cpp (+1/-1) src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+1/-1) src/Ubuntu/Components/plugin/ucfontutils.cpp (+1/-1) src/Ubuntu/Components/plugin/uchaptics.cpp (+1/-1) src/Ubuntu/Components/plugin/ucheader.cpp (+1/-1) src/Ubuntu/Components/plugin/uclabel.cpp (+4/-3) src/Ubuntu/Components/plugin/uclistitem.cpp (+1/-1) src/Ubuntu/Components/plugin/uclistitemactions.cpp (+1/-1) src/Ubuntu/Components/plugin/uclistitemlayout.cpp (+1/-1) src/Ubuntu/Components/plugin/ucmainviewbase.cpp (+1/-1) src/Ubuntu/Components/plugin/ucmousefilters.cpp (+2/-2) src/Ubuntu/Components/plugin/ucnamespace.cpp (+1/-1) src/Ubuntu/Components/plugin/ucpagetreenode.cpp (+1/-1) src/Ubuntu/Components/plugin/ucproportionalshape.cpp (+1/-1) src/Ubuntu/Components/plugin/ucserviceproperties.cpp (+1/-1) src/Ubuntu/Components/plugin/ucslotslayout.cpp (+1/-1) src/Ubuntu/Components/plugin/ucstatesaver.cpp (+1/-1) src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+1/-1) src/Ubuntu/Components/plugin/uctheme.cpp (+1/-1) src/Ubuntu/Components/plugin/ucubuntuanimation.cpp (+1/-1) src/Ubuntu/Components/plugin/ucubuntushape.cpp (+1/-1) src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp (+1/-1) src/Ubuntu/Components/plugin/ucunits.cpp (+1/-1) src/Ubuntu/Components/plugin/ucurihandler.cpp (+1/-1) src/Ubuntu/Components/plugin/ucviewitemsattached.cpp (+2/-2) src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+1/-1) tests/unit_x11/tst_components/tst_focus.qml (+18/-0) tests/unit_x11/tst_components/tst_slotslayout.qml (+12/-3) |
To merge this branch: | bzr merge lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-06-01 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu SDK team | Pending | ||
Review via email: mp+296192@code.launchpad.net |
Commit message
OTA12-2016-06-01
Description of the change
OTA12-2016-06-01
To post a comment you must log in.
- 1990. By Zoltan Balogh
-
Add changelog
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2016-05-27 07:08:44 +0000 | |||
3 | +++ debian/changelog 2016-06-01 11:49:05 +0000 | |||
4 | @@ -1,3 +1,17 @@ | |||
5 | 1 | ubuntu-ui-toolkit (1.3.1988+16.10) UNRELEASED; urgency=medium | ||
6 | 2 | |||
7 | 3 | [ Christian Dywan ] | ||
8 | 4 | * UCAbstractButton needs to accept key release events. Fixes LP: #1581026 | ||
9 | 5 | |||
10 | 6 | [ Andrea Bernabei ] | ||
11 | 7 | * Documentation: fix missing or outdated imports in QML modules (Popups, | ||
12 | 8 | Pickers, Themes, ListItems), misuse of qdoc API and similar. | ||
13 | 9 | Fixes LP: #1570156, LP: #1585557, LP: #1585585, LP: #1585591. | ||
14 | 10 | * tst_slotslayout: tentative fix for a very rare CI failure. | ||
15 | 11 | Fixes LP: #1571426 | ||
16 | 12 | |||
17 | 13 | -- Zoltán Balogh <zoltan@bakter.hu> Wed, 01 Jun 2016 14:31:28 +0300 | ||
18 | 14 | |||
19 | 1 | ubuntu-ui-toolkit (1.3.1984+16.10.20160527.2) yakkety; urgency=medium | 15 | ubuntu-ui-toolkit (1.3.1984+16.10.20160527.2) yakkety; urgency=medium |
20 | 2 | 16 | ||
21 | 3 | [ Christian Dywan ] | 17 | [ Christian Dywan ] |
22 | 4 | 18 | ||
23 | === modified file 'documentation/ubuntu-components-listitems.qdoc' | |||
24 | --- documentation/ubuntu-components-listitems.qdoc 2014-04-20 19:25:12 +0000 | |||
25 | +++ documentation/ubuntu-components-listitems.qdoc 2016-06-01 11:49:05 +0000 | |||
26 | @@ -15,6 +15,6 @@ | |||
27 | 15 | */ | 15 | */ |
28 | 16 | 16 | ||
29 | 17 | /*! | 17 | /*! |
31 | 18 | \qmlmodule Ubuntu.Components.ListItems 1.0 | 18 | \qmlmodule Ubuntu.Components.ListItems 1.3 |
32 | 19 | \title List Items | 19 | \title List Items |
33 | 20 | */ | 20 | */ |
34 | 21 | 21 | ||
35 | === modified file 'documentation/ubuntu-components-pickers.qdoc' | |||
36 | --- documentation/ubuntu-components-pickers.qdoc 2014-04-20 19:25:12 +0000 | |||
37 | +++ documentation/ubuntu-components-pickers.qdoc 2016-06-01 11:49:05 +0000 | |||
38 | @@ -15,6 +15,6 @@ | |||
39 | 15 | */ | 15 | */ |
40 | 16 | 16 | ||
41 | 17 | /*! | 17 | /*! |
43 | 18 | \qmlmodule Ubuntu.Components.Pickers 1.0 | 18 | \qmlmodule Ubuntu.Components.Pickers 1.3 |
44 | 19 | \title Pickers | 19 | \title Pickers |
45 | 20 | */ | 20 | */ |
46 | 21 | 21 | ||
47 | === modified file 'documentation/ubuntu-components-popups.qdoc' | |||
48 | --- documentation/ubuntu-components-popups.qdoc 2014-04-20 19:25:12 +0000 | |||
49 | +++ documentation/ubuntu-components-popups.qdoc 2016-06-01 11:49:05 +0000 | |||
50 | @@ -15,6 +15,6 @@ | |||
51 | 15 | */ | 15 | */ |
52 | 16 | 16 | ||
53 | 17 | /*! | 17 | /*! |
55 | 18 | \qmlmodule Ubuntu.Components.Popups 1.0 | 18 | \qmlmodule Ubuntu.Components.Popups 1.3 |
56 | 19 | \title Popovers, Sheets and Dialogs | 19 | \title Popovers, Sheets and Dialogs |
57 | 20 | */ | 20 | */ |
58 | 21 | 21 | ||
59 | === added file 'documentation/ubuntu-components-styles.qdoc' | |||
60 | --- documentation/ubuntu-components-styles.qdoc 1970-01-01 00:00:00 +0000 | |||
61 | +++ documentation/ubuntu-components-styles.qdoc 2016-06-01 11:49:05 +0000 | |||
62 | @@ -0,0 +1,20 @@ | |||
63 | 1 | /* | ||
64 | 2 | * Copyright 2016 Canonical Ltd. | ||
65 | 3 | * | ||
66 | 4 | * This program is free software; you can redistribute it and/or modify | ||
67 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
68 | 6 | * the Free Software Foundation; version 3. | ||
69 | 7 | * | ||
70 | 8 | * This program is distributed in the hope that it will be useful, | ||
71 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
72 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
73 | 11 | * GNU Lesser General Public License for more details. | ||
74 | 12 | * | ||
75 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
76 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
77 | 15 | */ | ||
78 | 16 | |||
79 | 17 | /*! | ||
80 | 18 | \qmlmodule Ubuntu.Components.Styles 1.3 | ||
81 | 19 | \title Styles | ||
82 | 20 | */ | ||
83 | 0 | 21 | ||
84 | === added file 'documentation/ubuntu-components-themes.qdoc' | |||
85 | --- documentation/ubuntu-components-themes.qdoc 1970-01-01 00:00:00 +0000 | |||
86 | +++ documentation/ubuntu-components-themes.qdoc 2016-06-01 11:49:05 +0000 | |||
87 | @@ -0,0 +1,20 @@ | |||
88 | 1 | /* | ||
89 | 2 | * Copyright 2016 Canonical Ltd. | ||
90 | 3 | * | ||
91 | 4 | * This program is free software; you can redistribute it and/or modify | ||
92 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
93 | 6 | * the Free Software Foundation; version 3. | ||
94 | 7 | * | ||
95 | 8 | * This program is distributed in the hope that it will be useful, | ||
96 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
97 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
98 | 11 | * GNU Lesser General Public License for more details. | ||
99 | 12 | * | ||
100 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
101 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
102 | 15 | */ | ||
103 | 16 | |||
104 | 17 | /*! | ||
105 | 18 | \qmlmodule Ubuntu.Components.Themes 1.3 | ||
106 | 19 | \title Themes | ||
107 | 20 | */ | ||
108 | 0 | 21 | ||
109 | === modified file 'src/Ubuntu/Components/1.0/ProgressBar.qml' | |||
110 | --- src/Ubuntu/Components/1.0/ProgressBar.qml 2015-07-24 11:09:09 +0000 | |||
111 | +++ src/Ubuntu/Components/1.0/ProgressBar.qml 2016-06-01 11:49:05 +0000 | |||
112 | @@ -19,7 +19,7 @@ | |||
113 | 19 | 19 | ||
114 | 20 | /*! | 20 | /*! |
115 | 21 | \qmltype ProgressBar | 21 | \qmltype ProgressBar |
117 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
118 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
119 | 24 | \brief The ProgressBar component visually indicates the progress of a process of | 24 | \brief The ProgressBar component visually indicates the progress of a process of |
120 | 25 | determinate or indeterminate duration. | 25 | determinate or indeterminate duration. |
121 | 26 | 26 | ||
122 | === modified file 'src/Ubuntu/Components/1.1/Button.qml' | |||
123 | --- src/Ubuntu/Components/1.1/Button.qml 2016-02-03 00:17:56 +0000 | |||
124 | +++ src/Ubuntu/Components/1.1/Button.qml 2016-06-01 11:49:05 +0000 | |||
125 | @@ -19,7 +19,7 @@ | |||
126 | 19 | 19 | ||
127 | 20 | /*! | 20 | /*! |
128 | 21 | \qmltype Button | 21 | \qmltype Button |
130 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
131 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
132 | 24 | \brief Standard Ubuntu button. | 24 | \brief Standard Ubuntu button. |
133 | 25 | 25 | ||
134 | 26 | 26 | ||
135 | === modified file 'src/Ubuntu/Components/1.1/UbuntuColors.qml' | |||
136 | --- src/Ubuntu/Components/1.1/UbuntuColors.qml 2015-03-03 12:53:42 +0000 | |||
137 | +++ src/Ubuntu/Components/1.1/UbuntuColors.qml 2016-06-01 11:49:05 +0000 | |||
138 | @@ -19,7 +19,7 @@ | |||
139 | 19 | 19 | ||
140 | 20 | /*! | 20 | /*! |
141 | 21 | \qmltype UbuntuColors | 21 | \qmltype UbuntuColors |
143 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
144 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
145 | 24 | \brief Singleton defining the Ubuntu color palette. | 24 | \brief Singleton defining the Ubuntu color palette. |
146 | 25 | 25 | ||
147 | 26 | 26 | ||
148 | === modified file 'src/Ubuntu/Components/1.2/AbstractButton.qml' | |||
149 | --- src/Ubuntu/Components/1.2/AbstractButton.qml 2015-12-14 15:47:03 +0000 | |||
150 | +++ src/Ubuntu/Components/1.2/AbstractButton.qml 2016-06-01 11:49:05 +0000 | |||
151 | @@ -19,7 +19,7 @@ | |||
152 | 19 | 19 | ||
153 | 20 | /*! | 20 | /*! |
154 | 21 | \qmlabstract AbstractButton | 21 | \qmlabstract AbstractButton |
156 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
157 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
158 | 24 | \brief The AbstractButton class defines the behavior of the button. | 24 | \brief The AbstractButton class defines the behavior of the button. |
159 | 25 | 25 | ||
160 | 26 | 26 | ||
161 | === modified file 'src/Ubuntu/Components/1.2/ActionList.qml' | |||
162 | --- src/Ubuntu/Components/1.2/ActionList.qml 2015-04-30 08:32:44 +0000 | |||
163 | +++ src/Ubuntu/Components/1.2/ActionList.qml 2016-06-01 11:49:05 +0000 | |||
164 | @@ -19,7 +19,7 @@ | |||
165 | 19 | 19 | ||
166 | 20 | /*! | 20 | /*! |
167 | 21 | \qmltype ActionList | 21 | \qmltype ActionList |
169 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
170 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
171 | 24 | \brief List of \l Action items | 24 | \brief List of \l Action items |
172 | 25 | */ | 25 | */ |
173 | 26 | 26 | ||
174 | === modified file 'src/Ubuntu/Components/1.2/ActivityIndicator.qml' | |||
175 | --- src/Ubuntu/Components/1.2/ActivityIndicator.qml 2015-04-30 08:32:44 +0000 | |||
176 | +++ src/Ubuntu/Components/1.2/ActivityIndicator.qml 2016-06-01 11:49:05 +0000 | |||
177 | @@ -18,7 +18,7 @@ | |||
178 | 18 | 18 | ||
179 | 19 | /*! | 19 | /*! |
180 | 20 | \qmltype ActivityIndicator | 20 | \qmltype ActivityIndicator |
182 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
183 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
184 | 23 | \brief The ActivityIndicator component visually indicates that a task of | 23 | \brief The ActivityIndicator component visually indicates that a task of |
185 | 24 | unknown duration is in progress, e.g. busy indication, connection in progress | 24 | unknown duration is in progress, e.g. busy indication, connection in progress |
186 | 25 | 25 | ||
187 | === modified file 'src/Ubuntu/Components/1.2/AnimatedItem.qml' | |||
188 | --- src/Ubuntu/Components/1.2/AnimatedItem.qml 2015-04-30 08:32:44 +0000 | |||
189 | +++ src/Ubuntu/Components/1.2/AnimatedItem.qml 2016-06-01 11:49:05 +0000 | |||
190 | @@ -16,7 +16,7 @@ | |||
191 | 16 | 16 | ||
192 | 17 | /*! | 17 | /*! |
193 | 18 | \qmltype AnimatedItem | 18 | \qmltype AnimatedItem |
195 | 19 | \inqmlmodule Ubuntu.Components 1.1 | 19 | \inqmlmodule Ubuntu.Components |
196 | 20 | \ingroup ubuntu | 20 | \ingroup ubuntu |
197 | 21 | \brief The AnimatedItem drives the animated components behavior inside a Flickable. | 21 | \brief The AnimatedItem drives the animated components behavior inside a Flickable. |
198 | 22 | Reports whether the component whos parent is a Flickable is in the visible area or not, | 22 | Reports whether the component whos parent is a Flickable is in the visible area or not, |
199 | 23 | 23 | ||
200 | === modified file 'src/Ubuntu/Components/1.2/AppHeader.qml' | |||
201 | --- src/Ubuntu/Components/1.2/AppHeader.qml 2015-12-14 19:48:44 +0000 | |||
202 | +++ src/Ubuntu/Components/1.2/AppHeader.qml 2016-06-01 11:49:05 +0000 | |||
203 | @@ -20,7 +20,7 @@ | |||
204 | 20 | /*! | 20 | /*! |
205 | 21 | \internal | 21 | \internal |
206 | 22 | \qmltype AppHeader | 22 | \qmltype AppHeader |
208 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
209 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
210 | 25 | */ | 25 | */ |
211 | 26 | Components.StyledItem { | 26 | Components.StyledItem { |
212 | 27 | 27 | ||
213 | === modified file 'src/Ubuntu/Components/1.2/Captions.qml' | |||
214 | --- src/Ubuntu/Components/1.2/Captions.qml 2015-04-30 08:32:44 +0000 | |||
215 | +++ src/Ubuntu/Components/1.2/Captions.qml 2016-06-01 11:49:05 +0000 | |||
216 | @@ -20,7 +20,7 @@ | |||
217 | 20 | 20 | ||
218 | 21 | /*! | 21 | /*! |
219 | 22 | \qmltype Captions | 22 | \qmltype Captions |
221 | 23 | \inqmlmodule Ubuntu.Components 1.2 | 23 | \inqmlmodule Ubuntu.Components |
222 | 24 | \ingroup ubuntu-listitem | 24 | \ingroup ubuntu-listitem |
223 | 25 | \since Ubuntu.Components 1.2 | 25 | \since Ubuntu.Components 1.2 |
224 | 26 | \brief Container providing captionStyles for a twin-label column that can be used in | 26 | \brief Container providing captionStyles for a twin-label column that can be used in |
225 | 27 | 27 | ||
226 | === modified file 'src/Ubuntu/Components/1.2/CheckBox.qml' | |||
227 | --- src/Ubuntu/Components/1.2/CheckBox.qml 2015-08-25 13:10:20 +0000 | |||
228 | +++ src/Ubuntu/Components/1.2/CheckBox.qml 2016-06-01 11:49:05 +0000 | |||
229 | @@ -18,7 +18,7 @@ | |||
230 | 18 | 18 | ||
231 | 19 | /*! | 19 | /*! |
232 | 20 | \qmltype CheckBox | 20 | \qmltype CheckBox |
234 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
235 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
236 | 23 | \brief CheckBox is a component with two states, checked or unchecked. It can | 23 | \brief CheckBox is a component with two states, checked or unchecked. It can |
237 | 24 | be used to set boolean options. The behavior is the same as \l Switch, the | 24 | be used to set boolean options. The behavior is the same as \l Switch, the |
238 | 25 | 25 | ||
239 | === modified file 'src/Ubuntu/Components/1.2/ComboButton.qml' | |||
240 | --- src/Ubuntu/Components/1.2/ComboButton.qml 2015-08-25 13:10:20 +0000 | |||
241 | +++ src/Ubuntu/Components/1.2/ComboButton.qml 2016-06-01 11:49:05 +0000 | |||
242 | @@ -20,7 +20,7 @@ | |||
243 | 20 | 20 | ||
244 | 21 | /*! | 21 | /*! |
245 | 22 | \qmltype ComboButton | 22 | \qmltype ComboButton |
247 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
248 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
249 | 25 | \brief Ubuntu button providing a drop-down panel visualizing custom options. | 25 | \brief Ubuntu button providing a drop-down panel visualizing custom options. |
250 | 26 | 26 | ||
251 | 27 | 27 | ||
252 | === modified file 'src/Ubuntu/Components/1.2/Label.qml' | |||
253 | --- src/Ubuntu/Components/1.2/Label.qml 2016-02-03 00:17:56 +0000 | |||
254 | +++ src/Ubuntu/Components/1.2/Label.qml 2016-06-01 11:49:05 +0000 | |||
255 | @@ -18,7 +18,7 @@ | |||
256 | 18 | 18 | ||
257 | 19 | /*! | 19 | /*! |
258 | 20 | \qmltype Label | 20 | \qmltype Label |
260 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
261 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
262 | 23 | \brief Text with Ubuntu styling. | 23 | \brief Text with Ubuntu styling. |
263 | 24 | 24 | ||
264 | 25 | 25 | ||
265 | === modified file 'src/Ubuntu/Components/1.2/Object.qml' | |||
266 | --- src/Ubuntu/Components/1.2/Object.qml 2015-04-30 08:32:44 +0000 | |||
267 | +++ src/Ubuntu/Components/1.2/Object.qml 2016-06-01 11:49:05 +0000 | |||
268 | @@ -19,7 +19,7 @@ | |||
269 | 19 | /*! | 19 | /*! |
270 | 20 | \qmltype Object | 20 | \qmltype Object |
271 | 21 | \internal | 21 | \internal |
273 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
274 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
275 | 24 | \brief Internal type used for lightweight objects that can have children. | 24 | \brief Internal type used for lightweight objects that can have children. |
276 | 25 | */ | 25 | */ |
277 | 26 | 26 | ||
278 | === modified file 'src/Ubuntu/Components/1.2/OptionSelector.qml' | |||
279 | --- src/Ubuntu/Components/1.2/OptionSelector.qml 2015-05-01 19:38:57 +0000 | |||
280 | +++ src/Ubuntu/Components/1.2/OptionSelector.qml 2016-06-01 11:49:05 +0000 | |||
281 | @@ -20,7 +20,7 @@ | |||
282 | 20 | 20 | ||
283 | 21 | /*! | 21 | /*! |
284 | 22 | \qmltype OptionSelector | 22 | \qmltype OptionSelector |
286 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
287 | 24 | \ingroup ubuntu-components | 24 | \ingroup ubuntu-components |
288 | 25 | \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a | 25 | \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a |
289 | 26 | listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically. | 26 | listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically. |
290 | 27 | 27 | ||
291 | === modified file 'src/Ubuntu/Components/1.2/OptionSelectorDelegate.qml' | |||
292 | --- src/Ubuntu/Components/1.2/OptionSelectorDelegate.qml 2016-04-29 09:52:20 +0000 | |||
293 | +++ src/Ubuntu/Components/1.2/OptionSelectorDelegate.qml 2016-06-01 11:49:05 +0000 | |||
294 | @@ -16,7 +16,7 @@ | |||
295 | 16 | 16 | ||
296 | 17 | /*! | 17 | /*! |
297 | 18 | \qmltype OptionSelectorDelegate | 18 | \qmltype OptionSelectorDelegate |
299 | 19 | \inqmlmodule Ubuntu.Components 1.1 | 19 | \inqmlmodule Ubuntu.Components |
300 | 20 | \ingroup ubuntu-components | 20 | \ingroup ubuntu-components |
301 | 21 | \brief OptionSelector delegate which can display text, subtext and an image from a custom model. | 21 | \brief OptionSelector delegate which can display text, subtext and an image from a custom model. |
302 | 22 | 22 | ||
303 | 23 | 23 | ||
304 | === modified file 'src/Ubuntu/Components/1.2/OrientationHelper.qml' | |||
305 | --- src/Ubuntu/Components/1.2/OrientationHelper.qml 2015-07-02 17:39:03 +0000 | |||
306 | +++ src/Ubuntu/Components/1.2/OrientationHelper.qml 2016-06-01 11:49:05 +0000 | |||
307 | @@ -20,7 +20,7 @@ | |||
308 | 20 | 20 | ||
309 | 21 | /*! | 21 | /*! |
310 | 22 | \qmltype OrientationHelper | 22 | \qmltype OrientationHelper |
312 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
313 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
314 | 25 | \brief The OrientationHelper automatically rotates its children following the | 25 | \brief The OrientationHelper automatically rotates its children following the |
315 | 26 | orientation of the device. | 26 | orientation of the device. |
316 | 27 | 27 | ||
317 | === modified file 'src/Ubuntu/Components/1.2/PageHeadConfiguration.qml' | |||
318 | --- src/Ubuntu/Components/1.2/PageHeadConfiguration.qml 2015-04-30 08:32:44 +0000 | |||
319 | +++ src/Ubuntu/Components/1.2/PageHeadConfiguration.qml 2016-06-01 11:49:05 +0000 | |||
320 | @@ -19,7 +19,7 @@ | |||
321 | 19 | 19 | ||
322 | 20 | /*! | 20 | /*! |
323 | 21 | \qmltype PageHeadConfiguration | 21 | \qmltype PageHeadConfiguration |
325 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
326 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
327 | 24 | \since Ubuntu.Components 1.1 | 24 | \since Ubuntu.Components 1.1 |
328 | 25 | \brief Page.head is used to configure the header for a \l Page. | 25 | \brief Page.head is used to configure the header for a \l Page. |
329 | 26 | 26 | ||
330 | === modified file 'src/Ubuntu/Components/1.2/PageHeadSections.qml' | |||
331 | --- src/Ubuntu/Components/1.2/PageHeadSections.qml 2015-04-30 08:32:44 +0000 | |||
332 | +++ src/Ubuntu/Components/1.2/PageHeadSections.qml 2016-06-01 11:49:05 +0000 | |||
333 | @@ -18,7 +18,7 @@ | |||
334 | 18 | 18 | ||
335 | 19 | /*! | 19 | /*! |
336 | 20 | \qmltype PageHeadSections | 20 | \qmltype PageHeadSections |
338 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
339 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
340 | 23 | \since Ubuntu.Components 1.1 | 23 | \since Ubuntu.Components 1.1 |
341 | 24 | \brief PageHeadSections is used to configure the sections for a \l Page. | 24 | \brief PageHeadSections is used to configure the sections for a \l Page. |
342 | 25 | 25 | ||
343 | === modified file 'src/Ubuntu/Components/1.2/PageHeadState.qml' | |||
344 | --- src/Ubuntu/Components/1.2/PageHeadState.qml 2015-04-30 08:32:44 +0000 | |||
345 | +++ src/Ubuntu/Components/1.2/PageHeadState.qml 2016-06-01 11:49:05 +0000 | |||
346 | @@ -19,7 +19,7 @@ | |||
347 | 19 | 19 | ||
348 | 20 | /*! | 20 | /*! |
349 | 21 | \qmltype PageHeadState | 21 | \qmltype PageHeadState |
351 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
352 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
353 | 24 | \since Ubuntu.Components 1.1 | 24 | \since Ubuntu.Components 1.1 |
354 | 25 | \brief PageHeadState is a helper component to make it easier to | 25 | \brief PageHeadState is a helper component to make it easier to |
355 | 26 | 26 | ||
356 | === modified file 'src/Ubuntu/Components/1.2/PageStack.qml' | |||
357 | --- src/Ubuntu/Components/1.2/PageStack.qml 2015-04-30 08:32:44 +0000 | |||
358 | +++ src/Ubuntu/Components/1.2/PageStack.qml 2016-06-01 11:49:05 +0000 | |||
359 | @@ -19,7 +19,7 @@ | |||
360 | 19 | 19 | ||
361 | 20 | /*! | 20 | /*! |
362 | 21 | \qmltype PageStack | 21 | \qmltype PageStack |
364 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
365 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
366 | 24 | \brief A stack of \l Page items that is used for inter-Page navigation. | 24 | \brief A stack of \l Page items that is used for inter-Page navigation. |
367 | 25 | Pages on the stack can be popped, and new Pages can be pushed. | 25 | Pages on the stack can be popped, and new Pages can be pushed. |
368 | 26 | 26 | ||
369 | === modified file 'src/Ubuntu/Components/1.2/PageTreeNode.qml' | |||
370 | --- src/Ubuntu/Components/1.2/PageTreeNode.qml 2015-12-17 09:13:29 +0000 | |||
371 | +++ src/Ubuntu/Components/1.2/PageTreeNode.qml 2016-06-01 11:49:05 +0000 | |||
372 | @@ -20,7 +20,7 @@ | |||
373 | 20 | /*! | 20 | /*! |
374 | 21 | \internal | 21 | \internal |
375 | 22 | \qmltype PageTreeNode | 22 | \qmltype PageTreeNode |
377 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
378 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
379 | 25 | \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs. | 25 | \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs. |
380 | 26 | 26 | ||
381 | 27 | 27 | ||
382 | === modified file 'src/Ubuntu/Components/1.2/PageWrapper.qml' | |||
383 | --- src/Ubuntu/Components/1.2/PageWrapper.qml 2015-04-30 08:32:44 +0000 | |||
384 | +++ src/Ubuntu/Components/1.2/PageWrapper.qml 2016-06-01 11:49:05 +0000 | |||
385 | @@ -20,7 +20,7 @@ | |||
386 | 20 | /*! | 20 | /*! |
387 | 21 | \internal | 21 | \internal |
388 | 22 | \qmltype PageWrapper | 22 | \qmltype PageWrapper |
390 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
391 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
392 | 25 | \brief Internal class used by \l PageStack | 25 | \brief Internal class used by \l PageStack |
393 | 26 | */ | 26 | */ |
394 | 27 | 27 | ||
395 | === modified file 'src/Ubuntu/Components/1.2/Panel.qml' | |||
396 | --- src/Ubuntu/Components/1.2/Panel.qml 2016-01-26 09:53:02 +0000 | |||
397 | +++ src/Ubuntu/Components/1.2/Panel.qml 2016-06-01 11:49:05 +0000 | |||
398 | @@ -19,7 +19,7 @@ | |||
399 | 19 | 19 | ||
400 | 20 | /*! | 20 | /*! |
401 | 21 | \qmltype Panel | 21 | \qmltype Panel |
403 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
404 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
405 | 24 | \brief A panel that can be swiped in and out from an edge of the window by the user. | 24 | \brief A panel that can be swiped in and out from an edge of the window by the user. |
406 | 25 | For most applications, it is highly recommended to use the \l MainView instead which includes | 25 | For most applications, it is highly recommended to use the \l MainView instead which includes |
407 | 26 | 26 | ||
408 | === modified file 'src/Ubuntu/Components/1.2/PullToRefresh.qml' | |||
409 | --- src/Ubuntu/Components/1.2/PullToRefresh.qml 2015-04-30 08:32:44 +0000 | |||
410 | +++ src/Ubuntu/Components/1.2/PullToRefresh.qml 2016-06-01 11:49:05 +0000 | |||
411 | @@ -19,7 +19,7 @@ | |||
412 | 19 | 19 | ||
413 | 20 | /*! | 20 | /*! |
414 | 21 | \qmltype PullToRefresh | 21 | \qmltype PullToRefresh |
416 | 22 | \inqmlmodule Ubuntu.Components 0.1 | 22 | \inqmlmodule Ubuntu.Components |
417 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
418 | 24 | \since Ubuntu.Components 1.1 | 24 | \since Ubuntu.Components 1.1 |
419 | 25 | \brief Pull-to-refresh component for Flickables to reload a model upon pull. | 25 | \brief Pull-to-refresh component for Flickables to reload a model upon pull. |
420 | 26 | 26 | ||
421 | === modified file 'src/Ubuntu/Components/1.2/Scrollbar.qml' | |||
422 | --- src/Ubuntu/Components/1.2/Scrollbar.qml 2015-04-30 08:32:44 +0000 | |||
423 | +++ src/Ubuntu/Components/1.2/Scrollbar.qml 2016-06-01 11:49:05 +0000 | |||
424 | @@ -19,7 +19,7 @@ | |||
425 | 19 | 19 | ||
426 | 20 | /*! | 20 | /*! |
427 | 21 | \qmltype ScrollBar | 21 | \qmltype ScrollBar |
429 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
430 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
431 | 24 | \brief The ScrollBar component provides scrolling functionality for | 24 | \brief The ScrollBar component provides scrolling functionality for |
432 | 25 | scrollable views (i.e. Flickable, ListView). | 25 | scrollable views (i.e. Flickable, ListView). |
433 | 26 | 26 | ||
434 | === modified file 'src/Ubuntu/Components/1.2/Slider.qml' | |||
435 | --- src/Ubuntu/Components/1.2/Slider.qml 2015-11-18 09:48:38 +0000 | |||
436 | +++ src/Ubuntu/Components/1.2/Slider.qml 2016-06-01 11:49:05 +0000 | |||
437 | @@ -21,7 +21,7 @@ | |||
438 | 21 | 21 | ||
439 | 22 | /*! | 22 | /*! |
440 | 23 | \qmltype Slider | 23 | \qmltype Slider |
442 | 24 | \inqmlmodule Ubuntu.Components 1.1 | 24 | \inqmlmodule Ubuntu.Components |
443 | 25 | \ingroup ubuntu | 25 | \ingroup ubuntu |
444 | 26 | \brief Slider is a component to select a value from a continuous range of | 26 | \brief Slider is a component to select a value from a continuous range of |
445 | 27 | values. | 27 | values. |
446 | 28 | 28 | ||
447 | === modified file 'src/Ubuntu/Components/1.2/Switch.qml' | |||
448 | --- src/Ubuntu/Components/1.2/Switch.qml 2015-04-30 08:32:44 +0000 | |||
449 | +++ src/Ubuntu/Components/1.2/Switch.qml 2016-06-01 11:49:05 +0000 | |||
450 | @@ -21,7 +21,7 @@ | |||
451 | 21 | 21 | ||
452 | 22 | /*! | 22 | /*! |
453 | 23 | \qmltype Switch | 23 | \qmltype Switch |
455 | 24 | \inqmlmodule Ubuntu.Components 1.1 | 24 | \inqmlmodule Ubuntu.Components |
456 | 25 | \ingroup ubuntu | 25 | \ingroup ubuntu |
457 | 26 | \brief Switch is a component with two states, checked or unchecked. It can | 26 | \brief Switch is a component with two states, checked or unchecked. It can |
458 | 27 | be used to set boolean options. The behavior is the same as \l CheckBox, the | 27 | be used to set boolean options. The behavior is the same as \l CheckBox, the |
459 | 28 | 28 | ||
460 | === modified file 'src/Ubuntu/Components/1.2/Tab.qml' | |||
461 | --- src/Ubuntu/Components/1.2/Tab.qml 2015-04-30 08:32:44 +0000 | |||
462 | +++ src/Ubuntu/Components/1.2/Tab.qml 2016-06-01 11:49:05 +0000 | |||
463 | @@ -18,7 +18,7 @@ | |||
464 | 18 | 18 | ||
465 | 19 | /*! | 19 | /*! |
466 | 20 | \qmltype Tab | 20 | \qmltype Tab |
468 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
469 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
470 | 23 | \brief Component to represent a single tab in a \l Tabs environment. | 23 | \brief Component to represent a single tab in a \l Tabs environment. |
471 | 24 | 24 | ||
472 | 25 | 25 | ||
473 | === modified file 'src/Ubuntu/Components/1.2/TabBar.qml' | |||
474 | --- src/Ubuntu/Components/1.2/TabBar.qml 2015-04-30 08:32:44 +0000 | |||
475 | +++ src/Ubuntu/Components/1.2/TabBar.qml 2016-06-01 11:49:05 +0000 | |||
476 | @@ -19,7 +19,7 @@ | |||
477 | 19 | 19 | ||
478 | 20 | /*! | 20 | /*! |
479 | 21 | \qmltype TabBar | 21 | \qmltype TabBar |
481 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
482 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
483 | 24 | \brief Tab bar that will be shown in the header when \l Tabs is active. | 24 | \brief Tab bar that will be shown in the header when \l Tabs is active. |
484 | 25 | This component does not need to be instantiated by the developer, it is | 25 | This component does not need to be instantiated by the developer, it is |
485 | 26 | 26 | ||
486 | === modified file 'src/Ubuntu/Components/1.2/Tabs.qml' | |||
487 | --- src/Ubuntu/Components/1.2/Tabs.qml 2015-04-30 08:32:44 +0000 | |||
488 | +++ src/Ubuntu/Components/1.2/Tabs.qml 2016-06-01 11:49:05 +0000 | |||
489 | @@ -18,7 +18,7 @@ | |||
490 | 18 | 18 | ||
491 | 19 | /*! | 19 | /*! |
492 | 20 | \qmltype Tabs | 20 | \qmltype Tabs |
494 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
495 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
496 | 23 | \brief The Tabs class provides an environment where multible \l Tab | 23 | \brief The Tabs class provides an environment where multible \l Tab |
497 | 24 | children can be added, and the user is presented with a tab | 24 | children can be added, and the user is presented with a tab |
498 | 25 | 25 | ||
499 | === modified file 'src/Ubuntu/Components/1.2/TextArea.qml' | |||
500 | --- src/Ubuntu/Components/1.2/TextArea.qml 2016-02-03 00:17:56 +0000 | |||
501 | +++ src/Ubuntu/Components/1.2/TextArea.qml 2016-06-01 11:49:05 +0000 | |||
502 | @@ -20,7 +20,7 @@ | |||
503 | 20 | 20 | ||
504 | 21 | /*! | 21 | /*! |
505 | 22 | \qmltype TextArea | 22 | \qmltype TextArea |
507 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
508 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
509 | 25 | \brief The TextArea item displays a block of editable, scrollable, formatted | 25 | \brief The TextArea item displays a block of editable, scrollable, formatted |
510 | 26 | text. | 26 | text. |
511 | 27 | 27 | ||
512 | === modified file 'src/Ubuntu/Components/1.2/TextField.qml' | |||
513 | --- src/Ubuntu/Components/1.2/TextField.qml 2016-02-03 00:17:56 +0000 | |||
514 | +++ src/Ubuntu/Components/1.2/TextField.qml 2016-06-01 11:49:05 +0000 | |||
515 | @@ -20,7 +20,7 @@ | |||
516 | 20 | 20 | ||
517 | 21 | /*! | 21 | /*! |
518 | 22 | \qmltype TextField | 22 | \qmltype TextField |
520 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
521 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
522 | 25 | \brief The TextField element displays a single line of editable plain text. | 25 | \brief The TextField element displays a single line of editable plain text. |
523 | 26 | Input constraints can be set through validator or inputMask. Setting echoMode | 26 | Input constraints can be set through validator or inputMask. Setting echoMode |
524 | 27 | 27 | ||
525 | === modified file 'src/Ubuntu/Components/1.2/Toolbar.qml' | |||
526 | --- src/Ubuntu/Components/1.2/Toolbar.qml 2015-12-17 09:13:29 +0000 | |||
527 | +++ src/Ubuntu/Components/1.2/Toolbar.qml 2016-06-01 11:49:05 +0000 | |||
528 | @@ -20,7 +20,7 @@ | |||
529 | 20 | /*! | 20 | /*! |
530 | 21 | \internal | 21 | \internal |
531 | 22 | \qmltype Toolbar | 22 | \qmltype Toolbar |
533 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
534 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
535 | 25 | \brief Application toolbar. This class is not exposed because it will | 25 | \brief Application toolbar. This class is not exposed because it will |
536 | 26 | be automatically added when a Page defines tools. | 26 | be automatically added when a Page defines tools. |
537 | 27 | 27 | ||
538 | === modified file 'src/Ubuntu/Components/1.2/ToolbarButton.qml' | |||
539 | --- src/Ubuntu/Components/1.2/ToolbarButton.qml 2015-08-18 15:51:43 +0000 | |||
540 | +++ src/Ubuntu/Components/1.2/ToolbarButton.qml 2016-06-01 11:49:05 +0000 | |||
541 | @@ -19,7 +19,7 @@ | |||
542 | 19 | 19 | ||
543 | 20 | /*! | 20 | /*! |
544 | 21 | \qmltype ToolbarButton | 21 | \qmltype ToolbarButton |
546 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
547 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
548 | 24 | \brief An \l ActionItem that represents a button in the toolbar. | 24 | \brief An \l ActionItem that represents a button in the toolbar. |
549 | 25 | ToolbarButtons should be included in \l ToolbarItems to define the tools of a \l Page. | 25 | ToolbarButtons should be included in \l ToolbarItems to define the tools of a \l Page. |
550 | 26 | 26 | ||
551 | === modified file 'src/Ubuntu/Components/1.2/ToolbarItems.qml' | |||
552 | --- src/Ubuntu/Components/1.2/ToolbarItems.qml 2015-04-30 08:32:44 +0000 | |||
553 | +++ src/Ubuntu/Components/1.2/ToolbarItems.qml 2016-06-01 11:49:05 +0000 | |||
554 | @@ -18,7 +18,7 @@ | |||
555 | 18 | 18 | ||
556 | 19 | /*! | 19 | /*! |
557 | 20 | \qmltype ToolbarItems | 20 | \qmltype ToolbarItems |
559 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
560 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
561 | 23 | \deprecated | 23 | \deprecated |
562 | 24 | \brief Row of Items to be placed in a toolbar. | 24 | \brief Row of Items to be placed in a toolbar. |
563 | 25 | 25 | ||
564 | === modified file 'src/Ubuntu/Components/1.2/UbuntuListView.qml' | |||
565 | --- src/Ubuntu/Components/1.2/UbuntuListView.qml 2015-04-30 08:32:44 +0000 | |||
566 | +++ src/Ubuntu/Components/1.2/UbuntuListView.qml 2016-06-01 11:49:05 +0000 | |||
567 | @@ -19,7 +19,7 @@ | |||
568 | 19 | 19 | ||
569 | 20 | /*! | 20 | /*! |
570 | 21 | \qmltype UbuntuListView | 21 | \qmltype UbuntuListView |
572 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
573 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
574 | 24 | \brief A ListView with special features tailored for a look and feel fitting the | 24 | \brief A ListView with special features tailored for a look and feel fitting the |
575 | 25 | Ubuntu Touch platform. | 25 | Ubuntu Touch platform. |
576 | 26 | 26 | ||
577 | === modified file 'src/Ubuntu/Components/1.2/UbuntuNumberAnimation.qml' | |||
578 | --- src/Ubuntu/Components/1.2/UbuntuNumberAnimation.qml 2015-04-30 08:32:44 +0000 | |||
579 | +++ src/Ubuntu/Components/1.2/UbuntuNumberAnimation.qml 2016-06-01 11:49:05 +0000 | |||
580 | @@ -20,7 +20,7 @@ | |||
581 | 20 | 20 | ||
582 | 21 | /*! | 21 | /*! |
583 | 22 | \qmltype UbuntuNumberAnimation | 22 | \qmltype UbuntuNumberAnimation |
585 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
586 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
587 | 25 | \brief UbuntuNumberAnimation is a NumberAnimation that has predefined | 25 | \brief UbuntuNumberAnimation is a NumberAnimation that has predefined |
588 | 26 | settings to ensure that Ubuntu applications are consistent in their animations. | 26 | settings to ensure that Ubuntu applications are consistent in their animations. |
589 | 27 | 27 | ||
590 | === modified file 'src/Ubuntu/Components/1.3/ActionBar.qml' | |||
591 | --- src/Ubuntu/Components/1.3/ActionBar.qml 2015-12-21 20:17:16 +0000 | |||
592 | +++ src/Ubuntu/Components/1.3/ActionBar.qml 2016-06-01 11:49:05 +0000 | |||
593 | @@ -19,7 +19,7 @@ | |||
594 | 19 | 19 | ||
595 | 20 | /*! | 20 | /*! |
596 | 21 | \qmltype ActionBar | 21 | \qmltype ActionBar |
598 | 22 | \inqmlmodule Ubuntu.Components 1.3 | 22 | \inqmlmodule Ubuntu.Components |
599 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
600 | 24 | \brief Show a row of buttons that trigger actions. When the | 24 | \brief Show a row of buttons that trigger actions. When the |
601 | 25 | number of visible actions specified is larger than | 25 | number of visible actions specified is larger than |
602 | 26 | 26 | ||
603 | === modified file 'src/Ubuntu/Components/1.3/ActionList.qml' | |||
604 | --- src/Ubuntu/Components/1.3/ActionList.qml 2015-04-25 08:54:58 +0000 | |||
605 | +++ src/Ubuntu/Components/1.3/ActionList.qml 2016-06-01 11:49:05 +0000 | |||
606 | @@ -19,7 +19,7 @@ | |||
607 | 19 | 19 | ||
608 | 20 | /*! | 20 | /*! |
609 | 21 | \qmltype ActionList | 21 | \qmltype ActionList |
611 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
612 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
613 | 24 | \brief List of \l Action items | 24 | \brief List of \l Action items |
614 | 25 | */ | 25 | */ |
615 | 26 | 26 | ||
616 | === modified file 'src/Ubuntu/Components/1.3/ActivityIndicator.qml' | |||
617 | --- src/Ubuntu/Components/1.3/ActivityIndicator.qml 2015-10-01 06:51:58 +0000 | |||
618 | +++ src/Ubuntu/Components/1.3/ActivityIndicator.qml 2016-06-01 11:49:05 +0000 | |||
619 | @@ -18,7 +18,7 @@ | |||
620 | 18 | 18 | ||
621 | 19 | /*! | 19 | /*! |
622 | 20 | \qmltype ActivityIndicator | 20 | \qmltype ActivityIndicator |
624 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
625 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
626 | 23 | \brief The ActivityIndicator component visually indicates that a task of | 23 | \brief The ActivityIndicator component visually indicates that a task of |
627 | 24 | unknown duration is in progress, e.g. busy indication, connection in progress | 24 | unknown duration is in progress, e.g. busy indication, connection in progress |
628 | 25 | 25 | ||
629 | === modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml' | |||
630 | --- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml 2016-05-04 13:07:19 +0000 | |||
631 | +++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml 2016-06-01 11:49:05 +0000 | |||
632 | @@ -21,7 +21,7 @@ | |||
633 | 21 | 21 | ||
634 | 22 | /*! | 22 | /*! |
635 | 23 | \qmltype AdaptivePageLayout | 23 | \qmltype AdaptivePageLayout |
637 | 24 | \inqmlmodule Ubuntu.Components 1.3 | 24 | \inqmlmodule Ubuntu.Components |
638 | 25 | \since Ubuntu.Components 1.3 | 25 | \since Ubuntu.Components 1.3 |
639 | 26 | \ingroup ubuntu | 26 | \ingroup ubuntu |
640 | 27 | \brief View with multiple columns of Pages. | 27 | \brief View with multiple columns of Pages. |
641 | 28 | 28 | ||
642 | === modified file 'src/Ubuntu/Components/1.3/AnimatedItem.qml' | |||
643 | --- src/Ubuntu/Components/1.3/AnimatedItem.qml 2015-10-01 12:40:52 +0000 | |||
644 | +++ src/Ubuntu/Components/1.3/AnimatedItem.qml 2016-06-01 11:49:05 +0000 | |||
645 | @@ -16,7 +16,7 @@ | |||
646 | 16 | 16 | ||
647 | 17 | /*! | 17 | /*! |
648 | 18 | \qmltype AnimatedItem | 18 | \qmltype AnimatedItem |
650 | 19 | \inqmlmodule Ubuntu.Components 1.1 | 19 | \inqmlmodule Ubuntu.Components |
651 | 20 | \ingroup ubuntu | 20 | \ingroup ubuntu |
652 | 21 | \brief The AnimatedItem drives the animated components behavior inside a Flickable. | 21 | \brief The AnimatedItem drives the animated components behavior inside a Flickable. |
653 | 22 | Reports whether the component whos parent is a Flickable is in the visible area or not, | 22 | Reports whether the component whos parent is a Flickable is in the visible area or not, |
654 | 23 | 23 | ||
655 | === modified file 'src/Ubuntu/Components/1.3/AppHeader.qml' | |||
656 | --- src/Ubuntu/Components/1.3/AppHeader.qml 2016-02-01 21:22:01 +0000 | |||
657 | +++ src/Ubuntu/Components/1.3/AppHeader.qml 2016-06-01 11:49:05 +0000 | |||
658 | @@ -20,7 +20,7 @@ | |||
659 | 20 | /*! | 20 | /*! |
660 | 21 | \internal | 21 | \internal |
661 | 22 | \qmltype AppHeader | 22 | \qmltype AppHeader |
663 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
664 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
665 | 25 | */ | 25 | */ |
666 | 26 | Privates.AppHeaderBase { | 26 | Privates.AppHeaderBase { |
667 | 27 | 27 | ||
668 | === modified file 'src/Ubuntu/Components/1.3/Button.qml' | |||
669 | --- src/Ubuntu/Components/1.3/Button.qml 2015-09-28 14:36:54 +0000 | |||
670 | +++ src/Ubuntu/Components/1.3/Button.qml 2016-06-01 11:49:05 +0000 | |||
671 | @@ -19,7 +19,7 @@ | |||
672 | 19 | 19 | ||
673 | 20 | /*! | 20 | /*! |
674 | 21 | \qmltype Button | 21 | \qmltype Button |
676 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
677 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
678 | 24 | \brief Standard Ubuntu button. | 24 | \brief Standard Ubuntu button. |
679 | 25 | 25 | ||
680 | 26 | 26 | ||
681 | === modified file 'src/Ubuntu/Components/1.3/Captions.qml' | |||
682 | --- src/Ubuntu/Components/1.3/Captions.qml 2015-09-21 14:44:13 +0000 | |||
683 | +++ src/Ubuntu/Components/1.3/Captions.qml 2016-06-01 11:49:05 +0000 | |||
684 | @@ -20,7 +20,7 @@ | |||
685 | 20 | 20 | ||
686 | 21 | /*! | 21 | /*! |
687 | 22 | \qmltype Captions | 22 | \qmltype Captions |
689 | 23 | \inqmlmodule Ubuntu.Components 1.2 | 23 | \inqmlmodule Ubuntu.Components |
690 | 24 | \ingroup ubuntu-listitem | 24 | \ingroup ubuntu-listitem |
691 | 25 | \since Ubuntu.Components 1.2 | 25 | \since Ubuntu.Components 1.2 |
692 | 26 | \brief Container providing captionStyles for a twin-label column that can be used in | 26 | \brief Container providing captionStyles for a twin-label column that can be used in |
693 | 27 | 27 | ||
694 | === modified file 'src/Ubuntu/Components/1.3/CheckBox.qml' | |||
695 | --- src/Ubuntu/Components/1.3/CheckBox.qml 2015-09-28 14:36:54 +0000 | |||
696 | +++ src/Ubuntu/Components/1.3/CheckBox.qml 2016-06-01 11:49:05 +0000 | |||
697 | @@ -18,7 +18,7 @@ | |||
698 | 18 | import Ubuntu.Components 1.3 | 18 | import Ubuntu.Components 1.3 |
699 | 19 | /*! | 19 | /*! |
700 | 20 | \qmltype CheckBox | 20 | \qmltype CheckBox |
702 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
703 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
704 | 23 | \brief CheckBox is a component with two states, checked or unchecked. It can | 23 | \brief CheckBox is a component with two states, checked or unchecked. It can |
705 | 24 | be used to set boolean options. The behavior is the same as \l Switch, the | 24 | be used to set boolean options. The behavior is the same as \l Switch, the |
706 | 25 | 25 | ||
707 | === modified file 'src/Ubuntu/Components/1.3/ComboButton.qml' | |||
708 | --- src/Ubuntu/Components/1.3/ComboButton.qml 2016-05-11 15:38:00 +0000 | |||
709 | +++ src/Ubuntu/Components/1.3/ComboButton.qml 2016-06-01 11:49:05 +0000 | |||
710 | @@ -20,7 +20,7 @@ | |||
711 | 20 | 20 | ||
712 | 21 | /*! | 21 | /*! |
713 | 22 | \qmltype ComboButton | 22 | \qmltype ComboButton |
715 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
716 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
717 | 25 | \brief Ubuntu button providing a drop-down panel visualizing custom options. | 25 | \brief Ubuntu button providing a drop-down panel visualizing custom options. |
718 | 26 | 26 | ||
719 | 27 | 27 | ||
720 | === modified file 'src/Ubuntu/Components/1.3/Icon.qml' | |||
721 | --- src/Ubuntu/Components/1.3/Icon.qml 2016-02-11 08:56:13 +0000 | |||
722 | +++ src/Ubuntu/Components/1.3/Icon.qml 2016-06-01 11:49:05 +0000 | |||
723 | @@ -21,7 +21,7 @@ | |||
724 | 21 | 21 | ||
725 | 22 | /*! | 22 | /*! |
726 | 23 | \qmltype Icon | 23 | \qmltype Icon |
728 | 24 | \inqmlmodule Ubuntu.Components 1.3 | 24 | \inqmlmodule Ubuntu.Components |
729 | 25 | \inherits Item | 25 | \inherits Item |
730 | 26 | \ingroup ubuntu | 26 | \ingroup ubuntu |
731 | 27 | \brief The Icon component displays an icon from the icon theme. | 27 | \brief The Icon component displays an icon from the icon theme. |
732 | 28 | 28 | ||
733 | === modified file 'src/Ubuntu/Components/1.3/MainView.qml' | |||
734 | --- src/Ubuntu/Components/1.3/MainView.qml 2016-03-11 12:47:29 +0000 | |||
735 | +++ src/Ubuntu/Components/1.3/MainView.qml 2016-06-01 11:49:05 +0000 | |||
736 | @@ -21,7 +21,7 @@ | |||
737 | 21 | 21 | ||
738 | 22 | /*! | 22 | /*! |
739 | 23 | \qmltype MainView | 23 | \qmltype MainView |
741 | 24 | \inqmlmodule Ubuntu.Components 1.3 | 24 | \inqmlmodule Ubuntu.Components |
742 | 25 | \ingroup ubuntu | 25 | \ingroup ubuntu |
743 | 26 | \inherits StyledItem | 26 | \inherits StyledItem |
744 | 27 | \brief MainView is the root Item that should be used for all applications. | 27 | \brief MainView is the root Item that should be used for all applications. |
745 | 28 | 28 | ||
746 | === modified file 'src/Ubuntu/Components/1.3/OptionSelector.qml' | |||
747 | --- src/Ubuntu/Components/1.3/OptionSelector.qml 2016-01-27 13:58:29 +0000 | |||
748 | +++ src/Ubuntu/Components/1.3/OptionSelector.qml 2016-06-01 11:49:05 +0000 | |||
749 | @@ -20,7 +20,7 @@ | |||
750 | 20 | 20 | ||
751 | 21 | /*! | 21 | /*! |
752 | 22 | \qmltype OptionSelector | 22 | \qmltype OptionSelector |
754 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
755 | 24 | \ingroup ubuntu-components | 24 | \ingroup ubuntu-components |
756 | 25 | \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a | 25 | \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a |
757 | 26 | listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically. | 26 | listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically. |
758 | 27 | 27 | ||
759 | === modified file 'src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml' | |||
760 | --- src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml 2016-04-27 08:04:12 +0000 | |||
761 | +++ src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml 2016-06-01 11:49:05 +0000 | |||
762 | @@ -16,7 +16,7 @@ | |||
763 | 16 | 16 | ||
764 | 17 | /*! | 17 | /*! |
765 | 18 | \qmltype OptionSelectorDelegate | 18 | \qmltype OptionSelectorDelegate |
767 | 19 | \inqmlmodule Ubuntu.Components 1.1 | 19 | \inqmlmodule Ubuntu.Components |
768 | 20 | \ingroup ubuntu-components | 20 | \ingroup ubuntu-components |
769 | 21 | \brief OptionSelector delegate which can display text, subtext and an image from a custom model. | 21 | \brief OptionSelector delegate which can display text, subtext and an image from a custom model. |
770 | 22 | 22 | ||
771 | 23 | 23 | ||
772 | === modified file 'src/Ubuntu/Components/1.3/OrientationHelper.qml' | |||
773 | --- src/Ubuntu/Components/1.3/OrientationHelper.qml 2015-07-02 17:39:03 +0000 | |||
774 | +++ src/Ubuntu/Components/1.3/OrientationHelper.qml 2016-06-01 11:49:05 +0000 | |||
775 | @@ -20,7 +20,7 @@ | |||
776 | 20 | 20 | ||
777 | 21 | /*! | 21 | /*! |
778 | 22 | \qmltype OrientationHelper | 22 | \qmltype OrientationHelper |
780 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
781 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
782 | 25 | \brief The OrientationHelper automatically rotates its children following the | 25 | \brief The OrientationHelper automatically rotates its children following the |
783 | 26 | orientation of the device. | 26 | orientation of the device. |
784 | 27 | 27 | ||
785 | === modified file 'src/Ubuntu/Components/1.3/Page.qml' | |||
786 | --- src/Ubuntu/Components/1.3/Page.qml 2016-04-05 12:25:56 +0000 | |||
787 | +++ src/Ubuntu/Components/1.3/Page.qml 2016-06-01 11:49:05 +0000 | |||
788 | @@ -20,7 +20,7 @@ | |||
789 | 20 | 20 | ||
790 | 21 | /*! | 21 | /*! |
791 | 22 | \qmltype Page | 22 | \qmltype Page |
793 | 23 | \inqmlmodule Ubuntu.Components 1.3 | 23 | \inqmlmodule Ubuntu.Components |
794 | 24 | \inherits StyledItem | 24 | \inherits StyledItem |
795 | 25 | \ingroup ubuntu | 25 | \ingroup ubuntu |
796 | 26 | \brief A page is the basic Item that represents a single view in | 26 | \brief A page is the basic Item that represents a single view in |
797 | 27 | 27 | ||
798 | === modified file 'src/Ubuntu/Components/1.3/PageColumn.qml' | |||
799 | --- src/Ubuntu/Components/1.3/PageColumn.qml 2015-08-14 05:47:23 +0000 | |||
800 | +++ src/Ubuntu/Components/1.3/PageColumn.qml 2016-06-01 11:49:05 +0000 | |||
801 | @@ -18,7 +18,7 @@ | |||
802 | 18 | 18 | ||
803 | 19 | /*! | 19 | /*! |
804 | 20 | \qmltype PageColumn | 20 | \qmltype PageColumn |
806 | 21 | \inqmlmodule Ubuntu.Components 1.3 | 21 | \inqmlmodule Ubuntu.Components |
807 | 22 | \since Ubuntu.Components 1.3 | 22 | \since Ubuntu.Components 1.3 |
808 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
809 | 24 | \brief Component configuring the metrics of a column in AdaptivePageLayout. | 24 | \brief Component configuring the metrics of a column in AdaptivePageLayout. |
810 | 25 | 25 | ||
811 | === modified file 'src/Ubuntu/Components/1.3/PageColumnsLayout.qml' | |||
812 | --- src/Ubuntu/Components/1.3/PageColumnsLayout.qml 2015-08-12 15:19:55 +0000 | |||
813 | +++ src/Ubuntu/Components/1.3/PageColumnsLayout.qml 2016-06-01 11:49:05 +0000 | |||
814 | @@ -18,7 +18,7 @@ | |||
815 | 18 | 18 | ||
816 | 19 | /*! | 19 | /*! |
817 | 20 | \qmltype PageColumnsLayout | 20 | \qmltype PageColumnsLayout |
819 | 21 | \inqmlmodule Ubuntu.Components 1.3 | 21 | \inqmlmodule Ubuntu.Components |
820 | 22 | \since Ubuntu.Components 1.3 | 22 | \since Ubuntu.Components 1.3 |
821 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
822 | 24 | \brief Component configuring a layout in an AdaptivePageLayout component. | 24 | \brief Component configuring a layout in an AdaptivePageLayout component. |
823 | 25 | 25 | ||
824 | === modified file 'src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc' | |||
825 | --- src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc 2016-05-17 20:54:33 +0000 | |||
826 | +++ src/Ubuntu/Components/1.3/PageHeadConfiguration.qdoc 2016-06-01 11:49:05 +0000 | |||
827 | @@ -16,7 +16,7 @@ | |||
828 | 16 | 16 | ||
829 | 17 | /*! | 17 | /*! |
830 | 18 | \qmltype PageHeadConfiguration | 18 | \qmltype PageHeadConfiguration |
832 | 19 | \inqmlmodule Ubuntu.Components 1.1 | 19 | \inqmlmodule Ubuntu.Components |
833 | 20 | \ingroup ubuntu | 20 | \ingroup ubuntu |
834 | 21 | \since Ubuntu.Components 1.1 | 21 | \since Ubuntu.Components 1.1 |
835 | 22 | \deprecated | 22 | \deprecated |
836 | 23 | 23 | ||
837 | === modified file 'src/Ubuntu/Components/1.3/PageHeadSections.qml' | |||
838 | --- src/Ubuntu/Components/1.3/PageHeadSections.qml 2016-05-17 20:54:33 +0000 | |||
839 | +++ src/Ubuntu/Components/1.3/PageHeadSections.qml 2016-06-01 11:49:05 +0000 | |||
840 | @@ -19,7 +19,7 @@ | |||
841 | 19 | 19 | ||
842 | 20 | /*! | 20 | /*! |
843 | 21 | \qmltype PageHeadSections | 21 | \qmltype PageHeadSections |
845 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
846 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
847 | 24 | \since Ubuntu.Components 1.1 | 24 | \since Ubuntu.Components 1.1 |
848 | 25 | \deprecated | 25 | \deprecated |
849 | 26 | 26 | ||
850 | === modified file 'src/Ubuntu/Components/1.3/PageHeadState.qml' | |||
851 | --- src/Ubuntu/Components/1.3/PageHeadState.qml 2016-05-17 20:54:33 +0000 | |||
852 | +++ src/Ubuntu/Components/1.3/PageHeadState.qml 2016-06-01 11:49:05 +0000 | |||
853 | @@ -19,7 +19,7 @@ | |||
854 | 19 | 19 | ||
855 | 20 | /*! | 20 | /*! |
856 | 21 | \qmltype PageHeadState | 21 | \qmltype PageHeadState |
858 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
859 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
860 | 24 | \since Ubuntu.Components 1.1 | 24 | \since Ubuntu.Components 1.1 |
861 | 25 | \deprecated | 25 | \deprecated |
862 | 26 | 26 | ||
863 | === modified file 'src/Ubuntu/Components/1.3/PageHeader.qml' | |||
864 | --- src/Ubuntu/Components/1.3/PageHeader.qml 2016-03-29 22:42:01 +0000 | |||
865 | +++ src/Ubuntu/Components/1.3/PageHeader.qml 2016-06-01 11:49:05 +0000 | |||
866 | @@ -19,7 +19,7 @@ | |||
867 | 19 | 19 | ||
868 | 20 | /*! | 20 | /*! |
869 | 21 | \qmltype PageHeader | 21 | \qmltype PageHeader |
871 | 22 | \inqmlmodule Ubuntu.Components 1.3 | 22 | \inqmlmodule Ubuntu.Components |
872 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
873 | 24 | \brief The PageHeader shows a title with a leading and a trailing | 24 | \brief The PageHeader shows a title with a leading and a trailing |
874 | 25 | \l ActionBar that add action buttons to the header. | 25 | \l ActionBar that add action buttons to the header. |
875 | 26 | 26 | ||
876 | === modified file 'src/Ubuntu/Components/1.3/PageStack.qml' | |||
877 | --- src/Ubuntu/Components/1.3/PageStack.qml 2016-04-08 22:22:21 +0000 | |||
878 | +++ src/Ubuntu/Components/1.3/PageStack.qml 2016-06-01 11:49:05 +0000 | |||
879 | @@ -21,7 +21,7 @@ | |||
880 | 21 | 21 | ||
881 | 22 | /*! | 22 | /*! |
882 | 23 | \qmltype PageStack | 23 | \qmltype PageStack |
884 | 24 | \inqmlmodule Ubuntu.Components 1.1 | 24 | \inqmlmodule Ubuntu.Components |
885 | 25 | \ingroup ubuntu | 25 | \ingroup ubuntu |
886 | 26 | \brief A stack of \l Page items that is used for inter-Page navigation. | 26 | \brief A stack of \l Page items that is used for inter-Page navigation. |
887 | 27 | Pages on the stack can be popped, and new Pages can be pushed. | 27 | Pages on the stack can be popped, and new Pages can be pushed. |
888 | 28 | 28 | ||
889 | === modified file 'src/Ubuntu/Components/1.3/Panel.qml' | |||
890 | --- src/Ubuntu/Components/1.3/Panel.qml 2016-01-26 09:53:02 +0000 | |||
891 | +++ src/Ubuntu/Components/1.3/Panel.qml 2016-06-01 11:49:05 +0000 | |||
892 | @@ -19,7 +19,7 @@ | |||
893 | 19 | 19 | ||
894 | 20 | /*! | 20 | /*! |
895 | 21 | \qmltype Panel | 21 | \qmltype Panel |
897 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
898 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
899 | 24 | \brief A panel that can be swiped in and out from an edge of the window by the user. | 24 | \brief A panel that can be swiped in and out from an edge of the window by the user. |
900 | 25 | For most applications, it is highly recommended to use the \l MainView instead which includes | 25 | For most applications, it is highly recommended to use the \l MainView instead which includes |
901 | 26 | 26 | ||
902 | === modified file 'src/Ubuntu/Components/1.3/ProgressBar.qml' | |||
903 | --- src/Ubuntu/Components/1.3/ProgressBar.qml 2015-10-01 06:51:58 +0000 | |||
904 | +++ src/Ubuntu/Components/1.3/ProgressBar.qml 2016-06-01 11:49:05 +0000 | |||
905 | @@ -18,7 +18,7 @@ | |||
906 | 18 | 18 | ||
907 | 19 | /*! | 19 | /*! |
908 | 20 | \qmltype ProgressBar | 20 | \qmltype ProgressBar |
910 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
911 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
912 | 23 | \brief The ProgressBar component visually indicates the progress of a process of | 23 | \brief The ProgressBar component visually indicates the progress of a process of |
913 | 24 | determinate or indeterminate duration. | 24 | determinate or indeterminate duration. |
914 | 25 | 25 | ||
915 | === modified file 'src/Ubuntu/Components/1.3/ProgressionSlot.qml' | |||
916 | --- src/Ubuntu/Components/1.3/ProgressionSlot.qml 2015-09-28 16:19:42 +0000 | |||
917 | +++ src/Ubuntu/Components/1.3/ProgressionSlot.qml 2016-06-01 11:49:05 +0000 | |||
918 | @@ -19,7 +19,7 @@ | |||
919 | 19 | 19 | ||
920 | 20 | /*! | 20 | /*! |
921 | 21 | \qmltype ProgressionSlot | 21 | \qmltype ProgressionSlot |
923 | 22 | \inqmlmodule Ubuntu.Components 1.3 | 22 | \inqmlmodule Ubuntu.Components |
924 | 23 | \inherits Icon | 23 | \inherits Icon |
925 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
926 | 25 | 25 | ||
927 | 26 | 26 | ||
928 | === modified file 'src/Ubuntu/Components/1.3/PullToRefresh.qml' | |||
929 | --- src/Ubuntu/Components/1.3/PullToRefresh.qml 2015-09-28 14:36:54 +0000 | |||
930 | +++ src/Ubuntu/Components/1.3/PullToRefresh.qml 2016-06-01 11:49:05 +0000 | |||
931 | @@ -19,7 +19,7 @@ | |||
932 | 19 | 19 | ||
933 | 20 | /*! | 20 | /*! |
934 | 21 | \qmltype PullToRefresh | 21 | \qmltype PullToRefresh |
936 | 22 | \inqmlmodule Ubuntu.Components 0.1 | 22 | \inqmlmodule Ubuntu.Components |
937 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
938 | 24 | \since Ubuntu.Components 1.1 | 24 | \since Ubuntu.Components 1.1 |
939 | 25 | \brief Pull-to-refresh component for Flickables to reload a model upon pull. | 25 | \brief Pull-to-refresh component for Flickables to reload a model upon pull. |
940 | 26 | 26 | ||
941 | === modified file 'src/Ubuntu/Components/1.3/ScrollView.qml' | |||
942 | --- src/Ubuntu/Components/1.3/ScrollView.qml 2016-03-30 13:42:32 +0000 | |||
943 | +++ src/Ubuntu/Components/1.3/ScrollView.qml 2016-06-01 11:49:05 +0000 | |||
944 | @@ -19,7 +19,7 @@ | |||
945 | 19 | 19 | ||
946 | 20 | /*! | 20 | /*! |
947 | 21 | \qmltype ScrollView | 21 | \qmltype ScrollView |
949 | 22 | \inqmlmodule Ubuntu.Components 1.3 | 22 | \inqmlmodule Ubuntu.Components |
950 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
951 | 24 | \inherits StyledItem | 24 | \inherits StyledItem |
952 | 25 | \brief ScrollView is a scrollable view that features scrollbars and scrolling via keyboard keys. | 25 | \brief ScrollView is a scrollable view that features scrollbars and scrolling via keyboard keys. |
953 | 26 | 26 | ||
954 | === modified file 'src/Ubuntu/Components/1.3/Scrollbar.qml' | |||
955 | --- src/Ubuntu/Components/1.3/Scrollbar.qml 2016-03-30 15:14:32 +0000 | |||
956 | +++ src/Ubuntu/Components/1.3/Scrollbar.qml 2016-06-01 11:49:05 +0000 | |||
957 | @@ -19,7 +19,7 @@ | |||
958 | 19 | 19 | ||
959 | 20 | /*! | 20 | /*! |
960 | 21 | \qmltype Scrollbar | 21 | \qmltype Scrollbar |
962 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
963 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
964 | 24 | \brief The Scrollbar component provides scrolling functionality for | 24 | \brief The Scrollbar component provides scrolling functionality for |
965 | 25 | scrollable views (i.e. Flickable, ListView). | 25 | scrollable views (i.e. Flickable, ListView). |
966 | 26 | 26 | ||
967 | === modified file 'src/Ubuntu/Components/1.3/Sections.qml' | |||
968 | --- src/Ubuntu/Components/1.3/Sections.qml 2016-04-25 18:58:29 +0000 | |||
969 | +++ src/Ubuntu/Components/1.3/Sections.qml 2016-06-01 11:49:05 +0000 | |||
970 | @@ -19,7 +19,7 @@ | |||
971 | 19 | 19 | ||
972 | 20 | /*! | 20 | /*! |
973 | 21 | \qmltype Sections | 21 | \qmltype Sections |
975 | 22 | \inqmlmodule Ubuntu.Components 1.3 | 22 | \inqmlmodule Ubuntu.Components |
976 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
977 | 24 | \since Ubuntu.Components 1.3 | 24 | \since Ubuntu.Components 1.3 |
978 | 25 | \brief Display a list of sections that the user can select. By tapping | 25 | \brief Display a list of sections that the user can select. By tapping |
979 | 26 | 26 | ||
980 | === modified file 'src/Ubuntu/Components/1.3/Slider.qml' | |||
981 | --- src/Ubuntu/Components/1.3/Slider.qml 2016-02-12 12:51:32 +0000 | |||
982 | +++ src/Ubuntu/Components/1.3/Slider.qml 2016-06-01 11:49:05 +0000 | |||
983 | @@ -21,7 +21,7 @@ | |||
984 | 21 | 21 | ||
985 | 22 | /*! | 22 | /*! |
986 | 23 | \qmltype Slider | 23 | \qmltype Slider |
988 | 24 | \inqmlmodule Ubuntu.Components 1.1 | 24 | \inqmlmodule Ubuntu.Components |
989 | 25 | \ingroup ubuntu | 25 | \ingroup ubuntu |
990 | 26 | \brief Slider is a component to select a value from a continuous range of | 26 | \brief Slider is a component to select a value from a continuous range of |
991 | 27 | values. | 27 | values. |
992 | 28 | 28 | ||
993 | === modified file 'src/Ubuntu/Components/1.3/Switch.qml' | |||
994 | --- src/Ubuntu/Components/1.3/Switch.qml 2015-05-21 10:50:35 +0000 | |||
995 | +++ src/Ubuntu/Components/1.3/Switch.qml 2016-06-01 11:49:05 +0000 | |||
996 | @@ -21,7 +21,7 @@ | |||
997 | 21 | 21 | ||
998 | 22 | /*! | 22 | /*! |
999 | 23 | \qmltype Switch | 23 | \qmltype Switch |
1001 | 24 | \inqmlmodule Ubuntu.Components 1.1 | 24 | \inqmlmodule Ubuntu.Components |
1002 | 25 | \ingroup ubuntu | 25 | \ingroup ubuntu |
1003 | 26 | \brief Switch is a component with two states, checked or unchecked. It can | 26 | \brief Switch is a component with two states, checked or unchecked. It can |
1004 | 27 | be used to set boolean options. The behavior is the same as \l CheckBox, the | 27 | be used to set boolean options. The behavior is the same as \l CheckBox, the |
1005 | 28 | 28 | ||
1006 | === modified file 'src/Ubuntu/Components/1.3/Tab.qml' | |||
1007 | --- src/Ubuntu/Components/1.3/Tab.qml 2016-05-17 20:54:33 +0000 | |||
1008 | +++ src/Ubuntu/Components/1.3/Tab.qml 2016-06-01 11:49:05 +0000 | |||
1009 | @@ -19,7 +19,7 @@ | |||
1010 | 19 | 19 | ||
1011 | 20 | /*! | 20 | /*! |
1012 | 21 | \qmltype Tab | 21 | \qmltype Tab |
1014 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
1015 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
1016 | 24 | \deprecated | 24 | \deprecated |
1017 | 25 | \brief Component to represent a single tab in a \l Tabs environment. | 25 | \brief Component to represent a single tab in a \l Tabs environment. |
1018 | 26 | 26 | ||
1019 | === modified file 'src/Ubuntu/Components/1.3/TabBar.qml' | |||
1020 | --- src/Ubuntu/Components/1.3/TabBar.qml 2016-05-17 20:54:33 +0000 | |||
1021 | +++ src/Ubuntu/Components/1.3/TabBar.qml 2016-06-01 11:49:05 +0000 | |||
1022 | @@ -19,7 +19,7 @@ | |||
1023 | 19 | 19 | ||
1024 | 20 | /*! | 20 | /*! |
1025 | 21 | \qmltype TabBar | 21 | \qmltype TabBar |
1027 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
1028 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
1029 | 24 | \deprecated | 24 | \deprecated |
1030 | 25 | \brief Tab bar that will be shown in the header when \l Tabs is active. | 25 | \brief Tab bar that will be shown in the header when \l Tabs is active. |
1031 | 26 | 26 | ||
1032 | === modified file 'src/Ubuntu/Components/1.3/Tabs.qml' | |||
1033 | --- src/Ubuntu/Components/1.3/Tabs.qml 2016-05-17 20:54:33 +0000 | |||
1034 | +++ src/Ubuntu/Components/1.3/Tabs.qml 2016-06-01 11:49:05 +0000 | |||
1035 | @@ -19,7 +19,7 @@ | |||
1036 | 19 | 19 | ||
1037 | 20 | /*! | 20 | /*! |
1038 | 21 | \qmltype Tabs | 21 | \qmltype Tabs |
1040 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
1041 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
1042 | 24 | \deprecated | 24 | \deprecated |
1043 | 25 | \brief The Tabs class provides an environment where multible \l Tab | 25 | \brief The Tabs class provides an environment where multible \l Tab |
1044 | 26 | 26 | ||
1045 | === modified file 'src/Ubuntu/Components/1.3/TextArea.qml' | |||
1046 | --- src/Ubuntu/Components/1.3/TextArea.qml 2016-05-12 16:30:27 +0000 | |||
1047 | +++ src/Ubuntu/Components/1.3/TextArea.qml 2016-06-01 11:49:05 +0000 | |||
1048 | @@ -20,7 +20,7 @@ | |||
1049 | 20 | 20 | ||
1050 | 21 | /*! | 21 | /*! |
1051 | 22 | \qmltype TextArea | 22 | \qmltype TextArea |
1053 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
1054 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
1055 | 25 | \brief The TextArea item displays a block of editable, scrollable, formatted | 25 | \brief The TextArea item displays a block of editable, scrollable, formatted |
1056 | 26 | text. | 26 | text. |
1057 | 27 | 27 | ||
1058 | === modified file 'src/Ubuntu/Components/1.3/TextField.qml' | |||
1059 | --- src/Ubuntu/Components/1.3/TextField.qml 2016-05-02 18:27:11 +0000 | |||
1060 | +++ src/Ubuntu/Components/1.3/TextField.qml 2016-06-01 11:49:05 +0000 | |||
1061 | @@ -20,7 +20,7 @@ | |||
1062 | 20 | 20 | ||
1063 | 21 | /*! | 21 | /*! |
1064 | 22 | \qmltype TextField | 22 | \qmltype TextField |
1066 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
1067 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
1068 | 25 | \brief The TextField element displays a single line of editable plain text. | 25 | \brief The TextField element displays a single line of editable plain text. |
1069 | 26 | Input constraints can be set through validator or inputMask. Setting echoMode | 26 | Input constraints can be set through validator or inputMask. Setting echoMode |
1070 | 27 | 27 | ||
1071 | === modified file 'src/Ubuntu/Components/1.3/Toolbar.qml' | |||
1072 | --- src/Ubuntu/Components/1.3/Toolbar.qml 2016-01-13 16:07:58 +0000 | |||
1073 | +++ src/Ubuntu/Components/1.3/Toolbar.qml 2016-06-01 11:49:05 +0000 | |||
1074 | @@ -21,7 +21,7 @@ | |||
1075 | 21 | // by the new text button when it becomes available. | 21 | // by the new text button when it becomes available. |
1076 | 22 | /*! | 22 | /*! |
1077 | 23 | \qmltype Toolbar | 23 | \qmltype Toolbar |
1079 | 24 | \inqmlmodule Ubuntu.Components 1.3 | 24 | \inqmlmodule Ubuntu.Components |
1080 | 25 | \ingroup ubuntu | 25 | \ingroup ubuntu |
1081 | 26 | \brief Toolbar that can be used as an extension for the edit mode header. | 26 | \brief Toolbar that can be used as an extension for the edit mode header. |
1082 | 27 | Example: | 27 | Example: |
1083 | 28 | 28 | ||
1084 | === modified file 'src/Ubuntu/Components/1.3/ToolbarButton.qml' | |||
1085 | --- src/Ubuntu/Components/1.3/ToolbarButton.qml 2016-05-17 20:54:33 +0000 | |||
1086 | +++ src/Ubuntu/Components/1.3/ToolbarButton.qml 2016-06-01 11:49:05 +0000 | |||
1087 | @@ -19,7 +19,7 @@ | |||
1088 | 19 | 19 | ||
1089 | 20 | /*! | 20 | /*! |
1090 | 21 | \qmltype ToolbarButton | 21 | \qmltype ToolbarButton |
1092 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
1093 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
1094 | 24 | \deprecated | 24 | \deprecated |
1095 | 25 | \brief An \l ActionItem that represents a button in the toolbar. | 25 | \brief An \l ActionItem that represents a button in the toolbar. |
1096 | 26 | 26 | ||
1097 | === modified file 'src/Ubuntu/Components/1.3/ToolbarItems.qml' | |||
1098 | --- src/Ubuntu/Components/1.3/ToolbarItems.qml 2016-05-17 20:54:33 +0000 | |||
1099 | +++ src/Ubuntu/Components/1.3/ToolbarItems.qml 2016-06-01 11:49:05 +0000 | |||
1100 | @@ -18,7 +18,7 @@ | |||
1101 | 18 | 18 | ||
1102 | 19 | /*! | 19 | /*! |
1103 | 20 | \qmltype ToolbarItems | 20 | \qmltype ToolbarItems |
1105 | 21 | \inqmlmodule Ubuntu.Components 1.1 | 21 | \inqmlmodule Ubuntu.Components |
1106 | 22 | \ingroup ubuntu | 22 | \ingroup ubuntu |
1107 | 23 | \deprecated | 23 | \deprecated |
1108 | 24 | \brief Row of Items to be placed in a toolbar. | 24 | \brief Row of Items to be placed in a toolbar. |
1109 | 25 | 25 | ||
1110 | === modified file 'src/Ubuntu/Components/1.3/UbuntuColors.qml' | |||
1111 | --- src/Ubuntu/Components/1.3/UbuntuColors.qml 2016-01-22 19:51:10 +0000 | |||
1112 | +++ src/Ubuntu/Components/1.3/UbuntuColors.qml 2016-06-01 11:49:05 +0000 | |||
1113 | @@ -19,7 +19,7 @@ | |||
1114 | 19 | 19 | ||
1115 | 20 | /*! | 20 | /*! |
1116 | 21 | \qmltype UbuntuColors | 21 | \qmltype UbuntuColors |
1118 | 22 | \inqmlmodule Ubuntu.Components 1.3 | 22 | \inqmlmodule Ubuntu.Components |
1119 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
1120 | 24 | \brief Singleton defining the Ubuntu color palette. | 24 | \brief Singleton defining the Ubuntu color palette. |
1121 | 25 | 25 | ||
1122 | 26 | 26 | ||
1123 | === modified file 'src/Ubuntu/Components/1.3/UbuntuListView.qml' | |||
1124 | --- src/Ubuntu/Components/1.3/UbuntuListView.qml 2016-04-27 07:21:45 +0000 | |||
1125 | +++ src/Ubuntu/Components/1.3/UbuntuListView.qml 2016-06-01 11:49:05 +0000 | |||
1126 | @@ -19,7 +19,7 @@ | |||
1127 | 19 | 19 | ||
1128 | 20 | /*! | 20 | /*! |
1129 | 21 | \qmltype UbuntuListView | 21 | \qmltype UbuntuListView |
1131 | 22 | \inqmlmodule Ubuntu.Components 1.1 | 22 | \inqmlmodule Ubuntu.Components |
1132 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
1133 | 24 | \inherits ListView | 24 | \inherits ListView |
1134 | 25 | \brief A ListView with special features tailored for a look and feel fitting the | 25 | \brief A ListView with special features tailored for a look and feel fitting the |
1135 | 26 | 26 | ||
1136 | === modified file 'src/Ubuntu/Components/1.3/UbuntuNumberAnimation.qml' | |||
1137 | --- src/Ubuntu/Components/1.3/UbuntuNumberAnimation.qml 2015-04-25 08:54:58 +0000 | |||
1138 | +++ src/Ubuntu/Components/1.3/UbuntuNumberAnimation.qml 2016-06-01 11:49:05 +0000 | |||
1139 | @@ -20,7 +20,7 @@ | |||
1140 | 20 | 20 | ||
1141 | 21 | /*! | 21 | /*! |
1142 | 22 | \qmltype UbuntuNumberAnimation | 22 | \qmltype UbuntuNumberAnimation |
1144 | 23 | \inqmlmodule Ubuntu.Components 1.1 | 23 | \inqmlmodule Ubuntu.Components |
1145 | 24 | \ingroup ubuntu | 24 | \ingroup ubuntu |
1146 | 25 | \brief UbuntuNumberAnimation is a NumberAnimation that has predefined | 25 | \brief UbuntuNumberAnimation is a NumberAnimation that has predefined |
1147 | 26 | settings to ensure that Ubuntu applications are consistent in their animations. | 26 | settings to ensure that Ubuntu applications are consistent in their animations. |
1148 | 27 | 27 | ||
1149 | === modified file 'src/Ubuntu/Components/1.3/dateUtils.js' | |||
1150 | --- src/Ubuntu/Components/1.3/dateUtils.js 2015-07-17 14:42:26 +0000 | |||
1151 | +++ src/Ubuntu/Components/1.3/dateUtils.js 2016-06-01 11:49:05 +0000 | |||
1152 | @@ -16,7 +16,7 @@ | |||
1153 | 16 | 16 | ||
1154 | 17 | /*! | 17 | /*! |
1155 | 18 | \qmltype dateUtils | 18 | \qmltype dateUtils |
1157 | 19 | \inqmlmodule Ubuntu.Components 1.3 | 19 | \inqmlmodule Ubuntu.Components |
1158 | 20 | \ingroup ubuntu | 20 | \ingroup ubuntu |
1159 | 21 | \brief Various date utility functions. | 21 | \brief Various date utility functions. |
1160 | 22 | */ | 22 | */ |
1161 | 23 | 23 | ||
1162 | === modified file 'src/Ubuntu/Components/1.3/pageUtils.js' | |||
1163 | --- src/Ubuntu/Components/1.3/pageUtils.js 2015-07-17 14:42:26 +0000 | |||
1164 | +++ src/Ubuntu/Components/1.3/pageUtils.js 2016-06-01 11:49:05 +0000 | |||
1165 | @@ -16,7 +16,7 @@ | |||
1166 | 16 | 16 | ||
1167 | 17 | /*! | 17 | /*! |
1168 | 18 | \qmltype pageUtils | 18 | \qmltype pageUtils |
1170 | 19 | \inqmlmodule Ubuntu.Components 1.3 | 19 | \inqmlmodule Ubuntu.Components |
1171 | 20 | \ingroup ubuntu | 20 | \ingroup ubuntu |
1172 | 21 | \internal | 21 | \internal |
1173 | 22 | \brief Page-related utility functions. | 22 | \brief Page-related utility functions. |
1174 | 23 | 23 | ||
1175 | === modified file 'src/Ubuntu/Components/Pickers/1.2/PickerPanel.qml' | |||
1176 | --- src/Ubuntu/Components/Pickers/1.2/PickerPanel.qml 2015-04-30 08:32:44 +0000 | |||
1177 | +++ src/Ubuntu/Components/Pickers/1.2/PickerPanel.qml 2016-06-01 11:49:05 +0000 | |||
1178 | @@ -23,7 +23,7 @@ | |||
1179 | 23 | 23 | ||
1180 | 24 | /*! | 24 | /*! |
1181 | 25 | \qmltype PickerPanel | 25 | \qmltype PickerPanel |
1183 | 26 | \inqmlmodule Ubuntu.Components 1.1 | 26 | \inqmlmodule Ubuntu.Components |
1184 | 27 | \ingroup ubuntu-pickers | 27 | \ingroup ubuntu-pickers |
1185 | 28 | \brief Provides a panel for opening a DatePicker in place of the input panel or | 28 | \brief Provides a panel for opening a DatePicker in place of the input panel or |
1186 | 29 | as Popover, depending on the form factor. | 29 | as Popover, depending on the form factor. |
1187 | 30 | 30 | ||
1188 | === modified file 'src/Ubuntu/Components/Pickers/1.3/PickerPanel.qml' | |||
1189 | --- src/Ubuntu/Components/Pickers/1.3/PickerPanel.qml 2015-04-29 08:55:31 +0000 | |||
1190 | +++ src/Ubuntu/Components/Pickers/1.3/PickerPanel.qml 2016-06-01 11:49:05 +0000 | |||
1191 | @@ -23,7 +23,7 @@ | |||
1192 | 23 | 23 | ||
1193 | 24 | /*! | 24 | /*! |
1194 | 25 | \qmltype PickerPanel | 25 | \qmltype PickerPanel |
1196 | 26 | \inqmlmodule Ubuntu.Components 1.1 | 26 | \inqmlmodule Ubuntu.Components |
1197 | 27 | \ingroup ubuntu-pickers | 27 | \ingroup ubuntu-pickers |
1198 | 28 | \brief Provides a panel for opening a DatePicker in place of the input panel or | 28 | \brief Provides a panel for opening a DatePicker in place of the input panel or |
1199 | 29 | as Popover, depending on the form factor. | 29 | as Popover, depending on the form factor. |
1200 | 30 | 30 | ||
1201 | === modified file 'src/Ubuntu/Components/plugin/i18n.cpp' | |||
1202 | --- src/Ubuntu/Components/plugin/i18n.cpp 2016-02-09 19:06:54 +0000 | |||
1203 | +++ src/Ubuntu/Components/plugin/i18n.cpp 2016-06-01 11:49:05 +0000 | |||
1204 | @@ -32,7 +32,7 @@ | |||
1205 | 32 | /*! | 32 | /*! |
1206 | 33 | * \qmltype i18n | 33 | * \qmltype i18n |
1207 | 34 | * \instantiates UbuntuI18n | 34 | * \instantiates UbuntuI18n |
1209 | 35 | * \inqmlmodule Ubuntu.Components 1.1 | 35 | * \inqmlmodule Ubuntu.Components |
1210 | 36 | * \ingroup ubuntu | 36 | * \ingroup ubuntu |
1211 | 37 | * \brief i18n is a context property that provides internationalization support. | 37 | * \brief i18n is a context property that provides internationalization support. |
1212 | 38 | * | 38 | * |
1213 | 39 | 39 | ||
1214 | === modified file 'src/Ubuntu/Components/plugin/inversemouseareatype.cpp' | |||
1215 | --- src/Ubuntu/Components/plugin/inversemouseareatype.cpp 2016-02-01 18:57:26 +0000 | |||
1216 | +++ src/Ubuntu/Components/plugin/inversemouseareatype.cpp 2016-06-01 11:49:05 +0000 | |||
1217 | @@ -21,7 +21,7 @@ | |||
1218 | 21 | /*! | 21 | /*! |
1219 | 22 | \qmltype InverseMouseArea | 22 | \qmltype InverseMouseArea |
1220 | 23 | \instantiates InverseMouseAreaType | 23 | \instantiates InverseMouseAreaType |
1222 | 24 | \inqmlmodule Ubuntu.Components 1.1 | 24 | \inqmlmodule Ubuntu.Components |
1223 | 25 | \ingroup ubuntu | 25 | \ingroup ubuntu |
1224 | 26 | \brief The InverseMouseArea captures mouse events happening outside of a given | 26 | \brief The InverseMouseArea captures mouse events happening outside of a given |
1225 | 27 | area. | 27 | area. |
1226 | 28 | 28 | ||
1227 | === modified file 'src/Ubuntu/Components/plugin/livetimer.cpp' | |||
1228 | --- src/Ubuntu/Components/plugin/livetimer.cpp 2015-08-12 09:56:33 +0000 | |||
1229 | +++ src/Ubuntu/Components/plugin/livetimer.cpp 2016-06-01 11:49:05 +0000 | |||
1230 | @@ -19,7 +19,7 @@ | |||
1231 | 19 | 19 | ||
1232 | 20 | /*! \qmltype LiveTimer | 20 | /*! \qmltype LiveTimer |
1233 | 21 | \instantiates LiveTimer | 21 | \instantiates LiveTimer |
1235 | 22 | \inqmlmodule Ubuntu.Components 1.3 | 22 | \inqmlmodule Ubuntu.Components |
1236 | 23 | \ingroup ubuntu | 23 | \ingroup ubuntu |
1237 | 24 | \since Ubuntu.Components 1.3 | 24 | \since Ubuntu.Components 1.3 |
1238 | 25 | \brief A live timing source providing peridioc updates. | 25 | \brief A live timing source providing peridioc updates. |
1239 | 26 | 26 | ||
1240 | === modified file 'src/Ubuntu/Components/plugin/privates/ucpagewrapper.cpp' | |||
1241 | --- src/Ubuntu/Components/plugin/privates/ucpagewrapper.cpp 2016-02-19 13:00:26 +0000 | |||
1242 | +++ src/Ubuntu/Components/plugin/privates/ucpagewrapper.cpp 2016-06-01 11:49:05 +0000 | |||
1243 | @@ -456,7 +456,7 @@ | |||
1244 | 456 | /*! | 456 | /*! |
1245 | 457 | \internal | 457 | \internal |
1246 | 458 | \qmltype PageWrapper | 458 | \qmltype PageWrapper |
1248 | 459 | \inqmlmodule Ubuntu.Components 1.1 | 459 | \inqmlmodule Ubuntu.Components |
1249 | 460 | \ingroup ubuntu | 460 | \ingroup ubuntu |
1250 | 461 | \brief Internal class used by \l PageStack | 461 | \brief Internal class used by \l PageStack |
1251 | 462 | */ | 462 | */ |
1252 | 463 | 463 | ||
1253 | === modified file 'src/Ubuntu/Components/plugin/qquickclipboard.cpp' | |||
1254 | --- src/Ubuntu/Components/plugin/qquickclipboard.cpp 2015-01-28 15:01:35 +0000 | |||
1255 | +++ src/Ubuntu/Components/plugin/qquickclipboard.cpp 2016-06-01 11:49:05 +0000 | |||
1256 | @@ -26,7 +26,7 @@ | |||
1257 | 26 | /*! | 26 | /*! |
1258 | 27 | * \qmltype Clipboard | 27 | * \qmltype Clipboard |
1259 | 28 | * \instantiates QQuickClipboard | 28 | * \instantiates QQuickClipboard |
1261 | 29 | * \inqmlmodule Ubuntu.Components 1.1 | 29 | * \inqmlmodule Ubuntu.Components |
1262 | 30 | * \ingroup ubuntu | 30 | * \ingroup ubuntu |
1263 | 31 | * \brief This is a singleton type providing access to the system clipboard. | 31 | * \brief This is a singleton type providing access to the system clipboard. |
1264 | 32 | * | 32 | * |
1265 | 33 | 33 | ||
1266 | === modified file 'src/Ubuntu/Components/plugin/qquickmimedata.cpp' | |||
1267 | --- src/Ubuntu/Components/plugin/qquickmimedata.cpp 2014-04-23 08:50:20 +0000 | |||
1268 | +++ src/Ubuntu/Components/plugin/qquickmimedata.cpp 2016-06-01 11:49:05 +0000 | |||
1269 | @@ -28,7 +28,7 @@ | |||
1270 | 28 | /*! | 28 | /*! |
1271 | 29 | * \qmltype MimeData | 29 | * \qmltype MimeData |
1272 | 30 | * \instantiates QQuickMimeData | 30 | * \instantiates QQuickMimeData |
1274 | 31 | * \inqmlmodule Ubuntu.Components 1.1 | 31 | * \inqmlmodule Ubuntu.Components |
1275 | 32 | * \ingroup ubuntu | 32 | * \ingroup ubuntu |
1276 | 33 | * \brief MimeData type provides interface to access and store data to the | 33 | * \brief MimeData type provides interface to access and store data to the |
1277 | 34 | * Clipboard. | 34 | * Clipboard. |
1278 | 35 | 35 | ||
1279 | === modified file 'src/Ubuntu/Components/plugin/sortfiltermodel.cpp' | |||
1280 | --- src/Ubuntu/Components/plugin/sortfiltermodel.cpp 2015-09-14 17:34:00 +0000 | |||
1281 | +++ src/Ubuntu/Components/plugin/sortfiltermodel.cpp 2016-06-01 11:49:05 +0000 | |||
1282 | @@ -23,7 +23,7 @@ | |||
1283 | 23 | /*! | 23 | /*! |
1284 | 24 | * \qmltype SortFilterModel | 24 | * \qmltype SortFilterModel |
1285 | 25 | * \instantiates QSortFilterProxyModelQML | 25 | * \instantiates QSortFilterProxyModelQML |
1287 | 26 | * \inqmlmodule Ubuntu.Components 0.1 | 26 | * \inqmlmodule Ubuntu.Components |
1288 | 27 | * \ingroup ubuntu | 27 | * \ingroup ubuntu |
1289 | 28 | * \brief SortFilterModel sorts and filters rows from an existing model. | 28 | * \brief SortFilterModel sorts and filters rows from an existing model. |
1290 | 29 | * | 29 | * |
1291 | 30 | 30 | ||
1292 | === modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp' | |||
1293 | --- src/Ubuntu/Components/plugin/ucabstractbutton.cpp 2016-04-25 10:35:48 +0000 | |||
1294 | +++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp 2016-06-01 11:49:05 +0000 | |||
1295 | @@ -46,7 +46,7 @@ | |||
1296 | 46 | \qmltype AbstractButton | 46 | \qmltype AbstractButton |
1297 | 47 | \instantiates UCAbstractButton | 47 | \instantiates UCAbstractButton |
1298 | 48 | \inherits ActionItem | 48 | \inherits ActionItem |
1300 | 49 | \inqmlmodule Ubuntu.Components 1.1 | 49 | \inqmlmodule Ubuntu.Components |
1301 | 50 | \ingroup ubuntu | 50 | \ingroup ubuntu |
1302 | 51 | \brief The AbstractButton class defines the behavior of the button. | 51 | \brief The AbstractButton class defines the behavior of the button. |
1303 | 52 | 52 | ||
1304 | @@ -217,7 +217,7 @@ | |||
1305 | 217 | Q_EMIT q->pressAndHold(); | 217 | Q_EMIT q->pressAndHold(); |
1306 | 218 | } | 218 | } |
1307 | 219 | 219 | ||
1309 | 220 | // emit clicked when Enter/Return is pressed | 220 | // emit clicked when Enter/Return/Space is pressed |
1310 | 221 | void UCAbstractButton::keyReleaseEvent(QKeyEvent *event) | 221 | void UCAbstractButton::keyReleaseEvent(QKeyEvent *event) |
1311 | 222 | { | 222 | { |
1312 | 223 | UCActionItem::keyReleaseEvent(event); | 223 | UCActionItem::keyReleaseEvent(event); |
1313 | @@ -226,6 +226,7 @@ | |||
1314 | 226 | case Qt::Key_Enter: | 226 | case Qt::Key_Enter: |
1315 | 227 | case Qt::Key_Return: | 227 | case Qt::Key_Return: |
1316 | 228 | case Qt::Key_Space: | 228 | case Qt::Key_Space: |
1317 | 229 | event->accept(); | ||
1318 | 229 | d_func()->onClicked(); | 230 | d_func()->onClicked(); |
1319 | 230 | break; | 231 | break; |
1320 | 231 | default: | 232 | default: |
1321 | 232 | 233 | ||
1322 | === modified file 'src/Ubuntu/Components/plugin/ucaction.cpp' | |||
1323 | --- src/Ubuntu/Components/plugin/ucaction.cpp 2016-02-01 18:57:26 +0000 | |||
1324 | +++ src/Ubuntu/Components/plugin/ucaction.cpp 2016-06-01 11:49:05 +0000 | |||
1325 | @@ -84,7 +84,7 @@ | |||
1326 | 84 | /*! | 84 | /*! |
1327 | 85 | * \qmltype Action | 85 | * \qmltype Action |
1328 | 86 | * \instantiates UCAction | 86 | * \instantiates UCAction |
1330 | 87 | * \inqmlmodule Ubuntu.Components 1.1 | 87 | * \inqmlmodule Ubuntu.Components |
1331 | 88 | * \ingroup ubuntu | 88 | * \ingroup ubuntu |
1332 | 89 | * \brief Describe an action that can be re-used and shared between different | 89 | * \brief Describe an action that can be re-used and shared between different |
1333 | 90 | * components. | 90 | * components. |
1334 | 91 | 91 | ||
1335 | === modified file 'src/Ubuntu/Components/plugin/ucactioncontext.cpp' | |||
1336 | --- src/Ubuntu/Components/plugin/ucactioncontext.cpp 2016-01-12 14:22:30 +0000 | |||
1337 | +++ src/Ubuntu/Components/plugin/ucactioncontext.cpp 2016-06-01 11:49:05 +0000 | |||
1338 | @@ -33,7 +33,7 @@ | |||
1339 | 33 | /*! | 33 | /*! |
1340 | 34 | * \qmltype ActionContext | 34 | * \qmltype ActionContext |
1341 | 35 | * \instantiates UCActionContext | 35 | * \instantiates UCActionContext |
1343 | 36 | * \inqmlmodule Ubuntu.Components 1.1 | 36 | * \inqmlmodule Ubuntu.Components |
1344 | 37 | * \ingroup ubuntu | 37 | * \ingroup ubuntu |
1345 | 38 | * \brief ActionContext groups actions together and by providing multiple contexts | 38 | * \brief ActionContext groups actions together and by providing multiple contexts |
1346 | 39 | * the developer is able to control the visibility of the actions. The \l ActionManager | 39 | * the developer is able to control the visibility of the actions. The \l ActionManager |
1347 | @@ -256,7 +256,7 @@ | |||
1348 | 256 | /*! | 256 | /*! |
1349 | 257 | * \qmltype PopupContext | 257 | * \qmltype PopupContext |
1350 | 258 | * \instantiates UCPopupContext | 258 | * \instantiates UCPopupContext |
1352 | 259 | * \inqmlmodule Ubuntu.Components 1.3 | 259 | * \inqmlmodule Ubuntu.Components |
1353 | 260 | * \since Ubuntu.Components 1.3 | 260 | * \since Ubuntu.Components 1.3 |
1354 | 261 | * \inherits ActionContext | 261 | * \inherits ActionContext |
1355 | 262 | * \ingroup ubuntu | 262 | * \ingroup ubuntu |
1356 | 263 | 263 | ||
1357 | === modified file 'src/Ubuntu/Components/plugin/ucactionitem.cpp' | |||
1358 | --- src/Ubuntu/Components/plugin/ucactionitem.cpp 2015-12-21 17:49:59 +0000 | |||
1359 | +++ src/Ubuntu/Components/plugin/ucactionitem.cpp 2016-06-01 11:49:05 +0000 | |||
1360 | @@ -38,7 +38,7 @@ | |||
1361 | 38 | /*! | 38 | /*! |
1362 | 39 | * \qmltype ActionItem | 39 | * \qmltype ActionItem |
1363 | 40 | * \instantiates UCActionItem | 40 | * \instantiates UCActionItem |
1365 | 41 | * \inqmlmodule Ubuntu.Components 1.1 | 41 | * \inqmlmodule Ubuntu.Components |
1366 | 42 | * \ingroup ubuntu | 42 | * \ingroup ubuntu |
1367 | 43 | * \brief A visual representation of an Action. The API of ActionItem is a | 43 | * \brief A visual representation of an Action. The API of ActionItem is a |
1368 | 44 | * copy of the API of \l Action, with additional properties to define | 44 | * copy of the API of \l Action, with additional properties to define |
1369 | 45 | 45 | ||
1370 | === modified file 'src/Ubuntu/Components/plugin/ucactionmanager.cpp' | |||
1371 | --- src/Ubuntu/Components/plugin/ucactionmanager.cpp 2015-07-09 17:55:03 +0000 | |||
1372 | +++ src/Ubuntu/Components/plugin/ucactionmanager.cpp 2016-06-01 11:49:05 +0000 | |||
1373 | @@ -22,7 +22,7 @@ | |||
1374 | 22 | /*! | 22 | /*! |
1375 | 23 | * \qmltype ActionManager | 23 | * \qmltype ActionManager |
1376 | 24 | * \instantiates UCActionManager | 24 | * \instantiates UCActionManager |
1378 | 25 | * \inqmlmodule Ubuntu.Components 1.1 | 25 | * \inqmlmodule Ubuntu.Components |
1379 | 26 | * \ingroup ubuntu | 26 | * \ingroup ubuntu |
1380 | 27 | * \brief ActionManager manages actions and action contexts withion an application. | 27 | * \brief ActionManager manages actions and action contexts withion an application. |
1381 | 28 | * | 28 | * |
1382 | 29 | 29 | ||
1383 | === modified file 'src/Ubuntu/Components/plugin/ucalarm.cpp' | |||
1384 | --- src/Ubuntu/Components/plugin/ucalarm.cpp 2016-01-30 12:03:31 +0000 | |||
1385 | +++ src/Ubuntu/Components/plugin/ucalarm.cpp 2016-06-01 11:49:05 +0000 | |||
1386 | @@ -207,7 +207,7 @@ | |||
1387 | 207 | /*! | 207 | /*! |
1388 | 208 | * \qmltype Alarm | 208 | * \qmltype Alarm |
1389 | 209 | * \instantiates UCAlarm | 209 | * \instantiates UCAlarm |
1391 | 210 | * \inqmlmodule Ubuntu.Components 1.1 | 210 | * \inqmlmodule Ubuntu.Components |
1392 | 211 | * \ingroup ubuntu-services | 211 | * \ingroup ubuntu-services |
1393 | 212 | * \brief Alarm component is a representation of an alarm event. | 212 | * \brief Alarm component is a representation of an alarm event. |
1394 | 213 | * | 213 | * |
1395 | 214 | 214 | ||
1396 | === modified file 'src/Ubuntu/Components/plugin/ucalarmmodel.cpp' | |||
1397 | --- src/Ubuntu/Components/plugin/ucalarmmodel.cpp 2015-06-16 13:15:41 +0000 | |||
1398 | +++ src/Ubuntu/Components/plugin/ucalarmmodel.cpp 2016-06-01 11:49:05 +0000 | |||
1399 | @@ -27,7 +27,7 @@ | |||
1400 | 27 | /*! | 27 | /*! |
1401 | 28 | * \qmltype AlarmModel | 28 | * \qmltype AlarmModel |
1402 | 29 | * \instantiates UCAlarmModel | 29 | * \instantiates UCAlarmModel |
1404 | 30 | * \inqmlmodule Ubuntu.Components 1.1 | 30 | * \inqmlmodule Ubuntu.Components |
1405 | 31 | * \ingroup ubuntu-services | 31 | * \ingroup ubuntu-services |
1406 | 32 | * \brief AlarmModel holds the list of alarms defined. | 32 | * \brief AlarmModel holds the list of alarms defined. |
1407 | 33 | * | 33 | * |
1408 | 34 | 34 | ||
1409 | === modified file 'src/Ubuntu/Components/plugin/ucapplication.cpp' | |||
1410 | --- src/Ubuntu/Components/plugin/ucapplication.cpp 2016-01-30 12:11:51 +0000 | |||
1411 | +++ src/Ubuntu/Components/plugin/ucapplication.cpp 2016-06-01 11:49:05 +0000 | |||
1412 | @@ -28,7 +28,7 @@ | |||
1413 | 28 | /*! | 28 | /*! |
1414 | 29 | * \qmltype UbuntuApplication | 29 | * \qmltype UbuntuApplication |
1415 | 30 | * \instantiates UCApplication | 30 | * \instantiates UCApplication |
1417 | 31 | * \inqmlmodule Ubuntu.Components 1.1 | 31 | * \inqmlmodule Ubuntu.Components |
1418 | 32 | * \ingroup ubuntu | 32 | * \ingroup ubuntu |
1419 | 33 | * \brief UbuntuApplication is a QML binding for a subset of QCoreApplication. | 33 | * \brief UbuntuApplication is a QML binding for a subset of QCoreApplication. |
1420 | 34 | * | 34 | * |
1421 | 35 | 35 | ||
1422 | === modified file 'src/Ubuntu/Components/plugin/ucargument.cpp' | |||
1423 | --- src/Ubuntu/Components/plugin/ucargument.cpp 2014-04-23 08:50:20 +0000 | |||
1424 | +++ src/Ubuntu/Components/plugin/ucargument.cpp 2016-06-01 11:49:05 +0000 | |||
1425 | @@ -21,7 +21,7 @@ | |||
1426 | 21 | /*! | 21 | /*! |
1427 | 22 | * \qmltype Argument | 22 | * \qmltype Argument |
1428 | 23 | * \instantiates UCArgument | 23 | * \instantiates UCArgument |
1430 | 24 | * \inqmlmodule Ubuntu.Components 1.1 | 24 | * \inqmlmodule Ubuntu.Components |
1431 | 25 | * \ingroup ubuntu-commandline | 25 | * \ingroup ubuntu-commandline |
1432 | 26 | * \brief The Argument class specifies what type a given command line parameter should be. | 26 | * \brief The Argument class specifies what type a given command line parameter should be. |
1433 | 27 | * | 27 | * |
1434 | 28 | 28 | ||
1435 | === modified file 'src/Ubuntu/Components/plugin/ucarguments.cpp' | |||
1436 | --- src/Ubuntu/Components/plugin/ucarguments.cpp 2016-01-30 12:03:31 +0000 | |||
1437 | +++ src/Ubuntu/Components/plugin/ucarguments.cpp 2016-06-01 11:49:05 +0000 | |||
1438 | @@ -28,7 +28,7 @@ | |||
1439 | 28 | /*! | 28 | /*! |
1440 | 29 | * \qmltype Arguments | 29 | * \qmltype Arguments |
1441 | 30 | * \instantiates UCArguments | 30 | * \instantiates UCArguments |
1443 | 31 | * \inqmlmodule Ubuntu.Components 1.1 | 31 | * \inqmlmodule Ubuntu.Components |
1444 | 32 | * \ingroup ubuntu-commandline | 32 | * \ingroup ubuntu-commandline |
1445 | 33 | * \brief The Arguments class provides a way to declare what command line | 33 | * \brief The Arguments class provides a way to declare what command line |
1446 | 34 | * parameters are expected by the application. | 34 | * parameters are expected by the application. |
1447 | 35 | 35 | ||
1448 | === modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp' | |||
1449 | --- src/Ubuntu/Components/plugin/ucbottomedge.cpp 2016-04-01 13:16:05 +0000 | |||
1450 | +++ src/Ubuntu/Components/plugin/ucbottomedge.cpp 2016-06-01 11:49:05 +0000 | |||
1451 | @@ -497,7 +497,7 @@ | |||
1452 | 497 | /*! | 497 | /*! |
1453 | 498 | * \qmltype BottomEdge | 498 | * \qmltype BottomEdge |
1454 | 499 | * \instantiates UCBottomEdge | 499 | * \instantiates UCBottomEdge |
1456 | 500 | * \inqmlmodule Ubuntu.Components 1.3 | 500 | * \inqmlmodule Ubuntu.Components |
1457 | 501 | * \inherits StyledItem | 501 | * \inherits StyledItem |
1458 | 502 | * \ingroup ubuntu | 502 | * \ingroup ubuntu |
1459 | 503 | * \since Ubuntu.Components 1.3 | 503 | * \since Ubuntu.Components 1.3 |
1460 | 504 | 504 | ||
1461 | === modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.cpp' | |||
1462 | --- src/Ubuntu/Components/plugin/ucbottomedgehint.cpp 2016-04-20 15:00:27 +0000 | |||
1463 | +++ src/Ubuntu/Components/plugin/ucbottomedgehint.cpp 2016-06-01 11:49:05 +0000 | |||
1464 | @@ -71,7 +71,7 @@ | |||
1465 | 71 | 71 | ||
1466 | 72 | /*! | 72 | /*! |
1467 | 73 | \qmltype BottomEdgeHint | 73 | \qmltype BottomEdgeHint |
1469 | 74 | \inqmlmodule Ubuntu.Components 1.3 | 74 | \inqmlmodule Ubuntu.Components |
1470 | 75 | \ingroup ubuntu | 75 | \ingroup ubuntu |
1471 | 76 | \inherits ActionItem | 76 | \inherits ActionItem |
1472 | 77 | \brief The BottomEdgeHint shows the availability of extra features | 77 | \brief The BottomEdgeHint shows the availability of extra features |
1473 | 78 | 78 | ||
1474 | === modified file 'src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp' | |||
1475 | --- src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp 2016-02-25 17:45:27 +0000 | |||
1476 | +++ src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp 2016-06-01 11:49:05 +0000 | |||
1477 | @@ -29,7 +29,7 @@ | |||
1478 | 29 | /*! | 29 | /*! |
1479 | 30 | \qmltype Theme | 30 | \qmltype Theme |
1480 | 31 | \instantiates UCTheme | 31 | \instantiates UCTheme |
1482 | 32 | \inqmlmodule Ubuntu.Components 1.1 | 32 | \inqmlmodule Ubuntu.Components |
1483 | 33 | \ingroup theming | 33 | \ingroup theming |
1484 | 34 | \brief The Theme class provides facilities to interact with the current theme. | 34 | \brief The Theme class provides facilities to interact with the current theme. |
1485 | 35 | 35 | ||
1486 | 36 | 36 | ||
1487 | === modified file 'src/Ubuntu/Components/plugin/ucfontutils.cpp' | |||
1488 | --- src/Ubuntu/Components/plugin/ucfontutils.cpp 2016-04-20 15:00:27 +0000 | |||
1489 | +++ src/Ubuntu/Components/plugin/ucfontutils.cpp 2016-06-01 11:49:05 +0000 | |||
1490 | @@ -23,7 +23,7 @@ | |||
1491 | 23 | /*! | 23 | /*! |
1492 | 24 | * \qmltype FontUtils | 24 | * \qmltype FontUtils |
1493 | 25 | * \instantiates UCFontUtils | 25 | * \instantiates UCFontUtils |
1495 | 26 | * \inqmlmodule Ubuntu.Components 1.1 | 26 | * \inqmlmodule Ubuntu.Components |
1496 | 27 | * \ingroup ubuntu | 27 | * \ingroup ubuntu |
1497 | 28 | * \brief FontUtils is a \l {http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#details} {context property}, | 28 | * \brief FontUtils is a \l {http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#details} {context property}, |
1498 | 29 | * which provides utility functions for font manipulations. | 29 | * which provides utility functions for font manipulations. |
1499 | 30 | 30 | ||
1500 | === modified file 'src/Ubuntu/Components/plugin/uchaptics.cpp' | |||
1501 | --- src/Ubuntu/Components/plugin/uchaptics.cpp 2016-02-11 08:54:26 +0000 | |||
1502 | +++ src/Ubuntu/Components/plugin/uchaptics.cpp 2016-06-01 11:49:05 +0000 | |||
1503 | @@ -23,7 +23,7 @@ | |||
1504 | 23 | /*! | 23 | /*! |
1505 | 24 | \qmltype Haptics | 24 | \qmltype Haptics |
1506 | 25 | \instantiates UCHaptics | 25 | \instantiates UCHaptics |
1508 | 26 | \inqmlmodule Ubuntu.Components 1.1 | 26 | \inqmlmodule Ubuntu.Components |
1509 | 27 | \ingroup ubuntu-services | 27 | \ingroup ubuntu-services |
1510 | 28 | \brief Singleton defining the haptics feedback used in components, where execution | 28 | \brief Singleton defining the haptics feedback used in components, where execution |
1511 | 29 | of the feedback is controlled by the system settings. | 29 | of the feedback is controlled by the system settings. |
1512 | 30 | 30 | ||
1513 | === modified file 'src/Ubuntu/Components/plugin/ucheader.cpp' | |||
1514 | --- src/Ubuntu/Components/plugin/ucheader.cpp 2016-05-11 21:17:26 +0000 | |||
1515 | +++ src/Ubuntu/Components/plugin/ucheader.cpp 2016-06-01 11:49:05 +0000 | |||
1516 | @@ -26,7 +26,7 @@ | |||
1517 | 26 | \qmltype Header | 26 | \qmltype Header |
1518 | 27 | \instantiates UCHeader | 27 | \instantiates UCHeader |
1519 | 28 | \inherits StyledItem | 28 | \inherits StyledItem |
1521 | 29 | \inqmlmodule Ubuntu.Components 1.3 | 29 | \inqmlmodule Ubuntu.Components |
1522 | 30 | \ingroup ubuntu | 30 | \ingroup ubuntu |
1523 | 31 | \since Ubuntu.Components 1.3 | 31 | \since Ubuntu.Components 1.3 |
1524 | 32 | \brief Header bar that can contain the title and controls for the current view. | 32 | \brief Header bar that can contain the title and controls for the current view. |
1525 | 33 | 33 | ||
1526 | === modified file 'src/Ubuntu/Components/plugin/uclabel.cpp' | |||
1527 | --- src/Ubuntu/Components/plugin/uclabel.cpp 2016-04-26 14:05:01 +0000 | |||
1528 | +++ src/Ubuntu/Components/plugin/uclabel.cpp 2016-06-01 11:49:05 +0000 | |||
1529 | @@ -65,9 +65,10 @@ | |||
1530 | 65 | } | 65 | } |
1531 | 66 | 66 | ||
1532 | 67 | /*! | 67 | /*! |
1534 | 68 | * \qmltype LabelBase | 68 | * \qmltype Label |
1535 | 69 | * \qmlabstract | 69 | * \qmlabstract |
1536 | 70 | * \instantiates UCLabel | 70 | * \instantiates UCLabel |
1537 | 71 | * \inherits Text | ||
1538 | 71 | * \inqmlmodule Ubuntu.Components 1.3 | 72 | * \inqmlmodule Ubuntu.Components 1.3 |
1539 | 72 | * \ingroup ubuntu | 73 | * \ingroup ubuntu |
1540 | 73 | * \brief Extended Text item with Ubuntu styling. | 74 | * \brief Extended Text item with Ubuntu styling. |
1541 | @@ -158,7 +159,7 @@ | |||
1542 | 158 | } | 159 | } |
1543 | 159 | 160 | ||
1544 | 160 | /*! | 161 | /*! |
1546 | 161 | * \qmlproperty enumeration LabelBase::textSize | 162 | * \qmlproperty enumeration Label::textSize |
1547 | 162 | * \since Ubuntu.Components 1.3 | 163 | * \since Ubuntu.Components 1.3 |
1548 | 163 | * | 164 | * |
1549 | 164 | * This property holds an abstract size that allows adaptive resizing based on the measurement unit | 165 | * This property holds an abstract size that allows adaptive resizing based on the measurement unit |
1550 | @@ -221,7 +222,7 @@ | |||
1551 | 221 | } | 222 | } |
1552 | 222 | 223 | ||
1553 | 223 | /*! | 224 | /*! |
1555 | 224 | * \qmlproperty string LabelBase::fontSize | 225 | * \qmlproperty string Label::fontSize |
1556 | 225 | * \deprecated | 226 | * \deprecated |
1557 | 226 | * | 227 | * |
1558 | 227 | * This property holds an abstract size represented as a string that allows adaptive resizing based | 228 | * This property holds an abstract size represented as a string that allows adaptive resizing based |
1559 | 228 | 229 | ||
1560 | === modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp' | |||
1561 | --- src/Ubuntu/Components/plugin/uclistitem.cpp 2016-04-27 07:59:22 +0000 | |||
1562 | +++ src/Ubuntu/Components/plugin/uclistitem.cpp 2016-06-01 11:49:05 +0000 | |||
1563 | @@ -519,7 +519,7 @@ | |||
1564 | 519 | /*! | 519 | /*! |
1565 | 520 | * \qmltype ListItem | 520 | * \qmltype ListItem |
1566 | 521 | * \instantiates UCListItem | 521 | * \instantiates UCListItem |
1568 | 522 | * \inqmlmodule Ubuntu.Components 1.2 | 522 | * \inqmlmodule Ubuntu.Components |
1569 | 523 | * \ingroup ubuntu-listitem | 523 | * \ingroup ubuntu-listitem |
1570 | 524 | * \since Ubuntu.Components 1.2 | 524 | * \since Ubuntu.Components 1.2 |
1571 | 525 | * \brief The ListItem element provides Ubuntu design standards for list or grid | 525 | * \brief The ListItem element provides Ubuntu design standards for list or grid |
1572 | 526 | 526 | ||
1573 | === modified file 'src/Ubuntu/Components/plugin/uclistitemactions.cpp' | |||
1574 | --- src/Ubuntu/Components/plugin/uclistitemactions.cpp 2015-03-03 13:47:48 +0000 | |||
1575 | +++ src/Ubuntu/Components/plugin/uclistitemactions.cpp 2016-06-01 11:49:05 +0000 | |||
1576 | @@ -38,7 +38,7 @@ | |||
1577 | 38 | * \qmltype ListItemActions | 38 | * \qmltype ListItemActions |
1578 | 39 | * \instantiates UCListItemActions | 39 | * \instantiates UCListItemActions |
1579 | 40 | * \inherits QtQObject | 40 | * \inherits QtQObject |
1581 | 41 | * \inqmlmodule Ubuntu.Components 1.2 | 41 | * \inqmlmodule Ubuntu.Components |
1582 | 42 | * \since Ubuntu.Components 1.2 | 42 | * \since Ubuntu.Components 1.2 |
1583 | 43 | * \ingroup ubuntu-listitem | 43 | * \ingroup ubuntu-listitem |
1584 | 44 | * \brief Provides configuration for actions to be added to a ListItem. | 44 | * \brief Provides configuration for actions to be added to a ListItem. |
1585 | 45 | 45 | ||
1586 | === modified file 'src/Ubuntu/Components/plugin/uclistitemlayout.cpp' | |||
1587 | --- src/Ubuntu/Components/plugin/uclistitemlayout.cpp 2016-01-07 18:23:51 +0000 | |||
1588 | +++ src/Ubuntu/Components/plugin/uclistitemlayout.cpp 2016-06-01 11:49:05 +0000 | |||
1589 | @@ -26,7 +26,7 @@ | |||
1590 | 26 | /*! | 26 | /*! |
1591 | 27 | \qmltype ListItemLayout | 27 | \qmltype ListItemLayout |
1592 | 28 | \instantiates UCListItemLayout | 28 | \instantiates UCListItemLayout |
1594 | 29 | \inqmlmodule Ubuntu.Components 1.3 | 29 | \inqmlmodule Ubuntu.Components |
1595 | 30 | \since Ubuntu.Components 1.3 | 30 | \since Ubuntu.Components 1.3 |
1596 | 31 | \inherits SlotsLayout | 31 | \inherits SlotsLayout |
1597 | 32 | \ingroup ubuntu | 32 | \ingroup ubuntu |
1598 | 33 | 33 | ||
1599 | === modified file 'src/Ubuntu/Components/plugin/ucmainviewbase.cpp' | |||
1600 | --- src/Ubuntu/Components/plugin/ucmainviewbase.cpp 2016-05-02 21:51:23 +0000 | |||
1601 | +++ src/Ubuntu/Components/plugin/ucmainviewbase.cpp 2016-06-01 11:49:05 +0000 | |||
1602 | @@ -31,7 +31,7 @@ | |||
1603 | 31 | /*! | 31 | /*! |
1604 | 32 | \internal | 32 | \internal |
1605 | 33 | \qmlabstract MainViewBase | 33 | \qmlabstract MainViewBase |
1607 | 34 | \inqmlmodule Ubuntu.Components 1.3 | 34 | \inqmlmodule Ubuntu.Components |
1608 | 35 | \ingroup ubuntu | 35 | \ingroup ubuntu |
1609 | 36 | \brief The base class for MainView and MultiColumnView. | 36 | \brief The base class for MainView and MultiColumnView. |
1610 | 37 | */ | 37 | */ |
1611 | 38 | 38 | ||
1612 | === modified file 'src/Ubuntu/Components/plugin/ucmousefilters.cpp' | |||
1613 | --- src/Ubuntu/Components/plugin/ucmousefilters.cpp 2016-04-05 19:47:18 +0000 | |||
1614 | +++ src/Ubuntu/Components/plugin/ucmousefilters.cpp 2016-06-01 11:49:05 +0000 | |||
1615 | @@ -58,7 +58,7 @@ | |||
1616 | 58 | /*! | 58 | /*! |
1617 | 59 | \qmltype Mouse | 59 | \qmltype Mouse |
1618 | 60 | \instantiates UCMouse | 60 | \instantiates UCMouse |
1620 | 61 | \inqmlmodule Ubuntu.Components 1.1 | 61 | \inqmlmodule Ubuntu.Components |
1621 | 62 | \ingroup ubuntu | 62 | \ingroup ubuntu |
1622 | 63 | \brief Attached property filtering mouse events occured inside the owner. | 63 | \brief Attached property filtering mouse events occured inside the owner. |
1623 | 64 | 64 | ||
1624 | @@ -1015,7 +1015,7 @@ | |||
1625 | 1015 | /*! | 1015 | /*! |
1626 | 1016 | \qmltype InverseMouse | 1016 | \qmltype InverseMouse |
1627 | 1017 | \instantiates UCInverseMouse | 1017 | \instantiates UCInverseMouse |
1629 | 1018 | \inqmlmodule Ubuntu.Components 1.1 | 1018 | \inqmlmodule Ubuntu.Components |
1630 | 1019 | \ingroup ubuntu | 1019 | \ingroup ubuntu |
1631 | 1020 | \brief Attached object filtering mouse events occured outside the owner. | 1020 | \brief Attached object filtering mouse events occured outside the owner. |
1632 | 1021 | 1021 | ||
1633 | 1022 | 1022 | ||
1634 | === modified file 'src/Ubuntu/Components/plugin/ucnamespace.cpp' | |||
1635 | --- src/Ubuntu/Components/plugin/ucnamespace.cpp 2015-04-25 07:10:57 +0000 | |||
1636 | +++ src/Ubuntu/Components/plugin/ucnamespace.cpp 2016-06-01 11:49:05 +0000 | |||
1637 | @@ -20,7 +20,7 @@ | |||
1638 | 20 | /*! | 20 | /*! |
1639 | 21 | * \qmltype Ubuntu | 21 | * \qmltype Ubuntu |
1640 | 22 | * \instantiates UCNamespace | 22 | * \instantiates UCNamespace |
1642 | 23 | * \inqmlmodule Ubuntu.Components 1.2 | 23 | * \inqmlmodule Ubuntu.Components |
1643 | 24 | * \ingroup ubuntu | 24 | * \ingroup ubuntu |
1644 | 25 | * \since Ubuntu.Components 1.2 | 25 | * \since Ubuntu.Components 1.2 |
1645 | 26 | * \brief Provides global object with different enums. | 26 | * \brief Provides global object with different enums. |
1646 | 27 | 27 | ||
1647 | === modified file 'src/Ubuntu/Components/plugin/ucpagetreenode.cpp' | |||
1648 | --- src/Ubuntu/Components/plugin/ucpagetreenode.cpp 2016-02-04 14:53:47 +0000 | |||
1649 | +++ src/Ubuntu/Components/plugin/ucpagetreenode.cpp 2016-06-01 11:49:05 +0000 | |||
1650 | @@ -360,7 +360,7 @@ | |||
1651 | 360 | /*! | 360 | /*! |
1652 | 361 | \internal | 361 | \internal |
1653 | 362 | \qmltype PageTreeNode | 362 | \qmltype PageTreeNode |
1655 | 363 | \inqmlmodule Ubuntu.Components 1.1 | 363 | \inqmlmodule Ubuntu.Components |
1656 | 364 | \ingroup ubuntu | 364 | \ingroup ubuntu |
1657 | 365 | \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs. | 365 | \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs. |
1658 | 366 | 366 | ||
1659 | 367 | 367 | ||
1660 | === modified file 'src/Ubuntu/Components/plugin/ucproportionalshape.cpp' | |||
1661 | --- src/Ubuntu/Components/plugin/ucproportionalshape.cpp 2016-02-17 19:32:41 +0000 | |||
1662 | +++ src/Ubuntu/Components/plugin/ucproportionalshape.cpp 2016-06-01 11:49:05 +0000 | |||
1663 | @@ -23,7 +23,7 @@ | |||
1664 | 23 | 23 | ||
1665 | 24 | /*! \qmltype ProportionalShape | 24 | /*! \qmltype ProportionalShape |
1666 | 25 | \instantiates UCProportionalShape | 25 | \instantiates UCProportionalShape |
1668 | 26 | \inqmlmodule Ubuntu.Components 1.3 | 26 | \inqmlmodule Ubuntu.Components |
1669 | 27 | \ingroup ubuntu | 27 | \ingroup ubuntu |
1670 | 28 | \brief Extended UbuntuShape mostly used for icons and vignettes. | 28 | \brief Extended UbuntuShape mostly used for icons and vignettes. |
1671 | 29 | 29 | ||
1672 | 30 | 30 | ||
1673 | === modified file 'src/Ubuntu/Components/plugin/ucserviceproperties.cpp' | |||
1674 | --- src/Ubuntu/Components/plugin/ucserviceproperties.cpp 2016-01-30 12:03:31 +0000 | |||
1675 | +++ src/Ubuntu/Components/plugin/ucserviceproperties.cpp 2016-06-01 11:49:05 +0000 | |||
1676 | @@ -80,7 +80,7 @@ | |||
1677 | 80 | /*! | 80 | /*! |
1678 | 81 | * \qmltype ServiceProperties | 81 | * \qmltype ServiceProperties |
1679 | 82 | * \instantiates UCServiceProperties | 82 | * \instantiates UCServiceProperties |
1681 | 83 | * \inqmlmodule Ubuntu.Components 1.1 | 83 | * \inqmlmodule Ubuntu.Components |
1682 | 84 | * \since Ubuntu.Components 1.1 | 84 | * \since Ubuntu.Components 1.1 |
1683 | 85 | * \ingroup ubuntu-services | 85 | * \ingroup ubuntu-services |
1684 | 86 | * \brief The component enables accessing service properties from QML. | 86 | * \brief The component enables accessing service properties from QML. |
1685 | 87 | 87 | ||
1686 | === modified file 'src/Ubuntu/Components/plugin/ucslotslayout.cpp' | |||
1687 | --- src/Ubuntu/Components/plugin/ucslotslayout.cpp 2016-04-20 15:00:27 +0000 | |||
1688 | +++ src/Ubuntu/Components/plugin/ucslotslayout.cpp 2016-06-01 11:49:05 +0000 | |||
1689 | @@ -597,7 +597,7 @@ | |||
1690 | 597 | /*! | 597 | /*! |
1691 | 598 | \qmltype SlotsLayout | 598 | \qmltype SlotsLayout |
1692 | 599 | \instantiates UCSlotsLayout | 599 | \instantiates UCSlotsLayout |
1694 | 600 | \inqmlmodule Ubuntu.Components 1.3 | 600 | \inqmlmodule Ubuntu.Components |
1695 | 601 | \ingroup ubuntu-slotslayout | 601 | \ingroup ubuntu-slotslayout |
1696 | 602 | \inherits Item | 602 | \inherits Item |
1697 | 603 | \since Ubuntu.Components 1.3 | 603 | \since Ubuntu.Components 1.3 |
1698 | 604 | 604 | ||
1699 | === modified file 'src/Ubuntu/Components/plugin/ucstatesaver.cpp' | |||
1700 | --- src/Ubuntu/Components/plugin/ucstatesaver.cpp 2016-02-01 18:57:26 +0000 | |||
1701 | +++ src/Ubuntu/Components/plugin/ucstatesaver.cpp 2016-06-01 11:49:05 +0000 | |||
1702 | @@ -146,7 +146,7 @@ | |||
1703 | 146 | /*! | 146 | /*! |
1704 | 147 | * \qmltype StateSaver | 147 | * \qmltype StateSaver |
1705 | 148 | * \instantiates UCStateSaverAttached | 148 | * \instantiates UCStateSaverAttached |
1707 | 149 | * \inqmlmodule Ubuntu.Components 1.1 | 149 | * \inqmlmodule Ubuntu.Components |
1708 | 150 | * \ingroup ubuntu-services | 150 | * \ingroup ubuntu-services |
1709 | 151 | * \brief Attached properties to save component property states. | 151 | * \brief Attached properties to save component property states. |
1710 | 152 | * | 152 | * |
1711 | 153 | 153 | ||
1712 | === modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp' | |||
1713 | --- src/Ubuntu/Components/plugin/ucstyleditembase.cpp 2016-04-27 09:20:29 +0000 | |||
1714 | +++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp 2016-06-01 11:49:05 +0000 | |||
1715 | @@ -130,7 +130,7 @@ | |||
1716 | 130 | /*! | 130 | /*! |
1717 | 131 | * \qmltype StyledItem | 131 | * \qmltype StyledItem |
1718 | 132 | * \instantiates UCStyledItemBase | 132 | * \instantiates UCStyledItemBase |
1720 | 133 | * \inqmlmodule Ubuntu.Components 1.1 | 133 | * \inqmlmodule Ubuntu.Components |
1721 | 134 | * \ingroup ubuntu | 134 | * \ingroup ubuntu |
1722 | 135 | * \since Ubuntu.Components 1.1 | 135 | * \since Ubuntu.Components 1.1 |
1723 | 136 | * \brief The StyledItem class allows items to be styled by the theme. | 136 | * \brief The StyledItem class allows items to be styled by the theme. |
1724 | 137 | 137 | ||
1725 | === modified file 'src/Ubuntu/Components/plugin/uctheme.cpp' | |||
1726 | --- src/Ubuntu/Components/plugin/uctheme.cpp 2016-04-15 14:57:05 +0000 | |||
1727 | +++ src/Ubuntu/Components/plugin/uctheme.cpp 2016-06-01 11:49:05 +0000 | |||
1728 | @@ -49,7 +49,7 @@ | |||
1729 | 49 | /*! | 49 | /*! |
1730 | 50 | * \qmltype ThemeSettings | 50 | * \qmltype ThemeSettings |
1731 | 51 | * \instantiates UCTheme | 51 | * \instantiates UCTheme |
1733 | 52 | * \inqmlmodule Ubuntu.Components 1.3 | 52 | * \inqmlmodule Ubuntu.Components |
1734 | 53 | * \since Ubuntu.Components 1.3 | 53 | * \since Ubuntu.Components 1.3 |
1735 | 54 | * \ingroup theming | 54 | * \ingroup theming |
1736 | 55 | * \brief The ThemeSettings class provides facilities to define the theme of a | 55 | * \brief The ThemeSettings class provides facilities to define the theme of a |
1737 | 56 | 56 | ||
1738 | === modified file 'src/Ubuntu/Components/plugin/ucubuntuanimation.cpp' | |||
1739 | --- src/Ubuntu/Components/plugin/ucubuntuanimation.cpp 2014-04-23 08:50:20 +0000 | |||
1740 | +++ src/Ubuntu/Components/plugin/ucubuntuanimation.cpp 2016-06-01 11:49:05 +0000 | |||
1741 | @@ -21,7 +21,7 @@ | |||
1742 | 21 | /*! | 21 | /*! |
1743 | 22 | * \qmltype UbuntuAnimation | 22 | * \qmltype UbuntuAnimation |
1744 | 23 | * \instantiates UCUbuntuAnimation | 23 | * \instantiates UCUbuntuAnimation |
1746 | 24 | * \inqmlmodule Ubuntu.Components 1.1 | 24 | * \inqmlmodule Ubuntu.Components |
1747 | 25 | * \ingroup ubuntu | 25 | * \ingroup ubuntu |
1748 | 26 | * \brief Singleton defining standard Ubuntu durations and easing for animations | 26 | * \brief Singleton defining standard Ubuntu durations and easing for animations |
1749 | 27 | * that should be used to ensure that Ubuntu applications are consistent | 27 | * that should be used to ensure that Ubuntu applications are consistent |
1750 | 28 | 28 | ||
1751 | === modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp' | |||
1752 | --- src/Ubuntu/Components/plugin/ucubuntushape.cpp 2016-04-20 15:00:27 +0000 | |||
1753 | +++ src/Ubuntu/Components/plugin/ucubuntushape.cpp 2016-06-01 11:49:05 +0000 | |||
1754 | @@ -255,7 +255,7 @@ | |||
1755 | 255 | 255 | ||
1756 | 256 | /*! \qmltype UbuntuShape | 256 | /*! \qmltype UbuntuShape |
1757 | 257 | \instantiates UCUbuntuShape | 257 | \instantiates UCUbuntuShape |
1759 | 258 | \inqmlmodule Ubuntu.Components 1.2 | 258 | \inqmlmodule Ubuntu.Components |
1760 | 259 | \ingroup ubuntu | 259 | \ingroup ubuntu |
1761 | 260 | \brief Rounded rectangle containing a source image blended over a background color. | 260 | \brief Rounded rectangle containing a source image blended over a background color. |
1762 | 261 | 261 | ||
1763 | 262 | 262 | ||
1764 | === modified file 'src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp' | |||
1765 | --- src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp 2015-09-25 09:44:34 +0000 | |||
1766 | +++ src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp 2016-06-01 11:49:05 +0000 | |||
1767 | @@ -97,7 +97,7 @@ | |||
1768 | 97 | 97 | ||
1769 | 98 | /*! \qmltype UbuntuShapeOverlay | 98 | /*! \qmltype UbuntuShapeOverlay |
1770 | 99 | \instantiates UCUbuntuShapeOverlay | 99 | \instantiates UCUbuntuShapeOverlay |
1772 | 100 | \inqmlmodule Ubuntu.Components 1.2 | 100 | \inqmlmodule Ubuntu.Components |
1773 | 101 | \ingroup ubuntu | 101 | \ingroup ubuntu |
1774 | 102 | \brief Extended UbuntuShape adding a colored overlay layer. | 102 | \brief Extended UbuntuShape adding a colored overlay layer. |
1775 | 103 | 103 | ||
1776 | 104 | 104 | ||
1777 | === modified file 'src/Ubuntu/Components/plugin/ucunits.cpp' | |||
1778 | --- src/Ubuntu/Components/plugin/ucunits.cpp 2016-04-21 16:02:05 +0000 | |||
1779 | +++ src/Ubuntu/Components/plugin/ucunits.cpp 2016-06-01 11:49:05 +0000 | |||
1780 | @@ -46,7 +46,7 @@ | |||
1781 | 46 | /*! | 46 | /*! |
1782 | 47 | \qmltype Units | 47 | \qmltype Units |
1783 | 48 | \instantiates UCUnits | 48 | \instantiates UCUnits |
1785 | 49 | \inqmlmodule Ubuntu.Components 1.1 | 49 | \inqmlmodule Ubuntu.Components |
1786 | 50 | \ingroup resolution-independence | 50 | \ingroup resolution-independence |
1787 | 51 | \brief Units of measurement for sizes, spacing, margin, etc. | 51 | \brief Units of measurement for sizes, spacing, margin, etc. |
1788 | 52 | 52 | ||
1789 | 53 | 53 | ||
1790 | === modified file 'src/Ubuntu/Components/plugin/ucurihandler.cpp' | |||
1791 | --- src/Ubuntu/Components/plugin/ucurihandler.cpp 2014-10-08 20:16:03 +0000 | |||
1792 | +++ src/Ubuntu/Components/plugin/ucurihandler.cpp 2016-06-01 11:49:05 +0000 | |||
1793 | @@ -36,7 +36,7 @@ | |||
1794 | 36 | /*! | 36 | /*! |
1795 | 37 | * \qmltype UriHandler | 37 | * \qmltype UriHandler |
1796 | 38 | * \instantiates UCUriHandler | 38 | * \instantiates UCUriHandler |
1798 | 39 | * \inqmlmodule Ubuntu.Components 1.1 | 39 | * \inqmlmodule Ubuntu.Components |
1799 | 40 | * \ingroup ubuntu | 40 | * \ingroup ubuntu |
1800 | 41 | * \brief Singleton signalling for opened URIs. | 41 | * \brief Singleton signalling for opened URIs. |
1801 | 42 | * | 42 | * |
1802 | 43 | 43 | ||
1803 | === modified file 'src/Ubuntu/Components/plugin/ucviewitemsattached.cpp' | |||
1804 | --- src/Ubuntu/Components/plugin/ucviewitemsattached.cpp 2016-02-24 06:45:27 +0000 | |||
1805 | +++ src/Ubuntu/Components/plugin/ucviewitemsattached.cpp 2016-06-01 11:49:05 +0000 | |||
1806 | @@ -33,7 +33,7 @@ | |||
1807 | 33 | 33 | ||
1808 | 34 | /*! | 34 | /*! |
1809 | 35 | * \qmltype ListItemDrag | 35 | * \qmltype ListItemDrag |
1811 | 36 | * \inqmlmodule Ubuntu.Components 1.2 | 36 | * \inqmlmodule Ubuntu.Components |
1812 | 37 | * \ingroup ubuntu-listitem | 37 | * \ingroup ubuntu-listitem |
1813 | 38 | * \since Ubuntu.Components 1.2 | 38 | * \since Ubuntu.Components 1.2 |
1814 | 39 | * \brief Provides information about a ListItem drag event. | 39 | * \brief Provides information about a ListItem drag event. |
1815 | @@ -173,7 +173,7 @@ | |||
1816 | 173 | /*! | 173 | /*! |
1817 | 174 | * \qmltype ViewItems | 174 | * \qmltype ViewItems |
1818 | 175 | * \instantiates UCViewItemsAttached | 175 | * \instantiates UCViewItemsAttached |
1820 | 176 | * \inqmlmodule Ubuntu.Components 1.2 | 176 | * \inqmlmodule Ubuntu.Components |
1821 | 177 | * \ingroup ubuntu-listitem | 177 | * \ingroup ubuntu-listitem |
1822 | 178 | * \since Ubuntu.Components 1.2 | 178 | * \since Ubuntu.Components 1.2 |
1823 | 179 | * \brief A set of properties attached to the ListItem's parent item or ListView. | 179 | * \brief A set of properties attached to the ListItem's parent item or ListView. |
1824 | 180 | 180 | ||
1825 | === modified file 'src/Ubuntu/UbuntuGestures/ucswipearea.cpp' | |||
1826 | --- src/Ubuntu/UbuntuGestures/ucswipearea.cpp 2016-03-04 17:34:48 +0000 | |||
1827 | +++ src/Ubuntu/UbuntuGestures/ucswipearea.cpp 2016-06-01 11:49:05 +0000 | |||
1828 | @@ -130,7 +130,7 @@ | |||
1829 | 130 | * \qmltype SwipeArea | 130 | * \qmltype SwipeArea |
1830 | 131 | * \instantiates UCSwipeArea | 131 | * \instantiates UCSwipeArea |
1831 | 132 | * \inherits Item | 132 | * \inherits Item |
1833 | 133 | * \inqmlmodule Ubuntu.Components 1.3 | 133 | * \inqmlmodule Ubuntu.Components |
1834 | 134 | * \since Ubuntu.Components 1.3 | 134 | * \since Ubuntu.Components 1.3 |
1835 | 135 | * \ingroup ubuntu-gestures | 135 | * \ingroup ubuntu-gestures |
1836 | 136 | * \brief An area which detects axis-aligned single-finger drag gestures. | 136 | * \brief An area which detects axis-aligned single-finger drag gestures. |
1837 | 137 | 137 | ||
1838 | === modified file 'tests/unit_x11/tst_components/tst_focus.qml' | |||
1839 | --- tests/unit_x11/tst_components/tst_focus.qml 2016-04-26 13:21:53 +0000 | |||
1840 | +++ tests/unit_x11/tst_components/tst_focus.qml 2016-06-01 11:49:05 +0000 | |||
1841 | @@ -28,6 +28,9 @@ | |||
1842 | 28 | 28 | ||
1843 | 29 | property bool hasOSK: false | 29 | property bool hasOSK: false |
1844 | 30 | 30 | ||
1845 | 31 | property bool keysReleased | ||
1846 | 32 | Keys.onReleased: keysReleased = true | ||
1847 | 33 | |||
1848 | 31 | Flow { | 34 | Flow { |
1849 | 32 | anchors { | 35 | anchors { |
1850 | 33 | fill: parent | 36 | fill: parent |
1851 | @@ -75,6 +78,8 @@ | |||
1852 | 75 | Button { | 78 | Button { |
1853 | 76 | id: button | 79 | id: button |
1854 | 77 | text: "Press me" | 80 | text: "Press me" |
1855 | 81 | property bool override: false | ||
1856 | 82 | Keys.onReleased: event.accepted = override | ||
1857 | 78 | } | 83 | } |
1858 | 79 | CheckBox { | 84 | CheckBox { |
1859 | 80 | id: checkbox | 85 | id: checkbox |
1860 | @@ -426,10 +431,23 @@ | |||
1861 | 426 | ]; | 431 | ]; |
1862 | 427 | } | 432 | } |
1863 | 428 | function test_button_trigger_via_keyboard(data) { | 433 | function test_button_trigger_via_keyboard(data) { |
1864 | 434 | button.override = false; | ||
1865 | 435 | main.keysReleased = false; | ||
1866 | 436 | buttonTriggerSpy.clear(); | ||
1867 | 429 | buttonTriggerSpy.target = button; | 437 | buttonTriggerSpy.target = button; |
1868 | 430 | button.forceActiveFocus(); | 438 | button.forceActiveFocus(); |
1869 | 431 | keyClick(data.key); | 439 | keyClick(data.key); |
1870 | 432 | buttonTriggerSpy.wait(); | 440 | buttonTriggerSpy.wait(); |
1871 | 441 | compare(main.keysReleased, false, "Parent didn't get Keys.onReleased"); | ||
1872 | 442 | |||
1873 | 443 | // Second attempt but the button will consume Keys.onReleased | ||
1874 | 444 | button.override = true; | ||
1875 | 445 | main.keysReleased = false; | ||
1876 | 446 | buttonTriggerSpy.clear(); | ||
1877 | 447 | keyClick(data.key); | ||
1878 | 448 | expectFailContinue(data.tag, "Trigger should've been overridden"); | ||
1879 | 449 | buttonTriggerSpy.wait(); | ||
1880 | 450 | compare(main.keysReleased, false, "Parent didn't get Keys.onReleased"); | ||
1881 | 433 | } | 451 | } |
1882 | 434 | 452 | ||
1883 | 435 | function test_disabled_component_does_not_focus() { | 453 | function test_disabled_component_does_not_focus() { |
1884 | 436 | 454 | ||
1885 | === modified file 'tests/unit_x11/tst_components/tst_slotslayout.qml' | |||
1886 | --- tests/unit_x11/tst_components/tst_slotslayout.qml 2016-01-27 06:39:09 +0000 | |||
1887 | +++ tests/unit_x11/tst_components/tst_slotslayout.qml 2016-06-01 11:49:05 +0000 | |||
1888 | @@ -887,11 +887,12 @@ | |||
1889 | 887 | id: layoutTestQmlContextComponent | 887 | id: layoutTestQmlContextComponent |
1890 | 888 | ListItemLayout { | 888 | ListItemLayout { |
1891 | 889 | id: layoutTestQmlContext | 889 | id: layoutTestQmlContext |
1893 | 890 | title.text: "<html><body><p dir='ltr'>TEST <img align=absmiddle height=\"10\" width=\"10\" src=\"file:///test.png\" /> </p></body></html>" | 890 | property string testingText: "<html><body><p dir='ltr'>TEST <img align=absmiddle height=\"10\" width=\"10\" src=\"file:///test.png\" /> </p></body></html>" |
1894 | 891 | title.text: testingText | ||
1895 | 891 | title.textFormat: Text.RichText | 892 | title.textFormat: Text.RichText |
1897 | 892 | subtitle.text: "<html><body><p dir='ltr'>TEST <img align=absmiddle height=\"10\" width=\"10\" src=\"file:///test.png\" /> </p></body></html>" | 893 | subtitle.text: testingText |
1898 | 893 | subtitle.textFormat: Text.RichText | 894 | subtitle.textFormat: Text.RichText |
1900 | 894 | summary.text: "<html><body><p dir='ltr'>TEST <img align=absmiddle height=\"10\" width=\"10\" src=\"file:///test.png\" /> </p></body></html>" | 895 | summary.text: testingText |
1901 | 895 | summary.textFormat: Text.RichText | 896 | summary.textFormat: Text.RichText |
1902 | 896 | } | 897 | } |
1903 | 897 | } | 898 | } |
1904 | @@ -904,6 +905,14 @@ | |||
1905 | 904 | //because the img is loaded async | 905 | //because the img is loaded async |
1906 | 905 | waitForRendering(obj) | 906 | waitForRendering(obj) |
1907 | 906 | compare(obj !== null, true, "QML ListItemLayout: testing labels' QML context.") | 907 | compare(obj !== null, true, "QML ListItemLayout: testing labels' QML context.") |
1908 | 908 | |||
1909 | 909 | //Tentative fix for lp:1571426, CI once (in months) managed to fail this test because | ||
1910 | 910 | //the warning was received after the test had already finished. | ||
1911 | 911 | //The fail could not be reproduced locally. | ||
1912 | 912 | tryCompare(obj.title, "text", obj.testingText) | ||
1913 | 913 | tryCompare(obj.subtitle, "text", obj.testingText) | ||
1914 | 914 | tryCompare(obj.summary, "text", obj.testingText) | ||
1915 | 915 | |||
1916 | 907 | obj.destroy() | 916 | obj.destroy() |
1917 | 908 | } | 917 | } |
1918 | 909 | 918 |