release: release version 0.8.0

Prepare for npm publishing

.gitignore

@@ -12,6 +12,9 @@ cache
 *.sublime-project
 *.sublime-workspace
 
+# netbeans project folder
+nbproject
+
 # git stackdumps
 *.stackdump
 

.npmignore

@@ -0,0 +1,3 @@
+node_modules/
+test/
+

Gruntfile.js

@@ -228,6 +228,20 @@ module.exports = function(grunt) {
           // src/index.html should already have been moved by the includereplace task
           {src: ['dest/tmp/index.html'], dest: 'dest/prod/piskelapp-partials/main-partial.html'}
         ]
+      },
+      // remove the fake header from the desktop build
+      desktop: {
+        options: {
+          patterns: [{
+              match: /<!--standalone-start-->(?:.|[\r\n])*<!--standalone-end-->/,
+              replacement: "",
+              description : "Remove everything between standalone-start & standalone-end"
+            }
+          ]
+        },
+        files: [
+          {src: ['dest/prod/index.html'], dest: 'dest/prod/index.html'}
+        ]
       }
     },
 
@@ -278,7 +292,7 @@ module.exports = function(grunt) {
     nwjs: {
       windows : {
         options: {
-          version : "0.11.5",
+          version : "0.12.3",
           build_dir: './dest/desktop/', // destination folder of releases.
           win: true,
           linux32: true,
@@ -288,9 +302,8 @@ module.exports = function(grunt) {
       },
       macos : {
         options: {
-          platforms : ['osx64'],
-          // had performance issues with 0.11.5 on mac os, need to test new versions/new hardware
-          version : "0.10.5",
+          osx64: true,
+          version : "0.12.3",
           build_dir: './dest/desktop/'
         },
         src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
@@ -315,15 +328,15 @@ module.exports = function(grunt) {
 
   grunt.registerTask('build-index.html', ['includereplace']);
   grunt.registerTask('merge-statics', ['concat:js', 'concat:css', 'uglify']);
-  grunt.registerTask('build',  ['clean:prod', 'sprite', 'merge-statics', 'build-index.html', 'replace', 'copy:prod']);
+  grunt.registerTask('build',  ['clean:prod', 'sprite', 'merge-statics', 'build-index.html', 'replace:mainPartial', 'copy:prod']);
   grunt.registerTask('build-dev',  ['clean:dev', 'sprite', 'build-index.html', 'copy:dev']);
 
   // Validate & Build
   grunt.registerTask('default', ['lint', 'build']);
 
   // Build stand alone app with nodewebkit
-  grunt.registerTask('desktop', ['clean:desktop', 'default', 'nwjs:windows']);
-  grunt.registerTask('desktop-mac', ['clean:desktop', 'default', 'nwjs:macos']);
+  grunt.registerTask('desktop', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:windows']);
+  grunt.registerTask('desktop-mac', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:macos']);
 
   // Start webserver and watch for changes
   grunt.registerTask('serve', ['build', 'connect:prod', 'open:prod', 'watch:prod']);

LICENSE

@@ -1,661 +1,202 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are 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.
-
-  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.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  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 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 work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  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 AGPL, see
-<http://www.gnu.org/licenses/>.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -69,18 +69,19 @@ Help is always welcome !
 
 ## License
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright 2016 Julian Descottes
 
-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 Affero General Public License for more details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 ## Mobile/Tablets
 

misc/scripts/piskel-root

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+// Writes the absolute path to the release build root to stdout
+var path = require('path');
+process.stdout.write(path.resolve(__dirname, '../../dest/prod') + '\n');

package.json

@@ -1,43 +1,56 @@
 {
-  "author": "Julian Descottes, Vincent Renaudin",
   "name": "piskel",
-  "main": "./dest/prod/index.html",
-  "description": "Web based 2d animations editor",
-  "version": "0.6.0",
+  "version": "0.8.0",
+  "description": "Pixel art editor",
+  "author": "Julian Descottes <julian.descottes@gmail.com>",
+  "contributors": [
+    "Vincent Renaudin"
+  ],
   "homepage": "http://github.com/juliandescottes/piskel",
+  "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/juliandescottes/piskel.git"
   },
+  "files": [
+    "dest/prod",
+    "misc/scripts/piskel-root"
+  ],
+  "bin": {
+    "piskel-root": "./misc/scripts/piskel-root"
+  },
+  "main": "./dest/prod/index.html",
   "scripts": {
     "test": "grunt test",
-    "start": "nodewebkit"
+    "start": "nodewebkit",
+    "preversion": "grunt test-local build",
+    "postversion": "git push && git push --tags && npm publish"
   },
   "devDependencies": {
     "dateformat": "1.0.11",
-    "grunt": "0.4.5",
-    "grunt-contrib-clean": "0.7.0",
-    "grunt-contrib-concat": "0.5.1",
-    "grunt-contrib-connect": "0.11.2",
-    "grunt-contrib-copy": "0.8.0",
-    "grunt-contrib-jshint": "0.11.1",
-    "grunt-contrib-uglify": "0.11.0",
-    "grunt-contrib-watch": "0.6.1",
+    "grunt": "^0.4.5",
+    "grunt-contrib-clean": "1.0.0",
+    "grunt-contrib-concat": "1.0.1",
+    "grunt-contrib-connect": "1.0.2",
+    "grunt-contrib-copy": "1.0.0",
+    "grunt-contrib-jshint": "1.0.0",
+    "grunt-contrib-uglify": "1.0.1",
+    "grunt-contrib-watch": "1.0.0",
     "grunt-ghost": "1.1.0",
-    "grunt-include-replace": "3.2.0",
-    "grunt-jscs": "2.5.0",
-    "grunt-karma": "0.12.1",
+    "grunt-include-replace": "4.0.1",
+    "grunt-jscs": "2.8.0",
+    "grunt-karma": "1.0.0",
     "grunt-leading-indent": "0.2.0",
-    "grunt-nw-builder": "2.0.0",
+    "grunt-nw-builder": "2.0.3",
     "grunt-open": "0.2.3",
-    "grunt-replace": "0.11.0",
-    "grunt-spritesmith": "6.1.0",
+    "grunt-replace": "1.0.1",
+    "grunt-spritesmith": "6.3.0",
     "jasmine-core": "2.1.0",
-    "karma": "0.13.15",
-    "karma-chrome-launcher": "0.2.2",
-    "karma-jasmine": "0.3.5",
-    "karma-phantomjs-launcher": "0.2.1",
-    "load-grunt-tasks": "3.1.0",
+    "karma": "0.13.21",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-jasmine": "1.0.2",
+    "karma-phantomjs-launcher": "0.2.3",
+    "load-grunt-tasks": "3.5.0",
     "phantomjs": "1.9.19"
   },
   "window": {

src/css/forms.css

@@ -14,6 +14,10 @@
   height: 23px;
 }
 
+.textfield[readonly="true"] {
+  background: transparent;
+}
+
 .textfield[disabled=disabled] {
   background : #3a3a3a;
 }

src/css/frames-list.css

@@ -25,9 +25,9 @@
 
   background-image: linear-gradient(45deg, #1D1D1D 20%, transparent 25%, transparent 75%, #1D1D1D 80%, #1D1D1D),
                     linear-gradient(-45deg, #1D1D1D 20%, transparent 25%, transparent 75%, #1D1D1D 80%, #1D1D1D);
-  background-size: 29px 45px;
+  background-size: 30px 40px;
   background-repeat: repeat-x;
-  background-position-x: 3px;
+  background-position: 3px 0;
   z-index: 10;
 }
 
@@ -37,8 +37,7 @@
 
 .bottom-overflow {
   bottom: -20px;
-  background-position-x: 0;
-  background-position-y: -23px;
+  background-position: 3px -20px;
 }
 
 .top-overflow-visible .top-overflow {
@@ -51,7 +50,7 @@
 
 .preview-list {
   list-style-type: none;
-  padding-right: 7px;
+  padding-right: 9px;
 }
 
 .add-frame-action {
@@ -158,13 +157,13 @@
 }
 
 .preview-tile.selected:after {
-  content: " ";
+  content: "";
   position: absolute;
   top: 38px;
-  right: -15px;
+  right: -9px;
   border: transparent 4px solid;
   border-left-color: gold;
-  border-width: 6px;
+  border-width: 6px 0 6px 6px;
   border-style: solid;
 }
 
@@ -175,7 +174,5 @@
 
 .preview-tile-drop-proxy {
   border: 3px dashed gold;
-  height: 90px;
-  border-radius: 9px;
   background-color: rgba(255, 215,0, 0.2);
 }

src/css/layout.css

@@ -13,6 +13,8 @@
 .column-wrapper {
   text-align: center;
   font-size: 0;
+  display: flex;
+
   position: absolute;
   left: 100px; /* Reserve room for tools on the left edge of the screen. */
   top: 0;
@@ -20,10 +22,6 @@
   bottom: 0;
 }
 
-.column {
-  display: inline-block;
-}
-
 .left-column {
   vertical-align: top;
   height: 100%;
@@ -36,10 +34,17 @@
 }
 
 .right-column {
+  box-sizing: border-box;
   vertical-align: top;
-  margin-left: 10px;
   height: 100%;
+
+  display: flex;
+  flex-direction: column;
   position: relative;
+
+  margin-left: 10px;
+  /* Add some padding for the absolutely positioned .cursor-coordinates */
+  padding-bottom: 20px;
 }
 
 .drawing-canvas-container {

src/css/settings-application.css

@@ -3,42 +3,37 @@
 /*******************************/
 
 .background-picker-wrapper {
+  display: inline-block;
+  width: 130px;
   overflow: hidden;
-  padding: 5px 5px 2px 5px;
+  vertical-align: middle;
+  margin-left: 5px;
 }
 
 .background-picker {
   cursor: pointer;
   float: left;
-  height: 35px;
-  width: 35px;
+  height: 14px;
+  width: 14px;
   background-color: transparent;
-  margin-right: 15px;
+  margin-right: 5px;
   padding: 1px;
   position: relative;
+  border: #888 2px solid;
 }
 
-.background-picker:after {
-  content: " ";
-  position: absolute;
-  top: -2px;
-  right: -2px;
-  bottom: -2px;
-  left: -2px;
+.background-picker:hover {
+  border-color: #eee;
 }
 
-.background-picker:hover:after {
-  border: #eee 1px solid;
-}
-
-.background-picker.selected:after {
-  border: gold 1px solid;
+.background-picker.selected {
+  border-color: gold;
 }
 
 .layer-opacity-input {
   margin: 5px;
   vertical-align: middle;
-  width: 145px;
+  width: 100px;
 }
 
 .layer-opacity-text {
@@ -53,9 +48,10 @@
 }
 
 .grid-width-select {
-  margin: 5px;
+  margin: 5px 5px 0 5px;
 }
 
-.settings-section--application-general > .settings-item > label {
-  display: block;
-}
+.settings-section-application > .settings-title {
+  /* Override the default 10px margin bottom for this panel */
+  margin-bottom: 15px;
+}

src/css/settings-export.css

@@ -57,17 +57,17 @@
   color: white;
 }
 
-.scaling-factor {
+.export-scale {
   margin-bottom: 10px;
 }
 
-.scaling-factor-input {
+.export-scale .scale-input {
   margin: 5px;
   vertical-align: middle;
-  width: 145px;
+  width: 150px;
 }
 
-.scaling-factor-text {
+.export-scale .scale-text {
   height: 31px;
   display: inline-block;
   line-height: 30px;
@@ -77,3 +77,107 @@
   border-radius: 3px;
   text-align: center;
 }
+
+.export-resize {
+  margin: 10px 0;
+  overflow: hidden;
+}
+
+.export-resize > * {
+  float: left;
+}
+
+.export-resize > *:not(:last-child) {
+  margin-right: 10px;
+}
+
+.export-resize > .resize-field {
+  width: 70px;
+}
+
+.export-resize > .resize-label {
+  height: 23px;
+  line-height: 23px;
+}
+
+.export-tabs {
+  overflow: hidden;
+  position: relative;
+}
+
+.export-tabs:after {
+  content: "";
+  display: block;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 1px;
+  z-index: 0;
+  background-color: gold;
+}
+
+.export-tab {
+  float: left;
+  cursor: pointer;
+  padding: 5px;
+  border: 1px solid transparent;
+  /* Make sure the tab and its border are positioned above the :after element; */
+  position: relative;
+  z-index: 1;
+}
+
+.export-tab.selected,
+.export-tab:hover {
+  color: gold;
+}
+
+.export-tab.selected {
+  border-color: gold gold #444 gold;
+  border-style: solid;
+  border-width: 1px;
+}
+
+.export-panel-header {
+  padding: 10px 5px 0px;
+}
+
+.export-info {
+  font-style: italic;
+  text-shadow: none;
+  font-weight: normal;
+}
+
+.export-panel-section {
+  padding: 5px;
+  margin-top: 10px;
+  border: 1px solid #5d5d5d;
+  border-radius: 2px;
+}
+
+.export-panel-row {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+}
+
+.export-panel-gif .button {
+  margin-right: 5px;
+  width: 75px;
+  flex-shrink: 0;
+}
+
+.export-panel-png .textfield {
+  width: 50px;
+}
+
+.png-export-dimension-info,
+.png-export-datauri-info {
+  margin-left: 5px;
+}
+
+#png-export-columns,
+#png-export-rows {
+  /* Override default textfield padding-right to keep the number spinners
+     aligned to the right. */
+  padding-right: 0;
+}

src/css/settings.css

@@ -72,7 +72,6 @@
 }
 
 .settings-title {
-  color : gold;
   margin-top: 20px;
   margin-bottom: 10px;
   text-transform: uppercase;

src/css/style.css

@@ -52,7 +52,6 @@ body {
 }
 
 .checkbox-fix {
-  vertical-align: -2px;
   margin-left: 0;
 }
 

src/css/toolbox-animated-preview.css

@@ -3,6 +3,8 @@
  */
 
 .preview-container {
+  flex-shrink: 0;
+
   border : 0 Solid black;
   border-radius:5px 0 0 5px;
   box-shadow : 0 0 2px rgba(0,0,0,0.2);

src/css/toolbox-layers-list.css

@@ -3,10 +3,18 @@
  * Layers container
  */
 .layers-list-container {
+  min-height: 85px;
+  display: flex;
+  flex-direction: column;
 }
 
+/**
+ * Layers title and toggle preview
+ */
+
 .layers-title {
   position: relative;
+  flex-shrink: 0;
 }
 
 .layers-toggle-preview {
@@ -30,31 +38,9 @@
   color : gold;
 }
 
-.layers-list {
-  font-size : 12px;
-}
-
-.layer-item {
-  height:24px;
-  line-height: 24px;
-  padding : 0 0 0 10px;
-  border-top: 1px solid #444;
-  cursor : pointer;
-}
-
-.layer-item:hover {
-  background : #222;
-}
-
-.current-layer-item,
-.current-layer-item:hover {
-  background : #333;
-  color: gold;
-}
-
-.layers-button-container {
-  overflow : hidden;
-}
+/**
+ * Layers buttons
+ */
 
 .layers-button {
   margin: 0;
@@ -62,11 +48,35 @@
   float : left;
 }
 
-/* @override */
-.layers-button-container .layers-button {
-  border-left-width: 0;
+/**
+ * Layers list
+ */
+
+.layers-list {
+  font-size : 12px;
+  overflow: auto;
 }
 
-.layers-button:last-child {
-  border-right-width: 0;
+.layer-item {
+  position: relative;
+  height:24px;
+  line-height: 24px;
+  padding: 0 0 0 10px;
+  border-top: 1px solid #444;
+  cursor: pointer;
+}
+
+.layer-item:hover {
+  background : #222;
+}
+
+.layer-item-opacity {
+  position: absolute;
+  right: 8px;
+}
+
+.current-layer-item,
+.current-layer-item:hover {
+  background : #333;
+  color: gold;
 }

src/css/toolbox-palettes-list.css

@@ -1,148 +1,174 @@
+.palettes-list-container {
+  min-height: 100px;
+  display: flex;
+  flex-direction: column;
+}
+
 .palettes-title {
-    background-size: 22px;
-    background-repeat: no-repeat;
-    background-position: 97%;
-}
-.palettes-list-colors {
-    overflow: auto;
-    max-height: 160px;
-}
-.palettes-list-color {
-    cursor: pointer;
-    float: left;
-    margin: 0 0 5px 5px;
-    width: 32px;
-    height: 32px;
-    position: relative;
+  flex-shrink: 0;
+  background-size: 22px;
+  background-repeat: no-repeat;
+  background-position: 97%;
 }
 
-.palettes-list-color:nth-child(-n+10):after {
-    position: absolute;
-    top: 0;
-    right: 0;
+/**
+ * Palettes action buttons
+ */
 
-    background-color: black;
-    color: gold;
-
-    font-family: Tahoma;
-    font-size: 0.5em;
-    font-weight: bold;
-
-    padding: 2px 3px 2px 3px;
-    border-radius: 0 0 0 2px;
-}
-
-.palettes-list-color:nth-child(1):after {
-    content: "1";
-}
-.palettes-list-color:nth-child(2):after {
-    content: "2";
-}
-.palettes-list-color:nth-child(3):after {
-    content: "3";
-}
-.palettes-list-color:nth-child(4):after {
-    content: "4";
-}
-.palettes-list-color:nth-child(5):after {
-    content: "5";
-}
-.palettes-list-color:nth-child(6):after {
-    content: "6";
-}
-.palettes-list-color:nth-child(7):after {
-    content: "7";
-}
-.palettes-list-color:nth-child(8):after {
-    content: "8";
-}
-.palettes-list-color:nth-child(9):after {
-    content: "9";
-}
-
-.palettes-list-color:nth-child(-n+5) {
-    margin-top: 5px;
-}
-
-.palettes-list-color div {
-    width: 32px;
-    height: 32px;
-}
-.palettes-list-has-scrollbar .palettes-list-color, .palettes-list-has-scrollbar .palettes-list-color div {
-    width: 29px
-}
-.palettes-list-primary-color:before, .palettes-list-secondary-color:before {
-    content: "";
-    position: absolute;
-    bottom: 1px;
-    display: inline-block;
-    border: 7px solid gold;
-    border-top-color: transparent;
-    width: 0px;
-    height: 0px;
-}
-.palettes-list-primary-color:before {
-    left: 1px;
-    border-right-color: transparent;
-}
-.palettes-list-secondary-color:before {
-    right: 1px;
-    border-left-color: transparent;
-}
-.palettes-list-actions {
-    background-color: #3f3f3f;
-    border-bottom-color: #222;
-    height: 24px;
-    padding: 0;
-    overflow: hidden;
+.palettes-list-container .toolbox-buttons {
+  background-color: #3f3f3f;
+  height: 24px;
+  padding: 0;
 }
 
 .palettes-list-button,
 .palettes-list-select {
-    margin: 0;
-    float: left;
+  margin: 0;
+  float: left;
 }
 
 .palettes-list-button {
-    width: 16.66667%;
+  width: 16.66667%;
 }
+
 .palettes-list-select {
-    width: 66.66667%;
-    height: 100%;
-    padding: 0 5px 0 5px;
+  width: 66.66667%;
+  height: 100%;
+  padding: 0 5px 0 5px;
 
-    border-style: solid;
-    border-width: 1px 0 1px 0;
+  color: #aaa;
+  font-size : 0.75em;
 
-    color: #aaa;
-    font-size : 0.75em;
+  text-align:left;
+  font-weight: normal;
 
-    /*thanks firefox, you suck*/
-    text-align:left;
-    /*text-shadow:none;*/
-    font-weight: normal;
-
-    transition : background-color 0.3s, color 0.3s;
-    cursor:pointer;
+  transition : background-color 0.3s, color 0.3s;
+  cursor:pointer;
 }
 
-.palettes-list-select:hover {
-    color: white;
-    background-color: #484848;
+.palettes-list-select:hover,
+.palettes-list-select:focus {
+  background-color: #484848;
+  color: white;
 }
 
 .palettes-list-select:focus {
-    background-color: #484848;
-    color: white;
-    outline: none;
+  outline: none;
 }
 
-.palettes-list-no-colors {
-    height: 42px;
-    width: 100%;
-    color: grey;
-    font-size: 0.7em;
-    font-style: italic;
-    line-height: 42px;
-    text-align: center
+/*
+ * Palette colors list
+ */
+
+.palettes-list-colors {
+  height: 100%;
+  max-height: 160px;
+  overflow: auto;
+  padding-top: 5px;
+}
+
+.palettes-list-color {
+  cursor: pointer;
+  float: left;
+  margin: 0 0 5px 5px;
+  width: calc((100% - 30px) / 5);
+  height: 32px;
+  position: relative;
+}
+
+.palettes-list-color div {
+  height: 100%;
+}
+
+/*
+ * Placeholder when no color is available in the current palette
+ */
+
+.palettes-list-no-colors {
+  height: 35px;
+  line-height: 35px;
+  width: 100%;
+  color: gray;
+  font-size: 0.7em;
+  font-style: italic;
+  text-align: center
+}
+
+/*
+ * Primary and secondary color markers
+ */
+
+.palettes-list-primary-color:before, .palettes-list-secondary-color:before {
+  content: "";
+  position: absolute;
+  bottom: 1px;
+  display: inline-block;
+  background: url('data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20height%3D%2215%22%20width%3D%2215%22%3E%3Cpath%20stroke%3D%22gold%22%20stroke-width%3D%222%22%20d%3D%22M1%203v10h10z%22/%3E%3C/svg%3E');
+  width: 14px;
+  height: 14px;
+}
+
+.palettes-list-primary-color:before {
+  left: 1px;
+}
+
+.palettes-list-secondary-color:before {
+  right: 1px;
+  background: url('data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20height%3D%2215%22%20width%3D%2215%22%3E%3Cpath%20stroke%3D%22gold%22%20stroke-width%3D%222%22%20d%3D%22M3%2013h10V3z%22/%3E%3C/svg%3E');
+}
+
+/*
+ * Color index for the 9 first colors
+ */
+
+.palettes-list-color:nth-child(-n+10):after {
+  position: absolute;
+  top: 0;
+  right: 0;
+
+  background-color: black;
+  color: gold;
+
+  font-family: Tahoma;
+  font-size: 0.5em;
+  font-weight: bold;
+
+  padding: 2px 3px 2px 3px;
+  border-radius: 0 0 0 2px;
+}
+
+.palettes-list-color:nth-child(1):after {
+  content: "1";
+}
+
+.palettes-list-color:nth-child(2):after {
+  content: "2";
+}
+
+.palettes-list-color:nth-child(3):after {
+  content: "3";
+}
+
+.palettes-list-color:nth-child(4):after {
+  content: "4";
+}
+
+.palettes-list-color:nth-child(5):after {
+  content: "5";
+}
+
+.palettes-list-color:nth-child(6):after {
+  content: "6";
+}
+
+.palettes-list-color:nth-child(7):after {
+  content: "7";
+}
+
+.palettes-list-color:nth-child(8):after {
+  content: "8";
+}
+
+.palettes-list-color:nth-child(9):after {
+  content: "9";
 }

src/css/toolbox.css

@@ -1,11 +1,10 @@
 .toolbox-container {
-  border: 4px solid #888;
+  border: 2px solid #888;
   font-size: medium;
   color: white;
   text-align: left;
-  border-radius: 4px;
+  border-radius: 2px;
   margin-top: 5px;
-  margin-bottom: 10px;
   overflow: hidden;
 }
 
@@ -13,5 +12,23 @@
   padding: 8px;
   margin: 0;
   font-size: 15px;
+  /* reset for firefox */
+  height: 16px;
   background: #222;
-}
+}
+
+.toolbox-buttons {
+  flex-shrink: 0;
+  overflow: hidden;
+  border-top: 1px solid #666;
+  border-bottom: 1px solid #222;
+}
+
+.toolbox-buttons .button {
+  /* Override border propery on .button elements from form.css */
+  border-width: 0 1px 0 0;
+}
+
+.toolbox-buttons button:last-child {
+  border-right-width: 0;
+}

src/css/transformations.css

@@ -1,3 +1,6 @@
+.transformations-container {
+  flex-shrink: 0;
+}
 
 .transformations-container .tool-icon {
   float:left;

src/index.html

@@ -22,26 +22,10 @@
     color:white;">
       <span style="top:45%">Loading Piskel ...</span>
   </div>
+  <!--standalone-start-->
+  @@include('templates/debug-header.html', {})
+  <!--standalone-end-->
 
-  <style type="text/css">
-    #main-wrapper {
-      margin-top: 40px;
-    }
-
-    .fake-piskelapp-header {
-      text-align: center;
-      height: 40px;
-      line-height: 40px;
-      font-size: 24px;
-      background: black;
-      color: gold;
-    }
-
-    .piskel-name.piskel-name-saving {
-      color: red;
-    }
-  </style>
-  <div class="fake-piskelapp-header"><span class="piskel-name"></span></div>
   <!-- the comment below indicates the beginning of markup reused by the editor integrated in piskelapp.com -->
   <!-- do not delete, do not move :) -->
   <!--body-main-start-->
@@ -101,6 +85,10 @@
   @@include('templates/settings/save.html', {})
   @@include('templates/settings/import.html', {})
   @@include('templates/settings/export.html', {})
+  @@include('templates/settings/export/png.html', {})
+  @@include('templates/settings/export/gif.html', {})
+  @@include('templates/settings/export/zip.html', {})
+  @@include('templates/settings/export/misc.html', {})
 
   <script type="text/javascript">
     @@include('piskel-boot.js', {})

src/js/Constants.js

@@ -14,13 +14,12 @@ var Constants = {
 
   MAX_PALETTE_COLORS : 100,
 
-  MINIMUM_ZOOM : 1,
-
   PREVIEW_FILM_SIZE : 96,
   ANIMATED_PREVIEW_WIDTH : 200,
 
   DEFAULT_PEN_COLOR : '#000000',
   TRANSPARENT_COLOR : 'rgba(0, 0, 0, 0)',
+  SEAMLESS_MODE_OVERLAY_COLOR : 'rgba(255, 255, 255, 0.5)',
 
   CURRENT_COLORS_PALETTE_ID : '__current-colors',
 

src/js/Events.js

@@ -72,6 +72,7 @@ var Events = {
   HIDE_PROGRESS: 'HIDE_PROGRESS',
 
   ZOOM_CHANGED : 'ZOOM_CHANGED',
+  EXPORT_SCALE_CHANGED : 'EXPORT_SCALE_CHANGED',
 
   CURRENT_COLORS_UPDATED : 'CURRENT_COLORS_UPDATED',
 

src/js/app.js

@@ -124,10 +124,12 @@
       this.storageService = new pskl.service.storage.StorageService(this.piskelController);
       this.storageService.init();
 
+      this.importService = new pskl.service.ImportService(this.piskelController, this.previewController);
+
       this.imageUploadService = new pskl.service.ImageUploadService();
       this.imageUploadService.init();
 
-      this.savedStatusService = new pskl.service.SavedStatusService(this.piskelController);
+      this.savedStatusService = new pskl.service.SavedStatusService(this.piskelController, this.historyService);
       this.savedStatusService.init();
 
       this.backupService = new pskl.service.BackupService(this.piskelController);
@@ -203,9 +205,14 @@
     },
 
     getFirstFrameAsPng : function () {
-      var firstFrame = this.piskelController.getFrameAt(0);
-      var firstFrameCanvas = pskl.utils.FrameUtils.toImage(firstFrame);
-      return firstFrameCanvas.toDataURL('image/png');
+      var frame = pskl.utils.LayerUtils.mergeFrameAt(this.piskelController.getLayers(), 0);
+      var canvas;
+      if (frame instanceof pskl.model.frame.RenderedFrame) {
+        canvas = pskl.utils.CanvasUtils.createFromImage(frame.getRenderedFrame());
+      } else {
+        canvas = pskl.utils.FrameUtils.toImage(frame);
+      }
+      return canvas.toDataURL('image/png');
     },
 
     getFramesheetAsPng : function () {

src/js/controller/FramesListController.js

@@ -124,9 +124,11 @@
   ns.FramesListController.prototype.initDragndropBehavior_ = function () {
 
     $('#preview-list').sortable({
-      placeholder: 'preview-tile-drop-proxy',
+      placeholder: 'preview-tile preview-tile-drop-proxy',
       update: $.proxy(this.onUpdate_, this),
-      items: '.preview-tile'
+      items: '.preview-tile',
+      axis: 'y',
+      tolerance: 'pointer'
     });
     $('#preview-list').disableSelection();
   };

src/js/controller/LayersListController.js

@@ -88,7 +88,8 @@
     var layerItemHtml = pskl.utils.Template.replace(this.layerItemTemplate_, {
       'layername' : layer.getName(),
       'layerindex' : index,
-      'isselected:current-layer-item' : isSelected
+      'isselected:current-layer-item' : isSelected,
+      'opacity': layer.getOpacity()
     });
     var layerItem = pskl.utils.Template.createFromHTML(layerItemHtml);
     this.layersListEl.insertBefore(layerItem, this.layersListEl.firstChild);
@@ -102,6 +103,11 @@
     } else if (el.classList.contains('layer-item')) {
       index = el.dataset.layerIndex;
       this.piskelController.setCurrentLayerIndex(parseInt(index, 10));
+    } else if (el.classList.contains('layer-item-opacity')) {
+      index = pskl.utils.Dom.getData(el, 'layerIndex');
+      var layer = this.piskelController.getLayerAt(parseInt(index, 10));
+      var opacity = window.prompt('Set layer opacity (value between 0 and 1)', layer.getOpacity());
+      this.piskelController.setLayerOpacityAt(index, opacity);
     }
   };
 

src/js/controller/PaletteController.js

@@ -48,10 +48,18 @@
    */
   ns.PaletteController.prototype.onPickerChange_ = function(evt, isPrimary) {
     var inputPicker = $(evt.target);
+    var color = inputPicker.val();
+
+    if (color != Constants.TRANSPARENT_COLOR) {
+      // Unless the color is TRANSPARENT_COLOR, format it to hexstring, as
+      // expected by the rest of the application.
+      color = window.tinycolor(color).toHexString();
+    }
+
     if (evt.data.isPrimary) {
-      this.setPrimaryColor_(inputPicker.val());
+      this.setPrimaryColor_(color);
     } else {
-      this.setSecondaryColor_(inputPicker.val());
+      this.setSecondaryColor_(color);
     }
   };
 
@@ -110,7 +118,8 @@
   };
 
   ns.PaletteController.prototype.setTitleOnPicker_ = function (title, colorPicker) {
-    var spectrumInputSelector = '.sp-replacer';
-    colorPicker.next(spectrumInputSelector).attr('title', title);
+    var parent = colorPicker.parent();
+    title = parent.data('initial-title') + '<br/>' + title;
+    parent.attr('data-original-title', title);
   };
 })();

src/js/controller/PalettesListController.js

@@ -4,12 +4,6 @@
   var PRIMARY_COLOR_CLASSNAME = 'palettes-list-primary-color';
   var SECONDARY_COLOR_CLASSNAME = 'palettes-list-secondary-color';
 
-  var HAS_SCROLL_CLASSNAME = 'palettes-list-has-scrollbar';
-  // well ... I know that if there are more than 20 colors, a scrollbar will be displayed
-  // It's linked to the max-height: 160px; defined in toolbox-palette-list.css !
-  // I apologize to my future self for this one.
-  var NO_SCROLL_MAX_COLORS = 20;
-
   ns.PalettesListController = function (usedColorService) {
     this.usedColorService = usedColorService;
     this.paletteService = pskl.app.paletteService;
@@ -67,13 +61,6 @@
       this.colorListContainer_.innerHTML = html;
 
       this.highlightSelectedColors();
-
-      var hasScrollbar = colors.length > NO_SCROLL_MAX_COLORS;
-      if (hasScrollbar && !pskl.utils.UserAgent.isChrome) {
-        this.colorListContainer_.classList.add(HAS_SCROLL_CLASSNAME);
-      } else {
-        this.colorListContainer_.classList.remove(HAS_SCROLL_CLASSNAME);
-      }
     } else {
       this.colorListContainer_.innerHTML = pskl.utils.Template.get('palettes-list-no-colors-partial');
     }

src/js/controller/TransformationsController.js

@@ -5,7 +5,8 @@
     this.tools = [
       new pskl.tools.transform.Flip(),
       new pskl.tools.transform.Rotate(),
-      new pskl.tools.transform.Clone()
+      new pskl.tools.transform.Clone(),
+      new pskl.tools.transform.Center()
     ];
 
     this.toolIconBuilder = new pskl.tools.ToolIconBuilder();

src/js/controller/dialogs/ImportImageController.js

@@ -171,84 +171,26 @@
   };
 
   ns.ImportImageController.prototype.importImageToPiskel_ = function () {
-    var image = this.importedImage_;
-    if (image) {
+    if (this.importedImage_) {
       if (window.confirm('You are about to create a new Piskel, unsaved changes will be lost.')) {
-        var gifLoader = new window.SuperGif({
-          gif : image
-        });
-
-        var resizeW = this.resizeWidth.val();
-        var resizeH = this.resizeHeight.val();
-
-        gifLoader.load({
-          success : function () {
-            var images = gifLoader.getFrames().map(function (frame) {
-              return pskl.utils.CanvasUtils.createFromImageData(frame.data);
-            });
-
-            if (this.getImportType_() === 'single' || images.length > 1) {
-              // Single image import or animated gif
-              this.createPiskelFromImages_(images, resizeW, resizeH);
-            } else {
-              // Spritesheet
-              this.createImagesFromSheet_(images[0]);
-            }
-            this.closeDialog();
-          }.bind(this),
-          error: function () {
-            if (this.getImportType_() === 'single') {
-              // Single image
-              this.createPiskelFromImages_([image], resizeW, resizeH);
-            } else {
-              // Spritesheet
-              this.createImagesFromSheet_(image);
-            }
-            this.closeDialog();
-          }.bind(this)
-        });
-
+        pskl.app.importService.newPiskelFromImage(
+          this.importedImage_,
+          {
+            importType: this.getImportType_(),
+            frameSizeX: this.getImportType_() === 'single' ?
+                this.resizeWidth.val() : this.sanitizeInputValue_(this.frameSizeX, 1),
+            frameSizeY: this.getImportType_() === 'single' ?
+                this.resizeHeight.val() : this.sanitizeInputValue_(this.frameSizeY, 1),
+            frameOffsetX: this.sanitizeInputValue_(this.frameOffsetX, 0),
+            frameOffsetY: this.sanitizeInputValue_(this.frameOffsetY, 0),
+            smoothing: !!this.smoothResize.prop('checked')
+          },
+          this.closeDialog.bind(this)
+        );
       }
     }
   };
 
-  ns.ImportImageController.prototype.createImagesFromSheet_ = function (image) {
-    var x = this.sanitizeInputValue_(this.frameOffsetX, 0);
-    var y = this.sanitizeInputValue_(this.frameOffsetY, 0);
-    var w = this.sanitizeInputValue_(this.frameSizeX, 1);
-    var h = this.sanitizeInputValue_(this.frameSizeY, 1);
-
-    var images = pskl.utils.CanvasUtils.createFramesFromImage(
-      image,
-      x,
-      y,
-      w,
-      h,
-      /*useHorizonalStrips=*/ true,
-      /*ignoreEmptyFrames=*/ true);
-    this.createPiskelFromImages_(images, w, h);
-  };
-
-  ns.ImportImageController.prototype.createFramesFromImages_ = function (images, w, h) {
-    var smoothing = !!this.smoothResize.prop('checked');
-
-    var frames = images.map(function (image) {
-      var resizedImage = pskl.utils.ImageResizer.resize(image, w, h, smoothing);
-      return pskl.utils.FrameUtils.createFromImage(resizedImage);
-    });
-    return frames;
-  };
-
-  ns.ImportImageController.prototype.createPiskelFromImages_ = function (images, w, h) {
-    var frames = this.createFramesFromImages_(images, w, h);
-    var layer = pskl.model.Layer.fromFrames('Layer 1', frames);
-    var descriptor = new pskl.model.piskel.Descriptor('Imported piskel', '');
-    var piskel = pskl.model.Piskel.fromLayers([layer], descriptor);
-
-    pskl.app.piskelController.setPiskel(piskel);
-    pskl.app.previewController.setFPS(Constants.DEFAULT.FPS);
-  };
-
   ns.ImportImageController.prototype.drawFrameGrid_ = function (frameX, frameY, frameW, frameH) {
     if (!this.importedImage_) {
       return;

src/js/controller/piskel/PiskelController.js

@@ -90,17 +90,14 @@
     return this.piskel;
   };
 
-  ns.PiskelController.prototype.getFrameAt = function (index) {
-    var hash = [];
-    var frames = this.getLayers().map(function (l) {
-      var frame = l.getFrameAt(index);
-      hash.push(frame.getHash());
-      return frame;
+  ns.PiskelController.prototype.isTransparent = function () {
+    return this.getLayers().some(function (l) {
+      return l.isTransparent();
     });
-    var mergedFrame = pskl.utils.FrameUtils.merge(frames);
-    mergedFrame.id = hash.join('-');
-    mergedFrame.version = 0;
-    return mergedFrame;
+  };
+
+  ns.PiskelController.prototype.renderFrameAt = function (index, preserveOpacity) {
+    return pskl.utils.LayerUtils.flattenFrameAt(this.getLayers(), index, preserveOpacity);
   };
 
   ns.PiskelController.prototype.hasFrameAt = function (index) {
@@ -205,6 +202,13 @@
     }
   };
 
+  ns.PiskelController.prototype.setLayerOpacityAt = function (index, opacity) {
+    var layer = this.getLayerByIndex(index);
+    if (layer) {
+      layer.setOpacity(opacity);
+    }
+  };
+
   ns.PiskelController.prototype.mergeDownLayerAt = function (index) {
     var layer = this.getLayerByIndex(index);
     var downLayer = this.getLayerByIndex(index - 1);

src/js/controller/piskel/PublicPiskelController.js

@@ -29,6 +29,7 @@
     this.saveWrap_('moveLayerUp', true);
     this.saveWrap_('moveLayerDown', true);
     this.saveWrap_('removeCurrentLayer', true);
+    this.saveWrap_('setLayerOpacityAt', true);
 
     var shortcuts = pskl.service.keyboard.Shortcuts;
     pskl.app.shortcutService.registerShortcut(shortcuts.MISC.PREVIOUS_FRAME, this.selectPreviousFrame.bind(this));

src/js/controller/preview/PreviewController.js

@@ -116,8 +116,8 @@
 
   ns.PreviewController.prototype.updateZoom_ = function () {
     var originalSizeEnabled = pskl.UserSettings.get(pskl.UserSettings.ORIGINAL_SIZE_PREVIEW);
-    var tiledPreviewEnabled = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW);
-    var useOriginalSize = originalSizeEnabled || tiledPreviewEnabled;
+    var seamlessModeEnabled = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_MODE);
+    var useOriginalSize = originalSizeEnabled || seamlessModeEnabled;
 
     var zoom = useOriginalSize ? 1 : this.calculateZoom_();
     this.renderer.setZoom(zoom);
@@ -168,9 +168,9 @@
   ns.PreviewController.prototype.render = function (delta) {
     this.elapsedTime += delta;
     var index = this.getNextIndex_(delta);
-    if (this.shoudlRender_() || this.currentIndex != index) {
+    if (this.shouldRender_() || this.currentIndex != index) {
       this.currentIndex = index;
-      var frame = this.piskelController.getFrameAt(this.currentIndex);
+      var frame = pskl.utils.LayerUtils.mergeFrameAt(this.piskelController.getLayers(), index);
       this.renderer.render(frame);
       this.renderFlag = false;
 
@@ -208,12 +208,12 @@
   };
 
   ns.PreviewController.prototype.updateContainerDimensions_ = function () {
-    var isTiled = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW);
-    this.renderer.setRepeated(isTiled);
+    var isSeamless = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_MODE);
+    this.renderer.setRepeated(isSeamless);
 
     var height, width;
 
-    if (isTiled) {
+    if (isSeamless) {
       height = PREVIEW_SIZE;
       width = PREVIEW_SIZE;
     } else {
@@ -240,7 +240,7 @@
     this.renderFlag = bool;
   };
 
-  ns.PreviewController.prototype.shoudlRender_ = function () {
+  ns.PreviewController.prototype.shouldRender_ = function () {
     return this.renderFlag || this.popupPreviewController.renderFlag;
   };
 

src/js/controller/settings/ApplicationSettingsController.js

@@ -26,13 +26,13 @@
 
     this.addEventListener(gridSelect, 'change', this.onGridWidthChange_);
 
-    // Tiled preview
-    var tiledPreview = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW);
-    var tiledPreviewCheckbox = document.querySelector('.tiled-preview-checkbox');
-    if (tiledPreview) {
-      tiledPreviewCheckbox.setAttribute('checked', tiledPreview);
+    // Seamless mode
+    var seamlessMode = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_MODE);
+    var seamlessModeCheckbox = document.querySelector('.seamless-mode-checkbox');
+    if (seamlessMode) {
+      seamlessModeCheckbox.setAttribute('checked', seamlessMode);
     }
-    this.addEventListener(tiledPreviewCheckbox, 'change', this.onTiledPreviewChange_);
+    this.addEventListener(seamlessModeCheckbox, 'change', this.onSeamlessModeChange_);
 
     // Max FPS
     var maxFpsInput = document.querySelector('.max-fps-input');
@@ -55,8 +55,8 @@
     pskl.UserSettings.set(pskl.UserSettings.GRID_WIDTH, width);
   };
 
-  ns.ApplicationSettingsController.prototype.onTiledPreviewChange_ = function (evt) {
-    pskl.UserSettings.set(pskl.UserSettings.TILED_PREVIEW, evt.currentTarget.checked);
+  ns.ApplicationSettingsController.prototype.onSeamlessModeChange_ = function (evt) {
+    pskl.UserSettings.set(pskl.UserSettings.SEAMLESS_MODE, evt.currentTarget.checked);
   };
 
   ns.ApplicationSettingsController.prototype.onBackgroundClick_ = function (evt) {

src/js/controller/settings/SettingsController.js

@@ -12,7 +12,7 @@
     },
     'export' : {
       template : 'templates/settings/export.html',
-      controller : ns.exportimage.ImageExportController
+      controller : ns.exportimage.ExportController
     },
     'import' : {
       template : 'templates/settings/import.html',
@@ -33,6 +33,7 @@
 
   ns.SettingsController = function (piskelController) {
     this.piskelController = piskelController;
+    this.closeDrawerShortcut = pskl.service.keyboard.Shortcuts.MISC.CLOSE_POPUP;
     this.settingsContainer = document.querySelector('[data-pskl-controller=settings]');
     this.drawerContainer = document.getElementById('drawer-container');
     this.isExpanded = false;
@@ -87,6 +88,8 @@
     this.currentController = new settings[setting].controller(this.piskelController);
     this.currentController.init();
 
+    pskl.app.shortcutService.registerShortcut(this.closeDrawerShortcut, this.closeDrawer_.bind(this));
+
     pskl.utils.Dom.removeClass(SEL_SETTING_CLS);
     var selectedSettingButton = document.querySelector('[data-setting=' + setting + ']');
     if (selectedSettingButton) {
@@ -109,9 +112,12 @@
   };
 
   ns.SettingsController.prototype.destroyCurrentController_ = function () {
-    if (this.currentController && this.currentController.destroy) {
-      this.currentController.destroy();
-      this.currentController = null;
+    if (this.currentController) {
+      pskl.app.shortcutService.unregisterShortcut(this.closeDrawerShortcut);
+      if (this.currentController.destroy) {
+        this.currentController.destroy();
+        this.currentController = null;
+      }
     }
   };
 })();

src/js/controller/settings/exportimage/ExportController.js

@@ -0,0 +1,125 @@
+(function () {
+  var ns = $.namespace('pskl.controller.settings.exportimage');
+
+  var tabs = {
+    'png' : {
+      template : 'templates/settings/export/png.html',
+      controller : ns.PngExportController
+    },
+    'gif' : {
+      template : 'templates/settings/export/gif.html',
+      controller : ns.GifExportController
+    },
+    'zip' : {
+      template : 'templates/settings/export/zip.html',
+      controller : ns.ZipExportController
+    },
+    'misc' : {
+      template : 'templates/settings/export/misc.html',
+      controller : ns.MiscExportController
+    }
+  };
+
+  ns.ExportController = function (piskelController) {
+    this.piskelController = piskelController;
+    this.onSizeInputChange_ = this.onSizeInputChange_.bind(this);
+  };
+
+  pskl.utils.inherit(ns.ExportController, pskl.controller.settings.AbstractSettingController);
+
+  ns.ExportController.prototype.init = function () {
+    // Initialize zoom controls
+    this.scaleInput = document.querySelector('.export-scale .scale-input');
+    this.addEventListener(this.scaleInput, 'change', this.onScaleChange_);
+    this.addEventListener(this.scaleInput, 'input', this.onScaleChange_);
+
+    this.widthInput = document.querySelector('.export-resize .resize-width');
+    this.heightInput = document.querySelector('.export-resize .resize-height');
+    var scale = pskl.UserSettings.get(pskl.UserSettings.EXPORT_SCALE);
+    this.sizeInputWidget = new pskl.widgets.SizeInput({
+      widthInput : this.widthInput,
+      heightInput : this.heightInput,
+      initWidth : this.piskelController.getWidth() * scale,
+      initHeight : this.piskelController.getHeight() * scale,
+      onChange : this.onSizeInputChange_
+    });
+
+    this.onSizeInputChange_();
+
+    // Initialize tabs and panel
+    this.exportPanel = document.querySelector('.export-panel');
+    this.exportTabs = document.querySelector('.export-tabs');
+    this.addEventListener(this.exportTabs, 'click', this.onTabsClicked_);
+
+    var tab = pskl.UserSettings.get(pskl.UserSettings.EXPORT_TAB);
+    this.selectTab(tab);
+  };
+
+  ns.ExportController.prototype.destroy = function () {
+    this.sizeInputWidget.destroy();
+    this.currentController.destroy();
+    this.superclass.destroy.call(this);
+  };
+
+  ns.ExportController.prototype.selectTab = function (tabId) {
+    if (!tabs[tabId] || this.currentTab == tabId) {
+      return;
+    }
+
+    if (this.currentController) {
+      this.currentController.destroy();
+    }
+
+    this.exportPanel.innerHTML = pskl.utils.Template.get(tabs[tabId].template);
+    this.currentController = new tabs[tabId].controller(this.piskelController, this);
+    this.currentController.init();
+    this.currentTab = tabId;
+    pskl.UserSettings.set(pskl.UserSettings.EXPORT_TAB, tabId);
+
+    var selectedTab = this.exportTabs.querySelector('.selected');
+    if (selectedTab) {
+      selectedTab.classList.remove('selected');
+    }
+    this.exportTabs.querySelector('[data-tab-id="' + tabId + '"]').classList.add('selected');
+  };
+
+  ns.ExportController.prototype.onTabsClicked_ = function (e) {
+    var tabId = pskl.utils.Dom.getData(e.target, 'tabId');
+    this.selectTab(tabId);
+  };
+
+  ns.ExportController.prototype.onScaleChange_ = function () {
+    var value = parseFloat(this.scaleInput.value);
+    if (!isNaN(value)) {
+      if (Math.round(this.getExportZoom()) != value) {
+        this.sizeInputWidget.setWidth(this.piskelController.getWidth() * value);
+      }
+      pskl.UserSettings.set(pskl.UserSettings.EXPORT_SCALE, value);
+    }
+  };
+
+  ns.ExportController.prototype.updateScaleText_ = function (scale) {
+    scale = scale.toFixed(1);
+    var scaleText = document.querySelector('.export-scale .scale-text');
+    scaleText.innerHTML = scale + 'x';
+  };
+
+  ns.ExportController.prototype.onSizeInputChange_ = function () {
+    var zoom = this.getExportZoom();
+    if (isNaN(zoom)) {
+      return;
+    }
+
+    this.updateScaleText_(zoom);
+    $.publish(Events.EXPORT_SCALE_CHANGED);
+
+    this.scaleInput.value = Math.round(zoom);
+    if (zoom >= 1 && zoom <= 32) {
+      this.onScaleChange_();
+    }
+  };
+
+  ns.ExportController.prototype.getExportZoom = function () {
+    return parseInt(this.widthInput.value, 10) / this.piskelController.getWidth();
+  };
+})();

src/js/controller/settings/exportimage/GifExportController.js

@@ -3,49 +3,29 @@
 
   var URL_MAX_LENGTH = 30;
   var MAX_GIF_COLORS = 256;
-  var MAX_EXPORT_ZOOM = 20;
-  var DEFAULT_EXPORT_ZOOM = 10;
   var MAGIC_PINK = '#FF00FF';
   var WHITE = '#FFFFFF';
 
-  ns.GifExportController = function (piskelController) {
+  ns.GifExportController = function (piskelController, exportController) {
     this.piskelController = piskelController;
+    this.exportController = exportController;
   };
 
   pskl.utils.inherit(ns.GifExportController, pskl.controller.settings.AbstractSettingController);
 
-  /**
-   * List of Resolutions applicable for Gif export
-   * @static
-   * @type {Array} array of Objects {zoom:{Number}, default:{Boolean}}
-   */
-  ns.GifExportController.RESOLUTIONS = [];
-  for (var i = 1 ; i <= MAX_EXPORT_ZOOM ; i++) {
-    ns.GifExportController.RESOLUTIONS.push({
-      zoom : i
-    });
-  }
-
   ns.GifExportController.prototype.init = function () {
 
     this.uploadStatusContainerEl = document.querySelector('.gif-upload-status');
     this.previewContainerEl = document.querySelector('.gif-export-preview');
-    this.widthInput = document.querySelector('.export-gif-resize-width');
-    this.heightInput = document.querySelector('.export-gif-resize-height');
     this.uploadButton = document.querySelector('.gif-upload-button');
     this.downloadButton = document.querySelector('.gif-download-button');
 
-    this.sizeInputWidget = new pskl.widgets.SizeInput(
-      this.widthInput, this.heightInput,
-      this.piskelController.getWidth(), this.piskelController.getHeight());
-
     this.addEventListener(this.uploadButton, 'click', this.onUploadButtonClick_);
     this.addEventListener(this.downloadButton, 'click', this.onDownloadButtonClick_);
   };
 
-  ns.GifExportController.prototype.destroy = function () {
-    this.sizeInputWidget.destroy();
-    this.superclass.destroy.call(this);
+  ns.GifExportController.prototype.getZoom_ = function () {
+    return this.exportController.getExportZoom();
   };
 
   ns.GifExportController.prototype.onUploadButtonClick_ = function (evt) {
@@ -98,14 +78,12 @@
     this.previewContainerEl.innerHTML = '<div><img style="max-width:32px;" src="' + src + '"/></div>';
   };
 
-  ns.GifExportController.prototype.getZoom_ = function () {
-    return parseInt(this.widthInput.value, 10) / this.piskelController.getWidth();
-  };
-
   ns.GifExportController.prototype.renderAsImageDataAnimatedGIF = function(zoom, fps, cb) {
     var currentColors = pskl.app.currentColorsService.getCurrentColors();
 
-    var preserveColors = currentColors.length < MAX_GIF_COLORS;
+    var layers = this.piskelController.getLayers();
+    var isTransparent = layers.some(function (l) {return l.isTransparent();});
+    var preserveColors = !isTransparent && currentColors.length < MAX_GIF_COLORS;
 
     var transparentColor, transparent;
     // transparency only supported if preserveColors is true, see Issue #357
@@ -117,23 +95,30 @@
       transparent = null;
     }
 
+    var width = this.piskelController.getWidth();
+    var height = this.piskelController.getHeight();
+
     var gif = new window.GIF({
       workers: 5,
       quality: 1,
-      width: this.piskelController.getWidth() * zoom,
-      height: this.piskelController.getHeight() * zoom,
+      width: width * zoom,
+      height: height * zoom,
       preserveColors : preserveColors,
       transparent : transparent
     });
 
-    for (var i = 0 ; i < this.piskelController.getFrameCount() ; i++) {
-      var frame = this.piskelController.getFrameAt(i);
-      var canvasRenderer = new pskl.rendering.CanvasRenderer(frame, zoom);
-      if (preserveColors) {
+    // Create a background canvas that will be filled with the transparent color before each render.
+    var background = pskl.utils.CanvasUtils.createCanvas(width, height);
+    var context = background.getContext('2d');
+    context.fillStyle = transparentColor;
 
-      }
-      canvasRenderer.drawTransparentAs(transparentColor);
-      var canvas = canvasRenderer.render();
+    for (var i = 0 ; i < this.piskelController.getFrameCount() ; i++) {
+      var render = this.piskelController.renderFrameAt(i, true);
+      context.clearRect(0, 0, width, height);
+      context.fillRect(0, 0, width, height);
+      context.drawImage(render, 0, 0, width, height);
+
+      var canvas = pskl.utils.ImageResizer.scale(background, zoom);
       gif.addFrame(canvas.getContext('2d'), {
         delay: 1000 / fps
       });
@@ -163,7 +148,6 @@
     return transparentColor;
   };
 
-  // FIXME : JD : HORRIBLE COPY/PASTA (JD later : where???)
   ns.GifExportController.prototype.updateStatus_ = function (imageUrl, error) {
     if (imageUrl) {
       var linkTpl = '<a class="image-link" href="{{link}}" target="_blank">{{shortLink}}</a>';

src/js/controller/settings/exportimage/ImageExportController.js

@@ -1,45 +0,0 @@
-(function () {
-  var ns = $.namespace('pskl.controller.settings.exportimage');
-
-  ns.ImageExportController = function (piskelController) {
-    this.piskelController = piskelController;
-    this.pngExportController = new ns.PngExportController(piskelController);
-    this.gifExportController = new ns.GifExportController(piskelController);
-  };
-
-  pskl.utils.inherit(ns.ImageExportController, pskl.controller.settings.AbstractSettingController);
-
-  ns.ImageExportController.prototype.init = function () {
-    // Output Scaling Factor
-    var scalingFactorInput = document.querySelector('.scaling-factor-input');
-    scalingFactorInput.value = pskl.UserSettings.get(pskl.UserSettings.EXPORT_SCALING);
-    this.addEventListener(scalingFactorInput, 'change', this.onScalingFactorChange_);
-    this.addEventListener(scalingFactorInput, 'input', this.onScalingFactorChange_);
-    this.updateScalingFactorText_(scalingFactorInput.value);
-
-    this.pngExportController.init();
-    this.gifExportController.init();
-  };
-
-  ns.ImageExportController.prototype.destroy = function () {
-    this.pngExportController.destroy();
-    this.gifExportController.destroy();
-    this.superclass.destroy.call(this);
-  };
-
-  ns.ImageExportController.prototype.onScalingFactorChange_ = function (evt) {
-    var target = evt.target;
-    var value = Math.round(parseFloat(target.value));
-    if (!isNaN(value)) {
-      this.updateScalingFactorText_(value);
-      pskl.UserSettings.set(pskl.UserSettings.EXPORT_SCALING, value);
-    } else {
-      target.value = pskl.UserSettings.get(pskl.UserSettings.EXPORT_SCALING);
-    }
-  };
-
-  ns.ImageExportController.prototype.updateScalingFactorText_ = function (scale) {
-    var scalingFactorText = document.querySelector('.scaling-factor-text');
-    scalingFactorText.innerHTML = scale + 'x';
-  };
-})();

src/js/controller/settings/exportimage/MiscExportController.js

@@ -0,0 +1,76 @@
+(function () {
+  var ns = $.namespace('pskl.controller.settings.exportimage');
+
+  var BLACK = '#000000';
+
+  ns.MiscExportController = function (piskelController) {
+    this.piskelController = piskelController;
+  };
+
+  pskl.utils.inherit(ns.MiscExportController, pskl.controller.settings.AbstractSettingController);
+
+  ns.MiscExportController.prototype.init = function () {
+    var cDownloadButton = document.querySelector('.c-download-button');
+    this.addEventListener(cDownloadButton, 'click', this.onDownloadCFileClick_);
+  };
+
+  ns.MiscExportController.prototype.onDownloadCFileClick_ = function (evt) {
+    var fileName = this.getPiskelName_() + '.c';
+    var cName = this.getPiskelName_().replace(' ','_');
+    var width = this.piskelController.getWidth();
+    var height = this.piskelController.getHeight();
+    var frameCount = this.piskelController.getFrameCount();
+
+    // Useful defines for C routines
+    var frameStr = '#include <stdint.h>\n\n';
+    frameStr += '#define ' + cName.toUpperCase() + '_FRAME_COUNT ' +  this.piskelController.getFrameCount() + '\n';
+    frameStr += '#define ' + cName.toUpperCase() + '_FRAME_WIDTH ' + width + '\n';
+    frameStr += '#define ' + cName.toUpperCase() + '_FRAME_HEIGHT ' + height + '\n\n';
+
+    frameStr += '/* Piskel data for \"' + this.getPiskelName_() + '\" */\n\n';
+
+    frameStr += 'static const uint32_t ' + cName.toLowerCase();
+    frameStr += '_data[' + frameCount + '][' + width * height + '] = {\n';
+
+    for (var i = 0 ; i < frameCount ; i++) {
+      var render = this.piskelController.renderFrameAt(i, true);
+      var context = render.getContext('2d');
+      var imgd = context.getImageData(0, 0, width, height);
+      var pix = imgd.data;
+
+      frameStr += '{\n';
+      for (var j = 0; j < pix.length; j += 4) {
+        frameStr += this.rgbToCHex(pix[j], pix[j + 1], pix[j + 2], pix[j + 3]);
+        if (j != pix.length - 4) {
+          frameStr += ', ';
+        }
+        if (((j + 4) % (width * 4)) === 0) {
+          frameStr += '\n';
+        }
+      }
+      if (i != (frameCount - 1)) {
+        frameStr += '},\n';
+      } else {
+        frameStr += '}\n';
+      }
+    }
+
+    frameStr += '};\n';
+    pskl.utils.BlobUtils.stringToBlob(frameStr, function(blob) {
+      pskl.utils.FileUtils.downloadAsFile(blob, fileName);
+    }.bind(this), 'application/text');
+  };
+
+  ns.MiscExportController.prototype.getPiskelName_ = function () {
+    return this.piskelController.getPiskel().getDescriptor().name;
+  };
+
+  ns.MiscExportController.prototype.rgbToCHex = function (r, g, b, a) {
+    var hexStr = '0x';
+    hexStr += ('00' + a.toString(16)).substr(-2);
+    hexStr += ('00' + b.toString(16)).substr(-2);
+    hexStr += ('00' + g.toString(16)).substr(-2);
+    hexStr += ('00' + r.toString(16)).substr(-2);
+    return hexStr;
+  };
+})();

src/js/controller/settings/exportimage/PngExportController.js

@@ -1,119 +1,162 @@
 (function () {
   var ns = $.namespace('pskl.controller.settings.exportimage');
 
-  var URL_MAX_LENGTH = 60;
+  var dimensionInfoPattern = '{{width}} x {{height}} px, {{frames}}<br/>{{columns}}, {{rows}}.';
 
-  ns.PngExportController = function (piskelController) {
+  // Shortcut to pskl.utils.Template.replace
+  var replace = pskl.utils.Template.replace;
+
+  // Helper to return "X items" or "1 item" if X is 1. Can be cnsidered as an overkill,
+  // but the one-liner equivalent is hard to read.
+  var pluralize = function (word, count) {
+    if (count === 1) {
+      return '1 ' + word;
+    }
+    return count + ' ' + word + 's';
+  };
+
+  ns.PngExportController = function (piskelController, exportController) {
     this.piskelController = piskelController;
+    this.exportController = exportController;
+    this.onScaleChanged_ = this.onScaleChanged_.bind(this);
   };
 
   pskl.utils.inherit(ns.PngExportController, pskl.controller.settings.AbstractSettingController);
 
   ns.PngExportController.prototype.init = function () {
-    this.pngFilePrefixInput = document.querySelector('.zip-prefix-name');
-    this.pngFilePrefixInput.value = 'sprite_';
+    this.layoutContainer = document.querySelector('.png-export-layout-section');
+    this.dimensionInfo = document.querySelector('.png-export-dimension-info');
 
-    this.splitByLayersCheckbox =  document.querySelector('.zip-split-layers-checkbox');
+    this.rowsInput = document.querySelector('#png-export-rows');
+    this.columnsInput = document.querySelector('#png-export-columns');
 
     var downloadButton = document.querySelector('.png-download-button');
-    this.addEventListener(downloadButton, 'click', this.onPngDownloadButtonClick_);
+    var dataUriButton = document.querySelector('.datauri-open-button');
 
-    var zipButton = document.querySelector('.zip-generate-button');
-    this.addEventListener(zipButton, 'click', this.onZipButtonClick_);
+    this.initLayoutSection_();
+    this.updateDimensionLabel_();
+
+    this.addEventListener(this.columnsInput, 'input', this.onColumnsInput_);
+    this.addEventListener(downloadButton, 'click', this.onDownloadClick_);
+    this.addEventListener(dataUriButton, 'click', this.onDataUriClick_);
+    $.subscribe(Events.EXPORT_SCALE_CHANGED, this.onScaleChanged_);
   };
 
-  ns.PngExportController.prototype.onPngDownloadButtonClick_ = function (evt) {
-    var fileName = this.getPiskelName_() + '.png';
+  ns.PngExportController.prototype.destroy = function () {
+    $.unsubscribe(Events.EXPORT_SCALE_CHANGED, this.onScaleChanged_);
+    this.superclass.destroy.call(this);
+  };
 
-    var outputCanvas = this.getFramesheetAsCanvas();
+  /**
+   * Initalize all controls related to the spritesheet layout.
+   */
+  ns.PngExportController.prototype.initLayoutSection_ = function () {
+    var frames = this.piskelController.getFrameCount();
+    if (frames === 1) {
+      // Hide the layout section if only one frame is defined.
+      this.layoutContainer.style.display = 'none';
+    } else {
+      this.columnsInput.setAttribute('max', frames);
+      this.columnsInput.value = this.getBestFit_();
+      this.onColumnsInput_();
+    }
+  };
 
-    var scalingFactor = pskl.UserSettings.get(pskl.UserSettings.EXPORT_SCALING);
-    if (scalingFactor > 1) {
-      var width = outputCanvas.width * scalingFactor;
-      var height = outputCanvas.height * scalingFactor;
-      outputCanvas = pskl.utils.ImageResizer.resize(outputCanvas, width, height, false);
+  ns.PngExportController.prototype.updateDimensionLabel_ = function () {
+    var zoom = this.exportController.getExportZoom();
+    var frames = this.piskelController.getFrameCount();
+    var width = this.piskelController.getWidth() * zoom;
+    var height = this.piskelController.getHeight() * zoom;
+
+    var columns = this.getColumns_();
+    var rows = this.getRows_();
+    width = columns * width;
+    height = rows * height;
+
+    this.dimensionInfo.innerHTML = replace(dimensionInfoPattern, {
+      width: width,
+      height: height,
+      rows: pluralize('row', rows),
+      columns: pluralize('column', columns),
+      frames: pluralize('frame', frames),
+    });
+  };
+
+  ns.PngExportController.prototype.getColumns_ = function () {
+    return parseInt(this.columnsInput.value || 1, 10);
+  };
+
+  ns.PngExportController.prototype.getRows_ = function () {
+    return parseInt(this.rowsInput.value || 1, 10);
+  };
+
+  ns.PngExportController.prototype.getBestFit_ = function () {
+    var ratio = this.piskelController.getWidth() / this.piskelController.getHeight();
+    var frameCount = this.piskelController.getFrameCount();
+    var bestFit = Math.round(Math.sqrt(frameCount / ratio));
+
+    return pskl.utils.Math.minmax(bestFit, 1, frameCount);
+  };
+
+  ns.PngExportController.prototype.onScaleChanged_ = function () {
+    this.updateDimensionLabel_();
+  };
+
+  /**
+   * Synchronise column and row inputs, called everytime a user input updates one of the
+   * two inputs by the SynchronizedInputs widget.
+   */
+  ns.PngExportController.prototype.onColumnsInput_ = function () {
+    var value = this.columnsInput.value;
+    if (value === '') {
+      // Skip the synchronization if the input is empty.
+      return;
     }
 
-    pskl.utils.BlobUtils.canvasToBlob(outputCanvas, function(blob) {
+    value = parseInt(value, 10);
+    if (isNaN(value)) {
+      value = 1;
+    }
+
+    // Force the value to be in bounds, in the user tried to update it by directly typing
+    // a value.
+    value = pskl.utils.Math.minmax(value, 1, this.piskelController.getFrameCount());
+    this.columnsInput.value = value;
+
+    // Update readonly rowsInput
+    this.rowsInput.value = Math.ceil(this.piskelController.getFrameCount() / value);
+    this.updateDimensionLabel_();
+  };
+
+  ns.PngExportController.prototype.createPngSpritesheet_ = function () {
+    var renderer = new pskl.rendering.PiskelRenderer(this.piskelController);
+    var outputCanvas = renderer.renderAsCanvas(this.getColumns_(), this.getRows_());
+    var width = outputCanvas.width;
+    var height = outputCanvas.height;
+
+    var zoom = this.exportController.getExportZoom();
+    if (zoom != 1) {
+      outputCanvas = pskl.utils.ImageResizer.resize(outputCanvas, width * zoom, height * zoom, false);
+    }
+
+    return outputCanvas;
+  };
+
+  ns.PngExportController.prototype.onDownloadClick_ = function (evt) {
+    // Create PNG export.
+    var canvas = this.createPngSpritesheet_();
+
+    // Generate file name
+    var name = this.piskelController.getPiskel().getDescriptor().name;
+    var fileName = name + '.png';
+
+    // Transform to blob and start download.
+    pskl.utils.BlobUtils.canvasToBlob(canvas, function(blob) {
       pskl.utils.FileUtils.downloadAsFile(blob, fileName);
     });
   };
 
-  ns.PngExportController.prototype.onZipButtonClick_ = function () {
-    var zip = new window.JSZip();
-
-    if (this.splitByLayersCheckbox.checked) {
-      this.splittedExport_(zip);
-    } else {
-      this.mergedExport_(zip);
-    }
-
-    var fileName = this.getPiskelName_() + '.zip';
-
-    var blob = zip.generate({
-      type : 'blob'
-    });
-
-    pskl.utils.FileUtils.downloadAsFile(blob, fileName);
-  };
-
-  ns.PngExportController.prototype.mergedExport_ = function (zip) {
-    for (var i = 0; i < this.piskelController.getFrameCount(); i++) {
-      var frame = this.piskelController.getFrameAt(i);
-      var canvas = this.getFrameAsCanvas_(frame);
-      var basename = this.pngFilePrefixInput.value;
-      var filename = basename + (i + 1) + '.png';
-      zip.file(filename, pskl.utils.CanvasUtils.getBase64FromCanvas(canvas) + '\n', {base64: true});
-    }
-  };
-
-  ns.PngExportController.prototype.splittedExport_ = function (zip) {
-    var layers = this.piskelController.getLayers();
-    for (var j = 0; this.piskelController.hasLayerAt(j); j++) {
-      var layer = this.piskelController.getLayerAt(j);
-      for (var i = 0; i < this.piskelController.getFrameCount(); i++) {
-        var frame = layer.getFrameAt(i);
-        var canvas = this.getFrameAsCanvas_(frame);
-        var basename = this.pngFilePrefixInput.value;
-        var filename = 'l' + j + '_' + basename + (i + 1) + '.png';
-        zip.file(filename, pskl.utils.CanvasUtils.getBase64FromCanvas(canvas) + '\n', {base64: true});
-      }
-    }
-  };
-
-  ns.PngExportController.prototype.getFrameAsCanvas_ = function (frame) {
-    var canvasRenderer = new pskl.rendering.CanvasRenderer(frame, 1);
-    canvasRenderer.drawTransparentAs(Constants.TRANSPARENT_COLOR);
-    return canvasRenderer.render();
-  };
-
-  ns.PngExportController.prototype.getPiskelName_ = function () {
-    return this.piskelController.getPiskel().getDescriptor().name;
-  };
-
-  ns.PngExportController.prototype.getFramesheetAsCanvas = function () {
-    var renderer = new pskl.rendering.PiskelRenderer(this.piskelController);
-    return renderer.renderAsCanvas();
-  };
-
-  ns.PngExportController.prototype.updateStatus_ = function (imageUrl, error) {
-    if (imageUrl) {
-      var linkTpl = '<a class="image-link" href="{{link}}" target="_blank">{{shortLink}}</a>';
-      var linkHtml = pskl.utils.Template.replace(linkTpl, {
-        link : imageUrl,
-        shortLink : this.shorten_(imageUrl, URL_MAX_LENGTH, '...')
-      });
-      this.uploadStatusContainerEl.innerHTML = 'Your image is now available at : ' + linkHtml;
-    } else {
-      // FIXME : Should display error message instead
-    }
-  };
-
-  ns.PngExportController.prototype.shorten_ = function (url, maxLength, suffix) {
-    if (url.length > maxLength) {
-      url = url.substring(0, maxLength);
-      url += suffix;
-    }
-    return url;
+  ns.PngExportController.prototype.onDataUriClick_ = function (evt) {
+    window.open(this.createPngSpritesheet_().toDataURL('image/png'));
   };
 })();

src/js/controller/settings/exportimage/ZipExportController.js

@@ -0,0 +1,74 @@
+(function () {
+  var ns = $.namespace('pskl.controller.settings.exportimage');
+
+  ns.ZipExportController = function (piskelController, exportController) {
+    this.piskelController = piskelController;
+    this.exportController = exportController;
+  };
+
+  pskl.utils.inherit(ns.ZipExportController, pskl.controller.settings.AbstractSettingController);
+
+  ns.ZipExportController.prototype.init = function () {
+    this.pngFilePrefixInput = document.querySelector('.zip-prefix-name');
+    this.pngFilePrefixInput.value = 'sprite_';
+
+    this.splitByLayersCheckbox =  document.querySelector('.zip-split-layers-checkbox');
+
+    var zipButton = document.querySelector('.zip-generate-button');
+    this.addEventListener(zipButton, 'click', this.onZipButtonClick_);
+  };
+
+  ns.ZipExportController.prototype.onZipButtonClick_ = function () {
+    var zip = new window.JSZip();
+
+    if (this.splitByLayersCheckbox.checked) {
+      this.splittedExport_(zip);
+    } else {
+      this.mergedExport_(zip);
+    }
+
+    var fileName = this.getPiskelName_() + '.zip';
+
+    var blob = zip.generate({
+      type : 'blob'
+    });
+
+    pskl.utils.FileUtils.downloadAsFile(blob, fileName);
+  };
+
+  ns.ZipExportController.prototype.mergedExport_ = function (zip) {
+    var paddingLength = ('' + this.piskelController.getFrameCount()).length;
+    var zoom = this.exportController.getExportZoom();
+    for (var i = 0; i < this.piskelController.getFrameCount(); i++) {
+      var render = this.piskelController.renderFrameAt(i, true);
+      var canvas = pskl.utils.ImageResizer.scale(render, zoom);
+      var basename = this.pngFilePrefixInput.value;
+      var id = pskl.utils.StringUtils.leftPad(i, paddingLength, '0');
+      var filename = basename + id + '.png';
+      zip.file(filename, pskl.utils.CanvasUtils.getBase64FromCanvas(canvas) + '\n', {base64: true});
+    }
+  };
+
+  ns.ZipExportController.prototype.splittedExport_ = function (zip) {
+    var layers = this.piskelController.getLayers();
+    var framePaddingLength = ('' + this.piskelController.getFrameCount()).length;
+    var layerPaddingLength = ('' + layers.length).length;
+    var zoom = this.exportController.getExportZoom();
+    for (var j = 0; this.piskelController.hasLayerAt(j); j++) {
+      var layer = this.piskelController.getLayerAt(j);
+      var layerid = pskl.utils.StringUtils.leftPad(j, layerPaddingLength, '0');
+      for (var i = 0; i < this.piskelController.getFrameCount(); i++) {
+        var render = pskl.utils.LayerUtils.renderFrameAt(layer, i, true);
+        var canvas = pskl.utils.ImageResizer.scale(render, zoom);
+        var basename = this.pngFilePrefixInput.value;
+        var frameid = pskl.utils.StringUtils.leftPad(i + 1, framePaddingLength, '0');
+        var filename = 'l' + layerid + '_' + basename + frameid + '.png';
+        zip.file(filename, pskl.utils.CanvasUtils.getBase64FromCanvas(canvas) + '\n', {base64: true});
+      }
+    }
+  };
+
+  ns.ZipExportController.prototype.getPiskelName_ = function () {
+    return this.piskelController.getPiskel().getDescriptor().name;
+  };
+})();

src/js/controller/settings/resize/ResizeController.js

@@ -20,9 +20,12 @@
     this.resizeContentCheckbox = this.container.querySelector('.resize-content-checkbox');
     this.maintainRatioCheckbox = this.container.querySelector('.resize-ratio-checkbox');
 
-    var initWidth = this.piskelController.getWidth();
-    var initHeight = this.piskelController.getHeight();
-    this.sizeInputWidget = new pskl.widgets.SizeInput(this.widthInput, this.heightInput, initWidth, initHeight);
+    this.sizeInputWidget = new pskl.widgets.SizeInput({
+      widthInput: this.widthInput,
+      heightInput: this.heightInput,
+      initWidth: this.piskelController.getWidth(),
+      initHeight: this.piskelController.getHeight(),
+    });
 
     var settings = pskl.UserSettings.get('RESIZE_SETTINGS');
     var origin = ns.AnchorWidget.ORIGIN[settings.origin] || ns.AnchorWidget.ORIGIN.TOPLEFT;
@@ -71,8 +74,11 @@
   };
 
   ns.ResizeController.prototype.resizeLayer_ = function (layer) {
+    var opacity = layer.getOpacity();
     var resizedFrames = layer.getFrames().map(this.resizeFrame_.bind(this));
-    return pskl.model.Layer.fromFrames(layer.getName(), resizedFrames);
+    var resizedLayer = pskl.model.Layer.fromFrames(layer.getName(), resizedFrames);
+    resizedLayer.setOpacity(opacity);
+    return resizedLayer;
   };
 
   ns.ResizeController.prototype.onResizeContentChange_ = function (evt) {

src/js/model/Layer.js

@@ -7,6 +7,7 @@
     } else {
       this.name = name;
       this.frames = [];
+      this.opacity = 1;
     }
   };
 
@@ -31,6 +32,21 @@
     this.name = name;
   };
 
+  ns.Layer.prototype.getOpacity = function () {
+    return this.opacity;
+  };
+
+  ns.Layer.prototype.setOpacity = function (opacity) {
+    if (opacity === null || isNaN(opacity) || opacity < 0 || opacity > 1) {
+      return;
+    }
+    this.opacity = opacity;
+  };
+
+  ns.Layer.prototype.isTransparent = function () {
+    return this.opacity < 1;
+  };
+
   ns.Layer.prototype.getFrames = function () {
     return this.frames;
   };

src/js/model/frame/AsyncCachedFrameProcessor.js

@@ -30,6 +30,10 @@
     var key1 = frame.getHash();
     if (cache[key1]) {
       processedFrame = cache[key1];
+    } else if (frame instanceof pskl.model.frame.RenderedFrame) {
+      // Cannot use 2nd level cache with rendered frames
+      var callbackFirstLvlCacheOnly = this.onProcessorComplete_.bind(this, deferred, cache, key1, key1);
+      this.frameProcessor(frame, callbackFirstLvlCacheOnly);
     } else {
       var framePixels = JSON.stringify(frame.getPixels());
       var key2 = pskl.utils.hashCode(framePixels);

src/js/model/frame/CachedFrameProcessor.js

@@ -66,6 +66,10 @@
     var cacheKey = frame.getHash();
     if (cache[cacheKey]) {
       processedFrame = cache[cacheKey];
+    } else if (frame instanceof pskl.model.frame.RenderedFrame) {
+      // Cannot use 2nd level cache with rendered frames
+      processedFrame = this.frameProcessor(frame);
+      cache[cacheKey] = processedFrame;
     } else {
       var framePixels = JSON.stringify(frame.getPixels());
       var frameAsString = pskl.utils.hashCode(framePixels);

src/js/model/frame/RenderedFrame.js

@@ -0,0 +1,49 @@
+(function () {
+  var ns = $.namespace('pskl.model.frame');
+
+  /**
+   * Create a frame instance that provides an image getter. Can be faster
+   * to use after merging using transparency. Transparent frames are merged to
+   * an image and this allows to reuse the image rather than retransform into
+   * a frame before calling the renderers.
+   *
+   * This rendered frame should only be used with renderers that support it.
+   *
+   * @param {Function} imageFn getter that will create the image
+   * @param {Number} width image width in pixels
+   * @param {Number} height image height in pixels
+   * @param {String} id will be used as hash, so should be as unique as possible
+   */
+  ns.RenderedFrame = function (renderFn, width, height, id) {
+    this.width = width;
+    this.height = height;
+    this.id = id;
+    this.renderFn = renderFn;
+  };
+
+  ns.RenderedFrame.prototype.getRenderedFrame = function () {
+    return this.renderFn();
+  };
+
+  ns.RenderedFrame.prototype.getHash = function () {
+    return this.id;
+  };
+
+  ns.RenderedFrame.prototype.getWidth = function () {
+    return this.width;
+  };
+
+  ns.RenderedFrame.prototype.getHeight = function () {
+    return this.height;
+  };
+
+  ns.RenderedFrame.prototype.getPixels = Constants.ABSTRACT_FUNCTION;
+  ns.RenderedFrame.prototype.containsPixel = Constants.ABSTRACT_FUNCTION;
+  ns.RenderedFrame.prototype.isSameSize = Constants.ABSTRACT_FUNCTION;
+  ns.RenderedFrame.prototype.clone = Constants.ABSTRACT_FUNCTION;
+  ns.RenderedFrame.prototype.setPixels = Constants.ABSTRACT_FUNCTION;
+  ns.RenderedFrame.prototype.clear = Constants.ABSTRACT_FUNCTION;
+  ns.RenderedFrame.prototype.setPixel = Constants.ABSTRACT_FUNCTION;
+  ns.RenderedFrame.prototype.getPixel = Constants.ABSTRACT_FUNCTION;
+  ns.RenderedFrame.prototype.forEachPixel = Constants.ABSTRACT_FUNCTION;
+})();

src/js/rendering/CanvasRenderer.js

@@ -4,6 +4,7 @@
   ns.CanvasRenderer = function (frame, zoom) {
     this.frame = frame;
     this.zoom = zoom;
+    this.opacity_ = 1;
     this.transparentColor_ = 'white';
   };
 
@@ -16,11 +17,15 @@
     this.transparentColor_ = color;
   };
 
+  ns.CanvasRenderer.prototype.setOpacity = function (opacity) {
+    this.opacity_ = opacity;
+  };
+
   ns.CanvasRenderer.prototype.render = function  () {
     var canvas = this.createCanvas_();
 
     // Draw in canvas
-    pskl.utils.FrameUtils.drawToCanvas(this.frame, canvas, this.transparentColor_);
+    pskl.utils.FrameUtils.drawToCanvas(this.frame, canvas, this.transparentColor_, this.opacity_);
 
     var scaledCanvas = this.createCanvas_(this.zoom);
     var scaledContext = scaledCanvas.getContext('2d');

src/js/rendering/DrawingLoop.js

@@ -6,6 +6,7 @@
     this.isRunning = false;
     this.previousTime = 0;
     this.callbacks = [];
+    this.loop_ = this.loop_.bind(this);
   };
 
   ns.DrawingLoop.prototype.addCallback = function (callback, scope, args) {
@@ -35,7 +36,7 @@
     var delta = currentTime - this.previousTime;
     this.executeCallbacks_(delta);
     this.previousTime = currentTime;
-    this.requestAnimationFrame.call(window, this.loop_.bind(this));
+    this.requestAnimationFrame.call(window, this.loop_);
   };
 
   ns.DrawingLoop.prototype.executeCallbacks_ = function (deltaTime) {

src/js/rendering/FramesheetRenderer.js

@@ -13,11 +13,17 @@
     }
   };
 
-  ns.FramesheetRenderer.prototype.renderAsCanvas = function () {
-    var canvas = this.createCanvas_();
+  ns.FramesheetRenderer.prototype.renderAsCanvas = function (columns) {
+    columns = columns || this.frames.length;
+    var rows = Math.ceil(this.frames.length / columns);
+
+    var canvas = this.createCanvas_(columns, rows);
+
     for (var i = 0 ; i < this.frames.length ; i++) {
       var frame = this.frames[i];
-      this.drawFrameInCanvas_(frame, canvas, i * frame.getWidth(), 0);
+      var posX = (i % columns) * frame.getWidth();
+      var posY = Math.floor(i / columns) * frame.getHeight();
+      this.drawFrameInCanvas_(frame, canvas, posX, posY);
     }
     return canvas;
   };
@@ -32,11 +38,10 @@
     });
   };
 
-  ns.FramesheetRenderer.prototype.createCanvas_ = function () {
+  ns.FramesheetRenderer.prototype.createCanvas_ = function (columns, rows) {
     var sampleFrame = this.frames[0];
-    var count = this.frames.length;
-    var width = count * sampleFrame.getWidth();
-    var height = sampleFrame.getHeight();
+    var width = columns * sampleFrame.getWidth();
+    var height = rows * sampleFrame.getHeight();
     return pskl.utils.CanvasUtils.createCanvas(width, height);
   };
 })();

src/js/rendering/PiskelRenderer.js

@@ -5,10 +5,35 @@
   ns.PiskelRenderer = function (piskelController) {
     var frames = [];
     for (var i = 0 ; i < piskelController.getFrameCount() ; i++) {
-      frames.push(piskelController.getFrameAt(i));
+      frames.push(piskelController.renderFrameAt(i, true));
     }
-    ns.FramesheetRenderer.call(this, frames);
+    this.piskelController = piskelController;
+    this.frames = frames;
   };
 
-  pskl.utils.inherit(ns.PiskelRenderer, ns.FramesheetRenderer);
+  ns.PiskelRenderer.prototype.renderAsCanvas = function (columns) {
+    columns = columns || this.frames.length;
+    var rows = Math.ceil(this.frames.length / columns);
+
+    var canvas = this.createCanvas_(columns, rows);
+
+    for (var i = 0 ; i < this.frames.length ; i++) {
+      var frame = this.frames[i];
+      var posX = (i % columns) * this.piskelController.getWidth();
+      var posY = Math.floor(i / columns) * this.piskelController.getHeight();
+      this.drawFrameInCanvas_(frame, canvas, posX, posY);
+    }
+    return canvas;
+  };
+
+  ns.PiskelRenderer.prototype.drawFrameInCanvas_ = function (frame, canvas, offsetWidth, offsetHeight) {
+    var context = canvas.getContext('2d');
+    context.drawImage(frame, offsetWidth, offsetHeight, frame.width, frame.height);
+  };
+
+  ns.PiskelRenderer.prototype.createCanvas_ = function (columns, rows) {
+    var width = columns * this.piskelController.getWidth();
+    var height = rows * this.piskelController.getHeight();
+    return pskl.utils.CanvasUtils.createCanvas(width, height);
+  };
 })();

src/js/rendering/frame/BackgroundImageFrameRenderer.js

@@ -16,7 +16,12 @@
   };
 
   ns.BackgroundImageFrameRenderer.prototype.frameToDataUrl_ = function (frame) {
-    var canvas = new pskl.utils.FrameUtils.toImage(frame, this.zoom);
+    var canvas;
+    if (frame instanceof pskl.model.frame.RenderedFrame) {
+      canvas = pskl.utils.ImageResizer.scale(frame.getRenderedFrame(), this.zoom);
+    } else {
+      canvas = pskl.utils.FrameUtils.toImage(frame, this.zoom);
+    }
     return canvas.toDataURL('image/png');
   };
 

src/js/rendering/frame/CachedFrameRenderer.js

@@ -34,6 +34,7 @@
     var serializedFrame = [
       this.getZoom(),
       this.getGridWidth(),
+      pskl.UserSettings.get('SEAMLESS_MODE'),
       offset.x, offset.y,
       size.width, size.height,
       frame.getHash()

src/js/rendering/frame/FrameRenderer.js

@@ -75,9 +75,12 @@
   };
 
   ns.FrameRenderer.prototype.setZoom = function (zoom) {
-    if (zoom < Constants.MINIMUM_ZOOM) {
-      zoom = Constants.MINIMUM_ZOOM;
-    }
+    // Minimum zoom is one to ensure one sprite pixel occupies at least one pixel on screen.
+    var minimumZoom = 1;
+    // Maximum zoom is relative to the display dimensions to ensure at least 10 pixels can
+    // be drawn on screen.
+    var maximumZoom = Math.min(this.displayWidth, this.displayHeight) / 10;
+    zoom = pskl.utils.Math.minmax(zoom, minimumZoom, maximumZoom);
 
     if (zoom == this.zoom) {
       return;
@@ -237,6 +240,10 @@
       this.canvas = pskl.utils.CanvasUtils.createCanvas(frame.getWidth(), frame.getHeight());
     }
 
+    var w = this.canvas.width;
+    var h = this.canvas.height;
+    var z = this.zoom;
+
     // Draw in canvas
     pskl.utils.FrameUtils.drawToCanvas(frame, this.canvas);
 
@@ -245,31 +252,51 @@
     var displayContext = this.displayCanvas.getContext('2d');
     displayContext.save();
 
-    var smallerHeight = this.canvas.height * this.zoom < this.displayCanvas.height;
-    var smallerWidth = this.canvas.width * this.zoom < this.displayCanvas.width;
-    if (smallerHeight || smallerWidth) {
-      displayContext.fillStyle = Constants.ZOOMED_OUT_BACKGROUND_COLOR;
-      displayContext.fillRect(0, 0, this.displayCanvas.width - 1, this.displayCanvas.height - 1);
-    }
+    // Draw background
+    displayContext.fillStyle = Constants.ZOOMED_OUT_BACKGROUND_COLOR;
+    displayContext.fillRect(0, 0, this.displayCanvas.width - 1, this.displayCanvas.height - 1);
 
     displayContext.translate(
-      this.margin.x - this.offset.x * this.zoom,
-      this.margin.y - this.offset.y * this.zoom
+      this.margin.x - this.offset.x * z,
+      this.margin.y - this.offset.y * z
     );
 
-    displayContext.clearRect(0, 0, this.canvas.width * this.zoom, this.canvas.height * this.zoom);
-
-    var isIE10 = pskl.utils.UserAgent.isIE && pskl.utils.UserAgent.version === 10;
+    if (pskl.UserSettings.get('SEAMLESS_MODE')) {
+      displayContext.clearRect(-1 * w * z, -1 * h * z, 3 * w * z, 3 * h * z);
+    } else {
+      displayContext.clearRect(0, 0, w * z, h * z);
+    }
 
     var gridWidth = this.computeGridWidthForDisplay_();
-    var isGridEnabled = gridWidth > 0;
-    if (isGridEnabled || isIE10) {
-      var scaled = pskl.utils.ImageResizer.resizeNearestNeighbour(this.canvas, this.zoom, gridWidth);
+    if (gridWidth > 0) {
+      var scaled = pskl.utils.ImageResizer.resizeNearestNeighbour(this.canvas, z, gridWidth);
+
+      if (pskl.UserSettings.get('SEAMLESS_MODE')) {
+        this.drawTiledFrames_(displayContext, scaled, w, h, z);
+      }
       displayContext.drawImage(scaled, 0, 0);
     } else {
-      displayContext.scale(this.zoom, this.zoom);
+      displayContext.scale(z, z);
+
+      if (pskl.UserSettings.get('SEAMLESS_MODE')) {
+        this.drawTiledFrames_(displayContext, this.canvas, w, h, 1);
+      }
       displayContext.drawImage(this.canvas, 0, 0);
     }
+
     displayContext.restore();
   };
+
+  /**
+   * Draw repeatedly the provided image around the main drawing area. Used for seamless
+   * drawing mode, to easily create seamless textures. A colored overlay is applied to
+   * differentiate those additional frames from the main frame.
+   */
+  ns.FrameRenderer.prototype.drawTiledFrames_ = function (context, image, w, h, z) {
+    context.fillStyle = Constants.SEAMLESS_MODE_OVERLAY_COLOR;
+    [[0, -1], [0, 1], [-1, -1], [-1, 0], [-1, 1], [1, -1], [1, 0], [1, 1]].forEach(function (d) {
+      context.drawImage(image, d[0] * w * z, d[1] * h * z);
+      context.fillRect(d[0] * w * z, d[1] * h * z, w * z, h * z);
+    });
+  };
 })();

src/js/rendering/layer/LayersRenderer.js

@@ -32,11 +32,11 @@
     var offset = this.getOffset();
     var size = this.getDisplaySize();
     var layers = this.piskelController.getLayers();
-    var currentFrameIndex = this.piskelController.getCurrentFrameIndex();
-    var currentLayerIndex = this.piskelController.getCurrentLayerIndex();
+    var frameIndex = this.piskelController.getCurrentFrameIndex();
+    var layerIndex = this.piskelController.getCurrentLayerIndex();
 
-    var belowLayers = layers.slice(0, currentLayerIndex);
-    var aboveLayers = layers.slice(currentLayerIndex + 1, layers.length);
+    var belowLayers = layers.slice(0, layerIndex);
+    var aboveLayers = layers.slice(layerIndex + 1, layers.length);
 
     var serializedRendering = [
       this.getZoom(),
@@ -45,8 +45,8 @@
       offset.y,
       size.width,
       size.height,
-      this.getHashForLayersAt_(currentFrameIndex, belowLayers),
-      this.getHashForLayersAt_(currentFrameIndex, aboveLayers),
+      pskl.utils.LayerUtils.getFrameHashAt(belowLayers, frameIndex),
+      pskl.utils.LayerUtils.getFrameHashAt(aboveLayers, frameIndex),
       layers.length
     ].join('-');
 
@@ -56,12 +56,12 @@
       this.clear();
 
       if (belowLayers.length > 0) {
-        var belowFrame = this.getFrameForLayersAt_(currentFrameIndex, belowLayers);
+        var belowFrame = pskl.utils.LayerUtils.mergeFrameAt(belowLayers, frameIndex);
         this.belowRenderer.render(belowFrame);
       }
 
       if (aboveLayers.length > 0) {
-        var aboveFrame = this.getFrameForLayersAt_(currentFrameIndex, aboveLayers);
+        var aboveFrame = pskl.utils.LayerUtils.mergeFrameAt(aboveLayers, frameIndex);
         this.aboveRenderer.render(aboveFrame);
       }
     }
@@ -80,20 +80,6 @@
     }
   };
 
-  ns.LayersRenderer.prototype.getFrameForLayersAt_ = function (frameIndex, layers) {
-    var frames = layers.map(function (l) {
-      return l.getFrameAt(frameIndex);
-    });
-    return pskl.utils.FrameUtils.merge(frames);
-  };
-
-  ns.LayersRenderer.prototype.getHashForLayersAt_ = function (frameIndex, layers) {
-    var hash = layers.map(function (l) {
-      return l.getFrameAt(frameIndex).getHash();
-    });
-    return hash.join('-');
-  };
-
   ns.LayersRenderer.prototype.onUserSettingsChange_ = function (evt, settingsName, settingsValue) {
     if (settingsName == pskl.UserSettings.LAYER_OPACITY) {
       this.updateLayersCanvasOpacity_(settingsValue);

src/js/service/HistoryService.js

@@ -46,7 +46,8 @@
     var state = {
       action : action,
       frameIndex : action.state ? action.state.frameIndex : this.piskelController.currentFrameIndex,
-      layerIndex : action.state ? action.state.layerIndex : this.piskelController.currentLayerIndex
+      layerIndex : action.state ? action.state.layerIndex : this.piskelController.currentLayerIndex,
+      uuid: pskl.utils.Uuid.generate()
     };
 
     var isSnapshot = action.type === ns.HistoryService.SNAPSHOT;
@@ -59,6 +60,15 @@
     $.publish(Events.HISTORY_STATE_SAVED);
   };
 
+  ns.HistoryService.prototype.getCurrentStateId = function () {
+    var state = this.stateQueue[this.currentIndex];
+    if (!state) {
+      return false;
+    }
+
+    return state.uuid;
+  };
+
   ns.HistoryService.prototype.undo = function () {
     this.loadState(this.currentIndex - 1);
   };

src/js/service/ImportService.js

@@ -0,0 +1,124 @@
+/* @file Image and Animation import service supporting the import dialog. */
+(function () {
+  var ns = $.namespace('pskl.service');
+  /**
+   * Image an animation import service supporting the import dialog.
+   * @param {!PiskelController} piskelController
+   * @param {!PreviewController} previewController
+   * @constructor
+   */
+  ns.ImportService =
+      function (piskelController, previewController) {
+    this.piskelController_ = piskelController;
+    this.previewController_ = previewController;
+  };
+
+  /**
+   * Given an image object and some options, create a new Piskel and open it
+   * for editing.
+   * @param {!Image} image
+   * @param {!Object} options
+   * @param {!string} options.importType - 'single' if not spritesheet
+   * @param {!number} options.frameSizeX
+   * @param {!number} options.frameSizeY
+   * @param {number} [options.frameOffsetX] only used in spritesheet imports.
+   * @param {number} [options.frameOffsetY] only used in spritesheet imports.
+   * @param {!boolean} options.smoothing
+   * @param {function} [onComplete]
+   */
+  ns.ImportService.prototype.newPiskelFromImage = function (image, options, onComplete) {
+    onComplete = onComplete || Constants.EMPTY_FUNCTION;
+    var importType = options.importType;
+    var frameSizeX = options.frameSizeX;
+    var frameSizeY = options.frameSizeY;
+    var frameOffsetX = options.frameOffsetX;
+    var frameOffsetY = options.frameOffsetY;
+
+    var gifLoader = new window.SuperGif({
+      gif: image
+    });
+
+    gifLoader.load({
+      success: function () {
+        var images = gifLoader.getFrames().map(function (frame) {
+          return pskl.utils.CanvasUtils.createFromImageData(frame.data);
+        });
+
+        if (importType === 'single' || images.length > 1) {
+          // Single image import or animated gif
+          this.createPiskelFromImages_(images, frameSizeX, frameSizeY, options.smoothing);
+        } else {
+          // Spritesheet
+          var frameImages = this.createImagesFromSheet_(images[0]);
+          this.createPiskelFromImages_(frameImages, frameSizeX, frameSizeY, options.smoothing);
+        }
+        onComplete();
+      }.bind(this),
+      error: function () {
+        if (importType === 'single') {
+          // Single image
+          this.createPiskelFromImages_([image], frameSizeX, frameSizeY, options.smoothing);
+        } else {
+          // Spritesheet
+          var frameImages = this.createImagesFromSheet_(image, frameSizeX, frameSizeY, frameOffsetX, frameOffsetY);
+          this.createPiskelFromImages_(frameImages, frameSizeX, frameSizeY, options.smoothing);
+        }
+        onComplete();
+      }.bind(this)
+    });
+  };
+
+  /**
+   * @param {!Image} image
+   * @param {!number} frameSizeX
+   * @param {!number} frameSizeY
+   * @param {!number} frameOffsetX
+   * @param {!number} frameOffsetY
+   * @returns {canvas[]}
+   * @private
+   */
+  ns.ImportService.prototype.createImagesFromSheet_ = function (image,
+      frameSizeX, frameSizeY, frameOffsetX, frameOffsetY) {
+    return pskl.utils.CanvasUtils.createFramesFromImage(
+        image,
+        frameOffsetX,
+        frameOffsetY,
+        frameSizeX,
+        frameSizeY,
+        /*useHorizonalStrips=*/ true,
+        /*ignoreEmptyFrames=*/ true);
+  };
+
+  /**
+   * @param {canvas[]} images
+   * @param {!number} frameSizeX
+   * @param {!number} frameSizeY
+   * @param {!boolean} smoothing
+   * @private
+   */
+  ns.ImportService.prototype.createPiskelFromImages_ = function (images,
+      frameSizeX, frameSizeY, smoothing) {
+    var frames = this.createFramesFromImages_(images, frameSizeX, frameSizeY, smoothing);
+    var layer = pskl.model.Layer.fromFrames('Layer 1', frames);
+    var descriptor = new pskl.model.piskel.Descriptor('Imported piskel', '');
+    var piskel = pskl.model.Piskel.fromLayers([layer], descriptor);
+
+    this.piskelController_.setPiskel(piskel);
+    this.previewController_.setFPS(Constants.DEFAULT.FPS);
+  };
+
+  /**
+   * @param {!canvas[]} images
+   * @param {!number} frameSizeX
+   * @param {!number} frameSizeY
+   * @param {!boolean} smoothing
+   * @returns {pskl.model.Frame[]}
+   * @private
+   */
+  ns.ImportService.prototype.createFramesFromImages_ = function (images, frameSizeX, frameSizeY, smoothing) {
+    return images.map(function (image) {
+      var resizedImage = pskl.utils.ImageResizer.resize(image, frameSizeX, frameSizeY, smoothing);
+      return pskl.utils.FrameUtils.createFromImage(resizedImage);
+    });
+  };
+})();

src/js/service/SavedStatusService.js

@@ -1,45 +1,31 @@
 (function () {
   var ns = $.namespace('pskl.service');
 
-  ns.SavedStatusService = function (piskelController) {
+  ns.SavedStatusService = function (piskelController, historyService) {
     this.piskelController = piskelController;
+    this.historyService = historyService;
+    this.lastSavedStateIndex = '';
+
+    this.publishStatusUpdateEvent_ = this.publishStatusUpdateEvent_.bind(this);
   };
 
   ns.SavedStatusService.prototype.init = function () {
-    $.subscribe(Events.TOOL_RELEASED, this.onToolReleased.bind(this));
-    $.subscribe(Events.PISKEL_RESET, this.onPiskelReset.bind(this));
+    $.subscribe(Events.TOOL_RELEASED, this.publishStatusUpdateEvent_);
+    $.subscribe(Events.PISKEL_RESET, this.publishStatusUpdateEvent_);
     $.subscribe(Events.PISKEL_SAVED, this.onPiskelSaved.bind(this));
-  };
-
-  ns.SavedStatusService.prototype.onPiskelReset = function () {
-    var piskel = this.piskelController.getPiskel();
-    // A first PISKEL_RESET is triggered during the load of a new Piskel, it should be ignored
-    // putting a firstResetDone flag as a nasty workaround for this
-    if (piskel.firstResetDone_) {
-      this.updateDirtyStatus(true);
-    } else {
-      piskel.firstResetDone_ = true;
-    }
-  };
-
-  ns.SavedStatusService.prototype.onToolReleased = function () {
-    this.updateDirtyStatus(true);
+    this.lastSavedStateIndex = this.historyService.getCurrentStateId();
   };
 
   ns.SavedStatusService.prototype.onPiskelSaved = function () {
-    this.updateDirtyStatus(false);
+    this.lastSavedStateIndex = this.historyService.getCurrentStateId();
+    this.publishStatusUpdateEvent_();
   };
 
-  ns.SavedStatusService.prototype.updateDirtyStatus = function (status) {
-    var piskel = this.piskelController.getPiskel();
-    if (piskel.isDirty_ != status) {
-      piskel.isDirty_ = status;
-      $.publish(Events.PISKEL_SAVED_STATUS_UPDATE);
-    }
+  ns.SavedStatusService.prototype.publishStatusUpdateEvent_ = function () {
+    $.publish(Events.PISKEL_SAVED_STATUS_UPDATE);
   };
 
-  ns.SavedStatusService.prototype.isDirty = function (evt) {
-    var piskel = this.piskelController.getPiskel();
-    return piskel.isDirty_;
+  ns.SavedStatusService.prototype.isDirty = function () {
+    return (this.lastSavedStateIndex != this.historyService.getCurrentStateId());
   };
 })();

src/js/tools/drawing/Move.js

@@ -14,7 +14,7 @@
     this.tooltipDescriptors = [
       {key : 'ctrl', description : 'Apply to all layers'},
       {key : 'shift', description : 'Apply to all frames'},
-      {key : 'alt', description : 'Warp canvas borders'}
+      {key : 'alt', description : 'Wrap canvas borders'}
     ];
 
     // Stroke's first point coordinates (set in applyToolAt)
@@ -75,7 +75,8 @@
     var colDiff = col - this.startCol;
     var rowDiff = row - this.startRow;
 
-    pskl.tools.ToolsHelper.getTargetFrames(event.ctrlKey, event.shiftKey).forEach(function (f) {
+    var ctrlKey = pskl.utils.UserAgent.isMac ?  event.metaKey : event.ctrlKey;
+    pskl.tools.ToolsHelper.getTargetFrames(ctrlKey, event.shiftKey).forEach(function (f) {
       // for the current frame, the backup clone should be reused as reference
       // the current frame has been modified by the user action already
       var reference = this.currentFrame == f ? this.currentFrameClone : f.clone();
@@ -85,7 +86,7 @@
     this.raiseSaveStateEvent({
       colDiff : colDiff,
       rowDiff : rowDiff,
-      ctrlKey : event.ctrlKey,
+      ctrlKey : ctrlKey,
       altKey : event.altKey,
       shiftKey : event.shiftKey
     });

src/js/tools/transform/AbstractTransformTool.js

@@ -7,7 +7,7 @@
 
   ns.AbstractTransformTool.prototype.applyTransformation = function (evt) {
     var allFrames = evt.shiftKey;
-    var allLayers = evt.ctrlKey;
+    var allLayers = pskl.utils.UserAgent.isMac ?  evt.metaKey : evt.ctrlKey;
 
     this.applyTool_(evt.altKey, allFrames, allLayers);
 

src/js/tools/transform/Center.js

@@ -0,0 +1,19 @@
+(function () {
+  var ns = $.namespace('pskl.tools.transform');
+
+  ns.Center = function () {
+    this.toolId = 'tool-center';
+    this.helpText = 'Align image to the center';
+    this.tooltipDescriptors = [
+      {key : 'ctrl', description : 'Apply to all layers'},
+      {key : 'shift', description : 'Apply to all frames'}
+    ];
+  };
+
+  pskl.utils.inherit(ns.Center, ns.AbstractTransformTool);
+
+  ns.Center.prototype.applyToolOnFrame_ = function (frame) {
+    ns.TransformUtils.center(frame);
+  };
+
+})();

src/js/tools/transform/TransformUtils.js

@@ -62,6 +62,49 @@
       });
       frame.version++;
       return frame;
+    },
+
+    center : function(frame) {
+      // Figure out the boundary
+      var minx = frame.width;
+      var miny = frame.height;
+      var maxx = 0;
+      var maxy = 0;
+      frame.forEachPixel(function (color, x, y) {
+        if (color !== Constants.TRANSPARENT_COLOR) {
+          minx = Math.min(minx, x);
+          maxx = Math.max(maxx, x);
+          miny = Math.min(miny, y);
+          maxy = Math.max(maxy, y);
+        }
+      });
+
+      // Calculate how much to move the pixels
+      var bw = (maxx - minx + 1) / 2;
+      var bh = (maxy - miny + 1) / 2;
+      var fw = frame.width / 2;
+      var fh = frame.height / 2;
+
+      var dx = Math.floor(fw - bw - minx);
+      var dy = Math.floor(fh - bh - miny);
+
+      // Actually move the pixels
+      var clone = frame.clone();
+      frame.forEachPixel(function(color, x, y) {
+        var _x = x;
+        var _y = y;
+
+        x -= dx;
+        y -= dy;
+
+        if (clone.containsPixel(x, y)) {
+          frame.pixels[_x][_y] = clone.getPixel(x, y);
+        } else {
+          frame.pixels[_x][_y] = Constants.TRANSPARENT_COLOR;
+        }
+      });
+      frame.version++;
+      return frame;
     }
   };
 })();

src/js/utils/FrameUtils.js

@@ -9,42 +9,55 @@
      * @param zoom {Number} zoom
      * @return {Image}
      */
-    toImage : function (frame, zoom) {
+    toImage : function (frame, zoom, opacity) {
       zoom = zoom || 1;
+      opacity = isNaN(opacity) ? 1 : opacity;
+
       var canvasRenderer = new pskl.rendering.CanvasRenderer(frame, zoom);
       canvasRenderer.drawTransparentAs(Constants.TRANSPARENT_COLOR);
+      canvasRenderer.setOpacity(opacity);
       return canvasRenderer.render();
     },
 
     /**
      * Draw the provided frame in a 2d canvas
      *
-     * @param frame {pskl.model.Frame} frame the frame to draw
-     * @param canvas {Canvas} canvas the canvas target
-     * @param transparentColor {String} transparentColor (optional) color to use to represent transparent pixels.
+     * @param {Frame|RenderedFrame} frame the frame to draw
+     * @param {Canvas} canvas the canvas target
+     * @param {String} transparentColor (optional) color to use to represent transparent pixels.
+     * @param {String} globalAlpha (optional) global frame opacity
      */
-    drawToCanvas : function (frame, canvas, transparentColor) {
+    drawToCanvas : function (frame, canvas, transparentColor, globalAlpha) {
       var context = canvas.getContext('2d');
-
+      globalAlpha = isNaN(globalAlpha) ? 1 : globalAlpha;
+      context.globalAlpha = globalAlpha;
       transparentColor = transparentColor || Constants.TRANSPARENT_COLOR;
-      for (var x = 0, width = frame.getWidth() ; x < width ; x++) {
-        for (var y = 0, height = frame.getHeight() ; y < height ; y++) {
-          var color = frame.getPixel(x, y);
 
-          // accumulate all the pixels of the same color to speed up rendering
-          // by reducting fillRect calls
-          var w = 1;
-          while (color === frame.getPixel(x, y + w) && (y + w) < height) {
-            w++;
+      if (frame instanceof pskl.model.frame.RenderedFrame) {
+        context.fillRect(transparentColor, 0, 0, frame.getWidth(), frame.getHeight());
+        context.drawImage(frame.getRenderedFrame(), 0, 0);
+      } else {
+        for (var x = 0, width = frame.getWidth() ; x < width ; x++) {
+          for (var y = 0, height = frame.getHeight() ; y < height ; y++) {
+            var color = frame.getPixel(x, y);
+
+            // accumulate all the pixels of the same color to speed up rendering
+            // by reducting fillRect calls
+            var w = 1;
+            while (color === frame.getPixel(x, y + w) && (y + w) < height) {
+              w++;
+            }
+
+            if (color == Constants.TRANSPARENT_COLOR) {
+              color = transparentColor;
+            }
+
+            pskl.utils.FrameUtils.renderLine_(color, x, y, w, context);
+            y = y + w - 1;
           }
-
-          if (color == Constants.TRANSPARENT_COLOR) {
-            color = transparentColor;
-          }
-
-          pskl.utils.FrameUtils.renderLine_(color, x, y, w, context);
-          y = y + w - 1;
         }
+
+        context.globalAlpha = 1;
       }
     },
 
@@ -91,12 +104,16 @@
     },
 
     /*
-     * Create a pskl.model.Frame from an Image object.
-     * Transparent pixels will either be converted to completely opaque or completely transparent pixels.
+     * Create a pskl.model.Frame from an Image object. By default transparent
+     * pixels will be converted to completely opaque or completely transparent
+     * pixels. If preserveOpacity is true the actual opacity of the pixel will
+     * be used and the generated frame will contain rgba pixels.
+     *
      * @param  {Image} image source image
+     * @param  {boolean} preserveOpacity set to true to preserve the opacity
      * @return {pskl.model.Frame} corresponding frame
      */
-    createFromImage : function (image) {
+    createFromImage : function (image, preserveOpacity) {
       var w = image.width;
       var h = image.height;
       var canvas = pskl.utils.CanvasUtils.createCanvas(w, h);
@@ -104,10 +121,10 @@
 
       context.drawImage(image, 0, 0, w, h, 0, 0, w, h);
       var imgData = context.getImageData(0, 0, w, h).data;
-      return pskl.utils.FrameUtils.createFromImageData_(imgData, w, h);
+      return pskl.utils.FrameUtils.createFromImageData_(imgData, w, h, preserveOpacity);
     },
 
-    createFromImageData_ : function (imageData, width, height) {
+    createFromImageData_ : function (imageData, width, height, preserveOpacity) {
       // Draw the zoomed-up pixels to a different canvas context
       var grid = [];
       for (var x = 0 ; x < width ; x++) {
@@ -119,10 +136,18 @@
           var g = imageData[i + 1];
           var b = imageData[i + 2];
           var a = imageData[i + 3];
-          if (a < 125) {
-            grid[x][y] = Constants.TRANSPARENT_COLOR;
+          if (preserveOpacity) {
+            if (a === 0) {
+              grid[x][y] = Constants.TRANSPARENT_COLOR;
+            } else {
+              grid[x][y] = 'rgba(' + [r, g, b, a / 255].join(',') + ')';
+            }
           } else {
-            grid[x][y] = pskl.utils.rgbToHex(r, g, b);
+            if (a < 125) {
+              grid[x][y] = Constants.TRANSPARENT_COLOR;
+            } else {
+              grid[x][y] = pskl.utils.rgbToHex(r, g, b);
+            }
           }
         }
       }

src/js/utils/ImageResizer.js

@@ -2,6 +2,10 @@
   var ns = $.namespace('pskl.utils');
 
   ns.ImageResizer = {
+    scale : function (image, factor, smoothingEnabled) {
+      return ns.ImageResizer.resize(image, image.width * factor, image.height * factor, smoothingEnabled);
+    },
+
     resize : function (image, targetWidth, targetHeight, smoothingEnabled) {
       var canvas = pskl.utils.CanvasUtils.createCanvas(targetWidth, targetHeight);
       var context = canvas.getContext('2d');

src/js/utils/LayerUtils.js

@@ -3,12 +3,15 @@
 
   ns.LayerUtils = {
     /**
-     * Create a pskl.model.Layer from an Image object.
+     * Create a Frame array from an Image object.
      * Transparent pixels will either be converted to completely opaque or completely transparent pixels.
+     * TODO : move to FrameUtils
+     *
      * @param  {Image} image source image
-     * @return {pskl.model.Frame} corresponding frame
+     * @param  {Number} frameCount number of frames in the spritesheet
+     * @return {Array<Frame>}
      */
-    createLayerFromSpritesheet : function (image, frameCount) {
+    createFramesFromSpritesheet : function (image, frameCount) {
       var width = image.width;
       var height = image.height;
       var frameWidth = width / frameCount;
@@ -37,6 +40,72 @@
       });
       var mergedLayer = pskl.model.Layer.fromFrames(layerA.getName(), mergedFrames);
       return mergedLayer;
+    },
+
+    getFrameHashAt : function (layers, index) {
+      var hashBuffer = [];
+      layers.forEach(function (l) {
+        var frame = l.getFrameAt(index);
+        hashBuffer.push(frame.getHash());
+        hashBuffer.push(l.getOpacity());
+        return frame;
+      });
+      return hashBuffer.join('-');
+    },
+
+    /**
+     * Create a frame instance merging all the frames from the layers array at
+     * the provided index.
+     *
+     * @param  {Array<Layer>} layers array of layers to use
+     * @param  {Number} index frame index to merge
+     * @return {Frame} Frame instance (can be a fake frame when using
+     *         transparency)
+     */
+    mergeFrameAt : function (layers, index) {
+      var isTransparent = layers.some(function (l) {return l.isTransparent();});
+      if (isTransparent) {
+        return pskl.utils.LayerUtils.mergeTransparentFrameAt_(layers, index);
+      } else {
+        return pskl.utils.LayerUtils.mergeOpaqueFrameAt_(layers, index);
+      }
+    },
+
+    mergeTransparentFrameAt_ : function (layers, index) {
+      var hash = pskl.utils.LayerUtils.getFrameHashAt(layers, index);
+      var width = layers[0].frames[0].getWidth();
+      var height = layers[0].frames[0].getHeight();
+      var renderFn = function () {return pskl.utils.LayerUtils.flattenFrameAt(layers, index, true);};
+      return new pskl.model.frame.RenderedFrame(renderFn, width, height, hash);
+    },
+
+    mergeOpaqueFrameAt_ : function (layers, index) {
+      var hash = pskl.utils.LayerUtils.getFrameHashAt(layers, index);
+      var frames = layers.map(function(l) {return l.getFrameAt(index);});
+      var mergedFrame = pskl.utils.FrameUtils.merge(frames);
+      mergedFrame.id = hash;
+      mergedFrame.version = 0;
+      return mergedFrame;
+    },
+
+    renderFrameAt : function (layer, index, preserveOpacity) {
+      var opacity = preserveOpacity ? layer.getOpacity() : 1;
+      var frame = layer.getFrameAt(index);
+      return pskl.utils.FrameUtils.toImage(frame, 1, opacity);
+    },
+
+    flattenFrameAt : function (layers, index, preserveOpacity) {
+      var width = layers[0].getFrameAt(index).getWidth();
+      var height = layers[0].getFrameAt(index).getHeight();
+      var canvas = pskl.utils.CanvasUtils.createCanvas(width, height);
+
+      var context = canvas.getContext('2d');
+      layers.forEach(function (l) {
+        var render = ns.LayerUtils.renderFrameAt(l, index, preserveOpacity);
+        context.drawImage(render, 0, 0, width, height, 0, 0, width, height);
+      });
+
+      return canvas;
     }
   };
 

src/js/utils/StringUtils.js

@@ -0,0 +1,10 @@
+(function () {
+  var ns = $.namespace('pskl.utils');
+
+  ns.StringUtils = {
+    leftPad : function (input, length, pad) {
+      var padding = new Array(length).join(pad);
+      return (padding + input).slice(-length);
+    },
+  };
+})();

src/js/utils/UserSettings.js

@@ -7,12 +7,13 @@
     DEFAULT_SIZE : 'DEFAULT_SIZE',
     CANVAS_BACKGROUND : 'CANVAS_BACKGROUND',
     SELECTED_PALETTE : 'SELECTED_PALETTE',
-    TILED_PREVIEW : 'TILED_PREVIEW',
+    SEAMLESS_MODE : 'SEAMLESS_MODE',
     ORIGINAL_SIZE_PREVIEW : 'ORIGINAL_SIZE_PREVIEW',
     ONION_SKIN : 'ONION_SKIN',
     LAYER_PREVIEW : 'LAYER_PREVIEW',
     LAYER_OPACITY : 'LAYER_OPACITY',
-    EXPORT_SCALING: 'EXPORT_SCALING',
+    EXPORT_SCALE: 'EXPORT_SCALE',
+    EXPORT_TAB: 'EXPORT_TAB',
     PEN_SIZE : 'PEN_SIZE',
     RESIZE_SETTINGS: 'RESIZE_SETTINGS',
     KEY_TO_DEFAULT_VALUE_MAP_ : {
@@ -24,12 +25,13 @@
       },
       'CANVAS_BACKGROUND' : 'lowcont-dark-canvas-background',
       'SELECTED_PALETTE' : Constants.CURRENT_COLORS_PALETTE_ID,
-      'TILED_PREVIEW' : false,
+      'SEAMLESS_MODE' : false,
       'ORIGINAL_SIZE_PREVIEW' : false,
       'ONION_SKIN' : false,
       'LAYER_OPACITY' : 0.2,
       'LAYER_PREVIEW' : true,
-      'EXPORT_SCALING' : 1,
+      'EXPORT_SCALE' : 1,
+      'EXPORT_TAB' : 'gif',
       'PEN_SIZE' : 1,
       'RESIZE_SETTINGS': {
         maintainRatio : true,

src/js/utils/serialization/Deserializer.js

@@ -6,6 +6,7 @@
     this.data_ = data;
     this.callback_ = callback;
     this.piskel_ = null;
+    this.layers_ = [];
   };
 
   ns.Deserializer.deserialize = function (data, callback) {
@@ -36,9 +37,10 @@
     }
   };
 
-  ns.Deserializer.prototype.deserializeLayer = function (layerString) {
+  ns.Deserializer.prototype.deserializeLayer = function (layerString, index) {
     var layerData = JSON.parse(layerString);
     var layer = new pskl.model.Layer(layerData.name);
+    layer.setOpacity(layerData.opacity);
 
     // 1 - create an image to load the base64PNG representing the layer
     var base64PNG = layerData.base64PNG;
@@ -47,39 +49,39 @@
     // 2 - attach the onload callback that will be triggered asynchronously
     image.onload = function () {
       // 5 - extract the frames from the loaded image
-      var frames = pskl.utils.LayerUtils.createLayerFromSpritesheet(image, layerData.frameCount);
+      var frames = pskl.utils.LayerUtils.createFramesFromSpritesheet(image, layerData.frameCount);
       // 6 - add each image to the layer
-      this.addFramesToLayer(frames, layer);
+      this.addFramesToLayer(frames, layer, index);
     }.bind(this);
 
     // 3 - set the source of the image
     image.src = base64PNG;
-
-    // 4 - return a pointer to the new layer instance
     return layer;
   };
 
-  ns.Deserializer.prototype.loadExpandedLayer = function (layerData) {
+  ns.Deserializer.prototype.loadExpandedLayer = function (layerData, index) {
     var layer = new pskl.model.Layer(layerData.name);
+    layer.setOpacity(layerData.opacity);
     var frames = layerData.grids.map(function (grid) {
       return pskl.model.Frame.fromPixelGrid(grid);
     });
-    this.addFramesToLayer(frames, layer);
-
-    // 4 - return a pointer to the new layer instance
+    this.addFramesToLayer(frames, layer, index);
     return layer;
   };
 
-  ns.Deserializer.prototype.addFramesToLayer = function (frames, layer) {
+  ns.Deserializer.prototype.addFramesToLayer = function (frames, layer, index) {
     frames.forEach(layer.addFrame.bind(layer));
 
-    this.piskel_.addLayer(layer);
+    this.layers_[index] = layer;
     this.onLayerLoaded_();
   };
 
   ns.Deserializer.prototype.onLayerLoaded_ = function () {
     this.layersToLoad_ = this.layersToLoad_ - 1;
     if (this.layersToLoad_ === 0) {
+      this.layers_.forEach(function (layer) {
+        this.piskel_.addLayer(layer);
+      }.bind(this));
       this.callback_(this.piskel_);
     }
   };

src/js/utils/serialization/Serializer.js

@@ -22,15 +22,16 @@
 
     serializeLayer : function (layer, expanded) {
       var frames = layer.getFrames();
-      var renderer = new pskl.rendering.FramesheetRenderer(frames);
       var layerToSerialize = {
         name : layer.getName(),
+        opacity : layer.getOpacity(),
         frameCount : frames.length
       };
       if (expanded) {
         layerToSerialize.grids = frames.map(function (f) {return f.pixels;});
         return layerToSerialize;
       } else {
+        var renderer = new pskl.rendering.FramesheetRenderer(frames);
         layerToSerialize.base64PNG = renderer.renderAsCanvas().toDataURL();
         return JSON.stringify(layerToSerialize);
       }

src/js/widgets/SizeInput.js

@@ -1,44 +1,52 @@
 (function () {
   var ns = $.namespace('pskl.widgets');
-  ns.SizeInput = function (widthInput, heightInput, initWidth, initHeight) {
-    this.widthInput = widthInput;
-    this.heightInput = heightInput;
-    this.initWidth = initWidth;
-    this.initHeight = initHeight;
 
-    this.syncEnabled = true;
-    this.lastInput = this.widthInput;
+  /**
+   * Synchronize two "number" inputs to stick to their initial ratio.
+   * The synchronization can be disabled/enabled on the fly.
+   *
+   * @param {Object} options
+   *        - {Element} widthInput
+   *        - {Element} heightInput
+   *        - {Number} initWidth
+   *        - {Number} initHeight
+   *        - {Function} onChange
+   */
+  ns.SizeInput = function (options) {
+    this.widthInput = options.widthInput;
+    this.heightInput = options.heightInput;
+    this.initWidth = options.initWidth;
+    this.initHeight = options.initHeight;
+    this.onChange = options.onChange;
 
-    this.widthInput.value = initWidth;
-    this.heightInput.value = initHeight;
+    this.synchronizedInputs = new ns.SynchronizedInputs({
+      leftInput: this.widthInput,
+      rightInput: this.heightInput,
+      synchronize: this.synchronize_.bind(this)
+    });
 
-    pskl.utils.Event.addEventListener(this.widthInput, 'keyup', this.onSizeInputKeyUp_, this);
-    pskl.utils.Event.addEventListener(this.heightInput, 'keyup', this.onSizeInputKeyUp_, this);
+    this.disableSync = this.synchronizedInputs.disableSync.bind(this.synchronizedInputs);
+    this.enableSync = this.synchronizedInputs.enableSync.bind(this.synchronizedInputs);
+
+    this.widthInput.value = this.initWidth;
+    this.heightInput.value = this.initHeight;
   };
 
   ns.SizeInput.prototype.destroy = function () {
-    pskl.utils.Event.removeAllEventListeners(this);
+    this.synchronizedInputs.destroy();
 
     this.widthInput = null;
     this.heightInput = null;
-    this.lastInput = null;
   };
 
-  ns.SizeInput.prototype.enableSync = function () {
-    this.syncEnabled = true;
-    this.synchronize_(this.lastInput);
+  ns.SizeInput.prototype.setWidth = function (width) {
+    this.widthInput.value = width;
+    this.synchronize_(this.widthInput);
   };
 
-  ns.SizeInput.prototype.disableSync = function () {
-    this.syncEnabled = false;
-  };
-
-  ns.SizeInput.prototype.onSizeInputKeyUp_ = function (evt) {
-    var target = evt.target;
-    if (this.syncEnabled) {
-      this.synchronize_(target);
-    }
-    this.lastInput = target;
+  ns.SizeInput.prototype.setHeight = function (height) {
+    this.heightInput.value = height;
+    this.synchronize_(this.heightInput);
   };
 
   /**
@@ -57,5 +65,9 @@
     } else if (sizeInput === this.heightInput) {
       this.widthInput.value = Math.round(value * this.initWidth / this.initHeight);
     }
+
+    if (this.onChange) {
+      this.onChange();
+    }
   };
 })();

src/js/widgets/SynchronizedInputs.js

@@ -0,0 +1,40 @@
+(function () {
+  var ns = $.namespace('pskl.widgets');
+
+  ns.SynchronizedInputs = function (options) {
+    this.leftInput = options.leftInput;
+    this.rightInput = options.rightInput;
+    this.synchronize = options.synchronize;
+
+    this.syncEnabled = true;
+    this.lastInput = this.leftInput;
+
+    pskl.utils.Event.addEventListener(this.leftInput, 'input', this.onInput_, this);
+    pskl.utils.Event.addEventListener(this.rightInput, 'input', this.onInput_, this);
+  };
+
+  ns.SynchronizedInputs.prototype.destroy = function () {
+    pskl.utils.Event.removeAllEventListeners(this);
+
+    this.leftInput = null;
+    this.rightInput = null;
+    this.lastInput = null;
+  };
+
+  ns.SynchronizedInputs.prototype.enableSync = function () {
+    this.syncEnabled = true;
+    this.synchronize(this.lastInput);
+  };
+
+  ns.SynchronizedInputs.prototype.disableSync = function () {
+    this.syncEnabled = false;
+  };
+
+  ns.SynchronizedInputs.prototype.onInput_ = function (evt) {
+    var target = evt.target;
+    if (this.syncEnabled) {
+      this.synchronize(target);
+    }
+    this.lastInput = target;
+  };
+})();

src/js/worker/framecolors/FrameColorsWorker.js

@@ -9,6 +9,15 @@
 
     var TRANSPARENT_COLOR = 'rgba(0, 0, 0, 0)';
 
+    var componentToHex = function (c) {
+      var hex = c.toString(16);
+      return hex.length == 1 ? '0' + hex : hex;
+    };
+
+    var rgbToHex = function (r, g, b) {
+      return '#' + componentToHex(r) + componentToHex(g) + componentToHex(b);
+    };
+
     var toHexString_ = function(color) {
       if (color === TRANSPARENT_COLOR) {
         return color;
@@ -25,15 +34,6 @@
       }
     };
 
-    var rgbToHex = function (r, g, b) {
-      return '#' + componentToHex(r) + componentToHex(g) + componentToHex(b);
-    };
-
-    var componentToHex = function (c) {
-      var hex = c.toString(16);
-      return hex.length == 1 ? '0' + hex : hex;
-    };
-
     var getFrameColors = function (frame) {
       var frameColors = {};
       for (var x = 0 ; x < frame.length ; x++) {

src/js/worker/imageprocessor/ImageProcessorWorker.js

@@ -24,15 +24,15 @@
       }
     };
 
-    var rgbToHex = function (r, g, b) {
-      return '#' + componentToHex(r) + componentToHex(g) + componentToHex(b);
-    };
-
     var componentToHex = function (c) {
       var hex = c.toString(16);
       return hex.length == 1 ? '0' + hex : hex;
     };
 
+    var rgbToHex = function (r, g, b) {
+      return '#' + componentToHex(r) + componentToHex(g) + componentToHex(b);
+    };
+
     var imageDataToGrid = function (imageData, width, height, transparent) {
       // Draw the zoomed-up pixels to a different canvas context
       var grid = [];

src/piskel-script-list.js

@@ -32,6 +32,7 @@
   "js/utils/LayerUtils.js",
   "js/utils/PixelUtils.js",
   "js/utils/PiskelFileUtils.js",
+  "js/utils/StringUtils.js",
   "js/utils/Template.js",
   "js/utils/TooltipFormatter.js",
   "js/utils/UserSettings.js",
@@ -57,7 +58,7 @@
   // Promises
   "js/lib/q.js",
 
-  // Application libraries-->
+  // Application libraries
   "js/rendering/DrawingLoop.js",
 
   // Models
@@ -66,6 +67,7 @@
   "js/model/piskel/Descriptor.js",
   "js/model/frame/CachedFrameProcessor.js",
   "js/model/frame/AsyncCachedFrameProcessor.js",
+  "js/model/frame/RenderedFrame.js",
   "js/model/Palette.js",
   "js/model/Piskel.js",
 
@@ -112,9 +114,11 @@
   // Settings sub-controllers
   "js/controller/settings/AbstractSettingController.js",
   "js/controller/settings/ApplicationSettingsController.js",
-  "js/controller/settings/exportimage/ImageExportController.js",
   "js/controller/settings/exportimage/GifExportController.js",
   "js/controller/settings/exportimage/PngExportController.js",
+  "js/controller/settings/exportimage/ZipExportController.js",
+  "js/controller/settings/exportimage/MiscExportController.js",
+  "js/controller/settings/exportimage/ExportController.js",
   "js/controller/settings/resize/AnchorWidget.js",
   "js/controller/settings/resize/ResizeController.js",
   "js/controller/settings/resize/DefaultSizeController.js",
@@ -138,6 +142,7 @@
   "js/widgets/ColorsList.js",
   "js/widgets/HslRgbColorPicker.js",
   "js/widgets/SizeInput.js",
+  "js/widgets/SynchronizedInputs.js",
 
   // Services
   "js/service/storage/StorageService.js",
@@ -165,6 +170,7 @@
   "js/service/keyboard/Shortcut.js",
   "js/service/keyboard/Shortcuts.js",
   "js/service/keyboard/ShortcutService.js",
+  "js/service/ImportService.js",
   "js/service/ImageUploadService.js",
   "js/service/CurrentColorsService.js",
   "js/service/FileDropperService.js",
@@ -198,6 +204,7 @@
   "js/tools/drawing/ColorSwap.js",
   "js/tools/drawing/DitheringTool.js",
   "js/tools/transform/AbstractTransformTool.js",
+  "js/tools/transform/Center.js",
   "js/tools/transform/Clone.js",
   "js/tools/transform/Flip.js",
   "js/tools/transform/Rotate.js",
@@ -227,4 +234,4 @@
 
   // Bonus features !!
   "js/snippets.js"
-];
+];

src/templates/debug-header.html

@@ -0,0 +1,19 @@
+<style type="text/css">
+  #main-wrapper {
+    margin-top: 40px;
+  }
+
+  .fake-piskelapp-header {
+    text-align: center;
+    height: 40px;
+    line-height: 40px;
+    font-size: 24px;
+    background: black;
+    color: gold;
+  }
+
+  .piskel-name.piskel-name-saving {
+    color: red;
+  }
+</style>
+<div class="fake-piskelapp-header"><span class="piskel-name"></span></div>

src/templates/drawing-tools.html

@@ -13,7 +13,7 @@
       <div class="palette-wrapper">
         <div
           class="tool-icon tool-color-picker"
-          title="Primary - left mouse button"
+          data-initial-title="Primary - left mouse button"
           rel="tooltip"
           data-placement="right"
         >
@@ -21,7 +21,7 @@
         </div>
         <div
           class="tool-icon tool-color-picker"
-          title="Secondary - right mouse button"
+          data-initial-title="Secondary - right mouse button"
           rel="tooltip"
           data-placement="right"
         >

src/templates/layers-list.html

@@ -4,7 +4,7 @@
          data-placement="left"
          class="layers-toggle-preview piskel-icon-eye"></div>
   </h3>
-  <div class="layers-button-container">
+  <div class="toolbox-buttons">
     <button data-action="add"
       class="button layers-button piskel-icon-plus"
       title="Create a new layer" rel="tooltip" data-placement="top" ></button>
@@ -34,6 +34,13 @@
   <ul class="layers-list"></ul>
 
   <script type="text/template" id="layer-item-template">
-    <li class="layer-item {{isselected:current-layer-item}}" data-layer-index="{{layerindex}}">{{layername}}</li>
+    <li class="layer-item {{isselected:current-layer-item}}"
+        data-layer-index="{{layerindex}}">
+        {{layername}}
+        <span class="layer-item-opacity"
+              title="Layer opacity" rel="tooltip" data-placement="top">
+          {{opacity}}&#945;
+        </span>
+    </li>
   </script>
 </div>

src/templates/palettes-list.html

@@ -1,6 +1,6 @@
 <div class="toolbox-container palettes-list-container">
   <h3 class="toolbox-title palettes-title">Palettes</h3>
-  <div class="palettes-list-actions">
+  <div class="toolbox-buttons">
     <button
       class="button palettes-list-button create-palette-button piskel-icon-plus" data-action="add"
       title="Create a new palette" rel="tooltip" data-placement="top" ></button>

src/templates/settings/application.html

@@ -1,9 +1,10 @@
 <script type="text/html" id="templates/settings/application.html">
   <form action="" method="POST" name="application-settings-form">
-    <div class="settings-section settings-section--application-general">
+    <div class="settings-section settings-section-application">
       <div class="settings-title">
         General
       </div>
+
       <div class="settings-item">
         <label>Background</label>
         <div class="background-picker-wrapper">
@@ -23,7 +24,7 @@
       </div>
 
       <div class="settings-item">
-        <label for="grid-width">Grid</label>
+        <label for="grid-width">Pixel Grid</label>
         <select id="grid-width" class="grid-width-select">
           <option value="0">Disabled</option>
           <option value="1">1px</option>
@@ -34,31 +35,24 @@
       </div>
 
       <div class="settings-item">
-        <label for="tiled-preview">Layer Preview Opacity</label>
+        <label>Layer Opacity</label>
         <input type="range" class="layer-opacity-input" name="layer-opacity" min="0"  max="1" step="0.05"/>
         <span class="layer-opacity-text"></span>
       </div>
 
-    </div>
-
-    <div class="settings-section">
-      <div class="settings-title">
-        Preview
-      </div>
-
       <div class="settings-item">
         <label>
-          <input type="checkbox" value="1" class="tiled-preview-checkbox  checkbox-fix" name="tiled-preview-checkbox"/>
-          Repeated preview
+          Seamless drawing mode
+          <input type="checkbox" value="1" class="seamless-mode-checkbox" name="seamless-mode-checkbox"/>
         </label>
       </div>
 
       <div class="settings-item">
-        <label for="tiled-preview">Maximum FPS </label>
+        <label>Maximum FPS</label>
         <input type="text" class="textfield  textfield-small  max-fps-input" autocomplete="off" name="max-fps"/>
       </div>
 
-      <input type="submit" class="button button-primary" value="Save" />
+      <input type="submit" class="button button-primary" value="Apply settings" />
     </div>
   </form>
 </script>

src/templates/settings/export.html

@@ -1,65 +1,25 @@
 <script type="text/html" id="templates/settings/export.html">
-  <div class="settings-section">
-    <div class="settings-title">
-      Export Spritesheet
-    </div>
-    <div class="settings-item">
-      <div class="settings-description">PNG with all frames side by side.</div>
-      <div class="scaling-factor"
-        title="Scale the exported PNG spritesheet"
+  <div class="settings-section settings-section-export">
+    <div class="settings-title">Export</div>
+    <div class="settings-item export-scale" title="Scale the animation for export"
         rel="tooltip"
         data-placement="top">
-        <label for="scaling-factor">Scale</label>
-        <input type="range" class="scaling-factor-input" name="scaling-factor" min="1"  max="32" step="1"/>
-        <span class="scaling-factor-text"></span>
-      </div>
-      <button type="button" class="button button-primary png-download-button">Download PNG</button>
+      <label for="scale-input">Scale</label>
+      <input type="range" class="scale-input" name="scale-input" min="1"  max="32" step="1"/>
+      <span class="scale-text"></span>
     </div>
-    <div class="settings-title">
-      Export as ZIP
+    <div class="settings-item export-resize">
+      <span class="resize-label">Resolution</span>
+      <input type="text" class="textfield  resize-field  resize-width" autocomplete="off" name="resize-width"/>
+      <div class="resize-label">x</div>
+      <input type="text" class="textfield  resize-field  resize-height" autocomplete="off" name="resize-height"/>
     </div>
-    <div class="settings-item">
-      <div class="settings-description">ZIP with one PNG file per frame.</div>
-      <div class="settings-description">File names will start with the prefix below.</div>
-      <div class="settings-item">
-        <label>Prefix</label>
-        <input type="text" class="zip-prefix-name  textfield" autocomplete="off" placeholder="PNG file prefix ...">
-      </div>
-    <div class="settings-item">
-        <label>
-          <input class="zip-split-layers-checkbox  checkbox-fix" type="checkbox" />
-          Split by layers
-        </label>
-      </div>
-      <button type="button" class="button button-primary zip-generate-button"/>Download ZIP</button>
-    </div>
-    <div class="settings-title">
-      Export to Animated GIF
-    </div>
-    <div class="settings-item">
-      <form action="" method="POST" class="gif-export-form">
-        <div class="settings-item">
-          <label>Select resolution:</label>
-          <div class="resize-section">
-            <span  class="resize-section-title">Width</span>
-            <input type="text" class="textfield  export-size-field  export-gif-resize-width" autocomplete="off" name="resize-width"/>
-            <span>px</span>
-          </div>
-          <div class="resize-section">
-            <span  class="resize-section-title">Height</span>
-            <input type="text" class="textfield  export-size-field  export-gif-resize-height" autocomplete="off" name="resize-height"/>
-            <span>px</span>
-          </div>
-        </div>
-        <div class="settings-item">
-          <button type="button" class="button button-primary gif-download-button">Download GIF</button>
-          <button type="button" class="button button gif-upload-button">Get public URL</button>
-        </div>
-      </form>
-      <div class="gif-upload">
-        <div class="gif-export-preview"></div>
-        <div class="gif-upload-status"></div>
-      </div>
+    <div class="export-tabs">
+      <div class="export-tab" data-tab-id="gif">GIF</div>
+      <div class="export-tab" data-tab-id="png">PNG</div>
+      <div class="export-tab" data-tab-id="zip">Zip</div>
+      <div class="export-tab" data-tab-id="misc">Others</div>
     </div>
+    <div class="export-panel"></div>
   </div>
 </script>

src/templates/settings/export/gif.html

@@ -0,0 +1,19 @@
+<script type="text/html" id="templates/settings/export/gif.html">
+  <div class="export-panel-gif">
+    <div class="export-panel-header export-info">
+      Convert your sprite to an animated GIF. Opacity will not be preserved. Colors might be resampled.
+    </div>
+    <div class="export-panel-section export-panel-row">
+      <button type="button" class="button button-primary gif-download-button">Download</button>
+      <div class="export-info">Download as an animated GIF.</div>
+    </div>
+    <div class="export-panel-section export-panel-row">
+      <button type="button" class="button button-primary gif-upload-button">Upload</button>
+      <div class="export-info">Upload as an animated GIF to a public URL.</div>
+    </div>
+    <div class="gif-upload">
+      <div class="gif-export-preview"></div>
+      <div class="gif-upload-status"></div>
+    </div>
+  </div>
+</script>

src/templates/settings/export/misc.html

@@ -0,0 +1,16 @@
+<script type="text/html" id="templates/settings/export/misc.html">
+  <div class="export-panel-misc">
+    <div class="export-panel-header export-info">
+      Less usual export formats. Feedback and improvements welcome.
+    </div>
+    <div class="export-panel-section">
+      <div style="padding-bottom: 5px">
+        <span style="color: gold;">Export as C File: </span>
+        <span class="export-info">
+          C file with frame rendered as array.
+        </span>
+      </div>
+      <button type="button" class="button button-primary c-download-button">Download C file</button>
+    </div>
+  </div>
+</script>

src/templates/settings/export/png.html

@@ -0,0 +1,26 @@
+<script type="text/html" id="templates/settings/export/png.html">
+  <div class="export-panel-png">
+    <div class="export-panel-header export-info">Export your animation as a PNG spritesheet containing all frames.</div>
+    <div class="export-panel-section  png-export-layout-section">
+      <div style="color: gold; padding-bottom: 5px;">Spritesheet layout options:</div>
+      <div style="display: flex; line-height: 20px;">
+        <div style="flex: 1;">
+          <span>Columns</span>
+          <input type="number" min="1" class="textfield" id="png-export-columns" name="png-export-columns">
+        </div>
+        <div style="flex: 1;">
+          <span>Rows</span>
+          <input readonly="true" class="textfield" id="png-export-rows" name="png-export-rows">
+        </div>
+      </div>
+    </div>
+    <div class="export-panel-section export-panel-row">
+      <button type="button" class="button button-primary png-download-button">Download</button>
+      <span class="png-export-dimension-info export-info"></span>
+    </div>
+    <div class="export-panel-section export-panel-row png-export-datauri-section">
+      <button type="button" style="white-space: nowrap;" class="button button-primary datauri-open-button">To data-uri</button>
+      <span class="png-export-datauri-info export-info">Open the PNG export in your browser as a data-uri</span>
+    </div>
+  </div>
+</script>

src/templates/settings/export/zip.html

@@ -0,0 +1,17 @@
+<script type="text/html" id="templates/settings/export/zip.html">
+  <div class="export-panel-zip">
+    <div class="export-panel-header export-info">ZIP archive containing one PNG for each frame. File names will start with the prefix below.</div>
+    <div class="export-panel-section">
+      <div style="display: flex; line-height: 23px;">
+        <label style="flex-shrink: 0; padding-right:5px;">Prefix</label>
+        <input type="text" style="flex: 1;" class="zip-prefix-name textfield"
+               autocomplete="off" placeholder="PNG file prefix ...">
+      </div>
+      <div style="margin: 5px 0;">
+        <input id="zip-split-layers" class="zip-split-layers-checkbox checkbox-fix" type="checkbox" />
+        <label for="zip-split-layers">Split by layers</label>
+      </div>
+      <button type="button" class="button button-primary zip-generate-button"/>Download ZIP</button>
+    </div>
+  </div>
+</script>

src/templates/settings/import.html

@@ -1,5 +1,5 @@
 <script type="text/template" id="templates/settings/import.html">
-  <div class="settings-section">
+  <div class="settings-section settings-section-import">
     <div class="settings-title">
       Load from Browser
     </div>

src/templates/settings/resize.html

@@ -1,5 +1,5 @@
 <script type="text/html" id="templates/settings/resize.html">
-  <div class="settings-section">
+  <div class="settings-section settings-section-resize">
     <!-- RESIZE DRAWING SECTION -->
     <div class="settings-title">
       Resize

src/templates/settings/save.html

@@ -1,5 +1,5 @@
 <script type="text/template" id="templates/settings/save.html">
-  <div class="settings-section  setting-save-section">
+  <div class="settings-section settings-section-save">
     <form action="" method="POST" class="save-form" name="save-form">
       <div class="settings-title">Sprite Information</div>
       <div class="settings-item">

test/js/model/LayerTest.js

@@ -0,0 +1,39 @@
+describe("Layer model test", function() {
+
+  beforeEach(function() {});
+  afterEach(function() {});
+
+  it("has proper defaults", function() {
+    var layer = new pskl.model.Layer('layerName');
+
+    expect(layer.getOpacity()).toBe(1);
+    expect(layer.getFrames().length).toBe(0);
+    expect(layer.getName()).toBe('layerName');
+  });
+
+  it("can set opacity", function() {
+    var layer = new pskl.model.Layer('layerName');
+
+    layer.setOpacity(0.5);
+    expect(layer.getOpacity()).toBe(0.5);
+  });
+
+  it("ignores bad opacity", function() {
+    var layer = new pskl.model.Layer('layerName');
+
+    layer.setOpacity(0.3);
+    expect(layer.getOpacity()).toBe(0.3);
+
+    layer.setOpacity('Yep I\'m an opacity, let me in !');
+    expect(layer.getOpacity()).toBe(0.3);
+
+    layer.setOpacity(9000);
+    expect(layer.getOpacity()).toBe(0.3);
+
+    layer.setOpacity(-1);
+    expect(layer.getOpacity()).toBe(0.3);
+
+    layer.setOpacity(null);
+    expect(layer.getOpacity()).toBe(0.3);
+  });
+});

test/js/rendering/FramesheetRendererTest.js

@@ -0,0 +1,72 @@
+describe("Framesheet Renderer test", function() {
+  var B = '#000000';
+  var W = '#ffffff';
+  var T = Constants.TRANSPARENT_COLOR;
+
+  var toFrameGrid = test.testutils.toFrameGrid;
+  var frameEqualsGrid = test.testutils.frameEqualsGrid;
+
+  beforeEach(function() {});
+  afterEach(function() {});
+
+  var toFrame = function (array) {
+    return pskl.model.Frame.fromPixelGrid(toFrameGrid(array));
+  };
+
+  it("draws frames side by side by default", function() {
+    // create frames
+    var f1 = toFrame([[B, T],
+                      [B, W]]);
+    var f2 = toFrame([[W, B],
+                      [T, B]]);
+
+    var renderer = new pskl.rendering.FramesheetRenderer([f1, f2]);
+    var canvas = renderer.renderAsCanvas();
+    frameEqualsGrid(pskl.utils.FrameUtils.createFromImage(canvas), [
+      [B, T, W, B],
+      [B, W, T, B]
+    ]);
+  });
+
+  it("renderAsCanvas accepts columns argument", function() {
+    // create frames
+    var f1 = toFrame([[B, B]]);
+    var f2 = toFrame([[W, W]]);
+    var f3 = toFrame([[T, W]]);
+    var f4 = toFrame([[B, W]]);
+    var frames = [f1, f2, f3, f4];
+
+    // columns = 4
+    var renderer = new pskl.rendering.FramesheetRenderer(frames);
+    var canvas = renderer.renderAsCanvas(4);
+    frameEqualsGrid(pskl.utils.FrameUtils.createFromImage(canvas), [
+      [B, B, W, W, T, W, B, W]
+    ]);
+
+    // columns = 3
+    renderer = new pskl.rendering.FramesheetRenderer(frames);
+    canvas = renderer.renderAsCanvas(3);
+    frameEqualsGrid(pskl.utils.FrameUtils.createFromImage(canvas), [
+      [B, B, W, W, T, W],
+      [B, W, T, T, T, T]
+    ]);
+
+    // columns = 2
+    renderer = new pskl.rendering.FramesheetRenderer(frames);
+    canvas = renderer.renderAsCanvas(2);
+    frameEqualsGrid(pskl.utils.FrameUtils.createFromImage(canvas), [
+      [B, B, W, W],
+      [T, W, B, W]
+    ]);
+
+    // columns = 1
+    renderer = new pskl.rendering.FramesheetRenderer(frames);
+    canvas = renderer.renderAsCanvas(1);
+    frameEqualsGrid(pskl.utils.FrameUtils.createFromImage(canvas), [
+      [B, B],
+      [W, W],
+      [T, W],
+      [B, W]
+    ]);
+  });
+});

test/js/service/keyboard/ShortcutServiceTest.js

@@ -20,8 +20,10 @@ describe("ShortcutService test suite", function() {
         return this;
       },
       ctrlKey : false,
+      metaKey : false,
       withCtrlKey : function () {
         this.ctrlKey = true;
+        this.metaKey = true;
         return this;
       },
       shiftKey : false,

test/js/testutils/TestUtils.js

@@ -16,10 +16,10 @@
    * we expect this to be a 3x2 image, one black line above a white line.
    *
    * However Frame.createFromGrid needs the following input to create such an image :
-   * 
+   *
    * [[black, white],
    *  [black, white],
-   *  [black, white]] 
+   *  [black, white]]
    *
    * This helper will build the second array from the first array.
    */
@@ -41,4 +41,32 @@
       expect(color).toBe(grid[row][col]);
     });
   };
+
+  ns.imageEqualsGrid = function (image, grid) {
+    for (var x = 0 ; x < grid.length ; x++) {
+      for (var y = 0 ; y < grid[x].length ; y++) {
+        var expected = tinycolor(grid[x][y]).toRgbString();
+        var color = tinycolor(ns.getRgbaAt(image, x, y)).toRgbString();
+        expect(color).toBe(expected);
+      }
+    }
+  }
+
+  ns.getRgbaAt = function (image, x, y) {
+    var w = image.width;
+    var h = image.height;
+    var canvas = pskl.utils.CanvasUtils.createCanvas(w, h);
+    var context = canvas.getContext('2d');
+
+    context.drawImage(image, 0, 0, w, h, 0, 0, w, h);
+    var imageData = context.getImageData(0, 0, w, h).data;
+    var i = (y * w + x) * 4;
+
+    return {
+      r : imageData[i],
+      g : imageData[i + 1],
+      b : imageData[i + 2],
+      a : imageData[i + 3]/255
+    };
+  }
 })();

test/js/tools/transform/TransformUtilsTest.js

@@ -230,4 +230,27 @@ describe("TransformUtils suite", function() {
     ]);
   });
 
-});
+  /*******************************/
+  /*********** CENTER ************/
+  /*******************************/
+
+  it("centers a frame", function () {
+    // create frame
+    var frame = pskl.model.Frame.fromPixelGrid(toFrameGrid([
+      [A, B, O, O],
+      [B, A, O, O],
+      [O, O, O, O],
+      [O, O, O, O]
+    ]));
+
+    // should be centered
+    pskl.tools.transform.TransformUtils.center(frame);
+    frameEqualsGrid(frame, [
+      [O, O, O, O],
+      [O, A, B, O],
+      [O, B, A, O],
+      [O, O, O, O]
+    ]);
+  });
+
+});

test/js/utils/FrameUtilsTest.js

@@ -74,7 +74,7 @@ describe("FrameUtils suite", function() {
     ]);
   });
 
-  it ("[LayerUtils] creates a layer from a simple spritesheet", function () {
+  it ("[LayerUtils] creates frames from a simple spritesheet", function () {
     var B = black, R = red;
 
     // original image in 4x2
@@ -86,7 +86,7 @@ describe("FrameUtils suite", function() {
     var spritesheet = pskl.utils.FrameUtils.toImage(frame);
 
     // split the spritesheet by 4
-    var frames = pskl.utils.LayerUtils.createLayerFromSpritesheet(spritesheet, 4);
+    var frames = pskl.utils.LayerUtils.createFramesFromSpritesheet(spritesheet, 4);
 
     // expect 4 frames of 1x2
     expect(frames.length).toBe(4);

test/js/utils/LayerUtilsTest.js

@@ -0,0 +1,56 @@
+describe("LayerUtils test", function() {
+
+  var B = '#000000';
+  var R = '#ff0000';
+  var T = Constants.TRANSPARENT_COLOR;
+  var frameEqualsGrid = test.testutils.frameEqualsGrid;
+  var imageEqualsGrid = test.testutils.imageEqualsGrid;
+
+  var frame1 = pskl.model.Frame.fromPixelGrid([
+    [B, T],
+    [T, B]
+  ]);
+
+  var frame2 = pskl.model.Frame.fromPixelGrid([
+    [T, R],
+    [R, T]
+  ]);
+
+  beforeEach(function() {});
+  afterEach(function() {});
+
+  it("flattens a frame", function() {
+    // when
+    var l1 = new pskl.model.Layer('l1');
+    l1.addFrame(frame1);
+    var l2 = new pskl.model.Layer('l2');
+    l2.addFrame(frame2);
+
+    // then
+    var flattened = pskl.utils.LayerUtils.flattenFrameAt([l1, l2], 0);
+
+    //verify
+    imageEqualsGrid(flattened, [
+      [B, R],
+      [R, B]
+    ]);
+  });
+
+  it("flattens a frame with opacity", function() {
+    // when
+    var l1 = new pskl.model.Layer('l1');
+    l1.addFrame(frame1);
+    var l2 = new pskl.model.Layer('l2');
+    l2.setOpacity(0.5);
+    l2.addFrame(frame2);
+
+    // then
+    var flattened = pskl.utils.LayerUtils.flattenFrameAt([l1, l2], 0, true);
+
+    //verify
+    imageEqualsGrid(flattened, [
+      [B, 'rgba(255,0,0,0.5)'],
+      ['rgba(255,0,0,0.5)', B]
+    ]);
+  });
+});

test/js/utils/serialization/SerializerTest.js

@@ -0,0 +1,41 @@
+describe("Serialization/Deserialization test", function() {
+
+  beforeEach(function() {
+    pskl.app.piskelController = {
+      getFPS: function () {
+        return 1;
+      }
+    };
+  });
+  afterEach(function() {
+    delete pskl.app.piskelController;
+  });
+
+  it("serializes layer opacity", function(done) {
+    var descriptor = new pskl.model.piskel.Descriptor('piskelName', 'piskelDesc');
+    var piskel = new pskl.model.Piskel(1, 1, descriptor);
+
+    piskel.addLayer(new pskl.model.Layer('layer1'));
+    piskel.addLayer(new pskl.model.Layer('layer2'));
+    piskel.addLayer(new pskl.model.Layer('layer3'));
+
+    piskel.getLayerAt(0).setOpacity(0);
+    piskel.getLayerAt(1).setOpacity(0.3);
+    piskel.getLayerAt(2).setOpacity(0.9);
+
+    var frame = new pskl.model.Frame(1, 1);
+    piskel.getLayers().forEach(function (layer) {
+      layer.addFrame(frame);
+    });
+
+    var serializedPiskel = pskl.utils.Serializer.serializePiskel(piskel);
+
+    var deserializer = pskl.utils.serialization.Deserializer;
+    deserializer.deserialize(JSON.parse(serializedPiskel), function (p) {
+      expect(p.getLayerAt(0).getOpacity()).toBe(0);
+      expect(p.getLayerAt(1).getOpacity()).toBe(0.3);
+      expect(p.getLayerAt(2).getOpacity()).toBe(0.9);
+      done();
+    })
+  });
+});