Merge lp:~nskaggs/ubuntu-ui-toolkit/aphelperdocs into lp:ubuntu-ui-toolkit/staging
- aphelperdocs
- Merge into staging
Proposed by
Nicholas Skaggs
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~nskaggs/ubuntu-ui-toolkit/aphelperdocs | ||||
Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
Diff against target: |
2967 lines (+990/-644) 82 files modified
.bazaar/Makefile (+3/-0) README (+29/-9) components.api (+1/-1) debian/control (+1/-0) documentation/autopilot-helpers/_static/nature.css (+211/-0) documentation/autopilot-helpers/_templates/layout.html (+28/-0) documentation/autopilot-helpers/conf.py (+339/-0) documentation/autopilot-helpers/index.rst (+17/-0) documentation/autopilot-helpers/ubuntuuitoolkit.rst (+10/-0) examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml (+0/-30) examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+0/-144) examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+0/-5) examples/ubuntu-ui-toolkit-gallery/po/es.po (+1/-1) modules/Ubuntu/Components/PageHeadConfiguration.qml (+0/-15) modules/Ubuntu/Components/plugin/uclistitem.cpp (+24/-88) modules/Ubuntu/Components/plugin/uclistitem.h (+3/-3) modules/Ubuntu/Components/plugin/uclistitem_p.h (+2/-3) modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp (+3/-3) po/am.po (+2/-2) po/ar.po (+2/-2) po/ast.po (+2/-2) po/az.po (+2/-2) po/be.po (+2/-2) po/bs.po (+2/-2) po/ca.po (+3/-3) po/ca@valencia.po (+2/-2) po/ce.po (+2/-2) po/cs.po (+2/-2) po/da.po (+2/-2) po/de.po (+2/-2) po/el.po (+2/-2) po/en_AU.po (+2/-2) po/en_GB.po (+2/-2) po/es.po (+1/-1) po/eu.po (+2/-2) po/fa.po (+1/-1) po/fi.po (+2/-2) po/fr.po (+4/-4) po/fr_CA.po (+2/-2) po/ga.po (+23/-16) po/gd.po (+2/-2) po/gl.po (+4/-4) po/he.po (+2/-2) po/hi.po (+140/-0) po/hr.po (+2/-2) po/hu.po (+2/-2) po/id.po (+2/-2) po/it.po (+2/-2) po/ja.po (+2/-2) po/km.po (+2/-2) po/kn.po (+2/-2) po/ko.po (+4/-4) po/lv.po (+2/-2) po/ms.po (+2/-2) po/my.po (+2/-2) po/nb.po (+4/-4) po/nl.po (+2/-2) po/oc.po (+2/-2) po/pa.po (+2/-2) po/pl.po (+2/-2) po/pt.po (+4/-4) po/pt_BR.po (+2/-2) po/ro.po (+2/-2) po/ru.po (+2/-2) po/sq.po (+2/-2) po/sr.po (+2/-2) po/sv.po (+2/-2) po/tr.po (+12/-11) po/ug.po (+3/-3) po/uk.po (+4/-4) po/zh_CN.po (+2/-2) po/zh_TW.po (+2/-2) tests/autopilot/ubuntuuitoolkit/__init__.py (+0/-2) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py (+0/-6) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_uclistitem.py (+8/-4) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py (+0/-4) tests/autopilot/ubuntuuitoolkit/emulators.py (+0/-2) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.DialogTestCase.qml (+0/-69) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py (+0/-43) tests/resources/listitems/ListItemTest.qml (+0/-9) tests/uitk_test_plan.sh (+7/-11) tests/unit_x11/tst_components/tst_listitem.qml (+14/-51) |
||||
To merge this branch: | bzr merge lp:~nskaggs/ubuntu-ui-toolkit/aphelperdocs | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu SDK team | Pending | ||
Review via email: mp+246358@code.launchpad.net |
This proposal has been superseded by a proposal from 2015-01-14.
Commit message
Re-add autopilot helper documentation and update
Description of the change
Re-add autopilot helper documentation and update
To post a comment you must log in.
- 906. By Nicholas Skaggs
-
merge with staging for proposing
- 907. By Nicholas Skaggs
-
sync nature.css from autopilot, fix favicon
- 908. By Nicholas Skaggs
-
revert staging
- 909. By Nicholas Skaggs
-
re-push
Unmerged revisions
- 909. By Nicholas Skaggs
-
re-push
- 908. By Nicholas Skaggs
-
revert staging
- 907. By Nicholas Skaggs
-
sync nature.css from autopilot, fix favicon
- 906. By Nicholas Skaggs
-
merge with staging for proposing
- 905. By Nicholas Skaggs
-
re-add sphinx depends on -autopilot package (which is in universe)
- 904. By Nicholas Skaggs
-
update build information
- 903. By Nicholas Skaggs
-
redo of build
- 902. By Nicholas Skaggs
-
re-merge trunk and restore docs build
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file '.bazaar/Makefile' | |||
2 | --- .bazaar/Makefile 1970-01-01 00:00:00 +0000 | |||
3 | +++ .bazaar/Makefile 2015-01-13 21:31:53 +0000 | |||
4 | @@ -0,0 +1,3 @@ | |||
5 | 1 | install: | ||
6 | 2 | mkdir -p ~/.bazaar/plugins | ||
7 | 3 | cp plugins/* ~/.bazaar/plugins | ||
8 | 0 | 4 | ||
9 | === modified file 'README' | |||
10 | --- README 2014-03-17 08:53:32 +0000 | |||
11 | +++ README 2015-01-13 21:31:53 +0000 | |||
12 | @@ -9,12 +9,12 @@ | |||
13 | 9 | beautiful applications in QML for Ubuntu. | 9 | beautiful applications in QML for Ubuntu. |
14 | 10 | 10 | ||
15 | 11 | QML alone lacks built-in components for basic widgets like Button, Slider, | 11 | QML alone lacks built-in components for basic widgets like Button, Slider, |
18 | 12 | Scrollbar, etc, meaning a developer has to build them from scratch. This | 12 | Scrollbar, etc, meaning a developer has to build them from scratch. This |
19 | 13 | toolkit aims to stop this duplication of work, supplying beautiful components | 13 | toolkit aims to stop this duplication of work, supplying beautiful components |
20 | 14 | ready-made and with a clear and consistent API. | 14 | ready-made and with a clear and consistent API. |
21 | 15 | 15 | ||
24 | 16 | These components are fully themeable so the look and feel can be easily | 16 | These components are fully themeable so the look and feel can be easily |
25 | 17 | customized. Resolution independence technology is built in so UIs are scaled | 17 | customized. Resolution independence technology is built in so UIs are scaled |
26 | 18 | to best suit the display. | 18 | to best suit the display. |
27 | 19 | 19 | ||
28 | 20 | Other features: | 20 | Other features: |
29 | @@ -37,16 +37,36 @@ | |||
30 | 37 | $ make install | 37 | $ make install |
31 | 38 | You may need to be root for this command to succeed. | 38 | You may need to be root for this command to succeed. |
32 | 39 | 39 | ||
34 | 40 | To use these components in QML without installing them, you need to set the | 40 | To use these components in QML without installing them, you need to set the |
35 | 41 | QML2_IMPORT_PATH environment variable. This is done by running | 41 | QML2_IMPORT_PATH environment variable. This is done by running |
36 | 42 | $ source export_modules_dir.sh | 42 | $ source export_modules_dir.sh |
38 | 43 | from the root directory of this repository, but is lost when you close your | 43 | from the root directory of this repository, but is lost when you close your |
39 | 44 | shell. | 44 | shell. |
40 | 45 | 45 | ||
41 | 46 | 46 | ||
42 | 47 | Documentation | 47 | Documentation |
43 | 48 | ------------- | 48 | ------------- |
44 | 49 | 49 | ||
48 | 50 | Once built, you may view the documentation by opening | 50 | Main Documentation (QDocs): |
49 | 51 | documentation/html/overview-ubuntu-sdk.html | 51 | +++++++++++++++++++++++++++ |
50 | 52 | in your favorite web browser. | 52 | |
51 | 53 | Once built, you may view the documentation by opening | ||
52 | 54 | `documentation/html/overview-ubuntu-sdk.html` in your favorite web browser. | ||
53 | 55 | |||
54 | 56 | |||
55 | 57 | Autopilot SDK Helpers Documentation (Sphinx docs): | ||
56 | 58 | ++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
57 | 59 | |||
58 | 60 | To build the Autopilot SDK Helpers documentation, you need to install sphinx. | ||
59 | 61 | After installation, change directory to documentation/autopilot-helpers | ||
60 | 62 | and executing make. | ||
61 | 63 | |||
62 | 64 | * $ sudo apt-get install python3-sphinx | ||
63 | 65 | |||
64 | 66 | * $ cd documentation/autopilot-helpers | ||
65 | 67 | |||
66 | 68 | * $ make singlehtml | ||
67 | 69 | |||
68 | 70 | * Once built, you may view the documentation by opening | ||
69 | 71 | `_build/singlehtml/index.html` in your favorite web browser. | ||
70 | 72 | |||
71 | 53 | 73 | ||
72 | === modified file 'components.api' | |||
73 | --- components.api 2014-12-18 10:08:56 +0000 | |||
74 | +++ components.api 2015-01-13 21:31:53 +0000 | |||
75 | @@ -871,7 +871,7 @@ | |||
76 | 871 | Property { name: "divider"; type: "UCListItemDivider"; isReadonly: true; isPointer: true } | 871 | Property { name: "divider"; type: "UCListItemDivider"; isReadonly: true; isPointer: true } |
77 | 872 | Property { name: "leadingActions"; type: "UCListItemActions"; isPointer: true } | 872 | Property { name: "leadingActions"; type: "UCListItemActions"; isPointer: true } |
78 | 873 | Property { name: "trailingActions"; type: "UCListItemActions"; isPointer: true } | 873 | Property { name: "trailingActions"; type: "UCListItemActions"; isPointer: true } |
80 | 874 | Property { name: "highlighted"; type: "bool"; isReadonly: true } | 874 | Property { name: "pressed"; type: "bool"; isReadonly: true } |
81 | 875 | Property { name: "swipeOvershoot"; type: "double" } | 875 | Property { name: "swipeOvershoot"; type: "double" } |
82 | 876 | Property { name: "contentMoving"; type: "bool"; isReadonly: true } | 876 | Property { name: "contentMoving"; type: "bool"; isReadonly: true } |
83 | 877 | Property { name: "color"; type: "QColor" } | 877 | Property { name: "color"; type: "QColor" } |
84 | 878 | 878 | ||
85 | === modified file 'debian/control' | |||
86 | --- debian/control 2014-12-12 04:46:30 +0000 | |||
87 | +++ debian/control 2015-01-13 21:31:53 +0000 | |||
88 | @@ -151,6 +151,7 @@ | |||
89 | 151 | python3-testtools, | 151 | python3-testtools, |
90 | 152 | python3-autopilot (>= 1.4), | 152 | python3-autopilot (>= 1.4), |
91 | 153 | python3-autopilot-trace, | 153 | python3-autopilot-trace, |
92 | 154 | python3-sphinx, | ||
93 | 154 | qttestability-autopilot, | 155 | qttestability-autopilot, |
94 | 155 | ubuntu-ui-toolkit-examples (>= ${source:Version}), | 156 | ubuntu-ui-toolkit-examples (>= ${source:Version}), |
95 | 156 | qtdeclarative5-ubuntu-ui-toolkit-plugin (>= ${source:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles, | 157 | qtdeclarative5-ubuntu-ui-toolkit-plugin (>= ${source:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles, |
96 | 157 | 158 | ||
97 | === added directory 'documentation/autopilot-helpers' | |||
98 | === added directory 'documentation/autopilot-helpers/_static' | |||
99 | === added file 'documentation/autopilot-helpers/_static/favicon.ico' | |||
100 | 158 | Binary files documentation/autopilot-helpers/_static/favicon.ico 1970-01-01 00:00:00 +0000 and documentation/autopilot-helpers/_static/favicon.ico 2015-01-13 21:31:53 +0000 differ | 159 | Binary files documentation/autopilot-helpers/_static/favicon.ico 1970-01-01 00:00:00 +0000 and documentation/autopilot-helpers/_static/favicon.ico 2015-01-13 21:31:53 +0000 differ |
101 | === added file 'documentation/autopilot-helpers/_static/nature.css' | |||
102 | --- documentation/autopilot-helpers/_static/nature.css 1970-01-01 00:00:00 +0000 | |||
103 | +++ documentation/autopilot-helpers/_static/nature.css 2015-01-13 21:31:53 +0000 | |||
104 | @@ -0,0 +1,211 @@ | |||
105 | 1 | /* | ||
106 | 2 | Copyright 2013 Canonical Ltd. | ||
107 | 3 | */ | ||
108 | 4 | |||
109 | 5 | @import url(basic.css); | ||
110 | 6 | |||
111 | 7 | body { | ||
112 | 8 | font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif; | ||
113 | 9 | font-size:100%; | ||
114 | 10 | background-color:#2C001E; | ||
115 | 11 | margin:0; | ||
116 | 12 | padding:0; | ||
117 | 13 | } | ||
118 | 14 | |||
119 | 15 | div.documentwrapper { | ||
120 | 16 | float:left; | ||
121 | 17 | width:100%; | ||
122 | 18 | } | ||
123 | 19 | |||
124 | 20 | div.bodywrapper { | ||
125 | 21 | margin:0 0 0 0; | ||
126 | 22 | } | ||
127 | 23 | |||
128 | 24 | hr { | ||
129 | 25 | border:1px solid #B1B4B6; | ||
130 | 26 | } | ||
131 | 27 | |||
132 | 28 | div.body { | ||
133 | 29 | background-color:#FFF; | ||
134 | 30 | color:#3E4349; | ||
135 | 31 | font-size:.9em; | ||
136 | 32 | padding:0 30px 30px; | ||
137 | 33 | } | ||
138 | 34 | |||
139 | 35 | div.footer { | ||
140 | 36 | color:#CCC; | ||
141 | 37 | width:100%; | ||
142 | 38 | text-align:center; | ||
143 | 39 | font-size:75%; | ||
144 | 40 | padding:13px 0; | ||
145 | 41 | } | ||
146 | 42 | |||
147 | 43 | div.footer a { | ||
148 | 44 | color:#444; | ||
149 | 45 | text-decoration:underline; | ||
150 | 46 | } | ||
151 | 47 | |||
152 | 48 | div.related { | ||
153 | 49 | background-color:#DD4814; | ||
154 | 50 | line-height:32px; | ||
155 | 51 | color:#fff; | ||
156 | 52 | font-size:.9em; | ||
157 | 53 | } | ||
158 | 54 | |||
159 | 55 | div.related a { | ||
160 | 56 | color:#EEE; | ||
161 | 57 | } | ||
162 | 58 | |||
163 | 59 | div.sphinxsidebar { | ||
164 | 60 | font-size:.75em; | ||
165 | 61 | line-height:1.5em; | ||
166 | 62 | } | ||
167 | 63 | |||
168 | 64 | div.sphinxsidebarwrapper { | ||
169 | 65 | padding:20px 0; | ||
170 | 66 | } | ||
171 | 67 | |||
172 | 68 | div.sphinxsidebar h3, | ||
173 | 69 | div.sphinxsidebar h4 { | ||
174 | 70 | font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif; | ||
175 | 71 | color:#222; | ||
176 | 72 | font-size:1.2em; | ||
177 | 73 | font-weight:400; | ||
178 | 74 | background-color:#ddd; | ||
179 | 75 | margin:0; | ||
180 | 76 | padding:5px 10px; | ||
181 | 77 | } | ||
182 | 78 | |||
183 | 79 | div.sphinxsidebar p { | ||
184 | 80 | color:#444; | ||
185 | 81 | padding:2px 10px; | ||
186 | 82 | } | ||
187 | 83 | |||
188 | 84 | div.sphinxsidebar ul { | ||
189 | 85 | color:#000; | ||
190 | 86 | margin:10px 5px; | ||
191 | 87 | padding:0; | ||
192 | 88 | } | ||
193 | 89 | |||
194 | 90 | div.sphinxsidebar input { | ||
195 | 91 | border:1px solid #ccc; | ||
196 | 92 | font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif; | ||
197 | 93 | font-size:1em; | ||
198 | 94 | } | ||
199 | 95 | |||
200 | 96 | div.sphinxsidebar input[type=text] { | ||
201 | 97 | margin-left:5px; | ||
202 | 98 | } | ||
203 | 99 | |||
204 | 100 | a { | ||
205 | 101 | color:#5E2750; | ||
206 | 102 | text-decoration:none; | ||
207 | 103 | } | ||
208 | 104 | |||
209 | 105 | a:hover { | ||
210 | 106 | color:#DD4814; | ||
211 | 107 | text-decoration:underline; | ||
212 | 108 | } | ||
213 | 109 | |||
214 | 110 | div.body h1 { | ||
215 | 111 | font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif; | ||
216 | 112 | font-weight:bold; | ||
217 | 113 | font-size:200%; | ||
218 | 114 | color:#444; | ||
219 | 115 | margin:20px 0 10px; | ||
220 | 116 | padding:5px 0 5px 10px; | ||
221 | 117 | } | ||
222 | 118 | |||
223 | 119 | div.body h2 { | ||
224 | 120 | font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif; | ||
225 | 121 | font-size:130%; | ||
226 | 122 | background-color:#CCC; | ||
227 | 123 | margin:20px 0 10px; | ||
228 | 124 | padding:5px 0 5px 10px; | ||
229 | 125 | } | ||
230 | 126 | |||
231 | 127 | div.body h6 { | ||
232 | 128 | font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif; | ||
233 | 129 | background-color:#BED4EB; | ||
234 | 130 | font-weight:400; | ||
235 | 131 | color:#333; | ||
236 | 132 | margin:30px 0 10px; | ||
237 | 133 | padding:5px 0 5px 10px; | ||
238 | 134 | } | ||
239 | 135 | |||
240 | 136 | a.headerlink { | ||
241 | 137 | text-decoration:none; | ||
242 | 138 | padding:0 4px; | ||
243 | 139 | } | ||
244 | 140 | |||
245 | 141 | a.headerlink:hover { | ||
246 | 142 | background-color:#AEA79F; | ||
247 | 143 | color:#FFF; | ||
248 | 144 | } | ||
249 | 145 | |||
250 | 146 | div.body p,div.body dd,div.body li { | ||
251 | 147 | line-height:1.5em; | ||
252 | 148 | } | ||
253 | 149 | |||
254 | 150 | div.highlight { | ||
255 | 151 | background-color:#FFF; | ||
256 | 152 | } | ||
257 | 153 | |||
258 | 154 | div.note { | ||
259 | 155 | background-color:#eee; | ||
260 | 156 | border:1px solid #ccc; | ||
261 | 157 | } | ||
262 | 158 | |||
263 | 159 | div.seealso { | ||
264 | 160 | background-color:#ffc; | ||
265 | 161 | border:1px solid #ff6; | ||
266 | 162 | } | ||
267 | 163 | |||
268 | 164 | div.warning { | ||
269 | 165 | background-color:#ffe4e4; | ||
270 | 166 | border:1px solid #f66; | ||
271 | 167 | } | ||
272 | 168 | |||
273 | 169 | p.admonition-title:after { | ||
274 | 170 | content:":"; | ||
275 | 171 | } | ||
276 | 172 | |||
277 | 173 | pre { | ||
278 | 174 | background-color:#EFEFEF; | ||
279 | 175 | color:#000; | ||
280 | 176 | line-height:1.1em; | ||
281 | 177 | border:1px solid #C6C9CB; | ||
282 | 178 | font-size:1.2em; | ||
283 | 179 | font-family:"Ubuntu Mono", Monaco, Consolas, "DejaVu Sans Mono", "Lucida Console", monospace; | ||
284 | 180 | margin:1.5em 0; | ||
285 | 181 | padding:6px; | ||
286 | 182 | } | ||
287 | 183 | |||
288 | 184 | tt { | ||
289 | 185 | background-color:#EFEFEF; | ||
290 | 186 | color:#222; | ||
291 | 187 | font-size:1.1em; | ||
292 | 188 | font-family:"Ubuntu Mono", Monaco, Consolas, "DejaVu Sans Mono", "Lucida Console", monospace; | ||
293 | 189 | } | ||
294 | 190 | |||
295 | 191 | .viewcode-back { | ||
296 | 192 | font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif; | ||
297 | 193 | } | ||
298 | 194 | |||
299 | 195 | div.viewcode-block:target { | ||
300 | 196 | background-color:#f4debf; | ||
301 | 197 | border-top:1px solid #ac9; | ||
302 | 198 | border-bottom:1px solid #ac9; | ||
303 | 199 | } | ||
304 | 200 | |||
305 | 201 | div.document,div.topic { | ||
306 | 202 | background-color:#eee; | ||
307 | 203 | } | ||
308 | 204 | |||
309 | 205 | div.sphinxsidebar h3 a,div.sphinxsidebar a { | ||
310 | 206 | color:#444; | ||
311 | 207 | } | ||
312 | 208 | |||
313 | 209 | div.admonition p.admonition-title + p,p.admonition-title { | ||
314 | 210 | display:inline; | ||
315 | 211 | } | ||
316 | 0 | 212 | ||
317 | === added directory 'documentation/autopilot-helpers/_templates' | |||
318 | === added file 'documentation/autopilot-helpers/_templates/layout.html' | |||
319 | --- documentation/autopilot-helpers/_templates/layout.html 1970-01-01 00:00:00 +0000 | |||
320 | +++ documentation/autopilot-helpers/_templates/layout.html 2015-01-13 21:31:53 +0000 | |||
321 | @@ -0,0 +1,28 @@ | |||
322 | 1 | <!-- | ||
323 | 2 | Copyright 2013 Canonical Ltd. | ||
324 | 3 | --> | ||
325 | 4 | |||
326 | 5 | {# | ||
327 | 6 | default/layout.html | ||
328 | 7 | ~~~~~~~~~~~~~~~~~~~ | ||
329 | 8 | |||
330 | 9 | Sphinx layout template for the default theme. | ||
331 | 10 | |||
332 | 11 | :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. | ||
333 | 12 | :license: BSD, see LICENSE for details. | ||
334 | 13 | #} | ||
335 | 14 | {% extends "basic/layout.html" %} | ||
336 | 15 | |||
337 | 16 | {%- block content %} | ||
338 | 17 | <div class="document"> | ||
339 | 18 | {%- block document %} | ||
340 | 19 | <div class="documentwrapper"> | ||
341 | 20 | {%- if render_sidebar %} | ||
342 | 21 | <div class="bodywrapper"> | ||
343 | 22 | {%- endif %} | ||
344 | 23 | <div class="body"> | ||
345 | 24 | {% block body %} {% endblock %} | ||
346 | 25 | </div> | ||
347 | 26 | </div> | ||
348 | 27 | {%- endblock %} | ||
349 | 28 | {%- endblock %} | ||
350 | 0 | \ No newline at end of file | 29 | \ No newline at end of file |
351 | 1 | 30 | ||
352 | === added file 'documentation/autopilot-helpers/conf.py' | |||
353 | --- documentation/autopilot-helpers/conf.py 1970-01-01 00:00:00 +0000 | |||
354 | +++ documentation/autopilot-helpers/conf.py 2015-01-13 21:31:53 +0000 | |||
355 | @@ -0,0 +1,339 @@ | |||
356 | 1 | # -*- coding: utf-8 -*- | ||
357 | 2 | # | ||
358 | 3 | # ubuntu-ui-toolkit-autopilot documentation build configuration file, created by | ||
359 | 4 | # sphinx-quickstart on Thu Jan 8 12:39:43 2015. | ||
360 | 5 | # | ||
361 | 6 | # This file is execfile()d with the current directory set to its | ||
362 | 7 | # containing dir. | ||
363 | 8 | # | ||
364 | 9 | # Note that not all possible configuration values are present in this | ||
365 | 10 | # autogenerated file. | ||
366 | 11 | # | ||
367 | 12 | # All configuration values have a default; values that are commented out | ||
368 | 13 | # serve to show the default. | ||
369 | 14 | |||
370 | 15 | import sys | ||
371 | 16 | import os | ||
372 | 17 | |||
373 | 18 | # If extensions (or modules to document with autodoc) are in another directory, | ||
374 | 19 | # add these directories to sys.path here. If the directory is relative to the | ||
375 | 20 | # documentation root, use os.path.abspath to make it absolute, like shown here. | ||
376 | 21 | #sys.path.insert(0, os.path.abspath('.')) | ||
377 | 22 | |||
378 | 23 | # -- General configuration ------------------------------------------------ | ||
379 | 24 | |||
380 | 25 | # If your documentation needs a minimal Sphinx version, state it here. | ||
381 | 26 | #needs_sphinx = '1.0' | ||
382 | 27 | |||
383 | 28 | # Add any Sphinx extension module names here, as strings. They can be | ||
384 | 29 | # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom | ||
385 | 30 | # ones. | ||
386 | 31 | extensions = [ | ||
387 | 32 | 'sphinx.ext.autodoc', | ||
388 | 33 | 'sphinx.ext.doctest', | ||
389 | 34 | 'sphinx.ext.todo', | ||
390 | 35 | 'sphinx.ext.viewcode', | ||
391 | 36 | ] | ||
392 | 37 | |||
393 | 38 | # Add any paths that contain templates here, relative to this directory. | ||
394 | 39 | templates_path = ['_templates'] | ||
395 | 40 | |||
396 | 41 | # The suffix of source filenames. | ||
397 | 42 | source_suffix = '.rst' | ||
398 | 43 | |||
399 | 44 | # The encoding of source files. | ||
400 | 45 | #source_encoding = 'utf-8-sig' | ||
401 | 46 | |||
402 | 47 | # The master toctree document. | ||
403 | 48 | master_doc = 'index' | ||
404 | 49 | |||
405 | 50 | # General information about the project. | ||
406 | 51 | project = u'ubuntu-ui-toolkit-autopilot' | ||
407 | 52 | copyright = u'2015, Canonical' | ||
408 | 53 | |||
409 | 54 | # The version info for the project you're documenting, acts as replacement for | ||
410 | 55 | # |version| and |release|, also used in various other places throughout the | ||
411 | 56 | # built documents. | ||
412 | 57 | # | ||
413 | 58 | # The short X.Y version. | ||
414 | 59 | version = '15.04' | ||
415 | 60 | # The full version, including alpha/beta/rc tags. | ||
416 | 61 | release = '15.04' | ||
417 | 62 | |||
418 | 63 | # The language for content autogenerated by Sphinx. Refer to documentation | ||
419 | 64 | # for a list of supported languages. | ||
420 | 65 | #language = None | ||
421 | 66 | |||
422 | 67 | # There are two options for replacing |today|: either, you set today to some | ||
423 | 68 | # non-false value, then it is used: | ||
424 | 69 | #today = '' | ||
425 | 70 | # Else, today_fmt is used as the format for a strftime call. | ||
426 | 71 | #today_fmt = '%B %d, %Y' | ||
427 | 72 | |||
428 | 73 | # List of patterns, relative to source directory, that match files and | ||
429 | 74 | # directories to ignore when looking for source files. | ||
430 | 75 | exclude_patterns = ['_build'] | ||
431 | 76 | |||
432 | 77 | # The reST default role (used for this markup: `text`) to use for all | ||
433 | 78 | # documents. | ||
434 | 79 | #default_role = None | ||
435 | 80 | |||
436 | 81 | # If true, '()' will be appended to :func: etc. cross-reference text. | ||
437 | 82 | #add_function_parentheses = True | ||
438 | 83 | |||
439 | 84 | # If true, the current module name will be prepended to all description | ||
440 | 85 | # unit titles (such as .. function::). | ||
441 | 86 | #add_module_names = True | ||
442 | 87 | |||
443 | 88 | # If true, sectionauthor and moduleauthor directives will be shown in the | ||
444 | 89 | # output. They are ignored by default. | ||
445 | 90 | #show_authors = False | ||
446 | 91 | |||
447 | 92 | # The name of the Pygments (syntax highlighting) style to use. | ||
448 | 93 | pygments_style = 'sphinx' | ||
449 | 94 | |||
450 | 95 | # A list of ignored prefixes for module index sorting. | ||
451 | 96 | #modindex_common_prefix = [] | ||
452 | 97 | |||
453 | 98 | # If true, keep warnings as "system message" paragraphs in the built documents. | ||
454 | 99 | #keep_warnings = False | ||
455 | 100 | |||
456 | 101 | |||
457 | 102 | # -- Options for HTML output ---------------------------------------------- | ||
458 | 103 | |||
459 | 104 | # The theme to use for HTML and HTML Help pages. See the documentation for | ||
460 | 105 | # a list of builtin themes. | ||
461 | 106 | html_theme = 'default' | ||
462 | 107 | |||
463 | 108 | # Theme options are theme-specific and customize the look and feel of a theme | ||
464 | 109 | # further. For a list of options available for each theme, see the | ||
465 | 110 | # documentation. | ||
466 | 111 | #html_theme_options = {} | ||
467 | 112 | |||
468 | 113 | # Add any paths that contain custom themes here, relative to this directory. | ||
469 | 114 | #html_theme_path = [] | ||
470 | 115 | |||
471 | 116 | # The name for this set of Sphinx documents. If None, it defaults to | ||
472 | 117 | # "<project> v<release> documentation". | ||
473 | 118 | #html_title = None | ||
474 | 119 | |||
475 | 120 | # A shorter title for the navigation bar. Default is the same as html_title. | ||
476 | 121 | #html_short_title = None | ||
477 | 122 | |||
478 | 123 | # The name of an image file (relative to this directory) to place at the top | ||
479 | 124 | # of the sidebar. | ||
480 | 125 | #html_logo = None | ||
481 | 126 | |||
482 | 127 | html_favicon = 'favicon.ico' | ||
483 | 128 | |||
484 | 129 | # Add any paths that contain custom static files (such as style sheets) here, | ||
485 | 130 | # relative to this directory. They are copied after the builtin static files, | ||
486 | 131 | # so a file named "default.css" will overwrite the builtin "default.css". | ||
487 | 132 | html_static_path = ['_static'] | ||
488 | 133 | |||
489 | 134 | # Add any extra paths that contain custom files (such as robots.txt or | ||
490 | 135 | # .htaccess) here, relative to this directory. These files are copied | ||
491 | 136 | # directly to the root of the documentation. | ||
492 | 137 | #html_extra_path = [] | ||
493 | 138 | |||
494 | 139 | # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, | ||
495 | 140 | # using the given strftime format. | ||
496 | 141 | #html_last_updated_fmt = '%b %d, %Y' | ||
497 | 142 | |||
498 | 143 | # If true, SmartyPants will be used to convert quotes and dashes to | ||
499 | 144 | # typographically correct entities. | ||
500 | 145 | #html_use_smartypants = True | ||
501 | 146 | |||
502 | 147 | # Custom sidebar templates, maps document names to template names. | ||
503 | 148 | #html_sidebars = {} | ||
504 | 149 | |||
505 | 150 | html_domain_indices = True | ||
506 | 151 | # Additional templates that should be rendered to pages, maps page names to | ||
507 | 152 | # template names. | ||
508 | 153 | html_use_index = True | ||
509 | 154 | #html_additional_pages = {} | ||
510 | 155 | |||
511 | 156 | # If false, no module index is generated. | ||
512 | 157 | #html_domain_indices = True | ||
513 | 158 | |||
514 | 159 | html_show_sourcelink = False | ||
515 | 160 | # If false, no index is generated. | ||
516 | 161 | #html_use_index = True | ||
517 | 162 | html_show_sphinx = False | ||
518 | 163 | |||
519 | 164 | # If true, the index is split into individual pages for each letter. | ||
520 | 165 | html_show_copyright = True | ||
521 | 166 | #html_split_index = False | ||
522 | 167 | |||
523 | 168 | # If true, links to the reST sources are added to the pages. | ||
524 | 169 | #html_show_sourcelink = True | ||
525 | 170 | |||
526 | 171 | # If true, "Created using Sphinx" is shown in the HTML footer. Default is True. | ||
527 | 172 | #html_show_sphinx = True | ||
528 | 173 | |||
529 | 174 | # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. | ||
530 | 175 | #html_show_copyright = True | ||
531 | 176 | |||
532 | 177 | # If true, an OpenSearch description file will be output, and all pages will | ||
533 | 178 | # contain a <link> tag referring to it. The value of this option must be the | ||
534 | 179 | # base URL from which the finished HTML is served. | ||
535 | 180 | #html_use_opensearch = '' | ||
536 | 181 | |||
537 | 182 | # This is the file name suffix for HTML files (e.g. ".xhtml"). | ||
538 | 183 | #html_file_suffix = None | ||
539 | 184 | |||
540 | 185 | # Output file base name for HTML help builder. | ||
541 | 186 | htmlhelp_basename = 'ubuntu-ui-toolkit-autopilotdoc' | ||
542 | 187 | |||
543 | 188 | |||
544 | 189 | # -- Options for LaTeX output --------------------------------------------- | ||
545 | 190 | |||
546 | 191 | latex_elements = { | ||
547 | 192 | # The paper size ('letterpaper' or 'a4paper'). | ||
548 | 193 | #'papersize': 'letterpaper', | ||
549 | 194 | |||
550 | 195 | # The font size ('10pt', '11pt' or '12pt'). | ||
551 | 196 | #'pointsize': '10pt', | ||
552 | 197 | |||
553 | 198 | # Additional stuff for the LaTeX preamble. | ||
554 | 199 | #'preamble': '', | ||
555 | 200 | } | ||
556 | 201 | |||
557 | 202 | # Grouping the document tree into LaTeX files. List of tuples | ||
558 | 203 | # (source start file, target name, title, | ||
559 | 204 | # author, documentclass [howto, manual, or own class]). | ||
560 | 205 | latex_documents = [ | ||
561 | 206 | ('index', 'ubuntu-ui-toolkit-autopilot.tex', | ||
562 | 207 | u'ubuntu-ui-toolkit-autopilot Documentation', | ||
563 | 208 | u'authors', 'manual'), | ||
564 | 209 | ] | ||
565 | 210 | |||
566 | 211 | # The name of an image file (relative to this directory) to place at the top of | ||
567 | 212 | # the title page. | ||
568 | 213 | #latex_logo = None | ||
569 | 214 | |||
570 | 215 | # For "manual" documents, if this is true, then toplevel headings are parts, | ||
571 | 216 | # not chapters. | ||
572 | 217 | #latex_use_parts = False | ||
573 | 218 | |||
574 | 219 | # If true, show page references after internal links. | ||
575 | 220 | #latex_show_pagerefs = False | ||
576 | 221 | |||
577 | 222 | # If true, show URL addresses after external links. | ||
578 | 223 | #latex_show_urls = False | ||
579 | 224 | |||
580 | 225 | # Documents to append as an appendix to all manuals. | ||
581 | 226 | #latex_appendices = [] | ||
582 | 227 | |||
583 | 228 | # If false, no module index is generated. | ||
584 | 229 | #latex_domain_indices = True | ||
585 | 230 | |||
586 | 231 | |||
587 | 232 | # -- Options for manual page output --------------------------------------- | ||
588 | 233 | |||
589 | 234 | # One entry per manual page. List of tuples | ||
590 | 235 | # (source start file, name, description, authors, manual section). | ||
591 | 236 | man_pages = [ | ||
592 | 237 | ('index', 'ubuntu-ui-toolkit-autopilot', | ||
593 | 238 | u'ubuntu-ui-toolkit-autopilot Documentation', | ||
594 | 239 | [u'authors'], 1) | ||
595 | 240 | ] | ||
596 | 241 | |||
597 | 242 | # If true, show URL addresses after external links. | ||
598 | 243 | #man_show_urls = False | ||
599 | 244 | |||
600 | 245 | |||
601 | 246 | # -- Options for Texinfo output ------------------------------------------- | ||
602 | 247 | |||
603 | 248 | # Grouping the document tree into Texinfo files. List of tuples | ||
604 | 249 | # (source start file, target name, title, author, | ||
605 | 250 | # dir menu entry, description, category) | ||
606 | 251 | texinfo_documents = [ | ||
607 | 252 | ('index', 'ubuntu-ui-toolkit-autopilot', | ||
608 | 253 | u'ubuntu-ui-toolkit-autopilot Documentation', | ||
609 | 254 | u'authors', 'ubuntu-ui-toolkit-autopilot', | ||
610 | 255 | 'An autopilot emulator for the ubuntu sdk', | ||
611 | 256 | 'Miscellaneous'), | ||
612 | 257 | ] | ||
613 | 258 | |||
614 | 259 | # Documents to append as an appendix to all manuals. | ||
615 | 260 | #texinfo_appendices = [] | ||
616 | 261 | |||
617 | 262 | # If false, no module index is generated. | ||
618 | 263 | #texinfo_domain_indices = True | ||
619 | 264 | |||
620 | 265 | # How to display URL addresses: 'footnote', 'no', or 'inline'. | ||
621 | 266 | #texinfo_show_urls = 'footnote' | ||
622 | 267 | |||
623 | 268 | # If true, do not generate a @detailmenu in the "Top" node's menu. | ||
624 | 269 | #texinfo_no_detailmenu = False | ||
625 | 270 | |||
626 | 271 | |||
627 | 272 | # -- Options for Epub output ---------------------------------------------- | ||
628 | 273 | |||
629 | 274 | # Bibliographic Dublin Core info. | ||
630 | 275 | epub_title = u'ubuntu-ui-toolkit-autopilot' | ||
631 | 276 | epub_author = u'authors' | ||
632 | 277 | epub_publisher = u'Canonical' | ||
633 | 278 | epub_copyright = u'2015, Canonical' | ||
634 | 279 | |||
635 | 280 | # The basename for the epub file. It defaults to the project name. | ||
636 | 281 | #epub_basename = u'ubuntu-ui-toolkit-autopilot' | ||
637 | 282 | |||
638 | 283 | # The HTML theme for the epub output. Since the default themes are not optimized | ||
639 | 284 | # for small screen space, using the same theme for HTML and epub output is | ||
640 | 285 | # usually not wise. This defaults to 'epub', a theme designed to save visual | ||
641 | 286 | # space. | ||
642 | 287 | #epub_theme = 'epub' | ||
643 | 288 | |||
644 | 289 | # The language of the text. It defaults to the language option | ||
645 | 290 | # or en if the language is not set. | ||
646 | 291 | #epub_language = '' | ||
647 | 292 | |||
648 | 293 | # The scheme of the identifier. Typical schemes are ISBN or URL. | ||
649 | 294 | #epub_scheme = '' | ||
650 | 295 | |||
651 | 296 | # The unique identifier of the text. This can be a ISBN number | ||
652 | 297 | # or the project homepage. | ||
653 | 298 | #epub_identifier = '' | ||
654 | 299 | |||
655 | 300 | # A unique identification for the text. | ||
656 | 301 | #epub_uid = '' | ||
657 | 302 | |||
658 | 303 | # A tuple containing the cover image and cover page html template filenames. | ||
659 | 304 | #epub_cover = () | ||
660 | 305 | |||
661 | 306 | # A sequence of (type, uri, title) tuples for the guide element of content.opf. | ||
662 | 307 | #epub_guide = () | ||
663 | 308 | |||
664 | 309 | # HTML files that should be inserted before the pages created by sphinx. | ||
665 | 310 | # The format is a list of tuples containing the path and title. | ||
666 | 311 | #epub_pre_files = [] | ||
667 | 312 | |||
668 | 313 | # HTML files shat should be inserted after the pages created by sphinx. | ||
669 | 314 | # The format is a list of tuples containing the path and title. | ||
670 | 315 | #epub_post_files = [] | ||
671 | 316 | |||
672 | 317 | # A list of files that should not be packed into the epub file. | ||
673 | 318 | epub_exclude_files = ['search.html'] | ||
674 | 319 | |||
675 | 320 | # The depth of the table of contents in toc.ncx. | ||
676 | 321 | #epub_tocdepth = 3 | ||
677 | 322 | |||
678 | 323 | # Allow duplicate toc entries. | ||
679 | 324 | #epub_tocdup = True | ||
680 | 325 | |||
681 | 326 | # Choose between 'default' and 'includehidden'. | ||
682 | 327 | #epub_tocscope = 'default' | ||
683 | 328 | |||
684 | 329 | # Fix unsupported image types using the PIL. | ||
685 | 330 | #epub_fix_images = False | ||
686 | 331 | |||
687 | 332 | # Scale large images. | ||
688 | 333 | #epub_max_image_width = 0 | ||
689 | 334 | |||
690 | 335 | # How to display URL addresses: 'footnote', 'no', or 'inline'. | ||
691 | 336 | #epub_show_urls = 'inline' | ||
692 | 337 | |||
693 | 338 | # If false, no index is generated. | ||
694 | 339 | #epub_use_index = True | ||
695 | 0 | 340 | ||
696 | === added file 'documentation/autopilot-helpers/index.rst' | |||
697 | --- documentation/autopilot-helpers/index.rst 1970-01-01 00:00:00 +0000 | |||
698 | +++ documentation/autopilot-helpers/index.rst 2015-01-13 21:31:53 +0000 | |||
699 | @@ -0,0 +1,17 @@ | |||
700 | 1 | .. ubuntu-ui-toolkit-autopilot documentation master file, created by | ||
701 | 2 | sphinx-quickstart on Thu Jan 8 12:39:43 2015. | ||
702 | 3 | You can adapt this file completely to your liking, but it should at least | ||
703 | 4 | contain the root `toctree` directive. | ||
704 | 5 | |||
705 | 6 | Welcome to ubuntu-ui-toolkit-autopilot's documentation! | ||
706 | 7 | ====================================== | ||
707 | 8 | |||
708 | 9 | Contents: | ||
709 | 10 | |||
710 | 11 | .. toctree:: | ||
711 | 12 | :maxdepth: 2 | ||
712 | 13 | |||
713 | 14 | ubuntuuitoolkit | ||
714 | 15 | |||
715 | 16 | * :ref:`genindex` | ||
716 | 17 | |||
717 | 0 | 18 | ||
718 | === added file 'documentation/autopilot-helpers/ubuntuuitoolkit.rst' | |||
719 | --- documentation/autopilot-helpers/ubuntuuitoolkit.rst 1970-01-01 00:00:00 +0000 | |||
720 | +++ documentation/autopilot-helpers/ubuntuuitoolkit.rst 2015-01-13 21:31:53 +0000 | |||
721 | @@ -0,0 +1,10 @@ | |||
722 | 1 | ubuntuuitoolkit Package | ||
723 | 2 | ======================= | ||
724 | 3 | |||
725 | 4 | :mod:`custom proxy object` Module | ||
726 | 5 | --------------------------------- | ||
727 | 6 | |||
728 | 7 | .. automodule:: ubuntuuitoolkit | ||
729 | 8 | :members: | ||
730 | 9 | :undoc-members: | ||
731 | 10 | :show-inheritance: | ||
732 | 0 | 11 | ||
733 | === removed file 'examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml' | |||
734 | --- examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml 2015-01-05 20:34:54 +0000 | |||
735 | +++ examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml 1970-01-01 00:00:00 +0000 | |||
736 | @@ -1,30 +0,0 @@ | |||
737 | 1 | /* | ||
738 | 2 | * Copyright 2015 Canonical Ltd. | ||
739 | 3 | * | ||
740 | 4 | * This program is free software; you can redistribute it and/or modify | ||
741 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
742 | 6 | * the Free Software Foundation; version 3. | ||
743 | 7 | * | ||
744 | 8 | * This program is distributed in the hope that it will be useful, | ||
745 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
746 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
747 | 11 | * GNU Lesser General Public License for more details. | ||
748 | 12 | * | ||
749 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
750 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
751 | 15 | */ | ||
752 | 16 | |||
753 | 17 | import QtQuick 2.2 | ||
754 | 18 | import Ubuntu.Components 1.2 | ||
755 | 19 | |||
756 | 20 | ListItem { | ||
757 | 21 | property alias text: label.text | ||
758 | 22 | Label { | ||
759 | 23 | id: label | ||
760 | 24 | anchors { | ||
761 | 25 | left: parent.left | ||
762 | 26 | leftMargin: units.gu(2) | ||
763 | 27 | verticalCenter: parent.verticalCenter | ||
764 | 28 | } | ||
765 | 29 | } | ||
766 | 30 | } | ||
767 | 31 | 0 | ||
768 | === removed file 'examples/ubuntu-ui-toolkit-gallery/NewListItems.qml' | |||
769 | --- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml 2015-01-05 20:55:12 +0000 | |||
770 | +++ examples/ubuntu-ui-toolkit-gallery/NewListItems.qml 1970-01-01 00:00:00 +0000 | |||
771 | @@ -1,144 +0,0 @@ | |||
772 | 1 | /* | ||
773 | 2 | * Copyright 2015 Canonical Ltd. | ||
774 | 3 | * | ||
775 | 4 | * This program is free software; you can redistribute it and/or modify | ||
776 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
777 | 6 | * the Free Software Foundation; version 3. | ||
778 | 7 | * | ||
779 | 8 | * This program is distributed in the hope that it will be useful, | ||
780 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
781 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
782 | 11 | * GNU Lesser General Public License for more details. | ||
783 | 12 | * | ||
784 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
785 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
786 | 15 | */ | ||
787 | 16 | |||
788 | 17 | import QtQuick 2.2 | ||
789 | 18 | import Ubuntu.Components 1.2 | ||
790 | 19 | |||
791 | 20 | Template { | ||
792 | 21 | objectName: "listItemsTemplate" | ||
793 | 22 | |||
794 | 23 | TemplateSection { | ||
795 | 24 | className: "ListItem" | ||
796 | 25 | // no spacing between the list items in the Column | ||
797 | 26 | spacing: 0 | ||
798 | 27 | Item { | ||
799 | 28 | // compensate for the spacing of 0 by adding this | ||
800 | 29 | // Item inbetween the title and the list items. | ||
801 | 30 | height: units.gu(3) | ||
802 | 31 | width: parent.width | ||
803 | 32 | } | ||
804 | 33 | |||
805 | 34 | // clip the action delegates while swiping left/right | ||
806 | 35 | clip: true | ||
807 | 36 | |||
808 | 37 | ListItemWithLabel { | ||
809 | 38 | text: i18n.tr("Basic") | ||
810 | 39 | } | ||
811 | 40 | ListItemWithLabel { | ||
812 | 41 | text: i18n.tr("Colored divider") | ||
813 | 42 | divider { | ||
814 | 43 | colorFrom: UbuntuColors.red | ||
815 | 44 | colorTo: UbuntuColors.green | ||
816 | 45 | } | ||
817 | 46 | } | ||
818 | 47 | ListItemWithLabel { | ||
819 | 48 | text: i18n.tr("No divider") | ||
820 | 49 | divider.visible: false | ||
821 | 50 | } | ||
822 | 51 | ListItemWithLabel { | ||
823 | 52 | color: UbuntuColors.blue | ||
824 | 53 | text: i18n.tr("Colored") | ||
825 | 54 | } | ||
826 | 55 | ListItemWithLabel { | ||
827 | 56 | text: i18n.tr("Highlight color") | ||
828 | 57 | highlightColor: UbuntuColors.orange | ||
829 | 58 | // no highlight without clicked() or leading/trailing actions | ||
830 | 59 | onClicked: print(i18n.tr("Highlighting list item")) | ||
831 | 60 | } | ||
832 | 61 | |||
833 | 62 | ListItemActions { | ||
834 | 63 | id: exampleLeadingActions | ||
835 | 64 | actions: [ | ||
836 | 65 | Action { | ||
837 | 66 | iconName: "tick" | ||
838 | 67 | }, | ||
839 | 68 | Action { | ||
840 | 69 | iconName: "delete" | ||
841 | 70 | } | ||
842 | 71 | ] | ||
843 | 72 | } | ||
844 | 73 | ListItemActions { | ||
845 | 74 | id: exampleTrailingActions | ||
846 | 75 | actions: [ | ||
847 | 76 | Action { | ||
848 | 77 | iconName: "edit" | ||
849 | 78 | }, | ||
850 | 79 | Action { | ||
851 | 80 | iconName: "save-to" | ||
852 | 81 | } | ||
853 | 82 | ] | ||
854 | 83 | } | ||
855 | 84 | |||
856 | 85 | ListItemWithLabel { | ||
857 | 86 | text: i18n.tr("Leading actions") | ||
858 | 87 | leadingActions: exampleLeadingActions | ||
859 | 88 | } | ||
860 | 89 | ListItemWithLabel { | ||
861 | 90 | text: i18n.tr("Trailing actions") | ||
862 | 91 | trailingActions: exampleTrailingActions | ||
863 | 92 | } | ||
864 | 93 | ListItemWithLabel { | ||
865 | 94 | text: i18n.tr("Leading and trailing actions") | ||
866 | 95 | leadingActions: exampleLeadingActions | ||
867 | 96 | trailingActions: exampleTrailingActions | ||
868 | 97 | } | ||
869 | 98 | ListItemWithLabel { | ||
870 | 99 | text: i18n.tr("Custom action delegates") | ||
871 | 100 | swipeOvershoot: 0 | ||
872 | 101 | leadingActions: ListItemActions { | ||
873 | 102 | actions: [ | ||
874 | 103 | Action { | ||
875 | 104 | iconName: "tick" | ||
876 | 105 | property color color: UbuntuColors.green | ||
877 | 106 | }, | ||
878 | 107 | Action { | ||
879 | 108 | iconName: "delete" | ||
880 | 109 | property color color: UbuntuColors.red | ||
881 | 110 | } | ||
882 | 111 | ] | ||
883 | 112 | delegate: Rectangle { | ||
884 | 113 | width: height | ||
885 | 114 | color: pressed ? Qt.darker(action.color, 1.2) : action.color | ||
886 | 115 | Icon { | ||
887 | 116 | width: units.gu(3) | ||
888 | 117 | height: width | ||
889 | 118 | name: action.iconName | ||
890 | 119 | color: "white" | ||
891 | 120 | anchors.centerIn: parent | ||
892 | 121 | } | ||
893 | 122 | } | ||
894 | 123 | } | ||
895 | 124 | trailingActions: ListItemActions { | ||
896 | 125 | actions: [ | ||
897 | 126 | Action { | ||
898 | 127 | text: i18n.tr("Edit") | ||
899 | 128 | }, | ||
900 | 129 | Action { | ||
901 | 130 | text: i18n.tr("Move") | ||
902 | 131 | } | ||
903 | 132 | ] | ||
904 | 133 | delegate: Rectangle { | ||
905 | 134 | color: pressed ? Qt.darker("yellow", 1.1) : "yellow" | ||
906 | 135 | width: units.gu(10) | ||
907 | 136 | Label { | ||
908 | 137 | text: action.text | ||
909 | 138 | anchors.centerIn: parent | ||
910 | 139 | } | ||
911 | 140 | } | ||
912 | 141 | } | ||
913 | 142 | } | ||
914 | 143 | } | ||
915 | 144 | } | ||
916 | 145 | 0 | ||
917 | === modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml' | |||
918 | --- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml 2015-01-05 20:43:06 +0000 | |||
919 | +++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml 2015-01-13 21:31:53 +0000 | |||
920 | @@ -104,11 +104,6 @@ | |||
921 | 104 | source: "ListItems.qml" | 104 | source: "ListItems.qml" |
922 | 105 | } | 105 | } |
923 | 106 | ListElement { | 106 | ListElement { |
924 | 107 | objectName: "newListItemsElement" | ||
925 | 108 | label: "New list items (preview)" | ||
926 | 109 | source: "NewListItems.qml" | ||
927 | 110 | } | ||
928 | 111 | ListElement { | ||
929 | 112 | objectName: "ubuntuListViewElement" | 107 | objectName: "ubuntuListViewElement" |
930 | 113 | label: "Ubuntu ListView" | 108 | label: "Ubuntu ListView" |
931 | 114 | source: "UbuntuListViews.qml" | 109 | source: "UbuntuListViews.qml" |
932 | 115 | 110 | ||
933 | === modified file 'examples/ubuntu-ui-toolkit-gallery/po/es.po' | |||
934 | --- examples/ubuntu-ui-toolkit-gallery/po/es.po 2014-12-12 06:33:39 +0000 | |||
935 | +++ examples/ubuntu-ui-toolkit-gallery/po/es.po 2015-01-13 21:31:53 +0000 | |||
936 | @@ -14,7 +14,7 @@ | |||
937 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
938 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
939 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
941 | 17 | "X-Launchpad-Export-Date: 2014-12-12 06:33+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
942 | 18 | "X-Generator: Launchpad (build 17286)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
943 | 19 | 19 | ||
944 | 20 | #: Animations.qml:24 | 20 | #: Animations.qml:24 |
945 | 21 | 21 | ||
946 | === modified file 'modules/Ubuntu/Components/PageHeadConfiguration.qml' | |||
947 | --- modules/Ubuntu/Components/PageHeadConfiguration.qml 2015-01-06 12:36:58 +0000 | |||
948 | +++ modules/Ubuntu/Components/PageHeadConfiguration.qml 2015-01-13 21:31:53 +0000 | |||
949 | @@ -96,21 +96,6 @@ | |||
950 | 96 | */ | 96 | */ |
951 | 97 | property Item contents: null | 97 | property Item contents: null |
952 | 98 | 98 | ||
953 | 99 | QtObject { | ||
954 | 100 | id: internal | ||
955 | 101 | property Item oldContents: null | ||
956 | 102 | } | ||
957 | 103 | |||
958 | 104 | onContentsChanged: { | ||
959 | 105 | if (internal.oldContents) { | ||
960 | 106 | // FIX: bug #1341814 and #1400297 | ||
961 | 107 | // We have to force the removal of the previous head.contents | ||
962 | 108 | // in order to show the new contents | ||
963 | 109 | internal.oldContents.parent = null; | ||
964 | 110 | } | ||
965 | 111 | internal.oldContents = contents; | ||
966 | 112 | } | ||
967 | 113 | |||
968 | 114 | // FIXME: The example below can be much simplified using PageHeadState | 99 | // FIXME: The example below can be much simplified using PageHeadState |
969 | 115 | // when bug #1345775 has been fixed. | 100 | // when bug #1345775 has been fixed. |
970 | 116 | /*! | 101 | /*! |
971 | 117 | 102 | ||
972 | === modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp' | |||
973 | --- modules/Ubuntu/Components/plugin/uclistitem.cpp 2015-01-07 06:42:09 +0000 | |||
974 | +++ modules/Ubuntu/Components/plugin/uclistitem.cpp 2015-01-13 21:31:53 +0000 | |||
975 | @@ -327,7 +327,7 @@ | |||
976 | 327 | */ | 327 | */ |
977 | 328 | UCListItemPrivate::UCListItemPrivate() | 328 | UCListItemPrivate::UCListItemPrivate() |
978 | 329 | : UCStyledItemBasePrivate() | 329 | : UCStyledItemBasePrivate() |
980 | 330 | , highlighted(false) | 330 | , pressed(false) |
981 | 331 | , contentMoved(false) | 331 | , contentMoved(false) |
982 | 332 | , highlightColorChanged(false) | 332 | , highlightColorChanged(false) |
983 | 333 | , swiped(false) | 333 | , swiped(false) |
984 | @@ -379,16 +379,6 @@ | |||
985 | 379 | _q_updateSize(); | 379 | _q_updateSize(); |
986 | 380 | } | 380 | } |
987 | 381 | 381 | ||
988 | 382 | // inspired from IS_SIGNAL_CONNECTED(q, UCListItem, pressAndHold, ()) | ||
989 | 383 | // the macro cannot be used due to Arguments cannot be an empty () | ||
990 | 384 | bool UCListItemPrivate::isClickedConnected() | ||
991 | 385 | { | ||
992 | 386 | Q_Q(UCListItem); | ||
993 | 387 | static QMetaMethod method = QMetaMethod::fromSignal(&UCListItem::clicked); | ||
994 | 388 | static int signalIdx = QMetaObjectPrivate::signalIndex(method); | ||
995 | 389 | return QObjectPrivate::get(q)->isSignalConnected(signalIdx); | ||
996 | 390 | } | ||
997 | 391 | |||
998 | 392 | void UCListItemPrivate::_q_updateThemedData() | 382 | void UCListItemPrivate::_q_updateThemedData() |
999 | 393 | { | 383 | { |
1000 | 394 | // update colors, panels | 384 | // update colors, panels |
1001 | @@ -402,7 +392,7 @@ | |||
1002 | 402 | 392 | ||
1003 | 403 | void UCListItemPrivate::_q_rebound() | 393 | void UCListItemPrivate::_q_rebound() |
1004 | 404 | { | 394 | { |
1006 | 405 | setHighlighted(false); | 395 | setPressed(false); |
1007 | 406 | // initiate rebinding only if there were actions tugged | 396 | // initiate rebinding only if there were actions tugged |
1008 | 407 | Q_Q(UCListItem); | 397 | Q_Q(UCListItem); |
1009 | 408 | if (!UCListItemActionsPrivate::isConnectedTo(leadingActions, q) && | 398 | if (!UCListItemActionsPrivate::isConnectedTo(leadingActions, q) && |
1010 | @@ -507,13 +497,14 @@ | |||
1011 | 507 | // rebound without animation | 497 | // rebound without animation |
1012 | 508 | void UCListItemPrivate::promptRebound() | 498 | void UCListItemPrivate::promptRebound() |
1013 | 509 | { | 499 | { |
1015 | 510 | setHighlighted(false); | 500 | setPressed(false); |
1016 | 511 | setSwiped(false); | 501 | setSwiped(false); |
1017 | 512 | if (animator) { | 502 | if (animator) { |
1018 | 513 | animator->snapOut(); | 503 | animator->snapOut(); |
1019 | 514 | } | 504 | } |
1020 | 515 | } | 505 | } |
1021 | 516 | 506 | ||
1022 | 507 | // set pressed flag and update background | ||
1023 | 517 | // called when units size changes | 508 | // called when units size changes |
1024 | 518 | void UCListItemPrivate::_q_updateSize() | 509 | void UCListItemPrivate::_q_updateSize() |
1025 | 519 | { | 510 | { |
1026 | @@ -549,18 +540,18 @@ | |||
1027 | 549 | // action, leading or trailing actions list or at least an active child component declared | 540 | // action, leading or trailing actions list or at least an active child component declared |
1028 | 550 | QQuickMouseArea *ma = q->findChild<QQuickMouseArea*>(); | 541 | QQuickMouseArea *ma = q->findChild<QQuickMouseArea*>(); |
1029 | 551 | bool activeMouseArea = ma && ma->isEnabled(); | 542 | bool activeMouseArea = ma && ma->isEnabled(); |
1031 | 552 | return !activeComponent && (isClickedConnected() || leadingActions || trailingActions || activeMouseArea); | 543 | return !activeComponent && (leadingActions || trailingActions || activeMouseArea); |
1032 | 553 | } | 544 | } |
1033 | 554 | 545 | ||
1036 | 555 | // set highlighted flag and update contentItem | 546 | // set pressed flag and update contentItem |
1037 | 556 | void UCListItemPrivate::setHighlighted(bool highlighted) | 547 | void UCListItemPrivate::setPressed(bool pressed) |
1038 | 557 | { | 548 | { |
1041 | 558 | if (this->highlighted != highlighted) { | 549 | if (this->pressed != pressed) { |
1042 | 559 | this->highlighted = highlighted; | 550 | this->pressed = pressed; |
1043 | 560 | suppressClick = false; | 551 | suppressClick = false; |
1044 | 561 | Q_Q(UCListItem); | 552 | Q_Q(UCListItem); |
1045 | 562 | q->update(); | 553 | q->update(); |
1047 | 563 | Q_EMIT q->highlightedChanged(); | 554 | Q_EMIT q->pressedChanged(); |
1048 | 564 | } | 555 | } |
1049 | 565 | } | 556 | } |
1050 | 566 | // toggles the tugged flag and installs/removes event filter | 557 | // toggles the tugged flag and installs/removes event filter |
1051 | @@ -652,63 +643,8 @@ | |||
1052 | 652 | * good performance when used in long list views. | 643 | * good performance when used in long list views. |
1053 | 653 | * | 644 | * |
1054 | 654 | * The component provides two color properties which configures the item's background | 645 | * The component provides two color properties which configures the item's background |
1112 | 655 | * when normal or highlighted. This can be configured through \l color and \l highlightColor | 646 | * when normal or pressed. This can be configured through \l color and \l highlightColor |
1113 | 656 | * properties. The list item is highlighted if there is an action attached to it. | 647 | * properties. |
1057 | 657 | * This means that the list item must have an active component declared as child, | ||
1058 | 658 | * at least leading- or trailing actions specified, or to have a slot connected to | ||
1059 | 659 | * \l clicked signal. In any other case the component will not be highlighted, and | ||
1060 | 660 | * \l highlighted property will not be toggled either. Also, there will be no highlight | ||
1061 | 661 | * happening if the click happens on the active component. | ||
1062 | 662 | * \qml | ||
1063 | 663 | * import QtQuick 2.3 | ||
1064 | 664 | * import Ubuntu.Components 1.2 | ||
1065 | 665 | * | ||
1066 | 666 | * MainView { | ||
1067 | 667 | * width: units.gu(40) | ||
1068 | 668 | * height: units.gu(71) | ||
1069 | 669 | * | ||
1070 | 670 | * Column { | ||
1071 | 671 | * anchors.fill: parent | ||
1072 | 672 | * ListItem { | ||
1073 | 673 | * Button { | ||
1074 | 674 | * text: "Press me" | ||
1075 | 675 | * } | ||
1076 | 676 | * onClicked: console.log("clicked on ListItem") | ||
1077 | 677 | * } | ||
1078 | 678 | * ListItem { | ||
1079 | 679 | * leadingActions: ListItemActions { | ||
1080 | 680 | * actions: [ | ||
1081 | 681 | * Action { | ||
1082 | 682 | * iconName: "delete" | ||
1083 | 683 | * } | ||
1084 | 684 | * ] | ||
1085 | 685 | * } | ||
1086 | 686 | * onClicked: console.log("clicked on ListItem with leadingActions set") | ||
1087 | 687 | * } | ||
1088 | 688 | * ListItem { | ||
1089 | 689 | * trailingActions: ListItemActions { | ||
1090 | 690 | * actions: [ | ||
1091 | 691 | * Action { | ||
1092 | 692 | * iconName: "edit" | ||
1093 | 693 | * } | ||
1094 | 694 | * ] | ||
1095 | 695 | * } | ||
1096 | 696 | * onClicked: console.log("clicked on ListItem with trailingActions set") | ||
1097 | 697 | * } | ||
1098 | 698 | * ListItem { | ||
1099 | 699 | * Label { | ||
1100 | 700 | * text: "onClicked implemented" | ||
1101 | 701 | * } | ||
1102 | 702 | * onClicked: console.log("clicked on ListItem with onClicked implemented") | ||
1103 | 703 | * } | ||
1104 | 704 | * ListItem { | ||
1105 | 705 | * Label { | ||
1106 | 706 | * text: "No highlight" | ||
1107 | 707 | * } | ||
1108 | 708 | * } | ||
1109 | 709 | * } | ||
1110 | 710 | * } | ||
1111 | 711 | * \endqml | ||
1114 | 712 | * | 648 | * |
1115 | 713 | * \c contentItem holds all components and resources declared as child to ListItem. | 649 | * \c contentItem holds all components and resources declared as child to ListItem. |
1116 | 714 | * Being an Item, all properties can be accessed or altered. However, make sure you | 650 | * Being an Item, all properties can be accessed or altered. However, make sure you |
1117 | @@ -782,7 +718,7 @@ | |||
1118 | 782 | /*! | 718 | /*! |
1119 | 783 | * \qmlsignal ListItem::clicked() | 719 | * \qmlsignal ListItem::clicked() |
1120 | 784 | * | 720 | * |
1122 | 785 | * The signal is emitted when the component gets released while the \l highlighted property | 721 | * The signal is emitted when the component gets released while the \l pressed property |
1123 | 786 | * is set. The signal is not emitted if the ListItem content is swiped or when used in | 722 | * is set. The signal is not emitted if the ListItem content is swiped or when used in |
1124 | 787 | * Flickable (or ListView, GridView) and the Flickable gets moved. | 723 | * Flickable (or ListView, GridView) and the Flickable gets moved. |
1125 | 788 | */ | 724 | */ |
1126 | @@ -873,7 +809,7 @@ | |||
1127 | 873 | Q_UNUSED(data); | 809 | Q_UNUSED(data); |
1128 | 874 | 810 | ||
1129 | 875 | Q_D(UCListItem); | 811 | Q_D(UCListItem); |
1131 | 876 | QColor color = d->highlighted ? d->highlightColor : d->color; | 812 | QColor color = d->pressed ? d->highlightColor : d->color; |
1132 | 877 | 813 | ||
1133 | 878 | if (width() <= 0 || height() <= 0) { | 814 | if (width() <= 0 || height() <= 0) { |
1134 | 879 | delete oldNode; | 815 | delete oldNode; |
1135 | @@ -929,7 +865,7 @@ | |||
1136 | 929 | return; | 865 | return; |
1137 | 930 | } | 866 | } |
1138 | 931 | if (event->button() == Qt::LeftButton && d->canHighlight(event)) { | 867 | if (event->button() == Qt::LeftButton && d->canHighlight(event)) { |
1140 | 932 | d->setHighlighted(true); | 868 | d->setPressed(true); |
1141 | 933 | d->lastPos = d->pressedPos = event->localPos(); | 869 | d->lastPos = d->pressedPos = event->localPos(); |
1142 | 934 | // connect the Flickable to know when to rebound | 870 | // connect the Flickable to know when to rebound |
1143 | 935 | d->listenToRebind(true); | 871 | d->listenToRebind(true); |
1144 | @@ -948,7 +884,7 @@ | |||
1145 | 948 | UCStyledItemBase::mouseReleaseEvent(event); | 884 | UCStyledItemBase::mouseReleaseEvent(event); |
1146 | 949 | Q_D(UCListItem); | 885 | Q_D(UCListItem); |
1147 | 950 | // set released | 886 | // set released |
1149 | 951 | if (d->highlighted) { | 887 | if (d->pressed) { |
1150 | 952 | d->listenToRebind(false); | 888 | d->listenToRebind(false); |
1151 | 953 | if (d->attachedProperties) { | 889 | if (d->attachedProperties) { |
1152 | 954 | d->attachedProperties->disableInteractive(this, false); | 890 | d->attachedProperties->disableInteractive(this, false); |
1153 | @@ -959,7 +895,7 @@ | |||
1154 | 959 | d->_q_rebound(); | 895 | d->_q_rebound(); |
1155 | 960 | } | 896 | } |
1156 | 961 | } | 897 | } |
1158 | 962 | d->setHighlighted(false); | 898 | d->setPressed(false); |
1159 | 963 | } | 899 | } |
1160 | 964 | 900 | ||
1161 | 965 | void UCListItem::mouseMoveEvent(QMouseEvent *event) | 901 | void UCListItem::mouseMoveEvent(QMouseEvent *event) |
1162 | @@ -970,7 +906,7 @@ | |||
1163 | 970 | // accept the tugging only if the move is within the threshold | 906 | // accept the tugging only if the move is within the threshold |
1164 | 971 | bool leadingAttached = UCListItemActionsPrivate::isConnectedTo(d->leadingActions, this); | 907 | bool leadingAttached = UCListItemActionsPrivate::isConnectedTo(d->leadingActions, this); |
1165 | 972 | bool trailingAttached = UCListItemActionsPrivate::isConnectedTo(d->trailingActions, this); | 908 | bool trailingAttached = UCListItemActionsPrivate::isConnectedTo(d->trailingActions, this); |
1167 | 973 | if (d->highlighted && !(leadingAttached || trailingAttached)) { | 909 | if (d->pressed && !(leadingAttached || trailingAttached)) { |
1168 | 974 | // check if we can initiate the drag at all | 910 | // check if we can initiate the drag at all |
1169 | 975 | // only X direction matters, if Y-direction leaves the threshold, but X not, the tug is not valid | 911 | // only X direction matters, if Y-direction leaves the threshold, but X not, the tug is not valid |
1170 | 976 | qreal threshold = UCUnits::instance().gu(d->xAxisMoveThresholdGU); | 912 | qreal threshold = UCUnits::instance().gu(d->xAxisMoveThresholdGU); |
1171 | @@ -1182,16 +1118,16 @@ | |||
1172 | 1182 | } | 1118 | } |
1173 | 1183 | 1119 | ||
1174 | 1184 | /*! | 1120 | /*! |
1178 | 1185 | * \qmlproperty bool ListItem::highlighted | 1121 | * \qmlproperty bool ListItem::pressed |
1179 | 1186 | * True when the item is pressed. The items stays highlighted when the mouse or touch | 1122 | * True when the item is pressed. The items stays pressed when the mouse or touch |
1180 | 1187 | * is moved horizontally. When in Flickable (or ListView), the item gets un-highlighted | 1123 | * is moved horizontally. When in Flickable (or ListView), the item gets un-pressed |
1181 | 1188 | * (false) when the mouse or touch is moved towards the vertical direction causing | 1124 | * (false) when the mouse or touch is moved towards the vertical direction causing |
1182 | 1189 | * the flickable to move. | 1125 | * the flickable to move. |
1183 | 1190 | */ | 1126 | */ |
1185 | 1191 | bool UCListItem::highlighted() const | 1127 | bool UCListItem::pressed() const |
1186 | 1192 | { | 1128 | { |
1187 | 1193 | Q_D(const UCListItem); | 1129 | Q_D(const UCListItem); |
1189 | 1194 | return d->highlighted; | 1130 | return d->pressed; |
1190 | 1195 | } | 1131 | } |
1191 | 1196 | 1132 | ||
1192 | 1197 | /*! | 1133 | /*! |
1193 | @@ -1253,7 +1189,7 @@ | |||
1194 | 1253 | 1189 | ||
1195 | 1254 | /*! | 1190 | /*! |
1196 | 1255 | * \qmlproperty color ListItem::highlightColor | 1191 | * \qmlproperty color ListItem::highlightColor |
1198 | 1256 | * Configures the color when highlighted. Defaults to the theme palette's background color. | 1192 | * Configures the color when pressed. Defaults to the theme palette's background color. |
1199 | 1257 | */ | 1193 | */ |
1200 | 1258 | QColor UCListItem::highlightColor() const | 1194 | QColor UCListItem::highlightColor() const |
1201 | 1259 | { | 1195 | { |
1202 | 1260 | 1196 | ||
1203 | === modified file 'modules/Ubuntu/Components/plugin/uclistitem.h' | |||
1204 | --- modules/Ubuntu/Components/plugin/uclistitem.h 2014-12-18 10:08:56 +0000 | |||
1205 | +++ modules/Ubuntu/Components/plugin/uclistitem.h 2015-01-13 21:31:53 +0000 | |||
1206 | @@ -33,7 +33,7 @@ | |||
1207 | 33 | Q_PROPERTY(UCListItemDivider *divider READ divider CONSTANT) | 33 | Q_PROPERTY(UCListItemDivider *divider READ divider CONSTANT) |
1208 | 34 | Q_PROPERTY(UCListItemActions *leadingActions READ leadingActions WRITE setLeadingActions NOTIFY leadingActionsChanged DESIGNABLE false) | 34 | Q_PROPERTY(UCListItemActions *leadingActions READ leadingActions WRITE setLeadingActions NOTIFY leadingActionsChanged DESIGNABLE false) |
1209 | 35 | Q_PROPERTY(UCListItemActions *trailingActions READ trailingActions WRITE setTrailingActions NOTIFY trailingActionsChanged DESIGNABLE false) | 35 | Q_PROPERTY(UCListItemActions *trailingActions READ trailingActions WRITE setTrailingActions NOTIFY trailingActionsChanged DESIGNABLE false) |
1211 | 36 | Q_PROPERTY(bool highlighted READ highlighted NOTIFY highlightedChanged) | 36 | Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged) |
1212 | 37 | Q_PRIVATE_PROPERTY(UCListItem::d_func(), qreal swipeOvershoot READ swipeOvershoot WRITE setSwipeOvershoot NOTIFY swipeOvershootChanged) | 37 | Q_PRIVATE_PROPERTY(UCListItem::d_func(), qreal swipeOvershoot READ swipeOvershoot WRITE setSwipeOvershoot NOTIFY swipeOvershootChanged) |
1213 | 38 | Q_PRIVATE_PROPERTY(UCListItem::d_func(), bool contentMoving READ contentMoving NOTIFY contentMovingChanged) | 38 | Q_PRIVATE_PROPERTY(UCListItem::d_func(), bool contentMoving READ contentMoving NOTIFY contentMovingChanged) |
1214 | 39 | Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) | 39 | Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) |
1215 | @@ -56,7 +56,7 @@ | |||
1216 | 56 | void setLeadingActions(UCListItemActions *options); | 56 | void setLeadingActions(UCListItemActions *options); |
1217 | 57 | UCListItemActions *trailingActions() const; | 57 | UCListItemActions *trailingActions() const; |
1218 | 58 | void setTrailingActions(UCListItemActions *options); | 58 | void setTrailingActions(UCListItemActions *options); |
1220 | 59 | bool highlighted() const; | 59 | bool pressed() const; |
1221 | 60 | QColor color() const; | 60 | QColor color() const; |
1222 | 61 | void setColor(const QColor &color); | 61 | void setColor(const QColor &color); |
1223 | 62 | QColor highlightColor() const; | 62 | QColor highlightColor() const; |
1224 | @@ -76,7 +76,7 @@ | |||
1225 | 76 | Q_SIGNALS: | 76 | Q_SIGNALS: |
1226 | 77 | void leadingActionsChanged(); | 77 | void leadingActionsChanged(); |
1227 | 78 | void trailingActionsChanged(); | 78 | void trailingActionsChanged(); |
1229 | 79 | void highlightedChanged(); | 79 | void pressedChanged(); |
1230 | 80 | void swipeOvershootChanged(); | 80 | void swipeOvershootChanged(); |
1231 | 81 | void contentMovingChanged(); | 81 | void contentMovingChanged(); |
1232 | 82 | void colorChanged(); | 82 | void colorChanged(); |
1233 | 83 | 83 | ||
1234 | === modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h' | |||
1235 | --- modules/Ubuntu/Components/plugin/uclistitem_p.h 2015-01-07 06:42:09 +0000 | |||
1236 | +++ modules/Ubuntu/Components/plugin/uclistitem_p.h 2015-01-13 21:31:53 +0000 | |||
1237 | @@ -43,7 +43,6 @@ | |||
1238 | 43 | return that->d_func(); | 43 | return that->d_func(); |
1239 | 44 | } | 44 | } |
1240 | 45 | 45 | ||
1241 | 46 | bool isClickedConnected(); | ||
1242 | 47 | void _q_updateThemedData(); | 46 | void _q_updateThemedData(); |
1243 | 48 | void _q_rebound(); | 47 | void _q_rebound(); |
1244 | 49 | void promptRebound(); | 48 | void promptRebound(); |
1245 | @@ -51,7 +50,7 @@ | |||
1246 | 51 | void _q_updateIndex(); | 50 | void _q_updateIndex(); |
1247 | 52 | int index(); | 51 | int index(); |
1248 | 53 | bool canHighlight(QMouseEvent *event); | 52 | bool canHighlight(QMouseEvent *event); |
1250 | 54 | void setHighlighted(bool pressed); | 53 | void setPressed(bool pressed); |
1251 | 55 | void setSwiped(bool tugged); | 54 | void setSwiped(bool tugged); |
1252 | 56 | bool grabPanel(UCListItemActions *optionList, bool isTugged); | 55 | bool grabPanel(UCListItemActions *optionList, bool isTugged); |
1253 | 57 | void listenToRebind(bool listen); | 56 | void listenToRebind(bool listen); |
1254 | @@ -59,7 +58,7 @@ | |||
1255 | 59 | void update(); | 58 | void update(); |
1256 | 60 | void clampAndMoveX(qreal &x, qreal dx); | 59 | void clampAndMoveX(qreal &x, qreal dx); |
1257 | 61 | 60 | ||
1259 | 62 | bool highlighted:1; | 61 | bool pressed:1; |
1260 | 63 | bool contentMoved:1; | 62 | bool contentMoved:1; |
1261 | 64 | bool highlightColorChanged:1; | 63 | bool highlightColorChanged:1; |
1262 | 65 | bool swiped:1; | 64 | bool swiped:1; |
1263 | 66 | 65 | ||
1264 | === modified file 'modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp' | |||
1265 | --- modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp 2014-12-18 10:08:56 +0000 | |||
1266 | +++ modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp 2015-01-13 21:31:53 +0000 | |||
1267 | @@ -74,12 +74,12 @@ | |||
1268 | 74 | return; | 74 | return; |
1269 | 75 | } | 75 | } |
1270 | 76 | if (connect) { | 76 | if (connect) { |
1272 | 77 | QObject::connect(item, &UCListItem::highlightedChanged, | 77 | QObject::connect(item, &UCListItem::pressedChanged, |
1273 | 78 | this, &UCListItemActionsAttached::updateSwipeState); | 78 | this, &UCListItemActionsAttached::updateSwipeState); |
1274 | 79 | QObject::connect(item, &UCListItem::contentMovingChanged, | 79 | QObject::connect(item, &UCListItem::contentMovingChanged, |
1275 | 80 | this, &UCListItemActionsAttached::updateSwipeState); | 80 | this, &UCListItemActionsAttached::updateSwipeState); |
1276 | 81 | } else { | 81 | } else { |
1278 | 82 | QObject::disconnect(item, &UCListItem::highlightedChanged, | 82 | QObject::disconnect(item, &UCListItem::pressedChanged, |
1279 | 83 | this, &UCListItemActionsAttached::updateSwipeState); | 83 | this, &UCListItemActionsAttached::updateSwipeState); |
1280 | 84 | QObject::disconnect(item, &UCListItem::contentMovingChanged, | 84 | QObject::disconnect(item, &UCListItem::contentMovingChanged, |
1281 | 85 | this, &UCListItemActionsAttached::updateSwipeState); | 85 | this, &UCListItemActionsAttached::updateSwipeState); |
1282 | @@ -112,7 +112,7 @@ | |||
1283 | 112 | } | 112 | } |
1284 | 113 | UCListItem *item = static_cast<UCListItem*>(panelItem->parentItem()); | 113 | UCListItem *item = static_cast<UCListItem*>(panelItem->parentItem()); |
1285 | 114 | UCListItemPrivate *listItem = UCListItemPrivate::get(item); | 114 | UCListItemPrivate *listItem = UCListItemPrivate::get(item); |
1287 | 115 | bool swiped = listItem->highlighted && listItem->contentMoved; | 115 | bool swiped = listItem->pressed && listItem->contentMoved; |
1288 | 116 | if (swiped != m_swiping) { | 116 | if (swiped != m_swiping) { |
1289 | 117 | m_swiping = swiped; | 117 | m_swiping = swiped; |
1290 | 118 | Q_EMIT swipingChanged(); | 118 | Q_EMIT swipingChanged(); |
1291 | 119 | 119 | ||
1292 | === modified file 'po/am.po' | |||
1293 | --- po/am.po 2014-11-29 06:47:10 +0000 | |||
1294 | +++ po/am.po 2015-01-13 21:31:53 +0000 | |||
1295 | @@ -14,8 +14,8 @@ | |||
1296 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1297 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1298 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1301 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1302 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1303 | 19 | 19 | ||
1304 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1305 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1306 | 22 | 22 | ||
1307 | === modified file 'po/ar.po' | |||
1308 | --- po/ar.po 2014-11-29 06:47:10 +0000 | |||
1309 | +++ po/ar.po 2015-01-13 21:31:53 +0000 | |||
1310 | @@ -14,8 +14,8 @@ | |||
1311 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1312 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1313 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1316 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1317 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1318 | 19 | 19 | ||
1319 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1320 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1321 | 22 | 22 | ||
1322 | === modified file 'po/ast.po' | |||
1323 | --- po/ast.po 2014-11-29 06:47:10 +0000 | |||
1324 | +++ po/ast.po 2015-01-13 21:31:53 +0000 | |||
1325 | @@ -14,8 +14,8 @@ | |||
1326 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1327 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1328 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1331 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1332 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1333 | 19 | 19 | ||
1334 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1335 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1336 | 22 | 22 | ||
1337 | === modified file 'po/az.po' | |||
1338 | --- po/az.po 2014-11-29 06:47:10 +0000 | |||
1339 | +++ po/az.po 2015-01-13 21:31:53 +0000 | |||
1340 | @@ -14,8 +14,8 @@ | |||
1341 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1342 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1343 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1346 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1347 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1348 | 19 | 19 | ||
1349 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1350 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1351 | 22 | 22 | ||
1352 | === modified file 'po/be.po' | |||
1353 | --- po/be.po 2014-11-29 06:47:10 +0000 | |||
1354 | +++ po/be.po 2015-01-13 21:31:53 +0000 | |||
1355 | @@ -14,8 +14,8 @@ | |||
1356 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1357 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1358 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1361 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1362 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1363 | 19 | 19 | ||
1364 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1365 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1366 | 22 | 22 | ||
1367 | === modified file 'po/bs.po' | |||
1368 | --- po/bs.po 2014-11-29 06:47:10 +0000 | |||
1369 | +++ po/bs.po 2015-01-13 21:31:53 +0000 | |||
1370 | @@ -14,8 +14,8 @@ | |||
1371 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1372 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1373 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1376 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1377 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1378 | 19 | 19 | ||
1379 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1380 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1381 | 22 | 22 | ||
1382 | === modified file 'po/ca.po' | |||
1383 | --- po/ca.po 2014-11-29 06:47:10 +0000 | |||
1384 | +++ po/ca.po 2015-01-13 21:31:53 +0000 | |||
1385 | @@ -14,8 +14,8 @@ | |||
1386 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1387 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1388 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1391 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1392 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1393 | 19 | 19 | ||
1394 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1395 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1396 | @@ -89,7 +89,7 @@ | |||
1397 | 89 | 89 | ||
1398 | 90 | #: Ubuntu/Components/plugin/uctheme.cpp:233 | 90 | #: Ubuntu/Components/plugin/uctheme.cpp:233 |
1399 | 91 | msgid "Theme not found: " | 91 | msgid "Theme not found: " |
1401 | 92 | msgstr "" | 92 | msgstr "No s'ha trobat el tema: " |
1402 | 93 | 93 | ||
1403 | 94 | #: Ubuntu/Components/Popups/ComposerSheet.qml:80 | 94 | #: Ubuntu/Components/Popups/ComposerSheet.qml:80 |
1404 | 95 | msgid "Cancel" | 95 | msgid "Cancel" |
1405 | 96 | 96 | ||
1406 | === modified file 'po/ca@valencia.po' | |||
1407 | --- po/ca@valencia.po 2014-11-29 06:47:10 +0000 | |||
1408 | +++ po/ca@valencia.po 2015-01-13 21:31:53 +0000 | |||
1409 | @@ -14,8 +14,8 @@ | |||
1410 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1411 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1412 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1415 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1416 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1417 | 19 | 19 | ||
1418 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1419 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1420 | 22 | 22 | ||
1421 | === modified file 'po/ce.po' | |||
1422 | --- po/ce.po 2014-11-29 06:47:10 +0000 | |||
1423 | +++ po/ce.po 2015-01-13 21:31:53 +0000 | |||
1424 | @@ -14,8 +14,8 @@ | |||
1425 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1426 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1427 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1430 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1431 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1432 | 19 | 19 | ||
1433 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1434 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1435 | 22 | 22 | ||
1436 | === modified file 'po/cs.po' | |||
1437 | --- po/cs.po 2014-11-29 06:47:10 +0000 | |||
1438 | +++ po/cs.po 2015-01-13 21:31:53 +0000 | |||
1439 | @@ -14,8 +14,8 @@ | |||
1440 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1441 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1442 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1445 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1446 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1447 | 19 | 19 | ||
1448 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1449 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1450 | 22 | 22 | ||
1451 | === modified file 'po/da.po' | |||
1452 | --- po/da.po 2014-11-29 06:47:10 +0000 | |||
1453 | +++ po/da.po 2015-01-13 21:31:53 +0000 | |||
1454 | @@ -14,8 +14,8 @@ | |||
1455 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1456 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1457 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1460 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1461 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1462 | 19 | 19 | ||
1463 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1464 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1465 | 22 | 22 | ||
1466 | === modified file 'po/de.po' | |||
1467 | --- po/de.po 2014-11-29 06:47:10 +0000 | |||
1468 | +++ po/de.po 2015-01-13 21:31:53 +0000 | |||
1469 | @@ -14,8 +14,8 @@ | |||
1470 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1471 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1472 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1475 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1476 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1477 | 19 | 19 | ||
1478 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1479 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1480 | 22 | 22 | ||
1481 | === modified file 'po/el.po' | |||
1482 | --- po/el.po 2014-11-29 06:47:10 +0000 | |||
1483 | +++ po/el.po 2015-01-13 21:31:53 +0000 | |||
1484 | @@ -14,8 +14,8 @@ | |||
1485 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1486 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1487 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1490 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1491 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1492 | 19 | 19 | ||
1493 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1494 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1495 | 22 | 22 | ||
1496 | === modified file 'po/en_AU.po' | |||
1497 | --- po/en_AU.po 2014-11-29 06:47:10 +0000 | |||
1498 | +++ po/en_AU.po 2015-01-13 21:31:53 +0000 | |||
1499 | @@ -14,8 +14,8 @@ | |||
1500 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1501 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1502 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1505 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1506 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1507 | 19 | 19 | ||
1508 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1509 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1510 | 22 | 22 | ||
1511 | === modified file 'po/en_GB.po' | |||
1512 | --- po/en_GB.po 2014-11-29 06:47:10 +0000 | |||
1513 | +++ po/en_GB.po 2015-01-13 21:31:53 +0000 | |||
1514 | @@ -14,8 +14,8 @@ | |||
1515 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1516 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1517 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1520 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1521 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1522 | 19 | 19 | ||
1523 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1524 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1525 | 22 | 22 | ||
1526 | === modified file 'po/es.po' | |||
1527 | --- po/es.po 2014-12-12 06:33:39 +0000 | |||
1528 | +++ po/es.po 2015-01-13 21:31:53 +0000 | |||
1529 | @@ -14,7 +14,7 @@ | |||
1530 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1531 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1532 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1534 | 17 | "X-Launchpad-Export-Date: 2014-12-12 06:33+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1535 | 18 | "X-Generator: Launchpad (build 17286)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1536 | 19 | 19 | ||
1537 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1538 | 21 | 21 | ||
1539 | === modified file 'po/eu.po' | |||
1540 | --- po/eu.po 2014-11-29 06:47:10 +0000 | |||
1541 | +++ po/eu.po 2015-01-13 21:31:53 +0000 | |||
1542 | @@ -14,8 +14,8 @@ | |||
1543 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1544 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1545 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1548 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1549 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1550 | 19 | 19 | ||
1551 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1552 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1553 | 22 | 22 | ||
1554 | === modified file 'po/fa.po' | |||
1555 | --- po/fa.po 2014-12-12 06:33:39 +0000 | |||
1556 | +++ po/fa.po 2015-01-13 21:31:53 +0000 | |||
1557 | @@ -14,7 +14,7 @@ | |||
1558 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1559 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1560 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1562 | 17 | "X-Launchpad-Export-Date: 2014-12-12 06:33+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1563 | 18 | "X-Generator: Launchpad (build 17286)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1564 | 19 | 19 | ||
1565 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1566 | 21 | 21 | ||
1567 | === modified file 'po/fi.po' | |||
1568 | --- po/fi.po 2014-11-29 06:47:10 +0000 | |||
1569 | +++ po/fi.po 2015-01-13 21:31:53 +0000 | |||
1570 | @@ -14,8 +14,8 @@ | |||
1571 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1572 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1573 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1576 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1577 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1578 | 19 | 19 | ||
1579 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1580 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1581 | 22 | 22 | ||
1582 | === modified file 'po/fr.po' | |||
1583 | --- po/fr.po 2014-11-29 06:47:10 +0000 | |||
1584 | +++ po/fr.po 2015-01-13 21:31:53 +0000 | |||
1585 | @@ -14,12 +14,12 @@ | |||
1586 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1587 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1588 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1591 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1592 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1593 | 19 | 19 | ||
1594 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1595 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1597 | 22 | msgstr "" | 22 | msgstr "Supprimer" |
1598 | 23 | 23 | ||
1599 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 |
1600 | 25 | #, qt-format | 25 | #, qt-format |
1601 | @@ -145,4 +145,4 @@ | |||
1602 | 145 | 145 | ||
1603 | 146 | #: Ubuntu/Components/ToolbarItems.qml:142 | 146 | #: Ubuntu/Components/ToolbarItems.qml:142 |
1604 | 147 | msgid "Back" | 147 | msgid "Back" |
1606 | 148 | msgstr "" | 148 | msgstr "Précédent" |
1607 | 149 | 149 | ||
1608 | === modified file 'po/fr_CA.po' | |||
1609 | --- po/fr_CA.po 2014-11-29 06:47:10 +0000 | |||
1610 | +++ po/fr_CA.po 2015-01-13 21:31:53 +0000 | |||
1611 | @@ -14,8 +14,8 @@ | |||
1612 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1613 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1614 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1617 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1618 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1619 | 19 | 19 | ||
1620 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1621 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1622 | 22 | 22 | ||
1623 | === modified file 'po/ga.po' | |||
1624 | --- po/ga.po 2014-12-17 07:02:28 +0000 | |||
1625 | +++ po/ga.po 2015-01-13 21:31:53 +0000 | |||
1626 | @@ -14,7 +14,7 @@ | |||
1627 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1628 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1629 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1631 | 17 | "X-Launchpad-Export-Date: 2014-12-17 07:02+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1632 | 18 | "X-Generator: Launchpad (build 17286)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1633 | 19 | 19 | ||
1634 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1635 | @@ -27,11 +27,13 @@ | |||
1636 | 27 | "property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" " | 27 | "property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" " |
1637 | 28 | "of type %5" | 28 | "of type %5" |
1638 | 29 | msgstr "" | 29 | msgstr "" |
1639 | 30 | "Tá cineál %3 ag aire \"%1\" de réad %2,agus ní féidir é a shocrú go luach " | ||
1640 | 31 | "\"%4\"de chineál %5" | ||
1641 | 30 | 32 | ||
1642 | 31 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:185 | 33 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:185 |
1643 | 32 | #, qt-format | 34 | #, qt-format |
1644 | 33 | msgid "property \"%1\" does not exist or is not writable for object %2" | 35 | msgid "property \"%1\" does not exist or is not writable for object %2" |
1646 | 34 | msgstr "" | 36 | msgstr "Ní ann don luach \"%1\" nó níl sé inscríofa don réad %2" |
1647 | 35 | 37 | ||
1648 | 36 | #: Ubuntu/Components/plugin/ucalarm.cpp:42 | 38 | #: Ubuntu/Components/plugin/ucalarm.cpp:42 |
1649 | 37 | #: Ubuntu/Components/plugin/ucalarm.cpp:136 | 39 | #: Ubuntu/Components/plugin/ucalarm.cpp:136 |
1650 | @@ -41,7 +43,7 @@ | |||
1651 | 41 | #: Ubuntu/Components/plugin/ucalarm.cpp:684 | 43 | #: Ubuntu/Components/plugin/ucalarm.cpp:684 |
1652 | 42 | #: Ubuntu/Components/plugin/ucalarm.cpp:716 | 44 | #: Ubuntu/Components/plugin/ucalarm.cpp:716 |
1653 | 43 | msgid "Alarm has a pending operation." | 45 | msgid "Alarm has a pending operation." |
1655 | 44 | msgstr "" | 46 | msgstr "Tá gníomh ar feitheamh ag an aláram" |
1656 | 45 | 47 | ||
1657 | 46 | #: Ubuntu/Components/plugin/ucarguments.cpp:188 | 48 | #: Ubuntu/Components/plugin/ucarguments.cpp:188 |
1658 | 47 | msgid "Usage: " | 49 | msgid "Usage: " |
1659 | @@ -69,16 +71,19 @@ | |||
1660 | 69 | #: Ubuntu/Components/plugin/ucmousefilters.cpp:1064 | 71 | #: Ubuntu/Components/plugin/ucmousefilters.cpp:1064 |
1661 | 70 | msgid "Ignoring AfterItem priority for InverseMouse filters." | 72 | msgid "Ignoring AfterItem priority for InverseMouse filters." |
1662 | 71 | msgstr "" | 73 | msgstr "" |
1663 | 74 | "Ag déanamh neamhaird ar phriaracht AfterItem do scagathóirí InverseMouse" | ||
1664 | 72 | 75 | ||
1665 | 73 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:46 | 76 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:46 |
1666 | 74 | msgid "Warning: attachee must have an ID. State will not be saved." | 77 | msgid "Warning: attachee must have an ID. State will not be saved." |
1668 | 75 | msgstr "" | 78 | msgstr "Aire: Tá ID ag teastáil ón gceangalaí. Ní shábháilfear an staid." |
1669 | 76 | 79 | ||
1670 | 77 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:56 | 80 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:56 |
1671 | 78 | #, qt-format | 81 | #, qt-format |
1672 | 79 | msgid "" | 82 | msgid "" |
1673 | 80 | "Warning: attachee's UUID is already registered, state won't be saved: %1" | 83 | "Warning: attachee's UUID is already registered, state won't be saved: %1" |
1674 | 81 | msgstr "" | 84 | msgstr "" |
1675 | 85 | "Aire: Tá UUID an cheangalaí cláraithe cheana féin. Ní shábháilfear an staid: " | ||
1676 | 86 | "%1" | ||
1677 | 82 | 87 | ||
1678 | 83 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:102 | 88 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:102 |
1679 | 84 | #, qt-format | 89 | #, qt-format |
1680 | @@ -86,54 +91,56 @@ | |||
1681 | 86 | "All the parents must have an id.\n" | 91 | "All the parents must have an id.\n" |
1682 | 87 | "State saving disabled for %1, class %2" | 92 | "State saving disabled for %1, class %2" |
1683 | 88 | msgstr "" | 93 | msgstr "" |
1684 | 94 | "Tá id ag teastáil ó gach tuismitheoir.\n" | ||
1685 | 95 | "Sábháil staid díchumasaithe do %1, aicme %2" | ||
1686 | 89 | 96 | ||
1687 | 90 | #: Ubuntu/Components/plugin/uctheme.cpp:233 | 97 | #: Ubuntu/Components/plugin/uctheme.cpp:233 |
1688 | 91 | msgid "Theme not found: " | 98 | msgid "Theme not found: " |
1690 | 92 | msgstr "" | 99 | msgstr "Níor aimsíodh téama: " |
1691 | 93 | 100 | ||
1692 | 94 | #: Ubuntu/Components/Popups/ComposerSheet.qml:80 | 101 | #: Ubuntu/Components/Popups/ComposerSheet.qml:80 |
1693 | 95 | msgid "Cancel" | 102 | msgid "Cancel" |
1695 | 96 | msgstr "" | 103 | msgstr "Cealaigh" |
1696 | 97 | 104 | ||
1697 | 98 | #: Ubuntu/Components/Popups/ComposerSheet.qml:90 | 105 | #: Ubuntu/Components/Popups/ComposerSheet.qml:90 |
1698 | 99 | msgid "Confirm" | 106 | msgid "Confirm" |
1700 | 100 | msgstr "" | 107 | msgstr "Deimhnigh" |
1701 | 101 | 108 | ||
1702 | 102 | #: Ubuntu/Components/Popups/DefaultSheet.qml:89 | 109 | #: Ubuntu/Components/Popups/DefaultSheet.qml:89 |
1703 | 103 | msgid "Close" | 110 | msgid "Close" |
1705 | 104 | msgstr "" | 111 | msgstr "Dún" |
1706 | 105 | 112 | ||
1707 | 106 | #: Ubuntu/Components/Popups/DefaultSheet.qml:99 | 113 | #: Ubuntu/Components/Popups/DefaultSheet.qml:99 |
1708 | 107 | msgid "Done" | 114 | msgid "Done" |
1710 | 108 | msgstr "" | 115 | msgstr "Déanta" |
1711 | 109 | 116 | ||
1712 | 110 | #: Ubuntu/Components/TextInputPopover.qml:27 | 117 | #: Ubuntu/Components/TextInputPopover.qml:27 |
1713 | 111 | msgid "Select All" | 118 | msgid "Select All" |
1715 | 112 | msgstr "" | 119 | msgstr "Roghnaigh Uile" |
1716 | 113 | 120 | ||
1717 | 114 | #: Ubuntu/Components/TextInputPopover.qml:33 | 121 | #: Ubuntu/Components/TextInputPopover.qml:33 |
1718 | 115 | msgid "Cut" | 122 | msgid "Cut" |
1720 | 116 | msgstr "" | 123 | msgstr "Gearr" |
1721 | 117 | 124 | ||
1722 | 118 | #: Ubuntu/Components/TextInputPopover.qml:42 | 125 | #: Ubuntu/Components/TextInputPopover.qml:42 |
1723 | 119 | msgid "Copy" | 126 | msgid "Copy" |
1725 | 120 | msgstr "" | 127 | msgstr "Cóipeáil" |
1726 | 121 | 128 | ||
1727 | 122 | #: Ubuntu/Components/TextInputPopover.qml:49 | 129 | #: Ubuntu/Components/TextInputPopover.qml:49 |
1728 | 123 | msgid "Paste" | 130 | msgid "Paste" |
1730 | 124 | msgstr "" | 131 | msgstr "Greamaigh" |
1731 | 125 | 132 | ||
1732 | 126 | #: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57 | 133 | #: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57 |
1733 | 127 | msgid "In Progress" | 134 | msgid "In Progress" |
1735 | 128 | msgstr "" | 135 | msgstr "Ar Bun" |
1736 | 129 | 136 | ||
1737 | 130 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 | 137 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 |
1738 | 131 | msgid "Release to refresh..." | 138 | msgid "Release to refresh..." |
1740 | 132 | msgstr "" | 139 | msgstr "Scaoil le hathnuachan a dhéanamh…" |
1741 | 133 | 140 | ||
1742 | 134 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 | 141 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 |
1743 | 135 | msgid "Pull to refresh..." | 142 | msgid "Pull to refresh..." |
1745 | 136 | msgstr "" | 143 | msgstr "Tarraing le hathnuachan a dhéanamh…" |
1746 | 137 | 144 | ||
1747 | 138 | #: Ubuntu/Components/ToolbarItems.qml:142 | 145 | #: Ubuntu/Components/ToolbarItems.qml:142 |
1748 | 139 | msgid "Back" | 146 | msgid "Back" |
1749 | 140 | 147 | ||
1750 | === modified file 'po/gd.po' | |||
1751 | --- po/gd.po 2014-11-29 06:47:10 +0000 | |||
1752 | +++ po/gd.po 2015-01-13 21:31:53 +0000 | |||
1753 | @@ -14,8 +14,8 @@ | |||
1754 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1755 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1756 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1759 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1760 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1761 | 19 | 19 | ||
1762 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1763 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1764 | 22 | 22 | ||
1765 | === modified file 'po/gl.po' | |||
1766 | --- po/gl.po 2014-11-29 06:47:10 +0000 | |||
1767 | +++ po/gl.po 2015-01-13 21:31:53 +0000 | |||
1768 | @@ -14,12 +14,12 @@ | |||
1769 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1770 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1771 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1774 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1775 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1776 | 19 | 19 | ||
1777 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1778 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1780 | 22 | msgstr "" | 22 | msgstr "Eliminar" |
1781 | 23 | 23 | ||
1782 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 |
1783 | 25 | #, qt-format | 25 | #, qt-format |
1784 | @@ -141,4 +141,4 @@ | |||
1785 | 141 | 141 | ||
1786 | 142 | #: Ubuntu/Components/ToolbarItems.qml:142 | 142 | #: Ubuntu/Components/ToolbarItems.qml:142 |
1787 | 143 | msgid "Back" | 143 | msgid "Back" |
1789 | 144 | msgstr "" | 144 | msgstr "Atrás" |
1790 | 145 | 145 | ||
1791 | === modified file 'po/he.po' | |||
1792 | --- po/he.po 2014-11-29 06:47:10 +0000 | |||
1793 | +++ po/he.po 2015-01-13 21:31:53 +0000 | |||
1794 | @@ -14,8 +14,8 @@ | |||
1795 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1796 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1797 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1800 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1801 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1802 | 19 | 19 | ||
1803 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1804 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1805 | 22 | 22 | ||
1806 | === added file 'po/hi.po' | |||
1807 | --- po/hi.po 1970-01-01 00:00:00 +0000 | |||
1808 | +++ po/hi.po 2015-01-13 21:31:53 +0000 | |||
1809 | @@ -0,0 +1,140 @@ | |||
1810 | 1 | # Hindi translation for ubuntu-ui-toolkit | ||
1811 | 2 | # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015 | ||
1812 | 3 | # This file is distributed under the same license as the ubuntu-ui-toolkit package. | ||
1813 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2015. | ||
1814 | 5 | # | ||
1815 | 6 | msgid "" | ||
1816 | 7 | msgstr "" | ||
1817 | 8 | "Project-Id-Version: ubuntu-ui-toolkit\n" | ||
1818 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
1819 | 10 | "POT-Creation-Date: 2014-11-05 14:29+0100\n" | ||
1820 | 11 | "PO-Revision-Date: 2015-01-05 14:49+0000\n" | ||
1821 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
1822 | 13 | "Language-Team: Hindi <hi@li.org>\n" | ||
1823 | 14 | "MIME-Version: 1.0\n" | ||
1824 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
1825 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
1826 | 17 | "X-Launchpad-Export-Date: 2015-01-06 07:14+0000\n" | ||
1827 | 18 | "X-Generator: Launchpad (build 17286)\n" | ||
1828 | 19 | |||
1829 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | ||
1830 | 21 | msgid "Delete" | ||
1831 | 22 | msgstr "" | ||
1832 | 23 | |||
1833 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 | ||
1834 | 25 | #, qt-format | ||
1835 | 26 | msgid "" | ||
1836 | 27 | "property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" " | ||
1837 | 28 | "of type %5" | ||
1838 | 29 | msgstr "" | ||
1839 | 30 | |||
1840 | 31 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:185 | ||
1841 | 32 | #, qt-format | ||
1842 | 33 | msgid "property \"%1\" does not exist or is not writable for object %2" | ||
1843 | 34 | msgstr "" | ||
1844 | 35 | |||
1845 | 36 | #: Ubuntu/Components/plugin/ucalarm.cpp:42 | ||
1846 | 37 | #: Ubuntu/Components/plugin/ucalarm.cpp:136 | ||
1847 | 38 | msgid "Alarm" | ||
1848 | 39 | msgstr "" | ||
1849 | 40 | |||
1850 | 41 | #: Ubuntu/Components/plugin/ucalarm.cpp:684 | ||
1851 | 42 | #: Ubuntu/Components/plugin/ucalarm.cpp:716 | ||
1852 | 43 | msgid "Alarm has a pending operation." | ||
1853 | 44 | msgstr "" | ||
1854 | 45 | |||
1855 | 46 | #: Ubuntu/Components/plugin/ucarguments.cpp:188 | ||
1856 | 47 | msgid "Usage: " | ||
1857 | 48 | msgstr "" | ||
1858 | 49 | |||
1859 | 50 | #: Ubuntu/Components/plugin/ucarguments.cpp:209 | ||
1860 | 51 | msgid "Options:" | ||
1861 | 52 | msgstr "" | ||
1862 | 53 | |||
1863 | 54 | #: Ubuntu/Components/plugin/ucarguments.cpp:498 | ||
1864 | 55 | #, qt-format | ||
1865 | 56 | msgid "%1 is expecting an additional argument: %2" | ||
1866 | 57 | msgstr "" | ||
1867 | 58 | |||
1868 | 59 | #: Ubuntu/Components/plugin/ucarguments.cpp:503 | ||
1869 | 60 | #, qt-format | ||
1870 | 61 | msgid "%1 is expecting a value for argument: %2" | ||
1871 | 62 | msgstr "" | ||
1872 | 63 | |||
1873 | 64 | #: Ubuntu/Components/plugin/ucarguments.cpp:520 | ||
1874 | 65 | #, qt-format | ||
1875 | 66 | msgid "%1 is expecting additional arguments: %2" | ||
1876 | 67 | msgstr "" | ||
1877 | 68 | |||
1878 | 69 | #: Ubuntu/Components/plugin/ucmousefilters.cpp:1064 | ||
1879 | 70 | msgid "Ignoring AfterItem priority for InverseMouse filters." | ||
1880 | 71 | msgstr "" | ||
1881 | 72 | |||
1882 | 73 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:46 | ||
1883 | 74 | msgid "Warning: attachee must have an ID. State will not be saved." | ||
1884 | 75 | msgstr "" | ||
1885 | 76 | |||
1886 | 77 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:56 | ||
1887 | 78 | #, qt-format | ||
1888 | 79 | msgid "" | ||
1889 | 80 | "Warning: attachee's UUID is already registered, state won't be saved: %1" | ||
1890 | 81 | msgstr "" | ||
1891 | 82 | |||
1892 | 83 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:102 | ||
1893 | 84 | #, qt-format | ||
1894 | 85 | msgid "" | ||
1895 | 86 | "All the parents must have an id.\n" | ||
1896 | 87 | "State saving disabled for %1, class %2" | ||
1897 | 88 | msgstr "" | ||
1898 | 89 | |||
1899 | 90 | #: Ubuntu/Components/plugin/uctheme.cpp:233 | ||
1900 | 91 | msgid "Theme not found: " | ||
1901 | 92 | msgstr "" | ||
1902 | 93 | |||
1903 | 94 | #: Ubuntu/Components/Popups/ComposerSheet.qml:80 | ||
1904 | 95 | msgid "Cancel" | ||
1905 | 96 | msgstr "" | ||
1906 | 97 | |||
1907 | 98 | #: Ubuntu/Components/Popups/ComposerSheet.qml:90 | ||
1908 | 99 | msgid "Confirm" | ||
1909 | 100 | msgstr "" | ||
1910 | 101 | |||
1911 | 102 | #: Ubuntu/Components/Popups/DefaultSheet.qml:89 | ||
1912 | 103 | msgid "Close" | ||
1913 | 104 | msgstr "" | ||
1914 | 105 | |||
1915 | 106 | #: Ubuntu/Components/Popups/DefaultSheet.qml:99 | ||
1916 | 107 | msgid "Done" | ||
1917 | 108 | msgstr "" | ||
1918 | 109 | |||
1919 | 110 | #: Ubuntu/Components/TextInputPopover.qml:27 | ||
1920 | 111 | msgid "Select All" | ||
1921 | 112 | msgstr "" | ||
1922 | 113 | |||
1923 | 114 | #: Ubuntu/Components/TextInputPopover.qml:33 | ||
1924 | 115 | msgid "Cut" | ||
1925 | 116 | msgstr "" | ||
1926 | 117 | |||
1927 | 118 | #: Ubuntu/Components/TextInputPopover.qml:42 | ||
1928 | 119 | msgid "Copy" | ||
1929 | 120 | msgstr "" | ||
1930 | 121 | |||
1931 | 122 | #: Ubuntu/Components/TextInputPopover.qml:49 | ||
1932 | 123 | msgid "Paste" | ||
1933 | 124 | msgstr "" | ||
1934 | 125 | |||
1935 | 126 | #: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57 | ||
1936 | 127 | msgid "In Progress" | ||
1937 | 128 | msgstr "" | ||
1938 | 129 | |||
1939 | 130 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 | ||
1940 | 131 | msgid "Release to refresh..." | ||
1941 | 132 | msgstr "" | ||
1942 | 133 | |||
1943 | 134 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 | ||
1944 | 135 | msgid "Pull to refresh..." | ||
1945 | 136 | msgstr "" | ||
1946 | 137 | |||
1947 | 138 | #: Ubuntu/Components/ToolbarItems.qml:142 | ||
1948 | 139 | msgid "Back" | ||
1949 | 140 | msgstr "" | ||
1950 | 0 | 141 | ||
1951 | === modified file 'po/hr.po' | |||
1952 | --- po/hr.po 2014-12-08 06:37:28 +0000 | |||
1953 | +++ po/hr.po 2015-01-13 21:31:53 +0000 | |||
1954 | @@ -14,8 +14,8 @@ | |||
1955 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1956 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1957 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1960 | 17 | "X-Launchpad-Export-Date: 2014-12-08 06:37+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1961 | 18 | "X-Generator: Launchpad (build 17274)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1962 | 19 | 19 | ||
1963 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1964 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1965 | 22 | 22 | ||
1966 | === modified file 'po/hu.po' | |||
1967 | --- po/hu.po 2014-11-29 06:47:10 +0000 | |||
1968 | +++ po/hu.po 2015-01-13 21:31:53 +0000 | |||
1969 | @@ -14,8 +14,8 @@ | |||
1970 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1971 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1972 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1975 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1976 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1977 | 19 | 19 | ||
1978 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1979 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1980 | 22 | 22 | ||
1981 | === modified file 'po/id.po' | |||
1982 | --- po/id.po 2014-11-29 06:47:10 +0000 | |||
1983 | +++ po/id.po 2015-01-13 21:31:53 +0000 | |||
1984 | @@ -14,8 +14,8 @@ | |||
1985 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1986 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1987 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1990 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
1991 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
1992 | 19 | 19 | ||
1993 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
1994 | 21 | msgid "Delete" | 21 | msgid "Delete" |
1995 | 22 | 22 | ||
1996 | === modified file 'po/it.po' | |||
1997 | --- po/it.po 2014-11-29 06:47:10 +0000 | |||
1998 | +++ po/it.po 2015-01-13 21:31:53 +0000 | |||
1999 | @@ -14,8 +14,8 @@ | |||
2000 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2001 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2002 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2005 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2006 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2007 | 19 | 19 | ||
2008 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2009 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2010 | 22 | 22 | ||
2011 | === modified file 'po/ja.po' | |||
2012 | --- po/ja.po 2014-11-29 06:47:10 +0000 | |||
2013 | +++ po/ja.po 2015-01-13 21:31:53 +0000 | |||
2014 | @@ -14,8 +14,8 @@ | |||
2015 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2016 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2017 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2020 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2021 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2022 | 19 | 19 | ||
2023 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2024 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2025 | 22 | 22 | ||
2026 | === modified file 'po/km.po' | |||
2027 | --- po/km.po 2014-11-29 06:47:10 +0000 | |||
2028 | +++ po/km.po 2015-01-13 21:31:53 +0000 | |||
2029 | @@ -14,8 +14,8 @@ | |||
2030 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2031 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2032 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2035 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2036 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2037 | 19 | 19 | ||
2038 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2039 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2040 | 22 | 22 | ||
2041 | === modified file 'po/kn.po' | |||
2042 | --- po/kn.po 2014-11-29 06:47:10 +0000 | |||
2043 | +++ po/kn.po 2015-01-13 21:31:53 +0000 | |||
2044 | @@ -14,8 +14,8 @@ | |||
2045 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2046 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2047 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2050 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2051 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2052 | 19 | 19 | ||
2053 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2054 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2055 | 22 | 22 | ||
2056 | === modified file 'po/ko.po' | |||
2057 | --- po/ko.po 2014-11-29 06:47:10 +0000 | |||
2058 | +++ po/ko.po 2015-01-13 21:31:53 +0000 | |||
2059 | @@ -14,12 +14,12 @@ | |||
2060 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2061 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2062 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2065 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2066 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2067 | 19 | 19 | ||
2068 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2069 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2071 | 22 | msgstr "" | 22 | msgstr "삭제" |
2072 | 23 | 23 | ||
2073 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 |
2074 | 25 | #, qt-format | 25 | #, qt-format |
2075 | @@ -139,4 +139,4 @@ | |||
2076 | 139 | 139 | ||
2077 | 140 | #: Ubuntu/Components/ToolbarItems.qml:142 | 140 | #: Ubuntu/Components/ToolbarItems.qml:142 |
2078 | 141 | msgid "Back" | 141 | msgid "Back" |
2080 | 142 | msgstr "" | 142 | msgstr "뒤로" |
2081 | 143 | 143 | ||
2082 | === modified file 'po/lv.po' | |||
2083 | --- po/lv.po 2014-11-29 06:47:10 +0000 | |||
2084 | +++ po/lv.po 2015-01-13 21:31:53 +0000 | |||
2085 | @@ -14,8 +14,8 @@ | |||
2086 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2087 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2088 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2091 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2092 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2093 | 19 | 19 | ||
2094 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2095 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2096 | 22 | 22 | ||
2097 | === modified file 'po/ms.po' | |||
2098 | --- po/ms.po 2014-11-29 06:47:10 +0000 | |||
2099 | +++ po/ms.po 2015-01-13 21:31:53 +0000 | |||
2100 | @@ -14,8 +14,8 @@ | |||
2101 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2102 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2103 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2106 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2107 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2108 | 19 | 19 | ||
2109 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2110 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2111 | 22 | 22 | ||
2112 | === modified file 'po/my.po' | |||
2113 | --- po/my.po 2014-11-29 06:47:10 +0000 | |||
2114 | +++ po/my.po 2015-01-13 21:31:53 +0000 | |||
2115 | @@ -14,8 +14,8 @@ | |||
2116 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2117 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2118 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2121 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2122 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2123 | 19 | 19 | ||
2124 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2125 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2126 | 22 | 22 | ||
2127 | === modified file 'po/nb.po' | |||
2128 | --- po/nb.po 2014-11-29 06:47:10 +0000 | |||
2129 | +++ po/nb.po 2015-01-13 21:31:53 +0000 | |||
2130 | @@ -14,12 +14,12 @@ | |||
2131 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2132 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2133 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2136 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2137 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2138 | 19 | 19 | ||
2139 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2140 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2142 | 22 | msgstr "" | 22 | msgstr "Slett" |
2143 | 23 | 23 | ||
2144 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 |
2145 | 25 | #, qt-format | 25 | #, qt-format |
2146 | @@ -143,4 +143,4 @@ | |||
2147 | 143 | 143 | ||
2148 | 144 | #: Ubuntu/Components/ToolbarItems.qml:142 | 144 | #: Ubuntu/Components/ToolbarItems.qml:142 |
2149 | 145 | msgid "Back" | 145 | msgid "Back" |
2151 | 146 | msgstr "" | 146 | msgstr "Tilbake" |
2152 | 147 | 147 | ||
2153 | === modified file 'po/nl.po' | |||
2154 | --- po/nl.po 2014-11-29 06:47:10 +0000 | |||
2155 | +++ po/nl.po 2015-01-13 21:31:53 +0000 | |||
2156 | @@ -14,8 +14,8 @@ | |||
2157 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2158 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2159 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2162 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2163 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2164 | 19 | 19 | ||
2165 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2166 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2167 | 22 | 22 | ||
2168 | === modified file 'po/oc.po' | |||
2169 | --- po/oc.po 2014-11-29 06:47:10 +0000 | |||
2170 | +++ po/oc.po 2015-01-13 21:31:53 +0000 | |||
2171 | @@ -14,8 +14,8 @@ | |||
2172 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2173 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2174 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2177 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2178 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2179 | 19 | 19 | ||
2180 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2181 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2182 | 22 | 22 | ||
2183 | === modified file 'po/pa.po' | |||
2184 | --- po/pa.po 2014-11-29 06:47:10 +0000 | |||
2185 | +++ po/pa.po 2015-01-13 21:31:53 +0000 | |||
2186 | @@ -14,8 +14,8 @@ | |||
2187 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2188 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2189 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2192 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2193 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2194 | 19 | 19 | ||
2195 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2196 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2197 | 22 | 22 | ||
2198 | === modified file 'po/pl.po' | |||
2199 | --- po/pl.po 2014-11-29 06:47:10 +0000 | |||
2200 | +++ po/pl.po 2015-01-13 21:31:53 +0000 | |||
2201 | @@ -14,8 +14,8 @@ | |||
2202 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2203 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2204 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2207 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2208 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2209 | 19 | 19 | ||
2210 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2211 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2212 | 22 | 22 | ||
2213 | === modified file 'po/pt.po' | |||
2214 | --- po/pt.po 2014-11-29 06:47:10 +0000 | |||
2215 | +++ po/pt.po 2015-01-13 21:31:53 +0000 | |||
2216 | @@ -14,12 +14,12 @@ | |||
2217 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2218 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2219 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2222 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2223 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2224 | 19 | 19 | ||
2225 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2226 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2228 | 22 | msgstr "" | 22 | msgstr "Eliminar" |
2229 | 23 | 23 | ||
2230 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 |
2231 | 25 | #, qt-format | 25 | #, qt-format |
2232 | @@ -141,4 +141,4 @@ | |||
2233 | 141 | 141 | ||
2234 | 142 | #: Ubuntu/Components/ToolbarItems.qml:142 | 142 | #: Ubuntu/Components/ToolbarItems.qml:142 |
2235 | 143 | msgid "Back" | 143 | msgid "Back" |
2237 | 144 | msgstr "" | 144 | msgstr "Anterior" |
2238 | 145 | 145 | ||
2239 | === modified file 'po/pt_BR.po' | |||
2240 | --- po/pt_BR.po 2014-11-29 06:47:10 +0000 | |||
2241 | +++ po/pt_BR.po 2015-01-13 21:31:53 +0000 | |||
2242 | @@ -14,8 +14,8 @@ | |||
2243 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2244 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2245 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2248 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2249 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2250 | 19 | 19 | ||
2251 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2252 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2253 | 22 | 22 | ||
2254 | === modified file 'po/ro.po' | |||
2255 | --- po/ro.po 2014-11-29 06:47:10 +0000 | |||
2256 | +++ po/ro.po 2015-01-13 21:31:53 +0000 | |||
2257 | @@ -14,8 +14,8 @@ | |||
2258 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2259 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2260 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2263 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2264 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2265 | 19 | 19 | ||
2266 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2267 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2268 | 22 | 22 | ||
2269 | === modified file 'po/ru.po' | |||
2270 | --- po/ru.po 2014-11-29 06:47:10 +0000 | |||
2271 | +++ po/ru.po 2015-01-13 21:31:53 +0000 | |||
2272 | @@ -14,8 +14,8 @@ | |||
2273 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2274 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2275 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2278 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2279 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2280 | 19 | 19 | ||
2281 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2282 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2283 | 22 | 22 | ||
2284 | === modified file 'po/sq.po' | |||
2285 | --- po/sq.po 2014-11-29 06:47:10 +0000 | |||
2286 | +++ po/sq.po 2015-01-13 21:31:53 +0000 | |||
2287 | @@ -14,8 +14,8 @@ | |||
2288 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2289 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2290 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2293 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2294 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2295 | 19 | 19 | ||
2296 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2297 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2298 | 22 | 22 | ||
2299 | === modified file 'po/sr.po' | |||
2300 | --- po/sr.po 2014-11-29 06:47:10 +0000 | |||
2301 | +++ po/sr.po 2015-01-13 21:31:53 +0000 | |||
2302 | @@ -14,8 +14,8 @@ | |||
2303 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2304 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2305 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2308 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2309 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2310 | 19 | 19 | ||
2311 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2312 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2313 | 22 | 22 | ||
2314 | === modified file 'po/sv.po' | |||
2315 | --- po/sv.po 2014-11-29 06:47:10 +0000 | |||
2316 | +++ po/sv.po 2015-01-13 21:31:53 +0000 | |||
2317 | @@ -14,8 +14,8 @@ | |||
2318 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2319 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2320 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2323 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2324 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2325 | 19 | 19 | ||
2326 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2327 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2328 | 22 | 22 | ||
2329 | === modified file 'po/tr.po' | |||
2330 | --- po/tr.po 2014-11-29 06:47:10 +0000 | |||
2331 | +++ po/tr.po 2015-01-13 21:31:53 +0000 | |||
2332 | @@ -14,8 +14,8 @@ | |||
2333 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2334 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2335 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2338 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2339 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2340 | 19 | 19 | ||
2341 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2342 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2343 | @@ -26,7 +26,8 @@ | |||
2344 | 26 | msgid "" | 26 | msgid "" |
2345 | 27 | "property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" " | 27 | "property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" " |
2346 | 28 | "of type %5" | 28 | "of type %5" |
2348 | 29 | msgstr "%2 nesnesinin %1 niteliği %3 tür, %4 veya %5 olarak ayarlanamaz." | 29 | msgstr "" |
2349 | 30 | "%2 nesnesinin %1 niteliği %3 tipindedir, %4 veya %5 olarak ayarlanamaz." | ||
2350 | 30 | 31 | ||
2351 | 31 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:185 | 32 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:185 |
2352 | 32 | #, qt-format | 33 | #, qt-format |
2353 | @@ -89,23 +90,23 @@ | |||
2354 | 89 | 90 | ||
2355 | 90 | #: Ubuntu/Components/plugin/uctheme.cpp:233 | 91 | #: Ubuntu/Components/plugin/uctheme.cpp:233 |
2356 | 91 | msgid "Theme not found: " | 92 | msgid "Theme not found: " |
2358 | 92 | msgstr "" | 93 | msgstr "Tema bulunamadı: " |
2359 | 93 | 94 | ||
2360 | 94 | #: Ubuntu/Components/Popups/ComposerSheet.qml:80 | 95 | #: Ubuntu/Components/Popups/ComposerSheet.qml:80 |
2361 | 95 | msgid "Cancel" | 96 | msgid "Cancel" |
2363 | 96 | msgstr "" | 97 | msgstr "İptal" |
2364 | 97 | 98 | ||
2365 | 98 | #: Ubuntu/Components/Popups/ComposerSheet.qml:90 | 99 | #: Ubuntu/Components/Popups/ComposerSheet.qml:90 |
2366 | 99 | msgid "Confirm" | 100 | msgid "Confirm" |
2368 | 100 | msgstr "" | 101 | msgstr "Doğrula" |
2369 | 101 | 102 | ||
2370 | 102 | #: Ubuntu/Components/Popups/DefaultSheet.qml:89 | 103 | #: Ubuntu/Components/Popups/DefaultSheet.qml:89 |
2371 | 103 | msgid "Close" | 104 | msgid "Close" |
2373 | 104 | msgstr "" | 105 | msgstr "Kapat" |
2374 | 105 | 106 | ||
2375 | 106 | #: Ubuntu/Components/Popups/DefaultSheet.qml:99 | 107 | #: Ubuntu/Components/Popups/DefaultSheet.qml:99 |
2376 | 107 | msgid "Done" | 108 | msgid "Done" |
2378 | 108 | msgstr "" | 109 | msgstr "Bitti" |
2379 | 109 | 110 | ||
2380 | 110 | #: Ubuntu/Components/TextInputPopover.qml:27 | 111 | #: Ubuntu/Components/TextInputPopover.qml:27 |
2381 | 111 | msgid "Select All" | 112 | msgid "Select All" |
2382 | @@ -125,15 +126,15 @@ | |||
2383 | 125 | 126 | ||
2384 | 126 | #: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57 | 127 | #: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57 |
2385 | 127 | msgid "In Progress" | 128 | msgid "In Progress" |
2387 | 128 | msgstr "" | 129 | msgstr "Devam Ediyor" |
2388 | 129 | 130 | ||
2389 | 130 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 | 131 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 |
2390 | 131 | msgid "Release to refresh..." | 132 | msgid "Release to refresh..." |
2392 | 132 | msgstr "" | 133 | msgstr "Yenilemek için bırakın..." |
2393 | 133 | 134 | ||
2394 | 134 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 | 135 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 |
2395 | 135 | msgid "Pull to refresh..." | 136 | msgid "Pull to refresh..." |
2397 | 136 | msgstr "" | 137 | msgstr "Yenilemek için çekin..." |
2398 | 137 | 138 | ||
2399 | 138 | #: Ubuntu/Components/ToolbarItems.qml:142 | 139 | #: Ubuntu/Components/ToolbarItems.qml:142 |
2400 | 139 | msgid "Back" | 140 | msgid "Back" |
2401 | 140 | 141 | ||
2402 | === modified file 'po/ug.po' | |||
2403 | --- po/ug.po 2014-11-29 06:47:10 +0000 | |||
2404 | +++ po/ug.po 2015-01-13 21:31:53 +0000 | |||
2405 | @@ -14,8 +14,8 @@ | |||
2406 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2407 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2408 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2411 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2412 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2413 | 19 | 19 | ||
2414 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2415 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2416 | @@ -43,7 +43,7 @@ | |||
2417 | 43 | #: Ubuntu/Components/plugin/ucalarm.cpp:684 | 43 | #: Ubuntu/Components/plugin/ucalarm.cpp:684 |
2418 | 44 | #: Ubuntu/Components/plugin/ucalarm.cpp:716 | 44 | #: Ubuntu/Components/plugin/ucalarm.cpp:716 |
2419 | 45 | msgid "Alarm has a pending operation." | 45 | msgid "Alarm has a pending operation." |
2421 | 46 | msgstr "" | 46 | msgstr "قوڭغۇراق توڭلىتىلغان ھالەتتە." |
2422 | 47 | 47 | ||
2423 | 48 | #: Ubuntu/Components/plugin/ucarguments.cpp:188 | 48 | #: Ubuntu/Components/plugin/ucarguments.cpp:188 |
2424 | 49 | msgid "Usage: " | 49 | msgid "Usage: " |
2425 | 50 | 50 | ||
2426 | === modified file 'po/uk.po' | |||
2427 | --- po/uk.po 2014-11-29 06:47:10 +0000 | |||
2428 | +++ po/uk.po 2015-01-13 21:31:53 +0000 | |||
2429 | @@ -14,12 +14,12 @@ | |||
2430 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2431 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2432 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2435 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2436 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2437 | 19 | 19 | ||
2438 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2439 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2441 | 22 | msgstr "" | 22 | msgstr "Вилучити" |
2442 | 23 | 23 | ||
2443 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 | 24 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176 |
2444 | 25 | #, qt-format | 25 | #, qt-format |
2445 | @@ -146,4 +146,4 @@ | |||
2446 | 146 | 146 | ||
2447 | 147 | #: Ubuntu/Components/ToolbarItems.qml:142 | 147 | #: Ubuntu/Components/ToolbarItems.qml:142 |
2448 | 148 | msgid "Back" | 148 | msgid "Back" |
2450 | 149 | msgstr "" | 149 | msgstr "Назад" |
2451 | 150 | 150 | ||
2452 | === modified file 'po/zh_CN.po' | |||
2453 | --- po/zh_CN.po 2014-11-29 06:47:10 +0000 | |||
2454 | +++ po/zh_CN.po 2015-01-13 21:31:53 +0000 | |||
2455 | @@ -14,8 +14,8 @@ | |||
2456 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2457 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2458 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2461 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2462 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2463 | 19 | 19 | ||
2464 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2465 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2466 | 22 | 22 | ||
2467 | === modified file 'po/zh_TW.po' | |||
2468 | --- po/zh_TW.po 2014-11-29 06:47:10 +0000 | |||
2469 | +++ po/zh_TW.po 2015-01-13 21:31:53 +0000 | |||
2470 | @@ -14,8 +14,8 @@ | |||
2471 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2472 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2473 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2476 | 17 | "X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n" | 17 | "X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n" |
2477 | 18 | "X-Generator: Launchpad (build 17267)\n" | 18 | "X-Generator: Launchpad (build 17286)\n" |
2478 | 19 | 19 | ||
2479 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 | 20 | #: Ubuntu/Components/ListItems/Empty.qml:413 |
2480 | 21 | msgid "Delete" | 21 | msgid "Delete" |
2481 | 22 | 22 | ||
2482 | === modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py' | |||
2483 | --- tests/autopilot/ubuntuuitoolkit/__init__.py 2014-12-17 11:46:03 +0000 | |||
2484 | +++ tests/autopilot/ubuntuuitoolkit/__init__.py 2015-01-13 21:31:53 +0000 | |||
2485 | @@ -27,7 +27,6 @@ | |||
2486 | 27 | 'get_keyboard', | 27 | 'get_keyboard', |
2487 | 28 | 'get_pointing_device', | 28 | 'get_pointing_device', |
2488 | 29 | 'Header', | 29 | 'Header', |
2489 | 30 | 'Dialog', | ||
2490 | 31 | 'listitems', | 30 | 'listitems', |
2491 | 32 | 'UCListItem', | 31 | 'UCListItem', |
2492 | 33 | 'MainView', | 32 | 'MainView', |
2493 | @@ -64,7 +63,6 @@ | |||
2494 | 64 | get_keyboard, | 63 | get_keyboard, |
2495 | 65 | get_pointing_device, | 64 | get_pointing_device, |
2496 | 66 | Header, | 65 | Header, |
2497 | 67 | Dialog, | ||
2498 | 68 | listitems, | 66 | listitems, |
2499 | 69 | UCListItem, | 67 | UCListItem, |
2500 | 70 | MainView, | 68 | MainView, |
2501 | 71 | 69 | ||
2502 | === modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py' | |||
2503 | --- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py 2014-12-17 11:46:03 +0000 | |||
2504 | +++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py 2015-01-13 21:31:53 +0000 | |||
2505 | @@ -24,7 +24,6 @@ | |||
2506 | 24 | 'get_keyboard', | 24 | 'get_keyboard', |
2507 | 25 | 'get_pointing_device', | 25 | 'get_pointing_device', |
2508 | 26 | 'Header', | 26 | 'Header', |
2509 | 27 | 'Dialog', | ||
2510 | 28 | 'listitems', | 27 | 'listitems', |
2511 | 29 | 'UCListItem', | 28 | 'UCListItem', |
2512 | 30 | 'MainView', | 29 | 'MainView', |
2513 | @@ -57,11 +56,6 @@ | |||
2514 | 57 | AppHeader, | 56 | AppHeader, |
2515 | 58 | Header, | 57 | Header, |
2516 | 59 | ) | 58 | ) |
2517 | 60 | |||
2518 | 61 | from ubuntuuitoolkit._custom_proxy_objects.popups import ( | ||
2519 | 62 | Dialog | ||
2520 | 63 | ) | ||
2521 | 64 | |||
2522 | 65 | from ubuntuuitoolkit._custom_proxy_objects import listitems | 59 | from ubuntuuitoolkit._custom_proxy_objects import listitems |
2523 | 66 | from ubuntuuitoolkit._custom_proxy_objects._uclistitem import ( | 60 | from ubuntuuitoolkit._custom_proxy_objects._uclistitem import ( |
2524 | 67 | UCListItem | 61 | UCListItem |
2525 | 68 | 62 | ||
2526 | === modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_uclistitem.py' | |||
2527 | --- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_uclistitem.py 2015-01-07 06:42:09 +0000 | |||
2528 | +++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_uclistitem.py 2015-01-13 21:31:53 +0000 | |||
2529 | @@ -18,6 +18,7 @@ | |||
2530 | 18 | 18 | ||
2531 | 19 | from autopilot import logging as autopilot_logging | 19 | from autopilot import logging as autopilot_logging |
2532 | 20 | from ubuntuuitoolkit._custom_proxy_objects import _common | 20 | from ubuntuuitoolkit._custom_proxy_objects import _common |
2533 | 21 | import time | ||
2534 | 21 | 22 | ||
2535 | 22 | 23 | ||
2536 | 23 | logger = logging.getLogger(__name__) | 24 | logger = logging.getLogger(__name__) |
2537 | @@ -41,8 +42,8 @@ | |||
2538 | 41 | 'No {0} panel found in a ListItem'.format(panel_item)) | 42 | 'No {0} panel found in a ListItem'.format(panel_item)) |
2539 | 42 | start_y = stop_y = y + (height // 2) | 43 | start_y = stop_y = y + (height // 2) |
2540 | 43 | self.pointing_device.drag(start_x, start_y, stop_x, stop_y) | 44 | self.pointing_device.drag(start_x, start_y, stop_x, stop_y) |
2543 | 44 | # wait till animation finishes | 45 | # wait 1 second to finish animation |
2544 | 45 | self.contentMoving.wait_for(False) | 46 | time.sleep(1) |
2545 | 46 | 47 | ||
2546 | 47 | def _click_on_panel_action(self, panel_item, action_object, wait_function): | 48 | def _click_on_panel_action(self, panel_item, action_object, wait_function): |
2547 | 48 | self._swipe_in_panel(panel_item) | 49 | self._swipe_in_panel(panel_item) |
2548 | @@ -56,8 +57,11 @@ | |||
2549 | 56 | 57 | ||
2550 | 57 | self.pointing_device.click_object(action_button) | 58 | self.pointing_device.click_object(action_button) |
2551 | 58 | if wait_function is None: | 59 | if wait_function is None: |
2554 | 59 | # wait till animation finishes | 60 | # wait for the animation to finish |
2555 | 60 | self.contentMoving.wait_for(False) | 61 | contentItem = self.select_single(objectName='ListItemHolder') |
2556 | 62 | while contentItem.x != 0.0: | ||
2557 | 63 | contentItem.x.wait_for(0) | ||
2558 | 64 | time.sleep(1) | ||
2559 | 61 | else: | 65 | else: |
2560 | 62 | wait_function() | 66 | wait_function() |
2561 | 63 | 67 | ||
2562 | 64 | 68 | ||
2563 | === modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py' | |||
2564 | --- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py 2014-12-18 12:48:05 +0000 | |||
2565 | +++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py 2015-01-13 21:31:53 +0000 | |||
2566 | @@ -25,10 +25,6 @@ | |||
2567 | 25 | logger = logging.getLogger(__name__) | 25 | logger = logging.getLogger(__name__) |
2568 | 26 | 26 | ||
2569 | 27 | 27 | ||
2570 | 28 | class Dialog(_common.UbuntuUIToolkitCustomProxyObjectBase): | ||
2571 | 29 | """Autopilot helper for the Dialog component.""" | ||
2572 | 30 | |||
2573 | 31 | |||
2574 | 32 | class TextInputPopover(_common.UbuntuUIToolkitCustomProxyObjectBase): | 28 | class TextInputPopover(_common.UbuntuUIToolkitCustomProxyObjectBase): |
2575 | 33 | """TextInputPopover Autopilot emulator .""" | 29 | """TextInputPopover Autopilot emulator .""" |
2576 | 34 | 30 | ||
2577 | 35 | 31 | ||
2578 | === modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py' | |||
2579 | --- tests/autopilot/ubuntuuitoolkit/emulators.py 2014-12-17 11:46:03 +0000 | |||
2580 | +++ tests/autopilot/ubuntuuitoolkit/emulators.py 2015-01-13 21:31:53 +0000 | |||
2581 | @@ -39,7 +39,6 @@ | |||
2582 | 39 | 'Empty', | 39 | 'Empty', |
2583 | 40 | 'UCListItem', | 40 | 'UCListItem', |
2584 | 41 | 'Header', | 41 | 'Header', |
2585 | 42 | 'Dialog', | ||
2586 | 43 | 'ItemSelector', | 42 | 'ItemSelector', |
2587 | 44 | 'MainView', | 43 | 'MainView', |
2588 | 45 | 'MultiValue', | 44 | 'MultiValue', |
2589 | @@ -65,7 +64,6 @@ | |||
2590 | 65 | get_pointing_device, | 64 | get_pointing_device, |
2591 | 66 | CheckBox, | 65 | CheckBox, |
2592 | 67 | Header, | 66 | Header, |
2593 | 68 | Dialog, | ||
2594 | 69 | UCListItem, | 67 | UCListItem, |
2595 | 70 | MainView, | 68 | MainView, |
2596 | 71 | OptionSelector, | 69 | OptionSelector, |
2597 | 72 | 70 | ||
2598 | === removed file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.DialogTestCase.qml' | |||
2599 | --- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.DialogTestCase.qml 2014-12-17 11:46:03 +0000 | |||
2600 | +++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.DialogTestCase.qml 1970-01-01 00:00:00 +0000 | |||
2601 | @@ -1,69 +0,0 @@ | |||
2602 | 1 | /* | ||
2603 | 2 | * Copyright 2014 Canonical Ltd. | ||
2604 | 3 | * | ||
2605 | 4 | * This program is free software; you can redistribute it and/or modify | ||
2606 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
2607 | 6 | * the Free Software Foundation; version 3. | ||
2608 | 7 | * | ||
2609 | 8 | * This program is distributed in the hope that it will be useful, | ||
2610 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2611 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2612 | 11 | * GNU Lesser General Public License for more details. | ||
2613 | 12 | * | ||
2614 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
2615 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2616 | 15 | */ | ||
2617 | 16 | |||
2618 | 17 | import QtQuick 2.0 | ||
2619 | 18 | import Ubuntu.Components 1.1 | ||
2620 | 19 | import Ubuntu.Components.Popups 0.1 | ||
2621 | 20 | |||
2622 | 21 | MainView { | ||
2623 | 22 | width: units.gu(48) | ||
2624 | 23 | height: units.gu(60) | ||
2625 | 24 | automaticOrientation: true | ||
2626 | 25 | Page { | ||
2627 | 26 | Component { | ||
2628 | 27 | id: dialog | ||
2629 | 28 | Dialog { | ||
2630 | 29 | id: dialogue | ||
2631 | 30 | title: "Dialog" | ||
2632 | 31 | text: "Simple dialog with text area and three stacked button" | ||
2633 | 32 | Column { | ||
2634 | 33 | id: row | ||
2635 | 34 | width: parent.width | ||
2636 | 35 | spacing: units.gu(1) | ||
2637 | 36 | TextArea { | ||
2638 | 37 | height: parent.height/2 | ||
2639 | 38 | objectName: "textfield_standard" | ||
2640 | 39 | placeholderText: i18n.tr("Type me in...") | ||
2641 | 40 | width: parent.width | ||
2642 | 41 | } | ||
2643 | 42 | Button { | ||
2644 | 43 | width: parent.width | ||
2645 | 44 | text: "Bellow TextField" | ||
2646 | 45 | color: UbuntuColors.green | ||
2647 | 46 | onClicked: PopupUtils.close(dialogue) | ||
2648 | 47 | } | ||
2649 | 48 | Button { | ||
2650 | 49 | width: parent.width | ||
2651 | 50 | text: "Middle button" | ||
2652 | 51 | onClicked: PopupUtils.close(dialogue) | ||
2653 | 52 | } | ||
2654 | 53 | Button { | ||
2655 | 54 | width: parent.width | ||
2656 | 55 | text: "Lower button" | ||
2657 | 56 | onClicked: PopupUtils.close(dialogue) | ||
2658 | 57 | } | ||
2659 | 58 | } | ||
2660 | 59 | } | ||
2661 | 60 | } | ||
2662 | 61 | Button { | ||
2663 | 62 | objectName: "button" | ||
2664 | 63 | anchors.centerIn: parent | ||
2665 | 64 | text: i18n.tr("Open dialog") | ||
2666 | 65 | onClicked: PopupUtils.open(dialog, null) | ||
2667 | 66 | } | ||
2668 | 67 | } | ||
2669 | 68 | } | ||
2670 | 69 | |||
2671 | 70 | 0 | ||
2672 | === removed file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py' | |||
2673 | --- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py 2014-12-17 12:11:51 +0000 | |||
2674 | +++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py 1970-01-01 00:00:00 +0000 | |||
2675 | @@ -1,43 +0,0 @@ | |||
2676 | 1 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- | ||
2677 | 2 | # | ||
2678 | 3 | # Copyright (C) 2013, 2014 Canonical Ltd. | ||
2679 | 4 | # | ||
2680 | 5 | # This program is free software; you can redistribute it and/or modify | ||
2681 | 6 | # it under the terms of the GNU Lesser General Public License as published by | ||
2682 | 7 | # the Free Software Foundation; version 3. | ||
2683 | 8 | # | ||
2684 | 9 | # This program is distributed in the hope that it will be useful, | ||
2685 | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2686 | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2687 | 12 | # GNU Lesser General Public License for more details. | ||
2688 | 13 | # | ||
2689 | 14 | # You should have received a copy of the GNU Lesser General Public License | ||
2690 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2691 | 16 | |||
2692 | 17 | import os | ||
2693 | 18 | |||
2694 | 19 | from ubuntuuitoolkit import tests | ||
2695 | 20 | |||
2696 | 21 | |||
2697 | 22 | class DialogTestCase(tests.QMLFileAppTestCase): | ||
2698 | 23 | path = os.path.abspath(__file__) | ||
2699 | 24 | dir_path = os.path.dirname(path) | ||
2700 | 25 | test_qml_file_path = os.path.join( | ||
2701 | 26 | dir_path, 'test_dialog.DialogTestCase.qml') | ||
2702 | 27 | |||
2703 | 28 | def setUp(self): | ||
2704 | 29 | super(DialogTestCase, self).setUp() | ||
2705 | 30 | |||
2706 | 31 | def test_dialog(self): | ||
2707 | 32 | open_button = self.main_view.wait_select_single('Button', | ||
2708 | 33 | objectName='button') | ||
2709 | 34 | self.pointing_device.click_object(open_button) | ||
2710 | 35 | dialog = self.main_view.wait_select_single('Dialog', | ||
2711 | 36 | title="Dialog") | ||
2712 | 37 | text_area = dialog.wait_select_single('TextArea', | ||
2713 | 38 | objectName='textfield_standard') | ||
2714 | 39 | text_area.write('test') | ||
2715 | 40 | self.assertEqual(text_area.text, 'test') | ||
2716 | 41 | lower_button = dialog.wait_select_single('Button', | ||
2717 | 42 | text='Lower button') | ||
2718 | 43 | self.pointing_device.click_object(lower_button) | ||
2719 | 44 | 0 | ||
2720 | === modified file 'tests/resources/listitems/ListItemTest.qml' | |||
2721 | --- tests/resources/listitems/ListItemTest.qml 2014-12-04 13:23:18 +0000 | |||
2722 | +++ tests/resources/listitems/ListItemTest.qml 2015-01-13 21:31:53 +0000 | |||
2723 | @@ -123,14 +123,6 @@ | |||
2724 | 123 | } | 123 | } |
2725 | 124 | ListItem { | 124 | ListItem { |
2726 | 125 | Label { | 125 | Label { |
2727 | 126 | id: label | ||
2728 | 127 | text: "No action" | ||
2729 | 128 | } | ||
2730 | 129 | onClicked: print(label.text, "clicked") | ||
2731 | 130 | } | ||
2732 | 131 | |||
2733 | 132 | ListItem { | ||
2734 | 133 | Label { | ||
2735 | 134 | anchors.fill: parent | 126 | anchors.fill: parent |
2736 | 135 | text: "Another standalone ListItem" | 127 | text: "Another standalone ListItem" |
2737 | 136 | } | 128 | } |
2738 | @@ -155,7 +147,6 @@ | |||
2739 | 155 | Label { | 147 | Label { |
2740 | 156 | text: modelData + " item" | 148 | text: modelData + " item" |
2741 | 157 | } | 149 | } |
2742 | 158 | |||
2743 | 159 | states: State { | 150 | states: State { |
2744 | 160 | name: "override" | 151 | name: "override" |
2745 | 161 | when: main.override | 152 | when: main.override |
2746 | 162 | 153 | ||
2747 | === modified file 'tests/uitk_test_plan.sh' | |||
2748 | --- tests/uitk_test_plan.sh 2015-01-08 06:21:28 +0000 | |||
2749 | +++ tests/uitk_test_plan.sh 2015-01-13 21:31:53 +0000 | |||
2750 | @@ -33,7 +33,7 @@ | |||
2751 | 33 | PASSWORD="0000" | 33 | PASSWORD="0000" |
2752 | 34 | BOOTTIME=500 | 34 | BOOTTIME=500 |
2753 | 35 | ONLYCOMPARE=false | 35 | ONLYCOMPARE=false |
2755 | 36 | 36 | ||
2756 | 37 | declare -a TEST_SUITE=( | 37 | declare -a TEST_SUITE=( |
2757 | 38 | " -p ubuntu-ui-toolkit-autopilot ubuntuuitoolkit" | 38 | " -p ubuntu-ui-toolkit-autopilot ubuntuuitoolkit" |
2758 | 39 | " -p webbrowser-app-autopilot webbrowser_app" | 39 | " -p webbrowser-app-autopilot webbrowser_app" |
2759 | @@ -41,11 +41,11 @@ | |||
2760 | 41 | " sudoku_app" | 41 | " sudoku_app" |
2761 | 42 | " online_accounts_ui" | 42 | " online_accounts_ui" |
2762 | 43 | " ubuntu_calculator_app" | 43 | " ubuntu_calculator_app" |
2764 | 44 | # " -p messaging-app-autopilot messaging_app" | 44 | " -p messaging-app-autopilot messaging_app" |
2765 | 45 | " -p mediaplayer-app-autopilot mediaplayer_app" | 45 | " -p mediaplayer-app-autopilot mediaplayer_app" |
2766 | 46 | " dropping_letters_app" | 46 | " dropping_letters_app" |
2767 | 47 | " -p dialer-app-autopilot dialer_app" | 47 | " -p dialer-app-autopilot dialer_app" |
2769 | 48 | " -p reminders-app-autopilot reminders" | 48 | # hangs " -p reminders-app-autopilot reminders" |
2770 | 49 | " shorts_app" | 49 | " shorts_app" |
2771 | 50 | " ubuntu_weather_app" | 50 | " ubuntu_weather_app" |
2772 | 51 | " -p ubuntu-system-settings-autopilot ubuntu_system_settings" | 51 | " -p ubuntu-system-settings-autopilot ubuntu_system_settings" |
2773 | @@ -71,17 +71,16 @@ | |||
2774 | 71 | gallery-app-autopilot \ | 71 | gallery-app-autopilot \ |
2775 | 72 | reminders-app-autopilot \ | 72 | reminders-app-autopilot \ |
2776 | 73 | address-book-app-autopilot \ | 73 | address-book-app-autopilot \ |
2779 | 74 | # messaging-app-autopilot \ | 74 | messaging-app-autopilot \ |
2778 | 75 | unity8-autopilot \ | ||
2780 | 76 | dialer-app-autopilot \ | 75 | dialer-app-autopilot \ |
2781 | 77 | camera-app-autopilot \ | 76 | camera-app-autopilot \ |
2782 | 78 | webbrowser-app-autopilot \ | 77 | webbrowser-app-autopilot \ |
2783 | 79 | mediaplayer-app-autopilot \ | 78 | mediaplayer-app-autopilot \ |
2784 | 79 | unity8-autopilot \ | ||
2785 | 80 | unity-webapps-qml-autopilot \ | 80 | unity-webapps-qml-autopilot \ |
2786 | 81 | ubuntu-system-settings-autopilot\ | 81 | ubuntu-system-settings-autopilot\ |
2787 | 82 | ubuntu-html5-ui-toolkit-autopilot \ | 82 | ubuntu-html5-ui-toolkit-autopilot \ |
2788 | 83 | ubuntu-system-settings-online-accounts-autopilot" | 83 | ubuntu-system-settings-online-accounts-autopilot" |
2789 | 84 | # messaging-app-autopilot \ | ||
2790 | 85 | 84 | ||
2791 | 86 | sleep_indicator () { | 85 | sleep_indicator () { |
2792 | 87 | if [ -z "$1" ]; then | 86 | if [ -z "$1" ]; then |
2793 | @@ -149,8 +148,8 @@ | |||
2794 | 149 | # flash the latest image | 148 | # flash the latest image |
2795 | 150 | echo -e "Flashing \e[31m${CHANNEL}\e[0m" | 149 | echo -e "Flashing \e[31m${CHANNEL}\e[0m" |
2796 | 151 | 150 | ||
2799 | 152 | # ubuntu-device-flash --serial=${SERIALNUMBER} --channel=${CHANNEL} --revision=${REVISION} --wipe --bootstrap --developer-mode --password=${PASSWORD} | 151 | # ubuntu-device-flash --serial=${SERIALNUMBER} --channel=${CHANNEL} --revision=${REVISION} --wipe --developer-mode --password=${PASSWORD} |
2800 | 153 | ubuntu-device-flash touch --serial=${SERIALNUMBER} --channel=${CHANNEL} --wipe --developer-mode --password=${PASSWORD} | 152 | ubuntu-device-flash --serial=${SERIALNUMBER} --channel=${CHANNEL} --wipe --developer-mode --password=${PASSWORD} |
2801 | 154 | 153 | ||
2802 | 155 | sleep_indicator ${BOOTTIME} | 154 | sleep_indicator ${BOOTTIME} |
2803 | 156 | echo -e "Disable the intro wizard" | 155 | echo -e "Disable the intro wizard" |
2804 | @@ -339,9 +338,6 @@ | |||
2805 | 339 | device_comission | 338 | device_comission |
2806 | 340 | fi | 339 | fi |
2807 | 341 | 340 | ||
2808 | 342 | # Fix the PPA string as it is used in log file names | ||
2809 | 343 | PPA=${PPA/\//_} | ||
2810 | 344 | |||
2811 | 345 | # Check if the job is only comissioning the device | 341 | # Check if the job is only comissioning the device |
2812 | 346 | if [ ${DONOTRUNTESTS} != true ]; then | 342 | if [ ${DONOTRUNTESTS} != true ]; then |
2813 | 347 | # Reset the device for testing | 343 | # Reset the device for testing |
2814 | 348 | 344 | ||
2815 | === modified file 'tests/unit_x11/tst_components/tst_listitem.qml' | |||
2816 | --- tests/unit_x11/tst_components/tst_listitem.qml 2014-12-19 06:32:11 +0000 | |||
2817 | +++ tests/unit_x11/tst_components/tst_listitem.qml 2015-01-13 21:31:53 +0000 | |||
2818 | @@ -72,13 +72,6 @@ | |||
2819 | 72 | width: parent.width | 72 | width: parent.width |
2820 | 73 | } | 73 | } |
2821 | 74 | ListItem { | 74 | ListItem { |
2822 | 75 | id: highlightTest | ||
2823 | 76 | } | ||
2824 | 77 | ListItem { | ||
2825 | 78 | id: clickedConnected | ||
2826 | 79 | onClicked: {} | ||
2827 | 80 | } | ||
2828 | 81 | ListItem { | ||
2829 | 82 | id: testItem | 75 | id: testItem |
2830 | 83 | width: parent.width | 76 | width: parent.width |
2831 | 84 | color: "blue" | 77 | color: "blue" |
2832 | @@ -89,15 +82,6 @@ | |||
2833 | 89 | anchors.fill: parent | 82 | anchors.fill: parent |
2834 | 90 | } | 83 | } |
2835 | 91 | } | 84 | } |
2836 | 92 | ListItem { | ||
2837 | 93 | id: controlItem | ||
2838 | 94 | Button { | ||
2839 | 95 | id: button | ||
2840 | 96 | objectName: "button_in_list" | ||
2841 | 97 | anchors.centerIn: parent | ||
2842 | 98 | text: "Button" | ||
2843 | 99 | } | ||
2844 | 100 | } | ||
2845 | 101 | ListView { | 85 | ListView { |
2846 | 102 | id: listView | 86 | id: listView |
2847 | 103 | width: parent.width | 87 | width: parent.width |
2848 | @@ -124,8 +108,8 @@ | |||
2849 | 124 | } | 108 | } |
2850 | 125 | 109 | ||
2851 | 126 | SignalSpy { | 110 | SignalSpy { |
2854 | 127 | id: highlightedSpy | 111 | id: pressedSpy |
2855 | 128 | signalName: "highlightedChanged" | 112 | signalName: "pressedChanged" |
2856 | 129 | target: testItem | 113 | target: testItem |
2857 | 130 | } | 114 | } |
2858 | 131 | 115 | ||
2859 | @@ -170,7 +154,7 @@ | |||
2860 | 170 | 154 | ||
2861 | 171 | function cleanup() { | 155 | function cleanup() { |
2862 | 172 | movingSpy.clear(); | 156 | movingSpy.clear(); |
2864 | 173 | highlightedSpy.clear(); | 157 | pressedSpy.clear(); |
2865 | 174 | clickSpy.clear(); | 158 | clickSpy.clear(); |
2866 | 175 | actionSpy.clear(); | 159 | actionSpy.clear(); |
2867 | 176 | interactiveSpy.clear(); | 160 | interactiveSpy.clear(); |
2868 | @@ -189,7 +173,7 @@ | |||
2869 | 189 | verify(defaults.contentItem !== null, "Defaults is null"); | 173 | verify(defaults.contentItem !== null, "Defaults is null"); |
2870 | 190 | compare(defaults.color, "#000000", "Transparent by default"); | 174 | compare(defaults.color, "#000000", "Transparent by default"); |
2871 | 191 | compare(defaults.highlightColor, Theme.palette.selected.background, "Theme.palette.selected.background color by default") | 175 | compare(defaults.highlightColor, Theme.palette.selected.background, "Theme.palette.selected.background color by default") |
2873 | 192 | compare(defaults.highlighted, false, "Not highlighted by default"); | 176 | compare(defaults.pressed, false, "Not pressed buy default"); |
2874 | 193 | compare(defaults.swipeOvershoot, 0.0, "No overshoot till the style is loaded!"); | 177 | compare(defaults.swipeOvershoot, 0.0, "No overshoot till the style is loaded!"); |
2875 | 194 | compare(defaults.divider.visible, true, "divider is visible by default"); | 178 | compare(defaults.divider.visible, true, "divider is visible by default"); |
2876 | 195 | compare(defaults.divider.leftMargin, units.dp(2), "divider's left margin is 2GU"); | 179 | compare(defaults.divider.leftMargin, units.dp(2), "divider's left margin is 2GU"); |
2877 | @@ -210,16 +194,14 @@ | |||
2878 | 210 | compare(bodyItem.parent, testItem.contentItem, "Content is not in the right holder!"); | 194 | compare(bodyItem.parent, testItem.contentItem, "Content is not in the right holder!"); |
2879 | 211 | } | 195 | } |
2880 | 212 | 196 | ||
2883 | 213 | function test_highlightedChanged_on_click() { | 197 | function test_pressedChanged_on_click() { |
2882 | 214 | highlightedSpy.target = testItem; | ||
2884 | 215 | mousePress(testItem, testItem.width / 2, testItem.height / 2); | 198 | mousePress(testItem, testItem.width / 2, testItem.height / 2); |
2886 | 216 | highlightedSpy.wait(); | 199 | pressedSpy.wait(); |
2887 | 217 | mouseRelease(testItem, testItem.width / 2, testItem.height / 2); | 200 | mouseRelease(testItem, testItem.width / 2, testItem.height / 2); |
2888 | 218 | } | 201 | } |
2891 | 219 | function test_highlightedChanged_on_tap() { | 202 | function test_pressedChanged_on_tap() { |
2890 | 220 | highlightedSpy.target = testItem; | ||
2892 | 221 | TestExtras.touchPress(0, testItem, centerOf(testItem)); | 203 | TestExtras.touchPress(0, testItem, centerOf(testItem)); |
2894 | 222 | highlightedSpy.wait(); | 204 | pressedSpy.wait(); |
2895 | 223 | TestExtras.touchRelease(0, testItem, centerOf(testItem)); | 205 | TestExtras.touchRelease(0, testItem, centerOf(testItem)); |
2896 | 224 | // local cleanup, wait few msecs to suppress double tap | 206 | // local cleanup, wait few msecs to suppress double tap |
2897 | 225 | wait(400); | 207 | wait(400); |
2898 | @@ -239,14 +221,14 @@ | |||
2899 | 239 | verify(listItem, "Cannot find listItem0"); | 221 | verify(listItem, "Cannot find listItem0"); |
2900 | 240 | 222 | ||
2901 | 241 | mousePress(listItem, listItem.width / 2, 0); | 223 | mousePress(listItem, listItem.width / 2, 0); |
2903 | 242 | compare(listItem.highlighted, true, "Item is not highlighted?"); | 224 | compare(listItem.pressed, true, "Item is not pressed?"); |
2904 | 243 | // do 5 moves to be able to sense it | 225 | // do 5 moves to be able to sense it |
2905 | 244 | var dy = 0; | 226 | var dy = 0; |
2906 | 245 | for (var i = 1; i <= 5; i++) { | 227 | for (var i = 1; i <= 5; i++) { |
2907 | 246 | dy += i * 10; | 228 | dy += i * 10; |
2908 | 247 | mouseMove(listItem, listItem.width / 2, dy); | 229 | mouseMove(listItem, listItem.width / 2, dy); |
2909 | 248 | } | 230 | } |
2911 | 249 | compare(listItem.highlighted, false, "Item is highlighted still!"); | 231 | compare(listItem.pressed, false, "Item is pressed still!"); |
2912 | 250 | mouseRelease(listItem, listItem.width / 2, dy); | 232 | mouseRelease(listItem, listItem.width / 2, dy); |
2913 | 251 | // dismiss | 233 | // dismiss |
2914 | 252 | rebound(listItem); | 234 | rebound(listItem); |
2915 | @@ -256,14 +238,14 @@ | |||
2916 | 256 | verify(listItem, "Cannot find listItem0"); | 238 | verify(listItem, "Cannot find listItem0"); |
2917 | 257 | 239 | ||
2918 | 258 | TestExtras.touchPress(0, listItem, Qt.point(listItem.width / 2, 5)); | 240 | TestExtras.touchPress(0, listItem, Qt.point(listItem.width / 2, 5)); |
2920 | 259 | compare(listItem.highlighted, true, "Item is not highlighted?"); | 241 | compare(listItem.pressed, true, "Item is not pressed?"); |
2921 | 260 | // do 5 moves to be able to sense it | 242 | // do 5 moves to be able to sense it |
2922 | 261 | var dy = 0; | 243 | var dy = 0; |
2923 | 262 | for (var i = 1; i <= 5; i++) { | 244 | for (var i = 1; i <= 5; i++) { |
2924 | 263 | dy += i * 10; | 245 | dy += i * 10; |
2925 | 264 | TestExtras.touchMove(0, listItem, Qt.point(listItem.width / 2, dy)); | 246 | TestExtras.touchMove(0, listItem, Qt.point(listItem.width / 2, dy)); |
2926 | 265 | } | 247 | } |
2928 | 266 | compare(listItem.highlighted, false, "Item is highlighted still!"); | 248 | compare(listItem.pressed, false, "Item is pressed still!"); |
2929 | 267 | // cleanup, wait few milliseconds to avoid dbl-click collision | 249 | // cleanup, wait few milliseconds to avoid dbl-click collision |
2930 | 268 | TestExtras.touchRelease(0, listItem, Qt.point(listItem.width / 2, dy)); | 250 | TestExtras.touchRelease(0, listItem, Qt.point(listItem.width / 2, dy)); |
2931 | 269 | // dismiss | 251 | // dismiss |
2932 | @@ -552,8 +534,8 @@ | |||
2933 | 552 | var item2 = findChild(listView, "listItem2"); | 534 | var item2 = findChild(listView, "listItem2"); |
2934 | 553 | var item3 = findChild(listView, "listItem3"); | 535 | var item3 = findChild(listView, "listItem3"); |
2935 | 554 | return [ | 536 | return [ |
2938 | 555 | // testItem is the child item @index 3 in the topmost Column. | 537 | // testItem is the child item @index 1 in the topmost Column. |
2939 | 556 | {tag: "Standalone item, child index 3", item: testItem, result: 3}, | 538 | {tag: "Standalone item, child index 1", item: testItem, result: 1}, |
2940 | 557 | {tag: "ListView, item index 0", item: item0, result: 0}, | 539 | {tag: "ListView, item index 0", item: item0, result: 0}, |
2941 | 558 | {tag: "ListView, item index 1", item: item1, result: 1}, | 540 | {tag: "ListView, item index 1", item: item1, result: 1}, |
2942 | 559 | {tag: "ListView, item index 2", item: item2, result: 2}, | 541 | {tag: "ListView, item index 2", item: item2, result: 2}, |
2943 | @@ -584,24 +566,5 @@ | |||
2944 | 584 | var param = actionSpy.signalArguments[0]; | 566 | var param = actionSpy.signalArguments[0]; |
2945 | 585 | compare(param[0], data.result, "Action parameter differs"); | 567 | compare(param[0], data.result, "Action parameter differs"); |
2946 | 586 | } | 568 | } |
2947 | 587 | |||
2948 | 588 | function test_highlight_data() { | ||
2949 | 589 | return [ | ||
2950 | 590 | {tag: "No actions", item: highlightTest, x: centerOf(highlightTest).x, y: centerOf(highlightTest).y, pressed: false}, | ||
2951 | 591 | {tag: "Leading/trailing actions", item: testItem, x: centerOf(testItem).x, y: centerOf(testItem).y, pressed: true}, | ||
2952 | 592 | {tag: "Active component content", item: controlItem, x: units.gu(1), y: units.gu(1), pressed: true}, | ||
2953 | 593 | {tag: "Center of active component content", item: controlItem, x: centerOf(controlItem).x, y: centerOf(controlItem).y, pressed: false}, | ||
2954 | 594 | {tag: "clicked() connected", item: clickedConnected, x: centerOf(clickedConnected).x, y: centerOf(clickedConnected).y, pressed: true}, | ||
2955 | 595 | ]; | ||
2956 | 596 | } | ||
2957 | 597 | function test_highlight(data) { | ||
2958 | 598 | highlightedSpy.target = data.item; | ||
2959 | 599 | mouseClick(data.item, data.x, data.y); | ||
2960 | 600 | if (data.pressed) { | ||
2961 | 601 | highlightedSpy.wait(); | ||
2962 | 602 | } else { | ||
2963 | 603 | compare(highlightedSpy.count, 0, "Should not be highlighted!"); | ||
2964 | 604 | } | ||
2965 | 605 | } | ||
2966 | 606 | } | 569 | } |
2967 | 607 | } | 570 | } |