Merge lp:~nskaggs/ubuntu-ui-toolkit/aphelperdocs into lp:ubuntu-ui-toolkit/staging

Proposed by Nicholas Skaggs on 2015-01-13
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
Reviewer Review Type Date Requested Status
Ubuntu SDK team 2015-01-13 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 on 2015-01-13

merge with staging for proposing

907. By Nicholas Skaggs on 2015-01-13

sync nature.css from autopilot, fix favicon

908. By Nicholas Skaggs on 2015-01-13

revert staging

909. By Nicholas Skaggs on 2015-01-23

re-push

Unmerged revisions

909. By Nicholas Skaggs on 2015-01-23

re-push

908. By Nicholas Skaggs on 2015-01-13

revert staging

907. By Nicholas Skaggs on 2015-01-13

sync nature.css from autopilot, fix favicon

906. By Nicholas Skaggs on 2015-01-13

merge with staging for proposing

905. By Nicholas Skaggs on 2015-01-13

re-add sphinx depends on -autopilot package (which is in universe)

904. By Nicholas Skaggs on 2015-01-13

update build information

903. By Nicholas Skaggs on 2015-01-08

redo of build

902. By Nicholas Skaggs on 2015-01-07

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

Subscribers

People subscribed via source and target branches