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

[Nicholas Skaggs]

Re-add autopilot helper documentation and update

Re-add autopilot helper documentation and update

[lp:~nskaggs/ubuntu-ui-toolkit/aphelperdocs]

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

=== added file '.bazaar/Makefile'
--- .bazaar/Makefile	1970-01-01 00:00:00 +0000
+++ .bazaar/Makefile	2015-01-13 21:31:53 +0000
@@ -0,0 +1,3 @@
+install:
+	mkdir -p ~/.bazaar/plugins
+	cp plugins/* ~/.bazaar/plugins

=== modified file 'README'
--- README	2014-03-17 08:53:32 +0000
+++ README	2015-01-13 21:31:53 +0000
@@ -9,12 +9,12 @@
 beautiful applications in QML for Ubuntu.
 
 QML alone lacks built-in components for basic widgets like Button, Slider,
-Scrollbar, etc, meaning a developer has to build them from scratch. This 
-toolkit aims to stop this duplication of work, supplying beautiful components 
+Scrollbar, etc, meaning a developer has to build them from scratch. This
+toolkit aims to stop this duplication of work, supplying beautiful components
 ready-made and with a clear and consistent API.
 
-These components are fully themeable so the look and feel can be easily 
-customized. Resolution independence technology is built in so UIs are scaled 
+These components are fully themeable so the look and feel can be easily
+customized. Resolution independence technology is built in so UIs are scaled
 to best suit the display.
 
 Other features:
@@ -37,16 +37,36 @@
 $ make install
 You may need to be root for this command to succeed.
 
-To use these components in QML without installing them, you need to set the 
+To use these components in QML without installing them, you need to set the
 QML2_IMPORT_PATH environment variable. This is done by running
 $ source export_modules_dir.sh
-from the root directory of this repository, but is lost when you close your 
+from the root directory of this repository, but is lost when you close your
 shell.
 
 
 Documentation
 -------------
 
-Once built, you may view the documentation by opening  
-  documentation/html/overview-ubuntu-sdk.html
-in your favorite web browser.
+Main Documentation (QDocs):
++++++++++++++++++++++++++++
+
+Once built, you may view the documentation by opening
+`documentation/html/overview-ubuntu-sdk.html` in your favorite web browser.
+
+
+Autopilot SDK Helpers Documentation (Sphinx docs):
+++++++++++++++++++++++++++++++++++++++++++++++++++
+
+To build the Autopilot SDK Helpers documentation, you need to install sphinx.
+After installation, change directory to documentation/autopilot-helpers
+and executing make.
+
+  * $ sudo apt-get install python3-sphinx
+
+  * $ cd documentation/autopilot-helpers
+
+  * $ make singlehtml
+
+  * Once built, you may view the documentation by opening
+    `_build/singlehtml/index.html` in your favorite web browser.
+

=== modified file 'components.api'
--- components.api	2014-12-18 10:08:56 +0000
+++ components.api	2015-01-13 21:31:53 +0000
@@ -871,7 +871,7 @@
     Property { name: "divider"; type: "UCListItemDivider"; isReadonly: true; isPointer: true }
     Property { name: "leadingActions"; type: "UCListItemActions"; isPointer: true }
     Property { name: "trailingActions"; type: "UCListItemActions"; isPointer: true }
-    Property { name: "highlighted"; type: "bool"; isReadonly: true }
+    Property { name: "pressed"; type: "bool"; isReadonly: true }
     Property { name: "swipeOvershoot"; type: "double" }
     Property { name: "contentMoving"; type: "bool"; isReadonly: true }
     Property { name: "color"; type: "QColor" }

=== modified file 'debian/control'
--- debian/control	2014-12-12 04:46:30 +0000
+++ debian/control	2015-01-13 21:31:53 +0000
@@ -151,6 +151,7 @@
          python3-testtools,
          python3-autopilot (>= 1.4),
          python3-autopilot-trace,
+         python3-sphinx,
          qttestability-autopilot,
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= ${source:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,

=== added directory 'documentation/autopilot-helpers'
=== added directory 'documentation/autopilot-helpers/_static'
=== added file 'documentation/autopilot-helpers/_static/favicon.ico'
Binary files documentation/autopilot-helpers/_static/favicon.ico	1970-01-01 00:00:00 +0000 and documentation/autopilot-helpers/_static/favicon.ico	2015-01-13 21:31:53 +0000 differ
=== added file 'documentation/autopilot-helpers/_static/nature.css'
--- documentation/autopilot-helpers/_static/nature.css	1970-01-01 00:00:00 +0000
+++ documentation/autopilot-helpers/_static/nature.css	2015-01-13 21:31:53 +0000
@@ -0,0 +1,211 @@
+/*
+	Copyright 2013 Canonical Ltd.
+*/
+ 
+ @import url(basic.css);
+
+body {
+	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
+	font-size:100%;
+	background-color:#2C001E;
+	margin:0;
+	padding:0;
+	}
+
+div.documentwrapper {
+	float:left;
+	width:100%;
+}
+
+div.bodywrapper {
+	margin:0 0 0 0;
+}
+
+hr {
+	border:1px solid #B1B4B6;
+}
+
+div.body {
+	background-color:#FFF;
+	color:#3E4349;
+	font-size:.9em;
+	padding:0 30px 30px;
+}
+
+div.footer {
+	color:#CCC;
+	width:100%;
+	text-align:center;
+	font-size:75%;
+	padding:13px 0;
+}
+
+div.footer a {
+	color:#444;
+	text-decoration:underline;
+}
+
+div.related {
+	background-color:#DD4814;
+	line-height:32px;
+	color:#fff;
+	font-size:.9em;
+}
+
+div.related a {
+	color:#EEE;
+}
+
+div.sphinxsidebar {
+	font-size:.75em;
+	line-height:1.5em;
+}
+
+div.sphinxsidebarwrapper {
+	padding:20px 0;
+}
+
+div.sphinxsidebar h3,
+div.sphinxsidebar h4 {
+	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
+	color:#222;
+	font-size:1.2em;
+	font-weight:400;
+	background-color:#ddd;
+	margin:0;
+	padding:5px 10px;
+}
+
+div.sphinxsidebar p {
+	color:#444;
+	padding:2px 10px;
+}
+
+div.sphinxsidebar ul {
+	color:#000;
+	margin:10px 5px;
+	padding:0;
+}
+
+div.sphinxsidebar input {
+	border:1px solid #ccc;
+	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
+	font-size:1em;
+}
+
+div.sphinxsidebar input[type=text] {
+	margin-left:5px;
+}
+
+a {
+	color:#5E2750;
+	text-decoration:none;
+}
+
+a:hover {
+	color:#DD4814;
+	text-decoration:underline;
+}
+
+div.body h1 {
+	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
+	font-weight:bold;
+	font-size:200%;
+	color:#444;
+	margin:20px 0 10px;
+	padding:5px 0 5px 10px;
+}
+
+div.body h2 {
+	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
+	font-size:130%;
+	background-color:#CCC;
+	margin:20px 0 10px;
+	padding:5px 0 5px 10px;
+}
+
+div.body h6 {
+	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
+	background-color:#BED4EB;
+	font-weight:400;
+	color:#333;
+	margin:30px 0 10px;
+	padding:5px 0 5px 10px;
+}
+
+a.headerlink {
+	text-decoration:none;
+	padding:0 4px;
+}
+
+a.headerlink:hover {
+	background-color:#AEA79F;
+	color:#FFF;
+}
+
+div.body p,div.body dd,div.body li {
+	line-height:1.5em;
+}
+
+div.highlight {
+	background-color:#FFF;
+}
+
+div.note {
+	background-color:#eee;
+	border:1px solid #ccc;
+}
+
+div.seealso {
+	background-color:#ffc;
+	border:1px solid #ff6;
+}
+
+div.warning {
+	background-color:#ffe4e4;
+	border:1px solid #f66;
+}
+
+p.admonition-title:after {
+	content:":";
+}
+
+pre {
+	background-color:#EFEFEF;
+	color:#000;
+	line-height:1.1em;
+	border:1px solid #C6C9CB;
+	font-size:1.2em;
+	font-family:"Ubuntu Mono", Monaco, Consolas, "DejaVu Sans Mono", "Lucida Console", monospace;
+	margin:1.5em 0;
+	padding:6px;
+}
+
+tt {
+	background-color:#EFEFEF;
+	color:#222;
+	font-size:1.1em;
+	font-family:"Ubuntu Mono", Monaco, Consolas, "DejaVu Sans Mono", "Lucida Console", monospace;
+}
+
+.viewcode-back {
+	font-family:Ubuntu, "DejaVu Sans", "Trebuchet MS", sans-serif;
+}
+
+div.viewcode-block:target {
+	background-color:#f4debf;
+	border-top:1px solid #ac9;
+	border-bottom:1px solid #ac9;
+}
+
+div.document,div.topic {
+ background-color:#eee;
+}
+
+div.sphinxsidebar h3 a,div.sphinxsidebar a {
+ color:#444;
+}
+
+div.admonition p.admonition-title + p,p.admonition-title {
+	display:inline;
+}

=== added directory 'documentation/autopilot-helpers/_templates'
=== added file 'documentation/autopilot-helpers/_templates/layout.html'
--- documentation/autopilot-helpers/_templates/layout.html	1970-01-01 00:00:00 +0000
+++ documentation/autopilot-helpers/_templates/layout.html	2015-01-13 21:31:53 +0000
@@ -0,0 +1,28 @@
+<!--
+    Copyright 2013 Canonical Ltd.
+-->
+
+{#
+    default/layout.html
+    ~~~~~~~~~~~~~~~~~~~
+
+    Sphinx layout template for the default theme.
+
+    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{% extends "basic/layout.html" %}
+
+{%- block content %}
+<div class="document">
+  {%- block document %}
+      <div class="documentwrapper">
+      {%- if render_sidebar %}
+        <div class="bodywrapper">
+      {%- endif %}
+          <div class="body">
+            {% block body %} {% endblock %}
+          </div>
+      </div>
+  {%- endblock %}
+{%- endblock %}
\ No newline at end of file

=== added file 'documentation/autopilot-helpers/conf.py'
--- documentation/autopilot-helpers/conf.py	1970-01-01 00:00:00 +0000
+++ documentation/autopilot-helpers/conf.py	2015-01-13 21:31:53 +0000
@@ -0,0 +1,339 @@
+# -*- coding: utf-8 -*-
+#
+# ubuntu-ui-toolkit-autopilot documentation build configuration file, created by
+# sphinx-quickstart on Thu Jan  8 12:39:43 2015.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.doctest',
+    'sphinx.ext.todo',
+    'sphinx.ext.viewcode',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'ubuntu-ui-toolkit-autopilot'
+copyright = u'2015, Canonical'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '15.04'
+# The full version, including alpha/beta/rc tags.
+release = '15.04'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+html_favicon = 'favicon.ico'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+html_domain_indices = True
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+html_use_index = True
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+html_show_sourcelink = False
+# If false, no index is generated.
+#html_use_index = True
+html_show_sphinx = False
+
+# If true, the index is split into individual pages for each letter.
+html_show_copyright = True
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'ubuntu-ui-toolkit-autopilotdoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    ('index', 'ubuntu-ui-toolkit-autopilot.tex',
+     u'ubuntu-ui-toolkit-autopilot Documentation',
+     u'authors', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'ubuntu-ui-toolkit-autopilot',
+     u'ubuntu-ui-toolkit-autopilot Documentation',
+     [u'authors'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    ('index', 'ubuntu-ui-toolkit-autopilot',
+     u'ubuntu-ui-toolkit-autopilot Documentation',
+     u'authors', 'ubuntu-ui-toolkit-autopilot',
+     'An autopilot emulator for the ubuntu sdk',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+
+# -- Options for Epub output ----------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = u'ubuntu-ui-toolkit-autopilot'
+epub_author = u'authors'
+epub_publisher = u'Canonical'
+epub_copyright = u'2015, Canonical'
+
+# The basename for the epub file. It defaults to the project name.
+#epub_basename = u'ubuntu-ui-toolkit-autopilot'
+
+# The HTML theme for the epub output. Since the default themes are not optimized
+# for small screen space, using the same theme for HTML and epub output is
+# usually not wise. This defaults to 'epub', a theme designed to save visual
+# space.
+#epub_theme = 'epub'
+
+# The language of the text. It defaults to the language option
+# or en if the language is not set.
+#epub_language = ''
+
+# The scheme of the identifier. Typical schemes are ISBN or URL.
+#epub_scheme = ''
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#epub_identifier = ''
+
+# A unique identification for the text.
+#epub_uid = ''
+
+# A tuple containing the cover image and cover page html template filenames.
+#epub_cover = ()
+
+# A sequence of (type, uri, title) tuples for the guide element of content.opf.
+#epub_guide = ()
+
+# HTML files that should be inserted before the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_pre_files = []
+
+# HTML files shat should be inserted after the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_post_files = []
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+# The depth of the table of contents in toc.ncx.
+#epub_tocdepth = 3
+
+# Allow duplicate toc entries.
+#epub_tocdup = True
+
+# Choose between 'default' and 'includehidden'.
+#epub_tocscope = 'default'
+
+# Fix unsupported image types using the PIL.
+#epub_fix_images = False
+
+# Scale large images.
+#epub_max_image_width = 0
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#epub_show_urls = 'inline'
+
+# If false, no index is generated.
+#epub_use_index = True

=== added file 'documentation/autopilot-helpers/index.rst'
--- documentation/autopilot-helpers/index.rst	1970-01-01 00:00:00 +0000
+++ documentation/autopilot-helpers/index.rst	2015-01-13 21:31:53 +0000
@@ -0,0 +1,17 @@
+.. ubuntu-ui-toolkit-autopilot documentation master file, created by
+   sphinx-quickstart on Thu Jan  8 12:39:43 2015.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to ubuntu-ui-toolkit-autopilot's documentation!
+======================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   ubuntuuitoolkit
+
+* :ref:`genindex`
+

=== added file 'documentation/autopilot-helpers/ubuntuuitoolkit.rst'
--- documentation/autopilot-helpers/ubuntuuitoolkit.rst	1970-01-01 00:00:00 +0000
+++ documentation/autopilot-helpers/ubuntuuitoolkit.rst	2015-01-13 21:31:53 +0000
@@ -0,0 +1,10 @@
+ubuntuuitoolkit Package
+=======================
+
+:mod:`custom proxy object` Module
+---------------------------------
+
+.. automodule:: ubuntuuitoolkit
+    :members:
+    :undoc-members:
+    :show-inheritance:

=== removed file 'examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	2015-01-05 20:34:54 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.2
-import Ubuntu.Components 1.2
-
-ListItem {
-    property alias text: label.text
-    Label {
-        id: label
-        anchors {
-            left: parent.left
-            leftMargin: units.gu(2)
-            verticalCenter: parent.verticalCenter
-        }
-    }
-}

=== removed file 'examples/ubuntu-ui-toolkit-gallery/NewListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-01-05 20:55:12 +0000
+++ examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.2
-import Ubuntu.Components 1.2
-
-Template {
-    objectName: "listItemsTemplate"
-
-    TemplateSection {
-        className: "ListItem"
-        // no spacing between the list items in the Column
-        spacing: 0
-        Item {
-            // compensate for the spacing of 0 by adding this
-            // Item inbetween the title and the list items.
-            height: units.gu(3)
-            width: parent.width
-        }
-
-        // clip the action delegates while swiping left/right
-        clip: true
-
-        ListItemWithLabel {
-            text: i18n.tr("Basic")
-        }
-        ListItemWithLabel {
-            text: i18n.tr("Colored divider")
-            divider {
-                colorFrom: UbuntuColors.red
-                colorTo: UbuntuColors.green
-            }
-        }
-        ListItemWithLabel {
-            text: i18n.tr("No divider")
-            divider.visible: false
-        }
-        ListItemWithLabel {
-            color: UbuntuColors.blue
-            text: i18n.tr("Colored")
-        }
-        ListItemWithLabel {
-            text: i18n.tr("Highlight color")
-            highlightColor: UbuntuColors.orange
-            // no highlight without clicked() or leading/trailing actions
-            onClicked: print(i18n.tr("Highlighting list item"))
-        }
-
-        ListItemActions {
-            id: exampleLeadingActions
-            actions: [
-                Action {
-                    iconName: "tick"
-                },
-                Action {
-                    iconName: "delete"
-                }
-            ]
-        }
-        ListItemActions {
-            id: exampleTrailingActions
-            actions: [
-                Action {
-                    iconName: "edit"
-                },
-                Action {
-                    iconName: "save-to"
-                }
-            ]
-        }
-
-        ListItemWithLabel {
-            text: i18n.tr("Leading actions")
-            leadingActions: exampleLeadingActions
-        }
-        ListItemWithLabel {
-            text: i18n.tr("Trailing actions")
-            trailingActions: exampleTrailingActions
-        }
-        ListItemWithLabel {
-            text: i18n.tr("Leading and trailing actions")
-            leadingActions: exampleLeadingActions
-            trailingActions: exampleTrailingActions
-        }
-        ListItemWithLabel {
-            text: i18n.tr("Custom action delegates")
-            swipeOvershoot: 0
-            leadingActions: ListItemActions {
-                actions: [
-                    Action {
-                        iconName: "tick"
-                        property color color: UbuntuColors.green
-                    },
-                    Action {
-                        iconName: "delete"
-                        property color color: UbuntuColors.red
-                    }
-                ]
-                delegate: Rectangle {
-                    width: height
-                    color: pressed ? Qt.darker(action.color, 1.2) : action.color
-                    Icon {
-                        width: units.gu(3)
-                        height: width
-                        name: action.iconName
-                        color: "white"
-                        anchors.centerIn: parent
-                    }
-                }
-            }
-            trailingActions: ListItemActions {
-                actions: [
-                    Action {
-                        text: i18n.tr("Edit")
-                    },
-                    Action {
-                        text: i18n.tr("Move")
-                    }
-                ]
-                delegate: Rectangle {
-                    color: pressed ? Qt.darker("yellow", 1.1) : "yellow"
-                    width: units.gu(10)
-                    Label {
-                        text: action.text
-                        anchors.centerIn: parent
-                    }
-                }
-            }
-        }
-    }
-}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-01-05 20:43:06 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-01-13 21:31:53 +0000
@@ -104,11 +104,6 @@
         source: "ListItems.qml"
     }
     ListElement {
-        objectName: "newListItemsElement"
-        label: "New list items (preview)"
-        source: "NewListItems.qml"
-    }
-    ListElement {
         objectName: "ubuntuListViewElement"
         label: "Ubuntu ListView"
         source: "UbuntuListViews.qml"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/po/es.po'
--- examples/ubuntu-ui-toolkit-gallery/po/es.po	2014-12-12 06:33:39 +0000
+++ examples/ubuntu-ui-toolkit-gallery/po/es.po	2015-01-13 21:31:53 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-12 06:33+0000\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
 "X-Generator: Launchpad (build 17286)\n"
 
 #: Animations.qml:24

=== modified file 'modules/Ubuntu/Components/PageHeadConfiguration.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration.qml	2015-01-06 12:36:58 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration.qml	2015-01-13 21:31:53 +0000
@@ -96,21 +96,6 @@
      */
     property Item contents: null
 
-    QtObject {
-        id: internal
-        property Item oldContents: null
-    }
-
-    onContentsChanged: {
-        if (internal.oldContents) {
-            // FIX: bug #1341814 and #1400297
-            // We have to force the removal of the previous head.contents
-            // in order to show the new contents
-            internal.oldContents.parent = null;
-        }
-        internal.oldContents = contents;
-    }
-
     // FIXME: The example below can be much simplified using PageHeadState
     //  when bug #1345775 has been fixed.
     /*!

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-01-07 06:42:09 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-01-13 21:31:53 +0000
@@ -327,7 +327,7 @@
  */
 UCListItemPrivate::UCListItemPrivate()
     : UCStyledItemBasePrivate()
-    , highlighted(false)
+    , pressed(false)
     , contentMoved(false)
     , highlightColorChanged(false)
     , swiped(false)
@@ -379,16 +379,6 @@
     _q_updateSize();
 }
 
-// inspired from IS_SIGNAL_CONNECTED(q, UCListItem, pressAndHold, ())
-// the macro cannot be used due to Arguments cannot be an empty ()
-bool UCListItemPrivate::isClickedConnected()
-{
-    Q_Q(UCListItem);
-    static QMetaMethod method = QMetaMethod::fromSignal(&UCListItem::clicked);
-    static int signalIdx = QMetaObjectPrivate::signalIndex(method);
-    return QObjectPrivate::get(q)->isSignalConnected(signalIdx);
-}
-
 void UCListItemPrivate::_q_updateThemedData()
 {
     // update colors, panels
@@ -402,7 +392,7 @@
 
 void UCListItemPrivate::_q_rebound()
 {
-    setHighlighted(false);
+    setPressed(false);
     // initiate rebinding only if there were actions tugged
     Q_Q(UCListItem);
     if (!UCListItemActionsPrivate::isConnectedTo(leadingActions, q) &&
@@ -507,13 +497,14 @@
 // rebound without animation
 void UCListItemPrivate::promptRebound()
 {
-    setHighlighted(false);
+    setPressed(false);
     setSwiped(false);
     if (animator) {
         animator->snapOut();
     }
 }
 
+// set pressed flag and update background
 // called when units size changes
 void UCListItemPrivate::_q_updateSize()
 {
@@ -549,18 +540,18 @@
    // action, leading or trailing actions list or at least an active child component declared
    QQuickMouseArea *ma = q->findChild<QQuickMouseArea*>();
    bool activeMouseArea = ma && ma->isEnabled();
-   return !activeComponent && (isClickedConnected() || leadingActions || trailingActions || activeMouseArea);
+   return !activeComponent && (leadingActions || trailingActions || activeMouseArea);
 }
 
-// set highlighted flag and update contentItem
-void UCListItemPrivate::setHighlighted(bool highlighted)
+// set pressed flag and update contentItem
+void UCListItemPrivate::setPressed(bool pressed)
 {
-    if (this->highlighted != highlighted) {
-        this->highlighted = highlighted;
+    if (this->pressed != pressed) {
+        this->pressed = pressed;
         suppressClick = false;
         Q_Q(UCListItem);
         q->update();
-        Q_EMIT q->highlightedChanged();
+        Q_EMIT q->pressedChanged();
     }
 }
 // toggles the tugged flag and installs/removes event filter
@@ -652,63 +643,8 @@
  * good performance when used in long list views.
  *
  * The component provides two color properties which configures the item's background
- * when normal or highlighted. This can be configured through \l color and \l highlightColor
- * properties. The list item is highlighted if there is an action attached to it.
- * This means that the list item must have an active component declared as child,
- * at least leading- or trailing actions specified, or to have a slot connected to
- * \l clicked signal. In any other case the component will not be highlighted, and
- * \l highlighted property will not be toggled either. Also, there will be no highlight
- * happening if the click happens on the active component.
- * \qml
- * import QtQuick 2.3
- * import Ubuntu.Components 1.2
- *
- * MainView {
- *    width: units.gu(40)
- *    height: units.gu(71)
- *
- *    Column {
- *        anchors.fill: parent
- *        ListItem {
- *            Button {
- *                text: "Press me"
- *            }
- *            onClicked: console.log("clicked on ListItem")
- *        }
- *        ListItem {
- *            leadingActions: ListItemActions {
- *                actions: [
- *                    Action {
- *                        iconName: "delete"
- *                    }
- *                ]
- *            }
- *            onClicked: console.log("clicked on ListItem with leadingActions set")
- *        }
- *        ListItem {
- *            trailingActions: ListItemActions {
- *                actions: [
- *                    Action {
- *                        iconName: "edit"
- *                    }
- *                ]
- *            }
- *            onClicked: console.log("clicked on ListItem with trailingActions set")
- *        }
- *        ListItem {
- *            Label {
- *                text: "onClicked implemented"
- *            }
- *            onClicked: console.log("clicked on ListItem with onClicked implemented")
- *        }
- *        ListItem {
- *            Label {
- *                text: "No highlight"
- *            }
- *        }
- *    }
- * }
- * \endqml
+ * when normal or pressed. This can be configured through \l color and \l highlightColor
+ * properties.
  *
  * \c contentItem holds all components and resources declared as child to ListItem.
  * Being an Item, all properties can be accessed or altered. However, make sure you
@@ -782,7 +718,7 @@
 /*!
  * \qmlsignal ListItem::clicked()
  *
- * The signal is emitted when the component gets released while the \l highlighted property
+ * The signal is emitted when the component gets released while the \l pressed property
  * is set. The signal is not emitted if the ListItem content is swiped or when used in
  * Flickable (or ListView, GridView) and the Flickable gets moved.
  */
@@ -873,7 +809,7 @@
     Q_UNUSED(data);
 
     Q_D(UCListItem);
-    QColor color = d->highlighted ? d->highlightColor : d->color;
+    QColor color = d->pressed ? d->highlightColor : d->color;
 
     if (width() <= 0 || height() <= 0) {
         delete oldNode;
@@ -929,7 +865,7 @@
         return;
     }
     if (event->button() == Qt::LeftButton && d->canHighlight(event)) {
-        d->setHighlighted(true);
+        d->setPressed(true);
         d->lastPos = d->pressedPos = event->localPos();
         // connect the Flickable to know when to rebound
         d->listenToRebind(true);
@@ -948,7 +884,7 @@
     UCStyledItemBase::mouseReleaseEvent(event);
     Q_D(UCListItem);
     // set released
-    if (d->highlighted) {
+    if (d->pressed) {
         d->listenToRebind(false);
         if (d->attachedProperties) {
             d->attachedProperties->disableInteractive(this, false);
@@ -959,7 +895,7 @@
             d->_q_rebound();
         }
     }
-    d->setHighlighted(false);
+    d->setPressed(false);
 }
 
 void UCListItem::mouseMoveEvent(QMouseEvent *event)
@@ -970,7 +906,7 @@
     // accept the tugging only if the move is within the threshold
     bool leadingAttached = UCListItemActionsPrivate::isConnectedTo(d->leadingActions, this);
     bool trailingAttached = UCListItemActionsPrivate::isConnectedTo(d->trailingActions, this);
-    if (d->highlighted && !(leadingAttached || trailingAttached)) {
+    if (d->pressed && !(leadingAttached || trailingAttached)) {
         // check if we can initiate the drag at all
         // only X direction matters, if Y-direction leaves the threshold, but X not, the tug is not valid
         qreal threshold = UCUnits::instance().gu(d->xAxisMoveThresholdGU);
@@ -1182,16 +1118,16 @@
 }
 
 /*!
- * \qmlproperty bool ListItem::highlighted
- * True when the item is pressed. The items stays highlighted when the mouse or touch
- * is moved horizontally. When in Flickable (or ListView), the item gets un-highlighted
+ * \qmlproperty bool ListItem::pressed
+ * True when the item is pressed. The items stays pressed when the mouse or touch
+ * is moved horizontally. When in Flickable (or ListView), the item gets un-pressed
  * (false) when the mouse or touch is moved towards the vertical direction causing
  * the flickable to move.
  */
-bool UCListItem::highlighted() const
+bool UCListItem::pressed() const
 {
     Q_D(const UCListItem);
-    return d->highlighted;
+    return d->pressed;
 }
 
 /*!
@@ -1253,7 +1189,7 @@
 
 /*!
  * \qmlproperty color ListItem::highlightColor
- * Configures the color when highlighted. Defaults to the theme palette's background color.
+ * Configures the color when pressed. Defaults to the theme palette's background color.
  */
 QColor UCListItem::highlightColor() const
 {

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.h'
--- modules/Ubuntu/Components/plugin/uclistitem.h	2014-12-18 10:08:56 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.h	2015-01-13 21:31:53 +0000
@@ -33,7 +33,7 @@
     Q_PROPERTY(UCListItemDivider *divider READ divider CONSTANT)
     Q_PROPERTY(UCListItemActions *leadingActions READ leadingActions WRITE setLeadingActions NOTIFY leadingActionsChanged DESIGNABLE false)
     Q_PROPERTY(UCListItemActions *trailingActions READ trailingActions WRITE setTrailingActions NOTIFY trailingActionsChanged DESIGNABLE false)
-    Q_PROPERTY(bool highlighted READ highlighted NOTIFY highlightedChanged)
+    Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), qreal swipeOvershoot READ swipeOvershoot WRITE setSwipeOvershoot NOTIFY swipeOvershootChanged)
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), bool contentMoving READ contentMoving NOTIFY contentMovingChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
@@ -56,7 +56,7 @@
     void setLeadingActions(UCListItemActions *options);
     UCListItemActions *trailingActions() const;
     void setTrailingActions(UCListItemActions *options);
-    bool highlighted() const;
+    bool pressed() const;
     QColor color() const;
     void setColor(const QColor &color);
     QColor highlightColor() const;
@@ -76,7 +76,7 @@
 Q_SIGNALS:
     void leadingActionsChanged();
     void trailingActionsChanged();
-    void highlightedChanged();
+    void pressedChanged();
     void swipeOvershootChanged();
     void contentMovingChanged();
     void colorChanged();

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-01-07 06:42:09 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-01-13 21:31:53 +0000
@@ -43,7 +43,6 @@
         return that->d_func();
     }
 
-    bool isClickedConnected();
     void _q_updateThemedData();
     void _q_rebound();
     void promptRebound();
@@ -51,7 +50,7 @@
     void _q_updateIndex();
     int index();
     bool canHighlight(QMouseEvent *event);
-    void setHighlighted(bool pressed);
+    void setPressed(bool pressed);
     void setSwiped(bool tugged);
     bool grabPanel(UCListItemActions *optionList, bool isTugged);
     void listenToRebind(bool listen);
@@ -59,7 +58,7 @@
     void update();
     void clampAndMoveX(qreal &x, qreal dx);
 
-    bool highlighted:1;
+    bool pressed:1;
     bool contentMoved:1;
     bool highlightColorChanged:1;
     bool swiped:1;

=== modified file 'modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp'
--- modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp	2014-12-18 10:08:56 +0000
+++ modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp	2015-01-13 21:31:53 +0000
@@ -74,12 +74,12 @@
         return;
     }
     if (connect) {
-        QObject::connect(item, &UCListItem::highlightedChanged,
+        QObject::connect(item, &UCListItem::pressedChanged,
                          this, &UCListItemActionsAttached::updateSwipeState);
         QObject::connect(item, &UCListItem::contentMovingChanged,
                          this, &UCListItemActionsAttached::updateSwipeState);
     } else {
-        QObject::disconnect(item, &UCListItem::highlightedChanged,
+        QObject::disconnect(item, &UCListItem::pressedChanged,
                             this, &UCListItemActionsAttached::updateSwipeState);
         QObject::disconnect(item, &UCListItem::contentMovingChanged,
                             this, &UCListItemActionsAttached::updateSwipeState);
@@ -112,7 +112,7 @@
     }
     UCListItem *item = static_cast<UCListItem*>(panelItem->parentItem());
     UCListItemPrivate *listItem = UCListItemPrivate::get(item);
-    bool swiped = listItem->highlighted && listItem->contentMoved;
+    bool swiped = listItem->pressed && listItem->contentMoved;
     if (swiped != m_swiping) {
         m_swiping = swiped;
         Q_EMIT swipingChanged();

=== modified file 'po/am.po'
--- po/am.po	2014-11-29 06:47:10 +0000
+++ po/am.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ar.po'
--- po/ar.po	2014-11-29 06:47:10 +0000
+++ po/ar.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ast.po'
--- po/ast.po	2014-11-29 06:47:10 +0000
+++ po/ast.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/az.po'
--- po/az.po	2014-11-29 06:47:10 +0000
+++ po/az.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/be.po'
--- po/be.po	2014-11-29 06:47:10 +0000
+++ po/be.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/bs.po'
--- po/bs.po	2014-11-29 06:47:10 +0000
+++ po/bs.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ca.po'
--- po/ca.po	2014-11-29 06:47:10 +0000
+++ po/ca.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"
@@ -89,7 +89,7 @@
 
 #: Ubuntu/Components/plugin/uctheme.cpp:233
 msgid "Theme not found: "
-msgstr ""
+msgstr "No s'ha trobat el tema: "
 
 #: Ubuntu/Components/Popups/ComposerSheet.qml:80
 msgid "Cancel"

=== modified file 'po/[e-mail]'
--- po/[e-mail]	2014-11-29 06:47:10 +0000
+++ po/[e-mail]	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ce.po'
--- po/ce.po	2014-11-29 06:47:10 +0000
+++ po/ce.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/cs.po'
--- po/cs.po	2014-11-29 06:47:10 +0000
+++ po/cs.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/da.po'
--- po/da.po	2014-11-29 06:47:10 +0000
+++ po/da.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/de.po'
--- po/de.po	2014-11-29 06:47:10 +0000
+++ po/de.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/el.po'
--- po/el.po	2014-11-29 06:47:10 +0000
+++ po/el.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2014-11-29 06:47:10 +0000
+++ po/en_AU.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2014-11-29 06:47:10 +0000
+++ po/en_GB.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/es.po'
--- po/es.po	2014-12-12 06:33:39 +0000
+++ po/es.po	2015-01-13 21:31:53 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-12 06:33+0000\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
 "X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413

=== modified file 'po/eu.po'
--- po/eu.po	2014-11-29 06:47:10 +0000
+++ po/eu.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/fa.po'
--- po/fa.po	2014-12-12 06:33:39 +0000
+++ po/fa.po	2015-01-13 21:31:53 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-12 06:33+0000\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
 "X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413

=== modified file 'po/fi.po'
--- po/fi.po	2014-11-29 06:47:10 +0000
+++ po/fi.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/fr.po'
--- po/fr.po	2014-11-29 06:47:10 +0000
+++ po/fr.po	2015-01-13 21:31:53 +0000
@@ -14,12 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
 
 #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176
 #, qt-format
@@ -145,4 +145,4 @@
 
 #: Ubuntu/Components/ToolbarItems.qml:142
 msgid "Back"
-msgstr ""
+msgstr "Précédent"

=== modified file 'po/fr_CA.po'
--- po/fr_CA.po	2014-11-29 06:47:10 +0000
+++ po/fr_CA.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ga.po'
--- po/ga.po	2014-12-17 07:02:28 +0000
+++ po/ga.po	2015-01-13 21:31:53 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-17 07:02+0000\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
 "X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
@@ -27,11 +27,13 @@
 "property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" "
 "of type %5"
 msgstr ""
+"Tá cineál %3 ag aire \"%1\" de réad %2,agus ní féidir é a shocrú go luach "
+"\"%4\"de chineál %5"
 
 #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:185
 #, qt-format
 msgid "property \"%1\" does not exist or is not writable for object %2"
-msgstr ""
+msgstr "Ní ann don luach \"%1\" nó níl sé inscríofa don réad %2"
 
 #: Ubuntu/Components/plugin/ucalarm.cpp:42
 #: Ubuntu/Components/plugin/ucalarm.cpp:136
@@ -41,7 +43,7 @@
 #: Ubuntu/Components/plugin/ucalarm.cpp:684
 #: Ubuntu/Components/plugin/ucalarm.cpp:716
 msgid "Alarm has a pending operation."
-msgstr ""
+msgstr "Tá gníomh ar feitheamh ag an aláram"
 
 #: Ubuntu/Components/plugin/ucarguments.cpp:188
 msgid "Usage: "
@@ -69,16 +71,19 @@
 #: Ubuntu/Components/plugin/ucmousefilters.cpp:1064
 msgid "Ignoring AfterItem priority for InverseMouse filters."
 msgstr ""
+"Ag déanamh neamhaird ar phriaracht AfterItem do scagathóirí InverseMouse"
 
 #: Ubuntu/Components/plugin/ucstatesaver.cpp:46
 msgid "Warning: attachee must have an ID. State will not be saved."
-msgstr ""
+msgstr "Aire: Tá ID ag teastáil ón gceangalaí. Ní shábháilfear an staid."
 
 #: Ubuntu/Components/plugin/ucstatesaver.cpp:56
 #, qt-format
 msgid ""
 "Warning: attachee's UUID is already registered, state won't be saved: %1"
 msgstr ""
+"Aire: Tá UUID an cheangalaí cláraithe cheana féin. Ní shábháilfear an staid: "
+"%1"
 
 #: Ubuntu/Components/plugin/ucstatesaver.cpp:102
 #, qt-format
@@ -86,54 +91,56 @@
 "All the parents must have an id.\n"
 "State saving disabled for %1, class %2"
 msgstr ""
+"Tá id ag teastáil ó gach tuismitheoir.\n"
+"Sábháil staid díchumasaithe do %1, aicme %2"
 
 #: Ubuntu/Components/plugin/uctheme.cpp:233
 msgid "Theme not found: "
-msgstr ""
+msgstr "Níor aimsíodh téama: "
 
 #: Ubuntu/Components/Popups/ComposerSheet.qml:80
 msgid "Cancel"
-msgstr ""
+msgstr "Cealaigh"
 
 #: Ubuntu/Components/Popups/ComposerSheet.qml:90
 msgid "Confirm"
-msgstr ""
+msgstr "Deimhnigh"
 
 #: Ubuntu/Components/Popups/DefaultSheet.qml:89
 msgid "Close"
-msgstr ""
+msgstr "Dún"
 
 #: Ubuntu/Components/Popups/DefaultSheet.qml:99
 msgid "Done"
-msgstr ""
+msgstr "Déanta"
 
 #: Ubuntu/Components/TextInputPopover.qml:27
 msgid "Select All"
-msgstr ""
+msgstr "Roghnaigh Uile"
 
 #: Ubuntu/Components/TextInputPopover.qml:33
 msgid "Cut"
-msgstr ""
+msgstr "Gearr"
 
 #: Ubuntu/Components/TextInputPopover.qml:42
 msgid "Copy"
-msgstr ""
+msgstr "Cóipeáil"
 
 #: Ubuntu/Components/TextInputPopover.qml:49
 msgid "Paste"
-msgstr ""
+msgstr "Greamaigh"
 
 #: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57
 msgid "In Progress"
-msgstr ""
+msgstr "Ar Bun"
 
 #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
 msgid "Release to refresh..."
-msgstr ""
+msgstr "Scaoil le hathnuachan a dhéanamh…"
 
 #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
 msgid "Pull to refresh..."
-msgstr ""
+msgstr "Tarraing le hathnuachan a dhéanamh…"
 
 #: Ubuntu/Components/ToolbarItems.qml:142
 msgid "Back"

=== modified file 'po/gd.po'
--- po/gd.po	2014-11-29 06:47:10 +0000
+++ po/gd.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/gl.po'
--- po/gl.po	2014-11-29 06:47:10 +0000
+++ po/gl.po	2015-01-13 21:31:53 +0000
@@ -14,12 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
 
 #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176
 #, qt-format
@@ -141,4 +141,4 @@
 
 #: Ubuntu/Components/ToolbarItems.qml:142
 msgid "Back"
-msgstr ""
+msgstr "Atrás"

=== modified file 'po/he.po'
--- po/he.po	2014-11-29 06:47:10 +0000
+++ po/he.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== added file 'po/hi.po'
--- po/hi.po	1970-01-01 00:00:00 +0000
+++ po/hi.po	2015-01-13 21:31:53 +0000
@@ -0,0 +1,140 @@
+# Hindi translation for ubuntu-ui-toolkit
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the ubuntu-ui-toolkit package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-ui-toolkit\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-11-05 14:29+0100\n"
+"PO-Revision-Date: 2015-01-05 14:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-01-06 07:14+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
+
+#: Ubuntu/Components/ListItems/Empty.qml:413
+msgid "Delete"
+msgstr ""
+
+#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176
+#, qt-format
+msgid ""
+"property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" "
+"of type %5"
+msgstr ""
+
+#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:185
+#, qt-format
+msgid "property \"%1\" does not exist or is not writable for object %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucalarm.cpp:42
+#: Ubuntu/Components/plugin/ucalarm.cpp:136
+msgid "Alarm"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucalarm.cpp:684
+#: Ubuntu/Components/plugin/ucalarm.cpp:716
+msgid "Alarm has a pending operation."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:188
+msgid "Usage: "
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:209
+msgid "Options:"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:498
+#, qt-format
+msgid "%1 is expecting an additional argument: %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:503
+#, qt-format
+msgid "%1 is expecting a value for argument: %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:520
+#, qt-format
+msgid "%1 is expecting additional arguments: %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucmousefilters.cpp:1064
+msgid "Ignoring AfterItem priority for InverseMouse filters."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucstatesaver.cpp:46
+msgid "Warning: attachee must have an ID. State will not be saved."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucstatesaver.cpp:56
+#, qt-format
+msgid ""
+"Warning: attachee's UUID is already registered, state won't be saved: %1"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucstatesaver.cpp:102
+#, qt-format
+msgid ""
+"All the parents must have an id.\n"
+"State saving disabled for %1, class %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/uctheme.cpp:233
+msgid "Theme not found: "
+msgstr ""
+
+#: Ubuntu/Components/Popups/ComposerSheet.qml:80
+msgid "Cancel"
+msgstr ""
+
+#: Ubuntu/Components/Popups/ComposerSheet.qml:90
+msgid "Confirm"
+msgstr ""
+
+#: Ubuntu/Components/Popups/DefaultSheet.qml:89
+msgid "Close"
+msgstr ""
+
+#: Ubuntu/Components/Popups/DefaultSheet.qml:99
+msgid "Done"
+msgstr ""
+
+#: Ubuntu/Components/TextInputPopover.qml:27
+msgid "Select All"
+msgstr ""
+
+#: Ubuntu/Components/TextInputPopover.qml:33
+msgid "Cut"
+msgstr ""
+
+#: Ubuntu/Components/TextInputPopover.qml:42
+msgid "Copy"
+msgstr ""
+
+#: Ubuntu/Components/TextInputPopover.qml:49
+msgid "Paste"
+msgstr ""
+
+#: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57
+msgid "In Progress"
+msgstr ""
+
+#: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
+msgid "Release to refresh..."
+msgstr ""
+
+#: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
+msgid "Pull to refresh..."
+msgstr ""
+
+#: Ubuntu/Components/ToolbarItems.qml:142
+msgid "Back"
+msgstr ""

=== modified file 'po/hr.po'
--- po/hr.po	2014-12-08 06:37:28 +0000
+++ po/hr.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-08 06:37+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/hu.po'
--- po/hu.po	2014-11-29 06:47:10 +0000
+++ po/hu.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/id.po'
--- po/id.po	2014-11-29 06:47:10 +0000
+++ po/id.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/it.po'
--- po/it.po	2014-11-29 06:47:10 +0000
+++ po/it.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ja.po'
--- po/ja.po	2014-11-29 06:47:10 +0000
+++ po/ja.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/km.po'
--- po/km.po	2014-11-29 06:47:10 +0000
+++ po/km.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/kn.po'
--- po/kn.po	2014-11-29 06:47:10 +0000
+++ po/kn.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ko.po'
--- po/ko.po	2014-11-29 06:47:10 +0000
+++ po/ko.po	2015-01-13 21:31:53 +0000
@@ -14,12 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"
-msgstr ""
+msgstr "삭제"
 
 #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176
 #, qt-format
@@ -139,4 +139,4 @@
 
 #: Ubuntu/Components/ToolbarItems.qml:142
 msgid "Back"
-msgstr ""
+msgstr "뒤로"

=== modified file 'po/lv.po'
--- po/lv.po	2014-11-29 06:47:10 +0000
+++ po/lv.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ms.po'
--- po/ms.po	2014-11-29 06:47:10 +0000
+++ po/ms.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/my.po'
--- po/my.po	2014-11-29 06:47:10 +0000
+++ po/my.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/nb.po'
--- po/nb.po	2014-11-29 06:47:10 +0000
+++ po/nb.po	2015-01-13 21:31:53 +0000
@@ -14,12 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
 
 #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176
 #, qt-format
@@ -143,4 +143,4 @@
 
 #: Ubuntu/Components/ToolbarItems.qml:142
 msgid "Back"
-msgstr ""
+msgstr "Tilbake"

=== modified file 'po/nl.po'
--- po/nl.po	2014-11-29 06:47:10 +0000
+++ po/nl.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/oc.po'
--- po/oc.po	2014-11-29 06:47:10 +0000
+++ po/oc.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/pa.po'
--- po/pa.po	2014-11-29 06:47:10 +0000
+++ po/pa.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/pl.po'
--- po/pl.po	2014-11-29 06:47:10 +0000
+++ po/pl.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/pt.po'
--- po/pt.po	2014-11-29 06:47:10 +0000
+++ po/pt.po	2015-01-13 21:31:53 +0000
@@ -14,12 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
 
 #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176
 #, qt-format
@@ -141,4 +141,4 @@
 
 #: Ubuntu/Components/ToolbarItems.qml:142
 msgid "Back"
-msgstr ""
+msgstr "Anterior"

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2014-11-29 06:47:10 +0000
+++ po/pt_BR.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ro.po'
--- po/ro.po	2014-11-29 06:47:10 +0000
+++ po/ro.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/ru.po'
--- po/ru.po	2014-11-29 06:47:10 +0000
+++ po/ru.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/sq.po'
--- po/sq.po	2014-11-29 06:47:10 +0000
+++ po/sq.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:46+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/sr.po'
--- po/sr.po	2014-11-29 06:47:10 +0000
+++ po/sr.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/sv.po'
--- po/sv.po	2014-11-29 06:47:10 +0000
+++ po/sv.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/tr.po'
--- po/tr.po	2014-11-29 06:47:10 +0000
+++ po/tr.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"
@@ -26,7 +26,8 @@
 msgid ""
 "property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" "
 "of type %5"
-msgstr "%2 nesnesinin %1 niteliği %3 tür, %4 veya %5 olarak ayarlanamaz."
+msgstr ""
+"%2 nesnesinin %1 niteliği %3 tipindedir, %4 veya %5 olarak ayarlanamaz."
 
 #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:185
 #, qt-format
@@ -89,23 +90,23 @@
 
 #: Ubuntu/Components/plugin/uctheme.cpp:233
 msgid "Theme not found: "
-msgstr ""
+msgstr "Tema bulunamadı: "
 
 #: Ubuntu/Components/Popups/ComposerSheet.qml:80
 msgid "Cancel"
-msgstr ""
+msgstr "İptal"
 
 #: Ubuntu/Components/Popups/ComposerSheet.qml:90
 msgid "Confirm"
-msgstr ""
+msgstr "Doğrula"
 
 #: Ubuntu/Components/Popups/DefaultSheet.qml:89
 msgid "Close"
-msgstr ""
+msgstr "Kapat"
 
 #: Ubuntu/Components/Popups/DefaultSheet.qml:99
 msgid "Done"
-msgstr ""
+msgstr "Bitti"
 
 #: Ubuntu/Components/TextInputPopover.qml:27
 msgid "Select All"
@@ -125,15 +126,15 @@
 
 #: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57
 msgid "In Progress"
-msgstr ""
+msgstr "Devam Ediyor"
 
 #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
 msgid "Release to refresh..."
-msgstr ""
+msgstr "Yenilemek için bırakın..."
 
 #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
 msgid "Pull to refresh..."
-msgstr ""
+msgstr "Yenilemek için çekin..."
 
 #: Ubuntu/Components/ToolbarItems.qml:142
 msgid "Back"

=== modified file 'po/ug.po'
--- po/ug.po	2014-11-29 06:47:10 +0000
+++ po/ug.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"
@@ -43,7 +43,7 @@
 #: Ubuntu/Components/plugin/ucalarm.cpp:684
 #: Ubuntu/Components/plugin/ucalarm.cpp:716
 msgid "Alarm has a pending operation."
-msgstr ""
+msgstr "قوڭغۇراق توڭلىتىلغان ھالەتتە."
 
 #: Ubuntu/Components/plugin/ucarguments.cpp:188
 msgid "Usage: "

=== modified file 'po/uk.po'
--- po/uk.po	2014-11-29 06:47:10 +0000
+++ po/uk.po	2015-01-13 21:31:53 +0000
@@ -14,12 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"
-msgstr ""
+msgstr "Вилучити"
 
 #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176
 #, qt-format
@@ -146,4 +146,4 @@
 
 #: Ubuntu/Components/ToolbarItems.qml:142
 msgid "Back"
-msgstr ""
+msgstr "Назад"

=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2014-11-29 06:47:10 +0000
+++ po/zh_CN.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2014-11-29 06:47:10 +0000
+++ po/zh_TW.po	2015-01-13 21:31:53 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-11-29 06:47+0000\n"
-"X-Generator: Launchpad (build 17267)\n"
+"X-Launchpad-Export-Date: 2014-12-25 06:12+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #: Ubuntu/Components/ListItems/Empty.qml:413
 msgid "Delete"

=== modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2014-12-17 11:46:03 +0000
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2015-01-13 21:31:53 +0000
@@ -27,7 +27,6 @@
     'get_keyboard',
     'get_pointing_device',
     'Header',
-    'Dialog',
     'listitems',
     'UCListItem',
     'MainView',
@@ -64,7 +63,6 @@
     get_keyboard,
     get_pointing_device,
     Header,
-    Dialog,
     listitems,
     UCListItem,
     MainView,

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-12-17 11:46:03 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2015-01-13 21:31:53 +0000
@@ -24,7 +24,6 @@
     'get_keyboard',
     'get_pointing_device',
     'Header',
-    'Dialog',
     'listitems',
     'UCListItem',
     'MainView',
@@ -57,11 +56,6 @@
     AppHeader,
     Header,
 )
-
-from ubuntuuitoolkit._custom_proxy_objects.popups import (
-    Dialog
-)
-
 from ubuntuuitoolkit._custom_proxy_objects import listitems
 from ubuntuuitoolkit._custom_proxy_objects._uclistitem import (
     UCListItem

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_uclistitem.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_uclistitem.py	2015-01-07 06:42:09 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_uclistitem.py	2015-01-13 21:31:53 +0000
@@ -18,6 +18,7 @@
 
 from autopilot import logging as autopilot_logging
 from ubuntuuitoolkit._custom_proxy_objects import _common
+import time
 
 
 logger = logging.getLogger(__name__)
@@ -41,8 +42,8 @@
                 'No {0} panel found in a ListItem'.format(panel_item))
         start_y = stop_y = y + (height // 2)
         self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
-        # wait till animation finishes
-        self.contentMoving.wait_for(False)
+        # wait 1 second to finish animation
+        time.sleep(1)
 
     def _click_on_panel_action(self, panel_item, action_object, wait_function):
         self._swipe_in_panel(panel_item)
@@ -56,8 +57,11 @@
 
         self.pointing_device.click_object(action_button)
         if wait_function is None:
-            # wait till animation finishes
-            self.contentMoving.wait_for(False)
+            # wait for the animation to finish
+            contentItem = self.select_single(objectName='ListItemHolder')
+            while contentItem.x != 0.0:
+                contentItem.x.wait_for(0)
+                time.sleep(1)
         else:
             wait_function()
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2014-12-18 12:48:05 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2015-01-13 21:31:53 +0000
@@ -25,10 +25,6 @@
 logger = logging.getLogger(__name__)
 
 
-class Dialog(_common.UbuntuUIToolkitCustomProxyObjectBase):
-    """Autopilot helper for the Dialog component."""
-
-
 class TextInputPopover(_common.UbuntuUIToolkitCustomProxyObjectBase):
     """TextInputPopover Autopilot emulator ."""
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-12-17 11:46:03 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2015-01-13 21:31:53 +0000
@@ -39,7 +39,6 @@
     'Empty',
     'UCListItem',
     'Header',
-    'Dialog',
     'ItemSelector',
     'MainView',
     'MultiValue',
@@ -65,7 +64,6 @@
     get_pointing_device,
     CheckBox,
     Header,
-    Dialog,
     UCListItem,
     MainView,
     OptionSelector,

=== removed file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.DialogTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.DialogTestCase.qml	2014-12-17 11:46:03 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.DialogTestCase.qml	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 0.1
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    automaticOrientation: true
-    Page {
-        Component {
-            id: dialog
-            Dialog {
-                id: dialogue
-                title: "Dialog"
-                text: "Simple dialog with text area and three stacked button"
-                Column {
-                    id: row
-                    width: parent.width
-                    spacing: units.gu(1)
-                    TextArea {
-                        height: parent.height/2
-                        objectName: "textfield_standard"
-                        placeholderText: i18n.tr("Type me in...")
-                        width: parent.width
-                    }
-                    Button {
-                        width: parent.width
-                        text: "Bellow TextField"
-                        color: UbuntuColors.green
-                        onClicked: PopupUtils.close(dialogue)
-                    }
-                    Button {
-                        width: parent.width
-                        text: "Middle button"
-                        onClicked: PopupUtils.close(dialogue)
-                    }
-                    Button {
-                        width: parent.width
-                        text: "Lower button"
-                        onClicked: PopupUtils.close(dialogue)
-                    }
-                }
-            }
-        }
-        Button {
-            objectName: "button"
-            anchors.centerIn: parent
-            text: i18n.tr("Open dialog")
-            onClicked: PopupUtils.open(dialog, null)
-        }
-    }
-}
-

=== removed file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py	2014-12-17 12:11:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2013, 2014 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from ubuntuuitoolkit import tests
-
-
-class DialogTestCase(tests.QMLFileAppTestCase):
-    path = os.path.abspath(__file__)
-    dir_path = os.path.dirname(path)
-    test_qml_file_path = os.path.join(
-        dir_path, 'test_dialog.DialogTestCase.qml')
-
-    def setUp(self):
-        super(DialogTestCase, self).setUp()
-
-    def test_dialog(self):
-        open_button = self.main_view.wait_select_single('Button',
-                                                        objectName='button')
-        self.pointing_device.click_object(open_button)
-        dialog = self.main_view.wait_select_single('Dialog',
-                                                   title="Dialog")
-        text_area = dialog.wait_select_single('TextArea',
-                                              objectName='textfield_standard')
-        text_area.write('test')
-        self.assertEqual(text_area.text, 'test')
-        lower_button = dialog.wait_select_single('Button',
-                                                 text='Lower button')
-        self.pointing_device.click_object(lower_button)

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2014-12-04 13:23:18 +0000
+++ tests/resources/listitems/ListItemTest.qml	2015-01-13 21:31:53 +0000
@@ -123,14 +123,6 @@
         }
         ListItem {
             Label {
-                id: label
-                text: "No action"
-            }
-            onClicked: print(label.text, "clicked")
-        }
-
-        ListItem {
-            Label {
                 anchors.fill: parent
                 text: "Another standalone ListItem"
             }
@@ -155,7 +147,6 @@
                 Label {
                     text: modelData + " item"
                 }
-
                 states: State {
                     name: "override"
                     when: main.override

=== modified file 'tests/uitk_test_plan.sh'
--- tests/uitk_test_plan.sh	2015-01-08 06:21:28 +0000
+++ tests/uitk_test_plan.sh	2015-01-13 21:31:53 +0000
@@ -33,7 +33,7 @@
 PASSWORD="0000"
 BOOTTIME=500
 ONLYCOMPARE=false
-
+    
 declare -a TEST_SUITE=(
     " -p ubuntu-ui-toolkit-autopilot ubuntuuitoolkit"
     " -p webbrowser-app-autopilot webbrowser_app"
@@ -41,11 +41,11 @@
     " sudoku_app"
     " online_accounts_ui"
     " ubuntu_calculator_app"
-#    " -p messaging-app-autopilot messaging_app"
+    " -p messaging-app-autopilot messaging_app"
     " -p mediaplayer-app-autopilot mediaplayer_app"
     " dropping_letters_app"
     " -p dialer-app-autopilot dialer_app"
-    " -p reminders-app-autopilot reminders"
+# hangs    " -p reminders-app-autopilot reminders"
     " shorts_app"
     " ubuntu_weather_app"
     " -p ubuntu-system-settings-autopilot ubuntu_system_settings"
@@ -71,17 +71,16 @@
              gallery-app-autopilot \
              reminders-app-autopilot \
              address-book-app-autopilot \
-#             messaging-app-autopilot \
-             unity8-autopilot \
+             messaging-app-autopilot \
              dialer-app-autopilot \
              camera-app-autopilot \
              webbrowser-app-autopilot \
              mediaplayer-app-autopilot \
+             unity8-autopilot \
              unity-webapps-qml-autopilot \
              ubuntu-system-settings-autopilot\
              ubuntu-html5-ui-toolkit-autopilot \
              ubuntu-system-settings-online-accounts-autopilot"
-#             messaging-app-autopilot \
 
 sleep_indicator () {
     if [ -z "$1" ]; then
@@ -149,8 +148,8 @@
     # flash the latest image
     echo -e "Flashing \e[31m${CHANNEL}\e[0m"
 
-#    ubuntu-device-flash --serial=${SERIALNUMBER} --channel=${CHANNEL} --revision=${REVISION} --wipe --bootstrap --developer-mode --password=${PASSWORD} 
-    ubuntu-device-flash touch --serial=${SERIALNUMBER} --channel=${CHANNEL} --wipe --developer-mode --password=${PASSWORD} 
+#    ubuntu-device-flash --serial=${SERIALNUMBER} --channel=${CHANNEL} --revision=${REVISION} --wipe --developer-mode --password=${PASSWORD} 
+    ubuntu-device-flash --serial=${SERIALNUMBER} --channel=${CHANNEL} --wipe --developer-mode --password=${PASSWORD} 
 
     sleep_indicator ${BOOTTIME}
     echo -e "Disable the intro wizard"
@@ -339,9 +338,6 @@
     device_comission
 fi
 
-# Fix the PPA string as it is used in log file names
-PPA=${PPA/\//_}
-
 # Check if the job is only comissioning the device
 if [ ${DONOTRUNTESTS} != true ]; then
     # Reset the device for testing

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2014-12-19 06:32:11 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2015-01-13 21:31:53 +0000
@@ -72,13 +72,6 @@
             width: parent.width
         }
         ListItem {
-            id: highlightTest
-        }
-        ListItem {
-            id: clickedConnected
-            onClicked: {}
-        }
-        ListItem {
             id: testItem
             width: parent.width
             color: "blue"
@@ -89,15 +82,6 @@
                 anchors.fill: parent
             }
         }
-        ListItem {
-            id: controlItem
-            Button {
-                id: button
-                objectName: "button_in_list"
-                anchors.centerIn: parent
-                text: "Button"
-            }
-        }
         ListView {
             id: listView
             width: parent.width
@@ -124,8 +108,8 @@
         }
 
         SignalSpy {
-            id: highlightedSpy
-            signalName: "highlightedChanged"
+            id: pressedSpy
+            signalName: "pressedChanged"
             target: testItem
         }
 
@@ -170,7 +154,7 @@
 
         function cleanup() {
             movingSpy.clear();
-            highlightedSpy.clear();
+            pressedSpy.clear();
             clickSpy.clear();
             actionSpy.clear();
             interactiveSpy.clear();
@@ -189,7 +173,7 @@
             verify(defaults.contentItem !== null, "Defaults is null");
             compare(defaults.color, "#000000", "Transparent by default");
             compare(defaults.highlightColor, Theme.palette.selected.background, "Theme.palette.selected.background color by default")
-            compare(defaults.highlighted, false, "Not highlighted by default");
+            compare(defaults.pressed, false, "Not pressed buy default");
             compare(defaults.swipeOvershoot, 0.0, "No overshoot till the style is loaded!");
             compare(defaults.divider.visible, true, "divider is visible by default");
             compare(defaults.divider.leftMargin, units.dp(2), "divider's left margin is 2GU");
@@ -210,16 +194,14 @@
             compare(bodyItem.parent, testItem.contentItem, "Content is not in the right holder!");
         }
 
-        function test_highlightedChanged_on_click() {
-            highlightedSpy.target = testItem;
+        function test_pressedChanged_on_click() {
             mousePress(testItem, testItem.width / 2, testItem.height / 2);
-            highlightedSpy.wait();
+            pressedSpy.wait();
             mouseRelease(testItem, testItem.width / 2, testItem.height / 2);
         }
-        function test_highlightedChanged_on_tap() {
-            highlightedSpy.target = testItem;
+        function test_pressedChanged_on_tap() {
             TestExtras.touchPress(0, testItem, centerOf(testItem));
-            highlightedSpy.wait();
+            pressedSpy.wait();
             TestExtras.touchRelease(0, testItem, centerOf(testItem));
             // local cleanup, wait few msecs to suppress double tap
             wait(400);
@@ -239,14 +221,14 @@
             verify(listItem, "Cannot find listItem0");
 
             mousePress(listItem, listItem.width / 2, 0);
-            compare(listItem.highlighted, true, "Item is not highlighted?");
+            compare(listItem.pressed, true, "Item is not pressed?");
             // do 5 moves to be able to sense it
             var dy = 0;
             for (var i = 1; i <= 5; i++) {
                 dy += i * 10;
                 mouseMove(listItem, listItem.width / 2, dy);
             }
-            compare(listItem.highlighted, false, "Item is highlighted still!");
+            compare(listItem.pressed, false, "Item is pressed still!");
             mouseRelease(listItem, listItem.width / 2, dy);
             // dismiss
             rebound(listItem);
@@ -256,14 +238,14 @@
             verify(listItem, "Cannot find listItem0");
 
             TestExtras.touchPress(0, listItem, Qt.point(listItem.width / 2, 5));
-            compare(listItem.highlighted, true, "Item is not highlighted?");
+            compare(listItem.pressed, true, "Item is not pressed?");
             // do 5 moves to be able to sense it
             var dy = 0;
             for (var i = 1; i <= 5; i++) {
                 dy += i * 10;
                 TestExtras.touchMove(0, listItem, Qt.point(listItem.width / 2, dy));
             }
-            compare(listItem.highlighted, false, "Item is highlighted still!");
+            compare(listItem.pressed, false, "Item is pressed still!");
             // cleanup, wait few milliseconds to avoid dbl-click collision
             TestExtras.touchRelease(0, listItem, Qt.point(listItem.width / 2, dy));
             // dismiss
@@ -552,8 +534,8 @@
             var item2 = findChild(listView, "listItem2");
             var item3 = findChild(listView, "listItem3");
             return [
-                // testItem is the child item @index 3 in the topmost Column.
-                {tag: "Standalone item, child index 3", item: testItem, result: 3},
+                // testItem is the child item @index 1 in the topmost Column.
+                {tag: "Standalone item, child index 1", item: testItem, result: 1},
                 {tag: "ListView, item index 0", item: item0, result: 0},
                 {tag: "ListView, item index 1", item: item1, result: 1},
                 {tag: "ListView, item index 2", item: item2, result: 2},
@@ -584,24 +566,5 @@
             var param = actionSpy.signalArguments[0];
             compare(param[0], data.result, "Action parameter differs");
         }
-
-        function test_highlight_data() {
-            return [
-                {tag: "No actions", item: highlightTest, x: centerOf(highlightTest).x, y: centerOf(highlightTest).y, pressed: false},
-                {tag: "Leading/trailing actions", item: testItem, x: centerOf(testItem).x, y: centerOf(testItem).y, pressed: true},
-                {tag: "Active component content", item: controlItem, x: units.gu(1), y: units.gu(1), pressed: true},
-                {tag: "Center of active component content", item: controlItem, x: centerOf(controlItem).x, y: centerOf(controlItem).y, pressed: false},
-                {tag: "clicked() connected", item: clickedConnected, x: centerOf(clickedConnected).x, y: centerOf(clickedConnected).y, pressed: true},
-            ];
-        }
-        function test_highlight(data) {
-            highlightedSpy.target = data.item;
-            mouseClick(data.item, data.x, data.y);
-            if (data.pressed) {
-                highlightedSpy.wait();
-            } else {
-                compare(highlightedSpy.count, 0, "Should not be highlighted!");
-            }
-        }
     }
 }