Merge lp:~sergiusens/ubuntu-clock-app/reboot-packaging into lp:ubuntu-clock-app/saucy

[Sergio Schvezov]

[lp:~sergiusens/ubuntu-clock-app/reboot-packaging]

84. By Sergio Schvezov on 2014-08-12

Don't install tests into click package

Unmerged revisions

84. By Sergio Schvezov on 2014-08-12

Don't install tests into click package

83. By Sergio Schvezov on 2014-08-12

Provision version and branch to x-source and version in the manifest

82. By Sergio Schvezov on 2014-08-12

Make it easy for us and let ubuntu-app-lauch use the expected import path

81. By Sergio Schvezov on 2014-08-12

Install apparmor manifest where manifest.json points to

80. By Sergio Schvezov on 2014-08-12

adding x-source to manifest for ci

79. By Nekhelesh Ramananthan on 2014-08-12

Merged trunk

78. By Nicholas Skaggs on 2014-08-12

fix pep8

77. By Nicholas Skaggs on 2014-08-12

remove find local path

76. By Daniel Holbach on 2014-08-11

remove 'builddir' portion from system-installed paths

75. By Daniel Holbach on 2014-08-11

merged lp:~nskaggs/ubuntu-clock-app/fix-ap-setup - resolve conflicts

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-08-12 22:08:22 +0000
@@ -0,0 +1,2 @@
+*.user
+builddir

=== renamed file '.bzrignore' => '.bzrignore.moved'
=== renamed file '.bzrignore.moved' => '.bzrignore.moved.moved'
=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2014-08-12 22:08:22 +0000
@@ -0,0 +1,82 @@
+project(com.ubuntu.clock.devel C CXX)
+cmake_minimum_required(VERSION 2.8.9)
+
+set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
+
+find_package(Qt5Core)
+find_package(Qt5Qml)
+find_package(Qt5Quick)
+find_package(Qt5DBus)
+#find_package(ubuntu-sdk-libs)
+
+#automatically create moc files
+set(CMAKE_AUTOMOC ON)
+
+option(INSTALL_TESTS "Install the tests on make install" on)
+option(CLICK_MODE "Build as a click package" on)
+
+set(APP_NAME                clock)
+set(APP_HARDCODE            ubuntu-clock-app)
+set(MAIN_QML                ${APP_HARDCODE}.qml)
+set(ICON                    clock-app)
+SET(AUTOPILOT_DIR           ubuntu_clock_app)
+
+# Standard install paths 
+include(GNUInstallDirs) 
+
+#set install paths
+if(CLICK_MODE)
+  set(CMAKE_INSTALL_PREFIX "/")
+  set(UBUNTU-CLOCK_APP_DIR    "${CMAKE_INSTALL_DATADIR}/qml")
+
+  set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
+  set(EXEC "qmlscene $@ ${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
+  set(MODULE_PATH ${QT_IMPORTS_DIR})
+  if(NOT BZR_REVNO)
+    execute_process( 
+      COMMAND bzr revno
+              OUTPUT_VARIABLE BZR_REVNO 
+              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+              OUTPUT_STRIP_TRAILING_WHITESPACE 
+      )
+  endif(NOT BZR_REVNO)
+  if(NOT BZR_SOURCE)
+    set(BZR_SOURCE lp:ubuntu-clock-app)
+  endif(NOT BZR_SOURCE)
+else(CLICK_MODE)
+  set(UBUNTU-CLOCK_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-clock-app")
+  execute_process( 
+    COMMAND qmake -query QT_INSTALL_QML 
+            OUTPUT_VARIABLE QT_IMPORTS_DIR 
+            OUTPUT_STRIP_TRAILING_WHITESPACE 
+    )
+set(MODULE_PATH ${QT_IMPORTS_DIR}/ClockApp)
+endif(CLICK_MODE)
+
+if(${CLICK_MODE})
+  configure_file(manifest.json manifest.json)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(FILES "${APP_HARDCODE}.json" DESTINATION ${CMAKE_INSTALL_PREFIX})
+else(CLICK_MODE)
+  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
+endif()
+
+add_subdirectory(app)
+add_subdirectory(backend)
+add_subdirectory(tests)
+
+add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/tests/autopilot/run
+                    COMMAND ${CMAKE_SOURCE_DIR}/tests/autopilot/run
+                    DEPENDS timezone timezone-qmldir alarmsettings alarmsettings-qmldir datetime datetime-qmldir
+                    WORKING_DIRECTORY ./app)
+
+enable_testing()
+add_test(NAME basic
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/app
+  COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/tests/unit -import ${CMAKE_BINARY_DIR}/backend
+)
+
+add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/ubuntu-clock-app.qml
+                    DEPENDS timezone timezone-qmldir alarmsettings alarmsettings-qmldir datetime datetime-qmldir
+                    WORKING_DIRECTORY ./app)

=== renamed file 'CMakeLists.txt' => 'CMakeLists.txt.moved'
=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2014-08-12 22:08:22 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

=== renamed file 'COPYING' => 'COPYING.moved'
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2014-08-12 22:08:22 +0000
@@ -0,0 +1,9 @@
+Ubuntu Clock App is the official clock app for Ubuntu Touch.
+
+Here are some useful links with regards to the Clock App development.
+
+Clock App Wiki - https://wiki.ubuntu.com/Touch/CoreApps/Clock
+Designs        - https://drive.google.com/#folders/0B55Gs35e-jxxNzRzOHVxbmNDbFU
+Trello Board   - https://trello.com/b/Ie2rAS3W/core-apps-management
+Project page   - https://launchpad.net/ubuntu-clock-app
+

=== added file 'README.autopilot'
--- README.autopilot	1970-01-01 00:00:00 +0000
+++ README.autopilot	2014-08-12 22:08:22 +0000
@@ -0,0 +1,45 @@
+# Running Autopilot tests
+
+Ubuntu Clock App follows a test driven development where autopilot tests are run before every merge into trunk. If you are submitting your bugfix/patch to the clock app, please follow the following steps below to ensure that all tests pass before proposing a merge request.
+
+If you are looking for more info about Autopilot or writing AP tests for the clock app, here are some useful links to help you,
+
+- http://developer.ubuntu.com/api/devel/ubuntu-14.10/python/autopilot/
+- http://developer.ubuntu.com/api/devel/ubuntu-14.10/python/autopilot-emulator/
+
+## Prerequisites
+
+Install the following autopilot packages required to run the tests,
+$ sudo apt-get install python-autopilot libautopilot-qt ubuntu-ui-toolkit-autopilot python3-autopilot-vis
+
+
+#### Running tests on the desktop
+
+Using terminal:
+
+1.  Branch the clock app code,
+    $ bzr branch lp:ubuntu-clock-app/reboot
+
+2.  Navigate to the tests/autopilot directory.
+    $ cd ubuntu-clock-app/reboot/tests/autopilot
+
+3.  run all tests.
+    $ autopilot3 run -vv ubuntu_clock_app
+
+    to list all tests:
+    $ autopilot3 list ubuntu_clock_app
+
+    To run only one test (for instance: test_add_single_type_alarm_must_add_to_alarm_list in TestAlarm.py):
+    $ autopilot3 run -vv ubuntu_clock_app.tests.test_alarm.TestAlarm.test_add_single_type_alarm_must_add_to_alarm_list
+
+    Debugging tests using autopilot vis
+    $ autopilot3 launch -i Qt qmlscene ../../app/ubuntu-clock-app.qml  -I ../../builddir/backend/
+    $ autopilot3 vis
+
+
+#### Running tests on device or emulator:
+
+Using autopkg:
+
+1. navigate to the directory where the ubuntu-clock-app branch is and run:
+  $ adt-run ubuntu-clock-app --click=com.ubuntu.clock.devel --- ssh -s adb

=== added file 'README.developers'
--- README.developers	1970-01-01 00:00:00 +0000
+++ README.developers	2014-08-12 22:08:22 +0000
@@ -0,0 +1,28 @@
+Building and running on Utopic Desktop (14.10)
+==============================================
+
+1. Branch the code as usual and navigate to it.
+	bzr branch lp:ubuntu-clock-app/reboot && cd reboot
+2. Create a build dir and navigate to it.
+	mkdir builddir && cd builddir
+3. Build the clock app
+	cmake .. && make
+4. Run the clock app
+	QML2_IMPORT_PATH=backend/ qmlscene ../app/ubuntu-clock-app.qml
+
+Code Style
+==========
+
+We are trying to use a common code style throughout the code base to maintain
+uniformity and improve code clarity. Listed below are the code styles guides
+that will be followed based on the language used.
+
+QML        - http://qt-project.org/doc/qt-5/qml-codingconventions.html 
+JS, C++    - https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
+Python     - Code should follow PEP8 and Flake regulations
+
+Note: In the QML code convention, ignore the Javascript code section guidelines.
+So the sections that should be taken into account in the QML conventions are QML 
+Object Declarations, Grouped Properties and Lists.
+
+

=== renamed file 'README' => 'README.moved'
=== added directory 'app'
=== added file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/CMakeLists.txt	2014-08-12 22:08:22 +0000
@@ -0,0 +1,24 @@
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+add_custom_target(ubuntu-clock-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+
+if(CLICK_MODE)
+  set(ICON "${ICON}@30.png")
+  install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)
+
+# substitute variables in the desktop file
+set(DESKTOP_FILE "ubuntu-clock-app.desktop")
+configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} 
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-CLOCK_APP_DIR})
+
+add_subdirectory(clock)
+add_subdirectory(alarm)
+add_subdirectory(graphics)
+add_subdirectory(components)
+add_subdirectory(worldclock)
+add_subdirectory(upstreamcomponents)

=== added directory 'app/alarm'
=== added file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/AlarmDelegate.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "../upstreamcomponents"
+
+ListItemWithActions {
+    id: root
+
+    width: parent ? parent.width : 0
+    height: units.gu(6)
+    color: "Transparent"
+    selectedColor: "Transparent"
+
+    Label {
+        id: alarmTime
+        objectName: "listAlarmTime" + index
+
+        anchors {
+            top: alarmDetailsColumn.top
+            left: parent.left
+        }
+
+        fontSize: "medium"
+        text: Qt.formatTime(date)
+    }
+
+    Column {
+        id: alarmDetailsColumn
+
+        anchors {
+            left: alarmTime.right
+            right: alarmStatus.left
+            verticalCenter: parent.verticalCenter
+            margins: units.gu(1)
+        }
+
+        Label {
+            id: alarmLabel
+            objectName: "listAlarmLabel" + index
+
+            text: message
+            fontSize: "medium"
+            width: parent.width
+            elide: Text.ElideRight
+            color: UbuntuColors.midAubergine
+        }
+
+        Label {
+            id: alarmSubtitle
+            objectName: "listAlarmSubtitle" + index
+
+            fontSize: "xx-small"
+            width: parent.width
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+            text: alarmUtils.format_day_string(daysOfWeek)
+        }
+    }
+
+    Switch {
+        id: alarmStatus
+        objectName: "listAlarmStatus" + index
+
+        anchors {
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+
+        checked: enabled
+
+        /*
+             #TODO: Add the ability to enable/disable alarms using the
+             switch. At the moment it only shows the alarm status.
+             This was postponed since a similar implementation in the
+             old clock app caused it to loop. So if user clicks on the
+             switch, it disables and then re-enables the alarm again.
+            */
+    }
+}

=== added file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/AlarmLabel.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Page {
+    id: _alarmLabelPage
+    objectName: "alarmLabelPage"
+
+    visible: false
+    title: i18n.tr("Label")
+
+    // Property to set the alarm label in the edit alarm page
+    property var alarm
+
+    Column {
+        id: _labelColumn
+
+        spacing: units.gu(0.5)
+
+        anchors {
+            fill: parent
+            margins: units.gu(2)
+        }
+
+        Label {
+            text: i18n.tr("Label")
+        }
+
+        TextField {
+            id: _labelEntry
+            objectName: "labelEntry"
+            text: alarm.message
+            width: parent.width
+        }
+    }
+
+    tools: ToolbarItems {
+        back: Button {
+            action: Action {
+                iconName: "back"
+                onTriggered: {
+                    alarm.message = _labelEntry.text
+                    mainStack.pop()
+                }
+            }
+        }
+    }
+}

=== added file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/AlarmList.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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.ListItems 1.0 as ListItem
+import "../components"
+import "../upstreamcomponents"
+import "../components/Utils.js" as Utils
+
+MultipleSelectionListView {
+    id: alarmListView
+    objectName: "alarmListView"
+
+    property var _currentSwipedItem: null
+
+    function _updateSwipeState(item)
+    {
+        if (item.swipping) {
+            return
+        }
+
+        if (item.swipeState !== "Normal") {
+            if (alarmListView._currentSwipedItem !== item) {
+                if (alarmListView._currentSwipedItem) {
+                    alarmListView._currentSwipedItem.resetSwipe()
+                }
+                alarmListView._currentSwipedItem = item
+            }
+        } else if (item.swipeState !== "Normal"
+                   && alarmListView._currentSwipedItem === item) {
+            alarmListView._currentSwipedItem = null
+        }
+    }
+
+    clip: true
+    anchors.fill: parent
+
+    AlarmUtils {
+        id: alarmUtils
+    }
+
+    listDelegate: AlarmDelegate {
+        id: alarmDelegate
+        objectName: "alarm" + index
+
+        property var removalAnimation
+
+        function remove() {
+            removalAnimation.start()
+        }
+
+        selectionMode: alarmListView.isInSelectionMode
+        selected: alarmListView.isSelected(alarmDelegate)
+
+        onSwippingChanged: {
+            _updateSwipeState(alarmDelegate)
+        }
+
+        onSwipeStateChanged: {
+            _updateSwipeState(alarmDelegate)
+        }
+
+        leftSideAction: Action {
+            iconName: "delete"
+            text: i18n.tr("Delete")
+            onTriggered: {
+                alarmDelegate.remove()
+            }
+        }
+
+        ListView.onRemove: ScriptAction {
+            script: {
+                if (_currentSwipedItem
+                        === alarmDelegate) {
+                    _currentSwipedItem = null
+                }
+            }
+        }
+
+        removalAnimation: SequentialAnimation {
+            alwaysRunToEnd: true
+
+            PropertyAction {
+                target: alarmDelegate
+                property: "ListView.delayRemove"
+                value: true
+            }
+
+            UbuntuNumberAnimation {
+                target: alarmDelegate
+                property: "height"
+                to: 0
+            }
+
+            PropertyAction {
+                target: alarmDelegate
+                property: "ListView.delayRemove"
+                value: false
+            }
+
+            ScriptAction {
+                script: {
+                    var alarm = alarmModel.get(index)
+                    alarm.cancel()
+                }
+            }
+        }
+
+        onItemClicked: {
+            if(alarmListView.isInSelectionMode) {
+                if(!alarmListView.selectItem(alarmDelegate)) {
+                    alarmListView.deselectItem(alarmDelegate)
+                }
+                return
+            }
+
+            else {
+                mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"),
+                               {"isNewAlarm": false, "alarmIndex": index})
+            }
+        }
+
+        onItemPressAndHold: {
+            if (!alarmListView.isInSelectionMode) {
+                alarmListView.startSelection()
+                alarmListView.selectItem(alarmDelegate)
+            }
+        }
+    }
+}
+

=== added file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/AlarmPage.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "../components/Utils.js" as Utils
+
+Page {
+    id: alarmPage
+
+    title: i18n.tr("Alarms")
+    objectName: 'AlarmPage'
+
+    Component.onCompleted: Utils.log(debugMode, "Alarm Page loaded")
+
+    flickable: null
+
+    states: [
+        PageHeadState {
+            name: "default"
+            head: alarmPage.head
+            when: !alarmListView.isInSelectionMode
+            actions: [
+                Action {
+                    objectName: "addAlarmAction"
+                    iconName: "add"
+                    text: i18n.tr("Alarm")
+                    onTriggered: {
+                        mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
+                    }
+                }
+            ]
+        },
+
+        PageHeadState {
+            name: "selection"
+            head: alarmPage.head
+            when: alarmListView.isInSelectionMode
+            backAction: Action {
+                text: i18n.tr("Cancel selection")
+                iconName: "close"
+                onTriggered: {
+                    alarmListView.cancelSelection()
+                }
+            }
+
+            actions: [
+                Action {
+                    text: i18n.tr("Select All")
+                    iconName: "select"
+                    onTriggered: {
+                        if(alarmListView.selectedItems.count
+                                === alarmListView.count) {
+                            alarmListView.clearSelection()
+                        }
+                        else {
+                            alarmListView.selectAll()
+                        }
+                    }
+                },
+
+                Action {
+                    text: i18n.tr("Delete")
+                    iconName: "delete"
+                    onTriggered: {
+                        var items = alarmListView.selectedItems
+
+                        for(var i=0; i < items.count; i++) {
+                            var alarm = alarmModel.get(items.get(i).itemsIndex)
+                            alarm.cancel()
+                        }
+
+                        alarmListView.endSelection()
+                    }
+                }
+            ]
+
+            contents: Label {
+                text: ""
+            }
+        }
+    ]
+
+    AlarmList{
+        id: alarmListView
+        listModel: alarmModel
+        anchors.fill: parent
+    }
+}

=== added file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/AlarmRepeat.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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.ListItems 1.0 as ListItem
+
+Page {
+    id: _alarmRepeatPage
+    objectName: "alarmRepeatPage"
+
+    visible: false
+    title: i18n.tr("Repeat")
+
+    // Property to set the alarm days of the week in the edit alarm page
+    property var alarm
+
+    ListModel {
+        id: daysModel
+
+        ListElement {
+            day: "1"
+            flag: Alarm.Monday
+        }
+
+        ListElement {
+            day: "2"
+            flag: Alarm.Tuesday
+        }
+
+        ListElement {
+            day: "3"
+            flag: Alarm.Wednesday
+        }
+
+        ListElement {
+            day: "4"
+            flag: Alarm.Thursday
+        }
+
+        ListElement {
+            day: "5"
+            flag: Alarm.Friday
+        }
+
+        ListElement {
+            day: "6"
+            flag: Alarm.Saturday
+        }
+
+        ListElement {
+            day: "0"
+            flag: Alarm.Sunday
+        }
+    }
+
+    Column {
+        id: _alarmDayColumn
+
+        anchors.fill: parent
+
+        Repeater {
+            id: _alarmDays
+            objectName: 'alarmDays'
+
+            model: daysModel
+
+            ListItem.Standard {
+                Label {
+                    id: _alarmDay
+                    objectName: 'alarmDay' + index
+
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        verticalCenter: parent.verticalCenter
+                    }
+
+                    color: UbuntuColors.midAubergine
+                    text: Qt.locale().standaloneDayName(day, Locale.LongFormat)
+                }
+
+                control: Switch {
+                    objectName: 'daySwitch' + index
+                    checked: (alarm.daysOfWeek & flag) == flag
+                    onCheckedChanged: {
+                        if (checked) {
+                            alarm.daysOfWeek |= flag
+                        }
+
+                        else {
+                            alarm.daysOfWeek &= ~flag
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/AlarmSettingsPage.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,231 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import DateTime 1.0
+import Alarm.Settings 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+import "../components"
+
+Page {
+    id: _alarmSettings
+
+    title: i18n.tr("Settings")
+    visible: false
+
+    Connections {
+        target: clockApp
+        onApplicationStateChanged: {
+            localTimeSource.update()
+        }
+    }
+
+    DateTime {
+        id: localTimeSource
+    }
+
+    AlarmSettings {
+        id: alarmSettings
+    }
+
+    ListModel {
+        id: durationModel
+        ListElement {
+            duration: 10
+        }
+
+        ListElement {
+            duration: 20
+        }
+
+        ListElement {
+            duration: 30
+        }
+
+        ListElement {
+            duration: 60
+        }
+
+        function title(index) {
+            if (title["text"] === undefined) {
+                title.text =
+                        [
+                            i18n.tr("%1 minutes").arg(10),
+                            i18n.tr("%1 minutes").arg(20),
+                            i18n.tr("%1 minutes").arg(30),
+                            i18n.tr("%1 minutes").arg(60)
+                        ]
+            }
+            return title.text[index]
+        }
+    }
+
+    Column {
+        id: _settingsColumn
+
+        anchors.fill: parent
+
+        ListItem.Base {
+            Column {
+                width: parent.width
+                height: childrenRect.height
+                anchors.verticalCenter: parent.verticalCenter
+
+                Label {
+                    color: UbuntuColors.midAubergine
+                    text: i18n.tr("Alarm volume")
+                }
+
+                Slider {
+                    id: _volumeSlider
+
+                    height: units.gu(2)
+                    width: parent.width
+
+                    minimumValue: 1
+                    maximumValue: 100
+                    value: alarmSettings.volume
+
+                    onValueChanged: {
+                        alarmSettings.volume = formatValue(value)
+                    }
+                }
+            }
+        }
+
+        ListItem.Expandable {
+            id: _alarmDuration
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: units.gu(-2)
+            }
+
+            collapseOnClick: true
+            expandedHeight: _contentColumn.height + units.gu(1)
+
+            Column {
+                id: _contentColumn
+                width: parent.width
+
+                Item {
+                    width: parent.width
+                    height: _alarmDuration.collapsedHeight
+
+                    SubtitledListItem {
+                        id: _header
+                        text: i18n.tr("Silence after")
+                        subText: i18n.tr("%1 minutes").arg(alarmSettings.duration)
+                        onClicked: _alarmDuration.expanded = true
+
+                        Icon {
+                            id: _upArrow
+
+                            width: units.gu(2)
+                            height: width
+                            anchors.right: parent.right
+                            anchors.verticalCenter: parent.verticalCenter
+
+                            name: "go-down"
+                            color: "Grey"
+                            rotation: _alarmDuration.expanded ? 180 : 0
+
+                            Behavior on rotation {
+                                UbuntuNumberAnimation {}
+                            }
+                        }
+                    }
+                }
+
+                ListView {
+                    id: _resultsList
+                    clip: true
+                    model: durationModel
+                    width: parent.width
+                    height: units.gu(24)
+                    delegate: ListItem.Standard {
+                        text: _resultsList.model.title(index)
+                        onClicked: {
+                            alarmSettings.duration = duration
+                            _alarmDuration.expanded = false
+                        }
+                    }
+                }
+            }
+        }
+
+        ListItem.Base {
+            Label {
+                text: i18n.tr("Vibration")
+                color: UbuntuColors.midAubergine
+                anchors.verticalCenter: parent.verticalCenter
+            }
+
+            Switch {
+                id: vibrateSwitch
+
+                anchors {
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                }
+
+                checked: alarmSettings.vibration === "pulse"
+                onCheckedChanged: {
+                    if(checked) {
+                        alarmSettings.vibration = "pulse"
+                    } else {
+                        alarmSettings.vibration = "none"
+                    }
+                }
+            }
+
+            onClicked: {
+                vibrateSwitch.checked = !vibrateSwitch.checked
+            }
+        }
+
+        SubtitledListItem {
+            text: i18n.tr("Change time and date")
+            subText: {
+                /*
+                  FIXME: When the upstream QT bug at
+                  https://bugreports.qt-project.org/browse/QTBUG-40275 is fixed
+                  it will be possible to receive a datetime object directly
+                  instead of using this hack.
+                */
+                var localTime = new Date
+                        (
+                            localTimeSource.localDateString.split(":")[0],
+                            localTimeSource.localDateString.split(":")[1]-1,
+                            localTimeSource.localDateString.split(":")[2],
+                            localTimeSource.localTimeString.split(":")[0],
+                            localTimeSource.localTimeString.split(":")[1],
+                            localTimeSource.localTimeString.split(":")[2],
+                            localTimeSource.localTimeString.split(":")[3]
+                        )
+                return localTime.toLocaleString()
+            }
+
+            onClicked: {
+                Qt.openUrlExternally("settings:///system/time-date")
+            }
+        }
+    }
+}

=== added file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/AlarmSound.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 Qt.labs.folderlistmodel 2.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Page {
+    id: _alarmSoundPage
+
+    title: i18n.tr("Sound")
+    flickable: _pageFlickable
+    visible: false
+
+    // Property to set the alarm sound in the edit alarm page
+    property var alarmSound
+
+    FolderListModel {
+        id: _soundModel
+        showDirs: false
+        nameFilters: [ "*.ogg", "*.mp3" ]
+        folder: "/usr/share/sounds/ubuntu/ringtones"
+    }
+
+    Flickable {
+        id: _pageFlickable
+
+        clip: true
+        anchors.fill: parent
+        contentHeight: _soundModel.count * units.gu(7)
+
+        Column {
+            id: _alarmSoundColumn
+
+            anchors.fill: parent
+
+            Repeater {
+                id: _alarmSounds
+                objectName: "alarmSounds"
+
+                model: _soundModel
+
+                ListItem.Base {
+                    id: _alarmSoundDelegate
+
+                    property alias isChecked: _soundStatus.checked
+
+                    height: units.gu(7)
+
+                    Label {
+                        id: _soundName
+                        objectName: "soundName" + index
+
+                        anchors {
+                            left: parent.left
+                            verticalCenter: parent.verticalCenter
+                        }
+
+                        color: UbuntuColors.midAubergine
+                        fontSize: "medium"
+                        text: fileBaseName
+                    }
+
+                    CheckBox {
+                        id: _soundStatus
+                        objectName: "soundStatus" + index
+
+                        anchors {
+                            right: parent.right
+                            verticalCenter: parent.verticalCenter
+                        }
+
+                        checked: alarmSound.subText === _soundName.text ? true :
+                                                                         false
+                        onClicked: {
+                            if (checked) {
+                                alarmSound.subText = _soundName.text
+
+                                // Ensures only one alarm sound is selected
+                                for(var i=0; i<_soundModel.count; i++) {
+                                    if(_alarmSounds.itemAt(i).isChecked &&
+                                            i !== index) {
+                                        _alarmSounds.itemAt(i).isChecked = false
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    tools: ToolbarItems {
+        back: Button {
+            action: Action {
+                iconName: "back"
+                onTriggered: {
+                    mainStack.pop()
+                }
+            }
+        }
+    }
+}

=== added file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/AlarmUtils.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+/*
+  Qt Object containing a collection of useful alarm functions
+*/
+QtObject {
+    id: alarmUtils
+
+    // Function to format the alarm days accordingly to their occurance
+    function format_day_string(value) {
+        var occurs = _get_day(value)
+
+        if (value === _get_weekdays()) {
+            return i18n.tr("Weekdays")
+        }
+
+        else if (value === _get_weekends()) {
+            return i18n.tr("Weekends")
+        }
+
+        else if (value === Alarm.Daily) {
+            return i18n.tr("Daily")
+        }
+
+        else {
+            return occurs
+        }
+    }
+
+    /*
+      INTERNAL FUNCTIONS
+    */
+
+    // Function to determine the locale's weekdays value
+    function _get_weekdays() {
+        var weekDays = 0
+        for (var i = 0; i < Qt.locale().weekDays.length; ++i) {
+            switch (Qt.locale().weekDays[i]) {
+            case Qt.Monday: {
+                weekDays |= Alarm.Monday
+                break
+            }
+
+            case Qt.Tuesday: {
+                weekDays |= Alarm.Tuesday
+                break
+            }
+
+            case Qt.Wednesday: {
+                weekDays |= Alarm.Wednesday
+                break
+            }
+
+            case Qt.Thursday: {
+                weekDays |= Alarm.Thursday
+                break
+            }
+
+            case Qt.Friday: {
+                weekDays |= Alarm.Friday
+                break
+            }
+
+            case Qt.Saturday: {
+                weekDays |= Alarm.Saturday
+                break
+            }
+
+            case Qt.Sunday: {
+                weekDays |= Alarm.Sunday
+                break
+            }
+            }
+        }
+        return weekDays
+    }
+
+    // Function to determine the locale's weekends value
+    function _get_weekends() {
+        return (Alarm.Daily - _get_weekdays())
+    }
+
+    // Function to retrieve the days of the week in the locale system
+    function _get_day(value) {
+        var occurs = []
+
+        if (value & Alarm.Monday) {
+            occurs.push(Qt.locale().standaloneDayName(1, Locale.LongFormat))
+        }
+
+        if (value & Alarm.Tuesday) {
+            occurs.push(Qt.locale().standaloneDayName(2, Locale.LongFormat))
+        }
+
+        if (value & Alarm.Wednesday) {
+            occurs.push(Qt.locale().standaloneDayName(3, Locale.LongFormat))
+        }
+
+        if (value & Alarm.Thursday) {
+            occurs.push(Qt.locale().standaloneDayName(4, Locale.LongFormat))
+        }
+
+        if (value & Alarm.Friday) {
+            occurs.push(Qt.locale().standaloneDayName(5, Locale.LongFormat))
+        }
+
+        if (value & Alarm.Saturday) {
+            occurs.push(Qt.locale().standaloneDayName(6, Locale.LongFormat))
+        }
+
+        if (value & Alarm.Sunday) {
+            occurs.push(Qt.locale().standaloneDayName(0, Locale.LongFormat))
+        }
+
+        occurs = occurs.join(', ');
+
+        return occurs;
+    }
+}

=== added file 'app/alarm/CMakeLists.txt'
--- app/alarm/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/alarm/CMakeLists.txt	2014-08-12 22:08:22 +0000
@@ -0,0 +1,6 @@
+file(GLOB ALARM_QML_JS_FILES *.qml *.js)
+
+# make the files visible in the qtcreator tree
+add_custom_target(ubuntu-clock-app_alarm_QMlFiles ALL SOURCES ${ALARM_QML_JS_FILES})
+
+install(FILES ${ALARM_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/alarm)

=== added file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/EditAlarmPage.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import DateTime 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Pickers 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
+import "../components"
+import "../components/Utils.js" as Utils
+
+Page {
+    id: _addAlarmPage
+    objectName: "AddAlarmPage"
+
+    // Property to determine if this is a new/saved alarm
+    property bool isNewAlarm: true
+
+    // Property to store the index of the alarm to be edited
+    property int alarmIndex
+
+    property var tempAlarm
+
+    title: isNewAlarm ? i18n.tr("New alarm") : i18n.tr("Edit alarm")
+    visible: false
+
+    head {
+        backAction: Action {
+            iconName: "close"
+            onTriggered: {
+                mainStack.pop()
+            }
+        }
+
+        actions: Action {
+            iconName: "ok"
+            objectName: "saveAlarmAction"
+            text: i18n.tr("Alarm")
+            onTriggered: {
+                if(isNewAlarm) {
+                    saveNewAlarm()
+                }
+                else {
+                    updateAlarm()
+                }
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        if(!isNewAlarm) {
+            readAlarm()
+        }
+    }
+
+    // Function to save a new alarm
+    function saveNewAlarm() {
+        var alarmTime = new Date()
+        alarmTime.setHours(_timePicker.hours, _timePicker.minutes, 0)
+
+        _alarm.message = _alarmLabel.subText
+        _alarm.date = alarmTime
+        _alarm.type = Alarm.Repeating
+        _alarm.enabled = true
+        _alarm.save()
+    }
+
+    // Function to read a saved alarm
+    function readAlarm() {
+        tempAlarm = alarmModel.get(alarmIndex)
+
+        _alarm.message = tempAlarm.message
+        _alarm.type = tempAlarm.type
+        _alarm.daysOfWeek = tempAlarm.daysOfWeek
+        _alarm.enabled = tempAlarm.enabled
+        _alarm.date = tempAlarm.date
+    }
+
+    // Function to delete a saved alarm
+    function deleteAlarm() {
+        tempAlarm = alarmModel.get(alarmIndex)
+        tempAlarm.cancel()
+
+        if(validateAlarm(tempAlarm)) {
+            mainStack.pop()
+        }
+    }
+
+    // Function to update a saved alarm
+    function updateAlarm() {
+        tempAlarm = alarmModel.get(alarmIndex)
+
+        var alarmTime = new Date()
+        alarmTime.setHours(_timePicker.hours, _timePicker.minutes, 0)
+
+        tempAlarm.message = _alarm.message
+        tempAlarm.date = alarmTime
+        tempAlarm.type = Alarm.Repeating
+        tempAlarm.enabled = _alarm.enabled
+
+        /*
+          #FIXME: Sometimes the clock app crashes due to this code. Cause not
+          known yet! This has been reported at http://pad.lv/1337405.
+        */
+        tempAlarm.daysOfWeek = _alarm.daysOfWeek
+
+        tempAlarm.save()
+
+        if(validateAlarm(tempAlarm)) {
+            mainStack.pop()
+        }
+    }
+
+    // Function to validate if the alarm was saved properly
+    function validateAlarm(alarmObject) {
+        if (alarmObject.error !== Alarm.NoError) {
+            Utils.log(debugMode, "Error saving alarm, code: " + alarmObject.error)
+            return false
+        }
+        else {
+            return true
+        }
+    }
+
+    Alarm {
+        id: _alarm
+        onStatusChanged: {
+            if (status !== Alarm.Ready)
+                return;
+            if ((operation > Alarm.NoOperation) &&
+                    (operation < Alarm.Reseting)) {
+                mainStack.pop();
+            }
+        }
+        onDaysOfWeekChanged: {
+            _alarmRepeat.subText = alarmUtils.format_day_string(_alarm.daysOfWeek)
+        }
+        onDateChanged: {
+            _timePicker.date = _alarm.date
+        }
+    }
+
+    AlarmUtils {
+        id: alarmUtils
+    }
+
+    Column {
+        id: _alarmColumn
+
+        width: parent.width
+        anchors.top: parent.top
+
+        DatePicker {
+            id: _timePicker
+
+            /*
+              #FIXME: DatePicker does not respect the user's locale. The bug
+              has been reported at http://pad.lv/1338138
+            */
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: units.gu(-2)
+            }
+
+            clip: true
+            mode: "Hours|Minutes"
+            date: {
+                if(isNewAlarm) {
+                    return new Date
+                            (
+                                currentTime.localDateString.split(":")[0],
+                                currentTime.localDateString.split(":")[1]-1,
+                                currentTime.localDateString.split(":")[2],
+                                currentTime.localTimeString.split(":")[0],
+                                Math.ceil(Math.abs(currentTime.localTimeString
+                                                   .split(":")[1]/5))*5,
+                                0,
+                                0
+                            )
+                }
+            }
+
+            DateTime {
+                id: currentTime
+                updateInterval: 0
+            }
+        }
+
+        SubtitledListItem {
+            id: _alarmRepeat
+            objectName: "alarmRepeat"
+
+            text: i18n.tr("Repeat")
+            subText: alarmUtils.format_day_string(_alarm.daysOfWeek)
+            onClicked: mainStack.push(Qt.resolvedUrl("AlarmRepeat.qml"),
+                                      {"alarm": _alarm})
+        }
+
+        SubtitledListItem {
+            id: _alarmLabel
+            objectName: "alarmLabel"
+
+            text: i18n.tr("Label")
+            subText: _alarm.message
+            onClicked: mainStack.push(Qt.resolvedUrl("AlarmLabel.qml"),
+                                      {"alarm": _alarm})
+        }
+
+        SubtitledListItem {
+            id: _alarmSound
+            objectName: "alarmSound"
+            /*
+              #TODO: Add support for choosing new alarm sound when indicator-
+              datetime supports custom alarm sounds
+            */
+            text: i18n.tr("Sound (disabled)")
+            subText: "Suru arpeggio"
+            onClicked: mainStack.push(Qt.resolvedUrl("AlarmSound.qml"),
+                                      {"alarmSound": _alarmSound})
+        }
+    }
+
+    Button {
+        id: _deleteAlarmButton
+
+        anchors {
+            top: _alarmColumn.bottom
+            topMargin: units.gu(3)
+            horizontalCenter: parent.horizontalCenter
+        }
+
+        width: units.gu(17)
+        height: units.gu(4)
+
+        visible: !isNewAlarm
+
+        color: "Red"
+        text: i18n.tr("Delete alarm")
+
+        onClicked: {
+            _addAlarmPage.deleteAlarm()
+        }
+    }
+}

=== added directory 'app/clock'
=== added file 'app/[e-mail]'
Binary files app/[e-mail]	1970-01-01 00:00:00 +0000 and app/[e-mail]	2014-08-12 22:08:22 +0000 differ
=== added file 'app/clock/CMakeLists.txt'
--- app/clock/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/clock/CMakeLists.txt	2014-08-12 22:08:22 +0000
@@ -0,0 +1,6 @@
+file(GLOB CLOCK_QML_JS_FILES *.qml *.js)
+
+# make the files visible in the qtcreator tree
+add_custom_target(ubuntu-clock-app_clock_QMlFiles ALL SOURCES ${CLOCK_QML_JS_FILES})
+
+install(FILES ${CLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/clock)

=== added file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	1970-01-01 00:00:00 +0000
+++ app/clock/ClockPage.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import U1db 1.0 as U1db
+import Ubuntu.Components 1.1
+import "../components"
+import "../upstreamcomponents"
+import "../worldclock"
+import "../components/Utils.js" as Utils
+
+PageWithBottomEdge {
+    id: _clockPage
+    objectName: "clockPage"
+
+    /*
+      Property to set the minimum drag distance before activating the add
+      city signal
+    */
+    property int _minThreshold: addCityButton.maxThreshold + units.gu(2)
+
+    // Property to keep track of the clock mode
+    property alias isDigital: clock.isDigital
+
+    flickable: null
+
+    Component.onCompleted: Utils.log(debugMode, "Clock Page loaded")
+
+    Flickable {
+        id: _flickable
+
+        Component.onCompleted: otherElementsStartUpAnimation.start()
+
+        anchors.fill: parent
+        contentWidth: parent.width
+        contentHeight: clock.height + date.height + locationRow.height
+                       + worldCityColumn.height + units.gu(14)
+
+        PullToAdd {
+            id: addCityButton
+            objectName: "addCityButton"
+
+            anchors {
+                top: parent.top
+                topMargin: -labelHeight - units.gu(3)
+                horizontalCenter: parent.horizontalCenter
+            }
+
+            leftLabel: i18n.tr("Add")
+            rightLabel: i18n.tr("City")
+        }
+
+        AbstractButton {
+            id: settingsIcon
+            objectName: "settingsIcon"
+
+            onClicked: {
+                mainStack.push(Qt.resolvedUrl("../alarm/AlarmSettingsPage.qml"))
+            }
+
+            width: units.gu(3)
+            height: width
+            opacity: 0
+
+            anchors {
+                top: parent.top
+                topMargin: units.gu(6)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+
+            Icon {
+                anchors.fill: parent
+                name: "settings"
+                color: "Grey"
+            }
+        }
+
+        MainClock {
+            id: clock
+            objectName: "clock"
+
+            anchors {
+                verticalCenter: parent.top
+                verticalCenterOffset: units.gu(20)
+                horizontalCenter: parent.horizontalCenter
+            }
+        }
+
+        Label {
+            id: date
+
+            anchors {
+                top: parent.top
+                topMargin: units.gu(36)
+                horizontalCenter: parent.horizontalCenter
+            }
+
+            text: clock.analogTime.toLocaleDateString()
+            opacity: settingsIcon.opacity
+            fontSize: "xx-small"
+        }
+
+        Row {
+            id: locationRow
+            objectName: "locationRow"
+
+            opacity: settingsIcon.opacity
+            spacing: units.gu(1)
+
+            anchors {
+                top: date.bottom
+                topMargin: units.gu(1)
+                horizontalCenter: parent.horizontalCenter
+            }
+
+            Image {
+                id: locationIcon
+                source: "../graphics/Location_Pin.png"
+                width: units.gu(1.2)
+                height: units.gu(2.2)
+            }
+
+            Label {
+                id: location
+                objectName: "location"
+                text: "Location"
+                fontSize: "medium"
+                anchors.verticalCenter: locationIcon.verticalCenter
+                color: UbuntuColors.midAubergine
+            }
+        }
+
+        UserWorldCityList {
+            id: worldCityColumn
+            objectName: "worldCityColumn"
+            opacity: settingsIcon.opacity
+            anchors.top: locationRow.bottom
+            anchors.topMargin: units.gu(4)
+        }
+
+        onDragEnded: {
+            if(contentY < _minThreshold) {
+                mainStack.push(Qt.resolvedUrl("../worldclock/WorldCityList.qml"))
+            }
+        }
+
+        onContentYChanged: {
+            if(contentY < 0 && atYBeginning) {
+                addCityButton.dragPosition = contentY.toFixed(0)
+            }
+        }
+
+        ParallelAnimation {
+            id: otherElementsStartUpAnimation
+
+            PropertyAnimation {
+                target: settingsIcon
+                property: "anchors.topMargin"
+                from: units.gu(6)
+                to: units.gu(2)
+                duration: 900
+            }
+
+            PropertyAnimation {
+                target: settingsIcon
+                property: "opacity"
+                from: 0
+                to: 1
+                duration: 900
+            }
+
+            PropertyAnimation {
+                target: date
+                property: "anchors.topMargin"
+                from: units.gu(36)
+                to: units.gu(40)
+                duration: 900
+            }
+        }
+    }
+}

=== added file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml	1970-01-01 00:00:00 +0000
+++ app/clock/MainClock.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import DateTime 1.0
+import Ubuntu.Components 1.1
+import "../components"
+
+Clock {
+    id: mainClock
+
+    fontSize: units.dp(62)
+    periodFontSize: units.dp(12)
+    innerCircleWidth: units.gu(23)
+
+    isMainClock: true
+
+    Connections {
+        target: clockApp
+        onApplicationStateChanged: {
+            localTimeSource.update()
+        }
+    }
+
+    DateTime {
+        id: localTimeSource
+        updateInterval: isDigital ? 1000 : 10
+    }
+
+    /*
+     Create a new Date() object and pass the date, month, year, hour, minute
+     and second received from the DateTime plugin manually to ensure the
+     timezone info is set correctly.
+
+     Javascript Month is 0-11 while QDateTime month is 1-12. Hence the -1
+     is required.
+    */
+
+    /*
+      FIXME: When the upstream QT bug at
+      https://bugreports.qt-project.org/browse/QTBUG-40275 is fixed it will be
+      possible to receive a datetime object directly instead of using this hack.
+    */
+    analogTime: new Date
+                (
+                    localTimeSource.localDateString.split(":")[0],
+                    localTimeSource.localDateString.split(":")[1]-1,
+                    localTimeSource.localDateString.split(":")[2],
+                    localTimeSource.localTimeString.split(":")[0],
+                    localTimeSource.localTimeString.split(":")[1],
+                    localTimeSource.localTimeString.split(":")[2],
+                    localTimeSource.localTimeString.split(":")[3]
+                )
+    time: Qt.formatTime(analogTime)
+
+    isDigital: clockModeDocument.contents.digitalMode ? true : false
+
+    Component.onCompleted: {
+        clockOpenAnimation.start()
+    }
+
+    /*
+      The clockOpenAnimation is only executed once when the clock app is
+      opened.
+    */
+    SequentialAnimation {
+        id: clockOpenAnimation
+
+        /*
+          On startup, first ensure that the correct mode is loaded into memory,
+          and then only proceed to start the startup animation.
+        */
+
+        ScriptAction {
+            script: {
+                if (isDigital) {
+                    digitalModeLoader.setSource
+                            ("../components/DigitalMode.qml",
+                             {
+                                 "maxWidth": innerCircleWidth,
+                                 "maxTimeFontSize": fontSize,
+                                 "maxPeriodFontSize": periodFontSize,
+                             })
+                }
+                else {
+                    analogModeLoader.setSource
+                            ("../components/AnalogMode.qml",
+                             {
+                                 "maxWidth": innerCircleWidth,
+                                 "showSeconds": isMainClock
+                             })
+                }
+            }
+        }
+
+        ParallelAnimation {
+            PropertyAnimation {
+                target: mainClock
+                property: "width"
+                to: units.gu(32)
+                duration: 900
+            }
+
+            ScriptAction {
+                script: {
+                    if (isDigital) {
+                        digitalModeLoader.item.startAnimation()
+                    }
+                    else {
+                        analogModeLoader.item.startAnimation()
+                    }
+                }
+            }
+        }
+    }
+}

=== added directory 'app/components'
=== added file 'app/components/AnalogMode.qml'
--- app/components/AnalogMode.qml	1970-01-01 00:00:00 +0000
+++ app/components/AnalogMode.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ClockCircle {
+    id: _innerCircleAnalog
+
+    // Property to set the max width when running the animation
+    property int maxWidth
+
+    // Property to show/hide the seconds hand
+    property bool showSeconds
+
+    function startAnimation() {
+        _animationTimer.start()
+    }
+
+    width: units.gu(0)
+
+    Timer {
+        id: _animationTimer
+        interval: 200
+        repeat: false
+        onTriggered: _innerCircleAnimation.start()
+    }
+
+    Image {
+        id: hourHand
+
+        z: minuteHand.z + 1
+        width: parent.width
+        anchors.centerIn: parent
+
+        smooth: true
+        source: "../graphics/Hour_Hand.png"
+        fillMode: Image.PreserveAspectFit
+        rotation: (analogTime.getHours() * 30) + (analogTime.getMinutes() / 2)
+    }
+
+    Image {
+        id: minuteHand
+
+        width: parent.width
+        anchors.centerIn: parent
+
+        smooth: true
+        source: "../graphics/Minute_Hand.png"
+        fillMode: Image.PreserveAspectFit
+        rotation: (analogTime.getMinutes() * 6) + (analogTime.getSeconds() / 10)
+    }
+
+    Image {
+        id: secondHand
+
+        anchors.centerIn: parent
+        width: parent.width + units.gu(2)
+
+        smooth: true
+        visible: showSeconds
+        source: "../graphics/Second_Hand.png"
+        fillMode: Image.PreserveAspectFit
+        rotation: visible ? ((360 * ((analogTime.getSeconds() * 1000) +
+                           analogTime.getMilliseconds())) / 60000) : 0
+    }
+
+    Image {
+        id: center
+
+        z: hourHand.z + 1
+        width: parent.width
+        anchors.centerIn: parent
+
+        fillMode: Image.PreserveAspectFit
+        source: "../graphics/Knob.png"
+    }
+
+    PropertyAnimation {
+        id: _innerCircleAnimation
+        target: _innerCircleAnalog
+        property: "width"
+        from: units.gu(0)
+        to: maxWidth
+        duration: 900
+    }
+}

=== added file 'app/components/AnalogShadow.qml'
--- app/components/AnalogShadow.qml	1970-01-01 00:00:00 +0000
+++ app/components/AnalogShadow.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Flipable {
+    id: analogShadow
+
+    // Properties to set the size of the analog shadow
+    property int shadowWidth
+    property int shadowTimeFontSize
+    property int shadowPeriodFontSize
+
+    // Property to disable the seconds hand
+    property alias showSeconds: _analogMode.showSeconds
+
+    // Property to switch between digital and analog mode
+    property bool isDigital: false
+
+    width: shadowWidth
+    height: width/2
+    clip: true
+
+    front: AnalogMode {
+        id: _analogMode
+
+        width: shadowWidth
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    back: DigitalMode {
+        id: _digitalMode
+
+        width: shadowWidth
+        timeFontSize: shadowTimeFontSize
+        timePeriodFontSize: shadowPeriodFontSize
+
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    transform: Rotation {
+        id: rotation
+        origin.x: analogShadow.width/2
+        origin.y: 0
+        axis.x: 1; axis.y: 0; axis.z: 0
+        angle: 0
+    }
+
+    states: State {
+        name: "Digital"
+        when: analogShadow.isDigital
+        PropertyChanges {
+            target: rotation
+            angle: -180
+        }
+    }
+
+    transitions: Transition {
+        NumberAnimation {
+            target: rotation
+            property: "angle"
+            duration: 666
+        }
+    }
+}

=== added file 'app/components/Background.qml'
--- app/components/Background.qml	1970-01-01 00:00:00 +0000
+++ app/components/Background.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+
+/*
+  Component to set the background of the app
+  */
+
+Image {
+    id: _background
+
+    anchors.fill: parent
+    source: "../graphics/Background_Texture.jpg"
+}

=== added file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/components/CMakeLists.txt	2014-08-12 22:08:22 +0000
@@ -0,0 +1,6 @@
+file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
+
+# make the files visible in the qtcreator tree
+add_custom_target(ubuntu-clock-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
+
+install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/components)

=== added file 'app/components/Clock.qml'
--- app/components/Clock.qml	1970-01-01 00:00:00 +0000
+++ app/components/Clock.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,254 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "Utils.js" as Utils
+
+/*
+ Generic clock component which has a digital and analog mode. A flip animation
+ is shown when switching clock modes. This components is used by the main
+ clock and the world clock list items.
+
+ The component follows a parent-child model where certain functions are
+ available only if used by a parent. You can set parent using the isMainClock
+ variable. Some functions which are provided only to the parent are listed
+ below,
+
+ - Ability to switch clock modes by tapping on the center. As per design, only
+   main clock app should allow switching mode by tapping at the center
+
+ - Modify the user preference settings document to reflect the currently chosen
+   clock mode. We don't want every child element modifying the file unnecessarily
+
+ - Disable the clock hand in the child elements (world clock) as per the design
+   spec.
+*/
+ClockCircle {
+    id: _outerCircle
+
+    // Property to set the analog time
+    property var analogTime
+
+    // Property to set the digital time label
+    property string time: Qt.formatTime(analogTime)
+
+    // Property to keep track of the clock mode
+    property alias isDigital: clockModeFlipable.isDigital
+
+    // Properties to set the dimension of the clock like the font size, width etc
+    property int fontSize
+    property int periodFontSize
+    property int innerCircleWidth
+
+    // Property to set if the component is the parent or the child
+    property bool isMainClock: false
+
+    // Properties to expose the analog and digital modes
+    property alias digitalModeLoader: _digitalModeLoader
+    property alias analogModeLoader: _analogModeLoader
+
+    // Signal which is triggered whenever the flip animation is started
+    signal triggerFlip();
+
+    function flipClock() {
+        clockFlipAnimation.start()
+    }
+
+    // Sets the style to outer circle
+    isOuter: true
+
+    Shadow {
+        id: upperShadow
+        rotation: 0
+        width: innerCircleWidth - units.gu(0.5)
+        z: clockModeFlipable.z + 2
+        anchors.centerIn: clockModeFlipable
+        anchors.verticalCenterOffset: -width/4
+    }
+
+    Shadow {
+        id: bottomShadow
+        rotation: 180
+        width: upperShadow.width
+        z: clockModeFlipable.z + 2
+        anchors.centerIn: clockModeFlipable
+        anchors.verticalCenterOffset: width/4
+    }
+
+    Loader {
+        id: analogShadow
+        z: clockModeFlipable.isDigital ? clockModeFlipable.z + 1
+                                       : clockModeFlipable.z + 3
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: clockModeFlipable.bottom
+    }
+
+    Loader {
+        id: digitalShadow
+        z: clockModeFlipable.isDigital ? clockModeFlipable.z + 3
+                                       : clockModeFlipable.z + 1
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: clockModeFlipable.bottom
+    }
+
+    Flipable {
+        id: clockModeFlipable
+
+        // Property to switch between digital and analog mode
+        property bool isDigital: false
+
+        width: innerCircleWidth
+        height: width
+        anchors.centerIn: parent
+
+        front: Loader {
+            id: _analogModeLoader
+            anchors.centerIn: parent
+        }
+
+        back: Loader {
+            id: _digitalModeLoader
+            anchors.centerIn: parent
+        }
+
+        transform: Rotation {
+            id: rotation
+            origin.x: clockModeFlipable.width/2
+            origin.y: clockModeFlipable.height/2
+            axis.x: 1; axis.y: 0; axis.z: 0
+            angle: 0
+        }
+
+        states: State {
+            name: "Digital"
+            when: clockModeFlipable.isDigital
+            PropertyChanges {
+                target: rotation
+                angle: 180
+            }
+        }
+
+        MouseArea {
+            enabled: isMainClock
+            anchors.fill: parent
+            onClicked: {
+                clockFlipAnimation.start()
+            }
+        }
+    }
+
+    /*
+      The clockFlipAnimation is executed during every switch between
+      analog and digital modes.
+    */
+    SequentialAnimation {
+        id: clockFlipAnimation
+
+        ScriptAction {
+            script: {
+                triggerFlip()
+                analogShadow.setSource
+                        ("AnalogShadow.qml",
+                         {
+                             "shadowWidth": innerCircleWidth,
+                             "shadowTimeFontSize": fontSize,
+                             "shadowPeriodFontSize": periodFontSize,
+                             "showSeconds": isMainClock
+                         })
+
+                digitalShadow.setSource
+                        ("DigitalShadow.qml",
+                         {
+                             "shadowWidth": innerCircleWidth,
+                             "shadowTimeFontSize": fontSize,
+                             "shadowPeriodFontSize": periodFontSize,
+                             "showSeconds": isMainClock
+                         })
+
+                if (clockModeFlipable.isDigital) {
+                    digitalShadow.item.isAnalog = true
+                }
+                else {
+                    analogShadow.item.isDigital = true
+                }
+            }
+        }
+
+        PropertyAnimation {
+            target: bottomShadow
+            property: "opacity"
+            duration: 333
+            from: 1
+            to: 0
+        }
+
+        PropertyAnimation {
+            target: upperShadow
+            property: "opacity"
+            duration: 333
+            from: 0
+            to: 1
+        }
+
+        /*
+          Script to clean up after the flip animation is complete which
+          involves (in the order listed below)
+            - Hiding the shadows
+            - Toggling clock mode and unloading the hidden mode
+            - Unloading the analog and digital shadow required to show the
+              paper effect
+        */
+
+        ScriptAction {
+            script: {
+                upperShadow.opacity = bottomShadow.opacity = 0
+                isDigital = !isDigital
+
+                if (isDigital) {
+                    _digitalModeLoader.setSource
+                            ("DigitalMode.qml",
+                             {
+                                 "width": innerCircleWidth,
+                                 "timeFontSize": fontSize,
+                                 "timePeriodFontSize": periodFontSize
+                             })
+                    _analogModeLoader.source = ""
+                }
+                else {
+                    _analogModeLoader.setSource
+                            ("AnalogMode.qml",
+                             {
+                                 "width": innerCircleWidth,
+                                 "showSeconds": isMainClock
+                             })
+                    _digitalModeLoader.source = ""
+                }
+
+                analogShadow.source = digitalShadow.source = ""
+
+                if(isMainClock) {
+                    var isDigitalSetting = JSON.parse
+                            (JSON.stringify(clockModeDocument.contents))
+                    isDigitalSetting.digitalMode = isDigital
+                    clockModeDocument.contents = isDigitalSetting
+                }
+            }
+        }
+    }
+}

=== added file 'app/components/ClockCircle.qml'
--- app/components/ClockCircle.qml	1970-01-01 00:00:00 +0000
+++ app/components/ClockCircle.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+import QtGraphicalEffects 1.0
+
+/*
+  Clock Circle with the shadows and background color set depending on the
+  position of the circle.
+
+  If used as the outer circle, the shadows are at the top and the background
+  has a 30% white shade. On the other hand, if used as the inner clock circle
+  then the shadows are at the bottom and the background has a 3% darker shade.
+
+  If used as the inner circle, a textured background image is set as part of
+  the new design specs.
+
+  The circle position is set by the public property "isOuter". If true, the
+  outer circle characteristics are set and vice-versa.
+ */
+Rectangle {
+    id: _innerCircle
+
+    /*
+      Property to set if the circle is the outer or the inner circle
+     */
+    property bool isOuter: false
+
+    height: width
+    radius: width / 2
+    antialiasing: true
+    color: isOuter ? Qt.rgba(1,1,1,0.3) : Qt.rgba(0,0,0,0.03)
+
+    /*
+      Rectangle with a gradient background which will be used as a source for
+      the opacity mask. It starts of transparent and then gradually turns
+      gray at the bottom.
+     */
+    Rectangle {
+        id: _source
+
+        radius: width / 2
+        anchors.fill: parent
+
+        antialiasing: true
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0.0
+                color: isOuter ? "#6E6E6E" : "Transparent"
+            }
+
+            GradientStop {
+                position: isOuter ? 0.7 : 0.3
+                color: "Transparent"
+            }
+
+            GradientStop {
+                position: 1.0
+                color: isOuter ? "Transparent" : "#6E6E6E"
+            }
+        }
+    }
+
+    Image {
+        id: _innerBackground
+
+        visible: !isOuter
+        anchors.fill: parent
+        fillMode: Image.PreserveAspectFit
+        source: "../graphics/Inner_Clock_Texture.png"
+    }
+
+    /*
+      Rectangle which will be masked over by the source rectangle. This
+      rectangle is required for the border effect which results in the
+      shadow.
+     */
+    Rectangle {
+        id: _mask
+
+        radius: (width / 2)
+        anchors.fill: _source
+
+        antialiasing: true
+        color: "Transparent"
+        border { width: units.gu(0.2) }
+    }
+    
+    OpacityMask {
+        opacity: 0.65
+        anchors.fill: _source
+        source: ShaderEffectSource {
+            sourceItem: _source
+            hideSource: true
+        }
+        maskSource: ShaderEffectSource {
+            sourceItem: _mask
+            hideSource: true
+        }
+    }
+}

=== added file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml	1970-01-01 00:00:00 +0000
+++ app/components/DigitalMode.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ClockCircle {
+    id: _innerCircle
+
+    // Property to allow setting the time font size manually
+    property alias timeFontSize: _digitalTime.font.pixelSize
+
+    // Property to allow setting the time period font size manually
+    property alias timePeriodFontSize: _digitalTimePeriod.font.pixelSize
+
+    // Properties to set the maximum dimensions when running the animations
+    property int maxWidth
+    property int maxTimeFontSize
+    property int maxPeriodFontSize
+
+    function startAnimation() {
+        _animationTimer.start()
+    }
+
+    width: units.gu(0)
+
+    Timer {
+        id: _animationTimer
+        interval: 200
+        repeat: false
+        onTriggered: _innerCircleAnimation.start()
+    }
+
+    Label {
+        id: _digitalTime
+
+        anchors.centerIn: parent
+
+        color: UbuntuColors.midAubergine
+        font.pixelSize: units.dp(1)
+        text: {
+            if (time.search(Qt.locale().amText) !== -1) {
+                // 12 hour format detected with the localised AM text
+                return time.split(Qt.locale().amText)[0].trim()
+            }
+            else if (time.search(Qt.locale().pmText) !== -1) {
+                // 12 hour format detected with the localised PM text
+                return time.split(Qt.locale().pmText)[0].trim()
+            }
+            else {
+                // 24-hour format detected, return full time string
+                return time
+            }
+        }
+    }
+
+    Label {
+        id: _digitalTimePeriod
+
+        anchors.top: _digitalTime.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        color: UbuntuColors.midAubergine
+        font.pixelSize: units.dp(1)
+        visible: text !== ""
+        text: {
+            if (time.search(Qt.locale().amText) !== -1) {
+                // 12 hour format detected with the localised AM text
+                return Qt.locale().amText
+            }
+            else if (time.search(Qt.locale().pmText) !== -1) {
+                // 12 hour format detected with the localised PM text
+                return Qt.locale().pmText
+            }
+            else {
+                // 24-hour format detected
+                return ""
+            }
+        }
+    }
+
+    ParallelAnimation {
+        id: _innerCircleAnimation
+
+        PropertyAnimation {
+            target: _innerCircle
+            property: "width"
+            from: units.gu(0)
+            to: maxWidth
+            duration: 900
+        }
+
+        PropertyAnimation {
+            target: _digitalTime
+            property: "font.pixelSize"
+            from: units.dp(1)
+            to: maxTimeFontSize
+            duration: 900
+        }
+
+        PropertyAnimation {
+            target: _digitalTimePeriod
+            property: "font.pixelSize"
+            from: units.dp(1)
+            to: maxPeriodFontSize
+            duration: 900
+        }
+    }
+}

=== added file 'app/components/DigitalShadow.qml'
--- app/components/DigitalShadow.qml	1970-01-01 00:00:00 +0000
+++ app/components/DigitalShadow.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Flipable {
+    id: digitalShadow
+
+    // Properties to set the size of the digital shadow
+    property int shadowWidth
+    property int shadowTimeFontSize
+    property int shadowPeriodFontSize
+
+    // Property to disable the seconds hand
+    property alias showSeconds: _analogMode.showSeconds
+
+    // Property to switch between digital and analog mode
+    property bool isAnalog: false
+
+    width: shadowWidth
+    height: width/2
+    clip: true
+
+    front: DigitalMode {
+        id: _digitalMode
+
+        width: shadowWidth
+        timeFontSize: shadowTimeFontSize
+        timePeriodFontSize: shadowPeriodFontSize
+
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    back: AnalogMode {
+        id: _analogMode
+
+        width: shadowWidth
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    transform: Rotation {
+        id: rotation
+        origin.x: digitalShadow.width/2
+        origin.y: 0
+        axis.x: 1; axis.y: 0; axis.z: 0
+        angle: 0
+    }
+
+    states: State {
+        name: "Digital"
+        when: digitalShadow.isAnalog
+        PropertyChanges {
+            target: rotation
+            angle: -180
+        }
+    }
+
+    transitions: Transition {
+        NumberAnimation {
+            target: rotation
+            property: "angle"
+            duration: 666
+        }
+    }
+}

=== added file 'app/components/PullToAdd.qml'
--- app/components/PullToAdd.qml	1970-01-01 00:00:00 +0000
+++ app/components/PullToAdd.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Row {
+    id: _pullToAdd
+
+    // Property to get the position of the button from the top
+    property int dragPosition: 0
+
+    // Property to store the height of the label
+    property alias labelHeight: _leftLabel.height
+
+    // Property to set the label on the left side of the add button
+    property alias leftLabel: _leftLabel.text
+
+    // Property to set the label on the right side of the add button
+    property alias rightLabel: _rightLabel.text
+
+    // Property to set the maximum threshold beyond which the button shouldn't
+    // resize
+    property int maxThreshold: -units.gu(8)
+
+    // Property to set the maximum size of the plus icon
+    property int maxPlusSize: _addButton.width * 0.3
+
+    spacing: units.gu(1)
+
+    Label {
+        id: _leftLabel
+
+        text: "pull"
+        fontSize: "medium"
+        color: UbuntuColors.midAubergine
+        anchors.verticalCenter: parent.verticalCenter
+    }
+
+    ClockCircle {
+        id: _addButton
+
+        isOuter: true
+        width: dragPosition >= maxThreshold
+               ? dragPosition * units.gu(6.5)/maxThreshold
+               : units.gu(6.5)
+
+        ClockCircle {
+            width: dragPosition >= maxThreshold
+                   ? dragPosition * units.gu(4.5)/maxThreshold
+                   : units.gu(4.5)
+            anchors.centerIn: parent
+
+            Icon {
+                id: plusIcon
+                anchors.centerIn: parent
+                color: UbuntuColors.coolGrey
+                name: "add"
+                height: dragPosition >= maxThreshold
+                        ? (dragPosition * maxPlusSize)/maxThreshold
+                        : maxPlusSize
+                width: height
+            }
+        }
+    }
+
+    Label {
+        id: _rightLabel
+
+        text: "down"
+        fontSize: "medium"
+        color: UbuntuColors.midAubergine
+        anchors.verticalCenter: parent.verticalCenter
+    }
+}

=== added file 'app/components/Shadow.qml'
--- app/components/Shadow.qml	1970-01-01 00:00:00 +0000
+++ app/components/Shadow.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Item {
+    id: _shadowContainer
+
+    clip: true
+    height: width/2
+
+    opacity: 0
+
+    Rectangle {
+        id: _shadow
+
+        width: _shadowContainer.width
+        height: width
+        radius: width/2
+
+        anchors {
+            top: parent.top
+            horizontalCenter: parent.horizontalCenter
+        }
+
+        color: Qt.rgba(0,0,0,0.2)
+    }
+}

=== added file 'app/components/SubtitledListItem.qml'
--- app/components/SubtitledListItem.qml	1970-01-01 00:00:00 +0000
+++ app/components/SubtitledListItem.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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.ListItems 1.0 as ListItem
+
+/*
+  This component is almost an identical copy of the SDK's subtitled with the
+  exception of the font size and color required by the new clock app design.
+
+  #TODO: Revert to using the SDK Subtitled Component when they change the
+  design to match the new clock app design.
+ */
+ListItem.Base {
+    id: _subtitledContainer
+
+    // Property to set the main text label
+    property alias text: _mainText.text
+
+    // Property to set the subtitle label
+    property alias subText: _subText.text
+    
+    Column {
+        id: _labelColumn
+        
+        anchors.verticalCenter: parent.verticalCenter
+        
+        Label {
+            id: _mainText
+            fontSize: "medium"
+            color: UbuntuColors.midAubergine
+        }
+        
+        Label {
+            id: _subText
+            fontSize: "xx-small"
+        }
+    }
+}

=== added file 'app/components/Utils.js'
--- app/components/Utils.js	1970-01-01 00:00:00 +0000
+++ app/components/Utils.js	2014-08-12 22:08:22 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.pragma library
+
+function log (debugMode, message) {
+    if (debugMode) {
+        console.log("[LOG]" + message)
+    }
+}

=== added directory 'app/graphics'
=== added file 'app/graphics/Background_Texture.jpg'
Binary files app/graphics/Background_Texture.jpg	1970-01-01 00:00:00 +0000 and app/graphics/Background_Texture.jpg	2014-08-12 22:08:22 +0000 differ
=== added file 'app/graphics/CMakeLists.txt'
--- app/graphics/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/graphics/CMakeLists.txt	2014-08-12 22:08:22 +0000
@@ -0,0 +1,8 @@
+file(GLOB GRAPHICS_FILES *.png *.jpg)
+
+# make the files visible in the qtcreator tree
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+  add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${IMAGES_PNG_FILES})
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+install(FILES ${GRAPHICS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/graphics)

=== added file 'app/graphics/[e-mail]'
Binary files app/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and app/graphics/[e-mail]	2014-08-12 22:08:22 +0000 differ
=== added file 'app/graphics/Inner_Clock_Texture.png'
Binary files app/graphics/Inner_Clock_Texture.png	1970-01-01 00:00:00 +0000 and app/graphics/Inner_Clock_Texture.png	2014-08-12 22:08:22 +0000 differ
=== added file 'app/graphics/[e-mail]'
Binary files app/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and app/graphics/[e-mail]	2014-08-12 22:08:22 +0000 differ
=== added file 'app/graphics/Location_Pin.png'
Binary files app/graphics/Location_Pin.png	1970-01-01 00:00:00 +0000 and app/graphics/Location_Pin.png	2014-08-12 22:08:22 +0000 differ
=== added file 'app/graphics/[e-mail]'
Binary files app/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and app/graphics/[e-mail]	2014-08-12 22:08:22 +0000 differ
=== added file 'app/graphics/[e-mail]'
Binary files app/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and app/graphics/[e-mail]	2014-08-12 22:08:22 +0000 differ
=== added file 'app/ubuntu-clock-app.desktop.in'
--- app/ubuntu-clock-app.desktop.in	1970-01-01 00:00:00 +0000
+++ app/ubuntu-clock-app.desktop.in	2014-08-12 22:08:22 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Clock Reboot
+Exec=@EXEC@
+Icon=@ICON@
+Terminal=false
+Type=Application
+X-Ubuntu-Touch=true
+
+

=== added file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	1970-01-01 00:00:00 +0000
+++ app/ubuntu-clock-app.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import U1db 1.0 as U1db
+import Ubuntu.Components 1.1
+import "clock"
+import "alarm"
+import "components"
+import "components/Utils.js" as Utils
+
+MainView {
+    id: clockApp
+
+    // Property to store the state of an application (active or suspended)
+    property bool applicationState: Qt.application.active
+
+    // Property to enable/disable the debug mode to show more console output
+    property bool debugMode: true
+
+    // objectName for functional testing purposes (autopilot-qt5)
+    objectName: "clock"
+
+    // applicationName for click packages (used as an unique app identifier)
+    applicationName: "com.ubuntu.clock.devel"
+
+    /*
+      This property enables the application to change orientation when the
+      device is rotated. This has been set to false since we are currently
+      only focussing on the phone interface.
+    */
+    automaticOrientation: false
+
+    /*
+      The width and height defined below are the same dimension used by the
+      designers in the clock visual spec.
+    */
+    width: units.gu(40)
+    height: units.gu(70)
+
+    backgroundColor: "#F5F5F5"
+
+    useDeprecatedToolbar: false
+
+    Background {}
+
+    // Database to store the user preferences locally
+    U1db.Database {
+        id: clockDB
+        path: "user-preferences"
+    }
+
+    // Document to store clock mode chosen by user
+    U1db.Document {
+        id: clockModeDocument
+        create: true
+        database: clockDB
+        docId: "clockModeDocument"
+        defaults: { "digitalMode": false }
+    }
+
+    AlarmModel {
+        id: alarmModel
+        Component.onCompleted: Utils.log(debugMode, "Alarm Database loaded")
+    }
+
+    PageStack {
+        id: mainStack
+
+        Component.onCompleted: push(clockPage)
+
+        ClockPage {
+            id: clockPage
+
+            /*
+              #FIXME: When the SDK support hiding the header, then enable the
+              clock page title. This will then set the correct window title on
+              the desktop.
+
+              title: "Clock"
+            */
+
+            /*
+              #TODO: The bottom edge title should reflect the time to the next
+              alarm. For instance it should read "Next alarm in 9h23m".
+            */
+            bottomEdgeTitle: i18n.tr("Next Alarm in ..")
+            bottomEdgePageComponent: AlarmPage {}
+        }
+    }
+}
+

=== added directory 'app/upstreamcomponents'
=== added file 'app/upstreamcomponents/CMakeLists.txt'
--- app/upstreamcomponents/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/CMakeLists.txt	2014-08-12 22:08:22 +0000
@@ -0,0 +1,6 @@
+file(GLOB UPSTREAM_COMPONENTS_QML_JS_FILES *.qml *.js)
+
+# make the files visible in the qtcreator tree
+add_custom_target(ubuntu-clock-app_upstream_components_QMlFiles ALL SOURCES ${UPSTREAM_COMPONENTS_QML_JS_FILES})
+
+install(FILES ${UPSTREAM_COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/upstreamcomponents)

=== added file 'app/upstreamcomponents/FastScroll.js'
--- app/upstreamcomponents/FastScroll.js	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/FastScroll.js	2014-08-12 22:08:22 +0000
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2014 Canonical Ltda
+** All rights reserved.
+** Contact: Nokia Corporation ([e-mail])
+**
+** This file is part of the Qt Components project.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// FastScroll.js - this is just SectionScroller.js with a fix for
+// section.criteria == ViewSection.FirstCharacter
+var sectionData = [];
+var _sections = [];
+
+function initialize(list) {
+    initSectionData(list);
+}
+
+function contains(name) {
+    return (_sections.indexOf(name) > -1)
+}
+
+function initSectionData(list) {
+    if (!list || !list.model) return;
+    sectionData = [];
+    _sections = [];
+    var current = "",
+        prop = list.section.property,
+        sectionText;
+
+    if (list.section.criteria === ViewSection.FullString) {
+        for (var i = 0, count = list.model.count; i < count; i++) {
+            sectionText = list.getSectionText(i)
+            if (sectionText !== current) {
+                current = sectionText;
+                _sections.push(current);
+                sectionData.push({ index: i, header: current });
+            }
+        }
+    } else if (list.section.criteria === ViewSection.FirstCharacter) {
+        for (var i = 0, count = list.model.count; i < count; i++) {
+            sectionText = list.getSectionText(i).substring(0, 1)
+            if (sectionText !== current) {
+                current = sectionText
+                _sections.push(sectionText);
+                sectionData.push({ index: i, header: current });
+            }
+        }
+    }
+}
+
+function getSectionPositionString(name) {
+    var val = _sections.indexOf(name);
+    return val === 0 ? "first" :
+           val === _sections.length - 1 ? "last" : false;
+}
+
+function getAt(pos) {
+    return _sections[pos] ? _sections[pos] : "";
+}
+
+function getRelativeSections(current) {
+    var val = _sections.indexOf(current),
+        sect = [],
+        sl = _sections.length;
+
+    val = val < 1 ? 1 : val >= sl-1 ? sl-2 : val;
+    sect = [getAt(val - 1), getAt(val), getAt(val + 1)];
+
+    return sect;
+}
+
+function getClosestSection(pos, down) {
+    var tmp = (_sections.length) * pos;
+    var val = Math.ceil(tmp) // TODO: better algorithm
+    val = val < 2 ? 1 : val;
+    return _sections[val-1];
+}
+
+function getNextSection(current) {
+    var val = _sections.indexOf(current);
+    return (val > -1 ? _sections[(val < _sections.length - 1 ? val + 1 : val)] : _sections[0]) || "";
+}
+
+function getPreviousSection(current) {
+    var val = _sections.indexOf(current);
+    return (val > -1 ? _sections[(val > 0 ? val - 1 : val)] : _sections[0]) || "";
+}
+
+function getIndexFor(sectionName) {
+    var data = sectionData[_sections.indexOf(sectionName)]
+    if (data) {
+        var val = data.index;
+        return val === 0 || val > 0 ? val : -1;
+    } else {
+        return -1
+    }
+}

=== added file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/FastScroll.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,321 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2014 Canonical Ltda
+** All rights reserved.
+** Contact: Nokia Corporation ([e-mail])
+**
+** This file is part of the Qt Components project.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// FastScroll.qml
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+import "FastScroll.js" as Sections
+
+Item {
+    id: root
+
+    property ListView listView
+    property int pinSize: units.gu(2)
+
+    readonly property var letters: ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+    readonly property alias fastScrolling: internal.fastScrolling
+    readonly property bool showing: (rail.opacity !== 0.0)
+    readonly property double minimumHeight: rail.height
+
+    width: units.gu(7)
+    height: rail.height
+
+    onListViewChanged: {
+        if (listView && listView.model) {
+            internal.initDirtyObserver();
+        } else if (listView) {
+            listView.modelChanged.connect(function() {
+                if (listView.model) {
+                    internal.initDirtyObserver();
+                }
+            });
+        }
+    }
+
+    Connections {
+        target: listView
+        onCurrentIndexChanged: {
+            if (currentIndex != -1) {
+                rail.opacity = 0.0
+            }
+        }
+    }
+
+    Rectangle {
+        id: magnified
+
+        color: Theme.palette.normal.overlay
+        radius: height * 0.3
+        height: pinSize * 2
+        width: height
+        opacity: internal.fastScrolling && root.enabled ? 1.0 : 0.0
+        x: -cursor.width - units.gu(3)
+        y: {
+            if (internal.currentItem) {
+                var itemCenterY = rail.y + internal.currentItem.y + (internal.currentItem.height / 2)
+                return (itemCenterY - (magnified.height / 2))
+            } else {
+                return 0
+            }
+        }
+
+        Label {
+            anchors.fill: parent
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            text: internal.desireSection
+            fontSize: "small"
+        }
+
+        Behavior on opacity {
+            UbuntuNumberAnimation {}
+        }
+    }
+
+    Rectangle {
+        id: cursor
+
+        property bool showLabel: false
+        property string currentSectionName: ""
+
+        radius: pinSize * 0.3
+        height: pinSize
+        width: height
+        color: Theme.palette.normal.foreground
+        opacity: rail.opacity
+        x: rail.x
+        y: {
+            if (internal.currentItem) {
+                var itemCenterY = rail.y + internal.currentItem.y + (internal.currentItem.height / 2)
+                return (itemCenterY - (cursor.height / 2))
+            } else {
+                return 0
+            }
+        }
+        Behavior on y {
+            enabled: !internal.fastScrolling
+            UbuntuNumberAnimation { }
+        }
+    }
+
+    Column {
+        id: rail
+
+        property bool isVisible: root.enabled &&
+                                 (listView.moving || dragArea.pressed) &&
+                                 (listView.currentIndex == -1)
+        anchors {
+            right: parent.right
+            rightMargin: units.gu(2)
+            left: parent.left
+            leftMargin: units.gu(2)
+            top: parent.top
+        }
+        height: childrenRect.height
+        opacity: 0.0
+        onIsVisibleChanged: {
+            if (isVisible) {
+                rail.opacity = 1.0
+                hideTimer.stop()
+            } else if (!root.enabled) {
+                rail.opacity = 0.0
+            } else {
+                hideTimer.restart()
+            }
+        }
+
+        Behavior on opacity {
+            UbuntuNumberAnimation { }
+        }
+
+        Repeater {
+            id: sectionsRepeater
+
+            model: root.letters
+            Label {
+                id: lbl
+
+                anchors.left: parent.left
+                height: pinSize
+                width: pinSize
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+                text: internal.fastScrolling && internal.targetSection == modelData ? "" : modelData
+                fontSize: "x-small"
+                color: internal.currentItem && (internal.currentItem.text === text) ? Theme.palette.selected.foregroundText : Theme.palette.selected.backgroundText
+                opacity: !internal.modelDirty && Sections.contains(text) ? 1.0 : 0.5
+            }
+        }
+
+        Timer {
+            id: hideTimer
+
+            running: false
+            interval: 2000
+            onTriggered: rail.opacity = 0.0
+        }
+    }
+
+    MouseArea {
+        id: dragArea
+
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        y: rail.y
+        height: rail.height
+        visible: rail.opacity == 1.0
+
+        preventStealing: true
+        onPressed: {
+            internal.adjustContentPosition(mouseY)
+            dragginTimer.start()
+        }
+
+        onReleased: {
+            dragginTimer.stop()
+            internal.desireSection = ""
+            internal.fastScrolling = false
+        }
+
+        onPositionChanged: internal.adjustContentPosition(mouseY)
+
+        Timer {
+            id: dragginTimer
+
+            running: false
+            interval: 150
+            onTriggered: {
+                internal.fastScrolling = true
+            }
+        }
+    }
+
+    Timer {
+        id: dirtyTimer
+        interval: 500
+        running: false
+        onTriggered: {
+            Sections.initSectionData(listView);
+            internal.modelDirty = false;
+        }
+    }
+
+    Timer {
+        id: timerScroll
+
+        running: false
+        interval: 10
+        onTriggered: {
+            if (internal.desireSection != internal.currentSection) {
+                var idx = Sections.getIndexFor(internal.desireSection)
+                if (idx !== -1) {
+                    listView.cancelFlick()
+                    listView.positionViewAtIndex(idx, ListView.Beginning)
+                }
+            }
+        }
+    }
+
+    QtObject {
+        id: internal
+
+        property string currentSection: listView.currentSection
+        property string desireSection: ""
+        property string targetSection: fastScrolling ? desireSection : currentSection
+        property int oldY: 0
+        property bool modelDirty: false
+        property bool down: true
+        property bool fastScrolling: false
+        property var currentItem: null
+
+        onTargetSectionChanged: moveIndicator(targetSection)
+
+        function initDirtyObserver() {
+            Sections.initialize(listView);
+            function dirtyObserver() {
+                if (!internal.modelDirty) {
+                    internal.modelDirty = true;
+                    dirtyTimer.running = true;
+                }
+            }
+
+            if (listView.model.countChanged)
+                listView.model.countChanged.connect(dirtyObserver);
+
+            if (listView.model.itemsChanged)
+                listView.model.itemsChanged.connect(dirtyObserver);
+
+            if (listView.model.itemsInserted)
+                listView.model.itemsInserted.connect(dirtyObserver);
+
+            if (listView.model.itemsMoved)
+                listView.model.itemsMoved.connect(dirtyObserver);
+
+            if (listView.model.itemsRemoved)
+                listView.model.itemsRemoved.connect(dirtyObserver);
+        }
+
+        function adjustContentPosition(mouseY) {
+            var child = rail.childAt(rail.width / 2, mouseY)
+            if (!child || child.text === "") {
+                return
+            }
+            var section = child.text
+            if (internal.desireSection !== section) {
+                internal.desireSection = section
+                moveIndicator(section)
+                if (dragArea.pressed) {
+                    timerScroll.restart()
+                }
+            }
+        }
+
+        function moveIndicator(section)
+        {
+            var index = root.letters.indexOf(section)
+            if (index != -1) {
+                currentItem = sectionsRepeater.itemAt(index)
+            }
+        }
+    }
+}

=== added file 'app/upstreamcomponents/ListItemWithActions.qml'
--- app/upstreamcomponents/ListItemWithActions.qml	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/ListItemWithActions.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,372 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+
+Item {
+    id: root
+
+    property Action leftSideAction: null
+    property list<Action> rightSideActions
+    property double defaultHeight: units.gu(8)
+    property bool locked: false
+    property Action activeAction: null
+    property var activeItem: null
+    property bool triggerActionOnMouseRelease: false
+    property color color: Theme.palette.normal.background
+    property color selectedColor: "#E6E6E6"
+    property bool selected: false
+    property bool selectionMode: false
+    property alias internalAnchors: mainContents.anchors
+    default property alias contents: mainContents.children
+
+    readonly property double actionWidth: units.gu(5)
+    readonly property double leftActionWidth: units.gu(10)
+    readonly property double actionThreshold: actionWidth * 0.4
+    readonly property double threshold: 0.4
+    readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
+    readonly property alias swipping: mainItemMoving.running
+
+    signal itemClicked(var mouse)
+    signal itemPressAndHold(var mouse)
+
+    function returnToBoundsRTL()
+    {
+        var actionFullWidth = actionWidth + units.gu(2)
+        var xOffset = Math.abs(main.x)
+        var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
+
+        if (index < 1) {
+            main.x = 0
+        } else if (index === rightSideActions.length) {
+            main.x = -rightActionsView.width
+        } else {
+            main.x = -(actionFullWidth * index)
+        }
+    }
+
+    function returnToBoundsLTR()
+    {
+        var finalX = leftActionWidth
+        if (main.x > (finalX * root.threshold))
+            main.x = finalX
+        else
+            main.x = 0
+    }
+
+    function returnToBounds()
+    {
+        if (main.x < 0) {
+            returnToBoundsRTL()
+        } else if (main.x > 0) {
+            returnToBoundsLTR()
+        }
+    }
+
+    function contains(item, point)
+    {
+        return (point.x >= item.x) && (point.x <= (item.x + item.width)) && (point.y >= item.y) && (point.y <= (item.y + item.height));
+    }
+
+    function getActionAt(point)
+    {
+        if (contains(leftActionView, point)) {
+            return leftSideAction
+        } else if (contains(rightActionsView, point)) {
+            var newPoint = root.mapToItem(rightActionsView, point.x, point.y)
+            for (var i = 0; i < rightActionsRepeater.count; i++) {
+                var child = rightActionsRepeater.itemAt(i)
+                if (contains(child, newPoint)) {
+                    return i
+                }
+            }
+        }
+        return -1
+    }
+
+    function updateActiveAction()
+    {
+        if ((main.x <= -root.actionWidth) &&
+            (main.x > -rightActionsView.width)) {
+            var actionFullWidth = actionWidth + units.gu(2)
+            var xOffset = Math.abs(main.x)
+            var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
+            index = index - 1
+            if (index > -1) {
+                root.activeItem = rightActionsRepeater.itemAt(index)
+                root.activeAction = root.rightSideActions[index]
+            }
+        } else {
+            root.activeAction = null
+        }
+    }
+
+    function resetSwipe()
+    {
+        main.x = 0
+    }
+
+    states: [
+        State {
+            name: "select"
+            when: selectionMode || selected
+            PropertyChanges {
+                target: selectionIcon
+                source: Qt.resolvedUrl("ListItemWithActionsCheckBox.qml")
+                anchors.leftMargin: units.gu(2)
+            }
+            PropertyChanges {
+                target: root
+                locked: true
+            }
+            PropertyChanges {
+                target: main
+                x: 0
+            }
+        }
+    ]
+
+    height: defaultHeight
+    clip: height !== defaultHeight
+
+    Rectangle {
+        id: leftActionView
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: main.left
+        }
+        width: root.leftActionWidth + actionThreshold
+        visible: leftSideAction
+        color: "red"
+
+        Icon {
+            anchors {
+                centerIn: parent
+                horizontalCenterOffset: actionThreshold / 2
+            }
+            name: leftSideAction ? leftSideAction.iconName : ""
+            color: Theme.palette.selected.field
+            height: units.gu(3)
+            width: units.gu(3)
+        }
+    }
+
+    Item {
+       id: rightActionsView
+
+       anchors {
+           top: main.top
+           left: main.right
+           leftMargin: units.gu(1)
+           bottom: main.bottom
+       }
+       visible: rightSideActions.length > 0
+       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + actionThreshold : 0
+       Row {
+           anchors.fill: parent
+           spacing: units.gu(2)
+           Repeater {
+               id: rightActionsRepeater
+
+               model: rightSideActions
+               Item {
+                   property alias image: img
+
+                   anchors {
+                       top: parent.top
+                       bottom: parent.bottom
+                   }
+                   width: root.actionWidth
+
+                   Icon {
+                       id: img
+
+                       anchors.centerIn: parent
+                       width: units.gu(3)
+                       height: units.gu(3)
+                       name: iconName
+                       color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? UbuntuColors.lightAubergine : Theme.palette.selected.background
+                   }
+               }
+           }
+       }
+    }
+
+
+    Rectangle {
+        id: main
+        objectName: "mainItem"
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+        }
+
+        width: parent.width
+        color: root.selected ? root.selectedColor : root.color
+
+        Loader {
+            id: selectionIcon
+
+            anchors {
+                left: main.left
+                verticalCenter: main.verticalCenter
+            }
+            width: (status === Loader.Ready) ? item.implicitWidth : 0
+            visible: (status === Loader.Ready) && (item.width === item.implicitWidth)
+            Behavior on width {
+                NumberAnimation {
+                    duration: UbuntuAnimation.SnapDuration
+                }
+            }
+        }
+
+
+        Item {
+            id: mainContents
+
+            anchors {
+                left: selectionIcon.right
+                leftMargin: units.gu(2)
+                top: parent.top
+                topMargin: units.gu(1)
+                right: parent.right
+                rightMargin: units.gu(2)
+                bottom: parent.bottom
+                bottomMargin: units.gu(1)
+            }
+        }
+
+        Behavior on x {
+            UbuntuNumberAnimation {
+                id: mainItemMoving
+
+                easing.type: Easing.OutElastic
+                duration: UbuntuAnimation.SlowDuration
+            }
+        }
+        Behavior on color {
+            enabled: (root.color != root.selectedColor)
+           ColorAnimation {}
+        }
+    }
+
+    SequentialAnimation {
+        id: triggerAction
+
+        property var currentItem: root.activeItem ? root.activeItem.image : null
+
+        running: false
+        ParallelAnimation {
+            UbuntuNumberAnimation {
+                target: triggerAction.currentItem
+                property: "opacity"
+                from: 1.0
+                to: 0.0
+                duration: UbuntuAnimation.SlowDuration
+                easing {type: Easing.InOutBack; }
+            }
+            UbuntuNumberAnimation {
+                target: triggerAction.currentItem
+                properties: "width, height"
+                from: units.gu(3)
+                to: root.actionWidth
+                duration: UbuntuAnimation.SlowDuration
+                easing {type: Easing.InOutBack; }
+            }
+        }
+        PropertyAction {
+            target: triggerAction.currentItem
+            properties: "width, height"
+            value: units.gu(3)
+        }
+        PropertyAction {
+            target: triggerAction.currentItem
+            properties: "opacity"
+            value: 1.0
+        }
+        ScriptAction {
+            script: root.activeAction.triggered(root)
+        }
+        PauseAnimation {
+            duration: 500
+        }
+        UbuntuNumberAnimation {
+            target: main
+            property: "x"
+            to: 0
+
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+
+        property bool locked: root.locked || ((root.leftSideAction === null) && (root.rightSideActions.count === 0))
+        property bool manual: false
+
+        anchors.fill: parent
+        drag {
+            target: locked ? null : main
+            axis: Drag.XAxis
+            minimumX: rightActionsView.visible ? -(rightActionsView.width + root.actionThreshold) : 0
+            maximumX: leftActionView.visible ? leftActionView.width : 0
+        }
+
+        onReleased: {
+            if (root.triggerActionOnMouseRelease && root.activeAction) {
+                triggerAction.start()
+            } else {
+                root.returnToBounds()
+                root.activeAction = null
+            }
+        }
+        onClicked: {
+            if (main.x === 0) {
+                root.itemClicked(mouse)
+            } else if (main.x > 0) {
+                var action = getActionAt(Qt.point(mouse.x, mouse.y))
+                if (action && action !== -1) {
+                    action.triggered(root)
+                }
+            } else {
+                var actionIndex = getActionAt(Qt.point(mouse.x, mouse.y))
+                if (actionIndex !== -1) {
+                    root.activeItem = rightActionsRepeater.itemAt(actionIndex)
+                    root.activeAction = root.rightSideActions[actionIndex]
+                    triggerAction.start()
+                    return
+                }
+            }
+            root.resetSwipe()
+        }
+
+        onPositionChanged: {
+            if (mouseArea.pressed) {
+                updateActiveAction()
+            }
+        }
+        onPressAndHold: {
+            if (main.x === 0) {
+                root.itemPressAndHold(mouse)
+            }
+        }
+        z: -1
+    }
+}

=== added file 'app/upstreamcomponents/ListItemWithActionsCheckBox.qml'
--- app/upstreamcomponents/ListItemWithActionsCheckBox.qml	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/ListItemWithActionsCheckBox.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+
+CheckBox {
+    checked: root.selected
+    width: implicitWidth
+    // disable item mouse area to avoid conflicts with parent mouse area
+    __mouseArea.enabled: false
+}

=== added file 'app/upstreamcomponents/MultipleSelectionListView.qml'
--- app/upstreamcomponents/MultipleSelectionListView.qml	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/MultipleSelectionListView.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0 as Popups
+
+/*!
+    \qmltype ContactSimpleListView
+    \inqmlmodule Ubuntu.Contacts 0.1
+    \ingroup ubuntu
+    \brief The MultipleSelectionListView provides a ListView with support to multiple selection
+
+    The MultipleSelectionListViewprovides a ListView with support to multiple selection which can be used by any
+    application.
+
+    Example:
+    \qml
+        import Ubuntu.Contacts 0.1
+
+        MultipleSelectionListView {
+            id: view
+            anchors.fill: paret
+            model: 100
+            delegate: Rectangle {
+                width: parent.width
+                height: 100
+                color: view.selectedItems.indexOf(index) == -1 ? "white" : "blue"
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        if (view.isInSelectionModel) {
+                            view.selectItem(index)
+                        }
+                    }
+                    onPressAndHold: view.startSelection()
+                }
+            }
+            onSelectionDone: console.debug("Selected items:" + view.selectedItems)
+        }
+    \endqml
+*/
+
+ListView {
+    id: listView
+
+    /*!
+      \qmlproperty model selectedItems
+
+      This property holds the list of selected items
+    */
+    readonly property alias selectedItems: visualModel.selectedItems
+    /*!
+      \qmlproperty bool multipleSelection
+
+      This property holds if the selection will accept multiple items or single items
+    */
+    property bool multipleSelection: true
+
+    /*!
+      \qmlproperty model listModel
+
+      This property holds the model providing data for the list.
+    */
+    property alias listModel: visualModel.model
+    /*!
+      \qmlproperty Component listDelegate
+
+      The delegate provides a template defining each item instantiated by the view.
+    */
+    property alias listDelegate: visualModel.delegate
+
+    /*!
+      \qmlproperty bool isInSelectionMode
+
+      This property holds a list with the index of selected items
+    */
+    readonly property bool isInSelectionMode: state === "selection"
+    /*!
+      This handler is called when the selection mode is finished without be canceled
+    */
+    signal selectionDone(var items)
+    /*!
+      This handler is called when the selection mode is canceled
+    */
+    signal selectionCanceled()
+
+    /*!
+      Start the selection mode on the list view.
+    */
+    function startSelection()
+    {
+        state = "selection"
+    }
+    /*!
+      Check if the item is selected
+      Returns true if the item was marked as selected or false if the item is unselected
+    */
+    function isSelected(item)
+    {
+        if (item && item.VisualDataModel) {
+            return (item.VisualDataModel.inSelected === true)
+        } else {
+            return false
+        }
+    }
+    /*!
+      Mark the item as selected
+      Returns true if the item was marked as selected or false if the item is already selected
+    */
+    function selectItem(item)
+    {
+        if (item.VisualDataModel.inSelected) {
+            return false
+        } else {
+            if (!multipleSelection) {
+                clearSelection()
+            }
+            item.VisualDataModel.inSelected = true
+            return true
+        }
+    }
+    /*!
+      Remove the index from the selected list
+    */
+    function deselectItem(item)
+    {
+        var result = false
+        if (item.VisualDataModel.inSelected) {
+            item.VisualDataModel.inSelected = false
+            result = true
+        }
+        return result
+    }
+    /*!
+      Finish the selection mode with sucess
+    */
+    function endSelection()
+    {
+        selectionDone(listView.selectedItems)
+        clearSelection()
+        state = ""
+    }
+    /*!
+      Cancel the selection
+    */
+    function cancelSelection()
+    {
+        selectionCanceled()
+        clearSelection()
+        state = ""
+    }
+    /*!
+      Remove any selected item from the selection list
+    */
+    function clearSelection()
+    {
+        if (selectedItems.count > 0) {
+            selectedItems.remove(0, selectedItems.count)
+        }
+    }
+    /*!
+      Select all items in the list
+    */
+    function selectAll()
+    {
+        if (multipleSelection) {
+            visualModel.items.addGroups(0, visualModel.items.count, ["selected"] )
+        }
+    }
+
+    model: visualModel
+
+    MultipleSelectionVisualModel {
+        id: visualModel
+    }
+
+    Component.onCompleted: {
+        // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
+        // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
+        var scaleFactor = units.gridUnit / 8;
+        maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
+        flickDeceleration = flickDeceleration * scaleFactor;
+    }
+}

=== added file 'app/upstreamcomponents/MultipleSelectionVisualModel.qml'
--- app/upstreamcomponents/MultipleSelectionVisualModel.qml	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/MultipleSelectionVisualModel.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+
+VisualDataModel {
+    id: contactVisualModel
+
+    property alias selectedItems: selectedGroup
+
+    groups: [
+        VisualDataGroup {
+            id: selectedGroup
+
+            name: "selected"
+        }
+    ]
+}

=== added file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml	2014-08-12 22:08:22 +0000
@@ -0,0 +1,396 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+    Example:
+
+    MainView {
+        objectName: "mainView"
+
+        applicationName: "com.ubuntu.developer.boiko.bottomedge"
+
+        width: units.gu(100)
+        height: units.gu(75)
+
+        Component {
+            id: pageComponent
+
+            PageWithBottomEdge {
+                id: mainPage
+                title: i18n.tr("Main Page")
+
+                Rectangle {
+                    anchors.fill: parent
+                    color: "white"
+                }
+
+                bottomEdgePageComponent: Page {
+                    title: "Contents"
+                    anchors.fill: parent
+                    //anchors.topMargin: contentsPage.flickable.contentY
+
+                    ListView {
+                        anchors.fill: parent
+                        model: 50
+                        delegate: ListItems.Standard {
+                            text: "One Content Item: " + index
+                        }
+                    }
+                }
+                bottomEdgeTitle: i18n.tr("Bottom edge action")
+            }
+        }
+